core-3nweb-client-lib 0.52.3 → 0.53.0

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

@@ -54,6 +54,13 @@ declare namespace web3n {
 		connectType: 'dns';
 	}
 
+	interface NetworkConnectException extends ConnectException {
+		connectType: 'network';
+		networkType: 'regular' | 'onion' | 'i2p';
+		location: string;
+		noImplementationSet?: true;
+	}
+
 	interface HTTPException extends HTTPErrorDetails {
 		type: 'http-request';
 		status: number;

package/build/core/asmail/config.d.ts

@@ -1,4 +1,4 @@
-import { ServiceLocator } from '../../lib-client/service-locator';
+import { ServiceLocator } from '../../lib-client/networks';
 import { ParamOnServer } from '../../lib-client/asmail/service-config';
 import { GetSigner } from '../id-manager';
 import { NetClient } from '../../lib-client/request-utils';

package/build/core/asmail/delivery/common.d.ts

@@ -5,7 +5,7 @@ import { Encryptor } from '../../../lib-common/async-cryptor-wrap';
 import { ASMailKeyPair } from '../../keyring/common';
 import { NetClient } from '../../../lib-client/request-utils';
 import { LogWarning, LogError } from '../../../lib-client/logging/log-to-file';
-import { ServiceLocator } from '../../../lib-client/service-locator';
+import { ServiceLocator } from '../../../lib-client/networks';
 import { AsyncRNG } from '../../../lib-common/rng-def';
 type OutgoingMessage = web3n.asmail.OutgoingMessage;
 type DeliveryProgress = web3n.asmail.DeliveryProgress;

package/build/core/asmail/inbox/index.d.ts

@@ -1,5 +1,5 @@
 import { StorageGetter } from '../../../lib-client/xsp-fs/common';
-import { ServiceLocator } from '../../../lib-client/service-locator';
+import { ServiceLocator } from '../../../lib-client/networks';
 import { OpenedMsg } from '../msg/opener';
 import { MsgKeyInfo } from '../../keyring';
 import * as delivApi from '../../../lib-common/service-api/asmail/delivery';

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

@@ -5,7 +5,7 @@ import { StorageGetter } from '../../lib-client/xsp-fs/common';
 import { GetSigner } from '../id-manager';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { Logger } from '../../lib-client/logging/log-to-file';
-import { ServiceLocatorMaker } from '../../lib-client/service-locator';
+import { ServiceLocatorMaker } from '../../lib-client/networks';
 import { MakeNet } from '..';
 import { AsyncRNG } from '../../lib-common/rng-def';
 type WritableFS = web3n.files.WritableFS;

package/build/core/asmail/key-verification.d.ts

@@ -1,5 +1,5 @@
-import { ServiceLocator } from '../../lib-client/service-locator';
 import { NetClient } from '../../lib-client/request-utils';
+import { ServiceLocator } from '../../lib-client/networks';
 type JsonKey = web3n.keys.JsonKey;
 type SignedLoad = web3n.keys.SignedLoad;
 type PKeyCertChain = web3n.keys.PKeyCertChain;

package/build/core/id-manager/index.d.ts

@@ -1,7 +1,7 @@
 import { GenerateKey } from '../startup/sign-in';
 import { LogError, LogWarning } from '../../lib-client/logging/log-to-file';
 import { NetClient } from '../../lib-client/request-utils';
-import { ServiceLocator } from '../../lib-client/service-locator';
+import { ServiceLocator } from '../../lib-client/networks';
 import { MailerIdSigner } from '../../lib-common/mailerid-sigs/user';
 import { AsyncRNG } from '../../lib-common/rng-def';
 type JsonKey = web3n.keys.JsonKey;

package/build/core/index.d.ts

@@ -1,6 +1,6 @@
 import { FactoryOfFSs } from './storage';
 import { NetClient } from '../lib-client/request-utils';
-import { ServiceLocatorMaker } from '../lib-client/service-locator';
+import { ServiceLocatorMaker } from '../lib-client/networks';
 import type { makeCryptor } from 'ecma-nacl-cryptors';
 import { AsyncRNG } from '../lib-common/rng-def';
 export type { makeCryptor } from 'ecma-nacl-cryptors';

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

@@ -1,7 +1,7 @@
 import { GetSigner } from '../id-manager';
 import { GenerateKey } from '../startup/sign-in';
 import { StorageGetter } from '../../lib-client/xsp-fs/common';
-import { ServiceLocator } from '../../lib-client/service-locator';
+import { ServiceLocator } from '../../lib-client/networks';
 import { ScryptGenParams } from '../../lib-client/key-derivation';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { StoragePathForUser } from '../app-files';

package/build/lib-client/asmail/sender.d.ts

@@ -3,8 +3,8 @@
  */
 import { NetClient } from '../request-utils';
 import * as api from '../../lib-common/service-api/asmail/delivery';
-import { ServiceLocator } from '../service-locator';
 import { MailerIdSigner } from '../../lib-common/mailerid-sigs/user';
+import { ServiceLocator } from '../networks';
 export type FirstSaveReqOpts = api.PutObjFirstQueryOpts;
 export type FollowingSaveReqOpts = api.PutObjSecondQueryOpts;
 export type ServiceUrlGetter = (address: string) => Promise<string>;

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

@@ -1,3 +1,3 @@
 import { RequestFn } from "./request-utils";
-import { DnsResolver } from "./service-locator";
+import { DnsResolver } from "./networks";
 export declare function dohAt(request: RequestFn<unknown>, dohServerUrl: string): DnsResolver;

package/build/lib-client/doh.js

@@ -17,7 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dohAt = dohAt;
-const service_locator_1 = require("./service-locator");
+const networks_1 = require("./networks");
 function dohAt(request, dohServerUrl) {
     async function resolveTxt(domain) {
         const answer = await sendDohQuestion(request, dohServerUrl, domain, 'TXT');
@@ -41,27 +41,27 @@ async function sendDohQuestion(request, serverUrl, domain, type) {
     const reply = await request(opts)
         .catch((exc) => {
         if (exc.type === 'connect') {
-            throw { code: service_locator_1.CONNREFUSED, hostname: domain, cause: exc };
+            throw { code: networks_1.CONNREFUSED, hostname: domain, cause: exc };
         }
         else {
-            throw { code: service_locator_1.SERVFAIL, hostname: domain, cause: exc };
+            throw { code: networks_1.SERVFAIL, hostname: domain, cause: exc };
         }
     });
     const { status, data } = reply;
     if (status !== 200) {
         throw {
-            code: service_locator_1.SERVFAIL, hostname: domain,
+            code: networks_1.SERVFAIL, hostname: domain,
             message: `status ${reply.status} from DoH server`
         };
     }
     if (data.Status !== 0) {
-        throw { code: service_locator_1.NOTFOUND, hostname: domain };
+        throw { code: networks_1.NOTFOUND, hostname: domain };
     }
     if (data.Answer) {
         return data.Answer;
     }
     else {
-        throw { code: service_locator_1.NODATA, hostname: domain };
+        throw { code: networks_1.NODATA, hostname: domain };
     }
 }
 Object.freeze(exports);

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

@@ -132,7 +132,7 @@ ${(0, error_1.stringifyErr)(err)}`;
             return [];
         }))
             .filter(fName => fName.endsWith(`.${LOG_FILE_EXT}`));
-        const tsCutOff = Date.now() - 4 * 24 * 12 * 60 * 60 * 1000;
+        const tsCutOff = Date.now() - 4 * 24 * 60 * 60 * 1000;
         for (const fName of logs) {
             try {
                 const fPath = (0, path_1.join)(logsDir, fName);

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

@@ -0,0 +1,29 @@
+import { NetClient, RequestFn, OpenServiceEventsSource } from './request-utils';
+import { LogError } from './logging/log-to-file';
+export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
+export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel | 'report', logError: LogError) => ServiceLocator;
+export type ServiceLocator = (address: string) => Promise<string>;
+export interface DnsResolver {
+    resolveTxt: (hostname: string) => Promise<string[][]>;
+}
+export declare const NODATA = "ENODATA";
+export declare const SERVFAIL = "ESERVFAIL";
+export declare const NOTFOUND = "ENOTFOUND";
+export declare const CONNREFUSED = "ECONNREFUSED";
+export declare const TIMEOUT = "ETIMEOUT";
+export interface NetworkFns {
+    requests: RequestFn<unknown>;
+    openServiceEventsSource: OpenServiceEventsSource;
+}
+export interface RegularNetworkFns extends NetworkFns {
+    naming: DnsResolver[];
+}
+export declare function wrapNetworkFns(impls: {
+    regular: RegularNetworkFns;
+    onion?: NetworkFns;
+    i2p?: NetworkFns;
+    resetConnectivity?: () => void;
+}): {
+    makeLocator: ServiceLocatorMaker;
+    makeNet: () => NetClient;
+};

package/build/lib-client/networks.js

@@ -0,0 +1,320 @@
+"use strict";
+/*
+ Copyright (C) 2015 - 2017, 2020 - 2021, 2024 - 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.TIMEOUT = exports.CONNREFUSED = exports.NOTFOUND = exports.SERVFAIL = exports.NODATA = void 0;
+exports.wrapNetworkFns = wrapNetworkFns;
+const request_utils_1 = require("./request-utils");
+const runtime_1 = require("../lib-common/exceptions/runtime");
+/**
+ * @param address
+ * @return domain string, extracted from a given address
+ */
+function domainOfAddress(address) {
+    address = address.trim();
+    const indOfAt = address.lastIndexOf('@');
+    if (indOfAt < 0) {
+        return address;
+    }
+    else {
+        return address.substring(indOfAt + 1);
+    }
+}
+function checkAndPrepareURL(value) {
+    // XXX insert some value sanity check
+    return 'https://' + value;
+}
+function domainNotFoundExc(address, cause) {
+    return (0, runtime_1.makeRuntimeException)('service-locating', { address, cause }, { domainNotFound: true });
+}
+function noServiceRecordExc(address) {
+    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
+    }, {});
+}
+function noConnectionToWellKnownExc(message, cause) {
+    return (0, runtime_1.makeRuntimeException)('connect', {
+        connectType: 'dns',
+        message,
+        cause
+    }, {});
+}
+/**
+ * This implementation extracts exactly one string value for a given service.
+ * All other values are ignored, without raising error about misconfiguration.
+ * In time we may have several records for the same service type, yet, for now
+ * only one TXT per service per domain is considered valid.
+ * @param txtRecords are TXT records from dns.
+ * @param serviceLabel is a label of service, for which we want to get string
+ * value from TXT record.
+ * @return string value for a given service among given dns TXT records, or
+ * undefined, when service record is not found.
+ */
+function extractPair(txtRecords, serviceLabel) {
+    for (const txtRecord of txtRecords) {
+        let joinedTXTstanzas = txtRecord.join('');
+        let record = getRecordAtStartOf(joinedTXTstanzas);
+        while (record) {
+            if (record.service === serviceLabel) {
+                const value = record.value.trim();
+                if (value.length > 0) {
+                    return value;
+                }
+            }
+            if (record.txtTail) {
+                record = getRecordAtStartOf(record.txtTail);
+            }
+            else {
+                break;
+            }
+        }
+    }
+    return;
+}
+const recordsStarts = {
+    "3nstorage": '3nstorage=',
+    asmail: 'asmail=',
+    mailerid: 'mailerid=',
+    report: 'report='
+};
+function getRecordAtStartOf(txt) {
+    let service = undefined;
+    for (const [label, startSeq] of Object.entries(recordsStarts)) {
+        if (txt.startsWith(startSeq)) {
+            service = label;
+            txt = txt.substring(startSeq.length);
+            break;
+        }
+    }
+    if (!service) {
+        return;
+    }
+    for (const delimiter of Object.values(recordsStarts)) {
+        const endPos = txt.indexOf(delimiter);
+        if (endPos >= 0) {
+            return {
+                service,
+                value: txt.substring(0, endPos),
+                txtTail: txt.substring(endPos)
+            };
+        }
+    }
+    return {
+        service,
+        value: txt
+    };
+}
+exports.NODATA = "ENODATA";
+// export const FORMERR = "EFORMERR";
+exports.SERVFAIL = "ESERVFAIL";
+exports.NOTFOUND = "ENOTFOUND";
+// export const NOTIMP = "ENOTIMP";
+// export const REFUSED = "EREFUSED";
+// export const BADQUERY = "EBADQUERY";
+// export const BADNAME = "EBADNAME";
+// export const BADFAMILY = "EBADFAMILY";
+// export const BADRESP = "EBADRESP";
+exports.CONNREFUSED = "ECONNREFUSED";
+exports.TIMEOUT = "ETIMEOUT";
+// export const EOF = "EOF";
+// export const FILE = "EFILE";
+// export const NOMEM = "ENOMEM";
+// export const DESTRUCTION = "EDESTRUCTION";
+// export const BADSTR = "EBADSTR";
+// export const BADFLAGS = "EBADFLAGS";
+// export const NONAME = "ENONAME";
+// export const BADHINTS = "EBADHINTS";
+// export const NOTINITIALIZED = "ENOTINITIALIZED";
+// export const LOADIPHLPAPI = "ELOADIPHLPAPI";
+// export const ADDRGETNETWORKPARAMS = "EADDRGETNETWORKPARAMS";
+// export const CANCELLED = "ECANCELLED";
+// XXX
+//  - service exist in network.
+//  - we go from name to address to service location in a network, and a request function ?
+//    Or, should we assume that request function will engage with proper network, based on location,
+//    implying that location string should always map to one network: regular | tor | i2p.
+//    Implicit rule allows us not to force making request fn here, as well as naming system in one net,
+//    pointing to another. bank.xyz can be served by server <key>.onion, and vice versa.
+//
+//  - this function, ... doesn't have to change, as DnsResolver is given. May be  we should make a more
+//    general wrap, that gonna use this for DNS in regular net?
+//  - and, we may probably want to make function here as a reusable wrapper around different network request fns.
+//    Regular net request, may internally switch into proxy/hidding modes. Other networks provide anonymity,
+//    hence, these additional options should stay "inside" regular network request fn.
+//
+//  - should we have a reusable wrapper creator here, creating coherent pair of naming and request functions.
+//    Cause, if embedding doesn't have explicit implementation for Tor, both initial naming and net-maker functions
+//    should be coherent.
+const onionTLD = '.onion';
+const i2pTLD = '.i2p';
+function makeMissingImplementationException(networkType, location) {
+    return (0, runtime_1.makeRuntimeException)('connect', { networkType, location }, { noImplementationSet: true });
+}
+function wrapNetworkFns(impls) {
+    const { regular, i2p, onion, resetConnectivity } = impls;
+    const locateInDNS = makeServiceLocatorInDNS(...regular.naming);
+    const locationRequesterInOnion = (onion ?
+        (0, request_utils_1.makeNetClient)(onion.requests, undefined).doBodylessRequest : undefined);
+    const locationRequesterInI2P = (i2p ?
+        (0, request_utils_1.makeNetClient)(i2p.requests, undefined).doBodylessRequest : undefined);
+    const makeLocator = function (serviceLabel, logError) {
+        return async (address) => {
+            if (address.endsWith(onionTLD)) {
+                if (locationRequesterInOnion) {
+                    return locateInWellKnown(locationRequesterInOnion, address, serviceLabel);
+                }
+                else {
+                    throw makeMissingImplementationException('onion', address);
+                }
+            }
+            else if (address.endsWith(i2pTLD)) {
+                if (locationRequesterInI2P) {
+                    return locateInWellKnown(locationRequesterInI2P, address, serviceLabel);
+                }
+                else {
+                    throw makeMissingImplementationException('i2p', address);
+                }
+            }
+            else {
+                return locateInDNS(address, serviceLabel, logError);
+            }
+        };
+    };
+    function fnsForUrl(url) {
+        const u = new URL(url);
+        if (u.hostname.endsWith(onionTLD)) {
+            if (onion) {
+                return onion;
+            }
+            else {
+                throw makeMissingImplementationException('onion', url);
+            }
+        }
+        else if (u.hostname.endsWith(i2pTLD)) {
+            if (i2p) {
+                return i2p;
+            }
+            else {
+                throw makeMissingImplementationException('i2p', url);
+            }
+        }
+        else {
+            return regular;
+        }
+    }
+    const requestFn = async function (opts, reqContentType, reqBody) {
+        const { requests } = fnsForUrl(opts.url);
+        return requests(opts, reqContentType, reqBody);
+    };
+    const openEventSourceFn = async function (req) {
+        const { openServiceEventsSource } = fnsForUrl(req.url);
+        return openServiceEventsSource(req);
+    };
+    function makeNet() {
+        return (0, request_utils_1.makeNetClient)(requestFn, openEventSourceFn, resetConnectivity);
+    }
+    return { makeLocator, makeNet };
+}
+function makeServiceLocatorInDNS(...resolvers) {
+    if (resolvers.length === 0) {
+        throw Error(`no DNS resolvers given`);
+    }
+    async function locateInDNS(address, serviceLabel, logError) {
+        const domain = domainOfAddress(address);
+        let exc = undefined;
+        let connectionExc = undefined;
+        for (let i = 0; i < resolvers.length; i += 1) {
+            const resolver = resolvers[i];
+            let txtRecords;
+            try {
+                txtRecords = await resolver.resolveTxt(domain);
+            }
+            catch (err) {
+                await logError(err, `Resolver ${i + 1} fails to get TXT records of ${domain}`);
+                const { code, hostname, message } = err;
+                if (code === exports.NODATA) {
+                    exc = noServiceRecordExc(address);
+                }
+                else if ((code === exports.SERVFAIL)
+                    || (code === exports.CONNREFUSED)
+                    || (code === exports.TIMEOUT)) {
+                    connectionExc !== null && connectionExc !== void 0 ? connectionExc : (connectionExc = noConnectionExc({ code, hostname, message }));
+                }
+                else if ((code === exports.NOTFOUND) || hostname) {
+                    exc !== null && exc !== void 0 ? exc : (exc = domainNotFoundExc(address, { code, hostname, message }));
+                }
+                else {
+                    exc !== null && exc !== void 0 ? exc : (exc = err);
+                }
+                continue;
+            }
+            const recValue = extractPair(txtRecords, serviceLabel);
+            if (recValue) {
+                if (serviceLabel === 'report') {
+                    return recValue;
+                }
+                else {
+                    return checkAndPrepareURL(recValue);
+                }
+            }
+            else {
+                exc !== null && exc !== void 0 ? exc : (exc = noServiceRecordExc(address));
+            }
+        }
+        throw exc !== null && exc !== void 0 ? exc : connectionExc;
+    }
+    return locateInDNS;
+}
+const wellKnownPath = '/.well-known/3nweb.json';
+async function locateInWellKnown(request, address, serviceLabel) {
+    const host = domainOfAddress(address);
+    try {
+        const reply = await request({
+            method: 'GET',
+            url: `https://${host}${wellKnownPath}`
+        });
+        if (reply.status === 200) {
+            const recValue = reply.data[serviceLabel];
+            if (recValue) {
+                if (serviceLabel === 'report') {
+                    return recValue;
+                }
+                else {
+                    return checkAndPrepareURL(recValue);
+                }
+            }
+            else {
+                throw noServiceRecordExc(address);
+            }
+        }
+        else if (reply.status === 404) {
+            throw noServiceRecordExc(address);
+        }
+        else {
+            throw noConnectionToWellKnownExc(`Fail to read ${wellKnownPath} for ${address}`, { httpStatus: reply.status });
+        }
+    }
+    catch (exc) {
+        throw noConnectionToWellKnownExc(`Fail to read ${wellKnownPath} for ${address}`, exc);
+    }
+}
+Object.freeze(exports);

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

