core-3nweb-client-lib 0.43.8 → 0.43.9

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

@@ -127,29 +127,16 @@ class FileNode extends node_in_fs_1.NodeInFS {
         super.setUpdatedParams(version, fileAttrs.attrs, fileAttrs.xattrs);
     }
     async getStats(flags) {
-        let attrs;
-        let version;
-        let size;
-        if ((0, node_in_fs_1.shouldReadCurrentVersion)(flags)) {
-            attrs = this.attrs;
-            version = this.version;
-            size = this.fileSize;
-        }
-        else {
-            const src = await this.getObjSrcOfVersion(flags);
-            const fileAttrs = await this.crypto.getFileAttrs(src);
-            attrs = fileAttrs.attrs;
-            version = src.version;
-            size = fileAttrs.size;
+        const { stats, attrs } = await this.getStatsAndSize(flags);
+        stats.size = (attrs ? attrs.size : this.fileSize);
+        if ((this.storage.type === 'synced')
+            || (this.storage.type === 'share')) {
+            const bytesNeedDownload = await this.syncedStorage().getNumOfBytesNeedingDownload(this.objId, stats.version);
+            if (typeof bytesNeedDownload === 'number') {
+                stats.bytesNeedDownload = bytesNeedDownload;
+            }
         }
-        return {
-            ctime: new Date(attrs.ctime),
-            mtime: new Date(attrs.mtime),
-            version,
-            writable: false,
-            isFile: true,
-            size
-        };
+        return stats;
     }
     async readSrc(flags) {
         const objSrc = await this.getObjSrcOfVersion(flags);

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

@@ -98,6 +98,10 @@ declare class V implements WritableFileVersionedAPI, N {
 declare class S implements WritableFileSyncAPI {
     private readonly n;
     constructor(n: N);
+    startUpload(opts?: OptionsToUploadLocal): Promise<{
+        uploadVersion: number;
+        uploadTaskId: number;
+    } | undefined>;
     upload(opts?: OptionsToUploadLocal): Promise<number | undefined>;
     status(skipServerCheck?: boolean): Promise<SyncStatus>;
     updateStatusInfo(): Promise<SyncStatus>;

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

@@ -224,10 +224,27 @@ class S {
         this.n = n;
         Object.freeze(this);
     }
+    async startUpload(opts) {
+        this.n.ensureIsWritable();
+        const node = await this.n.getNode();
+        const startedUpload = await node.startUpload(opts);
+        if (startedUpload) {
+            const { uploadTaskId, uploadVersion } = startedUpload;
+            return { uploadTaskId, uploadVersion };
+        }
+        else {
+            return;
+        }
+    }
     async upload(opts) {
         this.n.ensureIsWritable();
         const node = await this.n.getNode();
-        const uploadVersion = await node.upload(opts);
+        const startedUpload = await node.startUpload(opts);
+        if (!startedUpload) {
+            return;
+        }
+        const { uploadVersion, completion } = startedUpload;
+        await completion;
         return uploadVersion;
     }
     async status(skipServerCheck = false) {

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

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

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

@@ -163,24 +163,8 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         return rf;
     }
     async getStats(flags) {
-        let attrs;
-        let version;
-        if ((0, node_in_fs_1.shouldReadCurrentVersion)(flags)) {
-            attrs = this.attrs;
-            version = this.version;
-        }
-        else {
-            const src = await this.getObjSrcOfVersion(flags);
-            attrs = await this.crypto.getAttrs(src);
-            version = src.version;
-        }
-        return {
-            ctime: new Date(attrs.ctime),
-            mtime: new Date(attrs.mtime),
-            version,
-            writable: false,
-            isFolder: true,
-        };
+        const { stats } = await this.getStatsAndSize(flags);
+        return stats;
     }
     async setCurrentStateFrom(src) {
         const { folderInfo, attrs, xattrs } = await this.crypto.read(src);
@@ -801,26 +785,30 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         };
         return linkParams;
     }
-    async upload(opts) {
+    async startUpload(opts) {
         try {
             const toUpload = await this.needUpload(opts);
             if (!toUpload) {
                 return;
             }
+            const { localVersion, createOnRemote, uploadVersion } = toUpload;
             if (toUpload.createOnRemote) {
-                return await super.upload(opts);
+                return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
             }
-            const storage = this.syncedStorage();
-            const { localVersion, uploadVersion } = toUpload;
             const removedNodes = await this.getNodesRemovedBetweenVersions(localVersion, uploadVersion - 1);
-            const uploadHeader = await this.uploadHeaderChange(localVersion, uploadVersion);
-            await storage.upload(this.objId, localVersion, uploadVersion, uploadHeader, false);
+            const { completion, uploadTaskId } = await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
             if (removedNodes.length > 0) {
                 // start upload of children's removal after folder's upload;
-                // we also don't await for chidren removal
-                this.uploadRemovalOf(removedNodes);
+                // we also don't await for chidren removal in returned completion
+                completion.then(() => this.uploadRemovalOf(removedNodes));
             }
-            return uploadVersion;
+            return {
+                completion: completion.catch(exc => {
+                    throw (0, common_1.setPathInExc)(exc, this.name);
+                }),
+                uploadTaskId,
+                uploadVersion
+            };
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, this.name);

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

@@ -162,6 +162,10 @@ declare class V implements WritableFSVersionedAPI, N {
 declare class S implements WritableFSSyncAPI {
     private readonly n;
     constructor(n: N);
+    startUpload(path: string, opts?: OptionsToUploadLocal): Promise<{
+        uploadVersion: number;
+        uploadTaskId: number;
+    } | undefined>;
     upload(path: string, opts?: OptionsToUploadLocal): Promise<number | undefined>;
     status(path: string, skipServerCheck?: boolean): Promise<SyncStatus>;
     updateStatusInfo(path: string): Promise<SyncStatus>;

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

@@ -706,11 +706,35 @@ class S {
         this.n = n;
         Object.freeze(this);
     }
+    async startUpload(path, opts) {
+        this.n.ensureIsWritable();
+        const node = await this.n.get(path);
+        try {
+            const startedUpload = await node.startUpload(opts);
+            if (startedUpload) {
+                const { uploadTaskId, uploadVersion } = startedUpload;
+                return { uploadTaskId, uploadVersion };
+            }
+            else {
+                return;
+            }
+        }
+        catch (exc) {
+            throw (0, common_1.setPathInExc)(exc, path);
+        }
+        ;
+    }
     async upload(path, opts) {
         this.n.ensureIsWritable();
         const node = await this.n.get(path);
         try {
-            return await node.upload(opts);
+            const startedUpload = await node.startUpload(opts);
+            if (!startedUpload) {
+                return;
+            }
+            const { completion, uploadVersion } = startedUpload;
+            await completion;
+            return uploadVersion;
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, path);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2018, 2020, 2022 3NSoft Inc.
+ Copyright (C) 2016 - 2018, 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
@@ -104,24 +104,8 @@ class LinkNode extends node_in_fs_1.NodeInFS {
         this.setUpdatedState(params, src.version, attrs, xattrs);
     }
     async getStats(flags) {
-        let attrs;
-        let version;
-        if ((0, node_in_fs_1.shouldReadCurrentVersion)(flags)) {
-            attrs = this.attrs;
-            version = this.version;
-        }
-        else {
-            const src = await this.getObjSrcOfVersion(flags);
-            attrs = await this.crypto.getAttrs(src);
-            version = src.version;
-        }
-        return {
-            ctime: new Date(attrs.ctime),
-            mtime: new Date(attrs.mtime),
-            version,
-            writable: false,
-            isLink: true,
-        };
+        const { stats } = await this.getStatsAndSize(flags);
+        return stats;
     }
     setUpdatedState(params, version, attrs, xattrs) {
         this.linkParams = params;

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

@@ -1,9 +1,9 @@
-import { FSChangeSrc, Node, NodeType, Storage, SyncedStorage, UploadHeaderChange } from './common';
+import { FSChangeSrc, Node, NodeType, Storage, SyncedStorage } from './common';
 import { Observable } from 'rxjs';
 import { CommonAttrs, XAttrs } from './attrs';
-import { NodePersistance } from './node-persistence';
+import { Attrs, NodePersistance } from './node-persistence';
 import { ObjSource } from 'xsp-files';
-export type FSEvent = web3n.files.FolderEvent | web3n.files.FileEvent;
+export type FSEvent = web3n.files.FolderEvent | web3n.files.FileEvent | web3n.files.UploadEvent;
 type RemoteEvent = web3n.files.RemoteEvent;
 type XAttrsChanges = web3n.files.XAttrsChanges;
 type SyncStatus = web3n.files.SyncStatus;
@@ -46,6 +46,10 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
         version: number;
     }>;
     abstract getStats(flags?: VersionedReadFlags): Promise<Stats>;
+    protected getStatsAndSize(flags?: VersionedReadFlags): Promise<{
+        stats: Stats;
+        attrs?: Attrs;
+    }>;
     listVersions(): Promise<{
         current?: number;
         archived?: number[];
@@ -85,8 +89,17 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
         uploadVersion: number;
         createOnRemote: boolean;
     } | undefined>;
-    upload(opts: OptionsToUploadLocal | undefined): Promise<number | undefined>;
-    protected uploadHeaderChange(localVersion: number, uploadVersion: number): Promise<UploadHeaderChange | undefined>;
+    startUpload(opts: OptionsToUploadLocal | undefined): Promise<{
+        uploadVersion: number;
+        completion: Promise<void>;
+        uploadTaskId: number;
+    } | undefined>;
+    protected startUploadProcess(localVersion: number, createOnRemote: boolean, uploadVersion: number): Promise<{
+        uploadVersion: number;
+        completion: Promise<void>;
+        uploadTaskId: number;
+    }>;
+    private makeHeaderForUploadIfVersionChanges;
 }
 export declare function shouldReadCurrentVersion(flags: VersionedReadFlags | undefined): boolean;
 export {};

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

@@ -145,6 +145,54 @@ class NodeInFS {
             };
         }
     }
+    async getStatsAndSize(flags) {
+        var _a;
+        let attrs;
+        let version;
+        if (shouldReadCurrentVersion(flags)) {
+            attrs = this.attrs;
+            version = this.version;
+        }
+        else {
+            const src = await this.getObjSrcOfVersion(flags);
+            attrs = await this.crypto.getAttrs(src);
+            version = src.version;
+        }
+        const stats = {
+            ctime: new Date(attrs.ctime),
+            mtime: new Date(attrs.mtime),
+            version,
+            writable: false,
+        };
+        switch (this.type) {
+            case 'folder':
+                stats.isFolder = true;
+                break;
+            case 'link':
+                stats.isLink = true;
+                break;
+            case 'file':
+                stats.isFile = true;
+                break;
+        }
+        if ((this.storage.type === 'synced')
+            || (this.storage.type === 'share')) {
+            const syncStatus = await this.syncedStorage().status(this.objId);
+            const { synced } = syncStatus.syncStatus();
+            if (synced) {
+                if (synced.latest && (version > synced.latest)) {
+                    stats.versionSyncBranch = (((flags === null || flags === void 0 ? void 0 : flags.remoteVersion) === version) ? 'remote' : 'local');
+                }
+                else if ((version === synced.latest) || ((_a = synced.archived) === null || _a === void 0 ? void 0 : _a.includes(version))) {
+                    stats.versionSyncBranch = 'synced';
+                }
+            }
+            else {
+                stats.versionSyncBranch = (((flags === null || flags === void 0 ? void 0 : flags.remoteVersion) === version) ? 'remote' : 'local');
+            }
+        }
+        return { stats, attrs: (attrs.pack ? undefined : attrs) };
+    }
     async listVersions() {
         return (await this.storage.status(this.objId)).listVersions();
     }
@@ -429,29 +477,39 @@ class NodeInFS {
         }
         return { createOnRemote: (uploadVersion === 1), localVersion, uploadVersion };
     }
-    async upload(opts) {
+    async startUpload(opts) {
         try {
             const toUpload = await this.needUpload(opts);
             if (!toUpload) {
                 return;
             }
             const { localVersion, createOnRemote, uploadVersion } = toUpload;
-            const uploadHeader = await this.uploadHeaderChange(localVersion, uploadVersion);
-            const storage = this.syncedStorage();
-            await storage.upload(this.objId, localVersion, uploadVersion, uploadHeader, createOnRemote);
-            return await this.doChange(true, async () => {
-                storage.dropCachedLocalObjVersionsLessOrEqual(this.objId, localVersion);
-                if (this.currentVersion === localVersion) {
-                    this.currentVersion = uploadVersion;
-                }
-                return uploadVersion;
-            });
+            return await this.startUploadProcess(localVersion, createOnRemote, uploadVersion);
         }
         catch (exc) {
             throw (0, common_1.setPathInExc)(exc, this.name);
         }
     }
-    async uploadHeaderChange(localVersion, uploadVersion) {
+    async startUploadProcess(localVersion, createOnRemote, uploadVersion) {
+        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);
+        });
+        return {
+            completion: completion.then(() => this.doChange(true, async () => {
+                if (this.currentVersion === localVersion) {
+                    this.currentVersion = uploadVersion;
+                }
+            })).catch(exc => {
+                throw (0, common_1.setPathInExc)(exc, this.name);
+            }),
+            uploadTaskId,
+            uploadVersion
+        };
+    }
+    async makeHeaderForUploadIfVersionChanges(localVersion, uploadVersion) {
         if (localVersion === uploadVersion) {
             return;
         }

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

@@ -60,9 +60,7 @@ class ProcessingPool {
             await this.doOnError(err);
         }
         finally {
-            if (proc) {
-                this.inProcess.delete(proc);
-            }
+            this.inProcess.delete(proc);
         }
         return this.processNextQueued();
     }