core-3nweb-client-lib 0.44.3 → 0.44.5

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

@@ -98,8 +98,7 @@ function wrapWritableFileSyncAPI(sImpl) {
     return Object.freeze(w);
 }
 function addParamsAndFreezeFileWrap(w, fImpl) {
-    w.getLinkParams =
-        fImpl.getLinkParams.bind(fImpl);
+    w.getLinkParams = fImpl.getLinkParams.bind(fImpl);
     return Object.freeze(w);
 }
 function wrapReadonlyFile(fImpl) {
@@ -251,7 +250,7 @@ function wrapWritableFSSyncAPI(sImpl) {
         getRemoteFileItem: sImpl.getRemoteFileItem.bind(sImpl),
         getRemoteFolderItem: sImpl.getRemoteFolderItem.bind(sImpl),
         diffCurrentAndRemoteFileVersions: sImpl.diffCurrentAndRemoteFileVersions.bind(sImpl),
-        mergeFolderCurrentAndRemoteVersions: sImpl.mergeFolderCurrentAndRemoteVersions.bind(sImpl),
+        absorbRemoteFolderChanges: sImpl.absorbRemoteFolderChanges.bind(sImpl),
     };
     return Object.freeze(w);
 }

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

@@ -41,7 +41,7 @@ export declare class FileNode extends NodeInFS<FilePersistance> {
     static makeForNew(storage: Storage, parentId: string, name: string, key: Uint8Array): Promise<FileNode>;
     static makeForExisting(storage: Storage, parentId: string, fileName: string, objId: string, key: Uint8Array): Promise<FileNode>;
     static makeFromLinkParams(storage: Storage, params: FileLinkParams): Promise<FileNode>;
-    private static initWithAttrs;
+    static readNodeFromObjBytes(storage: Storage, parentId: string | undefined, fileName: string, objId: string, src: ObjSource, key: Uint8Array): Promise<FileNode>;
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     private setUpdatedState;
     getStorage(): Storage;

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

@@ -103,17 +103,18 @@ class FileNode extends node_in_fs_1.NodeInFS {
         if (!parentId) {
             throw new Error("Bad parent id");
         }
-        const file = await FileNode.initWithAttrs(storage, parentId, fileName, objId, key);
+        const src = await storage.getObjSrc(objId);
+        const file = await FileNode.readNodeFromObjBytes(storage, parentId, fileName, objId, src, key);
         return file;
     }
     static async makeFromLinkParams(storage, params) {
         const { objId, fileName } = params;
         const key = buffer_utils_1.base64.open(params.fKey);
-        const file = await FileNode.initWithAttrs(storage, undefined, fileName, objId, key);
+        const src = await storage.getObjSrc(objId);
+        const file = await FileNode.readNodeFromObjBytes(storage, undefined, fileName, objId, src, key);
         return file;
     }
-    static async initWithAttrs(storage, parentId, fileName, objId, key) {
-        const src = await storage.getObjSrc(objId);
+    static async readNodeFromObjBytes(storage, parentId, fileName, objId, src, key) {
         const file = new FileNode(storage, fileName, objId, src.version, parentId, key);
         await file.setCurrentStateFrom(src);
         return file;

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

@@ -27,6 +27,7 @@ export declare class FileObject implements WritableFile, Linkable {
     static makeExisting(node: FileNode, writable: boolean): WritableFile | ReadonlyFile;
     static makeForNotExisiting(name: string, makeNode: () => Promise<FileNode>, isInSyncedStorage: boolean): WritableFile;
     static makeFileFromLinkParams(storage: Storage, params: LinkParameters<FileLinkParams>): Promise<WritableFile | ReadonlyFile>;
+    static makeFromRemoteVersion(remote: FileNode): Promise<ReadonlyFile>;
     getLinkParams(): Promise<LinkParameters<FileLinkParams>>;
     stat(): Promise<Stats>;
     updateXAttrs(changes: XAttrsChanges): Promise<void>;

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

@@ -47,6 +47,24 @@ class FileObject {
         const node = await file_node_1.FileNode.makeFromLinkParams(storage, params.params);
         return FileObject.makeExisting(node, !params.readonly);
     }
+    static async makeFromRemoteVersion(remote) {
+        const f = new FileObject(remote.name, false, remote, undefined, false, true);
+        const versionFlags = { remoteVersion: remote.version };
+        const wrap = {
+            writable: false,
+            isNew: false,
+            name: f.name,
+            getByteSource: () => f.v.getByteSource(versionFlags).then(({ src }) => src),
+            readJSON: () => f.v.readJSON(versionFlags).then(({ json }) => json),
+            readTxt: () => f.v.readTxt(versionFlags).then(({ txt }) => txt),
+            readBytes: (start, end) => f.v.readBytes(start, end, versionFlags).then(({ bytes }) => bytes),
+            stat: f.stat.bind(f),
+            watch: f.watch.bind(f),
+            getXAttr: f.getXAttr.bind(f),
+            listXAttrs: f.listXAttrs.bind(f),
+        };
+        return Object.freeze(wrap);
+    }
     async getLinkParams() {
         const node = await this.v.getNode();
         const linkParams = node.getParamsForLink();

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

@@ -14,7 +14,7 @@ type OptionsToAdoptRemoteItem = web3n.files.OptionsToAdoptRemoteItem;
 type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 type VersionedReadFlags = web3n.files.VersionedReadFlags;
 type Stats = web3n.files.Stats;
-type OptionsToMergeFolderVersions = web3n.files.OptionsToMergeFolderVersions;
+type OptionsToAdoptRemoteFolderChanges = web3n.files.OptionsToAdoptRemoteFolderChanges;
 export interface NodeInfo {
     /**
      * This is a usual file name.
@@ -96,6 +96,7 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     hasChild(childName: string, throwIfMissing?: boolean): boolean;
     getNode<T extends NodeInFS<any>>(type: NodeType | undefined, name: string, undefOnMissing?: boolean): Promise<T | undefined>;
     private getOrMakeChildNodeForInfo;
+    private getNonLocal;
     getFolder(name: string, undefOnMissing?: boolean): Promise<FolderNode | undefined>;
     getFile(name: string, undefOnMissing?: boolean): Promise<FileNode | undefined>;
     getLink(name: string, undefOnMissing?: boolean): Promise<LinkNode | undefined>;
@@ -178,6 +179,6 @@ export declare class FolderNode extends NodeInFS<FolderPersistance> {
     diffCurrentAndRemote(remoteVersion: number | undefined): Promise<FolderDiff | undefined>;
     getRemoteItemNode<T extends NodeInFS<any>>(remoteItemName: string, remoteVersion: number | undefined): Promise<T>;
     getStorage(): Storage;
-    mergeCurrentAndRemoteVersions(opts: OptionsToMergeFolderVersions | undefined): Promise<number | undefined>;
+    absorbRemoteChanges(opts: OptionsToAdoptRemoteFolderChanges | undefined): Promise<number | undefined>;
 }
 export {};

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

@@ -344,17 +344,59 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             return nodeSet;
         }
         catch (exc) {
-            if (exc.objNotFound && fromCurrentNodes) {
-                await this.fixMissingChildAndThrow(exc, info);
-            }
-            else if (exc.failedCipherVerification) {
+            if (exc.failedCipherVerification) {
                 exc = (0, file_1.makeFileException)('ioError', `${this.name}/${info.name}`, exc);
             }
-            // XXX why and what ?
+            else if (exc.objNotFound) {
+                if (fromCurrentNodes) {
+                    await this.fixMissingChildAndThrow(exc, info);
+                }
+                else {
+                    try {
+                        const node = await this.getNonLocal(info);
+                        if (node) {
+                            deferred.resolve(node);
+                            return nodeSet;
+                        }
+                        else {
+                            throw exc;
+                        }
+                    }
+                    catch (exc2) {
+                        exc = exc2;
+                    }
+                }
+            }
             deferred.reject((0, error_1.errWithCause)(exc, `Failed to instantiate fs node '${this.name}/${info.name}'`));
             return nodeSet;
         }
     }
+    async getNonLocal(info) {
+        var _a;
+        const storage = this.syncedStorage();
+        const { objId, name, key } = info;
+        const status = await storage.status(objId);
+        const { remote, synced } = status.syncStatus();
+        const remoteVersion = (_a = remote === null || remote === void 0 ? void 0 : remote.latest) !== null && _a !== void 0 ? _a : synced === null || synced === void 0 ? void 0 : synced.latest;
+        if (!remoteVersion) {
+            return;
+        }
+        const src = await storage.getObjSrcOfRemoteVersion(info.objId, remoteVersion);
+        let node;
+        if (info.isFile) {
+            node = await file_node_1.FileNode.readNodeFromObjBytes(storage, undefined, name, objId, src, key);
+        }
+        else if (info.isFolder) {
+            node = await FolderNode.readNodeFromObjBytes(storage, name, objId, src, key);
+        }
+        else if (info.isLink) {
+            node = await link_node_1.LinkNode.readNodeFromObjBytes(storage, undefined, name, objId, src, key);
+        }
+        else {
+            throw new Error(`Unknown type of fs node`);
+        }
+        return node;
+    }
     getFolder(name, undefOnMissing = false) {
         return this.getNode('folder', name, undefOnMissing);
     }
@@ -377,61 +419,6 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         fileExc.inconsistentStateOfFS = true;
         throw fileExc;
     }
-    // XXX should we keep this, when merge with certain inputs will do same action
-    // async adoptItemsFromRemoteVersion(opts: OptionsToAdoptAllRemoteItems|undefined): Promise<number|undefined> {
-    // 	const { state, remote } = await this.syncStatus();
-    // 	if ((state !== 'conflicting') && (state !== 'behind')) {
-    // 		return;
-    // 	}
-    // 	const remoteVersion = versionFromRemoteBranch(remote!, opts?.remoteVersion);
-    // 	if (!remoteVersion) {
-    // 		throw 'something';
-    // 	}
-    // 	const { folderInfo: remoteState } = await this.readRemoteVersion(remoteVersion);
-    // 	const synced = undefined;
-    // 	return await this.doChangeWhileTrackingVersion(opts?.localVersion, async (state, newVersion) => {
-    // 		const { inRemote, nameOverlaps, differentKeys } = diffNodes(state, remoteState, synced);
-    // 		if (differentKeys) {
-    // 			throw makeFSSyncException(this.name, {
-    // 				message: `There are different keys, and implementation for it is not implemented, yet.`
-    // 			});
-    // 		}
-    // 		const events: { event: FSEvent; childObjId: string; }[] = [];
-    // 		if (!inRemote) {
-    // 			return events;
-    // 		}
-    // 		const addedNodes = new Set<string>();
-    // 		if (nameOverlaps) {
-    // 			const postfix = opts?.postfixForNameOverlaps;
-    // 			if ((postfix === undefined) || (postfix.length < 0)) {
-    // 				// XXX better exception
-    // 				throw 'something';
-    // 			}
-    // 			for (const itemName of nameOverlaps) {
-    // 				const node = remoteState.nodes[itemName];
-    // 				let newName = `${itemName}${postfix}`;
-    // 				while (state.nodes[newName]) {
-    // 					newName = `${newName}${postfix}`;
-    // 				}
-    // 				node.name = newName;
-    // 				state.nodes[newName] = node;
-    // 				addedNodes.add(itemName);
-    // 				const { event, childObjId } = this.makeEntryAdditionEvent(newVersion, 'sync', node);
-    // 				events.push({ event, childObjId });
-    // 			}
-    // 		}
-    // 		for (const { name: itemName } of inRemote) {
-    // 			if (addedNodes.has(itemName)) {
-    // 				continue;
-    // 			}
-    // 			const node = remoteState.nodes[itemName];
-    // 			state.nodes[itemName] = node;
-    // 			const { event, childObjId } = this.makeEntryAdditionEvent(newVersion, 'sync', node);
-    // 			events.push({ event, childObjId });
-    // 		}
-    // 		return events;
-    // 	});
-    // }
     /**
      * 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,
@@ -1061,7 +1048,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
     getStorage() {
         return this.storage;
     }
-    async mergeCurrentAndRemoteVersions(opts) {
+    async absorbRemoteChanges(opts) {
         const diff = await this.diffCurrentAndRemote(opts === null || opts === void 0 ? void 0 : opts.remoteVersion);
         if (!diff) {
             return;

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

@@ -32,7 +32,7 @@ type OptionsToDiffFileVersions = web3n.files.OptionsToDiffFileVersions;
 type OptionsToUploadLocal = web3n.files.OptionsToUploadLocal;
 type FolderDiff = web3n.files.FolderDiff;
 type FileDiff = web3n.files.FileDiff;
-type OptionsToMergeFolderVersions = web3n.files.OptionsToMergeFolderVersions;
+type OptionsToAdoptRemoteFolderChanges = web3n.files.OptionsToAdoptRemoteFolderChanges;
 export declare class XspFS implements WritableFS {
     readonly writable: boolean;
     name: string;
@@ -188,6 +188,6 @@ declare class S implements WritableFSSyncAPI {
     listRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ListingEntry[]>;
     getRemoteFileItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFile>;
     getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
-    mergeFolderCurrentAndRemoteVersions(path: string, opts?: OptionsToMergeFolderVersions): Promise<number | undefined>;
+    absorbRemoteFolderChanges(path: string, opts?: OptionsToAdoptRemoteFolderChanges): Promise<number | undefined>;
 }
 export {};

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

@@ -846,7 +846,7 @@ class S {
         const folderNode = await this.getFolderNode(path);
         const remoteChild = await folderNode.getRemoteItemNode(remoteItemName, remoteVersion);
         if (remoteChild.type === 'file') {
-            return (0, files_1.wrapReadonlyFile)(file_2.FileObject.makeExisting(remoteChild, false));
+            return file_2.FileObject.makeFromRemoteVersion(remoteChild);
         }
         else {
             throw (0, file_1.makeFileException)('notFile', `${path}/${remoteItemName}`);
@@ -862,9 +862,9 @@ class S {
             throw (0, file_1.makeFileException)('notDirectory', `${path}/${remoteItemName}`);
         }
     }
-    async mergeFolderCurrentAndRemoteVersions(path, opts) {
+    async absorbRemoteFolderChanges(path, opts) {
         const folderNode = await this.getFolderNode(path);
-        return await folderNode.mergeCurrentAndRemoteVersions(opts);
+        return await folderNode.absorbRemoteChanges(opts);
     }
 }
 Object.freeze(S.prototype);

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

@@ -26,6 +26,7 @@ export declare class LinkNode extends NodeInFS<LinkPersistance> {
     constructor(storage: Storage, name: string, objId: string, version: number, parentId: string | undefined, key: Uint8Array);
     static makeForNew(storage: Storage, parentId: string, name: string, key: Uint8Array): Promise<LinkNode>;
     static makeForExisting(storage: Storage, parentId: string, name: string, objId: string, key: Uint8Array): Promise<LinkNode>;
+    static readNodeFromObjBytes(storage: Storage, parentId: string | undefined, name: string, objId: string, src: ObjSource, key: Uint8Array): Promise<LinkNode>;
     protected setCurrentStateFrom(src: ObjSource): Promise<void>;
     getStats(flags?: VersionedReadFlags): Promise<Stats>;
     private setUpdatedState;

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

@@ -93,6 +93,9 @@ class LinkNode extends node_in_fs_1.NodeInFS {
     }
     static async makeForExisting(storage, parentId, name, objId, key) {
         const src = await storage.getObjSrc(objId);
+        return await LinkNode.readNodeFromObjBytes(storage, parentId, name, objId, src, key);
+    }
+    static async readNodeFromObjBytes(storage, parentId, name, objId, src, key) {
         const link = new LinkNode(storage, name, objId, src.version, parentId, key);
         const { params, attrs, xattrs } = await link.crypto.read(src);
         link.setUpdatedState(params, src.version, attrs, xattrs);

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

@@ -124,5 +124,5 @@ export declare abstract class NodeInFS<P extends NodePersistance> implements Nod
 }
 export declare function shouldReadCurrentVersion(flags: VersionedReadFlags | undefined): boolean;
 export declare function areBytesEqual(b1: Uint8Array, b2: Uint8Array): boolean;
-export declare function versionFromRemoteBranch(remote: SyncVersionsBranch, remoteVersion: number | undefined): number | undefined;
+export declare function versionFromBranch(branch: SyncVersionsBranch, versionInBranch: number | undefined): number | undefined;
 export {};

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

@@ -19,7 +19,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeInFS = void 0;
 exports.shouldReadCurrentVersion = shouldReadCurrentVersion;
 exports.areBytesEqual = areBytesEqual;
-exports.versionFromRemoteBranch = versionFromRemoteBranch;
+exports.versionFromBranch = versionFromBranch;
 /**
  * Everything in this module is assumed to be inside of a file system
  * reliance set.
@@ -550,14 +550,19 @@ class NodeInFS {
         let isCurrentLocal;
         if (state === 'behind') {
             isCurrentLocal = false;
+            remoteVersion = versionFromBranch(remote, remoteVersion);
         }
         else if (state === 'conflicting') {
             isCurrentLocal = true;
+            remoteVersion = versionFromBranch(remote, remoteVersion);
+        }
+        else if (state === 'unsynced') {
+            isCurrentLocal = true;
+            remoteVersion = versionFromBranch(synced, remoteVersion);
         }
         else {
             return;
         }
-        remoteVersion = versionFromRemoteBranch(remote, remoteVersion);
         if (remoteVersion) {
             return { rm: false, isCurrentLocal, remoteVersion, syncedVersion: synced === null || synced === void 0 ? void 0 : synced.latest };
         }
@@ -708,23 +713,20 @@ function areBytesEqual(b1, b2) {
     }
     return true;
 }
-function versionFromRemoteBranch(remote, remoteVersion) {
+function versionFromBranch(branch, versionInBranch) {
     var _a;
-    if (remote.isArchived) {
-        return;
-    }
-    if (remoteVersion) {
-        if ((remoteVersion !== remote.latest)
-            && !((_a = remote.archived) === null || _a === void 0 ? void 0 : _a.includes(remoteVersion))) {
+    if (versionInBranch) {
+        if ((versionInBranch !== branch.latest)
+            && !((_a = branch.archived) === null || _a === void 0 ? void 0 : _a.includes(versionInBranch))) {
             throw (0, exceptions_1.makeFSSyncException)(this.name, {
                 versionMismatch: true,
-                message: `Unknown remote version ${remoteVersion}`
+                message: `Unknown version in branch: ${versionInBranch}`
             });
         }
-        return remoteVersion;
+        return versionInBranch;
     }
     else {
-        return remote.latest;
+        return branch.latest;
     }
 }
 Object.freeze(exports);

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

@@ -13,7 +13,8 @@
  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.errWithCause = errWithCause;
 exports.recursiveErrJSONify = recursiveErrJSONify;