core-3nweb-client-lib 0.38.0 → 0.39.0

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

@@ -301,22 +301,6 @@ declare namespace web3n.asmail {
 		msgIsBroken?: true;
 	}
 
-	interface ServLocException extends RuntimeException {
-		type: 'service-locating';
-		address: string;
-
-		/**
-		 * domainNotFound flag indicates that domain in the address doesn't exist.
-		 */
-		domainNotFound?: true;
-
-		/**
-		 * noServiceRecord flag indicates that 3NWeb services are not set at
-		 * domain in the address.
-		 */
-		noServiceRecord?: true;
-	}
-
 	interface ASMailSendException extends RuntimeException {
 		type: 'asmail-delivery';
 		address?: string;

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

@@ -167,12 +167,14 @@ declare namespace web3n.keys {
 	interface IntroductorySendingPairInfo {
 		type: 'intro';
 		recipientKId: string;
+		alg: string;
 	}
 
 	interface RatchetedSendingPairInfo {
 		type: 'ratcheted';
 		pids: string[];
 		timestamp: number;
+		alg: string;
 		senderKId: string;
 		recipientKId: string;
 		sentMsgs?: {
@@ -183,6 +185,7 @@ declare namespace web3n.keys {
 
 	interface ReceptionPairInfo {
 		pids: string[];
+		alg: string;
 		recipientKId: string;
 		isSenderIntroKey?: boolean,
 		senderKId: string;

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

@@ -25,7 +25,7 @@
 
 
 declare namespace web3n {
-	
+
 	interface RuntimeException {
 		runtimeException: true;
 		type?: string;
@@ -33,21 +33,47 @@ declare namespace web3n {
 		message?: string;
 	}
 
+	interface ConnectException extends RuntimeException {
+		type: 'connect';
+		connectType: string;
+	}
+
 	interface HTTPErrorDetails extends web3n.RuntimeException {
 		url: string;
 		method: string;
-		message?: string;
 	}
-	
-	interface ConnectException extends HTTPErrorDetails {
-		type: 'http-connect';
+
+	interface HTTPConnectException extends ConnectException {
+		connectType: 'http';
+		url?: string;
+		method?: string;
+	}
+
+	interface DNSConnectException extends ConnectException {
+		connectType: 'dns';
 	}
-	
+
 	interface HTTPException extends HTTPErrorDetails {
 		type: 'http-request';
 		status: number;
 	}
-	
+
+	interface ServLocException extends RuntimeException {
+		type: 'service-locating';
+		address: string;
+
+		/**
+		 * domainNotFound flag indicates that domain in the address doesn't exist.
+		 */
+		domainNotFound?: true;
+
+		/**
+		 * noServiceRecord flag indicates that 3NWeb services are not set at
+		 * domain in the address.
+		 */
+		noServiceRecord?: true;
+	}
+
 	interface EncryptionException {
 		failedCipherVerification?: true;
 		failedSignatureVerification?: true;

package/build/core/asmail/inbox/index.js

@@ -214,7 +214,7 @@ class InboxOnServer {
                 msgIds = await this.msgReceiver.listMsgs(fromTS);
             }
             catch (exc) {
-                if (exc.type !== 'http-connect') {
+                if (exc.type !== 'connect') {
                     throw exc;
                 }
                 return this.index.listMsgs(fromTS);

package/build/core/asmail/sending-params/invitations-anon.js

@@ -95,7 +95,7 @@ class AnonymousInvites {
         // synced version is read.
         const infoOnServer = await this.anonInvitesOnServer.getFromServer()
             .catch((exc) => {
-            if (exc.type === 'http-connect') {
+            if (exc.type === 'connect') {
                 return;
             }
             else {

package/build/core/id-manager/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 - 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020 - 2022, 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
@@ -72,15 +72,7 @@ class IdManager {
     }
     static async initFromCachedStore(address, fs, resolver, makeNet, logError, logWarning) {
         const store = key_storage_1.IdKeysStorage.makeWithStorage(fs, logError, logWarning);
-        const idManager = new IdManager(store, makeNet, resolver, address);
-        try {
-            await idManager.provisionUsingSavedKey();
-            return idManager;
-        }
-        catch (err) {
-            await logError(err, `Can't initialize id manager from local store`);
-            return;
-        }
+        return new IdManager(store, makeNet, resolver, address);
     }
     async startProvisionWithoutSavedKey(address) {
         const midUrl = await this.midServiceFor(address);

package/build/core/index.js

@@ -86,6 +86,7 @@ class Core {
             };
         };
         this.initForExistingUserWithCache = async (address, storageKey) => {
+            // XXX this shouldn't fail without network. All data is on the disk!
             const completeStorageInit = await this.storages.startInitFromCache(address, storageKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
             if (!completeStorageInit) {
                 return;
@@ -222,6 +223,7 @@ class Core {
             // XXX This should be removed, at some point, as there will be no more
             //     users with very old data folders.
             await this.performDataMigrationsAtInit();
+            // XXX some of these starting can be done any way
             const keyringsSyncedFS = await this.storages.makeSyncedFSForApp(constants_1.KEYRINGS_APP_NAME);
             await this.keyrings.init(keyringsSyncedFS, this.idManager.getSigner, asmailServerConfig.makeParamSetterAndGetter('init-pub-key'));
             const inboxSyncedFS = await this.storages.makeSyncedFSForApp(constants_1.ASMAIL_APP_NAME);

package/build/core/keyring/correspondent-keys.d.ts

@@ -21,23 +21,6 @@ export interface ReceptionPair {
     };
     timestamp: number;
 }
-/**
- * Sending pairs are a rotating public key cryptography key material for sending
- * messages.
- *
- * Let's note naming convention. Since this is a sending pair, this side of
- * communication is called a sender, while the other side is a recipient.
- */
-export interface BaseSendingPair {
-    /**
-     * This is recipients' public key, to which encryption is done.
-     * If this is an introductory pair, this key is recipient's published intro
-     * public key.
-     * Else, if this is an ratcheted pair, this key comes from crypto material
-     * that recipients suggests from time to time for further use.
-     */
-    recipientPKey: JsonKeyShort;
-}
 /**
  * Introductory pair appears when the first message is sent to a new
  * correspondent. By nature it is an introductory message that uses recipient's
@@ -48,14 +31,22 @@ export interface BaseSendingPair {
  * a flag that allows to distinguish it from ratcheted pair with a clean
  * if-statement.
  */
-export interface IntroductorySendingPair extends BaseSendingPair {
+export interface IntroductorySendingPair {
     type: 'intro';
+    /**
+     * This is recipients' public key, to which encryption is done.
+     * If this is an introductory pair, this key is recipient's published intro
+     * public key.
+     * Else, if this is an ratcheted pair, this key comes from crypto material
+     * that recipients suggests from time to time for further use.
+     */
+    recipientPKey: JsonKey;
 }
 /**
  * Ratcheted sending pair is a sending pair with pair ids (pids), attached to
  * it. These ids are used to identify correct key material.
  */
-export interface RatchetedSendingPair extends BaseSendingPair {
+export interface RatchetedSendingPair {
     type: 'ratcheted';
     pids: string[];
     timestamp: number;
@@ -67,6 +58,14 @@ export interface RatchetedSendingPair extends BaseSendingPair {
      * and is moved to the sending pair when it is used by the other side.
      */
     senderKey: JWKeyPair;
+    /**
+     * This is recipients' public key, to which encryption is done.
+     * If this is an introductory pair, this key is recipient's published intro
+     * public key.
+     * Else, if this is an ratcheted pair, this key comes from crypto material
+     * that recipients suggests from time to time for further use.
+     */
+    recipientPKey: JsonKeyShort;
     /**
      * This is a precomputed message master key that comes from a given pair.
      * This exist only as a speedup measure, to save time of public key crypto

package/build/core/keyring/correspondent-keys.js

@@ -370,6 +370,7 @@ function turnSendingPairToInfo(sp) {
             type: 'ratcheted',
             recipientKId: sp.recipientPKey.kid,
             senderKId: sp.senderKey.pkey.kid,
+            alg: sp.senderKey.pkey.alg,
             pids,
             timestamp,
             sentMsgs
@@ -378,7 +379,8 @@ function turnSendingPairToInfo(sp) {
     else if (sp.type === 'intro') {
         return {
             type: 'intro',
-            recipientKId: sp.recipientPKey.kid
+            recipientKId: sp.recipientPKey.kid,
+            alg: sp.recipientPKey.alg
         };
     }
     else {
@@ -389,6 +391,7 @@ function turnReceptionPairToInfo(rp) {
     const { pids, timestamp, receivedMsgs, isSenderIntroKey } = rp;
     return {
         pids, timestamp, receivedMsgs, isSenderIntroKey,
+        alg: rp.recipientKey.pkey.alg,
         recipientKId: rp.recipientKey.pkey.kid,
         senderKId: rp.senderPKey.kid
     };

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

@@ -95,7 +95,7 @@ class ServerEvents {
         if (!exc.runtimeException) {
             return false;
         }
-        if (exc.type === 'http-connect') {
+        if (exc.type === 'connect') {
             return true;
         }
         else if (exc.type === 'http-request') {

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

@@ -24,6 +24,7 @@ exports.getMailerIdInfoFor = getMailerIdInfoFor;
 const jwkeys_1 = require("../lib-common/jwkeys");
 const url_1 = require("url");
 const request_utils_1 = require("./request-utils");
+const runtime_1 = require("../lib-common/exceptions/runtime");
 async function readJSONLocatedAt(client, url) {
     if ((0, url_1.parse)(url).protocol !== 'https:') {
         throw new Error("Url protocol must be https.");
@@ -143,23 +144,17 @@ function checkAndPrepareURL(value) {
     return 'https://' + value;
 }
 function domainNotFoundExc(address, cause) {
-    const exc = {
-        runtimeException: true,
-        type: 'service-locating',
-        address,
-        domainNotFound: true,
-        cause
-    };
-    return exc;
+    return (0, runtime_1.makeRuntimeException)('service-locating', { address, cause }, { domainNotFound: true });
 }
 function noServiceRecordExc(address) {
-    const exc = {
-        runtimeException: true,
-        type: 'service-locating',
-        address,
-        noServiceRecord: true
-    };
-    return exc;
+    return (0, runtime_1.makeRuntimeException)('service-locating', { address }, { noServiceRecord: true });
+}
+function noConnectionExc(cause) {
+    return (0, runtime_1.makeRuntimeException)('connect', {
+        connectType: 'dns',
+        message: `The most likely cause of this error is device not connected. Next likely cause is DNS not setup, or not connecting properly. Like the saying goes: "It's not DNS. There is no way it's DNS. It was DNS."`,
+        cause
+    }, {});
 }
 /**
  * This implementation extracts exactly one string value for a given service.
@@ -227,7 +222,8 @@ function getRecordAtStartOf(txt) {
 }
 const DNS_ERR_CODE = {
     NODATA: 'ENODATA',
-    NOTFOUND: 'ENOTFOUND'
+    NOTFOUND: 'ENOTFOUND',
+    ESERVFAIL: 'ESERVFAIL'
 };
 Object.freeze(DNS_ERR_CODE);
 function makeServiceLocator(resolver) {
@@ -247,6 +243,9 @@ function makeServiceLocator(resolver) {
             if (code === DNS_ERR_CODE.NODATA) {
                 throw noServiceRecordExc(address);
             }
+            else if (code === DNS_ERR_CODE.ESERVFAIL) {
+                throw noConnectionExc({ code, hostname, message });
+            }
             else if (hostname) {
                 throw domainNotFoundExc(address, { code, hostname, message });
             }

package/build/lib-common/exceptions/http.d.ts

@@ -1,4 +1,4 @@
-export type ConnectException = web3n.ConnectException;
+export type ConnectException = web3n.HTTPConnectException;
 export type HTTPException = web3n.HTTPException;
-export declare function makeConnectionException(url: string | undefined, method: string | undefined, msg?: string, cause?: any): ConnectException;
-export declare function makeHTTPException(url: string, method: string, status: number, msg?: string, cause?: any): HTTPException;
+export declare function makeConnectionException(url: string | undefined, method: string | undefined, message?: string, cause?: any): ConnectException;
+export declare function makeHTTPException(url: string, method: string, status: number, message?: string, cause?: any): HTTPException;

package/build/lib-common/exceptions/http.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 3NSoft Inc.
+ Copyright (C) 2015, 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
@@ -17,31 +17,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeConnectionException = makeConnectionException;
 exports.makeHTTPException = makeHTTPException;
-function makeConnectionException(url, method, msg, cause) {
-    const exc = {
-        runtimeException: true,
-        type: 'http-connect',
-        url: url,
-        method: method,
-        cause
-    };
-    if (msg) {
-        exc.message = msg;
-    }
-    return exc;
+const runtime_1 = require("./runtime");
+function makeConnectionException(url, method, message, cause) {
+    return (0, runtime_1.makeRuntimeException)('connect', { connectType: 'http', url, method, cause, message }, {});
 }
-function makeHTTPException(url, method, status, msg, cause) {
-    const exc = {
-        runtimeException: true,
-        type: 'http-request',
-        url: url,
-        method: method,
-        status: status,
-        cause
-    };
-    if (msg) {
-        exc.message = msg;
-    }
-    return exc;
+function makeHTTPException(url, method, status, message, cause) {
+    return (0, runtime_1.makeRuntimeException)('http-request', { url, method, status, cause, message }, {});
 }
 Object.freeze(exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",