core-3nweb-client-lib 0.43.20 → 0.44.0

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

@@ -92,6 +92,7 @@ function wrapWritableFileSyncAPI(sImpl) {
         startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
+        diffCurrentAndRemoteVersions: sImpl.diffCurrentAndRemoteVersions.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -143,6 +144,7 @@ function wrapReadonlyFileSyncAPI(sImpl) {
         startDownload: sImpl.startDownload.bind(sImpl),
         isRemoteVersionOnDisk: sImpl.isRemoteVersionOnDisk.bind(sImpl),
         adoptRemote: sImpl.adoptRemote.bind(sImpl),
+        diffCurrentAndRemoteVersions: sImpl.diffCurrentAndRemoteVersions.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -241,11 +243,12 @@ function wrapWritableFSSyncAPI(sImpl) {
         startUpload: sImpl.startUpload.bind(sImpl),
         upload: sImpl.upload.bind(sImpl),
         adoptRemoteFolderItem: sImpl.adoptRemoteFolderItem.bind(sImpl),
-        adoptAllRemoteItems: sImpl.adoptAllRemoteItems.bind(sImpl),
         statRemoteItem: sImpl.statRemoteItem.bind(sImpl),
         listRemoteFolderItem: sImpl.listRemoteFolderItem.bind(sImpl),
         getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
         getRemoteFolderItem: sImpl.getRemoteFolderItem.bind(sImpl),
+        diffCurrentAndRemoteFileVersions: sImpl.diffCurrentAndRemoteFileVersions.bind(sImpl),
+        mergeFolderCurrentAndRemoteVersions: sImpl.mergeFolderCurrentAndRemoteVersions.bind(sImpl),
     };
     return Object.freeze(w);
 }
@@ -309,6 +312,7 @@ function wrapReadonlyFSSyncAPI(sImpl) {
         getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
         getRemoteFolderItem: sImpl.getRemoteFolderItem.bind(sImpl),
         diffCurrentAndRemoteFolderVersions: sImpl.diffCurrentAndRemoteFolderVersions.bind(sImpl),
+        diffCurrentAndRemoteFileVersions: sImpl.diffCurrentAndRemoteFileVersions.bind(sImpl),
     };
     return Object.freeze(w);
 }

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2019, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2019, 2022, 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

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

@@ -13,6 +13,7 @@ type FileByteSink = web3n.files.FileByteSink;
 type XAttrsChanges = web3n.files.XAttrsChanges;
 type VersionedReadFlags = web3n.files.VersionedReadFlags;
 type Stats = web3n.files.Stats;
