Skip to content

Commit 7187cab

Browse files
committed
Added deprecation warning for request package
1 parent 68f6f1c commit 7187cab

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

lib/sandbox.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,10 @@ function sandBox(script, name, verbose, debug, context) {
529529
md = md.replace(/^node:/, '');
530530
}
531531

532+
if (typeof md === 'string' && md === 'request') {
533+
sandbox.log(`request package is deprecated - please use httpGet (or a stable lib like axios) instead!`, 'warn');
534+
}
535+
532536
if (mods[md]) {
533537
return mods[md];
534538
} else {

main.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,12 +1868,13 @@ function createVM(source, name) {
18681868
}
18691869
}
18701870

1871-
function execute(script, name, verbose, debug) {
1871+
function execute(script, name, engineType, verbose, debug) {
18721872
script.intervals = [];
18731873
script.timeouts = [];
18741874
script.schedules = [];
18751875
script.wizards = [];
18761876
script.name = name;
1877+
script.engineType = engineType;
18771878
script._id = Math.floor(Math.random() * 0xFFFFFFFF);
18781879
script.subscribes = {};
18791880
script.subscribesFile = {};
@@ -1948,7 +1949,7 @@ function updateLogSubscriptions() {
19481949
}
19491950

19501951
function stop(name, callback) {
1951-
adapter.log.info('Stop script ' + name);
1952+
adapter.log.info(`Stopping script ${name}`);
19521953

19531954
adapter.setState('scriptEnabled.' + name.substring(SCRIPT_CODE_MARKER.length), false, true);
19541955

@@ -2106,7 +2107,7 @@ function prepareScript(obj, callback) {
21062107

21072108
if ((obj.common.engineType.toLowerCase().startsWith('javascript') || obj.common.engineType === 'Blockly' || obj.common.engineType === 'Rules')) {
21082109
// Javascript
2109-
adapter.log.info('Start javascript ' + name);
2110+
adapter.log.info(`Start JavaScript ${name} (${obj.common.engineType})`);
21102111

21112112
let sourceFn = name;
21122113
if (webstormDebug) {
@@ -2119,11 +2120,11 @@ function prepareScript(obj, callback) {
21192120
typeof callback === 'function' && callback(false, name);
21202121
return;
21212122
}
2122-
execute(context.scripts[name], sourceFn, obj.common.verbose, obj.common.debug);
2123+
execute(context.scripts[name], sourceFn, obj.common.engineType, obj.common.verbose, obj.common.debug);
21232124
typeof callback === 'function' && callback(true, name);
21242125
} else if (obj.common.engineType.toLowerCase().startsWith('typescript')) {
21252126
// TypeScript
2126-
adapter.log.info(`${name}: compiling TypeScript source...`);
2127+
adapter.log.info(`Compiling TypeScript source ${name}`);
21272128
// The source code must be transformed in order to support top level await
21282129
// and to force TypeScript to compile the code as a module
21292130
const transformedSource = transformScriptBeforeCompilation(obj.common.source, false);
@@ -2185,7 +2186,7 @@ function prepareScript(obj, callback) {
21852186
typeof callback === 'function' && callback(false, name);
21862187
return;
21872188
}
2188-
execute(context.scripts[name], name, obj.common.verbose, obj.common.debug);
2189+
execute(context.scripts[name], name, obj.common.engineType, obj.common.verbose, obj.common.debug);
21892190
typeof callback === 'function' && callback(true, name);
21902191
}
21912192
} else {

0 commit comments

Comments
 (0)