spec-3nweb-server 1.6.2 → 1.6.4

package/build/3nstorage/3nstorage-app.d.ts

@@ -1,3 +1,4 @@
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
+import { ErrLogger } from '../lib-server/middleware/error-handler';
 import { AppWithWSs } from '../lib-server/web-sockets/app';
-export declare function makeApp(dataFolder: string, domain: string, midAuthorizer: MidAuthorizer): AppWithWSs;
+export declare function makeApp(dataFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;

package/build/3nstorage/3nstorage-app.js

@@ -42,7 +42,7 @@ function setupStaticEntryRoute(app) {
         res.status(200).json(json);
     });
 }
-function makeApp(dataFolder, domain, midAuthorizer) {
+function makeApp(dataFolder, domain, midAuthorizer, errLogger) {
     const app = new app_1.AppWithWSs();
     const ownersSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
     const sharingSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
@@ -50,12 +50,7 @@ function makeApp(dataFolder, domain, midAuthorizer) {
     setupStaticEntryRoute(app.http);
     app.use(PATHS.owner, owners.makeApp(domain, ownersSessions, users, midAuthorizer));
     app.http.use(PATHS.shared, sharing.makeApp(sharingSessions, users));
-    app.http.use((0, error_handler_1.makeErrHandler)((err, req) => {
-        if (typeof err.status !== 'number') {
-            console.error(`\n --- Error occured in storage, when handling ${req.method} request to ${req.originalUrl}`);
-            console.error(err);
-        }
-    }));
+    app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
 exports.makeApp = makeApp;

package/build/3nstorage/resources/store.js

@@ -403,7 +403,7 @@ class Store extends user_files_1.UserFiles {
             throw exports.SC.OBJ_UNKNOWN;
         }
         if (status.currentVersion !== version) {
-            throw exports.SC.OBJ_VER_UNKNOWN;
+            throw makeMismatchedObjVerException(status.currentVersion);
         }
         const arch = status.archivedVersions;
         if (Array.isArray(arch)) {

package/build/3nstorage/routes/owner/archive-obj-version.js

@@ -38,10 +38,17 @@ function archiveCurrentObjVersion(root, archiveObjVerFunc) {
         }
         catch (err) {
             if ("string" !== typeof err) {
-                next(err);
-            }
-            else if (err === users_1.SC.OBJ_VER_UNKNOWN) {
-                res.status(SC.unknownObjVer).send(`Object ${objId} version ${version} is not current.`);
+                if (err.type === 'mismatched-obj-ver') {
+                    const rep = {
+                        error: "Current object version doesn't match assumed one.",
+                        current_version: err.current_version
+                    };
+                    res.set(owner_1.HTTP_HEADER.objVersion, `${err.current_version}`);
+                    res.status(owner_1.archiveObj.SC.mismatchedObjVer).json(rep);
+                }
+                else {
+                    next(err);
+                }
             }
             else if (err === users_1.SC.OBJ_UNKNOWN) {
                 res.status(SC.unknownObj).send(root ?

package/build/admin/admin-app.d.ts

@@ -1,3 +1,4 @@
 import * as express from 'express';
+import { ErrLogger } from '../lib-server/middleware/error-handler';
 import { Configurations } from '../services';
-export declare function makeApp(conf: Configurations): express.Express;
+export declare function makeApp(conf: Configurations, errLogger?: ErrLogger): express.Express;

package/build/admin/admin-app.js

@@ -33,14 +33,14 @@ function apiPart(users) {
     app.post('/' + signupApi.addUser.URL_END, (0, body_parsers_1.json)('4kb'), (0, add_1.addUser)(users.add));
     return app;
 }
-function makeApp(conf) {
+function makeApp(conf, errLogger) {
     const app = express();
     const noTokenFile = (conf.signup ? conf.signup.noTokenFile : undefined);
     const users = (0, users_1.makeFactory)(conf.rootFolder, noTokenFile);
     if (conf.signup) {
         app.use('/signup', apiPart(users));
     }
-    app.use((0, error_handler_1.makeErrHandler)());
+    app.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
 exports.makeApp = makeApp;

package/build/asmail/asmail-app.d.ts

@@ -1,3 +1,4 @@
 import { AppWithWSs } from '../lib-server/web-sockets/app';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
-export declare function makeApp(rootFolder: string, domain: string, midAuthorizer: MidAuthorizer): AppWithWSs;
+import { ErrLogger } from '../lib-server/middleware/error-handler';
+export declare function makeApp(rootFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;

package/build/asmail/asmail-app.js

@@ -46,7 +46,7 @@ function setupStaticEntryRoute(app) {
         res.status(200).json(json);
     });
 }
-function makeApp(rootFolder, domain, midAuthorizer) {
+function makeApp(rootFolder, domain, midAuthorizer, errLogger) {
     const app = new app_1.AppWithWSs();
     const mailDeliverySessions = delivery_sessions_1.DeliverySessions.make(5 * 60);
     const recipientsSessions = (0, sessions_1.makeSessionFactory)(10 * 60);
@@ -56,12 +56,7 @@ function makeApp(rootFolder, domain, midAuthorizer) {
     app.http.use(PATHS.delivery, (0, delivery_1.makeApp)(domain, mailDeliverySessions, recipients, midAuthorizer));
     app.use(PATHS.retrieval, (0, retrieval_1.makeApp)(domain, recipientsSessions, recipients, midAuthorizer));
     app.http.use(PATHS.config, (0, config_1.makeApp)(domain, userSettingSessions, recipients, midAuthorizer));
-    app.http.use((0, error_handler_1.makeErrHandler)((err, req) => {
-        if (typeof err.status !== 'number') {
-            console.error(`\n --- Error occured in asmail, when handling ${req.method} request to ${req.originalUrl}`);
-            console.error(err);
-        }
-    }));
+    app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
 exports.makeApp = makeApp;

package/build/lib-common/service-api/3nstorage/owner.d.ts

@@ -128,9 +128,10 @@ export declare namespace currentObj {
         mismatchedObjVer: number;
         objIncomplete: number;
     };
-    interface MismatchedObjVerReply extends ErrorReply {
-        current_version: number;
-    }
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
+}
+export interface MismatchedObjVerErrReply extends ErrorReply {
+    current_version: number;
 }
 export declare namespace currentRootObj {
     const EXPRESS_URL_END = "root/current";
@@ -236,23 +237,25 @@ export declare namespace rootStatus {
 export declare namespace archiveObj {
     const EXPRESS_URL_END = "obj/:objId/archive";
     function postAndDelReqUrlEnd(objId: string, version: number): string;
-    type VersionsList = number[];
+    type MismatchedObjVerReply = MismatchedObjVerErrReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export declare namespace archiveRoot {
     const EXPRESS_URL_END = "root/archive";
     function postAndDelReqUrlEnd(version: number): string;
-    type VersionsList = archiveObj.VersionsList;
+    type MismatchedObjVerReply = archiveObj.MismatchedObjVerReply;
     const SC: {
         okPost: number;
         okDelete: number;
         unknownObj: number;
         unknownObjVer: number;
+        mismatchedObjVer: number;
     };
 }
 export interface ErrorReply {

package/build/lib-common/service-api/3nstorage/owner.js

@@ -258,7 +258,8 @@ var archiveObj;
         okPost: 200,
         okDelete: 200,
         unknownObj: 474,
-        unknownObjVer: 494
+        unknownObjVer: 494,
+        mismatchedObjVer: 495
     };
 })(archiveObj = exports.archiveObj || (exports.archiveObj = {}));
 Object.freeze(archiveObj);

package/build/lib-server/middleware/error-handler.d.ts

@@ -13,3 +13,4 @@ export interface HttpError extends ErrorWithCause {
 export declare function makeErr(code: number, msg: string, cause?: any): HttpError;
 export declare type ErrLogger = (err: any, req: Request) => void;
 export declare function makeErrHandler(log?: ErrLogger): ErrorRequestHandler;
+export declare function makeErrLoggerToConsole(srvName: string): ErrLogger;

package/build/lib-server/middleware/error-handler.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016, 2020 3NSoft Inc.
+ Copyright (C) 2016, 2020, 2023 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeErrHandler = exports.makeErr = void 0;
+exports.makeErrLoggerToConsole = exports.makeErrHandler = exports.makeErr = void 0;
 const http = require("http");
 const error_1 = require("../../lib-common/exceptions/error");
 /**
@@ -63,4 +63,13 @@ function makeErrHandler(log) {
     };
 }
 exports.makeErrHandler = makeErrHandler;
+function makeErrLoggerToConsole(srvName) {
+    return (err, req) => {
+        if (typeof err.status !== 'number') {
+            console.error(`\n --- Error occured in ${srvName}, when handling ${req.method} request to ${req.originalUrl}`);
+            console.error(err);
+        }
+    };
+}
+exports.makeErrLoggerToConsole = makeErrLoggerToConsole;
 Object.freeze(exports);

package/build/lib.d.ts

@@ -1,4 +1,5 @@
-export import services = require('./services');
-export import confs = require('./run-config');
-export import appUtils = require('./lib-server/web-sockets/app');
-export import mock = require('./mock/run-in-proc');
+export { AppWithWSs } from './lib-server/web-sockets/app';
+export { Configurations, servicesApp, adminApp } from './services';
+export { addSingleUserSignup, getConfsFromEnv, getBindParamsFromEnv } from './run-config';
+export import errors = require('./lib-server/middleware/error-handler');
+export * as mock from './mock/run-in-proc';

package/build/lib.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 3NSoft Inc.
+ Copyright (C) 2020, 2023 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,16 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.services = require("./services");
-exports.confs = require("./run-config");
-exports.appUtils = require("./lib-server/web-sockets/app");
+exports.mock = exports.getBindParamsFromEnv = exports.getConfsFromEnv = exports.addSingleUserSignup = exports.adminApp = exports.servicesApp = exports.AppWithWSs = void 0;
+var app_1 = require("./lib-server/web-sockets/app");
+Object.defineProperty(exports, "AppWithWSs", { enumerable: true, get: function () { return app_1.AppWithWSs; } });
+var services_1 = require("./services");
+Object.defineProperty(exports, "servicesApp", { enumerable: true, get: function () { return services_1.servicesApp; } });
+Object.defineProperty(exports, "adminApp", { enumerable: true, get: function () { return services_1.adminApp; } });
+var run_config_1 = require("./run-config");
+Object.defineProperty(exports, "addSingleUserSignup", { enumerable: true, get: function () { return run_config_1.addSingleUserSignup; } });
+Object.defineProperty(exports, "getConfsFromEnv", { enumerable: true, get: function () { return run_config_1.getConfsFromEnv; } });
+Object.defineProperty(exports, "getBindParamsFromEnv", { enumerable: true, get: function () { return run_config_1.getBindParamsFromEnv; } });
+exports.errors = require("./lib-server/middleware/error-handler");
 exports.mock = require("./mock/run-in-proc");
 Object.freeze(exports);

package/build/mailerId/mailerId-app.d.ts

@@ -3,4 +3,5 @@
  * express MailerId application.
  */
 import * as express from 'express';
-export declare function makeApp(rootFolder: string, domain: string, certFile: string): express.Express;
+import { ErrLogger } from '../lib-server/middleware/error-handler';
+export declare function makeApp(rootFolder: string, domain: string, certFile: string, errLogger?: ErrLogger): express.Express;

package/build/mailerId/mailerId-app.js

@@ -43,7 +43,7 @@ function provisioningApp(sessions, users, certifier, computeDHSharedKey) {
     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) {
+function makeApp(rootFolder, domain, certFile, errLogger) {
     const app = express();
     const certProvisSessions = (0, sessions_1.makeSessionFactory)(2 * 60);
     const users = (0, users_1.makeFactory)(rootFolder);
@@ -62,7 +62,7 @@ function makeApp(rootFolder, domain, certFile) {
         };
         res.status(200).json(json); // content type application/json
     });
-    app.use((0, error_handler_1.makeErrHandler)());
+    app.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
 exports.makeApp = makeApp;

package/build/main.js

@@ -13,13 +13,13 @@
  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 });
 /*
  * This script starts server, according to settings, given in config file.
  */
-const services_1 = require("./services");
-const app_1 = require("./lib-server/web-sockets/app");
+const lib_1 = require("./lib");
 const fs_1 = require("fs");
 const async_fs_node_1 = require("./lib-common/async-fs-node");
 const child_process_1 = require("child_process");
@@ -64,9 +64,9 @@ const noop = () => { };
         (0, async_fs_node_1.unlink)(PID_FILE).catch(noop);
     }
     try {
-        app = new app_1.AppWithWSs();
-        app.use((0, services_1.servicesApp)(conf));
-        app.use((0, services_1.adminApp)(conf));
+        app = new lib_1.AppWithWSs();
+        app.use((0, lib_1.servicesApp)(conf));
+        app.use((0, lib_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.'}`);

package/build/run.js

@@ -13,22 +13,32 @@
  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 });
-const services_1 = require("./services");
-const app_1 = require("./lib-server/web-sockets/app");
-const run_config_1 = require("./run-config");
+const lib_1 = require("./lib");
 (async () => {
+    let app = undefined;
+    async function stopProcess() {
+        if (!app) {
+            return;
+        }
+        app.stop().then(err => console.log(err));
+        app = undefined;
+    }
     try {
-        const conf = (0, run_config_1.getConfsFromEnv)();
-        const app = new app_1.AppWithWSs();
-        app.use((0, services_1.servicesApp)(conf));
-        app.use((0, services_1.adminApp)(conf));
-        const { address, port, sslOpts } = (0, run_config_1.getBindParamsFromEnv)();
+        const conf = (0, lib_1.getConfsFromEnv)();
+        app = new lib_1.AppWithWSs();
+        app.use((0, lib_1.servicesApp)(conf));
+        app.use((0, lib_1.adminApp)(conf));
+        const { address, port, sslOpts } = (0, lib_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.'}`);
+        process.on('SIGINT', stopProcess);
+        process.on('SIGTERM', stopProcess);
     }
     catch (err) {
+        stopProcess();
         console.error(err);
         process.exit(-500);
     }

package/build/services.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import * as https from "https";
 import { AppWithWSs } from './lib-server/web-sockets/app';
+import { ErrLogger } from "./lib-server/middleware/error-handler";
 export interface Configurations {
     enabledServices: {
         asmail?: boolean;
@@ -21,5 +22,5 @@ export interface Configurations {
         noTokenFile?: string;
     };
 }
-export declare function servicesApp(conf: Configurations): AppWithWSs;
-export declare function adminApp(conf: Configurations): AppWithWSs;
+export declare function servicesApp(conf: Configurations, errLogger?: ErrLogger | 'console'): AppWithWSs;
+export declare function adminApp(conf: Configurations, errLogger?: ErrLogger | 'console'): AppWithWSs;

package/build/services.js

@@ -23,26 +23,30 @@ const mailerId_app_1 = require("./mailerId/mailerId-app");
 const asmail_app_1 = require("./asmail/asmail-app");
 const _3nstorage_app_1 = require("./3nstorage/3nstorage-app");
 const admin_app_1 = require("./admin/admin-app");
-function servicesApp(conf) {
+const error_handler_1 = require("./lib-server/middleware/error-handler");
+function servicesApp(conf, errLogger) {
     if (!conf.enabledServices || (typeof conf.enabledServices !== 'object')) {
         throw new Error('Missing enabled-services sections in confs.');
     }
     const app = new app_1.AppWithWSs();
     const midAuthorizer = (0, mailerid_authorizer_1.validator)(); // share, allowing for caching of certs
     if (conf.enabledServices.mailerId) {
-        app.http.use('/mailerid', (0, 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, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('mailerid') : errLogger));
     }
     if (conf.enabledServices.asmail) {
-        app.use('/asmail', (0, asmail_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer));
+        app.use('/asmail', (0, asmail_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('asmail') : errLogger));
     }
     if (conf.enabledServices.storage) {
-        app.use('/3nstorage', (0, _3nstorage_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer));
+        app.use('/3nstorage', (0, _3nstorage_app_1.makeApp)(conf.rootFolder, conf.domain, midAuthorizer, (errLogger === 'console') ? (0, error_handler_1.makeErrLoggerToConsole)('storage') : errLogger));
     }
     return app;
 }
 exports.servicesApp = servicesApp;
-function adminApp(conf) {
-    return new app_1.AppWithWSs((0, admin_app_1.makeApp)(conf));
+function adminApp(conf, errLogger) {
+    if (errLogger === 'console') {
+        errLogger = (0, error_handler_1.makeErrLoggerToConsole)('3NWeb server admin');
+    }
+    return new app_1.AppWithWSs((0, admin_app_1.makeApp)(conf, errLogger));
 }
 exports.adminApp = adminApp;
 Object.freeze(exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",