+type FileDiff = web3n.files.FileDiff;
 interface FileAttrs {
     attrs: CommonAttrs;
     size: number;
@@ -60,5 +61,7 @@ export declare class FileNode extends NodeInFS<FilePersistance> {
     private savingObjInsideChange;
     save(bytes: Uint8Array | Uint8Array[], changes?: XAttrsChanges): Promise<number>;
     getParamsForLink(): LinkParameters<FileLinkParams>;
+    private readRemoteVersion;
+    diffCurrentAndRemote(remoteVersion: number | undefined, compareContentIfSameMTime: boolean): Promise<FileDiff | undefined>;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2015 - 2020, 2022, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -232,8 +232,7 @@ class FileNode extends node_in_fs_1.NodeInFS {
         return this.doChange(false, async () => {
             const { attrs, xattrs, newVersion } = super.getParamsForUpdate(changes);
             const encSub = await this.crypto.saveBytes(bytes, newVersion, attrs, xattrs);
-            const newSize = Promise.resolve(Array.isArray(bytes) ?
-                (0, buffer_utils_1.byteLengthIn)(bytes) : bytes.length);
+            const newSize = Promise.resolve(Array.isArray(bytes) ? (0, buffer_utils_1.byteLengthIn)(bytes) : bytes.length);
             await this.savingObjInsideChange(attrs, newSize, xattrs, newVersion, encSub);
             return this.version;
         });
@@ -254,9 +253,62 @@ class FileNode extends node_in_fs_1.NodeInFS {
         };
         return linkParams;
     }
+    async readRemoteVersion(remoteVersion) {
+        const storage = this.syncedStorage();
+        const srcOfRemote = await storage.getObjSrcOfRemoteVersion(this.objId, remoteVersion);
+        return await this.crypto.getFileAttrs(srcOfRemote);
+    }
+    async diffCurrentAndRemote(remoteVersion, compareContentIfSameMTime) {
+        const v = await this.getRemoteVersionToDiff(remoteVersion);
+        if (!v) {
+            return;
+        }
+        else if (v.rm) {
+            return {
+                ...v.rmDiff,
+                areContentsSame: false
+            };
+        }
+        else {
+            const { isCurrentLocal, remoteVersion, syncedVersion } = v;
+            const remoteAttrs = await this.readRemoteVersion(remoteVersion);
+            const synced = await this.readRemoteVersion(syncedVersion);
+            const commonDiff = this.commonDiffWithRemote(isCurrentLocal, remoteVersion, remoteAttrs, syncedVersion, synced);
+            const current = await this.readSrc(undefined);
+            const remote = await this.readSrc({ remoteVersion });
+            const size = {
+                current: await remote.src.getSize(),
+                remote: await current.src.getSize()
+            };
+            let areContentsSame = (size.current === size.remote);
+            if (areContentsSame && (commonDiff.mtime || compareContentIfSameMTime)) {
+                areContentsSame = await areAllBytesEqualIn(current.src, remote.src);
+            }
+            return {
+                ...commonDiff,
+                areContentsSame,
+                size
+            };
+        }
+    }
 }
 exports.FileNode = FileNode;
 Object.freeze(FileNode.prototype);
 Object.freeze(FileNode);
 function noop() { }
+const COMPARE_BUF_SIZE = 64 * 1024;
+async function areAllBytesEqualIn(src1, src2) {
+    await src1.seek(0);
+    await src2.seek(0);
+    let chunk1 = await src1.readNext(COMPARE_BUF_SIZE);
+    let chunk2 = await src2.readNext(COMPARE_BUF_SIZE);
+    while (chunk1 && chunk2) {
+        if (!(0, node_in_fs_1.areBytesEqual)(chunk1, chunk2)) {
+            return false;
+        }
+        chunk1 = await src1.readNext(COMPARE_BUF_SIZE);
+        chunk2 = await src2.readNext(COMPARE_BUF_SIZE);
+    }
+    return true;
+}
 Object.freeze(exports);

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

@@ -16,6 +16,8 @@ type WritableFileVersionedAPI = web3n.files.WritableFileVersionedAPI;
 type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 type VersionedReadFlags = web3n.files.VersionedReadFlags;
+type OptionsToDiffFileVersions = web3n.files.OptionsToDiffFileVersions;
+type FileDiff = web3n.files.FileDiff;
 export declare class FileObject implements WritableFile, Linkable {
     name: string;
     isNew: boolean;
@@ -110,5 +112,6 @@ declare class S implements WritableFileSyncAPI {
         downloadTaskId: number;
     } | undefined>;
     adoptRemote(opts?: OptionsToAdopteRemote): Promise<void>;
+    diffCurrentAndRemoteVersions(opts?: OptionsToDiffFileVersions): Promise<FileDiff | undefined>;
 }
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2016 - 2020, 2022, 2025 - 2026 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -269,6 +269,10 @@ class S {
         const node = await this.n.getNode();
         await node.adoptRemote(opts);
     }
+    async diffCurrentAndRemoteVersions(opts) {
+        const node = await this.n.getNode();
+        return await node.diffCurrentAndRemote(opts === null || opts === void 0 ? void 0 : opts.remoteVersion, !!(opts === null || opts === void 0 ? void 0 : opts.compareContentIfSameMTime));
+    }
 }
 Object.freeze(S.prototype);
 Object.freeze(S);

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

@@ -11,10 +11,10 @@ type XAttrsChanges = web3n.files.XAttrsChanges;
 type FolderDiff = web3n.files.FolderDiff;
 type OptionsToAdopteRemote = web3n.files.OptionsToAdopteRemote;
 type OptionsToAdoptRemoteItem = web3n.files.OptionsToAdoptRemoteItem;
-type OptionsToAdoptAllRemoteItems = web3n.files.OptionsToAdoptAllRemoteItems;
 type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 type VersionedReadFlags = web3n.files.VersionedReadFlags;
 type Stats = web3n.files.Stats;
+type OptionsToMergeFolderVersions = web3n.files.OptionsToMergeFolderVersions;
 export interface NodeInfo {
     /**
      * This is a usual file name.
@@ -79,6 +79,9 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     getStats(flags?: VersionedReadFlags): Promise<Stats>;
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     adoptRemote(opts: OptionsToAdopteRemote | undefined): Promise<void>;
+    private makeEntryAdditionEvent;
+    private makeEntryRemovalEvent;
+    private makeEntryRenamingEvent;
     private callRemoveObjOn;
     list(): {
         lst: ListingEntry[];
@@ -97,7 +100,6 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     getFile(name: string, undefOnMissing?: boolean): Promise<FileNode | undefined>;
     getLink(name: string, undefOnMissing?: boolean): Promise<LinkNode | undefined>;
     private fixMissingChildAndThrow;
-    adoptItemsFromRemoteVersion(opts: OptionsToAdoptAllRemoteItems | undefined): Promise<number | undefined>;
     /**
      * If no initial local version given, then this performs like doTransition(change) method.
      * When initial local version is given and check, exceptions are thrown if versions mismatch,
@@ -174,9 +176,8 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     private replaceLocalChildWithRemote;
     private readRemoteVersion;
     diffCurrentAndRemote(remoteVersion: number | undefined): Promise<FolderDiff | undefined>;
-    private diffWithArchivedRemote;
-    private diffWithRemote;
     getRemoteItemNode<T extends NodeInFS<any>>(remoteItemName: string, remoteVersion: number | undefined): Promise<T>;
     getStorage(): Storage;
+    mergeCurrentAndRemoteVersions(opts: OptionsToMergeFolderVersions | undefined): Promise<number | undefined>;
 }
 export {};