core-3nweb-client-lib 0.44.4 → 0.44.6

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) {

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

@@ -73,6 +73,7 @@ export interface ObjDownloader {
     getSegs: (objId: ObjId, version: number, start: number, end: number) => Promise<Uint8Array>;
     splitSegsDownloads: (start: number, end: number) => Section[];
     schedule: (download: Download) => void;
+    whenConnected: () => Promise<void>;
 }
 export interface InitDownloadParts {
     layout: Layout;

package/build/lib-client/objs-on-disk/obj-on-disk.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2018 - 2020, 2022, 2025 3NSoft Inc.
+ Copyright (C) 2018 - 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
@@ -423,7 +423,12 @@ class Download {
             this.inBkgrnd.runData.currentDownload.deferred.resolve(bytes);
         }
         catch (exc) {
-            this.inBkgrnd.runData.currentDownload.deferred.reject(exc);
+            if (exc.type === 'connect') {
+                await this.downloader.whenConnected();
+            }
+            else {
+                this.inBkgrnd.runData.currentDownload.deferred.reject(exc);
+            }
         }
         finally {
             this.inBkgrnd.runData.currentDownload = undefined;

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.js

@@ -387,7 +387,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
             node = await file_node_1.FileNode.readNodeFromObjBytes(storage, undefined, name, objId, src, key);
         }
         else if (info.isFolder) {
-            node = await FolderNode.readNodeFromObjBytes(storage, undefined, objId, src, key);
+            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);

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

@@ -818,6 +818,19 @@ class S {
             throw (0, common_1.setPathInExc)(exc, path);
         }
     }
+    // XXX WIP
+    // async compareLocalAndRemoteFileItems(
+    // 	path: string, itemName: string, remoteVersion?: number
+    // ): Promise<FileDiff> {
+    // 	const folderNode = await this.getFolderNode(path);
+    // 	const localChild = (await folderNode.getFile(itemName))!;
+    // 	const remoteChild = await folderNode.getRemoteItemNode(itemName, remoteVersion);
+    // 	if (remoteChild.type === 'file') {
+    // 		return await localChild.compareWithRemote(remoteChild);
+    // 	} else {
+    // 		throw makeFileException('notFile', `${path}/${itemName}`);
+    // 	}
+    // }
     async adoptRemoteFolderItem(path, itemName, opts) {
         const node = await this.getFolderNode(path);
         try {
@@ -846,7 +859,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}`);

package/build/lib-common/async-iter.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.asyncIteration = asyncIteration;
 exports.asyncFind = asyncFind;

package/build/lib-common/awaitable-state.d.ts

@@ -0,0 +1,7 @@
+export declare class AwaitableState {
+    private deferredStateSetPoint;
+    constructor();
+    setState(): void;
+    clearState(): void;
+    whenStateIsSet(): Promise<void>;
+}

package/build/lib-common/awaitable-state.js

@@ -0,0 +1,43 @@
+"use strict";
+/*
+ Copyright (C) 2017 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
+ Foundation, either version 3 of the License, or (at your option) any later
+ version.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AwaitableState = void 0;
+const deferred_1 = require("./processes/deferred");
+class AwaitableState {
+    constructor() {
+        this.deferredStateSetPoint = (0, deferred_1.defer)();
+        Object.seal(this);
+    }
+    setState() {
+        if (this.deferredStateSetPoint) {
+            this.deferredStateSetPoint.resolve();
+            this.deferredStateSetPoint = undefined;
+        }
+    }
+    clearState() {
+        if (!this.deferredStateSetPoint) {
+            this.deferredStateSetPoint = (0, deferred_1.defer)();
+        }
+    }
+    async whenStateIsSet() {
+        var _a;
+        return (_a = this.deferredStateSetPoint) === null || _a === void 0 ? void 0 : _a.promise;
+    }
+}
+exports.AwaitableState = AwaitableState;
+Object.freeze(exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.44.4",
+  "version": "0.44.6",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",