core-3nweb-client-lib 0.41.8 → 0.41.11

package/build/lib-client/cryptor/worker-js.js

@@ -19,16 +19,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const worker_threads_1 = require("worker_threads");
 const ecma_nacl_1 = require("ecma-nacl");
 const error_1 = require("../../lib-common/exceptions/error");
-function transfer(...arrs) {
-    const transferLst = [];
-    for (const arr of arrs) {
-        const buffer = arr.buffer;
-        if (!transferLst.includes(buffer)) {
-            transferLst.push(buffer);
-        }
-    }
-    return transferLst;
-}
 if (!worker_threads_1.parentPort) {
     throw new Error(`Missing expected parentPort. Is this called within WebWorker process?`);
 }

package/build/lib-client/mailer-id/provisioner.js

@@ -58,10 +58,10 @@ class MailerIdProvisioner extends user_with_pkl_session_1.ServiceUser {
         Object.seal(this);
     }
     async setUrlAndDomain() {
-        const info = await (0, service_locator_1.mailerIdInfoAt)(this.net, this.entryURI);
+        const { currentCert, provisioning } = await (0, service_locator_1.mailerIdInfoAt)(this.net, this.entryURI);
         this.midDomain = (0, url_1.parse)(this.serviceURI).hostname;
-        this.serviceURI = info.provisioning;
-        this.rootCert = info.currentCert;
+        this.serviceURI = provisioning;
+        this.rootCert = currentCert;
     }
     /**
      * @param pkey is a public key, that needs to be certified.
@@ -73,10 +73,7 @@ class MailerIdProvisioner extends user_with_pkl_session_1.ServiceUser {
      */
     async getCertificates(pkey, duration) {
         (0, assert_1.assert)(!!this.encryptor);
-        const plainReqData = {
-            pkey: pkey,
-            duration: duration
-        };
+        const plainReqData = { pkey, duration };
         const rep = await this.net.doBinaryRequest({
             url: this.serviceURI + api.certify.URL_END,
             method: api.certify.method,
@@ -95,6 +92,17 @@ class MailerIdProvisioner extends user_with_pkl_session_1.ServiceUser {
                 if (!certs.userCert || !certs.provCert) {
                     throw (0, request_utils_1.makeException)(rep, 'Malformed reply: Certificates are missing.');
                 }
+                if (certs.provCert.kid !== this.rootCert.kid) {
+                    const { currentCert, previousCerts } = await (0, service_locator_1.mailerIdInfoAt)(this.net, this.entryURI);
+                    const rootCert = ((currentCert.kid === certs.provCert.kid) ?
+                        currentCert : previousCerts.find(cert => (cert.kid === certs.provCert.kid)));
+                    if (rootCert) {
+                        this.rootCert = rootCert;
+                    }
+                    else {
+                        throw (0, request_utils_1.makeException)(rep, 'Malformed reply: referenced root MailerId certificate id is unknown.');
+                    }
+                }
                 const pkeyAndId = (0, relying_party_1.verifyChainAndGetUserKey)({ user: certs.userCert, prov: certs.provCert, root: this.rootCert }, this.midDomain, (0, jwkeys_1.getKeyCert)(certs.userCert).issuedAt + 1);
                 if (pkeyAndId.address !== (0, canonical_address_1.toCanonicalAddress)(this.userId)) {
                     throw (0, request_utils_1.makeException)(rep, 'Malformed reply: Certificate is for a wrong address.');

package/build/lib-client/server-events.d.ts

@@ -1,11 +1,13 @@
 import { SubscribingClient } from '../lib-common/ipc/generic-ipc';
 import { Observable } from 'rxjs';
+import { LogError } from './logging/log-to-file';
 export declare class ServerEvents<N extends string, T> {
-    private subscribeToServer;
+    private readonly subscribeToServer;
     private restartWaitSecs;
+    private readonly logError;
     private server;
     private openningServer;
-    constructor(subscribeToServer: () => Promise<SubscribingClient>, restartWaitSecs: number);
+    constructor(subscribeToServer: () => Promise<SubscribingClient>, restartWaitSecs: number, logError: LogError);
     /**
      * This method creates an observable of server's events.
      * @param event is an event on server, to which to subscribe.

package/build/lib-client/server-events.js

@@ -23,9 +23,10 @@ const sleep_1 = require("../lib-common/processes/sleep");
 const operators_1 = require("rxjs/operators");
 const error_1 = require("../lib-common/exceptions/error");
 class ServerEvents {
-    constructor(subscribeToServer, restartWaitSecs) {
+    constructor(subscribeToServer, restartWaitSecs, logError) {
         this.subscribeToServer = subscribeToServer;
         this.restartWaitSecs = restartWaitSecs;
+        this.logError = logError;
         this.server = undefined;
         this.openningServer = new synced_1.SingleProc();
         Object.seal(this);
@@ -72,13 +73,18 @@ class ServerEvents {
                 }
             };
         })
-            .pipe((0, operators_1.catchError)(err => {
+            .pipe(
+        // XXX tap to log more details
+        (0, operators_1.tap)({
+            complete: () => this.logError({}, `ServerEvents.observe stream completes`),
+            error: err => this.logError(err, `ServerEvents.observe stream has error`)
+        }), (0, operators_1.catchError)(err => {
             if (this.shouldRestartAfterErr(err)) {
                 console.error((0, error_1.stringifyErr)(err));
                 return this.restartObservation(event);
             }
             else {
-                return (0, rxjs_1.throwError)(err);
+                return (0, rxjs_1.throwError)(() => err);
             }
         }));
         return event$;

package/build/lib-client/service-locator.d.ts

@@ -1,39 +1,31 @@
 import { NetClient } from './request-utils';
 import { promises as dnsPromises } from 'dns';
+import { StorageRootRoute } from '../lib-common/service-api/3nstorage/root-route';
+import { ASMailRootRoute } from '../lib-common/service-api/asmail/root-route';
 type SignedLoad = web3n.keys.SignedLoad;
-export interface ASMailRoutes {
-    delivery?: string;
-    retrieval?: string;
-    config?: string;
-}
 /**
- * This returns a promise, resolvable to ASMailRoutes object.
+ * This returns a promise, resolvable to ASMailRootRoute object.
  * @param client
  * @param url
  */
-export declare function asmailInfoAt(client: NetClient, url: string): Promise<ASMailRoutes>;
+export declare function asmailInfoAt(client: NetClient, url: string): Promise<ASMailRootRoute>;
 export interface MailerIdServiceInfo {
     provisioning: string;
     currentCert: SignedLoad;
     previousCerts: SignedLoad[];
 }
 /**
- * This returns a promise, resolvable to MailerIdRoutes object.
+ * This returns a promise, resolvable to MailerIdRootRoute object.
  * @param client
  * @param url
  */
 export declare function mailerIdInfoAt(client: NetClient, url: string): Promise<MailerIdServiceInfo>;
-export interface StorageRoutes {
-    owner?: string;
-    shared?: string;
-    config?: string;
-}
 /**
- * This returns a promise, resolvable to StorageRoutes object.
+ * This returns a promise, resolvable to StorageRootRoute object.
  * @param client
  * @param url
  */
-export declare function storageInfoAt(client: NetClient, url: string): Promise<StorageRoutes>;
+export declare function storageInfoAt(client: NetClient, url: string): Promise<StorageRootRoute>;
 export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
 export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;

package/build/lib-client/service-locator.js

@@ -59,7 +59,7 @@ function transformPathToCompleteUri(url, path, rep) {
     }
 }
 /**
- * This returns a promise, resolvable to ASMailRoutes object.
+ * This returns a promise, resolvable to ASMailRootRoute object.
  * @param client
  * @param url
  */
@@ -80,7 +80,7 @@ async function asmailInfoAt(client, url) {
     return transform;
 }
 /**
- * This returns a promise, resolvable to MailerIdRoutes object.
+ * This returns a promise, resolvable to MailerIdRootRoute object.
  * @param client
  * @param url
  */
@@ -94,10 +94,10 @@ async function mailerIdInfoAt(client, url) {
     else {
         throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
     }
-    if (('object' === typeof json["current-cert"]) &&
-        (0, jwkeys_1.isLikeSignedKeyCert)(json["current-cert"])) {
+    if ((0, jwkeys_1.isLikeSignedKeyCert)(json["current-cert"])) {
         transform.currentCert = json["current-cert"];
-        transform.previousCerts = json["previous-certs"];
+        transform.previousCerts = (Array.isArray(json["previous-certs"]) ?
+            json["previous-certs"].filter(jwkeys_1.isLikeSignedKeyCert) : []);
     }
     else {
         throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
@@ -106,7 +106,7 @@ async function mailerIdInfoAt(client, url) {
     return transform;
 }
 /**
- * This returns a promise, resolvable to StorageRoutes object.
+ * This returns a promise, resolvable to StorageRootRoute object.
  * @param client
  * @param url
  */

package/build/lib-client/ws-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019 3NSoft Inc.
+ Copyright (C) 2017, 2019, 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
@@ -29,7 +29,7 @@ function openSocket(url, sessionId) {
     headers[request_utils_1.SESSION_ID_HEADER] = sessionId;
     const ws = new WebSocket(url, { headers, agent: https_1.globalAgent });
     const opening = (0, deferred_1.defer)();
-    const initOnError = err => opening.reject((0, http_1.makeConnectionException)(url, undefined, `Cannot open websocket connection due to error: ${err.message}`));
+    const initOnError = (err) => opening.reject((0, http_1.makeConnectionException)(url, undefined, `Cannot open websocket connection due to error: ${err.message}`));
     const onNonOkReply = (req, res) => {
         const errReply = {
             url,

package/build/lib-common/buffer-utils.d.ts

@@ -1,4 +1,4 @@
-export declare const EMPTY_BUFFER: Buffer;
+export declare const EMPTY_BUFFER: Buffer<ArrayBuffer>;
 /**
  * Buffer and Uint8Array are intimately linked in Node, starting with some
  * version. As a result, Uint8Array can be efficiently turned into Buffer,

package/build/lib-common/ipc/generic-ipc.js

@@ -13,15 +13,20 @@
  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.SingleObserverWrap = exports.MultiObserverWrap = void 0;
 exports.makeRequestingClient = makeRequestingClient;
 exports.makeRequestServer = makeRequestServer;
 exports.makeEventfulServer = makeEventfulServer;
 exports.makeSubscribingClient = makeSubscribingClient;
+const runtime_1 = require("../exceptions/runtime");
 const map_of_sets_1 = require("../map-of-sets");
 const synced_1 = require("../processes/synced");
+function makeEventException(params) {
+    return (0, runtime_1.makeRuntimeException)('events', params, {});
+}
 function toTransferrableError(e) {
     if (e.runtimeException) {
         return e;
@@ -142,7 +147,14 @@ class RequestingSide extends MessageHandler {
         }
         this.replyDeferreds.clear();
     }
-    makeRequest(name, req, notifyCallback) {
+    async makeRequest(name, req, notifyCallback) {
+        if (!this.rawDuplex) {
+            throw makeEventException({
+                channel: this.channel,
+                duplexDisconnected: true,
+                request: name
+            });
+        }
         this.counter += 1;
         if (this.counter === Number.MAX_SAFE_INTEGER) {
             this.counter = Number.MIN_SAFE_INTEGER;
@@ -225,26 +237,21 @@ class ReplyingSide extends MessageHandler {
         }
     }
     errorReply(env, err) {
-        const reply = {
+        return {
             type: 'reply',
             reqName: env.name,
             reqCount: env.count,
-            rep: null
+            rep: null,
+            err: (err.runtimeException ?
+                err : toTransferrableError(err))
         };
-        if (err.runtimeException) {
-            reply.err = err;
-        }
-        else {
-            reply.err = toTransferrableError(err);
-        }
-        return reply;
     }
     normalReply(env, rep, isInProgress = false) {
         const reply = {
             type: 'reply',
             reqName: env.name,
             reqCount: env.count,
-            rep: rep,
+            rep,
         };
         if (isInProgress) {
             reply.isInProgress = true;
@@ -283,14 +290,6 @@ Object.freeze(ReplyingSide);
 function makeRequestServer(channel, comm) {
     return (new ReplyingSide(channel, comm)).wrap();
 }
-function makeUnknownEventException(message) {
-    return {
-        runtimeException: true,
-        type: 'events',
-        unknownEvent: true,
-        message
-    };
-}
 const SUBSCRIBE_REQ_NAME = 'subscribe';
 const UNSUBSCRIBE_REQ_NAME = 'unsubscribe';
 class EventsSendingSide extends ReplyingSide {
@@ -313,7 +312,11 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException(`Events' channel ${event} is not found in handling subscribe`);
+            throw makeEventException({
+                channel: this.channel,
+                unknownEvent: true,
+                message: `Events' channel ${event} is not found in handling subscribe`
+            });
         }
         this.subscribedEvents.add(event);
         await gr.subscribe(event);
@@ -322,7 +325,11 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException(`Events' channel ${event} is not found in handling unsubscribe`);
+            throw makeEventException({
+                channel: this.channel,
+                unknownEvent: true,
+                message: `Events' channel ${event} is not found in handling unsubscribe`
+            });
         }
         this.subscribedEvents.delete(event);
         if (gr.unsubscribe) {
@@ -442,9 +449,7 @@ class EventsReceivingSide extends RequestingSide {
          * name, to which listener is attached.
          */
         this.listeners = new map_of_sets_1.MapOfSets();
-        this.channels = new IpcEventChannels((ipcChannel) => this.makeRequest(SUBSCRIBE_REQ_NAME, ipcChannel)
-            .catch(err => this.completeEvent(ipcChannel, err)), (ipcChannel) => this.makeRequest(UNSUBSCRIBE_REQ_NAME, ipcChannel)
-            .catch(_ => { }));
+        this.channels = new IpcEventChannels(ipcChannel => this.makeRequest(SUBSCRIBE_REQ_NAME, ipcChannel).catch(err => this.completeEvent(ipcChannel, err)), ipcChannel => this.makeRequest(UNSUBSCRIBE_REQ_NAME, ipcChannel).catch(_ => { }));
     }
     handleMsg(env) {
         if (env.type === 'event') {

package/build/lib-common/ipc/ws-ipc.d.ts

@@ -6,4 +6,5 @@ export interface WSException extends web3n.RuntimeException {
     socketSlow?: true;
     socketClosed?: true;
 }
+export declare function makeWSException(params: Partial<WSException>, flags?: Partial<WSException>): WSException;
 export declare function makeSubscriber(ws: WebSocket, ipcChannel: string | undefined): SubscribingClient;

package/build/lib-common/ipc/ws-ipc.js

@@ -16,10 +16,15 @@
  this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeEventfulServer = void 0;
+exports.makeWSException = makeWSException;
 exports.makeSubscriber = makeSubscriber;
+const runtime_1 = require("../exceptions/runtime");
 const generic_ipc_1 = require("./generic-ipc");
 var generic_ipc_2 = require("./generic-ipc");
 Object.defineProperty(exports, "makeEventfulServer", { enumerable: true, get: function () { return generic_ipc_2.makeEventfulServer; } });
+function makeWSException(params, flags) {
+    return (0, runtime_1.makeRuntimeException)('websocket', params, flags !== null && flags !== void 0 ? flags : {});
+}
 const MAX_TXT_BUFFER = 64 * 1024;
 /**
  * This creates a json communication point on a given web socket.
@@ -37,12 +42,7 @@ function makeJsonCommPoint(ws) {
         subscribe: obs => observers.add(obs),
         postMessage(env) {
             if (ws.bufferedAmount > MAX_TXT_BUFFER) {
-                const exc = {
-                    runtimeException: true,
-                    type: 'websocket',
-                    socketSlow: true
-                };
-                throw exc;
+                throw makeWSException({ socketSlow: true });
             }
             ws.send(JSON.stringify(env));
         }
@@ -84,13 +84,10 @@ function onClose(observers) {
             observers.complete();
         }
         else {
-            const exc = {
-                runtimeException: true,
-                type: 'websocket',
+            observers.error(makeWSException({
                 socketClosed: true,
                 cause: { code, reason }
-            };
-            observers.error(exc);
+            }));
         }
     };
 }
@@ -101,12 +98,7 @@ function onClose(observers) {
  */
 function onError(ws, observers) {
     return (err) => {
-        const exc = {
-            runtimeException: true,
-            type: 'websocket',
-            cause: err
-        };
-        observers.error(exc);
+        observers.error(makeWSException({ cause: err }));
         ws.close();
     };
 }

package/build/lib-common/objs-on-disk/v1-obj-file-format.d.ts

@@ -1,5 +1,5 @@
 import { HeaderChunkInfo, SegsChunk } from "./file-layout";
-export declare const V1_FILE_START: Buffer;
+export declare const V1_FILE_START: Buffer<ArrayBuffer>;
 export declare namespace layoutV1 {
     interface Attrs {
         fileComplete: boolean;

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

@@ -0,0 +1,5 @@
+export interface StorageRootRoute {
+    owner?: string;
+    shared?: string;
+    config?: string;
+}

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

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 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
+ 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 });

package/build/lib-common/service-api/asmail/root-route.d.ts

@@ -0,0 +1,5 @@
+export interface ASMailRootRoute {
+    delivery?: string;
+    retrieval?: string;
+    config?: string;
+}

package/build/lib-common/service-api/asmail/root-route.js

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 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
+ 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 });

package/build/lib-common/service-api/mailer-id/root-route.d.ts

@@ -0,0 +1,7 @@
+type SignedLoad = web3n.keys.SignedLoad;
+export interface MailerIdRootRoute {
+    "current-cert": SignedLoad;
+    "previous-certs": SignedLoad[];
+    provisioning: string;
+}
+export {};

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

@@ -0,0 +1,18 @@
+"use strict";
+/*
+ Copyright (C) 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
+ 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 });