core-3nweb-client-lib 0.25.3 → 0.26.0

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

@@ -1,9 +1,14 @@
 import { ScryptGenParams } from '../../key-derivation';
 import { AsyncSBoxCryptor, Subscribe, ObjSource } from 'xsp-files';
 import { objChanged, objRemoved } from '../../../lib-common/service-api/3nstorage/owner';
+import { Observable } from 'rxjs';
+import { UpSyncTaskInfo } from '../../../core/storage/synced/obj-status';
 export { AsyncSBoxCryptor } from 'xsp-files';
 export { FolderInJSON } from './folder-node';
 declare type StorageType = web3n.files.FSType;
+declare type FolderEvent = web3n.files.FolderEvent;
+declare type FileEvent = web3n.files.FileEvent;
+declare type Stats = web3n.files.Stats;
 export interface RemoteObjRemovalEvent extends objRemoved.Event {
     type: 'remote-delete';
 }
@@ -16,6 +21,7 @@ export interface Node {
     name: string;
     type: NodeType;
     processRemoteEvent: (event: RemoteEvent) => Promise<void>;
+    broadcastUpSyncEvent(task: UpSyncTaskInfo): void;
     localDelete(): Promise<void>;
 }
 export declare type NodeType = 'file' | 'link' | 'folder';
@@ -47,11 +53,18 @@ export declare class NodesContainer {
     reserveId(objId: string): boolean;
     clear(): void;
 }
+export interface NodeEvent {
+    objId: ObjId;
+    parentObjId?: ObjId;
+    event: FolderEvent | FileEvent;
+}
 export interface Storage {
     readonly type: StorageType;
     readonly versioned: boolean;
     readonly cryptor: AsyncSBoxCryptor;
     readonly nodes: NodesContainer;
+    getNodeEvents(): Observable<NodeEvent>;
+    broadcastNodeEvent(objId: ObjId, parentObjId: ObjId | undefined, ev: FolderEvent | FileEvent): void;
     /**
      * This returns a storage of another type, for use by link functionality.
      * @param type is a type of a requested storage.
@@ -67,20 +80,20 @@ export interface Storage {
      * This returns a promise, resolvable to source for a requested object.
      * @param objId
      */
-    getObj(objId: string): Promise<ObjSource>;
+    getObj(objId: ObjId): Promise<ObjSource>;
     /**
      * This saves given object, asynchronously.
      * @param objId
      * @param version
      * @param sinkSub is a sink subscribe function
      */
-    saveObj(objId: string, version: number, sinkSub: Subscribe): Promise<void>;
+    saveObj(objId: ObjId, version: number, sinkSub: Subscribe): Promise<void>;
     /**
      * This asynchronously removes an object. Note that it does not remove
      * archived version, only current one.
      * @param objId
      */
-    removeObj(objId: string): Promise<void>;
+    removeObj(objId: ObjId): Promise<void>;
     /**
      * This asynchronously runs closing cleanup.
      */
@@ -93,6 +106,7 @@ export interface SyncedStorage extends Storage {
      * This returns a promise, resolvable to root key generation parameters.
      */
     getRootKeyDerivParamsFromServer(): Promise<ScryptGenParams>;
-    getRemoteConflictObjVersion(objId: string, version: number): Promise<ObjSource>;
+    getRemoteConflictObjVersion(objId: ObjId, version: number): Promise<ObjSource>;
+    getObjSyncInfo(objId: ObjId): Promise<Stats['sync']>;
 }
 export declare function wrapSyncStorageImplementation(impl: SyncedStorage): SyncedStorage;

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

@@ -98,6 +98,8 @@ function wrapStorageImplementation(impl) {
         type: impl.type,
         versioned: impl.versioned,
         nodes: impl.nodes,
+        getNodeEvents: impl.getNodeEvents.bind(impl),
+        broadcastNodeEvent: impl.broadcastNodeEvent.bind(impl),
         storageForLinking: impl.storageForLinking.bind(impl),
         generateNewObjId: impl.generateNewObjId.bind(impl),
         getObj: impl.getObj.bind(impl),
@@ -119,11 +121,14 @@ function wrapSyncStorageImplementation(impl) {
         generateNewObjId: storageWrap.generateNewObjId,
         getObj: storageWrap.getObj,
         nodes: storageWrap.nodes,
+        getNodeEvents: storageWrap.getNodeEvents,
+        broadcastNodeEvent: storageWrap.broadcastNodeEvent,
         removeObj: storageWrap.removeObj,
         saveObj: storageWrap.saveObj,
         storageForLinking: storageWrap.storageForLinking,
         getRootKeyDerivParamsFromServer: impl.getRootKeyDerivParamsFromServer.bind(impl),
-        getRemoteConflictObjVersion: impl.getRemoteConflictObjVersion.bind(impl)
+        getRemoteConflictObjVersion: impl.getRemoteConflictObjVersion.bind(impl),
+        getObjSyncInfo: impl.getObjSyncInfo.bind(impl)
     };
     return Object.freeze(wrap);
 }

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

@@ -23,7 +23,7 @@ exports.FileNode = void 0;
  */
 const node_in_fs_1 = require("./node-in-fs");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
-const processes_1 = require("../../../lib-common/processes");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 const xsp_files_1 = require("xsp-files");
 const assert_1 = require("../../../lib-common/assert");
 const attrs_1 = require("./attrs");
@@ -177,8 +177,8 @@ class FileNode extends node_in_fs_1.NodeInFS {
         }
     }
     async writeSink(truncate, currentVersion, changes) {
-        const deferredSink = processes_1.defer();
-        const newSize = processes_1.defer();
+        const deferredSink = deferred_1.defer();
+        const newSize = deferred_1.defer();
         let version = 0; // need to set any value to satisfy compiler
         const completion = this.doChange(false, async () => {
             const { attrs, xattrs, newVersion, sinkPromise, sub } = await this.startMakingSinkInsideChange(truncate, currentVersion, changes);

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

@@ -26,6 +26,7 @@ const files_1 = require("../../files");
 const file_node_1 = require("./file-node");
 const buffer_utils_1 = require("../../../lib-common/buffer-utils");
 const pipe_1 = require("../../../lib-common/byte-streaming/pipe");
+const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 class FileObject {
     constructor(name, isNew, node, makeOrGetNode, writable) {
         this.name = name;
@@ -60,11 +61,13 @@ class FileObject {
         if (!this.v.node) {
             throw file_1.makeFileException(file_1.Code.notFound, this.name);
         }
+        const sync = await this.v.node.sync();
         const attrs = this.v.node.getAttrs();
         const stat = {
             writable: this.writable,
             size: this.v.node.size,
             version: this.v.node.version,
+            sync,
             isFile: true,
             ctime: new Date(attrs.ctime),
             mtime: new Date(attrs.mtime),
@@ -87,7 +90,7 @@ class FileObject {
             throw new Error(`Node for file ${this.name} is not yet initialized`);
         }
         const sub = this.v.node.event$
-            .subscribe(observer);
+            .subscribe(utils_for_observables_1.toRxObserver(observer));
         return () => sub.unsubscribe();
     }
     async readBytes(start, end) {

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

@@ -27,7 +27,7 @@ const error_1 = require("../../../lib-common/exceptions/error");
 const node_in_fs_1 = require("./node-in-fs");
 const file_node_1 = require("./file-node");
 const link_node_1 = require("./link-node");
-const processes_1 = require("../../../lib-common/processes");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 const json_utils_1 = require("../../../lib-common/json-utils");
 const xsp_files_1 = require("xsp-files");
 const random = require("../../../lib-common/random-node");
@@ -62,6 +62,17 @@ class FolderPersistance extends node_persistence_1.NodePersistance {
 }
 Object.freeze(FolderPersistance.prototype);
 Object.freeze(FolderPersistance);
+let nextMoveLabel = Math.floor(Math.random() / 2 * Number.MAX_SAFE_INTEGER);
+function getMoveLabel() {
+    const label = nextMoveLabel;
+    if (nextMoveLabel >= Number.MAX_SAFE_INTEGER) {
+        nextMoveLabel = 0;
+    }
+    else {
+        nextMoveLabel += 1;
+    }
+    return label;
+}
 class FolderNode extends node_in_fs_1.NodeInFS {
     constructor(storage, name, objId, zNonce, version, parentId, key, setNewAttrs) {
         super(storage, 'folder', name, objId, version, parentId);
@@ -183,7 +194,7 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         if (nodePromise) {
             return { nodeOrPromise: nodePromise };
         }
-        const deferred = processes_1.defer();
+        const deferred = deferred_1.defer();
         this.storage.nodes.setPromise(objId, deferred.promise);
         return { deferred };
     }
@@ -462,28 +473,30 @@ class FolderNode extends node_in_fs_1.NodeInFS {
         }
         if (dst === this) {
             // In this case we only need to change child's name
-            return this.changeChildName(childName, nameInDst);
+            await this.changeChildName(childName, nameInDst);
+        }
+        else {
+            const childJSON = this.getNodeInfo(childName);
+            // we have two transitions here, in this and in dst.
+            const moveLabel = getMoveLabel();
+            await dst.moveChildIn(nameInDst, childJSON, moveLabel);
+            await this.moveChildOut(childName, moveLabel);
         }
-        const childJSON = this.getNodeInfo(childName);
-        // we have two transitions here, in this and in dst.
-        await Promise.all([
-            await dst.moveChildIn(nameInDst, childJSON),
-            await this.moveChildOut(childName)
-        ]);
     }
-    async moveChildOut(name) {
+    async moveChildOut(name, moveLabel) {
         await this.doTransition(async (state, version) => {
             delete state.nodes[name];
             const event = {
                 type: 'entry-removal',
                 path: this.name,
                 name,
-                newVersion: version
+                newVersion: version,
+                moveLabel
             };
             return event;
         });
     }
-    async moveChildIn(newName, child) {
+    async moveChildIn(newName, child, moveLabel) {
         child = json_utils_1.copy(child);
         await this.doTransition(async (state, version) => {
             child.name = newName;
@@ -497,7 +510,8 @@ class FolderNode extends node_in_fs_1.NodeInFS {
                     isFolder: child.isFolder,
                     isLink: child.isLink
                 },
-                newVersion: version
+                newVersion: version,
+                moveLabel
             };
             return event;
         });

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

@@ -23,12 +23,14 @@ declare type FileByteSource = web3n.files.FileByteSource;
 declare type FileByteSink = web3n.files.FileByteSink;
 declare type XAttrsChanges = web3n.files.XAttrsChanges;
 export declare class XspFS implements WritableFS {
-    storage: Storage;
-    writable: boolean;
+    readonly writable: boolean;
     name: string;
-    type: FSType;
-    v: V;
+    readonly type: FSType;
+    readonly v: V;
+    private store;
+    private readonly fsObs;
     private constructor();
+    private storage;
     readonlySubRoot(path: string): Promise<ReadonlyFS>;
     writableSubRoot(path: string, flags?: web3n.files.VersionedFileFlags): Promise<WritableFS>;
     /**
@@ -74,6 +76,7 @@ export declare class XspFS implements WritableFS {
     readLink(path: string): Promise<SymLink>;
     getLinkParams(): Promise<LinkParameters<any>>;
     static makeFolderFromLinkParams(storage: Storage, params: LinkParameters<FolderLinkParams>): Promise<ReadonlyFS | WritableFS>;
+    private getCloseEvent$;
     watchFolder(path: string, observer: Observer<FolderEvent>): () => void;
     watchFile(path: string, observer: Observer<FileEvent>): () => void;
     watchTree(path: string, observer: Observer<FolderEvent | FileEvent>): () => void;
@@ -93,8 +96,10 @@ export declare class XspFS implements WritableFS {
 }
 declare type WritableFSVersionedAPI = web3n.files.WritableFSVersionedAPI;
 declare class V implements WritableFSVersionedAPI {
-    root: FolderNode;
-    constructor();
+    private rootNode;
+    constructor(root: FolderNode);
+    close(): void;
+    getRootIfNotClosed(excPath: string): FolderNode;
     getOrCreateFile(path: string, flags: FileFlags): Promise<FileNode>;
     get(path: string): Promise<NodeInFS<any>>;
     updateXAttrs(path: string, changes: XAttrsChanges): Promise<number>;