core-3nweb-client-lib 0.35.0 → 0.35.2

package/build/api-defs/keys.d.ts

@@ -121,7 +121,7 @@ declare namespace web3n.keys {
 
 	interface Keyrings {
 
-		introKeyToPublishOnASMailServer: IntroKeyOnASMailServer;
+		introKeyOnASMailServer: IntroKeyOnASMailServer;
 
 	}
 
@@ -129,13 +129,13 @@ declare namespace web3n.keys {
 
 		/**
 		 * Returns introductory key certificates chain that should be published on
-		 * ASMail server, and undefined, if there should be nothing on the server.
+		 * ASMail server, and null, if there should be nothing on the server.
 		 */
-		getCurrent(): Promise<PKeyCertChain|undefined>;
+		getCurrent(): Promise<PKeyCertChain|null>;
 
 		remove(): Promise<void>;
 
-		makeNew(): Promise<PKeyCertChain>;
+		makeAndPublishNew(): Promise<PKeyCertChain>;
 
 	}
 

package/build/core/asmail/asmail-cap-ipc.js

@@ -568,8 +568,8 @@ function callConfig(caller, objPath, method) {
 }
 function makeConfigCaller(caller, objPath) {
     return {
-        getOnServer: callConfig(caller, objPath.concat('getOnServer'), 'getOnServer'),
-        setOnServer: callConfig(caller, objPath.concat('setOnServer'), 'setOnServer')
+        getOnServer: callConfig(caller, objPath, 'getOnServer'),
+        setOnServer: callConfig(caller, objPath, 'setOnServer')
     };
 }
 Object.freeze(exports);

package/build/core/asmail/config.js

@@ -32,7 +32,10 @@ class ConfigOfASMailServer {
     makeCAP() {
         const w = {
             getOnServer: this.serverConfig.getParam.bind(this.serverConfig),
-            setOnServer: this.serverConfig.setParam.bind(this.serverConfig)
+            setOnServer: async (param, value) => {
+                ensureParameterCanBeSetDirectly(param);
+                this.serverConfig.setParam(param, value);
+            }
         };
         return Object.freeze(w);
     }
@@ -40,4 +43,12 @@ class ConfigOfASMailServer {
 exports.ConfigOfASMailServer = ConfigOfASMailServer;
 Object.freeze(ConfigOfASMailServer.prototype);
 Object.freeze(ConfigOfASMailServer);
+function ensureParameterCanBeSetDirectly(param) {
+    switch (param) {
+        case 'init-pub-key':
+            throw new Error(`Parameter ${param} can't be set directly to server`);
+        default:
+            return;
+    }
+}
 Object.freeze(exports);

package/build/core/keyring/index.js

@@ -318,11 +318,7 @@ class Keyrings {
     }
     makeKeyringsCAP() {
         const w = {
-            introKeyToPublishOnASMailServer: {
-                getCurrent: async () => { throw new Error(`not implemented, yet`); },
-                makeNew: async () => { throw new Error(`not implemented, yet`); },
-                remove: async () => { throw new Error(`not implemented, yet`); }
-            }
+            introKeyOnASMailServer: this.publishedKeys.makeIntroKeyCAP(),
         };
         return Object.freeze(w);
     }

package/build/core/keyring/keyrings-cap-ipc.js

@@ -22,13 +22,13 @@ const caller_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/caller-side
 const service_side_wrap_1 = require("../../core-ipc/json-ipc-wrapping/service-side-wrap");
 function exposeKeyringsCAP(cap) {
     return {
-        introKeyToPublishOnASMailServer: exposeIntroKey(cap.introKeyToPublishOnASMailServer),
+        introKeyOnASMailServer: exposeIntroKey(cap.introKeyOnASMailServer),
     };
 }
 function exposeIntroKey(cap) {
     return {
         getCurrent: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'getCurrent'),
-        makeNew: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'makeNew'),
+        makeAndPublishNew: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'makeAndPublishNew'),
         remove: (0, service_side_wrap_1.wrapReqReplySrvMethod)(cap, 'remove'),
     };
 }
