spec-3nweb-server 1.3.6 → 1.4.1

package/build/mailerId/mailerId-app.js

@@ -38,16 +38,16 @@ function provisioningApp(sessions, users, certifier, computeDHSharedKey) {
     const app = express();
     app.disable('etag');
     // MailerId certificate provisioning routes
-    app.post('/' + api.pkl.START_URL_END, sessions.checkSession(), body_parsers_1.json('1kb'), start_exchange_1.startPKLogin(users.getUserParamsAndKey, sessions.generate, computeDHSharedKey));
-    app.post('/' + api.pkl.COMPL_URL_END, sessions.ensureOpenedSession(), body_parsers_1.binary('1kb'), complete_exchange_1.completePKLogin());
-    app.post('/' + api.certify.URL_END, sessions.ensureAuthorizedSession(), body_parsers_1.binary('16kb'), certify_1.certify(certifier.certify));
+    app.post('/' + api.pkl.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_exchange_1.startPKLogin)(users.getUserParamsAndKey, sessions.generate, computeDHSharedKey));
+    app.post('/' + api.pkl.COMPL_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.binary)('1kb'), (0, complete_exchange_1.completePKLogin)());
+    app.post('/' + api.certify.URL_END, sessions.ensureAuthorizedSession(), (0, body_parsers_1.binary)('16kb'), (0, certify_1.certify)(certifier.certify));
     return app;
 }
 function makeApp(rootFolder, domain, certFile) {
     const app = express();
-    const certProvisSessions = sessions_1.makeSessionFactory(2 * 60);
-    const users = users_1.makeFactory(rootFolder);
-    const certifier = certifier_1.makeSingleProcCertifier(domain, certFile);
+    const certProvisSessions = (0, sessions_1.makeSessionFactory)(2 * 60);
+    const users = (0, users_1.makeFactory)(rootFolder);
+    const certifier = (0, certifier_1.makeSingleProcCertifier)(domain, certFile);
     app.use(PROVISIONING_PATH, provisioningApp(certProvisSessions, users, certifier, compute_login_dhshared_key_1.calcNaClBoxSharedKey));
     // MailerId display of service parameters, as per protocol
     app.get('/', (req, res) => {
@@ -62,7 +62,7 @@ function makeApp(rootFolder, domain, certFile) {
         };
         res.status(200).json(json); // content type application/json
     });
-    app.use(error_handler_1.makeErrHandler());
+    app.use((0, error_handler_1.makeErrHandler)());
     return app;
 }
 exports.makeApp = makeApp;

package/build/mailerId/resources/certifier.d.ts

@@ -6,12 +6,10 @@ export interface RootCerts {
     current: SignedLoad;
     previous: SignedLoad[];
 }
