core-3nweb-client-lib 0.45.0 → 0.45.2

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/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/folder-node.d.ts

@@ -143,6 +143,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     createFile(name: string, exclusive: boolean): Promise<FileNode>;
     createLink(name: string, params: LinkParameters<any>): Promise<void>;
     removeChild(f: NodeInFS<any>): Promise<void>;
+    removeChildEntryUnconditionally(name: string): Promise<void>;
     private changeChildName;
     moveChildTo(childName: string, dst: FolderNode, nameInDst: string): Promise<void>;
     private moveChildOut;

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

@@ -612,6 +612,16 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         // stays consistent
         this.callRemoveObjOn('local', f);
     }
+    async removeChildEntryUnconditionally(name) {
+        await this.doTransition(async (state, version) => {
+            const child = state.nodes[name];
+            if (!child) {
+                return [];
+            }
+            delete state.nodes[name];
+            return this.makeEntryRemovalEvent(version, 'local', child);
+        });
+    }
     changeChildName(oldName, newName) {
         return this.doTransition(async (state, version) => {
             const child = state.nodes[oldName];

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

@@ -146,32 +146,62 @@ class XspFS {
         if (typeof folderName !== 'string') {
             throw new Error('Cannot remove root folder');
         }
-        const folder = (await parentFolder.getFolder(folderName)
-            .catch(setExcPath(path)));
-        if (!removeContent && !folder.isEmpty()) {
-            throw (0, file_1.makeFileException)('notEmpty', path);
+        try {
+            const folder = (await parentFolder.getFolder(folderName)
+                .catch(setExcPath(path)));
+            if (!removeContent && !folder.isEmpty()) {
+                throw (0, file_1.makeFileException)('notEmpty', path);
+            }
+            // note that internal folder.delete() removes all children as a matter
+            // of not leaving inaccessible nodes, i.e. content is removed implicitly
+            await parentFolder.removeChild(folder);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(folderName);
+            }
+            else {
+                throw exc;
+            }
         }
-        // note that internal folder.delete() removes all children as a matter
-        // of not leaving inaccessible nodes, i.e. content is removed implicitly
-        await parentFolder.removeChild(folder);
     }
     async deleteFile(path) {
         const { fileName, folderPath } = split(path);
         const root = this.v.getRootIfNotClosed(path);
         const parentFolder = await root.getFolderInThisSubTree(folderPath)
             .catch(setExcPath(path));
-        const file = await parentFolder.getFile(fileName)
-            .catch(setExcPath(path));
-        await parentFolder.removeChild(file);
+        try {
+            const file = await parentFolder.getFile(fileName)
+                .catch(setExcPath(path));
+            await parentFolder.removeChild(file);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(fileName);
+            }
+            else {
+                throw exc;
+            }
+        }
     }
     async deleteLink(path) {
         const { fileName, folderPath } = split(path);
         const root = this.v.getRootIfNotClosed(path);
         const parentFolder = await root.getFolderInThisSubTree(folderPath)
             .catch(setExcPath(path));
-        const link = await parentFolder.getLink(fileName)
-            .catch(setExcPath(path));
-        await parentFolder.removeChild(link);
+        try {
+            const link = await parentFolder.getLink(fileName)
+                .catch(setExcPath(path));
+            await parentFolder.removeChild(link);
+        }
+        catch (exc) {
+            if (exc.type === 'secondary') {
+                await parentFolder.removeChildEntryUnconditionally(fileName);
+            }
+            else {
+                throw exc;
+            }
+        }
     }
     async move(initPath, newPath) {
         const srcFolderPath = splitPathIntoParts(initPath);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.45.0",
+  "version": "0.45.2",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -47,8 +47,8 @@
     "@types/node": "^22.13.14",
     "@types/punycode": "^2.1.1",
     "@types/ws": "^8.18.1",
-    "napi-nacl": "^1.2.0",
     "jasmine": "^5.13.0",
+    "napi-nacl": "^1.2.1",
     "protobufjs-cli": "^1.0.2",
     "spec-3nweb-server": "^1.8.5",
     "tsuml2": "^0.17.1",