core-3nweb-client-lib 0.34.2 → 0.35.0

package/build/core/storage/local/storage.js

@@ -17,8 +17,8 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalStorage = void 0;
-const common_1 = require("../../../lib-client/3nstorage/xsp-fs/common");
-const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
+const common_1 = require("../../../lib-client/xsp-fs/common");
+const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 const random_node_1 = require("../../../lib-common/random-node");
 const ecma_nacl_1 = require("ecma-nacl");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");

package/build/core/storage/synced/downloader.d.ts

@@ -1,5 +1,5 @@
-import { StorageOwner } from '../../../lib-client/3nstorage/service';
-import { ObjId } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { StorageOwner } from '../../../lib-client/3nstorage/storage-owner';
+import { ObjId } from '../../../lib-client/xsp-fs/common';
 import { ObjDownloader, InitDownloadParts } from '../../../lib-client/objs-on-disk/obj-on-disk';
 import { Layout } from 'xsp-files';
 export declare class Downloader implements ObjDownloader {

package/build/core/storage/synced/obj-files.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ObjId, SyncedObjStatus } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { ObjId, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
 import { InitDownloadParts } from '../../../lib-client/objs-on-disk/obj-on-disk';
 import { ObjSource, Subscribe } from 'xsp-files';
 import { Downloader } from './downloader';
@@ -9,8 +9,8 @@ import { ObjStatus } from './obj-status';
 import { LogError } from '../../../lib-client/logging/log-to-file';
 import { DiffInfo } from '../../../lib-common/service-api/3nstorage/owner';
 import { FiniteChunk } from '../../../lib-common/objs-on-disk/file-layout';
-import { StorageOwner as RemoteStorage } from '../../../lib-client/3nstorage/service';
-import { UploadHeaderChange } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { StorageOwner as RemoteStorage } from '../../../lib-client/3nstorage/storage-owner';
+import { UploadHeaderChange } from '../../../lib-client/xsp-fs/common';
 export declare const UNSYNCED_FILE_NAME_EXT = "unsynced";
 export declare const REMOTE_FILE_NAME_EXT = "v";
 /**

package/build/core/storage/synced/obj-files.js

@@ -32,7 +32,7 @@ const obj_status_1 = require("./obj-status");
 const timed_cache_1 = require("../../../lib-common/timed-cache");
 const upload_header_file_1 = require("./upload-header-file");
 const utils_1 = require("../common/utils");
-const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
+const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 exports.UNSYNCED_FILE_NAME_EXT = 'unsynced';
 exports.REMOTE_FILE_NAME_EXT = 'v';
 /**

package/build/core/storage/synced/obj-status.d.ts

@@ -1,4 +1,4 @@
-import { ObjId, SyncedObjStatus } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { ObjId, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
 import { NonGarbageVersions, VersionsInfo } from '../common/obj-info-file';
 import { LogError } from '../../../lib-client/logging/log-to-file';
 import { DiffInfo, ObjStatus as RemoteObjStatus } from '../../../lib-common/service-api/3nstorage/owner';

package/build/core/storage/synced/obj-status.js

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjStatus = exports.STATUS_FILE_NAME = void 0;
 exports.readAndCheckStatus = readAndCheckStatus;
 const path_1 = require("path");
-const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
+const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 const json_saving_1 = require("../common/json-saving");
 const obj_info_file_1 = require("../common/obj-info-file");
 const assert_1 = require("../../../lib-common/assert");

package/build/core/storage/synced/remote-events.d.ts

@@ -1,6 +1,6 @@
-import { StorageOwner } from '../../../lib-client/3nstorage/service';
+import { StorageOwner } from '../../../lib-client/3nstorage/storage-owner';
 import { ObjFiles } from './obj-files';
-import { Storage } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { Storage } from '../../../lib-client/xsp-fs/common';
 import { LogError } from '../../../lib-client/logging/log-to-file';
 /**
  * Remote events are absorbed into objects' statuses, broadcasting respective

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

@@ -1,11 +1,11 @@
 import { IGetMailerIdSigner } from '../../../lib-client/user-with-mid-session';
-import { SyncedStorage as ISyncedStorage, NodesContainer, Storage as IStorage, StorageGetter, ObjId, NodeEvent, SyncedObjStatus } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { SyncedStorage as ISyncedStorage, NodesContainer, Storage as IStorage, StorageGetter, ObjId, NodeEvent, SyncedObjStatus } from '../../../lib-client/xsp-fs/common';
 import { ScryptGenParams } from '../../../lib-client/key-derivation';
 import { LogError } from '../../../lib-client/logging/log-to-file';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { NetClient } from '../../../lib-client/request-utils';
 import { Observable } from 'rxjs';
-import { UploadHeaderChange } from '../../../lib-client/3nstorage/xsp-fs/common';
+import { UploadHeaderChange } from '../../../lib-client/xsp-fs/common';
 type FolderEvent = web3n.files.FolderEvent;
 type FileEvent = web3n.files.FileEvent;
 type SyncStatus = web3n.files.SyncStatus;

package/build/core/storage/synced/storage.js

@@ -17,9 +17,9 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncedStore = void 0;
-const common_1 = require("../../../lib-client/3nstorage/xsp-fs/common");
-const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
-const service_1 = require("../../../lib-client/3nstorage/service");
+const common_1 = require("../../../lib-client/xsp-fs/common");
+const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
+const storage_owner_1 = require("../../../lib-client/3nstorage/storage-owner");
 const obj_files_1 = require("./obj-files");
 const random_node_1 = require("../../../lib-common/random-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
@@ -44,7 +44,7 @@ class SyncedStore {
         Object.seal(this);
     }
     static async makeAndStart(path, user, getSigner, getStorages, cryptor, remoteServiceUrl, net, logError) {
-        const remote = service_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
+        const remote = storage_owner_1.StorageOwner.make(user, getSigner, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         s.uploader.start();
@@ -56,7 +56,7 @@ class SyncedStore {
         };
     }
     static async makeAndStartWithoutRemote(path, user, getStorages, cryptor, remoteServiceUrl, net, logError) {
-        const { remote, setMid } = service_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
+        const { remote, setMid } = storage_owner_1.StorageOwner.makeBeforeMidSetup(user, remoteServiceUrl, net);
         const objFiles = await obj_files_1.ObjFiles.makeFor(path, remote, logError);
         const s = new SyncedStore(objFiles, remote, getStorages, cryptor, logError);
         return {

package/build/core/storage/synced/upload-header-file.d.ts

@@ -1,4 +1,4 @@
-import { UploadHeaderChange } from "../../../lib-client/3nstorage/xsp-fs/common";
+import { UploadHeaderChange } from "../../../lib-client/xsp-fs/common";
 export declare const UPLOAD_HEADER_FILE_NAME_EXT = "upload";
 export declare function saveUploadHeaderFile(objFolder: string, headers: UploadHeaderChange): Promise<void>;
 export declare function readUploadHeaderFromFile(objFolder: string, uploadVersion: number): Promise<UploadHeaderChange | undefined>;

package/build/core/storage/synced/upsyncer.d.ts

@@ -1,4 +1,4 @@
-import { StorageOwner } from "../../../lib-client/3nstorage/service";
+import { StorageOwner } from "../../../lib-client/3nstorage/storage-owner";
 import { SyncedObj } from "./obj-files";
 import { MonoTypeOperatorFunction } from "rxjs";
 import { FileWrite } from "../../../lib-client/objs-on-disk/file-writing-proc";

package/build/core/storage/synced/upsyncer.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpSyncer = void 0;
 const labelled_exec_pools_1 = require("../../../lib-common/processes/labelled-exec-pools");
-const exceptions_1 = require("../../../lib-client/3nstorage/exceptions");
+const exceptions_1 = require("../../../lib-client/xsp-fs/exceptions");
 const assert_1 = require("../../../lib-common/assert");
 const deferred_1 = require("../../../lib-common/processes/deferred");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");

package/build/core-ipc/common-caps.js

@@ -25,12 +25,14 @@ const asmail_cap_ipc_1 = require("../core/asmail/asmail-cap-ipc");
 const storage_cap_ipc_1 = require("../core/storage/storage-cap-ipc");
 const mailerid_cap_ipc_1 = require("../core/id-manager/mailerid-cap-ipc");
 const generic_1 = require("./generic");
+const keyrings_cap_ipc_1 = require("../core/keyring/keyrings-cap-ipc");
 function exposeW3N(coreSide, w3n, extraCAPs) {
     const commonCAPsExposures = {
         log: log_cap_1.exposeLogger,
         mail: asmail_cap_ipc_1.exposeASMailCAP,
         mailerid: mailerid_cap_ipc_1.exposeMailerIdCAP,
         storage: storage_cap_ipc_1.exposeStorageCAP,
+        keyrings: keyrings_cap_ipc_1.exposeKeyringsCAP,
     };
     (0, generic_1.exposeCAPs)(coreSide, w3n, commonCAPsExposures, extraCAPs);
 }
@@ -43,6 +45,7 @@ function makeW3Nclient(clientSide, extraCAPs) {
         mail: asmail_cap_ipc_1.makeASMailCaller,
         mailerid: mailerid_cap_ipc_1.makeMailerIdCaller,
         storage: storage_cap_ipc_1.makeStorageCaller,
+        keyrings: keyrings_cap_ipc_1.makeKeyringsCaller,
     };
     const clientW3N = (0, generic_1.makeClientSide)(clientSide, mainCAPs, extraCAPs);
     addLogToConsoleToLogCap(clientW3N);
@@ -54,6 +57,7 @@ async function promiseW3Nclient(clientSide, extraCAPs) {
         mail: asmail_cap_ipc_1.makeASMailCaller,
         mailerid: mailerid_cap_ipc_1.makeMailerIdCaller,
         storage: storage_cap_ipc_1.promiseStorageCaller,
+        keyrings: keyrings_cap_ipc_1.makeKeyringsCaller,
     };
     const clientW3N = await (0, generic_1.promiseClientSide)(clientSide, mainCAPs, extraCAPs);
     addLogToConsoleToLogCap(clientW3N);

package/build/lib-client/3nstorage/{service.d.ts → storage-owner.d.ts}

@@ -1,12 +1,9 @@
-/**
- * This defines functions that implement 3NStorage protocol.
- */
 import { NetClient } from '../request-utils';
 import * as api from '../../lib-common/service-api/3nstorage/owner';
 import { ServiceUser, IGetMailerIdSigner } from '../user-with-mid-session';
 import * as keyGen from '../key-derivation';
 import { SubscribingClient } from '../../lib-common/ipc/ws-ipc';
-import { ObjId } from './xsp-fs/common';
+import { ObjId } from '../xsp-fs/common';
 export type FirstSaveReqOpts = api.PutObjFirstQueryOpts;
 export type FollowingSaveReqOpts = api.PutObjSecondQueryOpts;
 export declare class StorageOwner extends ServiceUser {

package/build/lib-client/3nstorage/{service.js → storage-owner.js}

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2022, 2025 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
@@ -17,45 +17,31 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageOwner = void 0;
-/**
- * This defines functions that implement 3NStorage protocol.
- */
 const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/3nstorage/owner");
 const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
 const keyGen = require("../key-derivation");
-const exceptions_1 = require("./exceptions");
+const exceptions_1 = require("../xsp-fs/exceptions");
 const ws_ipc_1 = require("../../lib-common/ipc/ws-ipc");
 const assert_1 = require("../../lib-common/assert");
-function toInitServiceUriGetter(net, mainUrlGetter) {
-    return async () => {
-        const serviceUrl = await mainUrlGetter();
-        const info = await (0, service_locator_1.storageInfoAt)(net, serviceUrl);
-        if (!info.owner) {
-            throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
-        }
-        return info.owner;
-    };
-}
+const storageAccessParams = {
+    login: api.midLogin.MID_URL_PART,
+    logout: api.closeSession.URL_END,
+    canBeRedirected: true
+};
 class StorageOwner extends user_with_mid_session_1.ServiceUser {
-    constructor(user, getSigner, getInitServiceURI, net) {
-        super(user, {
-            login: api.midLogin.MID_URL_PART,
-            logout: api.closeSession.URL_END,
-            canBeRedirected: true
-        }, getSigner, getInitServiceURI, net);
+    constructor(user, getSigner, mainUrlGetter, net) {
+        super(user, storageAccessParams, getSigner, serviceUriGetter(net, mainUrlGetter), net);
         this.maxChunkSize = undefined;
         Object.seal(this);
     }
     static make(user, getSigner, mainUrlGetter, net) {
-        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
-        const remote = new StorageOwner(user, getSigner, srvUriGetter, net);
+        const remote = new StorageOwner(user, getSigner, mainUrlGetter, net);
         return remote;
     }
     static makeBeforeMidSetup(user, mainUrlGetter, net) {
-        const srvUriGetter = toInitServiceUriGetter(net, mainUrlGetter);
-        const remote = new StorageOwner(user, undefined, srvUriGetter, net);
+        const remote = new StorageOwner(user, undefined, mainUrlGetter, net);
         return {
             remote,
             setMid: getSigner => remote.setGetterOfSigner(getSigner)
@@ -356,4 +342,14 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
 exports.StorageOwner = StorageOwner;
 Object.freeze(StorageOwner.prototype);
 Object.freeze(StorageOwner);
+function serviceUriGetter(net, mainUrlGetter) {
+    return async () => {
+        const serviceUrl = await mainUrlGetter();
+        const info = await (0, service_locator_1.storageInfoAt)(net, serviceUrl);
+        if (!info.owner) {
+            throw new Error(`Missing owner service url in 3NStorage information at ${serviceUrl}`);
+        }
+        return info.owner;
+    };
+}
 Object.freeze(exports);

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

@@ -1,6 +1,3 @@
-/**
- * This defines functions that implement ASMail reception protocol.
- */
 import { NetClient } from '../request-utils';
 import * as api from '../../lib-common/service-api/asmail/retrieval';
 import { ServiceUser, IGetMailerIdSigner } from '../user-with-mid-session';

package/build/lib-client/asmail/recipient.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015, 2017 3NSoft Inc.
+ Copyright (C) 2015, 2017, 2025 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
@@ -13,15 +13,13 @@
  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.MailRecipient = void 0;
 exports.makeMsgNotFoundException = makeMsgNotFoundException;
 exports.makeObjNotFoundException = makeObjNotFoundException;
 exports.makeMsgIsBrokenException = makeMsgIsBrokenException;
-/**
- * This defines functions that implement ASMail reception protocol.
- */
 const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/asmail/retrieval");
 const user_with_mid_session_1 = require("../user-with-mid-session");
@@ -55,20 +53,14 @@ function makeMsgIsBrokenException(msgId) {
     };
     return exc;
 }
+const inboxAccessParams = {
+    login: api.midLogin.MID_URL_PART,
+    logout: api.closeSession.URL_END,
+    canBeRedirected: true
+};
 class MailRecipient extends user_with_mid_session_1.ServiceUser {
     constructor(user, getSigner, mainUrlGetter, net) {
-        super(user, {
-            login: api.midLogin.MID_URL_PART,
-            logout: api.closeSession.URL_END,
-            canBeRedirected: true
-        }, getSigner, async () => {
-            const serviceUrl = await mainUrlGetter();
-            const info = await (0, service_locator_1.asmailInfoAt)(this.net, serviceUrl);
-            if (!info.retrieval) {
-                throw new Error(`Missing retrieval service url in ASMail information at ${serviceUrl}`);
-            }
-            return info.retrieval;
-        }, net);
+        super(user, inboxAccessParams, getSigner, serviceUriGetter(net, mainUrlGetter), net);
         Object.seal(this);
     }
     getNet() {
@@ -213,4 +205,14 @@ class MailRecipient extends user_with_mid_session_1.ServiceUser {
 exports.MailRecipient = MailRecipient;
 Object.freeze(MailRecipient);
 Object.freeze(MailRecipient.prototype);
+function serviceUriGetter(net, mainUrlGetter) {
+    return async () => {
+        const serviceUrl = await mainUrlGetter();
+        const info = await (0, service_locator_1.asmailInfoAt)(net, serviceUrl);
+        if (!info.retrieval) {
+            throw new Error(`Missing retrieval service url in ASMail information at ${serviceUrl}`);
+        }
+        return info.retrieval;
+    };
+}
 Object.freeze(exports);

package/build/lib-client/asmail/service-config.d.ts

@@ -3,11 +3,15 @@
  */
 import { NetClient } from '../request-utils';
 import { ServiceUser, IGetMailerIdSigner } from '../user-with-mid-session';
+type ASMailConfigParams = web3n.asmail.ASMailConfigParams;
+export interface ParamOnServer<P extends keyof ASMailConfigParams> {
+    setOnServer: (value: ASMailConfigParams[P] | null) => Promise<void>;
+    getFromServer: () => Promise<ASMailConfigParams[P] | null>;
+}
 export declare class MailConfigurator extends ServiceUser {
-    paramsOnServer: {
-        [name: string]: any;
-    };
     constructor(userId: string, getSigner: IGetMailerIdSigner, mainUrlGetter: () => Promise<string>, net: NetClient);
-    getParam<T>(urlEnd: string): Promise<T>;
-    setParam<T>(urlEnd: string, param: T): Promise<void>;
+    getParam<P extends keyof ASMailConfigParams>(param: P): Promise<ASMailConfigParams[P] | null>;
+    setParam<P extends keyof ASMailConfigParams>(param: P, value: ASMailConfigParams[P] | null): Promise<void>;
+    makeParamSetterAndGetter<P extends keyof ASMailConfigParams>(param: P): ParamOnServer<P>;
 }
+export {};

package/build/lib-client/asmail/service-config.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015, 2020 3NSoft Inc.
+ Copyright (C) 2015, 2020, 2025 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
@@ -23,24 +23,18 @@ const request_utils_1 = require("../request-utils");
 const api = require("../../lib-common/service-api/asmail/config");
 const user_with_mid_session_1 = require("../user-with-mid-session");
 const service_locator_1 = require("../service-locator");
+const configAccessParams = {
+    login: api.midLogin.MID_URL_PART,
+    logout: api.closeSession.URL_END,
+    canBeRedirected: true
+};
 class MailConfigurator extends user_with_mid_session_1.ServiceUser {
     constructor(userId, getSigner, mainUrlGetter, net) {
-        super(userId, {
-            login: api.midLogin.MID_URL_PART,
-            logout: api.closeSession.URL_END,
-            canBeRedirected: true
-        }, getSigner, async () => {
-            const serviceUrl = await mainUrlGetter();
-            const info = await (0, service_locator_1.asmailInfoAt)(this.net, serviceUrl);
-            if (!info.config) {
-                throw new Error(`Missing configuration service url in ASMail information at ${serviceUrl}`);
-            }
-            return info.config;
-        }, net);
-        this.paramsOnServer = {};
+        super(userId, configAccessParams, getSigner, serviceUriGetter(net, mainUrlGetter), net);
         Object.seal(this);
     }
-    async getParam(urlEnd) {
+    async getParam(param) {
+        const urlEnd = urlEndForParam(param);
         const rep = await this.doBodylessSessionRequest({
             appPath: urlEnd,
             method: 'GET',
@@ -51,17 +45,48 @@ class MailConfigurator extends user_with_mid_session_1.ServiceUser {
         }
         return rep.data;
     }
-    async setParam(urlEnd, param) {
+    async setParam(param, value) {
+        const urlEnd = urlEndForParam(param);
         const rep = await this.doJsonSessionRequest({
             appPath: urlEnd,
             method: 'PUT',
-        }, param);
+        }, value);
         if (rep.status !== api.PARAM_SC.ok) {
             throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
         }
     }
+    makeParamSetterAndGetter(param) {
+        return {
+            getFromServer: () => this.getParam(param),
+            setOnServer: value => this.setParam(param, value)
+        };
+    }
 }
 exports.MailConfigurator = MailConfigurator;
 Object.freeze(MailConfigurator.prototype);
 Object.freeze(MailConfigurator);
+function serviceUriGetter(net, mainUrlGetter) {
+    return async () => {
+        const serviceUrl = await mainUrlGetter();
+        const info = await (0, service_locator_1.asmailInfoAt)(net, serviceUrl);
+        if (!info.config) {
+            throw new Error(`Missing configuration service url in ASMail information at ${serviceUrl}`);
+        }
+        return info.config;
+    };
+}
+function urlEndForParam(param) {
+    switch (param) {
+        case 'anon-sender/invites':
+        case 'anon-sender/policy':
+        case 'auth-sender/blacklist':
+        case 'auth-sender/invites':
+        case 'auth-sender/policy':
+        case 'auth-sender/whitelist':
+        case 'init-pub-key':
+            return `param/${param}`;
+        default:
+            throw new Error(`Invalid ASMail server configuration parameter: ${param}`);
+    }
+}
 Object.freeze(exports);

package/build/lib-client/cryptor/cryptor-in-worker.js

@@ -24,7 +24,7 @@ const error_1 = require("../../lib-common/exceptions/error");
 const path_1 = require("path");
 const assert_1 = require("../../lib-common/assert");
 const serialization_for_wasm_1 = require("./serialization-for-wasm");
-const cryptor_work_labels_1 = require("../cryptor-work-labels");
+const cryptor_work_labels_1 = require("./cryptor-work-labels");
 const MAX_IDLE_MILLIS = 60 * 1000;
 const jsWorkerFName = 'worker-js.js';
 const wasmWorkerFName = 'worker-wasm.js';

package/build/lib-client/cryptor/in-proc-js.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeInProcessCryptor = makeInProcessCryptor;
 const ecma_nacl_1 = require("ecma-nacl");
-const cryptor_work_labels_1 = require("../cryptor-work-labels");
+const cryptor_work_labels_1 = require("./cryptor-work-labels");
 function onNextTick(f) {
     return new Promise((resolve, reject) => process.nextTick(() => {
         try {

package/build/lib-client/cryptor/in-proc-wasm.js

@@ -25,7 +25,7 @@ const cryptor_proto_1 = require("../../protos/cryptor.proto");
 const deferred_1 = require("../../lib-common/processes/deferred");
 const assert_1 = require("../../lib-common/assert");
 const error_1 = require("../../lib-common/exceptions/error");
-const cryptor_work_labels_1 = require("../cryptor-work-labels");
+const cryptor_work_labels_1 = require("./cryptor-work-labels");
 function wasmBytes() {
     // There is a bug with electrons 12, 13, that doesn't let
     // worker_thread read this file from asar pack, even though main thread

package/build/lib-client/fs-utils/fs-sync-utils.js

@@ -21,7 +21,7 @@ exports.getOrMakeAndUploadFolderIn = getOrMakeAndUploadFolderIn;
 exports.uploadFolderChangesIfAny = uploadFolderChangesIfAny;
 exports.observableFromTreeEvents = observableFromTreeEvents;
 const rxjs_1 = require("rxjs");
-const exceptions_1 = require("../3nstorage/exceptions");
+const exceptions_1 = require("../xsp-fs/exceptions");
 async function getRemoteFolderChanges(fs, forceServerCheck = false) {
     if (forceServerCheck) {
         await fs.v.sync.updateStatusInfo('');

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

@@ -1,5 +1,5 @@
-import { JsonKey } from '../lib-common/jwkeys';
 import { Cryptor } from './cryptor/cryptor';
+type JsonKey = web3n.keys.JsonKey;
 export interface ScryptGenParams {
     logN: number;
     r: number;
@@ -12,3 +12,4 @@ export declare function deriveMidKeyPair(cryptor: Cryptor, pass: string, derivPa
     skey: Uint8Array;
     pkey: JsonKey;
 }>;
+export {};

package/build/lib-client/objs-on-disk/obj-folders.d.ts

@@ -1,5 +1,5 @@
 import { LogError } from '../logging/log-to-file';
-import { ObjId } from '../3nstorage/xsp-fs/common';
+import { ObjId } from '../xsp-fs/common';
 export interface Exception extends web3n.RuntimeException {
     type: 'cache';
     notFound?: true;

package/build/lib-client/objs-on-disk/obj-on-disk.d.ts

@@ -1,4 +1,4 @@
-import { ObjId } from '../3nstorage/xsp-fs/common';
+import { ObjId } from '../xsp-fs/common';
 import { ObjSource, Subscribe, Layout } from 'xsp-files';
 import { FileWrite } from './file-writing-proc';
 import { Observable } from 'rxjs';

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2018, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2018, 2020, 2025 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
@@ -210,7 +210,9 @@ function makeNetClient(request = makeNodeRequest()) {
             return request(opts);
         },
         doJsonRequest(opts, json) {
-            const reqBody = buffer_utils_1.utf8.pack(JSON.stringify(json));
+            const reqBody = ((json === undefined) ?
+                new Uint8Array(0) :
+                buffer_utils_1.utf8.pack(JSON.stringify(json)));
             return request(opts, 'application/json', reqBody);
         }
     };

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

@@ -1,6 +1,6 @@
-import { SignedLoad } from '../lib-common/jwkeys';
 import { NetClient } from './request-utils';
 import { promises as dnsPromises } from 'dns';
+type SignedLoad = web3n.keys.SignedLoad;
 export interface ASMailRoutes {
     delivery?: string;
     retrieval?: string;
@@ -49,3 +49,4 @@ export declare function getMailerIdInfoFor(resolver: ServiceLocator, client: Net
     info: MailerIdServiceInfo;
     domain: string;
 }>;
+export {};

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

@@ -6,6 +6,11 @@ import { Reply, RequestOpts, NetClient } from '../lib-client/request-utils';
 import { user as mid } from '../lib-common/mid-sigs-NaCl-Ed';
 import * as WebSocket from 'ws';
 export type IGetMailerIdSigner = () => Promise<mid.MailerIdSigner>;
+export interface ServiceAccessParams {
+    login: string;
+    logout: string;
+    canBeRedirected?: boolean;
+}
 export declare abstract class ServiceUser {
     readonly userId: string;
     private getSigner;
@@ -21,11 +26,7 @@ export declare abstract class ServiceUser {
     private canBeRedirected;
     private sessionId;
     private loginProc;
-    protected constructor(userId: string, opts: {
-        login: string;
-        logout: string;
-        canBeRedirected?: boolean;
-    }, getSigner: IGetMailerIdSigner | undefined, getInitServiceURI: () => Promise<string>, net: NetClient);
+    protected constructor(userId: string, accessParams: ServiceAccessParams, getSigner: IGetMailerIdSigner | undefined, getInitServiceURI: () => Promise<string>, net: NetClient);
     private get isUriSet();
     private throwOnBadServiceURI;
     protected setGetterOfSigner(getSigner: IGetMailerIdSigner): void;

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

@@ -47,7 +47,7 @@ class ServiceUser {
     get loginUrl() {
         return `${this.serviceURI}${this.loginUrlPart}`;
     }
-    constructor(userId, opts, getSigner, getInitServiceURI, net) {
+    constructor(userId, accessParams, getSigner, getInitServiceURI, net) {
         this.userId = userId;
         this.getSigner = getSigner;
         this.getInitServiceURI = getInitServiceURI;
@@ -56,13 +56,13 @@ class ServiceUser {
         this.redirectedFrom = undefined;
         this.sessionId = undefined;
         this.loginProc = undefined;
-        this.loginUrlPart = opts.login;
+        this.loginUrlPart = accessParams.login;
         if ((this.loginUrlPart.length > 0)
             && (this.loginUrlPart[this.loginUrlPart.length - 1] !== '/')) {
             this.loginUrlPart += '/';
         }
-        this.logoutUrlEnd = opts.logout;
-        this.canBeRedirected = !!opts.canBeRedirected;
+        this.logoutUrlEnd = accessParams.logout;
+        this.canBeRedirected = !!accessParams.canBeRedirected;
     }
     get isUriSet() {
         return (typeof this.serviceURI === 'string');

package/build/lib-client/{3nstorage/xsp-fs → xsp-fs}/attrs.js

@@ -17,9 +17,9 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.XAttrs = exports.CommonAttrs = void 0;
-const assert_1 = require("../../../lib-common/assert");
-const buffer_utils_1 = require("../../../lib-common/buffer-utils");
-const big_endian_1 = require("../../../lib-common/big-endian");
+const assert_1 = require("../../lib-common/assert");
+const buffer_utils_1 = require("../../lib-common/buffer-utils");
+const big_endian_1 = require("../../lib-common/big-endian");
 class CommonAttrs {
     constructor(ctime, mtime) {
         this.ctime = ctime;