@@ -37,14 +37,14 @@ function callIntroKeyOnASMailServer(caller, objPath, method) {
 }
 function makeIntroKeyCaller(caller, objPath) {
     return {
-        getCurrent: callIntroKeyOnASMailServer(caller, objPath.concat('getCurrent'), 'getCurrent'),
-        makeNew: callIntroKeyOnASMailServer(caller, objPath.concat('makeNew'), 'makeNew'),
-        remove: callIntroKeyOnASMailServer(caller, objPath.concat('remove'), 'remove'),
+        getCurrent: callIntroKeyOnASMailServer(caller, objPath, 'getCurrent'),
+        makeAndPublishNew: callIntroKeyOnASMailServer(caller, objPath, 'makeAndPublishNew'),
+        remove: callIntroKeyOnASMailServer(caller, objPath, 'remove'),
     };
 }
 function makeKeyringsCaller(caller, objPath) {
     return {
-        introKeyToPublishOnASMailServer: makeIntroKeyCaller(caller, objPath.concat('introKeyOnASMailServer')),
+        introKeyOnASMailServer: makeIntroKeyCaller(caller, objPath.concat('introKeyOnASMailServer')),
     };
 }
 Object.freeze(exports);

package/build/core/keyring/published-intro-key.d.ts

@@ -2,7 +2,7 @@ import { ParamOnServer } from '../../lib-client/asmail/service-config';
 import { GetSigner } from '../id-manager';
 import { JWKeyPair, MsgKeyRole } from './common';
 type WritableFile = web3n.files.WritableFile;
