core-3nweb-client-lib 0.25.6 → 0.26.0

package/build/ipc-via-protobuf/asmail-cap.js

@@ -24,6 +24,7 @@ const connector_1 = require("./connector");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const fs_1 = require("./fs");
+const utils_for_observables_1 = require("../lib-common/utils-for-observables");
 function exposeASMailCAP(cap, expServices) {
     const out = cap.delivery;
     const box = cap.inbox;
@@ -222,15 +223,9 @@ var inboxSubscribe;
         return (event, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, requestType.pack({ event }), s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        obs.next(unpackIncomingMessage(buf, caller));
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe(operators_1.map(buf => unpackIncomingMessage(buf, caller)))
+                .subscribe(utils_for_observables_1.toRxObserver(obs));
             return unsub;
         };
     }
@@ -496,19 +491,14 @@ var observeAllDeliveries;
         return obs => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, undefined, s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        const { id, progress } = notifType.unpack(buf);
-                        obs.next({
-                            id,
-                            progress: unpackDeliveryProgress(progress)
-                        });
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe(operators_1.map(buf => {
+                const { id, progress } = notifType.unpack(buf);
+                return {
+                    id, progress: unpackDeliveryProgress(progress)
+                };
+            }))
+                .subscribe(utils_for_observables_1.toRxObserver(obs));
             return unsub;
         };
     }
@@ -533,16 +523,9 @@ var observeDelivery;
         return (id, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, requestType.pack({ id }), s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        const msg = deliveryProgressMsgType.unpack(buf);
-                        obs.next(unpackDeliveryProgress(msg));
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe(operators_1.map(buf => unpackDeliveryProgress(deliveryProgressMsgType.unpack(buf))))
+                .subscribe(utils_for_observables_1.toRxObserver(obs));
             return unsub;
         };
     }

package/build/ipc-via-protobuf/connector-clients-side.js

@@ -18,7 +18,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClientsSideImpl = void 0;
 const protobuf_msg_1 = require("./protobuf-msg");
-const processes_1 = require("../lib-common/processes");
+const deferred_1 = require("../lib-common/processes/deferred");
 const weakref_1 = require("../lib-common/weakref");
 const connector_1 = require("./connector");
 // XXX can have an optimized use of WeakRef and FinalizationRegistry, when
@@ -151,7 +151,7 @@ class ClientsSideImpl {
         });
     }
     startPromiseCall(path, req) {
-        const deferred = processes_1.defer();
+        const deferred = deferred_1.defer();
         const fnCallNum = this.nextFnCallNum();
         this.fnCalls.set(fnCallNum, { deferred });
         try {

package/build/ipc-via-protobuf/file.js

@@ -25,6 +25,7 @@ const error_1 = require("../lib-common/exceptions/error");
 const bytes_1 = require("./bytes");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const utils_for_observables_1 = require("../lib-common/utils-for-observables");
 function makeFileCaller(caller, fileMsg) {
     connector_1.checkRefObjTypeIs('FileImpl', fileMsg.impl);
     const objPath = fileMsg.impl.path;
@@ -131,7 +132,14 @@ function packStats(s) {
         ctime: (s.ctime ? protobuf_msg_1.toVal(s.ctime.valueOf()) : undefined),
         mtime: (s.mtime ? protobuf_msg_1.toVal(s.mtime.valueOf()) : undefined),
         size: protobuf_msg_1.toOptVal(s.size),
-        version: protobuf_msg_1.toOptVal(s.version)
+        version: protobuf_msg_1.toOptVal(s.version),
+        sync: (s.sync ? {
+            state: s.sync.state,
+            conflictingRemote: s.sync.conflictingRemote,
+            deletedOnRemote: protobuf_msg_1.toOptVal(s.sync.deletedOnRemote),
+            latest: protobuf_msg_1.toOptVal(s.sync.latest),
+            remote: protobuf_msg_1.toOptVal(s.sync.remote)
+        } : undefined)
     };
     return statsMsgType.pack(msg);
 }
@@ -147,6 +155,14 @@ function unpackStats(buf) {
         version: protobuf_msg_1.valOfOptInt(m.version),
         ctime: (m.ctime ? new Date(protobuf_msg_1.valOfOptInt(m.ctime)) : undefined),
         mtime: (m.mtime ? new Date(protobuf_msg_1.valOfOptInt(m.mtime)) : undefined),
+        sync: (m.sync ? {
+            state: m.sync.state,
+            conflictingRemote: ((m.sync.conflictingRemote.length > 0) ?
+                m.sync.conflictingRemote.map(protobuf_msg_1.fixInt) : undefined),
+            deletedOnRemote: !!protobuf_msg_1.valOfOpt(m.sync.deletedOnRemote) || undefined,
+            latest: protobuf_msg_1.valOfOptInt(m.sync.latest),
+            remote: protobuf_msg_1.valOfOptInt(m.sync.remote)
+        } : undefined),
     };
 }
 exports.unpackStats = unpackStats;
@@ -358,8 +374,7 @@ function packFileEvent(e) {
         isRemote: protobuf_msg_1.toOptVal(e.isRemote),
         newVersion: protobuf_msg_1.toOptVal(e.newVersion),
         current: protobuf_msg_1.toOptVal(e.current),
-        lastSynced: protobuf_msg_1.toOptVal(e.lastSynced),
-        remoteVersion: protobuf_msg_1.toOptVal(e.remoteVersion)
+        uploaded: protobuf_msg_1.toOptVal(e.uploaded)
     };
     return fileEventType.pack(msg);
 }
