core-3nweb-client-lib 0.44.2 → 0.44.4

package/build/api-defs/files.d.ts

@@ -622,6 +622,12 @@ declare namespace web3n.files {
 
 	interface ReadonlyFileSyncAPI {
 
+		/**
+		 * When connection exception is caught, use this to await connection to continue.
+		 * This returns a promise, resolvable when connected to storage server.
+		 */
+		whenConnected(): Promise<void>;
+
 		/**
 		 * Returns synchronization status of this object.
 		 * @param skipServerCheck is optional parameter to skip server check, that may be handy in offline 
@@ -1404,6 +1410,12 @@ declare namespace web3n.files {
 
 	interface ReadonlyFSSyncAPI {
 
+		/**
+		 * When connection exception is caught, use this to await connection to continue.
+		 * This returns a promise, resolvable when connected to storage server.
+		 */
+		whenConnected(): Promise<void>;
+
 		/**
 		 * Returns synchronization status of item at given path.
 		 * @param path
@@ -1481,7 +1493,7 @@ declare namespace web3n.files {
 		 */
 		getRemoteFolderItem(path: string, remoteItemName: string, remoteVersion?: number): Promise<ReadonlyFS>;
 
-		// XXX method to work around demaged files
+		// XXX method to work around damaged files
 		// reloadFromServer(path: string): Promise<SyncStatus>;
 
 	}
@@ -1657,15 +1669,18 @@ declare namespace web3n.files {
 
 		/**
 		 * This method is for resolving conflicts on folders.
-		 * It merges folder changes from remote version.
+		 * It absorbs folder changes done in remote version.
 		 * Returns new local version, if there were remote items to adopt and their were added to local state.
 		 * @param path 
 		 * @param opts
 		 */
-		mergeFolderCurrentAndRemoteVersions(
-			path: string, opts?: OptionsToMergeFolderVersions
+		absorbRemoteFolderChanges(
+			path: string, opts?: OptionsToAdoptRemoteFolderChanges
 		): Promise<number|undefined>;
 
+		// XXX
+		// makeSnapshot(path: string); // -> snapshot points and archives current versions of tree elements
+
 	}
 
 	interface OptionsToAdoptRemoteItem {
@@ -1688,7 +1703,7 @@ declare namespace web3n.files {
 		newItemName?: string;
 	}
 
-	interface OptionsToMergeFolderVersions {
+	interface OptionsToAdoptRemoteFolderChanges {
 		/**
 		 * Folder's local version. If not given, current local version is used.
 		 */

package/build/core/id-manager/key-storage.d.ts

@@ -17,5 +17,6 @@ export declare class IdKeysStorage {
     };
     getSavedKey(): Promise<JsonKey | undefined>;
     private setStorageFS;
+    private ensureDataFolderIsUploaded;
 }
 export {};

package/build/core/id-manager/key-storage.js

@@ -72,9 +72,6 @@ class IdKeysStorage {
         this.fs = fs;
         if (keysToSave) {
             await this.fs.writeJSONFile(LOGIN_KEY_FILE_NAME, keysToSave);
-            // XXX must add work with not-online condition
-            await this.fs.v.sync.upload(LOGIN_KEY_FILE_NAME);
-            await this.fs.v.sync.upload('');
         }
         else {
             try {
@@ -84,6 +81,24 @@ class IdKeysStorage {
                 throw (0, error_1.errWithCause)(exc, `Fail expection read of login MailerId keys from the storage`);
             }
         }
+        this.ensureDataFolderIsUploaded();
+    }
+    async ensureDataFolderIsUploaded() {
+        try {
+            const fileStatus = await this.fs.v.sync.status(LOGIN_KEY_FILE_NAME, false);
+            if (fileStatus.state === 'unsynced') {
+                await this.fs.v.sync.upload(LOGIN_KEY_FILE_NAME);
+            }
+            const folderStatus = await this.fs.v.sync.status('', true);
+            if (folderStatus.state === 'unsynced') {
+                await this.fs.v.sync.upload('');
+            }
+        }
+        catch (exc) {
+            if (exc.type === 'connect') {
+                return this.fs.v.sync.whenConnected().then(() => this.ensureDataFolderIsUploaded());
+            }
+        }
     }
 }
 exports.IdKeysStorage = IdKeysStorage;

package/build/core/storage/synced/remote-events.d.ts

@@ -19,10 +19,13 @@ export declare class RemoteEvents {
     private readonly connectionEvents;
     readonly connectionEvent$: Observable<StorageConnectionStatus>;
     private readonly wsProc;
+    private deferredConnection;
     constructor(remoteStorage: StorageOwner, files: ObjFiles, broadcastNodeEvent: Storage['broadcastNodeEvent'], logError: LogError);
     private makeProc;
     startListening(): void;
     close(): Promise<void>;
+    whenConnected(): Promise<void>;
+    private signalConnected;
     private absorbObjChange;
     private absorbObjRemoval;
     private absorbObjVersionArchival;

package/build/core/storage/synced/remote-events.js

@@ -21,6 +21,7 @@ const rxjs_1 = require("rxjs");
 const owner_1 = require("../../../lib-common/service-api/3nstorage/owner");
 const operators_1 = require("rxjs/operators");
 const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
+const deferred_1 = require("../../../lib-common/processes/deferred");
 function toStorageConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'storage',
@@ -40,13 +41,25 @@ class RemoteEvents {
         this.logError = logError;
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
+        this.deferredConnection = (0, deferred_1.defer)();
         this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
         Object.seal(this);
     }
     makeProc() {
         return (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
+            this.signalConnected();
             heartbeat.subscribe({
-                next: ev => this.connectionEvents.next(toStorageConnectionStatus(ev))
+                next: ev => {
+                    this.connectionEvents.next(toStorageConnectionStatus(ev));
+                    if (ev.type === 'heartbeat') {
+                        this.signalConnected();
+                    }
+                    else if ((ev.type === 'heartbeat-skip') || (ev.type === 'disconnected')) {
+                        if (!this.deferredConnection) {
+                            this.deferredConnection = (0, deferred_1.defer)();
+                        }
+                    }
+                }
             });
             return [
                 this.absorbObjChange(client),
@@ -65,6 +78,16 @@ class RemoteEvents {
         this.connectionEvents.complete();
         this.wsProc.close();
     }
+    async whenConnected() {
+        var _a;
+        return (_a = this.deferredConnection) === null || _a === void 0 ? void 0 : _a.promise;
+    }
+    signalConnected() {
+        if (this.deferredConnection) {
+            this.deferredConnection.resolve();
+            this.deferredConnection = undefined;
+        }
+    }
     absorbObjChange(client) {
         return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))
             .pipe((0, operators_1.mergeMap)(async ({ newVer: newRemoteVersion, objId }) => {

package/build/core/storage/synced/storage.d.ts

@@ -62,5 +62,6 @@ export declare class SyncedStore implements ISyncedStorage {
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
     get connectionEvent$(): Observable<import("./remote-events").StorageConnectionStatus>;
+    whenConnected(): Promise<void>;
 }
 export {};

package/build/core/storage/synced/storage.js

@@ -194,7 +194,7 @@ class SyncedStore {
         return obj.getObjSrcFromLocalAndSyncedBranch(version);
     }
     async getObjSrcOfRemoteVersion(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.getObjSrcFromRemoteAndSyncedBranch(version);
     }
     async saveObj(objId, version, encSub) {
@@ -225,7 +225,7 @@ class SyncedStore {
         await obj.removeCurrentVersion();
     }
     async getNumOfBytesNeedingDownload(objId, version) {
-        const obj = await this.getObjOrThrow(objId);
+        const obj = await this.getObjOrThrow(objId, true);
         return obj.getNumOfBytesNeedingDownload(version);
     }
     async close() {
@@ -248,6 +248,9 @@ class SyncedStore {
     get connectionEvent$() {
         return this.remoteEvents.connectionEvent$;
     }
+    whenConnected() {
+        return this.remoteEvents.whenConnected();
+    }
 }
 exports.SyncedStore = SyncedStore;
 Object.freeze(SyncedStore.prototype);

package/build/core-ipc/file.d.ts

@@ -151,6 +151,10 @@ export declare namespace vGetByteSink {
     function wrapService(fn: WritableFileVersionedAPI['getByteSink'], expServices: CoreSideServices): ExposedFn;
     function makeCaller(caller: Caller, objPath: string[]): WritableFileVersionedAPI['getByteSink'];
 }
+export declare namespace vsWhenConnected {
+    function wrapService(fn: ReadonlyFileSyncAPI['whenConnected']): ExposedFn;
+    function makeCaller(caller: Caller, objPath: string[]): ReadonlyFileSyncAPI['whenConnected'];
+}
 export declare namespace vsStartDownload {
     const replyType: ProtoType<{
         startedDownload?: {

package/build/core-ipc/file.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vsDiffCurrentAndRemoteVersions = exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vsStartDownload = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
+exports.vsDiffCurrentAndRemoteVersions = exports.vListVersions = exports.vsUpload = exports.vsStartUpload = exports.vsStartDownload = exports.vsWhenConnected = exports.vGetByteSink = exports.updateXAttrs = exports.vGetByteSource = exports.vReadJSON = exports.vReadTxt = exports.vReadBytes = exports.vListXAttrs = exports.vGetXAttr = exports.vStat = exports.readBytes = exports.fileMsgType = void 0;
 exports.makeFileCaller = makeFileCaller;
 exports.exposeFileService = exposeFileService;
 exports.packStats = packStats;
@@ -100,6 +100,7 @@ function makeFileCaller(caller, fileMsg) {
         if (fileMsg.isSynced) {
             const vsPath = (0, protobuf_msg_1.methodPathFor)(vPath, 'sync');
             file.v.sync = {
+                whenConnected: vsWhenConnected.makeCaller(caller, vsPath),
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
                 startDownload: vsStartDownload.makeCaller(caller, vsPath),
@@ -156,6 +157,7 @@ function exposeFileService(file, expServices) {
         }
         if (file.v.sync) {
             implExp.v.sync = {
+                whenConnected: vsWhenConnected.wrapService(file.v.sync.whenConnected),
                 status: vsStatus.wrapService(file.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(file.v.sync.isRemoteVersionOnDisk),
                 startDownload: vsStartDownload.wrapService(file.v.sync.startDownload),
@@ -1084,6 +1086,25 @@ var vGetByteSink;
     vGetByteSink.makeCaller = makeCaller;
 })(vGetByteSink || (exports.vGetByteSink = vGetByteSink = {}));
 Object.freeze(vGetByteSink);
+var vsWhenConnected;
+(function (vsWhenConnected) {
+    function wrapService(fn) {
+        return buf => {
+            const promise = fn();
+            return { promise };
+        };
+    }
+    vsWhenConnected.wrapService = wrapService;
+    function makeCaller(caller, objPath) {
+        const path = (0, protobuf_msg_1.methodPathFor)(objPath, 'whenConnected');
+        return () => caller
+            .startPromiseCall(path, undefined)
+            .then(noop);
+    }
+    vsWhenConnected.makeCaller = makeCaller;
+})(vsWhenConnected || (exports.vsWhenConnected = vsWhenConnected = {}));
+Object.freeze(vsWhenConnected);
+function noop() { }
 var vsStatus;
 (function (vsStatus) {
     function wrapService(fn) {

package/build/core-ipc/fs.js

@@ -101,6 +101,7 @@ function makeFSCaller(caller, fsMsg) {
         if (fsMsg.isSynced) {
             const vsPath = (0, protobuf_msg_1.methodPathFor)(vPath, 'sync');
             fs.v.sync = {
+                whenConnected: file.vsWhenConnected.makeCaller(caller, vsPath),
                 status: vsStatus.makeCaller(caller, vsPath),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.makeCaller(caller, vsPath),
                 startDownload: vsDownload.makeCaller(caller, vsPath),
@@ -116,7 +117,7 @@ function makeFSCaller(caller, fsMsg) {
                 fs.v.sync.startUpload = vsStartUpload.makeCaller(caller, vsPath);
                 fs.v.sync.upload = vsUpload.makeCaller(caller, vsPath);
                 fs.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.makeCaller(caller, vsPath);
-                fs.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.makeCaller(caller, vsPath);
+                fs.v.sync.absorbRemoteFolderChanges = vsAbsorbRemoteFolderChanges.makeCaller(caller, vsPath);
             }
         }
     }
@@ -186,6 +187,7 @@ function exposeFSService(fs, expServices) {
         }
         if (fs.v.sync) {
             implExp.v.sync = {
+                whenConnected: file.vsWhenConnected.wrapService(fs.v.sync.whenConnected),
                 status: vsStatus.wrapService(fs.v.sync.status),
                 isRemoteVersionOnDisk: vsIsRemoteVersionOnDisk.wrapService(fs.v.sync.isRemoteVersionOnDisk),
                 startDownload: vsDownload.wrapService(fs.v.sync.startDownload),
@@ -201,7 +203,7 @@ function exposeFSService(fs, expServices) {
                 implExp.v.sync.startUpload = vsStartUpload.wrapService(fs.v.sync.startUpload);
                 implExp.v.sync.upload = vsUpload.wrapService(fs.v.sync.upload);
                 implExp.v.sync.adoptRemoteFolderItem = vsAdoptRemoteFolderItem.wrapService(fs.v.sync.adoptRemoteFolderItem);
-                implExp.v.sync.mergeFolderCurrentAndRemoteVersions = vsMergeFolderCurrentAndRemoteVersions.wrapService(fs.v.sync.mergeFolderCurrentAndRemoteVersions);
+                implExp.v.sync.absorbRemoteFolderChanges = vsAbsorbRemoteFolderChanges.wrapService(fs.v.sync.absorbRemoteFolderChanges);
             }
         }
     }
@@ -1977,9 +1979,9 @@ var vsAdoptRemoteFolderItem;
     vsAdoptRemoteFolderItem.makeCaller = makeCaller;
 })(vsAdoptRemoteFolderItem || (vsAdoptRemoteFolderItem = {}));
 Object.freeze(vsAdoptRemoteFolderItem);
-var vsMergeFolderCurrentAndRemoteVersions;
-(function (vsMergeFolderCurrentAndRemoteVersions) {
-    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsRequestBody);
+var vsAbsorbRemoteFolderChanges;
+(function (vsAbsorbRemoteFolderChanges) {
+    const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AbsorbRemoteFolderChangesRequestBody);
     function optionsFromMsg(msg) {
         if (!msg) {
             return;
@@ -2000,7 +2002,7 @@ var vsMergeFolderCurrentAndRemoteVersions;
             postfixForNameOverlaps: (0, protobuf_msg_1.toOptVal)(opts.postfixForNameOverlaps),
         };
     }
-    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.MergeFolderCurrentAndRemoteVersionsReplyBody);
+    const replyType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AbsorbRemoteFolderChangesReplyBody);
     function wrapService(fn) {
         return buf => {
             const { path, opts } = requestType.unpack(buf);
@@ -2009,16 +2011,16 @@ var vsMergeFolderCurrentAndRemoteVersions;
             return { promise };
         };
     }
-    vsMergeFolderCurrentAndRemoteVersions.wrapService = wrapService;
+    vsAbsorbRemoteFolderChanges.wrapService = wrapService;
     function makeCaller(caller, objPath) {
-        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'mergeFolderCurrentAndRemoteVersions');
+        const ipcPath = (0, protobuf_msg_1.methodPathFor)(objPath, 'absorbRemoteFolderChanges');
         return (path, opts) => caller
             .startPromiseCall(ipcPath, requestType.pack({ path, opts: optionsToMsg(opts) }))
             .then(buf => (0, protobuf_msg_1.valOfOptInt)(replyType.unpack(buf).newVersion));
     }
-    vsMergeFolderCurrentAndRemoteVersions.makeCaller = makeCaller;
-})(vsMergeFolderCurrentAndRemoteVersions || (vsMergeFolderCurrentAndRemoteVersions = {}));
-Object.freeze(vsMergeFolderCurrentAndRemoteVersions);
+    vsAbsorbRemoteFolderChanges.makeCaller = makeCaller;
+})(vsAbsorbRemoteFolderChanges || (vsAbsorbRemoteFolderChanges = {}));
+Object.freeze(vsAbsorbRemoteFolderChanges);
 var vsAdoptRemote;
 (function (vsAdoptRemote) {
     const requestType = protobuf_type_1.ProtoType.for(fs_proto_1.fs.AdoptRemoteRequestBody);