-export type PKeyCertChain = web3n.keys.PKeyCertChain;
+type IntroKeyCAP = web3n.keys.Keyrings['introKeyOnASMailServer'];
 export declare class PublishedIntroKey {
     private readonly getSigner;
     private pkeyOnServer;
@@ -18,11 +18,8 @@ export declare class PublishedIntroKey {
     private toFileJSON;
     private absorbRemoteChanges;
     private makeNewIntroKey;
-    /**
-     * This generates a new NaCl's box key pair, as a new introductory
-     * published key.
-     */
-    update(): Promise<void>;
+    private update;
+    private retireCurrent;
     /**
      * This looks for a published key with a given key id. If it is found, an
      * object is returned with following fields:
@@ -39,5 +36,8 @@ export declare class PublishedIntroKey {
         pair: JWKeyPair;
         replacedAt?: number;
     } | undefined;
+    makeIntroKeyCAP(): IntroKeyCAP;
+    private getCurrent;
+    private removeCurrent;
 }
 export {};

package/build/core/keyring/published-intro-key.js

@@ -26,7 +26,9 @@ class PublishedIntroKey {
     constructor(getSigner, pkeyOnServer) {
         this.getSigner = getSigner;
         this.pkeyOnServer = pkeyOnServer;
-        this.published = {};
+        this.published = {
+            previous: []
+        };
         this.periodicExpiryCheck = undefined;
         this.fileProc = new file_based_json_1.JsonFileProc(this.onFileEvent.bind(this));
         Object.seal(this);
@@ -82,16 +84,10 @@ class PublishedIntroKey {
                 return;
         }
     }
-    // protected async initStruct(): Promise<void> {
-    // 	const newPair = await this.makeNewIntroKey();
-    // 	this.published = {
-    // 		current: {
-    // 			keyPair: newPair.pair,
-    // 			certs: newPair.certs
-    // 		}
-    // 	};
-    // }
     setFromJSON(json) {
+        if (!Array.isArray(json.previous)) { // migration part
+            json.previous = (json.previous ? [json.previous] : []);
+        }
         this.published = json;
     }
     toFileJSON() {
@@ -120,23 +116,26 @@ class PublishedIntroKey {
         pair.createdAt = Date.now();
         return { pair, certs };
     }
-    /**
-     * This generates a new NaCl's box key pair, as a new introductory
-     * published key.
-     */
     update() {
         return this.fileProc.order.startOrChain(async () => {
             const { certs, pair: keyPair } = await this.makeNewIntroKey();
             await this.pkeyOnServer.setOnServer(certs);
-            if (this.published.current) {
-                this.published.current.keyPair.retiredAt = keyPair.createdAt;
-                this.published.previous = this.published.current.keyPair;
-            }
+            this.retireCurrent(keyPair.createdAt);
             this.published.current = { keyPair, certs };
             await this.fileProc.save(this.toFileJSON(), false);
+            return certs;
         });
     }
     ;
+    retireCurrent(retiredAt) {
+        if (!this.published.current) {
+            return;
+        }
+        const current = this.published.current;
+        current.keyPair.retiredAt = retiredAt;
+        this.published.previous.push(current.keyPair);
+        this.published.current = undefined;
+    }
     /**
      * This looks for a published key with a given key id. If it is found, an
      * object is returned with following fields:
@@ -158,17 +157,39 @@ class PublishedIntroKey {
             };
         }
         // check previous key
-        if (this.published.previous
-            && (this.published.previous.skey.kid === kid)) {
+        const pair = this.published.previous.find(({ skey }) => (skey.kid === kid));
+        if (pair) {
             return {
                 role: 'prev_published_intro',
-                pair: this.published.previous,
-                replacedAt: this.published.previous.retiredAt
+                pair,
+                replacedAt: pair.retiredAt
             };
         }
         // if nothing found, explicitly return undefined
         return;
     }
+    makeIntroKeyCAP() {
+        const w = {
+            getCurrent: this.getCurrent.bind(this),
+            makeAndPublishNew: this.update.bind(this),
+            remove: this.removeCurrent.bind(this)
+        };
+        return Object.freeze(w);
+    }
+    async getCurrent() {
+        var _a;
+        const certs = (_a = this.published.current) === null || _a === void 0 ? void 0 : _a.certs;
+        return (certs ? certs : null);
+    }
+    async removeCurrent() {
+        if (!this.published.current) {
+            return;
+        }
+        return this.fileProc.order.startOrChain(async () => {
+            await this.pkeyOnServer.setOnServer(null);
+            this.retireCurrent(Math.floor(Date.now() / 1000));
+        });
+    }
 }
 exports.PublishedIntroKey = PublishedIntroKey;
 Object.freeze(PublishedIntroKey.prototype);

package/build/core-ipc/common-caps.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2021, 2023 - 2024 3NSoft Inc.
+ Copyright (C) 2020 - 2021, 2023 - 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

package/build/lib-client/asmail/service-config.d.ts

@@ -9,7 +9,8 @@ export interface ParamOnServer<P extends keyof ASMailConfigParams> {
     getFromServer: () => Promise<ASMailConfigParams[P] | null>;
 }
 export declare class MailConfigurator extends ServiceUser {
-    constructor(userId: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient);
+    private readonly sleepMillisAfterParamSetting;
+    constructor(userId: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient, sleepMillisAfterParamSetting?: number);
     getParam<P extends keyof ASMailConfigParams>(param: P): Promise<ASMailConfigParams[P] | null>;
     setParam<P extends keyof ASMailConfigParams>(param: P, value: ASMailConfigParams[P] | null): Promise<void>;
     makeParamSetterAndGetter<P extends keyof ASMailConfigParams>(param: P): ParamOnServer<P>;

package/build/lib-client/asmail/service-config.js

@@ -23,14 +23,16 @@ const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/asmail/config");
 const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
+const sleep_1 = require("../../lib-common/processes/sleep");
 const configAccessParams = {
     login: api.midLogin.MID_URL_PART,
     logout: api.closeSession.URL_END,
     canBeRedirected: true
 };
 class MailConfigurator extends user_with_mid_session_1.ServiceUser {
-    constructor(userId, getSigner, mainUrlGetter, net) {
+    constructor(userId, getSigner, mainUrlGetter, net, sleepMillisAfterParamSetting = 50) {
         super(userId, configAccessParams, getSigner, serviceUriGetter(net, mainUrlGetter), net);
+        this.sleepMillisAfterParamSetting = sleepMillisAfterParamSetting;
         Object.seal(this);
     }
     async getParam(param) {
@@ -54,6 +56,8 @@ class MailConfigurator extends user_with_mid_session_1.ServiceUser {
         if (rep.status !== api.PARAM_SC.ok) {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
+        // wait to let possibly distributed system to propagate updates internally
+        await (0, sleep_1.sleep)(this.sleepMillisAfterParamSetting);
     }
     makeParamSetterAndGetter(param) {
         return {