@@ -372,8 +387,7 @@ function unpackFileEvent(buf) {
         isRemote: protobuf_msg_1.valOfOpt(m.isRemote),
         newVersion: protobuf_msg_1.valOfOptInt(m.newVersion),
         current: protobuf_msg_1.valOfOptInt(m.current),
-        lastSynced: protobuf_msg_1.valOfOptInt(m.lastSynced),
-        remoteVersion: protobuf_msg_1.valOfOptInt(m.remoteVersion)
+        uploaded: protobuf_msg_1.valOfOptInt(m.uploaded),
     };
 }
 exports.unpackFileEvent = unpackFileEvent;
@@ -393,15 +407,9 @@ var watch;
         return obs => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(path, undefined, s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        obs.next(unpackFileEvent(buf));
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe(operators_1.map(unpackFileEvent))
+                .subscribe(utils_for_observables_1.toRxObserver(obs));
             return unsub;
         };
     }

package/build/ipc-via-protobuf/fs.js

@@ -26,8 +26,9 @@ const file = require("./file");
 const assert_1 = require("../lib-common/assert");
 const bytes_1 = require("./bytes");
 const rxjs_1 = require("rxjs");
-const processes_1 = require("../lib-common/processes");
+const deferred_1 = require("../lib-common/processes/deferred");
 const operators_1 = require("rxjs/operators");
+const utils_for_observables_1 = require("../lib-common/utils-for-observables");
 function makeFSCaller(caller, fsMsg) {
     connector_1.checkRefObjTypeIs('FSImpl', fsMsg.impl);
     const objPath = fsMsg.impl.path;
@@ -356,10 +357,10 @@ function packFSEvent(e) {
         oldName: protobuf_msg_1.toOptVal(e.oldName),
         newName: protobuf_msg_1.toOptVal(e.newName),
         entry: (e.entry ?
-            protobuf_msg_1.toVal(lsEntryToMsg(e.entry)) : undefined),
+            lsEntryToMsg(e.entry) : undefined),
         current: protobuf_msg_1.toOptVal(e.current),
-        lastSynced: protobuf_msg_1.toOptVal(e.lastSynced),
-        remoteVersion: protobuf_msg_1.toOptVal(e.remoteVersion)
+        uploaded: protobuf_msg_1.toOptVal(e.uploaded),
+        moveLabel: protobuf_msg_1.toOptVal(e.moveLabel)
     };
     return fsEventMsgType.pack(m);
 }
@@ -373,10 +374,10 @@ function unpackFSEvent(buf) {
         name: protobuf_msg_1.valOfOpt(m.name),
         oldName: protobuf_msg_1.valOfOpt(m.oldName),
         newName: protobuf_msg_1.valOfOpt(m.newName),
-        entry: (m.entry ? lsEntryFromMsg(m.entry.value) : undefined),
+        entry: (m.entry ? lsEntryFromMsg(m.entry) : undefined),
         current: protobuf_msg_1.valOfOptInt(m.current),
-        lastSynced: protobuf_msg_1.valOfOptInt(m.lastSynced),
-        remoteVersion: protobuf_msg_1.valOfOptInt(m.remoteVersion)
+        uploaded: protobuf_msg_1.valOfOptInt(m.uploaded),
+        moveLabel: protobuf_msg_1.valOfOptInt(m.moveLabel)
     };
     return event;
 }
