spec-3nweb-server 1.7.0 → 1.7.5

package/build/lib-common/service-api/mailer-id/provisioning.js

@@ -13,19 +13,10 @@
  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.serviceRoot = exports.certify = exports.pkl = void 0;
-/**
- * This defines request interfaces for MailerId certificate provisioning.
- */
-const pklApi = require("../pub-key-login");
-var pkl;
-(function (pkl) {
-    pkl.START_URL_END = pklApi.start.URL_END;
-    pkl.COMPL_URL_END = pklApi.complete.URL_END;
-})(pkl = exports.pkl || (exports.pkl = {}));
-Object.freeze(pkl);
+exports.serviceRoot = exports.certify = void 0;
 var certify;
 (function (certify) {
     certify.URL_END = 'certify';

package/build/lib-common/service-api/pub-key-login.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.complete = exports.start = exports.ERR_SC = void 0;
 /**

package/build/lib-common/service-api/web-socket-base.d.ts

@@ -16,7 +16,7 @@ export interface EventEnvelope<T> {
     eventChannel: string;
     eventPayload: T;
 }
-export declare type Envelope = RequestEnvelope<any> | ReplyEnvelope<any> | EventEnvelope<any>;
+export type Envelope = RequestEnvelope<any> | ReplyEnvelope<any> | EventEnvelope<any>;
 export declare namespace events {
     const MISSED_EVENTS_CHANNEL = "missed-events";
     const SUBSCRIBE_REQ_NAME = "subscribe";

package/build/lib-common/service-api/web-socket-base.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.errorReplyTo = exports.events = void 0;
 var events;

package/build/lib-common/session-encryptor.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.makeSessionEncryptor = void 0;
 /**

package/build/lib-common/time-window-cache.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.TimeWindowCache = void 0;
 class TimeWindowCache {

package/build/lib-server/mid-access.d.ts

@@ -0,0 +1,5 @@
+import { Factory as SessionsFactory, SessionParams } from './resources/sessions';
+import { MidAuthorizer } from "./routes/sessions/mid-auth";
+import { Express } from 'express';
+export type AccountExists = (id: string) => Promise<boolean>;
+export declare function addMailerIdLoginRoutes(app: Express, domain: string, urlPrefix: string, sessions: SessionsFactory<SessionParams>, accountExists: AccountExists, midAuthorizer: MidAuthorizer): void;

package/build/lib-server/mid-access.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ Copyright (C) 2024 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMailerIdLoginRoutes = void 0;
+const body_parsers_1 = require("./middleware/body-parsers");
+const start_1 = require("./routes/sessions/start");
+const mid_auth_1 = require("./routes/sessions/mid-auth");
+const api = require("../lib-common/service-api/mailer-id/login");
+function addMailerIdLoginRoutes(app, domain, urlPrefix, sessions, accountExists, midAuthorizer) {
+    app.post(urlPrefix + api.startSession.URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_1.startSession)(accountExists, sessions.generate));
+    app.post(urlPrefix + api.authSession.URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.json)('4kb'), (0, mid_auth_1.midLogin)(domain, midAuthorizer));
+}
+exports.addMailerIdLoginRoutes = addMailerIdLoginRoutes;

package/build/lib-server/middleware/body-parsers.d.ts

@@ -1,11 +1,11 @@
-import * as express from 'express';
-export declare function attachByteDrainToRequest(req: express.Request): void;
+import { Request, RequestHandler } from 'express';
+export declare function attachByteDrainToRequest(req: Request): void;
 /**
  * Use this for empty-body POST and PUT routes, as it does sanitization, and
  * prevents hanging requests, because nothing drains data.
  * @return a middleware function that ensures empty body in requests.
  */
-export declare function emptyBody(): express.RequestHandler;
+export declare function emptyBody(): RequestHandler;
 /**
  * @param req
  * @param expectedLen is an expected non-zero length of a binary body.
@@ -13,14 +13,14 @@ export declare function emptyBody(): express.RequestHandler;
  * @return a promise, resolvable to request's body bytes, parsed from a request
  * object.
  */
-export declare function parseBinaryBodyWithExpectedSize(req: express.Request, expectedLen: number): Promise<Uint8Array>;
+export declare function parseBinaryBodyWithExpectedSize(req: Request, expectedLen: number): Promise<Uint8Array>;
 /**
  * @param maxSize is a maximum allowed body length, given as number of bytes,
  * or string parameter for kb/mb's.
  * @return middleware function, that places all request bytes into Buffer,
  * placed into usual body field of request object.
  */
-export declare function binary(maxSize: string | number): express.RequestHandler;
+export declare function binary(maxSize: string | number): RequestHandler;
 /**
  * @param maxSize is a maximum allowed body length, given as number of bytes,
  * or string parameter for kb/mb's.
@@ -29,11 +29,11 @@ export declare function binary(maxSize: string | number): express.RequestHandler
  * @return middleware function, that parses all request bytes as JSON, placing
  * result into usual body field of request object.
  */
-export declare function json(maxSize: string | number, allowNonObject?: boolean): express.RequestHandler;
+export declare function json(maxSize: string | number, allowNonObject?: boolean): RequestHandler;
 /**
  * @param maxSize is a maximum allowed body length, given as number of bytes, or
  * string parameter for kb/mb's.
  * @return middleware function, that parses all request bytes as utf8 text,
  * placing result into usual body field of request object.
  */
-export declare function textPlain(maxSize: string | number): express.RequestHandler;
+export declare function textPlain(maxSize: string | number): RequestHandler;

package/build/lib-server/middleware/body-parsers.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2025 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
@@ -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.textPlain = exports.json = exports.binary = exports.parseBinaryBodyWithExpectedSize = exports.emptyBody = exports.attachByteDrainToRequest = void 0;
 const conf_util_1 = require("../conf-util");
@@ -30,22 +31,19 @@ const TYPES = {
     json: 'application/json',
     bin: 'application/octet-stream'
 };
-const noop = {
-    onData: (chunk) => { },
-    onEnd: () => { }
-};
 function attachByteDrainToRequest(req) {
-    req.on('data', noop.onData);
-    req.on('end', noop.onEnd);
+    req.on('data', noop);
+    req.on('end', noop);
 }
 exports.attachByteDrainToRequest = attachByteDrainToRequest;
+function noop() { }
 /**
  * Use this for empty-body POST and PUT routes, as it does sanitization, and
  * prevents hanging requests, because nothing drains data.
  * @return a middleware function that ensures empty body in requests.
  */
 function emptyBody() {
-    return (req, res, next) => {
+    return (req, _res, next) => {
         attachByteDrainToRequest(req);
         // get and check Content-Length
         const contentLength = parseInt(req.get(HTTP_HEADER.contentLength), 10);
@@ -195,16 +193,18 @@ exports.binary = binary;
  * result into usual body field of request object.
  */
 function json(maxSize, allowNonObject) {
-    return byteCollector(maxSize, TYPES.json, (req, res, next) => {
+    return byteCollector(maxSize, TYPES.json, (req, _res, next) => {
         try {
             const bodyAsStr = req.body.toString('utf8');
-            req.body = JSON.parse(bodyAsStr);
+            req.body = ((bodyAsStr === '') ?
+                undefined :
+                JSON.parse(bodyAsStr));
         }
         catch (err) {
             return next((0, error_handler_1.makeErr)(400, "Request body cannot be interpreted as JSON."));
         }
-        if (!allowNonObject &&
-            (!req.body || (typeof req.body !== 'object'))) {
+        if (!allowNonObject
+            && (!req.body || (typeof req.body !== 'object'))) {
             return next((0, error_handler_1.makeErr)(400, "Request body is not a JSON object."));
         }
         next();
@@ -218,7 +218,7 @@ exports.json = json;
  * placing result into usual body field of request object.
  */
 function textPlain(maxSize) {
-    return byteCollector(maxSize, TYPES.plain, (req, res, next) => {
+    return byteCollector(maxSize, TYPES.plain, (req, _res, next) => {
         try {
             req.body = req.body.toString('utf8');
         }

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

@@ -11,6 +11,6 @@ export interface HttpError extends ErrorWithCause {
  * @param cause
  */
 export declare function makeErr(code: number, msg: string, cause?: any): HttpError;
-export declare type ErrLogger = (err: any, req: Request) => void;
+export 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/pkl-access.d.ts

@@ -0,0 +1,4 @@
+import { Express } from 'express';
+import { Factory as SessionsFactory } from './resources/sessions';
+import { ComputeDHSharedKey, GetUserPKeyAndKeyGenParams, SessionParams } from './routes/pub-key-login/start-exchange';
+export declare function addPKLLoginRoutes(app: Express, urlPrefix: string, getUserParamsAndKey: GetUserPKeyAndKeyGenParams, sessions: SessionsFactory<SessionParams>, computeDHSharedKey: ComputeDHSharedKey): void;

package/build/lib-server/pkl-access.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ Copyright (C) 2024 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+ 
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addPKLLoginRoutes = void 0;
+const body_parsers_1 = require("./middleware/body-parsers");
+const start_exchange_1 = require("./routes/pub-key-login/start-exchange");
+const complete_exchange_1 = require("./routes/pub-key-login/complete-exchange");
+const api = require("../lib-common/service-api/pub-key-login");
+function addPKLLoginRoutes(app, urlPrefix, getUserParamsAndKey, sessions, computeDHSharedKey) {
+    app.post(urlPrefix + api.start.URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_exchange_1.startPKLogin)(getUserParamsAndKey, sessions.generate, computeDHSharedKey));
+    app.post(urlPrefix + api.complete.URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.binary)('1kb'), (0, complete_exchange_1.completePKLogin)());
+}
+exports.addPKLLoginRoutes = addPKLLoginRoutes;

package/build/lib-server/resources/dns.d.ts

@@ -2,5 +2,5 @@ export declare const SC: {
     RECORDS_MISSING: string;
     DOMAIN_NOT_FOUND: string;
 };
-export declare type ServiceLabel = 'asmail' | 'mailerid' | '3nstorage';
+export type ServiceLabel = 'asmail' | 'mailerid' | '3nstorage';
 export declare function get3NWebRecords(address: string, serviceLabel: ServiceLabel): Promise<string>;

package/build/lib-server/resources/dns.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.get3NWebRecords = exports.SC = void 0;
 const dns = require("dns");

package/build/lib-server/resources/mailerid-authorizer.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.validator = void 0;
 const https = require("https");
@@ -62,9 +63,7 @@ function getRootCert(serviceURL) {
 // TODO need to add caching of certs using domain->(kid->cert)
 //		(this will speed things up)
 function validator() {
-    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => {
-        return validate(rpDomain, sessionId, userId, assertion, userCert, provCert);
-    };
+    return (rpDomain, sessionId, userId, assertion, userCert, provCert) => validate(rpDomain, sessionId, userId, assertion, userCert, provCert);
 }
 exports.validator = validator;
 async function validate(rpDomain, sessionId, userId, assertion, userCert, provCert) {
@@ -86,8 +85,8 @@ async function validate(rpDomain, sessionId, userId, assertion, userCert, provCe
         // get root certificate and check the whole chain
         const rootCert = await getRootCert(serviceURL);
         const assertInfo = mid.relyingParty.verifyAssertion(assertion, { user: userCert, prov: provCert, root: rootCert }, issuer, validAt);
-        if ((assertInfo.relyingPartyDomain === rpDomain) &&
-            (assertInfo.sessionId === sessionId)) {
+        if ((assertInfo.relyingPartyDomain === rpDomain)
+            && (assertInfo.sessionId === sessionId)) {
             return true;
         }
         else {

package/build/lib-server/resources/server-data-folders.d.ts

@@ -36,6 +36,7 @@ export interface UserDataTree {
 export declare function treeInRootFolder(rootFolder: string): RootDataTree;
 export declare function tokensInRootFolder(rootFolder: string): string;
 export declare function userDataInRootFolder(root: string, userId: string): string;
+export declare function lockerDataInRootFolder(root: string, lockerId: string): string;
 export declare function treeInDefaultsFolder(defaults: string): DefaultsDataTree;
 export declare function treeInUserFolder(userFoder: string): UserDataTree;
 export declare function createFolderTree(structure: RootDataTree | UserDataTree | DefaultsDataTree | FolderDef): Promise<void>;

package/build/lib-server/resources/server-data-folders.js

@@ -16,17 +16,17 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFolderTreeSync = exports.createFolderTree = exports.treeInUserFolder = exports.treeInDefaultsFolder = exports.userDataInRootFolder = exports.tokensInRootFolder = exports.treeInRootFolder = exports.addressToFName = void 0;
+exports.createFolderTreeSync = exports.createFolderTree = exports.treeInUserFolder = exports.treeInDefaultsFolder = exports.lockerDataInRootFolder = exports.userDataInRootFolder = exports.tokensInRootFolder = exports.treeInRootFolder = exports.addressToFName = void 0;
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const path_1 = require("path");
 const fs_1 = require("fs");
 function addressToFName(address) {
-    return canonicalAddressToFName((0, canonical_address_1.toCanonicalAddress)(address));
+    return idStringToFName((0, canonical_address_1.toCanonicalAddress)(address));
 }
 exports.addressToFName = addressToFName;
-function canonicalAddressToFName(canonicalAddress) {
-    return buffer_utils_1.base64urlSafe.pack(buffer_utils_1.utf8.pack(canonicalAddress));
+function idStringToFName(id) {
+    return buffer_utils_1.base64urlSafe.pack(buffer_utils_1.utf8.pack(id));
 }
 function treeInRootFolder(rootFolder) {
     const defaults = (0, path_1.join)(rootFolder, 'defaults');
@@ -47,6 +47,11 @@ function userDataInRootFolder(root, userId) {
     return (0, path_1.join)(root, 'users', addressToFName(userId));
 }
 exports.userDataInRootFolder = userDataInRootFolder;
+// XXX use this instead of userDataInRootFolder for locker storage
+function lockerDataInRootFolder(root, lockerId) {
+    return (0, path_1.join)(root, 'lockers', idStringToFName(lockerId));
+}
+exports.lockerDataInRootFolder = lockerDataInRootFolder;
 function treeInDefaultsFolder(defaults) {
     const mail = (0, path_1.join)(defaults, 'mail');
     const mailParams = (0, path_1.join)(mail, 'params');

package/build/{mailerId/resources/compute-login-dhshared-key.js → lib-server/resources/server-key-for-pkl-challenge.js}

@@ -22,14 +22,14 @@ exports.calcNaClBoxSharedKey = void 0;
  */
 const ecma_nacl_1 = require("ecma-nacl");
 const random = require("../../lib-common/random-node");
-// XXX update the key from time-to-time
-const testLoginSecretKey = random.bytesSync(32);
-const testLoginPublicKey = ecma_nacl_1.box.generate_pubkey(testLoginSecretKey);
+// XXX update the key from time-to-time, and this must be single instance
+const skeyForPKLChallenge = random.bytesSync(32);
+const pkeyForPKLChallenge = ecma_nacl_1.box.generate_pubkey(skeyForPKLChallenge);
 function calcNaClBoxSharedKey(userPubKey) {
-    const dhsharedKey = ecma_nacl_1.box.calc_dhshared_key(userPubKey, testLoginSecretKey);
+    const dhsharedKey = ecma_nacl_1.box.calc_dhshared_key(userPubKey, skeyForPKLChallenge);
     return {
         dhsharedKey: dhsharedKey,
-        serverPubKey: testLoginPublicKey
+        serverPubKey: pkeyForPKLChallenge
     };
 }
 exports.calcNaClBoxSharedKey = calcNaClBoxSharedKey;

package/build/lib-server/resources/sessions.d.ts

@@ -22,8 +22,8 @@ export interface Request<T> extends express.Request {
 export interface BaseRequest<T> extends http.IncomingMessage {
     session: Session<T>;
 }
-export declare type CheckSession<T> = (req: BaseRequest<T>) => Promise<boolean>;
-export declare type GenerateSession<T> = () => Promise<Session<T>>;
+export type CheckSession<T> = (req: BaseRequest<T>) => Promise<boolean>;
+export type GenerateSession<T> = () => Promise<Session<T>>;
 export interface Factory<T> {
     generate: GenerateSession<T>;
     ensureAuthorizedSession(): express.RequestHandler;

package/build/lib-server/resources/sessions.js

@@ -13,10 +13,10 @@
  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.wrapFactory = exports.BaseSessionFactory = exports.SESSION_ID_HEADER = void 0;
-const binding_1 = require("../../lib-common/binding");
 // Constant custom header
 exports.SESSION_ID_HEADER = "X-Session-Id";
 const LOW_CASED_SESSION_ID_HEADER = exports.SESSION_ID_HEADER.toLowerCase();
@@ -171,11 +171,11 @@ Object.freeze(BaseSessionFactory.prototype);
 Object.freeze(BaseSessionFactory);
 function wrapFactory(impl) {
     const wrap = {
-        checkSession: (0, binding_1.bind)(impl, impl.checkSession),
-        ensureAuthorizedSession: (0, binding_1.bind)(impl, impl.ensureAuthorizedSession),
-        ensureOpenedSession: (0, binding_1.bind)(impl, impl.ensureOpenedSession),
-        ensureAuthorizedSessionForSocketStart: (0, binding_1.bind)(impl, impl.ensureAuthorizedSessionForSocketStart),
-        generate: (0, binding_1.bind)(impl, impl.generate)
+        checkSession: impl.checkSession.bind(impl),
+        ensureAuthorizedSession: impl.ensureAuthorizedSession.bind(impl),
+        ensureOpenedSession: impl.ensureOpenedSession.bind(impl),
+        ensureAuthorizedSessionForSocketStart: impl.ensureAuthorizedSessionForSocketStart.bind(impl),
+        generate: impl.generate.bind(impl)
     };
     return wrap;
 }

package/build/lib-server/resources/user-files.d.ts

@@ -3,7 +3,7 @@ export declare const SC: {
     USER_UNKNOWN: string;
 };
 export declare function addressToFName(address: string): string;
-export declare abstract class UserFiles {
+export declare abstract class UserFiles<ParamTypes extends object> {
     readonly userId: string;
     readonly path: string;
     protected readonly fileWritingBufferSize: number;
@@ -12,10 +12,10 @@ export declare abstract class UserFiles {
     ensureUserExistsOnDisk(): Promise<void>;
     private commonInfoFolder;
     getSpaceQuota(): Promise<number>;
-    getParam<T>(paramFileName: string): Promise<T>;
-    setParam<T>(paramFileName: string, param: T): Promise<void>;
+    getParam<P extends keyof ParamTypes>(paramFileName: P): Promise<ParamTypes[P]>;
+    protected setParam<P extends keyof ParamTypes>(paramFileName: P, param: ParamTypes[P]): Promise<void>;
 }
-export declare type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
+export type ObjPipe = (outStream: NodeJS.WritableStream) => Promise<void>;
 export interface ObjReader {
     len: number;
     /**

package/build/lib-server/resources/user-files.js

@@ -70,10 +70,12 @@ class UserFiles {
         return readJsonFile((0, path_1.join)(this.commonInfoFolder(), 'quota'));
     }
     getParam(paramFileName) {
-        return readJsonFile((0, path_1.join)(this.path, 'params', paramFileName));
+        const filePath = (0, path_1.join)(this.path, 'params', paramFileName);
+        return readJsonFile(filePath);
     }
     setParam(paramFileName, param) {
-        return fs.writeFile((0, path_1.join)(this.path, 'params', paramFileName), JSON.stringify(param), { encoding: 'utf8', flag: 'w' });
+        const filePath = (0, path_1.join)(this.path, 'params', paramFileName);
+        return fs.writeFile(filePath, JSON.stringify(param), { encoding: 'utf8', flag: 'w' });
     }
 }
 exports.UserFiles = UserFiles;

package/build/lib-server/routes/pub-key-login/start-exchange.d.ts

@@ -10,7 +10,7 @@ export interface SessionParams extends UserParams {
     sessionKey: Uint8Array;
     serverVerificationBytes: Uint8Array;
 }
-export declare type Request = SessReq<SessionParams>;
+export type Request = SessReq<SessionParams>;
 export interface UserPKeyAndKeyGenParams {
     pkey: Uint8Array;
     params?: any;
@@ -22,7 +22,7 @@ export interface UserPKeyAndKeyGenParams {
  * Else, if incoming id is not ok, undefined is returned.
  * @params initUserId is a an incoming string, that should be an id
  */
-export declare type CheckAndTransformUserId = (initUserId: string) => string | undefined;
+export type CheckAndTransformUserId = (initUserId: string) => string | undefined;
 /**
  * This returns a promise of user public key and related parameters.
  * If user is not found, undefined is returned.
@@ -30,8 +30,8 @@ export declare type CheckAndTransformUserId = (initUserId: string) => string | u
  * @param kid is a key id that should be used at login. Undefined value
  * indicates that default key should be used.
  */
-export declare type GetUserPKeyAndKeyGenParams = (userId: string, kid: string | undefined) => Promise<UserPKeyAndKeyGenParams | undefined>;
-export declare type ComputeDHSharedKey = (userKey: Uint8Array) => {
+export type GetUserPKeyAndKeyGenParams = (userId: string, kid: string | undefined) => Promise<UserPKeyAndKeyGenParams | undefined>;
+export type ComputeDHSharedKey = (userKey: Uint8Array) => {
     dhsharedKey: Uint8Array;
     serverPubKey: Uint8Array;
 };

package/build/lib-server/routes/sessions/close.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.closeSession = void 0;
 function closeSession() {

package/build/lib-server/routes/sessions/mid-auth.d.ts

@@ -6,7 +6,7 @@ import { SignedLoad } from '../../../lib-common/jwkeys';
  * Autherization failure may be due to either, invalid MailerId credentials, or
  * due to other service's restriction(s) on users.
  */
-export declare type MidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
+export type MidAuthorizer = (rpDomain: string, sessionId: string, userId: string, mailerIdAssertion: SignedLoad, userCert: SignedLoad, provCert: SignedLoad) => Promise<boolean>;
 /**
  * @param relyingPartyDomain is a domain of service, for which this assertion
  * check is done. Usually, it is this site's domain, which we set explicitly.

package/build/lib-server/routes/sessions/start.d.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express';
 import { GenerateSession, Request as SessionReq, SessionParams } from '../../resources/sessions';
-export declare type Request = SessionReq<SessionParams>;
+export type Request = SessionReq<SessionParams>;
 /**
  * This function checks overall shape of a given user id, possibly
  * transforming it to some canonical form, used by the service.
@@ -8,9 +8,9 @@ export declare type Request = SessionReq<SessionParams>;
  * Else, if incoming id is not ok, undefined is returned.
  * @params initUserId is a an incoming string, that should be an id
  */
-export declare type CheckAndTransformUserId = (initUserId: string) => string | undefined;
-export declare type UserExists = (userId: string) => Promise<boolean>;
-export declare type Redirect = (userId: string) => Promise<string>;
+export type CheckAndTransformUserId = (initUserId: string) => string | undefined;
+export type UserExists = (userId: string) => Promise<boolean>;
+export type Redirect = (userId: string) => Promise<string>;
 /**
  * This returns route handler that creates sessions for a given userId, with
  * potential redirect for a named user.

package/build/lib-server/web-sockets/app.d.ts

@@ -5,7 +5,7 @@ import * as https from 'https';
 import * as express from 'express';
 import * as WebSocket from 'ws';
 import { CheckSession, SessionParams } from '../resources/sessions';
-export declare type HttpServer = http.Server | https.Server;
+export type HttpServer = http.Server | https.Server;
 export declare class UserSockets {
     checkSession: CheckSession<SessionParams>;
     /**

package/build/lib-server/web-sockets/app.js

@@ -21,7 +21,6 @@ const http = require("http");
 const https = require("https");
 const express = require("express");
 const WebSocket = require("ws");
-const binding_1 = require("../../lib-common/binding");
 const map_of_sets_1 = require("../../lib-common/map-of-sets");
 const url_1 = require("url");
 const MAX_MSG_PAYLOAD = 4 * 1024;
@@ -57,9 +56,9 @@ class UserSocketsServer {
             server,
             clientTracking: true,
             maxPayload: MAX_MSG_PAYLOAD,
-            verifyClient: (0, binding_1.bind)(this, this.verifyClient)
+            verifyClient: this.verifyClient.bind(this)
         })
-            .on('connection', (0, binding_1.bind)(this, this.handleConnection)) // bad @types
+            .on('connection', this.handleConnection.bind(this))
             .on('error', (err) => { console.error(err); });
     }
     disconnect() {
@@ -209,6 +208,12 @@ class PingSender {
 Object.freeze(PingSender.prototype);
 Object.freeze(PingSender);
 class AppWithWSs {
+    get sockServer() {
+        if (!this.socks) {
+            this.socks = new UserSocketsServer();
+        }
+        return this.socks;
+    }
     constructor(httpApp) {
         this.server = undefined;
         this.closingProc = undefined;
@@ -216,12 +221,6 @@ class AppWithWSs {
         this.http = (httpApp ? httpApp : express());
         Object.seal(this);
     }
-    get sockServer() {
-        if (!this.socks) {
-            this.socks = new UserSocketsServer();
-        }
-        return this.socks;
-    }
     addWS(path, socks) {
         if (typeof path === 'string') {
             socks.path = ensureSlashesOnFront(path);

package/build/lib-server/web-sockets/server-events.d.ts

@@ -1,6 +1,6 @@
 import * as WebSocket from 'ws';
 import { SocketIPCs } from './app';
-export declare type EventsSink<T> = (userId: string, channel: string, event: T) => void;
+export type EventsSink<T> = (userId: string, channel: string, event: T) => void;
 export declare class ServerEvents<T> implements SocketIPCs {
     ipcChannel: string | undefined;
     private eventChannels;

package/build/lib-server/web-sockets/server-events.js

@@ -18,7 +18,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerEvents = void 0;
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
-const binding_1 = require("../../lib-common/binding");
 class ServerEvents {
     constructor(ipcChannel, eventChannels, getSocket) {
         this.ipcChannel = ipcChannel;
@@ -49,7 +48,7 @@ class ServerEvents {
         }
     }
     get eventsSink() {
-        return (0, binding_1.bind)(this, this.sendEvent);
+        return this.sendEvent.bind(this);
     }
 }
 exports.ServerEvents = ServerEvents;