core-3nweb-client-lib 0.44.12 → 0.45.1

package/build/core/asmail/msg/opener.js

@@ -21,7 +21,7 @@ exports.openMsg = openMsg;
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const error_1 = require("../../../lib-common/exceptions/error");
 const xsp_files_1 = require("xsp-files");
-const cryptor_work_labels_1 = require("../../../lib-client/cryptor/cryptor-work-labels");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 class OpenedMsg {
     constructor(msgId, main) {
         this.msgId = msgId;

package/build/core/asmail/msg/packer.js

@@ -24,7 +24,7 @@ const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const folder_node_serialization_1 = require("../../../lib-client/xsp-fs/folder-node-serialization");
 const json_utils_1 = require("../../../lib-common/json-utils");
 const attachments_container_1 = require("./attachments-container");
-const cryptor_work_labels_1 = require("../../../lib-client/cryptor/cryptor-work-labels");
+const cryptor_work_labels_1 = require("../../../lib-client/cryptor-work-labels");
 function turnKeysToB64(obj) {
     obj.key = buffer_utils_1.base64.pack(obj.key);
     if (!obj.folder) {

package/build/core/index.d.ts

@@ -1,7 +1,8 @@
 import { FactoryOfFSs } from './storage';
-import { makeCryptor } from '../lib-client/cryptor/cryptor';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
+import type { makeCryptor } from 'ecma-nacl-cryptors';
+export type { makeCryptor } from 'ecma-nacl-cryptors';
 type RequestedCAPs = web3n.caps.common.RequestedCAPs;
 type W3N = web3n.caps.common.W3N;
 type ProgressCB = web3n.startup.ProgressCB;
@@ -58,4 +59,3 @@ export declare class Core {
         storage$: import("rxjs").Observable<import("./storage/synced/remote-events").StorageConnectionStatus>;
     };
 }
-export {};

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

@@ -27,7 +27,7 @@ const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const error_1 = require("../../lib-common/exceptions/error");
 const async_cryptor_wrap_1 = require("../../lib-common/async-cryptor-wrap");
-const cryptor_work_labels_1 = require("../../lib-client/cryptor/cryptor-work-labels");
+const cryptor_work_labels_1 = require("../../lib-client/cryptor-work-labels");
 function generatePids() {
     const pids = [];
     for (let i = 0; i < 5; i += 1) {

package/build/core/keyring/index.js

@@ -27,7 +27,7 @@ const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const canonical_address_1 = require("../../lib-common/canonical-address");
 const common_2 = require("../asmail/delivery/common");
 const keyring_storage_1 = require("./keyring-storage");
-const cryptor_work_labels_1 = require("../../lib-client/cryptor/cryptor-work-labels");
+const cryptor_work_labels_1 = require("../../lib-client/cryptor-work-labels");
 const published_intro_key_1 = require("./published-intro-key");
 var common_3 = require("./common");
 Object.defineProperty(exports, "KEY_USE", { enumerable: true, get: function () { return common_3.KEY_USE; } });

package/build/core/startup/sign-in.d.ts

@@ -1,7 +1,7 @@
 import { ScryptGenParams } from '../../lib-client/key-derivation';
 import type { GetUsersOnDisk } from '../app-files';
-import { Cryptor } from '../../lib-client/cryptor/cryptor';
 import { LogError } from '../../lib-client/logging/log-to-file';
+import type { Cryptor } from 'ecma-nacl-cryptors';
 export type GenerateKey = (derivParams: ScryptGenParams) => Promise<Uint8Array>;
 export type StartInitWithoutCache = (address: string) => Promise<CompleteInitWithoutCache | undefined>;
 export type CompleteInitWithoutCache = (midLoginKey: GenerateKey, storageKey: GenerateKey) => Promise<boolean>;

package/build/core/startup/sign-up.d.ts

@@ -1,8 +1,8 @@
 import { NetClient } from '../../lib-client/request-utils';
 import * as keyDeriv from '../../lib-client/key-derivation';
 import type { GetUsersOnDisk } from '../app-files';
-import { Cryptor } from '../../lib-client/cryptor/cryptor';
 import { LogError } from '../../lib-client/logging/log-to-file';
+import type { Cryptor } from 'ecma-nacl-cryptors';
 type JsonKey = web3n.keys.JsonKey;
 export interface ScryptGenParams {
     logN: number;

package/build/core/storage/index.d.ts

@@ -7,7 +7,7 @@ import { AsyncSBoxCryptor } from 'xsp-files';
 import { StoragePathForUser } from '../app-files';
 import { LogError } from '../../lib-client/logging/log-to-file';
 import { MakeNet } from '..';
-import { Cryptor } from '../../cryptors';
+import type { Cryptor } from 'ecma-nacl-cryptors';
 type WritableFS = web3n.files.WritableFS;
 type StorageType = web3n.storage.StorageType;
 type FSItem = web3n.files.FSItem;

package/build/lib-client/doh.d.ts

@@ -0,0 +1,2 @@
+import { DnsResolver } from "./service-locator";
+export declare function dohAt(dohServerUrl: string): DnsResolver;

package/build/lib-client/doh.js

@@ -0,0 +1,68 @@
+"use strict";
+/*
+ Copyright (C) 2026 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.dohAt = dohAt;
+const https = require("https");
+const request_utils_1 = require("./request-utils");
+const service_locator_1 = require("./service-locator");
+function dohAt(dohServerUrl) {
+    async function resolveTxt(domain) {
+        const answer = await sendDohQuestion(dohServerUrl, domain, 'TXT');
+        let txt = [];
+        for (const { data: line } of answer) {
+            txt.push([line]);
+        }
+        return txt;
+    }
+    return { resolveTxt };
+}
+async function sendDohQuestion(serverUrl, domain, type) {
+    const opts = {
+        method: 'GET',
+        url: `${serverUrl}?name=${domain}&type=${type}`,
+        responseType: 'json'
+    };
+    const httpsOpts = (0, request_utils_1.formHttpsReqOpts)(opts);
+    httpsOpts.headers.accept = 'application/dns-json';
+    const reply = await (0, request_utils_1.processRequest)(opts => https.request(opts), httpsOpts, opts, undefined)
+        .catch((exc) => {
+        if (exc.type === 'connect') {
+            throw { code: service_locator_1.DNS_ERR_CODE.ECONNREFUSED, hostname: domain, cause: exc };
+        }
+        else {
+            throw { code: service_locator_1.DNS_ERR_CODE.ESERVFAIL, hostname: domain, cause: exc };
+        }
+    });
+    const { status, data } = reply;
+    if (status !== 200) {
+        throw {
+            code: service_locator_1.DNS_ERR_CODE.ESERVFAIL, hostname: domain,
+            message: `status ${reply.status} from DoH server`
+        };
+    }
+    if (data.Status !== 0) {
+        throw { code: service_locator_1.DNS_ERR_CODE.NOTFOUND, hostname: domain };
+    }
+    if (data.Answer) {
+        return data.Answer;
+    }
+    else {
+        throw { code: service_locator_1.DNS_ERR_CODE.NODATA, hostname: domain };
+    }
+}
+Object.freeze(exports);

package/build/lib-client/key-derivation.d.ts

@@ -1,4 +1,4 @@
-import { Cryptor } from './cryptor/cryptor';
+import type { Cryptor } from 'ecma-nacl-cryptors';
 type JsonKey = web3n.keys.JsonKey;
 export interface ScryptGenParams {
     logN: number;

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

@@ -94,7 +94,7 @@ async function attachRequestReaders(clReq, opts) {
     }
     catch (exc) {
         if (exc.cause === TIMEOUT_FLAG) {
-            clReq.abort();
+            clReq.destroy();
         }
         throw exc;
     }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2025 3NSoft Inc.
+ Copyright (C) 2025 - 2026 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
@@ -18,6 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkServicesStartingFromSignup = checkServicesStartingFromSignup;
 const _3nweb_signup_1 = require("./3nweb-signup");
+const doh_1 = require("./doh");
 const service_locator_1 = require("./service-locator");
 const dns_1 = require("dns");
 async function checkServicesStartingFromSignup(client, signupUrl, signupToken, progress) {
@@ -126,16 +127,7 @@ async function checkSignup(client, signupURL, signupToken) {
         };
     }
 }
-const srvLocator = (0, service_locator_1.makeServiceLocator)({
-    resolveTxt: domain => new Promise((resolve, reject) => (0, dns_1.resolveTxt)(domain, (err, texts) => {
-        if (err) {
-            reject(err);
-        }
-        else {
-            resolve(texts);
-        }
-    }))
-});
+const srvLocator = (0, service_locator_1.makeServiceLocator)({ resolveTxt: dns_1.promises.resolveTxt }, (0, doh_1.dohAt)(`https://cloudflare-dns.com/dns-query`), (0, doh_1.dohAt)(`https://dns.google/resolve`));
 async function checkUserDomainDNS(service, domain) {
     try {
         const serviceUrl = await (srvLocator(service))(`u@${domain}`);

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

@@ -26,12 +26,20 @@ export declare function mailerIdInfoAt(client: NetClient, url: string): Promise<
  * @param url
  */
 export declare function storageInfoAt(client: NetClient, url: string): Promise<StorageRootRoute>;
+export declare const DNS_ERR_CODE: {
+    NODATA: string;
+    NOTFOUND: string;
+    ESERVFAIL: string;
+    ECONNREFUSED: string;
+    ETIMEOUT: string;
+};
 export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
 export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;
-export declare function makeServiceLocator(resolver: {
+export interface DnsResolver {
     resolveTxt: (typeof dnsPromises)['resolveTxt'];
-}): ServiceLocatorMaker;
+}
+export declare function makeServiceLocator(...resolvers: DnsResolver[]): ServiceLocatorMaker;
 /**
  * @param resolver
  * @param address

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

@@ -16,6 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DNS_ERR_CODE = void 0;
 exports.asmailInfoAt = asmailInfoAt;
 exports.mailerIdInfoAt = mailerIdInfoAt;
 exports.storageInfoAt = storageInfoAt;
@@ -215,43 +216,55 @@ function getRecordAtStartOf(txt) {
         value: txt
     };
 }
-const DNS_ERR_CODE = {
+exports.DNS_ERR_CODE = {
     NODATA: 'ENODATA',
     NOTFOUND: 'ENOTFOUND',
     ESERVFAIL: 'ESERVFAIL',
     ECONNREFUSED: 'ECONNREFUSED',
     ETIMEOUT: 'ETIMEOUT'
 };
-Object.freeze(DNS_ERR_CODE);
-function makeServiceLocator(resolver) {
+Object.freeze(exports.DNS_ERR_CODE);
+function makeServiceLocator(...resolvers) {
+    if (resolvers.length === 0) {
+        throw Error(`no DNS resolvers given`);
+    }
     return serviceLabel => async (address) => {
-        try {
-            const domain = domainOfAddress(address);
-            const txtRecords = await resolver.resolveTxt(domain);
-            const recValue = extractPair(txtRecords, serviceLabel);
-            if (!recValue) {
-                throw noServiceRecordExc(address);
-            }
-            const url = checkAndPrepareURL(recValue);
-            return url;
-        }
-        catch (err) {
-            const { code, hostname, message } = err;
-            if (code === DNS_ERR_CODE.NODATA) {
-                throw noServiceRecordExc(address);
-            }
-            else if ((code === DNS_ERR_CODE.ESERVFAIL)
-                || (code === DNS_ERR_CODE.ECONNREFUSED)
-                || (code === DNS_ERR_CODE.ETIMEOUT)) {
-                throw noConnectionExc({ code, hostname, message });
-            }
-            else if (hostname) {
-                throw domainNotFoundExc(address, { code, hostname, message });
+        const domain = domainOfAddress(address);
+        let prevConnectionExc = undefined;
+        for (const resolver of resolvers) {
+            try {
+                const txtRecords = await resolver.resolveTxt(domain);
+                const recValue = extractPair(txtRecords, serviceLabel);
+                if (!recValue) {
+                    throw noServiceRecordExc(address);
+                }
+                const url = checkAndPrepareURL(recValue);
+                return url;
             }
-            else {
-                throw err;
+            catch (err) {
+                const { code, hostname, message } = err;
+                if (code === exports.DNS_ERR_CODE.NODATA) {
+                    throw noServiceRecordExc(address);
+                }
+                else if ((code === exports.DNS_ERR_CODE.ESERVFAIL)
+                    || (code === exports.DNS_ERR_CODE.ECONNREFUSED)
+                    || (code === exports.DNS_ERR_CODE.ETIMEOUT)) {
+                    if (!prevConnectionExc) {
+                        prevConnectionExc = noConnectionExc({ code, hostname, message });
+                    }
+                }
+                else if ((code === exports.DNS_ERR_CODE.NOTFOUND) || hostname) {
+                    throw domainNotFoundExc(address, { code, hostname, message });
+                }
+                else {
+                    if (!prevConnectionExc) {
+                        prevConnectionExc = err;
+                    }
+                    throw err;
+                }
             }
         }
+        throw prevConnectionExc;
     };
 }
 /**

package/build/lib-client/xsp-fs/node-persistence.js

@@ -25,7 +25,7 @@ const xsp_files_1 = require("xsp-files");
 const buffer_utils_1 = require("../../lib-common/buffer-utils");
 const deferred_1 = require("../../lib-common/processes/deferred");
 const random = require("../../lib-common/random-node");
-const cryptor_work_labels_1 = require("../cryptor/cryptor-work-labels");
+const cryptor_work_labels_1 = require("../cryptor-work-labels");
 const pv1 = require("./xsp-payload-v1");
 const pv2 = require("./xsp-payload-v2");
 const SEG_SIZE = 16; // in 256-byte blocks = 4K in bytes

package/build/lib-index.d.ts

@@ -13,3 +13,4 @@ export { DeviceFS } from './lib-client/local-files/device-fs';
 export { makeLogger } from './lib-client/logging/log-to-file';
 export declare const SYSTEM_DOMAIN = "3nweb.computer";
 export { checkServicesStartingFromSignup } from './lib-client/service-checks';
+export { dohAt } from './lib-client/doh';

package/build/lib-index.js

@@ -30,7 +30,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkServicesStartingFromSignup = exports.SYSTEM_DOMAIN = exports.makeLogger = exports.DeviceFS = exports.sysFolders = exports.appDirs = exports.makeNetClient = exports.makeServiceLocator = exports.ASMail = exports.SignIn = exports.reverseDomain = exports.Storages = exports.IdManager = exports.SignUp = void 0;
+exports.dohAt = exports.checkServicesStartingFromSignup = exports.SYSTEM_DOMAIN = exports.makeLogger = exports.DeviceFS = exports.sysFolders = exports.appDirs = exports.makeNetClient = exports.makeServiceLocator = exports.ASMail = exports.SignIn = exports.reverseDomain = exports.Storages = exports.IdManager = exports.SignUp = void 0;
 __exportStar(require("./core"), exports);
 var sign_up_1 = require("./core/startup/sign-up");
 Object.defineProperty(exports, "SignUp", { enumerable: true, get: function () { return sign_up_1.SignUp; } });
@@ -58,4 +58,6 @@ Object.defineProperty(exports, "makeLogger", { enumerable: true, get: function (
 exports.SYSTEM_DOMAIN = '3nweb.computer';
 var service_checks_1 = require("./lib-client/service-checks");
 Object.defineProperty(exports, "checkServicesStartingFromSignup", { enumerable: true, get: function () { return service_checks_1.checkServicesStartingFromSignup; } });
+var doh_1 = require("./lib-client/doh");
+Object.defineProperty(exports, "dohAt", { enumerable: true, get: function () { return doh_1.dohAt; } });
 Object.freeze(exports);

package/build/tests/caps-api/asmail/specs/events.d.ts

@@ -0,0 +1,2 @@
+import { SpecDescribe } from '../../../libs-for-tests/spec-module';
+export declare const specs: SpecDescribe;

package/build/tests/caps-api/asmail/specs/events.js

@@ -0,0 +1,63 @@
+"use strict";
+/*
+ Copyright (C) 2017 - 2018, 2020 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.specs = void 0;
+const test_utils_1 = require("../test-utils");
+exports.specs = {
+    description: '.subscribe',
+    its: []
+};
+const it = {
+    expectation: `delivers new messages to listeners of event 'message'`
+};
+it.func = async function (s) {
+    const u1_w3n = s.testAppCapsByUserIndex(0);
+    const u2 = s.users[1];
+    const u2_w3n = s.testAppCapsByUser(u2);
+    // user 2 starts listening for events, collecting 'em into an array
+    const incomingMsgs = [];
+    const receptionPromise = new Promise((resolve, reject) => {
+        u2_w3n.mail.inbox.subscribe('message', {
+            next: (msg) => {
+                incomingMsgs.push(msg);
+                // promise will resolve when at least two messages come
+                if (incomingMsgs.length >= 2) {
+                    resolve(incomingMsgs);
+                }
+            },
+            error: reject
+        });
+    });
+    const txtBody1 = 'Some text\nBlah-blah-blah';
+    const txtBody2 = 'Another text message';
+    // user 1 sends messages to user 2
+    const msgId1 = await (0, test_utils_1.sendTxtMsg)(u1_w3n, u2.userId, txtBody1);
+    expect(msgId1).toBeTruthy();
+    const msgId2 = await (0, test_utils_1.sendTxtMsg)(u1_w3n, u2.userId, txtBody2);
+    expect(msgId2).toBeTruthy();
+    // user 2 gets incoming message
+    await receptionPromise;
+    [[msgId1, txtBody1], [msgId2, txtBody2]]
+        .forEach(([msgId, txtBody]) => {
+        const msg = incomingMsgs.find(m => (m.msgId === msgId));
+        expect(msg).withContext(`message ${msgId} should be present in a list of all messages`).toBeTruthy();
+        expect(msg.plainTxtBody).toBe(txtBody);
+    });
+};
+exports.specs.its.push(it);
+Object.freeze(exports);

package/build/tests/caps-api/asmail/specs/send-to-wrong-address.d.ts

@@ -0,0 +1,2 @@
+import { SpecDescribe } from '../../../libs-for-tests/spec-module';
+export declare const specs: SpecDescribe;

package/build/tests/caps-api/asmail/specs/send-to-wrong-address.js

@@ -0,0 +1,68 @@
+"use strict";
+/*
+ Copyright (C) 2016 - 2018, 2020, 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.specs = void 0;
+exports.specs = {
+    description: '.sendMsg',
+    its: []
+};
+const it = {
+    expectation: 'send message to unknown user'
+};
+it.func = async function (s) {
+    const u = s.users[0];
+    const w3n = s.testAppCapsByUser(u);
+    const txtBody = 'Some text\nBlah-blah-blah';
+    const recipient = `Unknown ${u.userId}`;
+    // user 1 sends message to user 2
+    const msg = {
+        msgType: 'mail',
+        plainTxtBody: txtBody
+    };
+    // start sending
+    const idForSending = 'q2w3e';
+    await w3n.mail.delivery.addMsg([recipient], msg, idForSending);
+    // register delivery progress callback
+    const notifs = [];
+    // observe, while waiting for delivery completion
+    const observation = new Promise(async (resolve, reject) => {
+        const observer = {
+            next: (p) => { notifs.push(p); },
+            complete: resolve, error: reject
+        };
+        const cbDetach = w3n.mail.delivery.observeDelivery(idForSending, observer);
+        expect(typeof cbDetach).toBe('function');
+    });
+    expect(await w3n.mail.delivery.currentState(idForSending)).toBeTruthy();
+    // notifications should have something
+    await observation;
+    // test on localhost may complete requestbefore observation start
+    if (notifs.length > 0) {
+        const lastInfo = notifs[notifs.length - 1];
+        expect(lastInfo).withContext('There has to be at least one event fired').toBeTruthy();
+        // it has to be an error
+        expect(typeof lastInfo.recipients[recipient].err).toBe('object');
+        const exc = lastInfo.recipients[recipient].err;
+        expect(exc.unknownRecipient).toBe(true);
+        expect(typeof lastInfo.recipients[recipient].idOnDelivery).toBe('undefined');
+    }
+    await w3n.mail.delivery.rmMsg(idForSending);
+    expect(await w3n.mail.delivery.currentState(idForSending)).toBeFalsy();
+};
+exports.specs.its.push(it);
+Object.freeze(exports);

package/build/tests/caps-api/asmail/specs/send-with-attacment-from-storage.d.ts

@@ -0,0 +1,2 @@
+import { SpecDescribe } from '../../../libs-for-tests/spec-module';
+export declare const specs: SpecDescribe;