@@ -389,12 +390,21 @@ function lsEntryToMsg(e) {
     };
 }
 function lsEntryFromMsg(m) {
-    return {
-        name: m.name,
-        isFile: protobuf_msg_1.valOfOpt(m.isFile),
-        isFolder: protobuf_msg_1.valOfOpt(m.isFolder),
-        isLink: protobuf_msg_1.valOfOpt(m.isLink)
-    };
+    const name = m.name;
+    if (protobuf_msg_1.valOfOpt(m.isFile)) {
+        return { name, isFile: true };
+    }
+    else if (protobuf_msg_1.valOfOpt(m.isFolder)) {
+        return { name, isFolder: true };
+    }
+    else if (protobuf_msg_1.valOfOpt(m.isLink)) {
+        return { name, isLink: true };
+    }
+    else {
+        throw connector_1.makeIPCException({
+            badReply: true, message: `Missing fs entry type flag`
+        });
+    }
 }
 var watch;
 (function (watch) {
@@ -412,15 +422,9 @@ var watch;
         return (path, obs) => {
             const s = new rxjs_1.Subject();
             const unsub = caller.startObservableCall(ipcPath, reqWithPathType.pack({ path }), s);
-            s.subscribe({
-                next: buf => {
-                    if (obs.next) {
-                        obs.next(unpackEvent(buf));
-                    }
-                },
-                complete: obs.complete,
-                error: obs.error
-            });
+            s.asObservable()
+                .pipe(operators_1.map(unpackEvent))
+                .subscribe(utils_for_observables_1.toRxObserver(obs));
             return unsub;
         };
     }
@@ -687,14 +691,14 @@ var select;
             const req = { path, criteria: criteriaToMsg(criteria) };
             const s = new rxjs_1.Subject();
             caller.startObservableCall(ipcPath, requestType.pack(req), s);
-            const reply = processes_1.defer();
+            const reply = deferred_1.defer();
             let completion = undefined;
             s.subscribe({
                 next: buf => {
                     const ref = protobuf_msg_1.objRefType.unpack(buf);
                     const collection = fsCollection.makeCollectionCaller(ref, caller);
                     reply.resolve(collection);
-                    completion = processes_1.defer();
+                    completion = deferred_1.defer();
                 },
                 complete: () => {
                     if (completion) {
@@ -927,15 +931,9 @@ var fsCollection;
             return obs => {
                 const s = new rxjs_1.Subject();
                 const unsub = caller.startObservableCall(path, undefined, s);
-                s.subscribe({
-                    next: buf => {
-                        if (obs.next) {
-                            obs.next(unpackEvent(buf, caller));
-                        }
-                    },
-                    complete: obs.complete,
-                    error: obs.error
-                });
+                s.asObservable()
+                    .pipe(operators_1.map(buf => unpackEvent(buf, caller)))
+                    .subscribe(utils_for_observables_1.toRxObserver(obs));
                 return unsub;
             };
         }

package/build/ipc-via-protobuf/startup-cap.js

@@ -20,7 +20,7 @@ exports.makeSignUpCaller = exports.wrapSignUpCAP = exports.makeSignInCaller = ex
 const protobuf_msg_1 = require("./protobuf-msg");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
-const processes_1 = require("../lib-common/processes");
+const deferred_1 = require("../lib-common/processes/deferred");
 const protobuf_type_1 = require("../lib-client/protobuf-type");
 const startup_proto_1 = require("../protos/startup.proto");
 function wrapSignInCAP(cap) {
@@ -140,7 +140,7 @@ var createUserParams;
         const path = objPath.concat('createUserParams');
         return (pass, progressCB) => {
             const s = new rxjs_1.Subject();
-            const completion = processes_1.defer();
+            const completion = deferred_1.defer();
             s.subscribe({
                 next: buf => {
                     const { p } = progressValueType.unpack(buf);
@@ -217,8 +217,8 @@ var completeLoginAndLocalSetup;
         const path = objPath.concat('completeLoginAndLocalSetup');
         return (pass, progressCB) => {
             const s = new rxjs_1.Subject();
-            const completion = processes_1.defer();
-            s.asObservable().subscribe({
+            const completion = deferred_1.defer();
+            s.subscribe({
                 next: buf => {
                     const { decrResult, p } = progressValueType.unpack(buf);
                     if (typeof protobuf_msg_1.valOfOpt(decrResult) === 'boolean') {
@@ -259,7 +259,7 @@ var useExistingStorage;
         const path = objPath.concat('useExistingStorage');
         return (address, pass, progressCB) => {
             const s = new rxjs_1.Subject();
-            const completion = processes_1.defer();
+            const completion = deferred_1.defer();
             s.subscribe({
                 next: buf => {
                     const { decrResult, p } = progressValueType.unpack(buf);

package/build/lib-client/3nstorage/exceptions.d.ts

@@ -1,19 +1,20 @@
 import { ObjId } from "./xsp-fs/common";
 export interface StorageException extends web3n.RuntimeException {
     type: 'storage';
+    remoteStorage?: true;
     objId?: ObjId;
     version?: number;
-    objNotFound?: boolean;
-    objExists?: boolean;
-    concurrentTransaction?: boolean;
-    unknownTransaction?: boolean;
-    versionMismatch?: boolean;
+    objNotFound?: true;
+    objExists?: true;
+    concurrentTransaction?: true;
+    unknownTransaction?: true;
+    versionMismatch?: true;
     currentVersion?: number;
-    storageIsClosed?: boolean;
+    storageIsClosed?: true;
 }
 export declare function makeStorageException(fields: Partial<StorageException>): StorageException;
-export declare function makeObjNotFoundExc(objId: ObjId, version?: number): StorageException;
-export declare function makeObjExistsExc(objId: ObjId, version?: number): StorageException;
+export declare function makeObjNotFoundExc(objId: ObjId, version?: number, remoteStorage?: true): StorageException;
+export declare function makeObjExistsExc(objId: ObjId, version?: number, remoteStorage?: true): StorageException;
 export declare function makeConcurrentTransExc(objId: ObjId): StorageException;
 export declare function makeUnknownTransactionExc(objId: ObjId): StorageException;
 export declare function makeVersionMismatchExc(objId: ObjId, currentVersion: number): StorageException;

package/build/lib-client/3nstorage/exceptions.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016, 2019 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2019, 2022 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
@@ -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.makeStorageIsClosedExc = exports.makeVersionMismatchExc = exports.makeUnknownTransactionExc = exports.makeConcurrentTransExc = exports.makeObjExistsExc = exports.makeObjNotFoundExc = exports.makeStorageException = void 0;
 function makeStorageException(fields) {
@@ -27,25 +28,33 @@ function makeStorageException(fields) {
     return exc;
 }
 exports.makeStorageException = makeStorageException;
-function makeObjNotFoundExc(objId, version) {
-    return makeStorageException({ objId, version, objNotFound: true });
+function makeObjNotFoundExc(objId, version, remoteStorage) {
+    return makeStorageException({
+        objId, version, objNotFound: true, remoteStorage
+    });
 }
 exports.makeObjNotFoundExc = makeObjNotFoundExc;
-function makeObjExistsExc(objId, version) {
-    return makeStorageException({ objId, version, objExists: true });
+function makeObjExistsExc(objId, version, remoteStorage) {
+    return makeStorageException({
+        objId, version, objExists: true, remoteStorage
+    });
 }
 exports.makeObjExistsExc = makeObjExistsExc;
 function makeConcurrentTransExc(objId) {
-    return makeStorageException({ objId, concurrentTransaction: true });
+    return makeStorageException({
+        objId, concurrentTransaction: true, remoteStorage: true
+    });
 }
 exports.makeConcurrentTransExc = makeConcurrentTransExc;
 function makeUnknownTransactionExc(objId) {
-    return makeStorageException({ objId, unknownTransaction: true });
+    return makeStorageException({
+        objId, unknownTransaction: true, remoteStorage: true
+    });
 }
 exports.makeUnknownTransactionExc = makeUnknownTransactionExc;
 function makeVersionMismatchExc(objId, currentVersion) {
     return makeStorageException({
-        objId, versionMismatch: true, currentVersion
+        objId, versionMismatch: true, currentVersion, remoteStorage: true
     });
 }
 exports.makeVersionMismatchExc = makeVersionMismatchExc;

package/build/lib-client/3nstorage/service.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2022 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
@@ -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.StorageOwner = void 0;
 /**
@@ -142,7 +143,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             };
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId);
+            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
         }
         else {
             throw request_utils_1.makeException(rep, 'Unexpected status');
@@ -177,7 +178,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             return rep.data;
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId);
+            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
         }
         else {
             throw request_utils_1.makeException(rep, 'Unexpected status');
@@ -212,8 +213,11 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
         if (rep.status === api.currentObj.SC.okPut) {
             return rep.data.transactionId;
         }
+        else if (rep.status === api.currentObj.SC.objAlreadyExists) {
+            throw exceptions_1.makeObjExistsExc(objId, undefined, true);
+        }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId);
+            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
         }
         else if (rep.status === api.currentObj.SC.concurrentTransaction) {
             throw exceptions_1.makeConcurrentTransExc(objId);
@@ -251,7 +255,7 @@ class StorageOwner extends user_with_mid_session_1.ServiceUser {
             throw exceptions_1.makeConcurrentTransExc(objId);
         }
         else if (rep.status === api.currentObj.SC.unknownObj) {
-            throw exceptions_1.makeObjNotFoundExc(objId);
+            throw exceptions_1.makeObjNotFoundExc(objId, undefined, true);
         }
         else {
             throw request_utils_1.makeException(rep, 'Unexpected status');

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