@@ -1,5 +1,5 @@
+import { ServiceLocatorMaker } from "./networks";
 import { NetClient } from "./request-utils";
-import { ServiceLocatorMaker } from "./service-locator";
 export interface Check {
     service: 'signup' | 'asmail' | '3nstorage' | 'mailerid';
 }

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

@@ -1,7 +1,7 @@
 import { NetClient } from './request-utils';
 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';
+import { ServiceLocator } from './networks';
 type SignedLoad = web3n.keys.SignedLoad;
 /**
  * This returns a promise, resolvable to ASMailRootRoute object.
@@ -26,18 +26,6 @@ export declare function mailerIdInfoAt(client: NetClient, url: string): Promise<
  * @param url
  */
 export declare function storageInfoAt(client: NetClient, url: string): Promise<StorageRootRoute>;
-export type ServiceTypeDNSLabel = 'mailerid' | 'asmail' | '3nstorage';
-export type ServiceLocatorMaker = (serviceLabel: ServiceTypeDNSLabel | 'report', logError: LogError) => ServiceLocator;
-export type ServiceLocator = (address: string) => Promise<string>;
-export interface DnsResolver {
-    resolveTxt: (hostname: string) => Promise<string[][]>;
-}
-export declare const NODATA = "ENODATA";
-export declare const SERVFAIL = "ESERVFAIL";
-export declare const NOTFOUND = "ENOTFOUND";
-export declare const CONNREFUSED = "ECONNREFUSED";
-export declare const TIMEOUT = "ETIMEOUT";
-export declare function makeServiceLocator(...resolvers: DnsResolver[]): ServiceLocatorMaker;
 /**
  * @param resolver
  * @param address

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

@@ -16,14 +16,11 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TIMEOUT = exports.CONNREFUSED = exports.NOTFOUND = exports.SERVFAIL = exports.NODATA = 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 runtime_1 = require("../lib-common/exceptions/runtime");
 const http_1 = require("../lib-common/exceptions/http");
 async function readJSONLocatedAt(client, url) {
     if ((new URL(url)).protocol !== 'https:') {
@@ -121,175 +118,6 @@ async function storageInfoAt(client, url) {
     }
     return transform;
 }
-/**
- * @param address
- * @return domain string, extracted from a given address
- */
-function domainOfAddress(address) {
-    address = address.trim();
-    const indOfAt = address.lastIndexOf('@');
-    if (indOfAt < 0) {
-        return address;
-    }
-    else {
-        return address.substring(indOfAt + 1);
-    }
-}
-function checkAndPrepareURL(value) {
-    // XXX insert some value sanity check
-    return 'https://' + value;
-}
-function domainNotFoundExc(address, cause) {
-    return (0, runtime_1.makeRuntimeException)('service-locating', { address, cause }, { domainNotFound: true });
-}
-function noServiceRecordExc(address) {
-    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.
- * All other values are ignored, without raising error about misconfiguration.
- * In time we may have several records for the same service type, yet, for now
- * only one TXT per service per domain is considered valid.
- * @param txtRecords are TXT records from dns.
- * @param serviceLabel is a label of service, for which we want to get string
- * value from TXT record.
- * @return string value for a given service among given dns TXT records, or
- * undefined, when service record is not found.
- */
-function extractPair(txtRecords, serviceLabel) {
-    for (const txtRecord of txtRecords) {
-        let joinedTXTstanzas = txtRecord.join('');
-        let record = getRecordAtStartOf(joinedTXTstanzas);
-        while (record) {
-            if (record.service === serviceLabel) {
-                const value = record.value.trim();
-                if (value.length > 0) {
-                    return value;
-                }
-            }
-            if (record.txtTail) {
-                record = getRecordAtStartOf(record.txtTail);
-            }
-            else {
-                break;
-            }
-        }
-    }
-    return;
-}
-const recordsStarts = {
-    "3nstorage": '3nstorage=',
-    asmail: 'asmail=',
-    mailerid: 'mailerid=',
-    report: 'report='
-};
-function getRecordAtStartOf(txt) {
-    let service = undefined;
-    for (const [label, startSeq] of Object.entries(recordsStarts)) {
-        if (txt.startsWith(startSeq)) {
-            service = label;
-            txt = txt.substring(startSeq.length);
-            break;
-        }
-    }
-    if (!service) {
-        return;
-    }
-    for (const delimiter of Object.values(recordsStarts)) {
-        const endPos = txt.indexOf(delimiter);
-        if (endPos >= 0) {
-            return {
-                service,
-                value: txt.substring(0, endPos),
-                txtTail: txt.substring(endPos)
-            };
-        }
-    }
-    return {
-        service,
-        value: txt
-    };
-}
-exports.NODATA = "ENODATA";
-// export const FORMERR = "EFORMERR";
-exports.SERVFAIL = "ESERVFAIL";
-exports.NOTFOUND = "ENOTFOUND";
-// export const NOTIMP = "ENOTIMP";
-// export const REFUSED = "EREFUSED";
-// export const BADQUERY = "EBADQUERY";
-// export const BADNAME = "EBADNAME";
-// export const BADFAMILY = "EBADFAMILY";
-// export const BADRESP = "EBADRESP";
-exports.CONNREFUSED = "ECONNREFUSED";
-exports.TIMEOUT = "ETIMEOUT";
-// export const EOF = "EOF";
-// export const FILE = "EFILE";
-// export const NOMEM = "ENOMEM";
-// export const DESTRUCTION = "EDESTRUCTION";
-// export const BADSTR = "EBADSTR";
-// export const BADFLAGS = "EBADFLAGS";
-// export const NONAME = "ENONAME";
-// export const BADHINTS = "EBADHINTS";
-// export const NOTINITIALIZED = "ENOTINITIALIZED";
-// export const LOADIPHLPAPI = "ELOADIPHLPAPI";
-// export const ADDRGETNETWORKPARAMS = "EADDRGETNETWORKPARAMS";
-// export const CANCELLED = "ECANCELLED";
-function makeServiceLocator(...resolvers) {
-    if (resolvers.length === 0) {
-        throw Error(`no DNS resolvers given`);
-    }
-    return (serviceLabel, logError) => async (address) => {
-        const domain = domainOfAddress(address);
-        let exc = undefined;
-        let connectionExc = undefined;
-        for (let i = 0; i < resolvers.length; i += 1) {
-            const resolver = resolvers[i];
-            let txtRecords;
-            try {
-                txtRecords = await resolver.resolveTxt(domain);
-            }
-            catch (err) {
-                await logError(err, `Resolver ${i + 1} fails to get TXT records of ${domain}`);
-                const { code, hostname, message } = err;
-                if (code === exports.NODATA) {
-                    exc = noServiceRecordExc(address);
-                }
-                else if ((code === exports.SERVFAIL)
-                    || (code === exports.CONNREFUSED)
-                    || (code === exports.TIMEOUT)) {
-                    connectionExc !== null && connectionExc !== void 0 ? connectionExc : (connectionExc = noConnectionExc({ code, hostname, message }));
-                }
-                else if ((code === exports.NOTFOUND) || hostname) {
-                    exc !== null && exc !== void 0 ? exc : (exc = domainNotFoundExc(address, { code, hostname, message }));
-                }
-                else {
-                    exc !== null && exc !== void 0 ? exc : (exc = err);
-                }
-                continue;
-            }
-            const recValue = extractPair(txtRecords, serviceLabel);
-            if (recValue) {
-                if (serviceLabel === 'report') {
-                    return recValue;
-                }
-                else {
-                    return checkAndPrepareURL(recValue);
-                }
-            }
-            else {
-                exc !== null && exc !== void 0 ? exc : (exc = noServiceRecordExc(address));
-            }
-        }
-        throw exc !== null && exc !== void 0 ? exc : connectionExc;
-    };
-}
 /**
  * @param resolver
  * @param address

package/build/lib-common-on-node/request-from-node.d.ts

@@ -1,2 +1,3 @@
+import * as https from 'https';
 import { RequestFn } from '../lib-client/request-utils';
-export declare function makeRequestFromNode(): RequestFn<unknown>;
+export declare function makeRequestFromNode(getAgent?: () => https.Agent | undefined): RequestFn<unknown>;

package/build/lib-common-on-node/request-from-node.js

@@ -19,10 +19,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRequestFromNode = makeRequestFromNode;
 const https = require("https");
 const request_utils_1 = require("../lib-client/request-utils");
-function makeRequestFromNode() {
+function makeRequestFromNode(getAgent) {
     const nodeRequest = (opts) => https.request(opts);
     return (opts, reqContentType, reqBody) => {
         const httpsOpts = (0, request_utils_1.formHttpsReqOpts)(opts, reqContentType, reqBody);
+        const agent = getAgent === null || getAgent === void 0 ? void 0 : getAgent();
+        if (agent) {
+            httpsOpts.agent = agent;
+        }
         return (0, request_utils_1.processRequest)(nodeRequest, httpsOpts, opts, reqBody);
     };
 }

package/build/lib-index.d.ts

@@ -5,7 +5,7 @@ export { IdManager } from './core/id-manager';
 export { Storages, FactoryOfFSs, reverseDomain } from './core/storage';
 export { SignIn, GenerateKey, CompleteInitWithoutCache } from './core/startup/sign-in';
 export { ASMail } from './core/asmail';
-export { makeServiceLocator, ServiceLocatorMaker } from "./lib-client/service-locator";
+export { wrapNetworkFns, ServiceLocatorMaker } from "./lib-client/networks";
 export { makeNetClient, NetClient } from "./lib-client/request-utils";
 export { appDirs } from './core/app-files';
 export { sysFolders } from "./core/storage/system-folders";

package/build/lib-index.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2022, 2025 3NSoft Inc.
+ Copyright (C) 2020 - 2022, 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
@@ -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.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;
+exports.dohAt = exports.checkServicesStartingFromSignup = exports.SYSTEM_DOMAIN = exports.makeLogger = exports.DeviceFS = exports.sysFolders = exports.appDirs = exports.makeNetClient = exports.wrapNetworkFns = 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; } });
@@ -43,8 +43,8 @@ var sign_in_1 = require("./core/startup/sign-in");
 Object.defineProperty(exports, "SignIn", { enumerable: true, get: function () { return sign_in_1.SignIn; } });
 var asmail_1 = require("./core/asmail");
 Object.defineProperty(exports, "ASMail", { enumerable: true, get: function () { return asmail_1.ASMail; } });
-var service_locator_1 = require("./lib-client/service-locator");
-Object.defineProperty(exports, "makeServiceLocator", { enumerable: true, get: function () { return service_locator_1.makeServiceLocator; } });
+var networks_1 = require("./lib-client/networks");
+Object.defineProperty(exports, "wrapNetworkFns", { enumerable: true, get: function () { return networks_1.wrapNetworkFns; } });
 var request_utils_1 = require("./lib-client/request-utils");
 Object.defineProperty(exports, "makeNetClient", { enumerable: true, get: function () { return request_utils_1.makeNetClient; } });
 var app_files_1 = require("./core/app-files");

package/build/tests/libs-for-tests/core-runner.js

@@ -26,7 +26,7 @@ const log_to_file_1 = require("../../lib-client/logging/log-to-file");
 const error_1 = require("../../lib-common/exceptions/error");
 const assert_1 = require("../../lib-common/assert");
 const caps_ipc_wrap_1 = require("./caps-ipc-wrap");
-const service_locator_1 = require("../../lib-client/service-locator");
+const networks_1 = require("../../lib-client/networks");
 const dns_1 = require("dns");
 const napi_nacl_1 = require("napi-nacl");
 const request_from_node_1 = require("../../lib-common-on-node/request-from-node");
@@ -62,6 +62,21 @@ exports.testApp = {
 };
 let numOfRunningCores = 0;
 const DATA_FOLDER = (0, path_1.join)(__dirname, '..', '..', '..', 'test-data');
+function resolveTxt(domain) {
+    return new Promise((resolve, reject) => (0, dns_1.resolveTxt)(domain, (err, records) => {
+        if (err) {
+            reject(err);
+        }
+        else {
+            resolve(records);
+        }
+    }));
+}
+const { makeLocator, makeNet } = (0, networks_1.wrapNetworkFns)({ regular: {
+        naming: [{ resolveTxt }],
+        openServiceEventsSource: websocket_from_node_1.openServiceEventsSrcFromNode,
+        requests: (0, request_from_node_1.makeRequestFromNode)()
+    } });
 class CoreRunner {
     constructor(signUpUrl) {
         this.signUpUrl = signUpUrl;
@@ -83,16 +98,7 @@ class CoreRunner {
             this.appCaps.close();
             this.appCaps = undefined;
         }
-        this.runningCore = lib_index_1.Core.make({ dataDir: this.dataFolder, signUpUrl: this.signUpUrl }, () => (0, lib_index_1.makeNetClient)((0, request_from_node_1.makeRequestFromNode)(), websocket_from_node_1.openServiceEventsSrcFromNode), (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);
-                }
-            }))
-        }), device_fs_places_1.sysFilesOnDevice, napi_nacl_1.makeNativeCryptor, random_node_1.bytes);
+        this.runningCore = lib_index_1.Core.make({ dataDir: this.dataFolder, signUpUrl: this.signUpUrl }, makeNet, makeLocator, device_fs_places_1.sysFilesOnDevice, napi_nacl_1.makeNativeCryptor, random_node_1.bytes);
     }
     async close() {
         if (this.appCaps) {

package/package.json

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