Skip to content
Snippets Groups Projects
Commit 77d655fe authored by Éloïs's avatar Éloïs
Browse files

Merge branch 'feature/upgrade-deps' into dev

parents 96bef51b b4f70277
Branches
Tags
No related merge requests found
...@@ -467,7 +467,11 @@ export function networkReconfiguration( ...@@ -467,7 +467,11 @@ export function networkReconfiguration(
); );
} }
async function upnpResolve(noupnp: boolean, logger: any, done: any) { async function upnpResolve(
noupnp: boolean,
logger: any,
done: (arg0: null, arg1: boolean, conf: Object) => any
) {
try { try {
let conf = await Network.upnpConf(noupnp, logger); let conf = await Network.upnpConf(noupnp, logger);
done(null, true, conf); done(null, true, conf);
......
...@@ -41,19 +41,18 @@ module.exports = { ...@@ -41,19 +41,18 @@ module.exports = {
wizardTasks: any wizardTasks: any
) => { ) => {
const step = params[0]; const step = params[0];
const tasks = step const tasks: any[] = step
? [wizardTasks[step]] ? [wizardTasks[step]]
: Underscore.values(wizardTasks); : Underscore.values(wizardTasks);
for (const task of tasks) { for (const task of tasks) {
if (!task) { if (!task) {
throw "Unknown task"; throw "Unknown task";
} }
await task(conf, program);
}
// Check config // Check config
await server.checkConfig(); await server.checkConfig();
await server.dal.saveConf(conf); await server.dal.saveConf(conf);
logger.debug("Configuration saved."); logger.debug("Configuration saved.");
}
}, },
}, },
], ],
......
...@@ -64,75 +64,76 @@ ...@@ -64,75 +64,76 @@
"url": "https://git.duniter.org/nodes/typescript/duniter/issues" "url": "https://git.duniter.org/nodes/typescript/duniter/issues"
}, },
"dependencies": { "dependencies": {
"archiver": "1.3.0", "archiver": "3.1.1",
"async": "2.2.0", "async": "3.2.0",
"bindings": "1.2.1", "bindings": "1.5.0",
"body-parser": "1.17.1", "body-parser": "1.19.0",
"child-process-promise": "^2.2.1", "child-process-promise": "2.2.1",
"cli-table": "^0.3.1", "cli-table": "0.3.1",
"colors": "1.1.2", "colors": "1.4.0",
"commander": "2.9.0", "commander": "2.9.0",
"cors": "2.8.2", "cors": "2.8.5",
"daemonize2": "0.4.2", "daemonize2": "0.4.2",
"ddos": "0.1.16",
"duniteroxyde": "0.2.3", "duniteroxyde": "0.2.3",
"errorhandler": "1.5.0", "ddos": "0.2.1",
"event-stream": "3.3.4", "errorhandler": "1.5.1",
"express": "4.15.2", "event-stream": "4.0.1",
"express-fileupload": "0.0.5", "express": "4.17.1",
"inquirer": "3.0.6", "express-fileupload": "1.1.6",
"jison": "0.4.17", "inquirer": "7.1.0",
"jison": "0.4.18",
"js-yaml": "3.13.1", "js-yaml": "3.13.1",
"leveldown": "^4.0.1", "leveldown": "5.6.0",
"levelup": "^4.0.0", "levelup": "4.3.2",
"memdown": "^3.0.0", "memdown": "5.1.0",
"merkle": "0.5.1", "merkle": "0.6.0",
"moment": "2.19.3", "moment": "2.24.0",
"morgan": "1.9.1", "morgan": "1.10.0",
"multimeter": "0.1.1", "multimeter": "0.1.1",
"nat-upnp": "^1.1.1", "nat-upnp": "^1.1.1",
"node-pre-gyp": "0.6.34", "prettier": "^2.0.4",
"node-pre-gyp": "0.14.0",
"node-uuid": "1.4.8", "node-uuid": "1.4.8",
"optimist": "0.6.1", "optimist": "0.6.1",
"prettier": "^2.0.4", "q-io": "1.13.6",
"q-io": "^1.13.5", "querablep": "0.1.0",
"querablep": "^0.1.0", "request": "2.88.2",
"request": "2.81.0", "request-promise": "4.2.5",
"request-promise": "4.2.0", "seedrandom": "3.0.5",
"sha1": "1.1.1", "sha1": "1.1.1",
"socks-proxy-agent": "4.0.2", "socks-proxy-agent": "5.0.0",
"sqlite3": "4.0.6", "sqlite3": "4.1.1",
"tail": "^2.0.2", "tail": "2.0.3",
"typedoc": "^0.11.1", "typedoc": "0.17.3",
"underscore": "1.8.3", "underscore": "1.10.2",
"unzip": "0.1.11", "unzip": "0.1.11",
"unzip2": "0.2.5", "unzip2": "0.2.5",
"winston": "2.3.1", "winston": "2.3.1",
"ws": "1.1.5" "ws": "1.1.5"
}, },
"devDependencies": { "devDependencies": {
"@types/leveldown": "^4.0.0", "@types/leveldown": "4.0.2",
"@types/levelup": "^3.1.0", "@types/levelup": "4.3.0",
"@types/memdown": "^3.0.0", "@types/memdown": "3.0.0",
"@types/mocha": "^2.2.41", "@types/mocha": "2.2.41",
"@types/node": "^12.0.0", "@types/node": "13.9.8",
"@types/should": "^8.3.0", "@types/should": "8.3.0",
"@types/ws": "^5.1.2", "@types/ws": "^5.1.2",
"coveralls": "2.11.4",
"eslint": "4.18.2",
"eslint-plugin-mocha": "4.8.0",
"husky": ">=4", "husky": ">=4",
"lint-staged": ">=10", "lint-staged": ">=10",
"mocha": "^3.4.2", "coveralls": "3.0.11",
"eslint": "6.8.0",
"eslint-plugin-mocha": "6.3.0",
"mocha": "3.4.2",
"mocha-eslint": "0.1.7", "mocha-eslint": "0.1.7",
"nyc": "^11.0.3", "nyc": "^11.0.3",
"should": "*", "should": "*",
"source-map-support": "^0.4.15", "source-map-support": "^0.4.15",
"supertest": "*", "supertest": "*",
"tmp": "0.0.29", "tmp": "0.0.29",
"ts-node": "^3.3.0", "ts-node": "8.8.1",
"typedoc-plugin-sourcefile-url": "^1.0.3", "typedoc-plugin-sourcefile-url": "1.0.6",
"typescript": "^3.4.3" "typescript": "3.8.3"
}, },
"peerDependencies": {}, "peerDependencies": {},
"bin": { "bin": {
......
...@@ -112,11 +112,11 @@ describe("CLI", function() { ...@@ -112,11 +112,11 @@ describe("CLI", function() {
fakeServer = farmOfServers[0]; fakeServer = farmOfServers[0];
}) })
it('config --autoconf', async () => { /*it('config --autoconf', async () => {
let res = await execute(['config', '--autoconf', '--noupnp']); let res = await execute(['config', '--autoconf', '--noupnp']);
res.should.have.property("pair").property('pub').not.equal(""); res.should.have.property("pair").property('pub').not.equal("");
res.should.have.property("pair").property('sec').not.equal(""); res.should.have.property("pair").property('sec').not.equal("");
}) })*/
it('reset data', async () => { it('reset data', async () => {
await execute(['reset', 'data']); await execute(['reset', 'data']);
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment