core-3nweb-client-lib 0.46.0 → 0.47.0

package/README.md

@@ -6,18 +6,36 @@
 ## Development and testing
 
 After repository clone, bring down all NodeJS modules, by running in project's folder:
-```
+```bash
 npm ci
 ```
 
 Tests have some unit and integrated components. Integration test uses 3NWeb spec server. Integrated tests use server and dns mocking from `spec-3nweb-server`.
 
 Build is done with
-```
+```bash
 npm run build
 ```
 
 Test is done with (after build)
-```
+```bash
 npm run test
 ```
+
+
+## Reuse on non-Node and injecting implementation
+
+To reuse this library in non-Node environments, like Android's jsengine and browser, we need to provide different implementations for access to network, files.
+
+Some of these functions are explicitly passed in setup phases, like naming functionality that may either use DNS of DoH. Switch between these may even be done based on same platform, but depending on user prefernces.
+
+Other functions, like access to device's file system, depend only on environment. For these we use a bit cheaper injection approach. We articulate types that should be implemented. And modules expect to get implementation from `globalThis`. Hence, environments that use core should inject respective implementations at some early stage.
+
+Note that import of implementations of injected for node should be done directly, placing it before other imports that need injected global value(s). Do something like:
+```typescript
+import { makePlatformDeviceFS } from 'core-3nweb-client-lib/build/injected-globals/inject-on-node';
+globalThis.platform = {
+	device_fs: makePlatformDeviceFS()
+};
+import ... // other modules
+```

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

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

package/build/lib-client/doh.js

@@ -17,12 +17,10 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dohAt = dohAt;
-const https = require("https");
-const request_utils_1 = require("./request-utils");
-const dns_1 = require("dns");
-function dohAt(dohServerUrl) {
+const service_locator_1 = require("./service-locator");
+function dohAt(request, dohServerUrl) {
     async function resolveTxt(domain) {
-        const answer = await sendDohQuestion(dohServerUrl, domain, 'TXT');
+        const answer = await sendDohQuestion(request, dohServerUrl, domain, 'TXT');
         let txt = [];
         for (const { data: line } of answer) {
             txt.push([line]);
@@ -31,38 +29,39 @@ function dohAt(dohServerUrl) {
     }
     return { resolveTxt };
 }
-async function sendDohQuestion(serverUrl, domain, type) {
+async function sendDohQuestion(request, serverUrl, domain, type) {
     const opts = {
         method: 'GET',
         url: `${serverUrl}?name=${domain}&type=${type}`,
+        requestHeaders: {
+            accept: 'application/dns-json'
+        },
         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)
+    const reply = await request(opts)
         .catch((exc) => {
         if (exc.type === 'connect') {
-            throw { code: dns_1.CONNREFUSED, hostname: domain, cause: exc };
+            throw { code: service_locator_1.CONNREFUSED, hostname: domain, cause: exc };
         }
         else {
-            throw { code: dns_1.SERVFAIL, hostname: domain, cause: exc };
+            throw { code: service_locator_1.SERVFAIL, hostname: domain, cause: exc };
         }
     });
     const { status, data } = reply;
     if (status !== 200) {
         throw {
-            code: dns_1.SERVFAIL, hostname: domain,
+            code: service_locator_1.SERVFAIL, hostname: domain,
             message: `status ${reply.status} from DoH server`
         };
     }
     if (data.Status !== 0) {
-        throw { code: dns_1.NOTFOUND, hostname: domain };
+        throw { code: service_locator_1.NOTFOUND, hostname: domain };
     }
     if (data.Answer) {
         return data.Answer;
     }
     else {
-        throw { code: dns_1.NODATA, hostname: domain };
+        throw { code: service_locator_1.NODATA, hostname: domain };
     }
 }
 Object.freeze(exports);

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

@@ -58,7 +58,6 @@ 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/objs-on-disk/obj-on-disk.js

@@ -26,7 +26,6 @@ const file_writing_proc_1 = require("./file-writing-proc");
 const operators_1 = require("rxjs/operators");
 const obj_version_file_1 = require("../../lib-common/objs-on-disk/obj-version-file");
 const utils_for_observables_1 = require("../../lib-common/utils-for-observables");
-const types_1 = require("util/types");
 const deferred_1 = require("../../lib-common/processes/deferred");
 class ObjOnDisk {
     constructor(objId, version, objFile, downloader, readable, getBaseSegsOnDisk, downloadsInProgress = undefined) {
@@ -349,7 +348,7 @@ class Download {
         const { chunk, chunkBytes, deferred, segments } = this.segsAsapRequest[0];
         const segment = segments[0];
         try {
-            if ((0, types_1.isPromise)(segment)) {
+            if (isPromise(segment)) {
                 chunkBytes.push(await segment);
                 segments.shift();
             }
@@ -561,6 +560,9 @@ class DownloadsRunner {
 exports.DownloadsRunner = DownloadsRunner;
 Object.freeze(DownloadsRunner.prototype);
 Object.freeze(DownloadsRunner);
+function isPromise(object) {
+    return !!object.then;
+}
 function makeExecPool(max) {
     return { queue: [], max, numOfRunning: 0 };
 }

package/build/lib-client/request-utils.d.ts

@@ -1,5 +1,6 @@
-import * as https from 'https';
-import { ClientRequest } from 'http';
+import type * as https from 'https';
+import type * as WebSocket from 'ws';
+import type { ClientRequest, OutgoingHttpHeaders } from 'http';
 export declare const SESSION_ID_HEADER = "X-Session-Id";
 export declare const CONTENT_TYPE_HEADER = "Content-Type";
 export interface JSONHttpRequest extends XMLHttpRequest {
@@ -18,6 +19,7 @@ export interface RequestOpts {
     appPath?: string;
     responseType?: 'json' | 'arraybuffer' | 'text';
     sessionId?: string;
+    requestHeaders?: OutgoingHttpHeaders;
     responseHeaders?: string[];
     timeout?: number;
     timeoutRetries?: number;
@@ -30,6 +32,7 @@ export type RequestFn<T> = (opts: RequestOpts, contentType?: ContentType, reqBod
 export declare function processRequest<T>(requester: (opts: https.RequestOptions) => ClientRequest, httpsOpts: https.RequestOptions, opts: RequestOpts, reqBody: Uint8Array | undefined, attempt?: number): Promise<Reply<T>>;
 export declare function formHttpsReqOpts(opts: RequestOpts, contentType?: ContentType, reqBody?: Uint8Array): https.RequestOptions;
 export declare function extractIntHeader(rep: Reply<any>, headerName: string): number;
+export type OpenWebSocket = (url: string, sessionId: string) => Promise<Reply<WebSocket>>;
 export interface NetClient {
     /**
      * This makes a 'Content-Type: application/json' request with given json,
@@ -52,5 +55,6 @@ export interface NetClient {
      */
     doBodylessRequest<T>(opts: RequestOpts): Promise<Reply<T>>;
     reset(): void;
+    openWebSocket: (url: string, sessionId: string) => Promise<Reply<WebSocket>>;
 }
-export declare function makeNetClient(request?: RequestFn<unknown>, reset?: () => void): NetClient;
+export declare function makeNetClient(request: RequestFn<unknown>, openWebSocket: NetClient['openWebSocket'], reset?: () => void): NetClient;

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

@@ -22,7 +22,6 @@ exports.extractIntHeader = extractIntHeader;
 exports.makeNetClient = makeNetClient;
 const http_1 = require("../lib-common/exceptions/http");
 const bytes_fifo_buffer_1 = require("../lib-common/byte-streaming/bytes-fifo-buffer");
-const https = require("https");
 const rxjs_1 = require("rxjs");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
 const deferred_1 = require("../lib-common/processes/deferred");
@@ -47,6 +46,7 @@ async function processRequest(requester, httpsOpts, opts, reqBody, attempt = 0)
     }
 }
 function formHttpsReqOpts(opts, contentType, reqBody) {
+    var _a;
     if (!opts.url) {
         throw new Error(`Cannot send net request, cause url is not set in given options.`);
     }
@@ -60,7 +60,7 @@ function formHttpsReqOpts(opts, contentType, reqBody) {
         hostname: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
-        headers: {}
+        headers: (_a = opts.requestHeaders) !== null && _a !== void 0 ? _a : {}
     };
     if (reqBody) {
         netReqOpts.headers['Content-Length'] = reqBody.length;
@@ -178,14 +178,7 @@ function extractIntHeader(rep, headerName) {
     }
     return intHeader;
 }
-function makeNodeRequest() {
-    const nodeRequest = (opts) => https.request(opts);
-    return (opts, contentType, reqBody) => {
-        const httpsOpts = formHttpsReqOpts(opts, contentType, reqBody);
-        return processRequest(nodeRequest, httpsOpts, opts, reqBody);
-    };
-}
-function makeNetClient(request = makeNodeRequest(), reset = () => { }) {
+function makeNetClient(request, openWebSocket, reset = () => { }) {
     const client = {
         doBinaryRequest(opts, bytes) {
             let reqBody;
@@ -208,7 +201,8 @@ function makeNetClient(request = makeNodeRequest(), reset = () => { }) {
             const reqBody = ((json === undefined) ? new Uint8Array(0) : buffer_utils_1.utf8.pack(JSON.stringify(json)));
             return request(opts, 'application/json', reqBody);
         },
-        reset
+        reset,
+        openWebSocket
     };
     return Object.freeze(client);
 }

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

@@ -1,4 +1,5 @@
 import { NetClient } from "./request-utils";
+import { ServiceLocatorMaker } from "./service-locator";
 export interface Check {
     service: 'signup' | 'asmail' | '3nstorage' | 'mailerid';
 }
@@ -15,4 +16,4 @@ export interface CheckResult extends Check {
     message: string;
     err?: any;
 }
-export declare function checkServicesStartingFromSignup(client: NetClient, signupUrl: string, signupToken: string | undefined, progress?: (result: CheckResult | CheckStart) => void): Promise<CheckResult[]>;
+export declare function checkServicesStartingFromSignup(srvLocator: ServiceLocatorMaker, client: NetClient, signupUrl: string, signupToken: string | undefined, progress?: (result: CheckResult | CheckStart) => void): Promise<CheckResult[]>;

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

@@ -18,10 +18,8 @@
 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) {
+async function checkServicesStartingFromSignup(srvLocator, client, signupUrl, signupToken, progress) {
     const results = [];
     function recordResult(r) {
         progress === null || progress === void 0 ? void 0 : progress(r);
@@ -35,7 +33,7 @@ async function checkServicesStartingFromSignup(client, signupUrl, signupToken, p
     }
     async function checkService(service, userDomain) {
         progress === null || progress === void 0 ? void 0 : progress({ start: true, service, userDomain });
-        const check = await checkUserDomainDNS(service, userDomain);
+        const check = await checkUserDomainDNS(srvLocator, service, userDomain);
         recordResult(check);
         if (check.isOk) {
             await checkFstServiceEndpoint(service, check.serviceUrl);
@@ -127,8 +125,12 @@ 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) {
+// const srvLocator = makeServiceLocator(
+// 	{ resolveTxt: dns.resolveTxt },
+// 	dohAt(`https://cloudflare-dns.com/dns-query`),
+// 	dohAt(`https://dns.google/resolve`)
+// );
+async function checkUserDomainDNS(srvLocator, service, domain) {
     try {
         const serviceUrl = await (srvLocator(service, noop))(`u@${domain}`);
         return {

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

@@ -1,5 +1,5 @@
 import { NetClient } from './request-utils';
-import { promises as dnsPromises } from 'dns';
+import type { 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';
@@ -33,6 +33,11 @@ export type ServiceLocator = (address: string) => Promise<string>;
 export interface DnsResolver {
     resolveTxt: (typeof dnsPromises)['resolveTxt'];
 }
+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

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

@@ -16,13 +16,14 @@
  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 dns_1 = require("dns");
+// import { CONNREFUSED, NODATA, NOTFOUND, SERVFAIL, TIMEOUT } from 'dns';
 const runtime_1 = require("../lib-common/exceptions/runtime");
 const http_1 = require("../lib-common/exceptions/http");
 async function readJSONLocatedAt(client, url) {
@@ -216,6 +217,30 @@ function getRecordAtStartOf(txt) {
         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`);
@@ -237,17 +262,17 @@ function makeServiceLocator(...resolvers) {
             catch (err) {
                 await logError(err, `Resolver ${i + 1} fails to get TXT records of ${domain}`);
                 const { code, hostname, message } = err;
-                if (code === dns_1.NODATA) {
+                if (code === exports.NODATA) {
                     throw noServiceRecordExc(address);
                 }
-                else if ((code === dns_1.SERVFAIL)
-                    || (code === dns_1.CONNREFUSED)
-                    || (code === dns_1.TIMEOUT)) {
+                else if ((code === exports.SERVFAIL)
+                    || (code === exports.CONNREFUSED)
+                    || (code === exports.TIMEOUT)) {
                     if (!prevConnectionExc) {
                         prevConnectionExc = noConnectionExc({ code, hostname, message });
                     }
                 }
-                else if ((code === dns_1.NOTFOUND) || hostname) {
+                else if ((code === exports.NOTFOUND) || hostname) {
                     throw domainNotFoundExc(address, { code, hostname, message });
                 }
                 else {

package/build/lib-client/user-with-mid-session.d.ts

@@ -3,7 +3,7 @@
  * MailerId and uses respectively authenticated session.
  */
 import { Reply, RequestOpts, NetClient } from '../lib-client/request-utils';
-import * as WebSocket from 'ws';
+import type * as WebSocket from 'ws';
 import { MailerIdSigner } from '../lib-common/mailerid-sigs/user';
 import { AwaitableState } from '../lib-common/awaitable-state';
 export type IGetMailerIdSigner = () => Promise<MailerIdSigner>;

package/build/lib-client/user-with-mid-session.js

@@ -18,7 +18,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceUser = void 0;
 const api = require("../lib-common/service-api/mailer-id/login");
-const ws_utils_1 = require("./ws-utils");
 const login_1 = require("./mailer-id/login");
 const assert_1 = require("../lib-common/assert");
 const http_1 = require("../lib-common/exceptions/http");
@@ -228,7 +227,7 @@ class ServiceUser {
         };
         return this.callEnsuringLogin(() => {
             this.prepCallOpts(opts, true);
-            return (0, ws_utils_1.openSocket)(opts.url, opts.sessionId);
+            return this.net.openWebSocket(opts.url, opts.sessionId);
         });
     }
 }

package/build/lib-common/async-fs-node.js

@@ -16,6 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 var _a;
+var _b;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.copyFile = exports.writeFile = exports.unlink = exports.truncate = exports.symlink = exports.stat = exports.rmdir = exports.rename = exports.readlink = exports.readdir = exports.readFile = exports.open = exports.mkdir = exports.lstat = exports.appendFile = void 0;
 exports.readToBuf = readToBuf;
@@ -37,6 +38,9 @@ const deferred_1 = require("./processes/deferred");
 const bytes_fifo_buffer_1 = require("./byte-streaming/bytes-fifo-buffer");
 const buffer_utils_1 = require("./buffer-utils");
 function noop() { }
+if (!((_b = globalThis.platform) === null || _b === void 0 ? void 0 : _b.device_fs)) {
+    throw new Error(`Expected globally injected object globalThis.platform?.device_fs is missing`);
+}
 /**
  * fs functions follow node's type, and are injected via global object to allow injection in
  * non-node environments, like Android or browser.

package/build/lib-common/ipc/ws-ipc.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { SubscribingClient } from './generic-ipc';
-import * as WebSocket from 'ws';
+import type * as WebSocket from 'ws';
 import type { ConnectException, HTTPException } from '../exceptions/http';
 export { RequestEnvelope, RequestHandler, EventfulServer, makeEventfulServer, SubscribingClient } from './generic-ipc';
 export interface WSException extends web3n.RuntimeException {

package/build/lib-common-on-node/fs-on-node.d.ts

@@ -0,0 +1,2 @@
+import { PlatformDeviceFS } from '../injected-globals/platform-devfs';
+export declare function makePlatformDeviceFS(): PlatformDeviceFS;

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

@@ -0,0 +1,2 @@
+import { RequestFn } from '../lib-client/request-utils';
+export declare function makeRequestFromNode(): RequestFn<unknown>;

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

@@ -0,0 +1,28 @@
+"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.makeRequestFromNode = makeRequestFromNode;
+const https = require("https");
+const request_utils_1 = require("../lib-client/request-utils");
+function makeRequestFromNode() {
+    const nodeRequest = (opts) => https.request(opts);
+    return (opts, contentType, reqBody) => {
+        const httpsOpts = (0, request_utils_1.formHttpsReqOpts)(opts, contentType, reqBody);
+        return (0, request_utils_1.processRequest)(nodeRequest, httpsOpts, opts, reqBody);
+    };
+}

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

@@ -0,0 +1,3 @@
+import * as WebSocket from 'ws';
+import { Reply } from '../lib-client/request-utils';
+export declare function openSocketFromNode(url: string, sessionId: string): Promise<Reply<WebSocket>>;

package/build/{lib-client/ws-utils.js → lib-common-on-node/websocket-from-node.js}

@@ -13,15 +13,16 @@
  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/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openSocket = openSocket;
+exports.openSocketFromNode = openSocketFromNode;
 const WebSocket = require("ws");
-const request_utils_1 = require("./request-utils");
+const request_utils_1 = require("../lib-client/request-utils");
 const deferred_1 = require("../lib-common/processes/deferred");
 const http_1 = require("../lib-common/exceptions/http");
 const https_1 = require("https");
-function openSocket(url, sessionId) {
+function openSocketFromNode(url, sessionId) {
     if (!url.startsWith('wss://')) {
         throw new Error(`Url protocol must be wss`);
     }

package/build/lib-index.d.ts

@@ -14,4 +14,3 @@ 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';
-export * as injectOnNode from './injected-globals/inject-on-node';

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.injectOnNode = 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.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; } });
@@ -60,5 +60,4 @@ 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; } });
-exports.injectOnNode = require("./injected-globals/inject-on-node");
 Object.freeze(exports);

package/build/tests/jasmine.js

@@ -17,10 +17,10 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 const jasmine = require("jasmine");
-const inject_on_node_1 = require("../injected-globals/inject-on-node");
+const fs_on_node_1 = require("../lib-common-on-node/fs-on-node");
 // injecting global's expected to be on node
 globalThis.platform = {
-    device_fs: (0, inject_on_node_1.makePlatformDeviceFS)()
+    device_fs: (0, fs_on_node_1.makePlatformDeviceFS)()
 };
 const jas = new jasmine({});
 const specsFromCLI = [];

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

@@ -29,6 +29,8 @@ const caps_ipc_wrap_1 = require("./caps-ipc-wrap");
 const service_locator_1 = require("../../lib-client/service-locator");
 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");
+const websocket_from_node_1 = require("../../lib-common-on-node/websocket-from-node");
 exports.testApp = {
     appDomain: 'test.3nweb.app',
     capsRequested: {
@@ -80,7 +82,7 @@ class CoreRunner {
             this.appCaps.close();
             this.appCaps = undefined;
         }
-        this.runningCore = lib_index_1.Core.make({ dataDir: this.dataFolder, signUpUrl: this.signUpUrl }, lib_index_1.makeNetClient, (0, service_locator_1.makeServiceLocator)({
+        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.openSocketFromNode), (0, service_locator_1.makeServiceLocator)({
             resolveTxt: domain => new Promise((resolve, reject) => (0, dns_1.resolveTxt)(domain, (err, texts) => {
                 if (err) {
                     reject(err);

package/build/tests/libs-for-tests/setups.js

@@ -28,6 +28,8 @@ const assert_1 = require("../../lib-common/assert");
 const request_utils_1 = require("../../lib-client/request-utils");
 const retrieval_1 = require("../../lib-common/service-api/asmail/retrieval");
 const sleep_1 = require("../../lib-common/processes/sleep");
+const request_from_node_1 = require("../../lib-common-on-node/request-from-node");
+const websocket_from_node_1 = require("../../lib-common-on-node/websocket-from-node");
 const SERVICE_PORT = 8088;
 const SIGNUP_URL = `https://localhost:${SERVICE_PORT}/signup/`;
 function makeSetupObject(domains) {
@@ -260,7 +262,7 @@ function domainFromUserId(userId) {
 function serviceWithMailerIdLogin() {
     const testSrv = (new URL(SIGNUP_URL)).host;
     const serviceUrl = `https://${testSrv}/asmail/retrieval/login/mailerid`;
-    const net = (0, request_utils_1.makeNetClient)();
+    const net = (0, request_utils_1.makeNetClient)((0, request_from_node_1.makeRequestFromNode)(), websocket_from_node_1.openSocketFromNode);
     async function isSessionValid(sessionId) {
         const rep = await net.doBodylessRequest({
             url: `https://${testSrv}/asmail/retrieval/${retrieval_1.listMsgs.genUrlEnd()}`,

package/package.json

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

package/build/injected-globals/inject-on-node.d.ts

@@ -1,2 +0,0 @@
-import { PlatformDeviceFS } from './platform-devfs';
-export declare function makePlatformDeviceFS(): PlatformDeviceFS;

package/build/lib-client/ws-utils.d.ts

@@ -1,3 +0,0 @@
-import * as WebSocket from 'ws';
-import { Reply } from './request-utils';
-export declare function openSocket(url: string, sessionId: string): Promise<Reply<WebSocket>>;