-export interface ICertify {
-    (userPKey: JsonKey, address: string, validFor?: number): {
-        userCert: SignedLoad;
-        provCert: SignedLoad;
-    };
-}
+export declare type ICertify = (userPKey: JsonKey, address: string, validFor?: number) => {
+    userCert: SignedLoad;
+    provCert: SignedLoad;
+};
 export interface Certifier {
     certify: ICertify;
     getRootCert(): SignedLoad;

package/build/mailerId/resources/certifier.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSingleProcCertifier = exports.MAX_USER_CERT_VALIDITY = exports.PROVIDER_CERT_VALIDITY = exports.ROOT_CERT_VALIDITY = void 0;
 const ecma_nacl_1 = require("ecma-nacl");
@@ -28,7 +29,7 @@ exports.MAX_USER_CERT_VALIDITY = 24 * 60 * 60;
 function loadOrGenerateRootCert(domain, path) {
     let certsAndKey;
     try {
-        certsAndKey = JSON.parse(fs_1.readFileSync(path, { encoding: 'utf8', flag: 'r' }));
+        certsAndKey = JSON.parse((0, fs_1.readFileSync)(path, { encoding: 'utf8', flag: 'r' }));
     }
     catch (err) {
         if (err.code === file_1.Code.notFound) {
@@ -38,13 +39,13 @@ function loadOrGenerateRootCert(domain, path) {
             throw err;
         }
     }
-    const certDomain = jwkeys_1.getKeyCert(certsAndKey.certs.current).issuer;
+    const certDomain = (0, jwkeys_1.getKeyCert)(certsAndKey.certs.current).issuer;
     if (certDomain !== domain) {
         throw new Error('Give domain ' + domain +
             ' does not equal domain in certificates file: ' + certDomain);
     }
     try {
-        const pkeyBytes = ecma_nacl_1.signing.extract_pkey(jwkeys_1.keyFromJson(certsAndKey.skey, mid_sigs_NaCl_Ed_1.KEY_USE.ROOT, ecma_nacl_1.signing.JWK_ALG_NAME, ecma_nacl_1.signing.SECRET_KEY_LENGTH).k);
+        const pkeyBytes = ecma_nacl_1.signing.extract_pkey((0, jwkeys_1.keyFromJson)(certsAndKey.skey, mid_sigs_NaCl_Ed_1.KEY_USE.ROOT, ecma_nacl_1.signing.JWK_ALG_NAME, ecma_nacl_1.signing.SECRET_KEY_LENGTH).k);
         const rootPKey = {
             k: pkeyBytes,
             kid: certsAndKey.skey.kid,
@@ -70,7 +71,7 @@ function createFirstCert(domain, path, log) {
             previous: []
         }
     };
-    fs_1.writeFileSync(path, JSON.stringify(toSave), { encoding: 'utf8', flag: 'wx' });
+    (0, fs_1.writeFileSync)(path, JSON.stringify(toSave), { encoding: 'utf8', flag: 'wx' });
     return toSave;
 }
 function updateCert(domain, path, certs, log) {
@@ -85,7 +86,7 @@ function updateCert(domain, path, certs, log) {
             previous: [certs.current].concat(certs.previous)
         }
     };
-    fs_1.writeFileSync(path, JSON.stringify(toSave), { encoding: 'utf8', flag: 'w' });
+    (0, fs_1.writeFileSync)(path, JSON.stringify(toSave), { encoding: 'utf8', flag: 'w' });
     return toSave;
 }
 const UPDATE_PERIOD = 8 * 60 * 60;
@@ -112,7 +113,7 @@ function makeSingleProcCertifier(domain, certsPath) {
         provCert = provider.cert;
         Object.freeze(provCert);
         certifier = mid_sigs_NaCl_Ed_1.idProvider.makeIdProviderCertifier(domain, exports.MAX_USER_CERT_VALIDITY, provider.skey);
-        updateTime = (jwkeys_1.getKeyCert(provCert).expiresAt - 2 * UPDATE_PERIOD) * 1000;
+        updateTime = ((0, jwkeys_1.getKeyCert)(provCert).expiresAt - 2 * UPDATE_PERIOD) * 1000;
     }
     updateCertifier();
     const timer = setInterval(updateCertifier, UPDATE_PERIOD * 1000);

package/build/mailerId/resources/compute-login-dhshared-key.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calcNaClBoxSharedKey = void 0;
 /**

package/build/mailerId/resources/sessions.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSessionFactory = void 0;
 const mem_backed_sessions_factory_1 = require("../../lib-server/resources/mem-backed-sessions-factory");

package/build/mailerId/resources/users.js

@@ -27,9 +27,9 @@ const path_1 = require("path");
 const server_data_folders_1 = require("../../lib-server/resources/server-data-folders");
 async function getUser(rootFolder, userId) {
     try {
-        const userFolder = server_data_folders_1.userDataInRootFolder(rootFolder, userId);
-        const midParamsPath = path_1.join(userFolder, 'info', 'mid-params');
-        const str = await async_fs_node_1.readFile(midParamsPath, { encoding: 'utf8' });
+        const userFolder = (0, server_data_folders_1.userDataInRootFolder)(rootFolder, userId);
+        const midParamsPath = (0, path_1.join)(userFolder, 'info', 'mid-params');
+        const str = await (0, async_fs_node_1.readFile)(midParamsPath, { encoding: 'utf8' });
         return JSON.parse(str);
     }
     catch (exc) {
@@ -41,7 +41,7 @@ async function getUser(rootFolder, userId) {
 }
 const MID_KEY_USE = 'login-pub-key';
 function extractPKeyBytes(pkey) {
-    return jwkeys_1.keyFromJson(pkey, MID_KEY_USE, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH).k;
+    return (0, jwkeys_1.keyFromJson)(pkey, MID_KEY_USE, ecma_nacl_1.box.JWK_ALG_NAME, ecma_nacl_1.box.KEY_LENGTH).k;
 }
 function makeFactory(rootFolder) {
     const factory = {

package/build/mailerId/routes/certify.js

@@ -51,7 +51,7 @@ function certify(certifyingFunc) {
             res.status(provisioning_1.certify.SC.malformed).send('Missing or incorrectly formatted payload.');
             return;
         }
-        res.status(provisioning_1.certify.SC.ok).send(buffer_utils_1.toBuffer(encryptor.pack(buffer_utils_1.utf8.pack(JSON.stringify(signedCerts)))));
+        res.status(provisioning_1.certify.SC.ok).send((0, buffer_utils_1.toBuffer)(encryptor.pack(buffer_utils_1.utf8.pack(JSON.stringify(signedCerts)))));
         session.close();
     };
 }

package/build/main.js

@@ -30,7 +30,7 @@ if (!confFile) {
     console.error(`Configuration file is not given. It should be the first script argument.`);
     process.exit(-1);
 }
-const conf = JSON.parse(fs_1.readFileSync(confFile, 'utf8'));
+const conf = JSON.parse((0, fs_1.readFileSync)(confFile, 'utf8'));
 const noop = () => { };
 (async () => {
     if (!conf.servicesConnect) {
@@ -39,14 +39,14 @@ const noop = () => { };
         return;
     }
     try {
-        const prevPidStr = await async_fs_node_1.readFile(PID_FILE, { encoding: 'utf8' });
+        const prevPidStr = await (0, async_fs_node_1.readFile)(PID_FILE, { encoding: 'utf8' });
         const prevPid = Number.parseInt(prevPidStr);
         if (!Number.isNaN(prevPid)) {
-            child_process_1.execSync(`kill -SIGTERM ${prevPid}`);
-            while (!!child_process_1.execSync(`ps ${prevPid} | grep ${prevPid}`)) {
-                await processes_1.sleep(1000);
+            (0, child_process_1.execSync)(`kill -SIGTERM ${prevPid}`);
+            while (!!(0, child_process_1.execSync)(`ps ${prevPid} | grep ${prevPid}`)) {
+                await (0, processes_1.sleep)(1000);
             }
-            await async_fs_node_1.unlink(PID_FILE).catch(noop);
+            await (0, async_fs_node_1.unlink)(PID_FILE).catch(noop);
         }
     }
     catch (err) {
@@ -61,16 +61,16 @@ const noop = () => { };
         }
         app.stop().then(err => console.log(err));
         app = undefined;
-        async_fs_node_1.unlink(PID_FILE).catch(noop);
+        (0, async_fs_node_1.unlink)(PID_FILE).catch(noop);
     }
     try {
         app = new app_1.AppWithWSs();
-        app.use(services_1.servicesApp(conf));
-        app.use(services_1.adminApp(conf));
+        app.use((0, services_1.servicesApp)(conf));
+        app.use((0, services_1.adminApp)(conf));
         const { hostname, port, sslOpts } = conf.servicesConnect;
         await app.start(sslOpts, port, hostname);
         console.log(`Started 3NWeb server at address "${hostname}", port ${port}, ${sslOpts ? 'via TLS' : 'without TLS, and requiring TLS reverse proxy infront.'}`);
-        fs_1.writeFileSync(PID_FILE, `${process.pid}`);
+        (0, fs_1.writeFileSync)(PID_FILE, `${process.pid}`);
         process.on('SIGINT', stopProcess);
         process.on('SIGTERM', stopProcess);
     }

package/build/mock/dns.js

@@ -56,7 +56,7 @@ class DNSMock {
             }
         }
         // node's definition incorrectly describes callback argument
-        this.resolveTxt = binding_1.bind(this, this.mockResolve);
+        this.resolveTxt = (0, binding_1.bind)(this, this.mockResolve);
         Object.freeze(this);
     }
     mockResolve(domain, callback) {

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.6",
+  "version": "1.4.1",
   "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,9 +30,9 @@
   "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": {
@@ -39,7 +42,7 @@
     "@types/ws": "^4.0.0",
     "jasmine": "^2.5.3",
     "rxjs": "^5.3.0",
-    "typescript": "^3.7.3",
+    "typescript": "^4.6.3",
     "xhr2": "^0.1.3"
   },
   "readmeFilename": "README.md"