core-3nweb-client-lib 0.45.1 → 0.45.3

package/build/core/asmail/index.js

@@ -69,8 +69,8 @@ class ASMail {
             address: this.address,
             cryptor: this.cryptor,
             getSigner,
-            asmailResolver: makeResolver('asmail'),
-            midResolver: makeResolver('mailerid'),
+            asmailResolver: makeResolver('asmail', this.logger.logError),
+            midResolver: makeResolver('mailerid', this.logger.logError),
             correspondents: {
                 needIntroKeyFor: this.keyring.needIntroKeyFor,
                 generateKeysToSend: this.keyring.generateKeysToSend,
@@ -92,12 +92,12 @@ class ASMail {
             cryptor: this.cryptor,
             getSigner,
             getStorages,
-            asmailResolver: makeResolver('asmail'),
+            asmailResolver: makeResolver('asmail', this.logger.logError),
             correspondents: {
                 msgDecryptor: this.keyring.decrypt,
                 markOwnSendingParamsAsUsed: this.sendingParams.thisSide.setAsUsed,
                 saveParamsForSendingTo: this.sendingParams.otherSides.set,
-                midResolver: makeResolver('mailerid')
+                midResolver: makeResolver('mailerid', this.logger.logError)
             },
             makeNet: this.makeNet,
             logError: this.logger.logError

package/build/core/index.js

@@ -93,7 +93,7 @@ class Core {
         });
         try {
             // 1) init of id manager without setting fs
-            const stepTwo = await id_manager_1.IdManager.initWithoutStore(u.address, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(u.address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
             if (!stepTwo) {
                 const message = `MailerId server doesn't recognize identity ${u.address}`;
                 emitBootEvent({ message, isError: true });
@@ -111,7 +111,7 @@ class Core {
             const { idManager, setupManagerStorage } = idManagerInit;
             // 3) initialize all storages
             emitBootEvent({ message: `Setting up main storage for new user` });
-            const storesUp = await this.storages.initFreshForNewUser(u.address, idManager.getSigner, u.storeParams, u.storeSKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
+            const storesUp = await this.storages.initFreshForNewUser(u.address, idManager.getSigner, u.storeParams, u.storeSKey, this.makeNet, this.makeResolver('3nstorage', this.logger.logError), this.logger.logError);
             if (!storesUp) {
                 const message = `Main store failed to initialize for new user`;
                 emitBootEvent({ message, isError: true });
@@ -141,7 +141,7 @@ class Core {
         });
         try {
             // 1) init of id manager without setting fs
-            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const stepTwo = await id_manager_1.IdManager.initWithoutStore(address, this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
             if (!stepTwo) {
                 emitBootEvent({
                     isError: true, message: `MailerId server doesn't recognize identity ${address}`
@@ -163,7 +163,7 @@ class Core {
                     const { idManager, setupManagerStorage } = idManagerInit;
                     // 3) initialize all storages
                     emitBootEvent({ message: `Setting up main storage without local cache` });
-                    const storeDone = await this.storages.initFromRemote(address, idManager.getSigner, storageKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
+                    const storeDone = await this.storages.initFromRemote(address, idManager.getSigner, storageKey, this.makeNet, this.makeResolver('3nstorage', this.logger.logError), this.logger.logError);
                     if (!storeDone) {
                         emitBootEvent({ message: `Main store failed to initialize`, isError: true });
                         return false;
@@ -204,7 +204,7 @@ class Core {
         });
         try {
             emitBootEvent({ message: `Unlocking data from local cache with provided password/key` });
-            const completeStorageInit = await this.storages.startInitFromCache(address, storageKey, this.makeNet, this.makeResolver('3nstorage'), this.logger.logError);
+            const completeStorageInit = await this.storages.startInitFromCache(address, storageKey, this.makeNet, this.makeResolver('3nstorage', this.logger.logError), this.logger.logError);
             if (!completeStorageInit) {
                 emitBootEvent({
                     isError: true, message: `password/key is incorrect to decrypt local caches, or caches are damaged`
@@ -212,7 +212,7 @@ class Core {
                 return false;
             }
             emitBootEvent({ message: `✔️  main storage is opened` });
-            const idManager = await id_manager_1.IdManager.initFromCachedStore(address, await this.storages.makeSyncedFSForApp(constants_1.MAILERID_APP_NAME), this.makeResolver('mailerid'), this.makeNet, this.logger.logError, this.logger.logWarning);
+            const idManager = await id_manager_1.IdManager.initFromCachedStore(address, await this.storages.makeSyncedFSForApp(constants_1.MAILERID_APP_NAME), this.makeResolver('mailerid', this.logger.logError), this.makeNet, this.logger.logError, this.logger.logWarning);
             if (!idManager) {
                 return false;
             }
@@ -319,7 +319,7 @@ class Core {
         try {
             const address = this.idManager.getId();
             const getSigner = this.idManager.getSigner;
-            const asmailServerConfig = new config_1.ConfigOfASMailServer(address, getSigner, this.makeResolver('asmail'), this.makeNet());
+            const asmailServerConfig = new config_1.ConfigOfASMailServer(address, getSigner, this.makeResolver('asmail', this.logger.logError), this.makeNet());
             emitBootEvent({ coreApp: constants_1.KEYRINGS_APP_NAME, message: `starting initialization` });
             const keyringsSyncedFS = await this.storages.makeSyncedFSForApp(constants_1.KEYRINGS_APP_NAME);
             await this.keyrings.init(keyringsSyncedFS, this.idManager.getSigner, asmailServerConfig.makeParamSetterAndGetter('init-pub-key'));

package/build/lib-client/doh.js

@@ -19,7 +19,7 @@ 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");
+const dns_1 = require("dns");
 function dohAt(dohServerUrl) {
     async function resolveTxt(domain) {
         const answer = await sendDohQuestion(dohServerUrl, domain, 'TXT');
@@ -42,27 +42,27 @@ async function sendDohQuestion(serverUrl, domain, type) {
     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 };
+            throw { code: dns_1.CONNREFUSED, hostname: domain, cause: exc };
         }
         else {
-            throw { code: service_locator_1.DNS_ERR_CODE.ESERVFAIL, hostname: domain, cause: exc };
+            throw { code: dns_1.SERVFAIL, hostname: domain, cause: exc };
         }
     });
     const { status, data } = reply;
     if (status !== 200) {
         throw {
-            code: service_locator_1.DNS_ERR_CODE.ESERVFAIL, hostname: domain,
+            code: dns_1.SERVFAIL, hostname: domain,
             message: `status ${reply.status} from DoH server`
         };
     }
     if (data.Status !== 0) {
-        throw { code: service_locator_1.DNS_ERR_CODE.NOTFOUND, hostname: domain };
+        throw { code: dns_1.NOTFOUND, hostname: domain };
     }
     if (data.Answer) {
         return data.Answer;
     }
     else {
-        throw { code: service_locator_1.DNS_ERR_CODE.NODATA, hostname: domain };
+        throw { code: dns_1.NODATA, hostname: domain };
     }
 }
 Object.freeze(exports);

package/build/lib-client/logging/log-to-file.js

@@ -58,6 +58,7 @@ Log level: error.${msg ? `
 ${msg}` : ''}
 ${(0, error_1.stringifyErr)(err)}`;
             await appendLog(entry, now);
+            console.error(`[duplicating log message into console] ${entry}`);
         }
         catch (err2) {
             console.error(err);

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

@@ -130,7 +130,7 @@ async function checkSignup(client, signupURL, signupToken) {
 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}`);
+        const serviceUrl = await (srvLocator(service, noop))(`u@${domain}`);
         return {
             service,
             isOk: true,
@@ -166,4 +166,5 @@ async function checkUserDomainDNS(service, domain) {
         };
     }
 }
+async function noop() { }
 Object.freeze(exports);

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

@@ -2,6 +2,7 @@ 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';
+import { LogError } from './logging/log-to-file';
 type SignedLoad = web3n.keys.SignedLoad;
 /**
  * This returns a promise, resolvable to ASMailRootRoute object.
@@ -26,15 +27,8 @@ 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 ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel, logError: LogError) => ServiceLocator;
 export type ServiceLocator = (address: string) => Promise<string>;
 export interface DnsResolver {
     resolveTxt: (typeof dnsPromises)['resolveTxt'];

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

@@ -16,13 +16,13 @@
  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;
 exports.makeServiceLocator = makeServiceLocator;
 exports.getMailerIdInfoFor = getMailerIdInfoFor;
 const jwkeys_1 = require("../lib-common/jwkeys");
+const dns_1 = require("dns");
 const runtime_1 = require("../lib-common/exceptions/runtime");
 const http_1 = require("../lib-common/exceptions/http");
 async function readJSONLocatedAt(client, url) {
@@ -216,22 +216,15 @@ function getRecordAtStartOf(txt) {
         value: txt
     };
 }
-exports.DNS_ERR_CODE = {
-    NODATA: 'ENODATA',
-    NOTFOUND: 'ENOTFOUND',
-    ESERVFAIL: 'ESERVFAIL',
-    ECONNREFUSED: 'ECONNREFUSED',
-    ETIMEOUT: 'ETIMEOUT'
-};
-Object.freeze(exports.DNS_ERR_CODE);
 function makeServiceLocator(...resolvers) {
     if (resolvers.length === 0) {
         throw Error(`no DNS resolvers given`);
     }
-    return serviceLabel => async (address) => {
+    return (serviceLabel, logError) => async (address) => {
         const domain = domainOfAddress(address);
         let prevConnectionExc = undefined;
-        for (const resolver of resolvers) {
+        for (let i = 0; i < resolvers.length; i += 1) {
+            const resolver = resolvers[i];
             try {
                 const txtRecords = await resolver.resolveTxt(domain);
                 const recValue = extractPair(txtRecords, serviceLabel);
@@ -242,25 +235,25 @@ function makeServiceLocator(...resolvers) {
                 return url;
             }
             catch (err) {
+                await logError(err, `Resolver ${i + 1} fails to get TXT records of ${domain}`);
                 const { code, hostname, message } = err;
-                if (code === exports.DNS_ERR_CODE.NODATA) {
+                if (code === dns_1.NODATA) {
                     throw noServiceRecordExc(address);
                 }
-                else if ((code === exports.DNS_ERR_CODE.ESERVFAIL)
-                    || (code === exports.DNS_ERR_CODE.ECONNREFUSED)
-                    || (code === exports.DNS_ERR_CODE.ETIMEOUT)) {
+                else if ((code === dns_1.SERVFAIL)
+                    || (code === dns_1.CONNREFUSED)
+                    || (code === dns_1.TIMEOUT)) {
                     if (!prevConnectionExc) {
                         prevConnectionExc = noConnectionExc({ code, hostname, message });
                     }
                 }
-                else if ((code === exports.DNS_ERR_CODE.NOTFOUND) || hostname) {
+                else if ((code === dns_1.NOTFOUND) || hostname) {
                     throw domainNotFoundExc(address, { code, hostname, message });
                 }
                 else {
                     if (!prevConnectionExc) {
                         prevConnectionExc = err;
                     }
-                    throw err;
                 }
             }
         }

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

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.45.1",
+  "version": "0.45.3",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -44,11 +44,11 @@
   },
   "devDependencies": {
     "@types/jasmine": "^5.1.13",
-    "@types/node": "^22.13.14",
+    "@types/node": "^24.1.0",
     "@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",