frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fully remove when.js dependency

This commit is contained in:
Nick O'Leary 2020-11-30 14:38:48 +00:00
parent beccdac717
commit 5992ed1fab
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
49 changed files with 299 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -74,7 +74,6 @@
"semver": "6.3.0",
"tar": "6.0.5",
"uglify-js": "3.11.6",
"when": "3.7.8",
"ws": "6.2.1",
"xml2js": "0.4.23"
},

1
packages/node_modules/@node-red/editor-api/lib/editor/library.js vendored
View File

@ -17,7 +17,6 @@
var apiUtils = require("../util");
var fs = require('fs');
var fspath = require('path');
var when = require('when');
var runtimeAPI;

8
packages/node_modules/@node-red/editor-api/lib/index.js vendored
View File

@ -28,7 +28,6 @@ var express = require("express");
var bodyParser = require("body-parser");
var util = require('util');
var passport = require('passport');
var when = require('when');
var cors = require('cors');
var auth = require("./auth");
@ -111,11 +110,9 @@ function init(settings,_server,storage,runtimeAPI) {
* @return {Promise} resolves when the application is ready to handle requests
* @memberof @node-red/editor-api
*/
function start() {
async function start() {
if (editor) {
return editor.start();
} else {
return when.resolve();
}
}
@ -124,11 +121,10 @@ function start() {
* @return {Promise} resolves when the application is stopped
* @memberof @node-red/editor-api
*/
function stop() {
async function stop() {
if (editor) {
editor.stop();
}
return when.resolve();
}
module.exports = {
init: init,

1
packages/node_modules/@node-red/editor-api/package.json vendored
View File

@ -32,7 +32,6 @@
"passport-http-bearer": "1.0.1",
"passport-oauth2-client-password": "0.1.2",
"passport": "0.4.1",
"when": "3.7.8",
"ws": "6.2.1"
},
"optionalDependencies": {

9
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require("when");
var fs = require("fs-extra");
var path = require("path");
var semver = require("semver");
@ -92,7 +91,7 @@ function loadNodeFiles(nodeFiles) {
nodeFiles[m].nodes[n] = nodeSet;
nodes.push(nodeSet);
}
})()));
})()).catch(err => {}));
} catch(err) {
//
}
@ -101,7 +100,7 @@ function loadNodeFiles(nodeFiles) {
}
}
}
return when.settle(promises).then(function(results) {
return Promise.all(promises).then(function(results) {
for (var module in nodeFiles) {
if (nodeFiles.hasOwnProperty(module)) {
if (!nodeFiles[module].err) {
@ -293,13 +292,13 @@ function loadNodeSetList(nodes) {
var promises = [];
nodes.forEach(function(node) {
if (!node.err) {
promises.push(loadNodeSet(node));
promises.push(loadNodeSet(node).catch(err => {}));
} else {
promises.push(node);
}
});
return when.settle(promises).then(function() {
return Promise.all(promises).then(function() {
if (settings.available()) {
return registry.saveNodeList();
} else {

4
packages/node_modules/@node-red/registry/lib/localfilesystem.js vendored
View File

@ -17,7 +17,6 @@
var fs = require("fs");
var path = require("path");
var events;
var log;
var log = require("@node-red/util").log;
@ -29,7 +28,6 @@ var iconFileExtensions = [".png", ".gif", ".svg"];
function init(runtime) {
settings = runtime.settings;
events = runtime.events;
}
function isIncluded(name) {
@ -75,7 +73,6 @@ function getLocalFile(file) {
/**
* Synchronously walks the directory looking for node files.
* Emits 'node-icon-dir' events for an icon dirs found
* @param dir the directory to search
* @return an array of fully-qualified paths to .js files
*/
@ -229,7 +226,6 @@ function getModuleNodeFiles(module) {
try {
fs.statSync(examplesDir)
result.examples = {path:examplesDir};
// events.emit("node-examples-dir",{name:pkg.name,path:examplesDir});
} catch(err) {
}
return result;

3
packages/node_modules/@node-red/registry/package.json vendored
View File

@ -19,7 +19,6 @@
"@node-red/util": "1.3.0-beta.1",
"semver": "6.3.0",
"tar": "6.0.5",
"uglify-js": "3.11.6",
"when": "3.7.8"
"uglify-js": "3.11.6"
}
}

27
packages/node_modules/@node-red/runtime/lib/index.js vendored
View File

@ -14,8 +14,6 @@
* limitations under the License.
**/
var when = require('when');
var externalAPI = require("./api");
var redNodes = require("./nodes");
@ -197,25 +195,24 @@ function start() {
});
}
var reinstallAttempts;
var reinstallAttempts = 0;
var reinstallTimeout;
function reinstallModules(moduleList) {
var promises = [];
var failedModules = [];
var reinstallList = [];
for (var i=0;i<moduleList.length;i++) {
if (settings.autoInstallModules && i != "node-red") {
promises.push(redNodes.installModule(moduleList[i].id,moduleList[i].version));
if (settings.autoInstallModules && moduleList[i].id != "node-red") {
(function(mod) {
promises.push(redNodes.installModule(mod.id,mod.version).then(m => {
events.emit("runtime-event",{id:"node/added",retain:false,payload:m.nodes});
}).catch(err => {
reinstallList.push(mod);
}));
})(moduleList[i])
}
}
when.settle(promises).then(function(results) {
var reinstallList = [];
for (var i=0;i<results.length;i++) {
if (results[i].state === 'rejected') {
reinstallList.push(moduleList[i]);
} else {
events.emit("runtime-event",{id:"node/added",retain:false,payload:results[i].value.nodes});
}
}
Promise.all(promises).then(function(results) {
if (reinstallList.length > 0) {
reinstallAttempts++;
// First 5 at 1x timeout, next 5 at 2x, next 5 at 4x, then 8x

27
packages/node_modules/@node-red/runtime/lib/nodes/credentials.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require("when");
var crypto = require('crypto');
var runtime;
var settings;
@ -60,7 +59,7 @@ var api = module.exports = {
/**
* Sets the credentials from storage.
*/
load: function (credentials) {
load: async function (credentials) {
dirty = false;
var credentialsEncrypted = credentials.hasOwnProperty("$") && Object.keys(credentials).length === 1;
@ -77,7 +76,7 @@ var api = module.exports = {
// Case 4: credentialSecret set
// - use it
var setupEncryptionPromise = when.resolve();
var setupEncryptionPromise = Promise.resolve();
var projectKey = false;
var activeProject;
@ -134,7 +133,7 @@ var api = module.exports = {
log.warn(log._("nodes.credentials.error",{message:err.toString()}))
var error = new Error("Failed to decrypt credentials");
error.code = "credentials_load_failed";
return when.reject(error);
throw error;
}
}
dirty = true;
@ -163,7 +162,7 @@ var api = module.exports = {
log.warn(log._("nodes.credentials.error",{message:err.toString()}))
var error = new Error("Failed to decrypt credentials");
error.code = "credentials_load_failed";
return when.reject(error);
throw error;
}
}
dirty = true;
@ -217,9 +216,9 @@ var api = module.exports = {
// This is a project with a bad key. Mark it as invalid
// TODO: this delves too deep into Project structure
activeProject.credentialSecretInvalid = true;
return when.reject(error);
throw error;
}
return when.reject(error);
throw error;
}
// These are encrypted credentials
try {
@ -235,9 +234,9 @@ var api = module.exports = {
// This is a project with a bad key. Mark it as invalid
// TODO: this delves too deep into Project structure
activeProject.credentialSecretInvalid = true;
return when.reject(error);
throw error;
}
return when.reject(error);
throw error;
}
} else {
credentialCache = credentials;
@ -257,12 +256,11 @@ var api = module.exports = {
* @param creds an object of credential key/value pairs
* @return a promise for backwards compatibility TODO: can this be removed?
*/
add: function (id, creds) {
add: async function (id, creds) {
if (!credentialCache.hasOwnProperty(id) || JSON.stringify(creds) !== JSON.stringify(credentialCache[id])) {
credentialCache[id] = creds;
dirty = true;
}
return when.resolve();
},
/**
@ -293,7 +291,7 @@ var api = module.exports = {
* @param config a flow config
* @return a promise for the saving of credentials to storage
*/
clean: function (config) {
clean: async function (config) {
var existingIds = {};
config.forEach(function(n) {
existingIds[n.id] = true;
@ -313,7 +311,6 @@ var api = module.exports = {
if (deletedCredentials) {
dirty = true;
}
return when.resolve();
},
/**
@ -432,7 +429,7 @@ var api = module.exports = {
getKeyType: function() {
return encryptionKeyType;
},
export: function() {
export: async function() {
var result = credentialCache;
if (encryptionEnabled) {
@ -455,7 +452,7 @@ var api = module.exports = {
return result;
})
} else {
return when.resolve(result);
return result;
}
}
}

1
packages/node_modules/@node-red/runtime/lib/nodes/index.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require("when");
var path = require("path");
var fs = require("fs");
var clone = require("clone");

6
packages/node_modules/@node-red/runtime/lib/settings.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require("when");
var clone = require("clone");
var assert = require("assert");
var log = require("@node-red/util").log; // TODO: separate module
@ -90,10 +89,10 @@ var persistentSettings = {
globalSettings[prop] = clone(value);
try {
assert.deepEqual(current,value);
return when.resolve();
} catch(err) {
return storage.saveSettings(clone(globalSettings));
}
return Promise.resolve();
},
delete: function(prop) {
if (localSettings.hasOwnProperty(prop)) {
@ -106,7 +105,7 @@ var persistentSettings = {
delete globalSettings[prop];
return storage.saveSettings(clone(globalSettings));
}
return when.resolve();
return Promise.resolve();
},
available: function() {
@ -180,7 +179,6 @@ var persistentSettings = {
userSettings[username] = settings;
try {
assert.deepEqual(current,settings);
return when.resolve();
} catch(err) {
globalSettings.users = userSettings;
return storage.saveSettings(clone(globalSettings));

111
packages/node_modules/@node-red/runtime/lib/storage/index.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require('when');
var Path = require('path');
var crypto = require('crypto');
@ -50,15 +49,13 @@ function is_malicious(path) {
}
var storageModuleInterface = {
init: function(_runtime) {
init: async function(_runtime) {
runtime = _runtime;
try {
storageModule = moduleSelector(runtime.settings);
settingsAvailable = storageModule.hasOwnProperty("getSettings") && storageModule.hasOwnProperty("saveSettings");
sessionsAvailable = storageModule.hasOwnProperty("getSessions") && storageModule.hasOwnProperty("saveSessions");
} catch (e) {
return when.reject(e);
}
// Any errors thrown by the module will get passed up to the called
// as a rejected promise
storageModule = moduleSelector(runtime.settings);
settingsAvailable = storageModule.hasOwnProperty("getSettings") && storageModule.hasOwnProperty("saveSettings");
sessionsAvailable = storageModule.hasOwnProperty("getSessions") && storageModule.hasOwnProperty("saveSessions");
if (!!storageModule.projects) {
var projectsEnabled = false;
if (runtime.settings.hasOwnProperty("editorTheme") && runtime.settings.editorTheme.hasOwnProperty("projects")) {
@ -73,7 +70,7 @@ var storageModuleInterface = {
}
return storageModule.init(runtime.settings,runtime);
},
getFlows: function() {
getFlows: async function() {
return storageModule.getFlows().then(function(flows) {
return storageModule.getCredentials().then(function(creds) {
var result = {
@ -85,14 +82,14 @@ var storageModuleInterface = {
})
});
},
saveFlows: function(config, user) {
saveFlows: async function(config, user) {
var flows = config.flows;
var credentials = config.credentials;
var credentialSavePromise;
if (config.credentialsDirty) {
credentialSavePromise = storageModule.saveCredentials(credentials);
} else {
credentialSavePromise = when.resolve();
credentialSavePromise = Promise.resolve();
}
delete config.credentialsDirty;
@ -105,64 +102,60 @@ var storageModuleInterface = {
// getCredentials: function() {
// return storageModule.getCredentials();
// },
saveCredentials: function(credentials) {
saveCredentials: async function(credentials) {
return storageModule.saveCredentials(credentials);
},
getSettings: function() {
getSettings: async function() {
if (settingsAvailable) {
return storageModule.getSettings();
} else {
return when.resolve(null);
return null
}
},
saveSettings: function(settings) {
saveSettings: async function(settings) {
if (settingsAvailable) {
return settingsSaveMutex.runExclusive(() => storageModule.saveSettings(settings))
} else {
return when.resolve();
}
},
getSessions: function() {
getSessions: async function() {
if (sessionsAvailable) {
return storageModule.getSessions();
} else {
return when.resolve(null);
return null
}
},
saveSessions: function(sessions) {
saveSessions: async function(sessions) {
if (sessionsAvailable) {
return storageModule.saveSessions(sessions);
} else {
return when.resolve();
}
},
/* Library Functions */
getLibraryEntry: function(type, path) {
getLibraryEntry: async function(type, path) {
if (is_malicious(path)) {
var err = new Error();
err.code = "forbidden";
return when.reject(err);
throw err;
}
return storageModule.getLibraryEntry(type, path);
},
saveLibraryEntry: function(type, path, meta, body) {
saveLibraryEntry: async function(type, path, meta, body) {
if (is_malicious(path)) {
var err = new Error();
err.code = "forbidden";
return when.reject(err);
throw err;
}
return storageModule.saveLibraryEntry(type, path, meta, body);
},
/* Deprecated functions */
getAllFlows: function() {
getAllFlows: async function() {
if (storageModule.hasOwnProperty("getAllFlows")) {
return storageModule.getAllFlows();
} else {
if (libraryFlowsCachedResult) {
return Promise.resolve(libraryFlowsCachedResult);
return libraryFlowsCachedResult;
} else {
return listFlows("/").then(function(result) {
libraryFlowsCachedResult = result;
@ -175,7 +168,7 @@ var storageModuleInterface = {
if (is_malicious(fn)) {
var err = new Error();
err.code = "forbidden";
return when.reject(err);
throw err;
}
if (storageModule.hasOwnProperty("getFlow")) {
return storageModule.getFlow(fn);
@ -188,7 +181,7 @@ var storageModuleInterface = {
if (is_malicious(fn)) {
var err = new Error();
err.code = "forbidden";
return when.reject(err);
throw err;
}
libraryFlowsCachedResult = null;
if (storageModule.hasOwnProperty("saveFlow")) {
@ -204,40 +197,36 @@ var storageModuleInterface = {
function listFlows(path) {
return storageModule.getLibraryEntry("flows",path).then(function(res) {
return when.promise(function(resolve) {
var promises = [];
res.forEach(function(r) {
if (typeof r === "string") {
promises.push(listFlows(Path.join(path,r)));
} else {
promises.push(when.resolve(r));
}
});
var i=0;
when.settle(promises).then(function(res2) {
var result = {};
res2.forEach(function(r) {
// TODO: name||fn
if (r.value.fn) {
var name = r.value.name;
if (!name) {
name = r.value.fn.replace(/\.json$/, "");
}
result.f = result.f || [];
result.f.push(name);
} else {
result.d = result.d || {};
result.d[res[i]] = r.value;
//console.log(">",r.value);
const promises = [];
res.forEach(function(r) {
if (typeof r === "string") {
promises.push(listFlows(Path.join(path,r)));
} else {
promises.push(Promise.resolve(r));
}
});
return Promise.all(promises).then(res2 => {
let i = 0;
const result = {};
res2.forEach(function(r) {
// TODO: name||fn
if (r.fn) {
var name = r.name;
if (!name) {
name = r.fn.replace(/\.json$/, "");
}
i++;
});
resolve(result);
result.f = result.f || [];
result.f.push(name);
} else {
result.d = result.d || {};
result.d[res[i]] = r;
//console.log(">",r.value);
}
i++;
});
return result;
});
});
}
module.exports = storageModuleInterface;

14
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/library.js vendored
View File

@ -15,9 +15,7 @@
**/
var fs = require('fs-extra');
var when = require('when');
var fspath = require("path");
var nodeFn = require('when/node/function');
var util = require("./util");
@ -90,14 +88,14 @@ function getLibraryEntry(type,path) {
var rootPath = fspath.join(libDir,type,path);
// don't create the folder if it does not exist - we are only reading....
return nodeFn.call(fs.lstat, rootPath).then(function(stats) {
return fs.lstat(rootPath).then(function(stats) {
if (stats.isFile()) {
return getFileBody(root,path);
}
if (path.substr(-1) == '/') {
path = path.substr(0,path.length-1);
}
return nodeFn.call(fs.readdir, rootPath).then(function(fns) {
return fs.readdir(rootPath).then(function(fns) {
var dirs = [];
var files = [];
fns.sort().filter(function(fn) {
@ -143,21 +141,19 @@ function getLibraryEntry(type,path) {
}
module.exports = {
init: function(_settings) {
init: async function(_settings) {
settings = _settings;
libDir = fspath.join(settings.userDir,"lib");
libFlowsDir = fspath.join(libDir,"flows");
if (!settings.readOnly) {
return fs.ensureDir(libFlowsDir);
} else {
return when.resolve();
}
},
getLibraryEntry: getLibraryEntry,
saveLibraryEntry: function(type,path,meta,body) {
saveLibraryEntry: async function(type,path,meta,body) {
if (settings.readOnly) {
return when.resolve();
return;
}
if (type === "flows" && !path.endsWith(".json")) {
path += ".json";

56
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/Project.js vendored
View File

@ -16,7 +16,6 @@
var fs = require('fs-extra');
var when = require('when');
var fspath = require("path");
var os = require('os');
@ -108,12 +107,12 @@ Project.prototype.load = function () {
// package.json isn't valid JSON... is a merge underway?
project.package = {};
}
}));
}).catch(err => {})); //
if (missingFiles.indexOf('README.md') === -1) {
project.paths['README.md'] = fspath.join(project.paths.root,"README.md");
promises.push(fs.readFile(fspath.join(project.path,project.paths['README.md']),"utf8").then(function(content) {
project.description = content;
}));
}).catch(err => {}));
} else {
project.description = "";
}
@ -133,9 +132,9 @@ Project.prototype.load = function () {
// project.paths.credentialsFile = fspath.join(project.path,"flow_cred.json");
// }
promises.push(project.loadRemotes());
promises.push(project.loadRemotes().catch(err => {}));
return when.settle(promises).then(function(results) {
return Promise.all(promises).then(function(results) {
return project;
})
});
@ -239,7 +238,7 @@ Project.prototype.isMerging = function() {
return this.merging;
}
Project.prototype.update = function (user, data) {
Project.prototype.update = async function (user, data) {
var username;
if (!user) {
username = "_";
@ -279,7 +278,7 @@ Project.prototype.update = function (user, data) {
this.credentialSecret !== existingSecret) { // key doesn't match provided existing key
var e = new Error("Cannot change credentialSecret without current key");
e.code = "missing_current_credential_key";
return when.reject(e);
throw e;
}
this.credentialSecret = secret;
@ -292,7 +291,7 @@ Project.prototype.update = function (user, data) {
if (this.missingFiles.indexOf('package.json') !== -1) {
if (!data.files || !data.files.package) {
// Cannot update a project that doesn't have a known package.json
return Promise.reject("Cannot update project with missing package.json");
throw new Error("Cannot update project with missing package.json");
}
}
@ -302,7 +301,7 @@ Project.prototype.update = function (user, data) {
// We have a package file. It could be one that doesn't exist yet,
// or it does exist and we need to load it.
if (!/package\.json$/.test(data.files.package)) {
return Promise.reject("Invalid package file: "+data.files.package)
return new Error("Invalid package file: "+data.files.package)
}
var root = data.files.package.substring(0,data.files.package.length-12);
this.paths.root = root;
@ -391,20 +390,20 @@ Project.prototype.update = function (user, data) {
modifyRemotesPromise = modifyRemotesPromise.then(function() {
return project.loadRemotes();
});
promises.push(modifyRemotesPromise);
promises.push(modifyRemotesPromise.catch(err => {}));
}
}
}
if (saveSettings) {
promises.push(settings.set("projects",globalProjectSettings));
promises.push(settings.set("projects",globalProjectSettings).catch(err => {}));
}
var modifiedFiles = [];
if (saveREADME) {
promises.push(util.writeFile(fspath.join(this.path,this.paths['README.md']), this.description));
promises.push(util.writeFile(fspath.join(this.path,this.paths['README.md']), this.description).catch(err => {}));
modifiedFiles.push('README.md');
}
if (savePackage) {
@ -416,10 +415,10 @@ Project.prototype.update = function (user, data) {
}
this.package = Object.assign(currentPackage,this.package);
return util.writeFile(fspath.join(project.path,this.paths['package.json']), JSON.stringify(this.package,"",4));
}));
}).catch(err => {}));
modifiedFiles.push('package.json');
}
return when.settle(promises).then(function(res) {
return Promise.all(promises).then(function(res) {
var gitSettings = getUserGitSettings(user) || {};
var workflowMode = (gitSettings.workflow||{}).mode || "manual";
if (workflowMode === 'auto') {
@ -944,32 +943,17 @@ function createDefaultProject(user, project) {
}
function checkProjectFiles(project) {
var promises = [];
var paths = [];
var missing = [];
for (var file in defaultFileSet) {
if (defaultFileSet.hasOwnProperty(file)) {
paths.push(file);
promises.push(fs.stat(fspath.join(project.path,project.paths.root,file)));
(function(f) {
promises.push(fs.stat(fspath.join(project.path,project.paths.root,f)).catch(err => {
missing.push(f);
}));
})(file);
}
}
return when.settle(promises).then(function(results) {
var missing = [];
results.forEach(function(result,i) {
if (result.state === 'rejected') {
missing.push(paths[i]);
}
});
return missing;
}).then(function(missing) {
// if (createMissing) {
// var promises = [];
// missing.forEach(function(file) {
// promises.push(util.writeFile(fspath.join(projectPath,file),defaultFileSet[file](project)));
// });
// return promises;
// } else {
return missing;
// }
});
return Promise.all(promises).then(() => missing);
}
function createProject(user, metadata) {
var username;

23
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js vendored
View File

@ -15,9 +15,7 @@
**/
var fs = require('fs-extra');
var when = require('when');
var fspath = require("path");
var nodeFn = require('when/node/function');
var crypto = require('crypto');
var storageSettings = require("../settings");
@ -223,7 +221,6 @@ function loadProject(name) {
function getProject(user, name) {
checkActiveProject(name);
//return when.resolve(activeProject.info);
return Promise.resolve(activeProject.export());
}
@ -495,7 +492,7 @@ var flowsFileBackup;
var credentialsFile;
var credentialsFileBackup;
function getFlows() {
async function getFlows() {
if (!initialFlowLoadComplete) {
initialFlowLoadComplete = true;
log.info(log._("storage.localfilesystem.user-dir",{path:settings.userDir}));
@ -522,25 +519,25 @@ function getFlows() {
log.warn("Project repository is empty");
error = new Error("Project repository is empty");
error.code = "project_empty";
return when.reject(error);
throw error;
}
if (activeProject.missingFiles && activeProject.missingFiles.indexOf('package.json') !== -1) {
log.warn("Project missing package.json");
error = new Error("Project missing package.json");
error.code = "missing_package_file";
return when.reject(error);
throw error;
}
if (!activeProject.getFlowFile()) {
log.warn("Project has no flow file");
error = new Error("Project has no flow file");
error.code = "missing_flow_file";
return when.reject(error);
throw error;
}
if (activeProject.isMerging()) {
log.warn("Project has unmerged changes");
error = new Error("Project has unmerged changes. Cannot load flows");
error.code = "git_merge_conflict";
return when.reject(error);
throw error;
}
}
@ -554,14 +551,14 @@ function getFlows() {
});
}
function saveFlows(flows, user) {
async function saveFlows(flows, user) {
if (settings.readOnly) {
return when.resolve();
return
}
if (activeProject && activeProject.isMerging()) {
var error = new Error("Project has unmerged changes. Cannot deploy new flows");
error.code = "git_merge_conflict";
return when.reject(error);
throw error;
}
flowsFileExists = true;
@ -589,9 +586,9 @@ function getCredentials() {
return util.readFile(credentialsFile,credentialsFileBackup,{},'credentials');
}
function saveCredentials(credentials) {
async function saveCredentials(credentials) {
if (settings.readOnly) {
return when.resolve();
return;
}
var credentialData;

1
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/ssh/index.js vendored
View File

@ -15,7 +15,6 @@
**/
var fs = require('fs-extra');
var when = require('when');
var fspath = require("path");
var keygen = require("./keygen");

9
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/sessions.js vendored
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require('when');
var fs = require('fs-extra');
var fspath = require("path");
@ -30,8 +29,8 @@ module.exports = {
settings = _settings;
sessionsFile = fspath.join(settings.userDir,".sessions.json");
},
getSessions: function() {
return when.promise(function(resolve,reject) {
getSessions: async function() {
return new Promise(function(resolve,reject) {
fs.readFile(sessionsFile,'utf8',function(err,data){
if (!err) {
try {
@ -44,9 +43,9 @@ module.exports = {
})
});
},
saveSessions: function(sessions) {
saveSessions: async function(sessions) {
if (settings.readOnly) {
return when.resolve();
return;
}
return util.writeFile(sessionsFile,JSON.stringify(sessions));
}

3
packages/node_modules/@node-red/runtime/package.json vendored
View File

@ -22,7 +22,6 @@
"clone": "2.1.2",
"express": "4.17.1",
"fs-extra": "8.1.0",
"json-stringify-safe": "5.0.1",
"when": "3.7.8"
"json-stringify-safe": "5.0.1"
}
}

9
packages/node_modules/@node-red/util/lib/i18n.js vendored
View File

@ -22,7 +22,6 @@
var i18n = require("i18next");
var when = require("when");
var path = require("path");
var fs = require("fs");
@ -38,16 +37,16 @@ var initPromise;
*/
function registerMessageCatalogs(catalogs) {
var promises = catalogs.map(function(catalog) {
return registerMessageCatalog(catalog.namespace,catalog.dir,catalog.file);
return registerMessageCatalog(catalog.namespace,catalog.dir,catalog.file).catch(err => {});
});
return when.settle(promises);
return Promise.all(promises);
}
/**
* Register a message catalog with i18n.
* @memberof @node-red/util_i18n
*/
function registerMessageCatalog(namespace,dir,file) {
async function registerMessageCatalog(namespace,dir,file) {
return initPromise.then(function() {
return new Promise((resolve,reject) => {
resourceMap[namespace] = { basedir:dir, file:file, lngs: []};
@ -147,7 +146,7 @@ function init() {
if (!initPromise) {
// Keep this as a 'when' promise as top-level red.js uses 'otherwise'
// and embedded users of NR may have copied that.
initPromise = when.promise((resolve,reject) => {
initPromise = new Promise((resolve,reject) => {
i18n.use(MessageFileLoader);
var opt = {
// debug: true,

3
packages/node_modules/@node-red/util/package.json vendored
View File

@ -20,7 +20,6 @@
"json-stringify-safe": "5.0.1",
"jsonata": "1.8.4",
"lodash.clonedeep": "^4.5.0",
"moment-timezone": "0.5.32",
"when": "3.7.8"
"moment-timezone": "0.5.32"
}
}

23
packages/node_modules/node-red/lib/red.js vendored
View File

@ -92,11 +92,32 @@ module.exports = {
* @memberof node-red
*/
start: function() {
return runtime.start().then(function() {
// The top level red.js has always used 'otherwise' on the promise returned
// here. This is a non-standard promise function coming from our early use
// of the when.js library.
// We want to remove all dependency on when.js as native Promises now exist.
// But we have the issue that some embedders of Node-RED may have copied our
// top-level red.js a bit too much.
//
let startPromise = runtime.start().then(function() {
if (apiEnabled) {
return api.start();
}
});
startPromise._then = startPromise.then;
startPromise.then = function(resolve,reject) {
var inner = startPromise._then(resolve,reject);
inner.otherwise = function(cb) {
redUtil.log.error("**********************************************");
redUtil.log.error("* Deprecated call to RED.start().otherwise() *");
redUtil.log.error("* This will be removed in Node-RED 2.x *");
redUtil.log.error("* Use RED.start().catch() instead *")
redUtil.log.error("**********************************************");
return inner.catch(cb);
}
return inner;
}
return startPromise;
},
/**
* Stop the Node-RED application.

3
packages/node_modules/node-red/red.js vendored
View File

@ -429,7 +429,7 @@ httpsPromise.then(function(startupHttps) {
} else {
RED.log.info(RED.log._("server.headless-mode"));
}
}).otherwise(function(err) {
}).catch(function(err) {
RED.log.error(RED.log._("server.failed-to-start"));
if (err.stack) {
RED.log.error(err.stack);
@ -468,4 +468,5 @@ httpsPromise.then(function(startupHttps) {
}).catch(function(err) {
console.log("Failed to get https settings: " + err);
console.log(err.stack)
});

1
test/nodes/core/network/21-httprequest_spec.js
View File

@ -14,7 +14,6 @@
* limitations under the License.
**/
var when = require("when");
var http = require("http");
var https = require("https");
var should = require("should");

41
test/nodes/core/network/22-websocket_spec.js
View File

@ -15,7 +15,6 @@
**/
var ws = require("ws");
var when = require("when");
var should = require("should");
var helper = require("node-red-node-test-helper");
var websocketNode = require("nr-test-utils").require("@node-red/nodes/core/network/22-websocket.js");
@ -27,7 +26,7 @@ function getWsUrl(path) {
}
function createClient(listenerid) {
return when.promise(function(resolve, reject) {
return new Promise(function(resolve, reject) {
var node = helper.getNode(listenerid);
var url = getWsUrl(node.path);
var sock = new ws(url);
@ -300,23 +299,33 @@ describe('websocket Node', function() {
{ id: "n2", type: "websocket out", server: "n1" },
{ id: "n3", type: "helper", wires: [["n2"]] }];
helper.load(websocketNode, flow, function() {
var def1 = when.defer(),
def2 = when.defer();
when.all([createClient("n1"), createClient("n1")]).then(function(socks) {
socks[0].on("message", function(msg, flags) {
msg.should.equal("hello");
def1.resolve();
});
socks[1].on("message", function(msg, flags) {
msg.should.equal("hello");
def2.resolve();
});
Promise.all([createClient("n1"), createClient("n1")]).then(function(socks) {
var promises = [
new Promise((resolve,reject) => {
socks[0].on("message", function(msg, flags) {
try {
msg.should.equal("hello");
resolve();
} catch(err) {
reject(err);
}
});
}),
new Promise((resolve,reject) => {
socks[1].on("message", function(msg, flags) {
try {
msg.should.equal("hello");
resolve();
} catch(err) {
reject(err);
}
});
})
];
helper.getNode("n3").send({
payload: "hello"
});
return when.all([def1.promise, def2.promise]).then(function() {
done();
});
return Promise.all(promises).then(() => {done()});
}).catch(function(err) {
done(err);
});

1
test/unit/@node-red/editor-api/lib/admin/flow_spec.js
View File

@ -19,7 +19,6 @@ var request = require('supertest');
var express = require('express');
var bodyParser = require('body-parser');
var sinon = require('sinon');
var when = require('when');
var NR_TEST_UTILS = require("nr-test-utils");

1
test/unit/@node-red/editor-api/lib/admin/nodes_spec.js
View File

@ -19,7 +19,6 @@ var request = require('supertest');
var express = require('express');
var bodyParser = require('body-parser');
var sinon = require('sinon');
var when = require('when');
var NR_TEST_UTILS = require("nr-test-utils");

3
test/unit/@node-red/editor-api/lib/auth/index_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require("when");
var sinon = require("sinon");
var passport = require("passport");
@ -60,7 +59,7 @@ describe("api/auth/index",function() {
describe("revoke", function() {
it("revokes a token", function(done) {
var revokeToken = sinon.stub(Tokens,"revoke",function() {
return when.resolve();
return Promise.resolve();
});
var req = { body: { token: "abcdef" } };

37
test/unit/@node-red/editor-api/lib/auth/strategies_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require('when');
var sinon = require('sinon');
var NR_TEST_UTILS = require("nr-test-utils");
@ -37,7 +36,7 @@ describe("api/auth/strategies", function() {
it('Handles authentication failure',function(done) {
userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
return when.resolve(null);
return Promise.resolve(null);
});
strategies.passwordTokenExchange({},"user","password","scope",function(err,token) {
@ -53,7 +52,7 @@ describe("api/auth/strategies", function() {
it('Handles scope overreach',function(done) {
userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
return when.resolve({username:"user",permissions:"read"});
return Promise.resolve({username:"user",permissions:"read"});
});
strategies.passwordTokenExchange({},"user","password","*",function(err,token) {
@ -69,14 +68,14 @@ describe("api/auth/strategies", function() {
it('Creates new token on authentication success',function(done) {
userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
return when.resolve({username:"user",permissions:"*"});
return Promise.resolve({username:"user",permissions:"*"});
});
var tokenDetails = {};
var tokenCreate = sinon.stub(Tokens,"create",function(username,client,scope) {
tokenDetails.username = username;
tokenDetails.client = client;
tokenDetails.scope = scope;
return when.resolve({accessToken: "123456"});
return Promise.resolve({accessToken: "123456"});
});
strategies.passwordTokenExchange({id:"myclient"},"user","password","read",function(err,token) {
@ -100,7 +99,7 @@ describe("api/auth/strategies", function() {
describe("Anonymous Strategy", function() {
it('Succeeds if anon user enabled',function(done) {
var userDefault = sinon.stub(Users,"default",function() {
return when.resolve("anon");
return Promise.resolve("anon");
});
strategies.anonymousStrategy._success = strategies.anonymousStrategy.success;
strategies.anonymousStrategy.success = function(user) {
@ -113,7 +112,7 @@ describe("api/auth/strategies", function() {
});
it('Fails if anon user not enabled',function(done) {
var userDefault = sinon.stub(Users,"default",function() {
return when.resolve(null);
return Promise.resolve(null);
});
strategies.anonymousStrategy._fail = strategies.anonymousStrategy.fail;
strategies.anonymousStrategy.fail = function(err) {
@ -132,7 +131,7 @@ describe("api/auth/strategies", function() {
describe("Tokens Strategy", function() {
it('Succeeds if tokens user enabled custom header',function(done) {
var userTokens = sinon.stub(Users,"tokens",function(token) {
return when.resolve("tokens-"+token);
return Promise.resolve("tokens-"+token);
});
var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
return "x-test-token";
@ -148,7 +147,7 @@ describe("api/auth/strategies", function() {
});
it('Succeeds if tokens user enabled default header',function(done) {
var userTokens = sinon.stub(Users,"tokens",function(token) {
return when.resolve("tokens-"+token);
return Promise.resolve("tokens-"+token);
});
var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
return "authorization";
@ -164,7 +163,7 @@ describe("api/auth/strategies", function() {
});
it('Fails if tokens user not enabled',function(done) {
var userTokens = sinon.stub(Users,"tokens",function() {
return when.resolve(null);
return Promise.resolve(null);
});
var userTokenHeader = sinon.stub(Users,"tokenHeader",function(token) {
return "authorization";
@ -187,7 +186,7 @@ describe("api/auth/strategies", function() {
describe("Bearer Strategy", function() {
it('Rejects invalid token',function(done) {
var getToken = sinon.stub(Tokens,"get",function(token) {
return when.resolve(null);
return Promise.resolve(null);
});
strategies.bearerStrategy("1234",function(err,user) {
@ -204,10 +203,10 @@ describe("api/auth/strategies", function() {
});
it('Accepts valid token',function(done) {
var getToken = sinon.stub(Tokens,"get",function(token) {
return when.resolve({user:"user",scope:"scope"});
return Promise.resolve({user:"user",scope:"scope"});
});
var getUser = sinon.stub(Users,"get",function(username) {
return when.resolve("aUser");
return Promise.resolve("aUser");
});
strategies.bearerStrategy("1234",function(err,user,opts) {
@ -226,10 +225,10 @@ describe("api/auth/strategies", function() {
});
it('Fail if no user for token',function(done) {
var getToken = sinon.stub(Tokens,"get",function(token) {
return when.resolve({user:"user",scope:"scope"});
return Promise.resolve({user:"user",scope:"scope"});
});
var getUser = sinon.stub(Users,"get",function(username) {
return when.resolve(null);
return Promise.resolve(null);
});
strategies.bearerStrategy("1234",function(err,user,opts) {
@ -252,7 +251,7 @@ describe("api/auth/strategies", function() {
it('Accepts valid client',function(done) {
var testClient = {id:"node-red-editor",secret:"not_available"};
var getClient = sinon.stub(Clients,"get",function(client) {
return when.resolve(testClient);
return Promise.resolve(testClient);
});
strategies.clientPasswordStrategy(testClient.id,testClient.secret,function(err,client) {
@ -270,7 +269,7 @@ describe("api/auth/strategies", function() {
it('Rejects invalid client secret',function(done) {
var testClient = {id:"node-red-editor",secret:"not_available"};
var getClient = sinon.stub(Clients,"get",function(client) {
return when.resolve(testClient);
return Promise.resolve(testClient);
});
strategies.clientPasswordStrategy(testClient.id,"invalid_secret",function(err,client) {
@ -287,7 +286,7 @@ describe("api/auth/strategies", function() {
});
it('Rejects invalid client id',function(done) {
var getClient = sinon.stub(Clients,"get",function(client) {
return when.resolve(null);
return Promise.resolve(null);
});
strategies.clientPasswordStrategy("invalid_id","invalid_secret",function(err,client) {
try {
@ -305,7 +304,7 @@ describe("api/auth/strategies", function() {
var userAuthentication;
it('Blocks after 5 failures',function(done) {
userAuthentication = sinon.stub(Users,"authenticate",function(username,password) {
return when.resolve(null);
return Promise.resolve(null);
});
for (var z=0; z<5; z++) {
strategies.passwordTokenExchange({},"user","badpassword","scope",function(err,token) {

21
test/unit/@node-red/editor-api/lib/auth/tokens_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require("when");
var sinon = require("sinon");
var NR_TEST_UTILS = require("nr-test-utils");
@ -35,7 +34,7 @@ describe("api/auth/tokens", function() {
it('returns a valid token', function(done) {
Tokens.init({},{
getSessions:function() {
return when.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
return Promise.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
}
}).then(function() {
Tokens.get("1234").then(function(token) {
@ -52,7 +51,7 @@ describe("api/auth/tokens", function() {
it('returns null for an invalid token', function(done) {
Tokens.init({},{
getSessions:function() {
return when.resolve({});
return Promise.resolve({});
}
}).then(function() {
Tokens.get("1234").then(function(token) {
@ -66,11 +65,11 @@ describe("api/auth/tokens", function() {
});
});
it('returns null for an expired token', function(done) {
var saveSessions = sinon.stub().returns(when.resolve());
var saveSessions = sinon.stub().returns(Promise.resolve());
var expiryTime = Date.now()+50;
Tokens.init({},{
getSessions:function() {
return when.resolve({"1234":{"user":"fred","expires":expiryTime}});
return Promise.resolve({"1234":{"user":"fred","expires":expiryTime}});
},
saveSessions: saveSessions
}).then(function() {
@ -100,10 +99,10 @@ describe("api/auth/tokens", function() {
tokens: [{
token: "1234",
user: "fred",
}]
}]
},{
getSessions:function() {
return when.resolve({});
return Promise.resolve({});
}
}).then(function() {
Tokens.get("1234").then(function(token) {
@ -124,11 +123,11 @@ describe("api/auth/tokens", function() {
var savedSession;
Tokens.init({sessionExpiryTime: 10},{
getSessions:function() {
return when.resolve({});
return Promise.resolve({});
},
saveSessions:function(sess) {
savedSession = sess;
return when.resolve();
return Promise.resolve();
}
});
var expectedExpiryTime = Date.now()+10000;
@ -159,11 +158,11 @@ describe("api/auth/tokens", function() {
var savedSession;
Tokens.init({},{
getSessions:function() {
return when.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
return Promise.resolve({"1234":{"user":"fred","expires":Date.now()+1000}});
},
saveSessions:function(sess) {
savedSession = sess;
return when.resolve();
return Promise.resolve();
}
}).then(function() {
Tokens.revoke("1234").then(function() {

5
test/unit/@node-red/editor-api/lib/auth/users_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require('when');
var sinon = require('sinon');
var NR_TEST_UTILS = require("nr-test-utils");
@ -144,12 +143,12 @@ describe("api/auth/users", function() {
Users.init({
type:"credentials",
users:function(username) {
return when.resolve({'username':'dave','permissions':'read'});
return Promise.resolve({'username':'dave','permissions':'read'});
},
authenticate: function(username,password) {
authUsername = username;
authPassword = password;
return when.resolve({'username':'pete','permissions':'write'});
return Promise.resolve({'username':'pete','permissions':'write'});
}
});
});

29
test/unit/@node-red/editor-api/lib/editor/comms_spec.js
View File

@ -18,7 +18,6 @@ var should = require("should");
var sinon = require("sinon");
const stoppable = require('stoppable');
var when = require("when");
var http = require('http');
var express = require('express');
var app = express();
@ -59,7 +58,7 @@ describe("api/editor/comms", function() {
var url;
var port;
before(function(done) {
sinon.stub(Users,"default",function() { return when.resolve(null);});
sinon.stub(Users,"default",function() { return Promise.resolve(null);});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {}, {comms: mockComms});
server.listen(listenPort, address);
@ -165,7 +164,7 @@ describe("api/editor/comms", function() {
var url;
var port;
before(function(done) {
sinon.stub(Users,"default",function() { return when.resolve(null);});
sinon.stub(Users,"default",function() { return Promise.resolve(null);});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {httpAdminRoot:"/adminPath"}, {comms: mockComms});
server.listen(listenPort, address);
@ -203,7 +202,7 @@ describe("api/editor/comms", function() {
var url;
var port;
before(function(done) {
sinon.stub(Users,"default",function() { return when.resolve(null);});
sinon.stub(Users,"default",function() { return Promise.resolve(null);});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {httpAdminRoot:"/adminPath/"}, {comms: mockComms});
server.listen(listenPort, address);
@ -241,7 +240,7 @@ describe("api/editor/comms", function() {
var url;
var port;
before(function(done) {
sinon.stub(Users,"default",function() { return when.resolve(null);});
sinon.stub(Users,"default",function() { return Promise.resolve(null);});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {httpAdminRoot:"adminPath"}, {comms: mockComms});
server.listen(listenPort, address);
@ -279,7 +278,7 @@ describe("api/editor/comms", function() {
var url;
var port;
before(function(done) {
sinon.stub(Users,"default",function() { return when.resolve(null);});
sinon.stub(Users,"default",function() { return Promise.resolve(null);});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {webSocketKeepAliveTime: 100}, {comms: mockComms});
server.listen(listenPort, address);
@ -345,28 +344,28 @@ describe("api/editor/comms", function() {
var getToken;
var getUserToken;
before(function(done) {
getDefaultUser = sinon.stub(Users,"default",function() { return when.resolve(null);});
getDefaultUser = sinon.stub(Users,"default",function() { return Promise.resolve(null);});
getUser = sinon.stub(Users,"get", function(username) {
if (username == "fred") {
return when.resolve({permissions:"read"});
return Promise.resolve({permissions:"read"});
} else {
return when.resolve(null);
return Promise.resolve(null);
}
});
getUserToken = sinon.stub(Users,"tokens", function(token) {
if (token == "abcde") {
return when.resolve({user:"wilma", permissions:"*"})
return Promise.resolve({user:"wilma", permissions:"*"})
} else {
return when.resolve(null);
return Promise.resolve(null);
}
});
getToken = sinon.stub(Tokens,"get",function(token) {
if (token == "1234") {
return when.resolve({user:"fred",scope:["*"]});
return Promise.resolve({user:"fred",scope:["*"]});
} else if (token == "5678") {
return when.resolve({user:"barney",scope:["*"]});
return Promise.resolve({user:"barney",scope:["*"]});
} else {
return when.resolve(null);
return Promise.resolve(null);
}
});
@ -484,7 +483,7 @@ describe("api/editor/comms", function() {
var port;
var getDefaultUser;
before(function(done) {
getDefaultUser = sinon.stub(Users,"default",function() { return when.resolve({permissions:"read"});});
getDefaultUser = sinon.stub(Users,"default",function() { return Promise.resolve({permissions:"read"});});
server = stoppable(http.createServer(function(req,res){app(req,res)}));
comms.init(server, {adminAuth:{}}, {comms: mockComms});
server.listen(listenPort, address);

1
test/unit/@node-red/editor-api/lib/editor/credentials_spec.js
View File

@ -18,7 +18,6 @@ var should = require("should");
var request = require('supertest');
var express = require('express');
var sinon = require('sinon');
var when = require('when');
var NR_TEST_UTILS = require("nr-test-utils");

4
test/unit/@node-red/editor-api/lib/editor/index_spec.js
View File

@ -28,10 +28,6 @@ var auth = NR_TEST_UTILS.require("@node-red/editor-api/lib/auth");
var log = NR_TEST_UTILS.require("@node-red/util").log;
var when = require("when");
describe("api/editor/index", function() {
var app;
describe("disabled the editor", function() {

1
test/unit/@node-red/editor-api/lib/editor/theme_spec.js
View File

@ -17,7 +17,6 @@
var should = require("should");
var express = require('express');
var sinon = require('sinon');
var when = require('when');
var fs = require("fs");
var app = express();

1
test/unit/@node-red/editor-api/lib/index_spec.js
View File

@ -18,7 +18,6 @@ var should = require("should");
var sinon = require("sinon");
var request = require("supertest");
var express = require("express");
var when = require("when");
var fs = require("fs");
var path = require("path");

11
test/unit/@node-red/registry/lib/index_spec.js
View File

@ -17,7 +17,6 @@
var should = require("should");
var sinon = require("sinon");
var path = require("path");
var when = require("when");
var fs = require("fs");
var NR_TEST_UTILS = require("nr-test-utils");
@ -51,7 +50,7 @@ describe('red/registry/index', function() {
describe('#addModule', function() {
it('loads the module and returns its info', function(done) {
stubs.push(sinon.stub(loader,"addModule",function(module) {
return when.resolve();
return Promise.resolve();
}));
stubs.push(sinon.stub(typeRegistry,"getModuleInfo", function(module) {
return "info";
@ -63,7 +62,7 @@ describe('red/registry/index', function() {
});
it('rejects if loader rejects', function(done) {
stubs.push(sinon.stub(loader,"addModule",function(module) {
return when.reject("error");
return Promise.reject("error");
}));
stubs.push(sinon.stub(typeRegistry,"getModuleInfo", function(module) {
return "info";
@ -80,7 +79,7 @@ describe('red/registry/index', function() {
describe('#enableNode',function() {
it('enables a node set',function(done) {
stubs.push(sinon.stub(typeRegistry,"enableNodeSet",function() {
return when.resolve();
return Promise.resolve();
}));
stubs.push(sinon.stub(typeRegistry,"getNodeInfo", function() {
return {id:"node-set",loaded:true};
@ -104,14 +103,14 @@ describe('red/registry/index', function() {
it('triggers a node load',function(done) {
stubs.push(sinon.stub(typeRegistry,"enableNodeSet",function() {
return when.resolve();
return Promise.resolve();
}));
var calls = 0;
stubs.push(sinon.stub(typeRegistry,"getNodeInfo", function() {
// loaded=false on first call, true on subsequent
return {id:"node-set",loaded:(calls++>0)};
}));
stubs.push(sinon.stub(loader,"loadNodeSet",function(){return when.resolve();}));
stubs.push(sinon.stub(loader,"loadNodeSet",function(){return Promise.resolve();}));
stubs.push(sinon.stub(typeRegistry,"getFullNodeInfo"));
registry.enableNode("node-set").then(function(ns) {

22
test/unit/@node-red/registry/lib/installer_spec.js
View File

@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var path = require("path");
var fs = require('fs-extra');
var EventEmitter = require('events');
@ -185,7 +184,7 @@ describe('nodes/registry/installer', function() {
initInstaller(p)
var addModule = sinon.stub(registry,"addModule",function(md) {
return when.resolve(nodeInfo);
return Promise.resolve(nodeInfo);
});
installer.installModule("this_wont_exist").then(function(info) {
@ -216,7 +215,7 @@ describe('nodes/registry/installer', function() {
it("succeeds when path is valid node-red module", function(done) {
var nodeInfo = {nodes:{module:"foo",types:["a"]}};
var addModule = sinon.stub(registry,"addModule",function(md) {
return when.resolve(nodeInfo);
return Promise.resolve(nodeInfo);
});
var resourcesDir = path.resolve(path.join(__dirname,"resources","local","TestNodeModule","node_modules","TestNodeModule"));
@ -246,7 +245,7 @@ describe('nodes/registry/installer', function() {
initInstaller(p)
var addModule = sinon.stub(registry,"addModule",function(md) {
return when.resolve(nodeInfo);
return Promise.resolve(nodeInfo);
});
installer.installModule("this_wont_exist",null,"https://example/foo-0.1.1.tgz").then(function(info) {
@ -259,19 +258,20 @@ describe('nodes/registry/installer', function() {
describe("uninstalls module", function() {
it("rejects invalid module names", function(done) {
var promises = [];
promises.push(installer.uninstallModule("this_wont_exist "));
promises.push(installer.uninstallModule("this_wont_exist;no_it_really_wont"));
when.settle(promises).then(function(results) {
results[0].state.should.be.eql("rejected");
results[1].state.should.be.eql("rejected");
var rejectedCount = 0;
promises.push(installer.uninstallModule("this_wont_exist ").catch(() => {rejectedCount++}));
promises.push(installer.uninstallModule("this_wont_exist;no_it_really_wont").catch(() => {rejectedCount++}));
Promise.all(promises).then(function() {
rejectedCount.should.eql(2);
done();
});
}).catch(done);
});
it("rejects with generic error", function(done) {
var nodeInfo = [{module:"foo",types:["a"]}];
var removeModule = sinon.stub(registry,"removeModule",function(md) {
return when.resolve(nodeInfo);
return Promise.resolve(nodeInfo);
});
var res = {
code: 1,

1
test/unit/@node-red/registry/lib/loader_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require("when");
var sinon = require("sinon");
var path = require("path");
var fs = require("fs-extra");

1
test/unit/@node-red/registry/lib/localfilesystem_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require("when");
var sinon = require("sinon");
var path = require("path");

5
test/unit/@node-red/registry/lib/registry_spec.js
View File

@ -15,7 +15,6 @@
**/
var should = require("should");
var when = require("when");
var sinon = require("sinon");
var path = require("path");
@ -34,7 +33,7 @@ describe("red/nodes/registry/registry",function() {
function stubSettings(s,available,initialConfig) {
s.available = function() {return available;};
s.set = sinon.spy(function(s,v) { return when.resolve();});
s.set = sinon.spy(function(s,v) { return Promise.resolve();});
s.get = function(s) { return initialConfig;};
return s;
}
@ -95,7 +94,7 @@ describe("red/nodes/registry/registry",function() {
it('migrates legacy format', function(done) {
var legacySettings = {
available: function() { return true; },
set: sinon.stub().returns(when.resolve()),
set: sinon.stub().returns(Promise.resolve()),
get: function() { return {
"123": {
"name": "72-sentiment.js",

3
test/unit/@node-red/registry/lib/resources/local/TestNode2/TestNode2.js
View File

@ -1,8 +1,7 @@
// A test node that exports a function which returns a resolving promise
var when = require("when");
module.exports = function(RED) {
return when.promise(function(resolve,reject) {
return new Promise(function(resolve,reject) {
function TestNode(n) {}
RED.nodes.registerType("test-node-2",TestNode);
resolve();

3
test/unit/@node-red/registry/lib/resources/local/TestNode3/TestNode3.js
View File

@ -1,8 +1,7 @@
// A test node that exports a function which returns a rejecting promise
var when = require("when");
module.exports = function(RED) {
return when.promise(function(resolve,reject) {
return new Promise(function(resolve,reject) {
reject("fail");
});
}

41
test/unit/@node-red/runtime/lib/api/nodes_spec.js
View File

@ -185,7 +185,6 @@ var request = require('supertest');
var express = require('express');
var bodyParser = require('body-parser');
var sinon = require('sinon');
var when = require('when');
var nodes = require("../../../../red/api/admin/nodes");
var apiUtil = require("../../../../red/api/util");
@ -418,7 +417,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return null; },
installModule: function() {
return when.resolve({
return Promise.resolve({
name:"foo",
nodes:[{id:"123"}]
});
@ -446,7 +445,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:{id:"123"}}; },
installModule: function() {
return when.resolve({id:"123"});
return Promise.resolve({id:"123"});
}
}
});
@ -468,7 +467,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return null },
installModule: function() {
return when.reject(new Error("test error"));
return Promise.reject(new Error("test error"));
}
}
});
@ -492,7 +491,7 @@ describe("api/admin/nodes", function() {
installModule: function() {
var err = new Error("test error");
err.code = 404;
return when.reject(err);
return Promise.reject(err);
}
}
});
@ -533,7 +532,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
getNodeInfo: function() { return null },
uninstallModule: function() { return when.resolve({id:"123"});}
uninstallModule: function() { return Promise.resolve({id:"123"});}
}
});
request(app)
@ -572,7 +571,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
getNodeInfo: function() { return null },
uninstallModule: function() { return when.reject(new Error("test error"));}
uninstallModule: function() { return Promise.reject(new Error("test error"));}
}
});
request(app)
@ -686,7 +685,7 @@ describe("api/admin/nodes", function() {
settings:{available:function(){return true}},
nodes:{
getNodeInfo: function() { return {id:"123",enabled: false} },
enableNode: function() { return when.resolve({id:"123",enabled: true,types:['a']}); }
enableNode: function() { return Promise.resolve({id:"123",enabled: true,types:['a']}); }
}
});
request(app)
@ -709,7 +708,7 @@ describe("api/admin/nodes", function() {
settings:{available:function(){return true}},
nodes:{
getNodeInfo: function() { return {id:"123",enabled: true} },
disableNode: function() { return when.resolve({id:"123",enabled: false,types:['a']}); }
disableNode: function() { return Promise.resolve({id:"123",enabled: false,types:['a']}); }
}
});
request(app)
@ -729,8 +728,8 @@ describe("api/admin/nodes", function() {
describe('no-ops if already in the right state', function() {
function run(state,done) {
var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
initNodes({
settings:{available:function(){return true}},
@ -768,8 +767,8 @@ describe("api/admin/nodes", function() {
describe('does not no-op if err on node', function() {
function run(state,done) {
var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
initNodes({
settings:{available:function(){return true}},
@ -811,11 +810,11 @@ describe("api/admin/nodes", function() {
var enableNode = sinon.stub();
enableNode.onFirstCall().returns((function() {
n1.enabled = true;
return when.resolve(n1);
return Promise.resolve(n1);
})());
enableNode.onSecondCall().returns((function() {
n2.enabled = true;
return when.resolve(n2);
return Promise.resolve(n2);
})());
enableNode.returns(null);
initNodes({
@ -849,11 +848,11 @@ describe("api/admin/nodes", function() {
var disableNode = sinon.stub();
disableNode.onFirstCall().returns((function() {
n1.enabled = false;
return when.resolve(n1);
return Promise.resolve(n1);
})());
disableNode.onSecondCall().returns((function() {
n2.enabled = false;
return when.resolve(n2);
return Promise.resolve(n2);
})());
disableNode.returns(null);
initNodes({
@ -886,11 +885,11 @@ describe("api/admin/nodes", function() {
var node = {id:"123",enabled:state,types:['a']};
var enableNode = sinon.spy(function(id) {
node.enabled = true;
return when.resolve(node);
return Promise.resolve(node);
});
var disableNode = sinon.spy(function(id) {
node.enabled = false;
return when.resolve(node);
return Promise.resolve(node);
});
initNodes({
@ -933,11 +932,11 @@ describe("api/admin/nodes", function() {
var node = {id:"123",enabled:state,types:['a'],err:"foo"};
var enableNode = sinon.spy(function(id) {
node.enabled = true;
return when.resolve(node);
return Promise.resolve(node);
});
var disableNode = sinon.spy(function(id) {
node.enabled = false;
return when.resolve(node);
return Promise.resolve(node);
});
initNodes({

5
test/unit/@node-red/runtime/lib/api/settings_spec.js
View File

@ -588,7 +588,6 @@ var comms = require("../../../../red/api/editor/comms");
var info = require("../../../../red/api/editor/settings");
var auth = require("../../../../red/api/auth");
var sshkeys = require("../../../../red/api/editor/sshkeys");
var when = require("when");
var bodyParser = require("body-parser");
var fs = require("fs-extra");
var fspath = require("path");
@ -611,11 +610,11 @@ describe("api/editor/sshkeys", function() {
exportNodeSettings:function(){},
storage: {
getSessions: function(){
return when.resolve(session_data);
return Promise.resolve(session_data);
},
setSessions: function(_session) {
session_data = _session;
return when.resolve();
return Promise.resolve();
}
}
},

41
test/unit/@node-red/runtime/lib/flows/index_spec.js
View File

@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var clone = require("clone");
var NR_TEST_UTILS = require("nr-test-utils");
@ -65,13 +64,13 @@ describe('flows/index', function() {
conf.forEach(function(n) {
delete n.credentials;
});
return when.resolve();
return Promise.resolve();
});
credentialsLoad = sinon.stub(credentials,"load",function(creds) {
if (creds && creds.hasOwnProperty("$") && creds['$'] === "fail") {
return when.reject("creds error");
return Promise.reject("creds error");
}
return when.resolve();
return Promise.resolve();
});
flowCreate = sinon.stub(Flow,"create",function(parent, global, flow) {
var id;
@ -101,7 +100,7 @@ describe('flows/index', function() {
storage = {
saveFlows: function(conf) {
storage.conf = conf;
return when.resolve();
return Promise.resolve();
}
}
});
@ -145,10 +144,10 @@ describe('flows/index', function() {
var loadStorage = {
saveFlows: function(conf) {
loadStorage.conf = conf;
return when.resolve(456);
return Promise.resolve(456);
},
getFlows: function() {
return when.resolve({flows:originalConfig,rev:123})
return Promise.resolve({flows:originalConfig,rev:123})
}
}
flows.init({log:mockLog, settings:{},storage:loadStorage});
@ -207,7 +206,7 @@ describe('flows/index', function() {
newConfig.push({id:"t2",type:"tab"});
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
flows.setFlows(newConfig,"nodes").then(function() {
@ -235,7 +234,7 @@ describe('flows/index', function() {
newConfig.push({id:"t2",type:"tab"});
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
@ -277,7 +276,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@ -297,7 +296,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
@ -317,7 +316,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
@ -336,7 +335,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@ -370,7 +369,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@ -394,7 +393,7 @@ describe('flows/index', function() {
// {id:"t1",type:"tab"}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@ -419,7 +418,7 @@ describe('flows/index', function() {
// {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@ -447,7 +446,7 @@ describe('flows/index', function() {
// {id:"t1",type:"tab"}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@ -473,7 +472,7 @@ describe('flows/index', function() {
// {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@ -548,7 +547,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@ -572,10 +571,10 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
storage.setFlows = function() {
return when.resolve();
return Promise.resolve();
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {

1
test/unit/@node-red/runtime/lib/flows/util_spec.js
View File

@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var clone = require("clone");
var NR_TEST_UTILS = require("nr-test-utils");
var flowUtil = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/util");

5
test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
View File

@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var util = require("util");
var NR_TEST_UTILS = require("nr-test-utils");
@ -228,11 +227,11 @@ describe('red/runtime/nodes/credentials', function() {
},
set: function(key,value) {
settings[key] = value;
return when.resolve();
return Promise.resolve();
},
delete: function(key) {
delete settings[key];
return when.resolve();
return Promise.resolve();
}
}
}

11
test/unit/@node-red/runtime/lib/nodes/index_spec.js
View File

@ -17,7 +17,6 @@
var should = require("should");
var fs = require('fs-extra');
var path = require('path');
var when = require("when");
var sinon = require('sinon');
var inherits = require("util").inherits;
@ -47,11 +46,11 @@ describe("red/nodes/index", function() {
var testCredentials = {"tab1":{"b":1, "c":"2", "d":"$(foo)"}};
var storage = {
getFlows: function() {
return when({red:123,flows:testFlows,credentials:testCredentials});
return Promise.resolve({red:123,flows:testFlows,credentials:testCredentials});
},
saveFlows: function(conf) {
should.deepEqual(testFlows, conf.flows);
return when.resolve(123);
return Promise.resolve(123);
}
};
@ -182,12 +181,12 @@ describe("red/nodes/index", function() {
fs.remove(userDir,function(err) {
fs.mkdir(userDir,function() {
sinon.stub(index, 'load', function() {
return when.promise(function(resolve,reject){
return new Promise(function(resolve,reject){
resolve([]);
});
});
sinon.stub(localfilesystem, 'getCredentials', function() {
return when.promise(function(resolve,reject) {
return new Promise(function(resolve,reject) {
resolve({"tab1":{"b":1,"c":2}});
});
}) ;
@ -282,7 +281,7 @@ describe("red/nodes/index", function() {
}
});
sinon.stub(registry,"disableNode",function(id) {
return when.resolve(randomNodeInfo);
return Promise.resolve(randomNodeInfo);
});
});
afterEach(function() {

17
test/unit/@node-red/runtime/lib/storage/index_spec.js
View File

@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
var when = require("when");
var should = require("should");
var paff = require('path');
@ -79,16 +78,16 @@ describe("red/storage/index", function() {
},
getFlows : function() {
calledFlagGetFlows = true;
return when.resolve([]);
return Promise.resolve([]);
},
saveFlows : function (flows) {
flows.should.be.an.Array();
flows.should.have.lengthOf(0);
return when.resolve("");
return Promise.resolve("");
},
getCredentials : function() {
calledFlagGetCredentials = true;
return when.resolve({});
return Promise.resolve({});
},
saveCredentials : function(credentials) {
credentials.should.be.true();
@ -147,7 +146,7 @@ describe("red/storage/index", function() {
storage.getLibraryEntry(true, "name");
storage.saveLibraryEntry(true, "name", true, true);
when.settle(promises).then(function() {
Promise.all(promises).then(function() {
try {
calledInit.should.be.true();
calledFlagGetFlows.should.be.true();
@ -174,11 +173,11 @@ describe("red/storage/index", function() {
getLibraryEntry : function(type, path) {
if (type === "flows") {
if (path === "/" || path === "\\") {
return when.resolve(["a",{fn:"test.json"}]);
return Promise.resolve(["a",{fn:"test.json"}]);
} else if (path == "/a" || path == "\\a") {
return when.resolve([{fn:"test2.json"}]);
return Promise.resolve([{fn:"test2.json"}]);
} else if (path == paff.join("","a","test2.json")) {
return when.resolve("test content");
return Promise.resolve("test content");
}
}
},
@ -187,7 +186,7 @@ describe("red/storage/index", function() {
savePath = path;
saveContent = body;
saveMeta = meta;
return when.resolve();
return Promise.resolve();
}
};