core-3nweb-client-lib 0.43.4 → 0.43.6

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

@@ -603,16 +603,19 @@ declare namespace web3n.files {
 
 		/**
 		 * Adopts remote version.
-		 * @param opts options let one to pass exact remote version, to trigger download.
+		 * In conflicting state remote version must be present in options.
+		 * @param opts options let one to pass exact remote version.
 		 */
 		adoptRemote(opts?: OptionsToAdopteRemote): Promise<void>;
 
 	}
 
 	interface OptionsToAdopteRemote {
-		dropLocalVer?: boolean;
+		/**
+		 * Identifies remote version that should be adopted.
+		 * In conflicting state this must be present.
+		 */
 		remoteVersion?: number;
-		download?: boolean;
 	}
 
 	interface WritableFileSyncAPI extends ReadonlyFileSyncAPI {
@@ -1228,9 +1231,10 @@ declare namespace web3n.files {
 		download(path: string, version: number): Promise<void>;
 
 		/**
-		 * Adopts remote version of fs object at given path
+		 * Adopts remote version of fs object at given path.
+		 * In conflicting state remote version must be present in options.
 		 * @param path 
-		 * @param opts options let one to pass exact remote version, to trigger download.
+		 * @param opts options let one to pass exact remote version.
 		 */
 		adoptRemote(path: string, opts?: OptionsToAdopteRemote): Promise<void>;
 

package/build/core/asmail/inbox/inbox-events.d.ts

@@ -29,18 +29,13 @@ export declare class InboxEvents {
     private readonly newMsg$;
     private readonly connectionEvents;
     readonly connectionEvent$: Observable<InboxConnectionStatus>;
-    private listeningProc;
-    private networkActive;
+    private readonly wsProc;
     private disconnectedAt;
     constructor(msgReceiver: MailRecipient, getMsg: (msgId: string) => Promise<IncomingMessage>, listNewMsgs: (fromTS: number) => Promise<MsgInfo[]>, rmMsg: (msgId: string) => Promise<void>, logError: LogError);
-    private startListening;
-    private sleepAndRestart;
+    private makeProc;
     private getMessage;
     subscribe<T>(event: InboxEventType, observer: Observer<T>): () => void;
     close(): void;
-    get isListening(): boolean;
-    private shouldRestartAfterErr;
-    private stopListening;
     suspendNetworkActivity(): void;
     resumeNetworkActivity(): void;
     private listMsgsFromDisconnectedPeriod;

package/build/core/asmail/inbox/inbox-events.js

@@ -22,7 +22,6 @@ const retrieval_1 = require("../../../lib-common/service-api/asmail/retrieval");
 const operators_1 = require("rxjs/operators");
 const utils_for_observables_1 = require("../../../lib-common/utils-for-observables");
 const ws_ipc_1 = require("../../../lib-common/ipc/ws-ipc");
-const sleep_1 = require("../../../lib-common/processes/sleep");
 function toInboxConnectionStatus(status, params) {
     return (0, ws_ipc_1.addToStatus)(status, {
         service: 'inbox',
@@ -52,54 +51,30 @@ class InboxEvents {
         this.newMsg$ = this.newMsgs.asObservable().pipe((0, operators_1.share)());
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
-        this.listeningProc = undefined;
-        this.networkActive = true;
         this.disconnectedAt = undefined;
-        this.startListening();
+        this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
+        this.wsProc.startListening();
         Object.seal(this);
     }
-    startListening() {
-        if (this.listeningProc || !this.networkActive) {
-            return;
-        }
-        const clearListeningProc = () => {
-            if (this.listeningProc === sub) {
-                this.listeningProc = undefined;
-            }
-            if (!this.disconnectedAt) {
-                this.disconnectedAt = Date.now();
-            }
-        };
-        const sub = (0, rxjs_1.from)(this.msgReceiver.openEventSource().then(({ client, heartbeat }) => {
+    makeProc() {
+        const proc$ = (0, rxjs_1.from)(this.msgReceiver.openEventSource().then(({ client, heartbeat }) => {
             const channel = retrieval_1.msgRecievedCompletely.EVENT_NAME;
             heartbeat.subscribe({
                 next: ev => this.connectionEvents.next(toInboxConnectionStatus(ev))
             });
             return new rxjs_1.Observable(obs => client.subscribe(channel, obs));
         }))
-            .pipe((0, operators_1.mergeMap)(events => events), (0, operators_1.mergeMap)(async (ev) => this.getMessage(ev.msgId), 5))
-            .subscribe({
-            next: msg => {
-                if (msg) {
-                    this.newMsgs.next(msg);
-                }
-            },
-            complete: () => {
-                clearListeningProc();
-            },
-            error: async (exc) => {
-                clearListeningProc();
-                if (this.shouldRestartAfterErr(exc)) {
-                    this.sleepAndRestart();
+            .pipe((0, operators_1.mergeMap)(events => events), (0, operators_1.mergeMap)(async (ev) => this.getMessage(ev.msgId), 5), (0, operators_1.filter)(msg => !!msg), (0, operators_1.tap)({
+            next: msg => this.newMsgs.next(msg),
+            error: () => {
+                if (!this.disconnectedAt) {
+                    this.disconnectedAt = Date.now();
                 }
             }
-        });
-        this.listeningProc = sub;
+        }));
+        // list messages as a side effect of starting, or at point of starting.
         this.listMsgsFromDisconnectedPeriod();
-    }
-    async sleepAndRestart() {
-        await (0, sleep_1.sleep)(SERVER_EVENTS_RESTART_WAIT_SECS);
-        this.startListening();
+        return proc$;
     }
     async getMessage(msgId) {
         try {
@@ -123,45 +98,26 @@ class InboxEvents {
     }
     close() {
         this.newMsgs.complete();
+        this.wsProc.close();
     }
-    get isListening() {
-        return !!this.listeningProc;
-    }
-    shouldRestartAfterErr(exc) {
-        if (!exc.runtimeException) {
-            return false;
-        }
-        if (exc.type === 'connect') {
-            return true;
-        }
-        else if (exc.type === 'http-request') {
-            return false;
-        }
-        else if (exc.type === 'websocket') {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    stopListening() {
-        var _a;
-        (_a = this.listeningProc) === null || _a === void 0 ? void 0 : _a.unsubscribe();
-        this.listeningProc = undefined;
-    }
+    // XXX we should go along:
+    //  - last working connection and ping
+    //  - may be have an expect suspending of network, with less aggressive attempts to reconnect
+    //  - instead of talking about presence of network, expose methods to nudge restarting behaviour, as outside
+    //    may have better clues and able to command behaviour switch
     suspendNetworkActivity() {
-        this.networkActive = false;
-        if (this.isListening) {
-            if (!this.disconnectedAt) {
-                this.disconnectedAt = Date.now();
-            }
-            this.stopListening();
-        }
+        // XXX code below shutdown for good, but restart sometimes has been failing.
+        // 
+        // if (this.isListening) {
+        // 	if (!this.disconnectedAt) {
+        // 		this.disconnectedAt = Date.now();
+        // 	}
+        // 	this.stopListening();
+        // }
     }
     resumeNetworkActivity() {
-        this.networkActive = true;
-        if (!this.isListening) {
-            this.startListening();
+        if (!this.wsProc.isListening) {
+            this.wsProc.startListening();
         }
     }
     async listMsgsFromDisconnectedPeriod() {
@@ -178,9 +134,6 @@ class InboxEvents {
                     this.newMsgs.next(msg);
                     this.disconnectedAt = msg.deliveryTS;
                 }
-                else if (!this.networkActive) {
-                    return;
-                }
             }
             this.disconnectedAt = undefined;
         }

package/build/core/storage/synced/obj-status.d.ts

@@ -124,7 +124,7 @@ export declare class ObjStatus implements SyncedObjStatus, UploadStatusRecorder
     syncStatus(): SyncStatus;
     neverUploaded(): boolean;
     versionBeforeUnsyncedRemoval(): number | undefined;
-    adoptRemoteVersion(version?: number, dropLocalVer?: boolean): Promise<void>;
+    adoptRemoteVersion(version?: number): Promise<void>;
     isAmongRemote(version: number): boolean;
 }
 export declare function readAndCheckStatus(objFolder: string, objId: ObjId): Promise<ObjStatusInfo>;

package/build/core/storage/synced/obj-status.js

@@ -510,14 +510,14 @@ class ObjStatus {
             return this.status.upload.localVersion;
         }
     }
-    async adoptRemoteVersion(version, dropLocalVer = false) {
+    async adoptRemoteVersion(version) {
         var _a;
         const { local, remote } = this.status;
         if (this.stateIndicator !== 'behind') {
             if (this.stateIndicator === 'synced') {
                 return;
             }
-            else if (!dropLocalVer) {
+            else if ((this.stateIndicator === 'conflicting') && !version) {
                 throw (0, exceptions_1.makeFSSyncException)('', {
                     localVersion: local === null || local === void 0 ? void 0 : local.current,
                     remoteVersion: remote.current,

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

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

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

@@ -33,6 +33,7 @@ const SERVER_EVENTS_RESTART_WAIT_SECS = 5;
  * events. Someone down the stream can react to these changes from remote.
  */
 class RemoteEvents {
+    // private listeningProc: Subscription|undefined = undefined;
     constructor(remoteStorage, files, broadcastNodeEvent, logError) {
         this.remoteStorage = remoteStorage;
         this.files = files;
@@ -40,11 +41,11 @@ class RemoteEvents {
         this.logError = logError;
         this.connectionEvents = new rxjs_1.Subject();
         this.connectionEvent$ = this.connectionEvents.asObservable().pipe((0, operators_1.share)());
-        this.absorbingRemoteEventsProc = undefined;
+        this.wsProc = new ws_ipc_1.WebSocketListening(SERVER_EVENTS_RESTART_WAIT_SECS, this.makeProc.bind(this));
         Object.seal(this);
     }
-    startAbsorbingRemoteEvents() {
-        this.absorbingRemoteEventsProc = (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
+    makeProc() {
+        return (0, rxjs_1.from)(this.remoteStorage.openEventSource().then(({ client, heartbeat }) => {
             heartbeat.subscribe({
                 next: ev => this.connectionEvents.next(toStorageConnectionStatus(ev))
             });
@@ -56,23 +57,14 @@ class RemoteEvents {
                 // this.absorbArchVersionRemoval(client)
             ];
         }))
-            .pipe((0, operators_1.mergeMap)(event$ => event$), (0, operators_1.mergeMap)(event$ => event$))
-            .subscribe({
-            next: noop,
-            error: async (err) => {
-                await this.logError(err);
-                this.absorbingRemoteEventsProc = undefined;
-            },
-            complete: () => {
-                this.absorbingRemoteEventsProc = undefined;
-            }
-        });
+            .pipe((0, operators_1.mergeMap)(event$ => event$), (0, operators_1.mergeMap)(event$ => event$));
+    }
+    startListening() {
+        this.wsProc.startListening();
     }
     async close() {
-        if (this.absorbingRemoteEventsProc) {
-            this.absorbingRemoteEventsProc.unsubscribe();
-            this.absorbingRemoteEventsProc = undefined;
-        }
+        this.connectionEvents.complete();
+        this.wsProc.close();
     }
     absorbObjChange(client) {
         return (new rxjs_1.Observable(obs => client.subscribe(owner_1.events.objChanged.EVENT_NAME, obs)))
@@ -136,19 +128,22 @@ class RemoteEvents {
             });
         }, 1));
     }
+    // XXX we should go along:
+    //  - last working connection and ping
+    //  - may be have an expect suspending of network, with less aggressive attempts to reconnect
+    //  - instead of talking about presence of network, expose methods to nudge restarting behaviour, as outside
+    //    may have better clues and able to command behaviour switch
     suspendNetworkActivity() {
         // XXX
-        // - set haveNetwork flag to false
-        // - press breaks on events from server
+        // - ...
     }
     resumeNetworkActivity() {
-        // XXX
-        // - set haveNetwork flag to true
-        // - restart watching events from server
+        if (!this.wsProc.isListening) {
+            this.wsProc.startListening();
+        }
     }
 }
 exports.RemoteEvents = RemoteEvents;
 Object.freeze(RemoteEvents.prototype);
 Object.freeze(RemoteEvents);
-function noop() { }
 Object.freeze(exports);

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

@@ -51,7 +51,7 @@ class SyncedStore {
         return {
             syncedStore: (0, common_1.wrapSyncStorageImplementation)(s),
             startObjProcs: () => {
-                s.remoteEvents.startAbsorbingRemoteEvents();
+                s.remoteEvents.startListening();
             }
         };
     }
@@ -64,7 +64,7 @@ class SyncedStore {
             setupRemoteAndStartObjProcs: getSigner => {
                 setMid(getSigner);
                 s.uploader.start();
-                s.remoteEvents.startAbsorbingRemoteEvents();
+                s.remoteEvents.startListening();
             }
         };
     }
@@ -92,11 +92,7 @@ class SyncedStore {
     async adoptRemote(objId, opts) {
         const obj = await this.getObjOrThrow(objId);
         const objStatus = obj.statusObj();
-        await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion, opts === null || opts === void 0 ? void 0 : opts.dropLocalVer);
-        if (opts && opts.download) {
-            // XXX this needs implementation
-            throw new Error('SyncedStore.adoptRemote() with download option needs implementation, probably using SyncedStore.download().');
-        }
+        await objStatus.adoptRemoteVersion(opts === null || opts === void 0 ? void 0 : opts.remoteVersion);
         this.files.scheduleGC(obj);
         return objStatus.syncStatus().synced.latest;
     }

package/build/core-ipc/file.js

@@ -1199,7 +1199,7 @@ function remoteAdoptionOptsToMsg(opts) {
         return;
     }
     return {
-        dropLocalVer: (0, protobuf_msg_1.toOptVal)(opts.dropLocalVer),
+        // dropLocalVer: toOptVal(opts.dropLocalVer),
         remoteVersion: (0, protobuf_msg_1.toOptVal)(opts.remoteVersion)
     };
 }
@@ -1208,7 +1208,7 @@ function remoteAdoptionOptsFromMsg(msg) {
         return;
     }
     return {
-        dropLocalVer: (0, protobuf_msg_1.valOfOpt)(msg.dropLocalVer),
+        // dropLocalVer: valOfOpt(msg.dropLocalVer),
         remoteVersion: (0, protobuf_msg_1.valOfOptInt)(msg.remoteVersion)
     };
 }