core-3nweb-client-lib 0.43.9 → 0.43.12

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

@@ -17,16 +17,12 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceUser = void 0;
-/**
- * This defines a base class for some service's client that logs in with
- * MailerId and uses respectively authenticated session.
- */
-const request_utils_1 = require("../lib-client/request-utils");
 const api = require("../lib-common/service-api/mailer-id/login");
 const ws_utils_1 = require("./ws-utils");
 const url_1 = require("url");
 const login_1 = require("./mailer-id/login");
 const assert_1 = require("../lib-common/assert");
+const http_1 = require("../lib-common/exceptions/http");
 class ServiceUser {
     get serviceURI() {
         return this.uri;
@@ -162,7 +158,7 @@ class ServiceUser {
             this.sessionId = undefined;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     async callEnsuringLogin(func) {

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020 - 2021 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020 - 2021, 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,11 +17,7 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceUser = void 0;
-/**
- * This defines a base class for some service's client that logs in with
- * Public Key Login process and uses respectively authenticated session.
- */
-const request_utils_1 = require("./request-utils");
+const http_1 = require("../lib-common/exceptions/http");
 const buffer_utils_1 = require("../lib-common/buffer-utils");
 const ecma_nacl_1 = require("ecma-nacl");
 const session_encryptor_1 = require("../lib-common/session-encryptor");
@@ -82,40 +78,43 @@ class ServiceUser {
         if (rep.status == loginApi.start.SC.ok) {
             // set sessionid
             if (!rep.data || (typeof rep.data.sessionId !== 'string')) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply to starting session');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep);
             }
             this.sessionId = rep.data.sessionId;
             // set server public key
             if (typeof rep.data.serverPubKey !== 'string') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: serverPubKey string is missing.');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'serverPubKey string is missing.' });
             }
             try {
                 this.serverPubKey = buffer_utils_1.base64.open(rep.data.serverPubKey);
                 if (this.serverPubKey.length !== ecma_nacl_1.box.KEY_LENGTH) {
-                    throw (0, request_utils_1.makeException)(rep, 'Malformed reply: server\'s key has a wrong size.');
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `server's key has a wrong size.` });
                 }
             }
             catch (err) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed reply: bad serverPubKey string. Error: ${('string' === typeof err) ? err : err.message}`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                    message: `bad serverPubKey string. Error: ${('string' === typeof err) ? err : err.message}`
+                });
             }
             // get encrypted session key from json body
             if (typeof rep.data.sessionKey !== 'string') {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply: sessionKey string is missing.');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: 'sessionKey string is missing.' });
             }
             try {
                 this.encChallenge = buffer_utils_1.base64.open(rep.data.sessionKey);
-                if (this.encChallenge.length !==
-                    (ecma_nacl_1.secret_box.NONCE_LENGTH + ecma_nacl_1.secret_box.KEY_LENGTH)) {
-                    throw (0, request_utils_1.makeException)(rep, `Malformed reply: byte chunk with session key has a wrong size.`);
+                if (this.encChallenge.length !== (ecma_nacl_1.secret_box.NONCE_LENGTH + ecma_nacl_1.secret_box.KEY_LENGTH)) {
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `byte chunk with session key has a wrong size.` });
                 }
             }
             catch (err) {
-                throw (0, request_utils_1.makeException)(rep, `Malformed reply: bad sessionKey string. Error: ${(typeof err === 'string') ? err : err.message}`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                    message: `bad sessionKey string. Error: ${(typeof err === 'string') ? err : err.message}`
+                });
             }
             // get key derivation parameters for a default key
             if (!keyId) {
                 if (typeof rep.data.keyDerivParams !== 'object') {
-                    throw (0, request_utils_1.makeException)(rep, `Malformed reply: keyDerivParams string is missing.`);
+                    throw (0, http_1.makeMalformedReplyHTTPException)(rep, { message: `keyDerivParams string is missing.` });
                 }
                 this.keyDerivationParams = rep.data.keyDerivParams;
             }
@@ -124,11 +123,13 @@ class ServiceUser {
             (rep.status === loginApi.start.SC.redirect)) {
             const rd = rep.data;
             if (!rd || ('string' !== typeof rd.redirect)) {
-                throw (0, request_utils_1.makeException)(rep, 'Malformed reply');
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep);
             }
             // refuse second redirect
             if (this.redirectedFrom !== undefined) {
-                throw (0, request_utils_1.makeException)(rep, `Redirected too many times. First redirect was from ${this.redirectedFrom} to ${this.serviceURI}. Second and forbidden redirect is to ${rd.redirect}`);
+                throw (0, http_1.makeMalformedReplyHTTPException)(rep, {
+                    message: `Redirected too many times. First redirect was from ${this.redirectedFrom} to ${this.serviceURI}. Second and forbidden redirect is to ${rd.redirect}`
+                });
             }
             // set params
             this.redirectedFrom = this.serviceURI;
@@ -137,12 +138,12 @@ class ServiceUser {
             return this.startSession(keyId);
         }
         else if (rep.status === loginApi.start.SC.unknownUser) {
-            const exc = (0, request_utils_1.makeException)(rep);
+            const exc = (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, {});
             exc.unknownUser = true;
             throw exc;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     openSessionKey(dhsharedKeyCalc) {
@@ -190,18 +191,18 @@ class ServiceUser {
                 this.serverVerificationBytes = undefined;
             }
             else {
-                const exc = (0, request_utils_1.makeException)(rep);
+                const exc = (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, {});
                 exc.serverNotTrusted = true;
                 throw exc;
             }
         }
         else if (rep.status === loginApi.complete.SC.authFailed) {
-            const exc = (0, request_utils_1.makeException)(rep);
+            const exc = (0, http_1.makeHTTPException)(rep.url, rep.method, rep.status, {});
             exc.cryptoResponseNotAccepted = true;
             throw exc;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
     /**
@@ -245,7 +246,7 @@ class ServiceUser {
             this.encryptor = undefined;
         }
         else {
-            throw (0, request_utils_1.makeException)(rep, 'Unexpected status');
+            throw (0, http_1.makeUnexpectedStatusHTTPException)(rep);
         }
     }
 }

package/build/lib-client/xsp-fs/common.d.ts

@@ -13,6 +13,7 @@ type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 type FSSyncException = web3n.files.FSSyncException;
 type FileException = web3n.files.FileException;
 type UploadEvent = web3n.files.UploadEvent;
+type DownloadEvent = web3n.files.DownloadEvent;
 export type FSChangeSrc = web3n.files.FSChangeEvent['src'];
 export interface Node {
     objId: string;
@@ -40,7 +41,7 @@ export interface NodeEvent {
     objId: ObjId;
     parentObjId?: ObjId;
     childObjId?: ObjId;
-    event: FolderEvent | FileEvent | RemoteEvent | UploadEvent;
+    event: FolderEvent | FileEvent | RemoteEvent | UploadEvent | DownloadEvent;
 }
 export interface Storage {
     readonly type: StorageType;
@@ -93,6 +94,8 @@ export interface LocalObjStatus {
 }
 export declare function wrapStorageImplementation(impl: Storage): Storage;
 export type StorageGetter = (type: StorageType, location?: string) => Storage;
+export type DownloadEventSink = (event: DownloadEvent) => void;
+export type UploadEventSink = (event: UploadEvent) => void;
 export interface SyncedStorage extends Storage {
     getObjSrcOfRemoteVersion(objId: ObjId, version: number): Promise<ObjSource>;
     archiveVersionOnServer(objId: ObjId, version: number): Promise<void>;
@@ -103,8 +106,10 @@ export interface SyncedStorage extends Storage {
     adoptRemote(objId: ObjId, opts: OptionsToAdopteRemote | undefined): Promise<number | undefined>;
     updateStatusInfo(objId: ObjId): Promise<SyncStatus>;
     isRemoteVersionOnDisk(objId: ObjId, version: number): Promise<'partial' | 'complete' | 'none'>;
-    download(objId: ObjId, version: number): Promise<void>;
-    startUpload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: (event: UploadEvent) => void): Promise<{
+    startDownload(objId: ObjId, version: number, eventSink: DownloadEventSink): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
+    startUpload(objId: ObjId, localVersion: number, uploadVersion: number, uploadHeader: UploadHeaderChange | undefined, createOnRemote: boolean, eventSink: UploadEventSink | undefined): Promise<{
         uploadTaskId: number;
         completion: Promise<void>;
     }>;

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

@@ -117,7 +117,7 @@ function wrapSyncStorageImplementation(impl) {
     wrap.getObjSrcOfRemoteVersion = impl.getObjSrcOfRemoteVersion.bind(impl);
     wrap.archiveVersionOnServer = impl.archiveVersionOnServer.bind(impl);
     wrap.isRemoteVersionOnDisk = impl.isRemoteVersionOnDisk.bind(impl);
-    wrap.download = impl.download.bind(impl);
+    wrap.startDownload = impl.startDownload.bind(impl);
     wrap.startUpload = impl.startUpload.bind(impl);
     wrap.uploadObjRemoval = impl.uploadObjRemoval.bind(impl);
     wrap.dropCachedLocalObjVersionsLessOrEqual = impl.dropCachedLocalObjVersionsLessOrEqual.bind(impl);

package/build/lib-client/xsp-fs/file.d.ts

@@ -106,7 +106,9 @@ declare class S implements WritableFileSyncAPI {
     status(skipServerCheck?: boolean): Promise<SyncStatus>;
     updateStatusInfo(): Promise<SyncStatus>;
     isRemoteVersionOnDisk(version: number): Promise<'complete' | 'partial' | 'none'>;
-    download(version: number): Promise<void>;
+    startDownload(version: number): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
     adoptRemote(opts?: OptionsToAdopteRemote): Promise<void>;
 }
 export {};

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

@@ -227,7 +227,7 @@ class S {
     async startUpload(opts) {
         this.n.ensureIsWritable();
         const node = await this.n.getNode();
-        const startedUpload = await node.startUpload(opts);
+        const startedUpload = await node.startUpload(opts, true);
         if (startedUpload) {
             const { uploadTaskId, uploadVersion } = startedUpload;
             return { uploadTaskId, uploadVersion };
@@ -239,7 +239,7 @@ class S {
     async upload(opts) {
         this.n.ensureIsWritable();
         const node = await this.n.getNode();
-        const startedUpload = await node.startUpload(opts);
+        const startedUpload = await node.startUpload(opts, false);
         if (!startedUpload) {
             return;
         }
@@ -261,9 +261,9 @@ class S {
         const isOnDisk = await node.isSyncedVersionOnDisk(version);
         return isOnDisk;
     }
-    async download(version) {
+    async startDownload(version) {
         const node = await this.n.getNode();
-        await node.download(version);
+        return await node.startDownload(version);
     }
     async adoptRemote(opts) {
         const node = await this.n.getNode();

package/build/lib-client/xsp-fs/folder-node.d.ts

@@ -144,7 +144,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     private removeChildrenObjsInSyncedStorage;
     private uploadRemovalOfObjs;
     getParamsForLink(): LinkParameters<FolderLinkParams>;
-    startUpload(opts: OptionsToUploadLocal | undefined): Promise<{
+    startUpload(opts: OptionsToUploadLocal | undefined, emitEvents: boolean): Promise<{
         uploadVersion: number;
         completion: Promise<void>;
         uploadTaskId: number;

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

@@ -244,7 +244,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
     async listNonCurrent(flags) {
         const src = await this.getObjSrcOfVersion(flags);
         const { folderInfo } = await this.crypto.read(src);
-        const lst = Object.values(folderInfo)
+        const lst = Object.values(folderInfo.nodes)
             .map(nodeInfoToListingEntry);
         return { lst, version: src.version };
     }
@@ -785,7 +785,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         };
         return linkParams;
     }
-    async startUpload(opts) {
+    async startUpload(opts, emitEvents) {
         try {
             const toUpload = await this.needUpload(opts);
             if (!toUpload) {
@@ -793,10 +793,10 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             }
             const { localVersion, createOnRemote, uploadVersion } = toUpload;
             if (toUpload.createOnRemote) {
-                return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
+                return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion, emitEvents);
             }
             const removedNodes = await this.getNodesRemovedBetweenVersions(localVersion, uploadVersion - 1);
-            const { completion, uploadTaskId } = await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
+            const { completion, uploadTaskId } = await this.startUploadProcess(localVersion, createOnRemote, uploadVersion, emitEvents);
             if (removedNodes.length > 0) {
                 // start upload of children's removal after folder's upload;
                 // we also don't await for chidren removal in returned completion

package/build/lib-client/xsp-fs/fs.d.ts

@@ -170,7 +170,9 @@ declare class S implements WritableFSSyncAPI {
     status(path: string, skipServerCheck?: boolean): Promise<SyncStatus>;
     updateStatusInfo(path: string): Promise<SyncStatus>;
     isRemoteVersionOnDisk(path: string, version: number): Promise<'complete' | 'partial' | 'none'>;
-    download(path: string, version: number): Promise<void>;
+    startDownload(path: string, version: number): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
     adoptRemote(path: string, opts?: OptionsToAdopteRemote): Promise<void>;
     private getFolderNode;
     diffCurrentAndRemoteFolderVersions(path: string, remoteVersion?: number): Promise<FolderDiff | undefined>;

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

@@ -710,7 +710,7 @@ class S {
         this.n.ensureIsWritable();
         const node = await this.n.get(path);
         try {
-            const startedUpload = await node.startUpload(opts);
+            const startedUpload = await node.startUpload(opts, true);
             if (startedUpload) {
                 const { uploadTaskId, uploadVersion } = startedUpload;
                 return { uploadTaskId, uploadVersion };
@@ -728,7 +728,7 @@ class S {
         this.n.ensureIsWritable();
         const node = await this.n.get(path);
         try {
-            const startedUpload = await node.startUpload(opts);
+            const startedUpload = await node.startUpload(opts, false);
             if (!startedUpload) {
                 return;
             }
@@ -765,10 +765,10 @@ class S {
             throw (0, common_1.setPathInExc)(exc, path);
         }
     }
-    async download(path, version) {
+    async startDownload(path, version) {
         const node = await this.n.get(path);
         try {
-            await node.download(version);
+            return await node.startDownload(version);
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, path);

package/build/lib-client/xsp-fs/node-in-fs.d.ts

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs';
 import { CommonAttrs, XAttrs } from './attrs';
 import { Attrs, NodePersistance } from './node-persistence';
 import { ObjSource } from 'xsp-files';
-export type FSEvent = web3n.files.FolderEvent | web3n.files.FileEvent | web3n.files.UploadEvent;
+export type FSEvent = web3n.files.FolderEvent | web3n.files.FileEvent | web3n.files.UploadEvent | web3n.files.DownloadEvent;
 type RemoteEvent = web3n.files.RemoteEvent;
 type XAttrsChanges = web3n.files.XAttrsChanges;
 type SyncStatus = web3n.files.SyncStatus;
@@ -81,7 +81,9 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
     syncStatus(): Promise<SyncStatus>;
     updateStatusInfo(): Promise<SyncStatus>;
     isSyncedVersionOnDisk(version: number): Promise<'partial' | 'complete' | 'none'>;
-    download(version: number): Promise<void>;
+    startDownload(version: number): Promise<{
+        downloadTaskId: number;
+    } | undefined>;
     protected abstract setCurrentStateFrom(src: ObjSource): Promise<void>;
     adoptRemote(opts: OptionsToAdopteRemote | undefined): Promise<void>;
     protected needUpload(opts: OptionsToUploadLocal | undefined): Promise<{
@@ -89,12 +91,12 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
         uploadVersion: number;
         createOnRemote: boolean;
     } | undefined>;
-    startUpload(opts: OptionsToUploadLocal | undefined): Promise<{
+    startUpload(opts: OptionsToUploadLocal | undefined, emitEvents: boolean): Promise<{
         uploadVersion: number;
         completion: Promise<void>;
         uploadTaskId: number;
     } | undefined>;
-    protected startUploadProcess(localVersion: number, createOnRemote: boolean, uploadVersion: number): Promise<{
+    protected startUploadProcess(localVersion: number, createOnRemote: boolean, uploadVersion: number, emitEvents: boolean): Promise<{
         uploadVersion: number;
         completion: Promise<void>;
         uploadTaskId: number;

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

@@ -361,9 +361,12 @@ class NodeInFS {
         const storage = this.syncedStorage();
         return storage.isRemoteVersionOnDisk(this.objId, version);
     }
-    async download(version) {
+    async startDownload(version) {
         const storage = this.syncedStorage();
-        return storage.download(this.objId, version);
+        return storage.startDownload(this.objId, version, event => {
+            event.path = this.name;
+            this.broadcastEvent(event);
+        });
     }
     adoptRemote(opts) {
         return this.doChange(true, async () => {
@@ -477,26 +480,28 @@ class NodeInFS {
         }
         return { createOnRemote: (uploadVersion === 1), localVersion, uploadVersion };
     }
-    async startUpload(opts) {
+    async startUpload(opts, emitEvents) {
         try {
             const toUpload = await this.needUpload(opts);
             if (!toUpload) {
                 return;
             }
             const { localVersion, createOnRemote, uploadVersion } = toUpload;
-            return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
+            return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion, emitEvents);
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, this.name);
         }
     }
-    async startUploadProcess(localVersion, createOnRemote, uploadVersion) {
+    async startUploadProcess(localVersion, createOnRemote, uploadVersion, emitEvents) {
         const uploadHeader = await this.makeHeaderForUploadIfVersionChanges(localVersion, uploadVersion);
         const storage = this.syncedStorage();
-        const { completion, uploadTaskId } = await storage.startUpload(this.objId, localVersion, uploadVersion, uploadHeader, createOnRemote, event => {
-            event.path = this.name;
-            this.broadcastEvent(event);
-        });
+        const { completion, uploadTaskId } = await storage.startUpload(this.objId, localVersion, uploadVersion, uploadHeader, createOnRemote, (emitEvents ?
+            event => {
+                event.path = this.name;
+                this.broadcastEvent(event);
+            } :
+            undefined));
         return {
             completion: completion.then(() => this.doChange(true, async () => {
                 if (this.currentVersion === localVersion) {

package/build/lib-common/buffer-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016, 2018 - 2020 3NSoft Inc.
+ Copyright (C) 2016, 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
@@ -97,6 +97,9 @@ var utf8;
 })(utf8 || (exports.utf8 = utf8 = {}));
 Object.freeze(utf8);
 function joinByteArrs(arrs) {
+    if (arrs.length === 1) {
+        return arrs[0];
+    }
     let totalLen = 0;
     for (const arr of arrs) {
         totalLen += arr.length;

package/build/lib-common/exceptions/http.d.ts

@@ -1,4 +1,14 @@
 export type ConnectException = web3n.HTTPConnectException;
 export type HTTPException = web3n.HTTPException;
 export declare function makeConnectionException(url: string | undefined, method: string | undefined, message?: string, cause?: any): ConnectException;
-export declare function makeHTTPException(url: string, method: string, status: number, message?: string, cause?: any): HTTPException;
+export declare function makeHTTPException(url: string, method: string, status: number, params: Partial<HTTPException>): HTTPException;
+export declare function makeMalformedReplyHTTPException({ url, method, status }: {
+    url: string;
+    method: string;
+    status: number;
+}, params?: Partial<HTTPException>): HTTPException;
+export declare function makeUnexpectedStatusHTTPException({ url, method, status }: {
+    url: string;
+    method: string;
+    status: number;
+}, params?: Partial<HTTPException>): HTTPException;

package/build/lib-common/exceptions/http.js

@@ -17,11 +17,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeConnectionException = makeConnectionException;
 exports.makeHTTPException = makeHTTPException;
+exports.makeMalformedReplyHTTPException = makeMalformedReplyHTTPException;
+exports.makeUnexpectedStatusHTTPException = makeUnexpectedStatusHTTPException;
 const runtime_1 = require("./runtime");
 function makeConnectionException(url, method, message, cause) {
     return (0, runtime_1.makeRuntimeException)('connect', { connectType: 'http', url, method, cause, message }, {});
 }
-function makeHTTPException(url, method, status, message, cause) {
-    return (0, runtime_1.makeRuntimeException)('http-request', { url, method, status, cause, message }, {});
+function makeHTTPException(url, method, status, params) {
+    return (0, runtime_1.makeRuntimeException)('http-request', { url, method, status, ...params }, {});
+}
+function makeMalformedReplyHTTPException({ url, method, status }, params) {
+    return (0, runtime_1.makeRuntimeException)('http-request', { url, method, status, ...params }, { malformedResponse: true });
+}
+function makeUnexpectedStatusHTTPException({ url, method, status }, params) {
+    return (0, runtime_1.makeRuntimeException)('http-request', { url, method, status, ...params }, { unexpectedStatus: true });
 }
 Object.freeze(exports);

package/build/lib-common/objs-on-disk/utils.d.ts

@@ -1,6 +1,6 @@
 import { Layout } from 'xsp-files';
 import { DiffInfo } from '../service-api/3nstorage/owner';
-import { ObjVersionFile } from './obj-file';
+import { ObjVersionFile } from './obj-version-file';
 import { Readable } from 'stream';
 export declare function diffToLayout(diff: DiffInfo): Layout;
 export interface ChunkWithHeader {

package/build/lib-common/processes/labelled-exec-pools.d.ts

@@ -1,6 +1,6 @@
 export interface Task<PoolLabel extends string> {
     neededExecutor(): PoolLabel | undefined;
-    process(): Promise<void>;
+    process(): Promise<boolean>;
     cancel(): Promise<void>;
 }
 declare class ProcessingPool<PoolLabel extends string> {

package/build/lib-common/processes/labelled-exec-pools.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2022 3NSoft Inc.
+ Copyright (C) 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
@@ -52,9 +52,15 @@ class ProcessingPool {
         }
         let proc = undefined;
         try {
-            proc = task.process().catch(this.doOnError);
+            let continueRun = false;
+            proc = task.process().then(done => {
+                continueRun = !done;
+            }, this.doOnError);
             this.inProcess.add(proc);
             await proc;
+            if (continueRun) {
+                this.queue.unshift(task);
+            }
         }
         catch (err) {
             await this.doOnError(err);