spec-3nweb-server 1.3.8 → 1.5.0

package/build/mock/mock-as-child-proc.js

@@ -27,9 +27,9 @@ const app_1 = require("../lib-server/web-sockets/app");
 const path_1 = require("path");
 const signup_tokens_1 = require("../admin/signup-tokens");
 const SERVER_MOCK_CHANNEL = 'server-mock';
-const parent = node_child_ipc_1.commToParent(SERVER_MOCK_CHANNEL);
+const parent = (0, node_child_ipc_1.commToParent)(SERVER_MOCK_CHANNEL);
 const DEFAULT_SERVICE_PORT = 8088;
-const DEFAULT_DATA_FOLDER = path_1.join(__dirname, '/../../mock-data');
+const DEFAULT_DATA_FOLDER = (0, path_1.join)(__dirname, '/../../mock-data');
 let dnsMock;
 let app;
 parent.addHandler('set-dns-mock', setDnsMock);
@@ -38,7 +38,7 @@ async function setDnsMock(env) {
     dns.resolveTxt = dnsMock.resolveTxt;
 }
 async function cleanDataFolder() {
-    await async_fs_node_1.rmDirWithContent(DEFAULT_DATA_FOLDER).catch((exc) => {
+    await (0, async_fs_node_1.rmDirWithContent)(DEFAULT_DATA_FOLDER).catch((exc) => {
         if (!exc.notFound) {
             throw exc;
         }
@@ -50,7 +50,7 @@ async function start(env) {
     const servicePort = (env.req.port ? env.req.port : DEFAULT_SERVICE_PORT);
     const dataFolder = (env.req.dataFolder ?
         env.req.dataFolder : DEFAULT_DATA_FOLDER);
-    const noTokensFilePath = path_1.join(dataFolder, 'no-tokens-signup.json');
+    const noTokensFilePath = (0, path_1.join)(dataFolder, 'no-tokens-signup.json');
     const conf = {
         rootFolder: dataFolder,
         domain: env.req.midServiceDomain,
@@ -63,19 +63,19 @@ async function start(env) {
             storage: true
         },
         mailerId: {
-            certs: path_1.join(dataFolder, 'mid-certs.json')
+            certs: (0, path_1.join)(dataFolder, 'mid-certs.json')
         }
     };
     // prepare data folders
     await cleanDataFolder();
-    await async_fs_node_1.mkdir(dataFolder);
+    await (0, async_fs_node_1.mkdir)(dataFolder);
     // write to-tokens signup file
-    const noTokenCtx = signup_tokens_1.makeMultiDomainSignupCtx(env.req.signupDomains);
-    await async_fs_node_1.writeFile(noTokensFilePath, JSON.stringify(noTokenCtx), { encoding: 'utf8' });
+    const noTokenCtx = (0, signup_tokens_1.makeMultiDomainSignupCtx)(env.req.signupDomains);
+    await (0, async_fs_node_1.writeFile)(noTokensFilePath, JSON.stringify(noTokenCtx), { encoding: 'utf8' });
     // setup app
     app = new app_1.AppWithWSs();
-    app.use(services_1.adminApp(conf));
-    app.use(services_1.servicesApp(conf));
+    app.use((0, services_1.adminApp)(conf));
+    app.use((0, services_1.servicesApp)(conf));
     // start app
     await app.start(tls_options_1.sslOpts, servicePort);
     // set client https to trust the cert (MailerId checks need this)

package/build/mock/node-child-ipc.js

@@ -34,7 +34,7 @@ function commToChild(channel, child) {
             child.send(env);
         }
     };
-    return generic_ipc_1.makeRequestingClient(channel, rawDuplex);
+    return (0, generic_ipc_1.makeRequestingClient)(channel, rawDuplex);
 }
 exports.commToChild = commToChild;
 function commToParent(channel) {
@@ -57,7 +57,7 @@ function commToParent(channel) {
             process.send(env);
         }
     };
-    return generic_ipc_1.makeRequestServer(channel, commPoint);
+    return (0, generic_ipc_1.makeRequestServer)(channel, commPoint);
 }
 exports.commToParent = commToParent;
 Object.freeze(exports);

package/build/mock/run-in-proc.js

@@ -47,7 +47,7 @@ function setTestCertsAndDNS(domains, thisSrvLoc) {
 }
 exports.setTestCertsAndDNS = setTestCertsAndDNS;
 async function startOn(srvDomain, dataDir, port, domains) {
-    const noTokensFilePath = path_1.join(dataDir, 'no-tokens-signup.json');
+    const noTokensFilePath = (0, path_1.join)(dataDir, 'no-tokens-signup.json');
     const conf = {
         rootFolder: dataDir,
         domain: srvDomain,
@@ -60,7 +60,7 @@ async function startOn(srvDomain, dataDir, port, domains) {
             noTokenFile: noTokensFilePath
         },
         mailerId: {
-            certs: path_1.join(dataDir, 'mid-certs.json')
+            certs: (0, path_1.join)(dataDir, 'mid-certs.json')
         },
         servicesConnect: {
             port,
@@ -68,22 +68,22 @@ async function startOn(srvDomain, dataDir, port, domains) {
         }
     };
     // prepare data folders
-    await async_fs_node_1.mkdir(dataDir)
+    await (0, async_fs_node_1.mkdir)(dataDir)
         .catch((exc) => {
         if (!exc.alreadyExists) {
             throw exc;
         }
     });
     // write to-tokens signup file
-    const noTokenCtx = signup_tokens_1.makeMultiDomainSignupCtx(domains.noTokenSignup);
-    await async_fs_node_1.writeFile(noTokensFilePath, JSON.stringify(noTokenCtx), { encoding: 'utf8' });
+    const noTokenCtx = (0, signup_tokens_1.makeMultiDomainSignupCtx)(domains.noTokenSignup);
+    await (0, async_fs_node_1.writeFile)(noTokensFilePath, JSON.stringify(noTokenCtx), { encoding: 'utf8' });
     // certs and DNS
     const allDomains = domains.noTokenSignup.concat(domains.other);
     const dnsMock = setTestCertsAndDNS(allDomains, `${srvDomain}:${port}`);
     // setup services and start
     const app = new app_1.AppWithWSs();
-    app.use(services_1.adminApp(conf));
-    app.use(services_1.servicesApp(conf));
+    app.use((0, services_1.adminApp)(conf));
+    app.use((0, services_1.servicesApp)(conf));
     await app.start(conf.servicesConnect.sslOpts, conf.servicesConnect.port);
     return { dnsMock, stop: () => app.stop() };
 }

package/build/run-config.js

@@ -60,25 +60,25 @@ function getConfsFromEnv() {
     }
     // Make data folders
     ensureFolderPresence(dataDir, true);
-    dataDir = fs_1.realpathSync(dataDir);
+    dataDir = (0, fs_1.realpathSync)(dataDir);
     let midCerts = process.env[CERTS_FILE_VAR];
     if (!midCerts) {
-        midCerts = path_1.join(dataDir, 'mid-certs.json');
+        midCerts = (0, path_1.join)(dataDir, 'mid-certs.json');
     }
     const noTokenFile = process.env[NO_TOKENS_FILE];
     return makeConf(domain, dataDir, midCerts, noTokenFile);
 }
 exports.getConfsFromEnv = getConfsFromEnv;
 function ensureFolderPresence(path, doLog) {
-    if (async_fs_node_1.existsFolderSync(path)) {
+    if ((0, async_fs_node_1.existsFolderSync)(path)) {
         if (doLog) {
             console.log(`Using existing data folder ${path}`);
         }
     }
     else {
-        fs_1.mkdirSync(path);
+        (0, fs_1.mkdirSync)(path);
         if (doLog) {
-            console.log(`Created ${fs_1.realpathSync(path)}`);
+            console.log(`Created ${(0, fs_1.realpathSync)(path)}`);
         }
     }
 }
@@ -117,11 +117,11 @@ function getTLSParamsFromEnv() {
     }
 }
 async function addSingleUserSignup(rootFolder, userId) {
-    const token = await signup_tokens_1.generateToken();
-    const ctx = signup_tokens_1.makeSingleUserSignupCtx(token, userId);
-    const fPath = signup_tokens_1.tokenPath(rootFolder, token);
+    const token = await (0, signup_tokens_1.generateToken)();
+    const ctx = (0, signup_tokens_1.makeSingleUserSignupCtx)(token, userId);
+    const fPath = (0, signup_tokens_1.tokenPath)(rootFolder, token);
     try {
-        await async_fs_node_1.writeFile(fPath, JSON.stringify(ctx), { encoding: 'utf8', flag: 'wx' });
+        await (0, async_fs_node_1.writeFile)(fPath, JSON.stringify(ctx), { encoding: 'utf8', flag: 'wx' });
         return token;
     }
     catch (exc) {
@@ -129,7 +129,7 @@ async function addSingleUserSignup(rootFolder, userId) {
             return addSingleUserSignup(rootFolder, userId);
         }
         else if (exc.notFound) {
-            await async_fs_node_1.mkdir(server_data_folders_1.tokensInRootFolder(rootFolder))
+            await (0, async_fs_node_1.mkdir)((0, server_data_folders_1.tokensInRootFolder)(rootFolder))
                 .catch((exc) => {
                 if (!exc.alreadyExists) {
                     throw exc;

package/build/run.js

@@ -20,11 +20,11 @@ const app_1 = require("./lib-server/web-sockets/app");
 const run_config_1 = require("./run-config");
 (async () => {
     try {
-        const conf = run_config_1.getConfsFromEnv();
+        const conf = (0, run_config_1.getConfsFromEnv)();
         const app = new app_1.AppWithWSs();
-        app.use(services_1.servicesApp(conf));
-        app.use(services_1.adminApp(conf));
-        const { address, port, sslOpts } = run_config_1.getBindParamsFromEnv();
+        app.use((0, services_1.servicesApp)(conf));
+        app.use((0, services_1.adminApp)(conf));
+        const { address, port, sslOpts } = (0, run_config_1.getBindParamsFromEnv)();
         await app.start(sslOpts, port, address);
         console.log(`Started 3NWeb server at address ${address}, port ${port}, ${sslOpts ? 'via TLS' : 'without TLS, and requiring TLS reverse proxy infront.'}`);
     }

package/build/services.js

@@ -28,21 +28,21 @@ function servicesApp(conf) {
         throw new Error('Missing enabled-services sections in confs.');
     }
     const app = new app_1.AppWithWSs();
-    const midAuthorizer = mailerid_authorizer_1.validator(); // share, allowing for caching of certs
+    const midAuthorizer = (0, mailerid_authorizer_1.validator)(); // share, allowing for caching of certs
     if (conf.enabledServices.mailerId) {
-        app.http.use('/mailerid', mailerId_app_1.makeApp(conf.rootFolder, conf.domain, conf.mailerId.certs));
+        app.http.use('/mailerid', (0, mailerId_app_1.makeApp)(conf.rootFolder, conf.domain, conf.mailerId.certs));
     }
     if (conf.enabledServices.asmail) {
-        app.use('/asmail', asmail_app_1.makeApp(conf.rootFolder, conf.domain, midAuthorizer));
+        app.use('/asmail', (0, asmail_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer));
     }
     if (conf.enabledServices.storage) {
-        app.use('/3nstorage', _3nstorage_app_1.makeApp(conf.rootFolder, conf.domain, midAuthorizer));
+        app.use('/3nstorage', (0, _3nstorage_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer));
     }
     return app;
 }
 exports.servicesApp = servicesApp;
 function adminApp(conf) {
-    return new app_1.AppWithWSs(admin_app_1.makeApp(conf));
+    return new app_1.AppWithWSs((0, admin_app_1.makeApp)(conf));
 }
 exports.adminApp = adminApp;
 Object.freeze(exports);

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.3.8",
+  "version": "1.5.0",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",
   "scripts": {
-    "test": "tsc -p ts-code && node build/tests/jasmine.js",
-    "build": "tsc -p ts-code"
+    "build": "tsc -p ts-code",
+    "test": "node build/tests/jasmine.js",
+    "clear-for-packing": "npm prune --production && bash -c \"rm -rf build/mock build/tests 'node_modules/ecma-nacl/c sources'\"",
+    "clear-for-packing-mock": "npm prune --production && bash -c \"rm -rf build/tests 'node_modules/ecma-nacl/c sources'\"",
+    "pack-deb": "npm run clear-for-packing && bash packing/deb/create-bin.sh"
   },
   "repository": {
     "type": "git",
@@ -27,19 +30,19 @@
   "license": "GPL-3.0",
   "dependencies": {
     "ecma-nacl": "^2.4.0",
-    "express": "^4.12.3",
+    "express": "^4.18.0",
     "punycode": "^2.1.1",
-    "ws": "^7.0.0",
+    "ws": "^7.4.6",
     "xsp-files": "^2.0.0"
   },
   "devDependencies": {
-    "@types/express": "",
-    "@types/jasmine": "",
-    "@types/node": "",
+    "@types/express": "4.17.13",
+    "@types/jasmine": "^3.9.1",
+    "@types/node": "^16.11.7",
     "@types/ws": "^4.0.0",
-    "jasmine": "^2.5.3",
+    "jasmine": "^3.9.0",
     "rxjs": "^5.3.0",
-    "typescript": "^3.7.3",
+    "typescript": "^4.7.4",
     "xhr2": "^0.1.3"
   },
   "readmeFilename": "README.md"