@vrtmrz/livesync-commonlib 0.1.17 → 0.1.19-rc.0

package/dist/services/base/ReplicationService.js

@@ -186,8 +186,7 @@ class ReplicationService extends ServiceBase {
     }
     return activeReplicator;
   }
-  async replicateAllToRemote(showingNotice = false) {
-    if (!this.appLifecycleService.isReady()) return false;
+  async performReplicateAllToRemote(showingNotice) {
     if (!await this.onBeforeReplicate(showingNotice)) {
       this._log(this.context.translate("Replicator.Message.SomeModuleFailed"), LOG_LEVEL_NOTICE);
       return false;
@@ -204,8 +203,7 @@ class ReplicationService extends ServiceBase {
       return await activeReplicator.replicateAllToServer(currentSettings, showingNotice);
     return !checkResult;
   }
-  async replicateAllFromRemote(showingNotice = false) {
-    if (!this.appLifecycleService.isReady()) return false;
+  async performReplicateAllFromRemote(showingNotice) {
     const activeReplicator = this.getActiveReplicatorFor("fetching data from remote");
     if (!activeReplicator) {
       return false;
@@ -218,6 +216,40 @@ class ReplicationService extends ServiceBase {
       return await activeReplicator.replicateAllFromServer(currentSettings, showingNotice);
     return !checkResult;
   }
+  async replicateAllToRemote(showingNotice = false) {
+    if (!this.appLifecycleService.isReady()) return false;
+    return await this.performReplicateAllToRemote(showingNotice);
+  }
+  async replicateAllFromRemote(showingNotice = false) {
+    if (!this.appLifecycleService.isReady()) return false;
+    return await this.performReplicateAllFromRemote(showingNotice);
+  }
+  /**
+   * Perform a full upload owned by an active rebuild while the physical database is ready.
+   *
+   * This concrete maintenance entry point is intentionally absent from `IReplicationService`;
+   * it is not a general application-readiness bypass.
+   */
+  async replicateAllToRemoteForRebuild(showingNotice = false) {
+    if (!this.databaseService.isDatabaseReady()) {
+      this._log("The selected local database is not ready for the rebuild upload.", LOG_LEVEL_NOTICE);
+      return false;
+    }
+    return await this.performReplicateAllToRemote(showingNotice);
+  }
+  /**
+   * Perform a full download owned by an active rebuild while the physical database is ready.
+   *
+   * This concrete maintenance entry point is intentionally absent from `IReplicationService`;
+   * it is not a general application-readiness bypass.
+   */
+  async replicateAllFromRemoteForRebuild(showingNotice = false) {
+    if (!this.databaseService.isDatabaseReady()) {
+      this._log("The selected local database is not ready for the rebuild download.", LOG_LEVEL_NOTICE);
+      return false;
+    }
+    return await this.performReplicateAllFromRemote(showingNotice);
+  }
   _getReplicatorAndPerform(action, perform) {
     const activeReplicator = this.getActiveReplicatorFor(action);
     if (!activeReplicator) {

package/dist/services/base/ReplicatorService.d.ts

@@ -39,6 +39,7 @@ export declare abstract class ReplicatorService<T extends ServiceContext = Servi
     private suspendReplication;
     private reinitialiseReplicator;
     private disposeReplicator;
+    private discardFailedReplicator;
     private _initialiseReplicator;
     /**
      * Close the active replication if any.

package/dist/services/base/ReplicatorService.js

@@ -15,7 +15,10 @@ class ReplicatorService extends ServiceBase {
     super(context);
     this.dependencies = dependencies;
     this.appLifecycleService = dependencies.appLifecycleService;
-    this._unresolvedErrorManager = new UnresolvedErrorManager(dependencies.appLifecycleService, this.context.events);
+    this._unresolvedErrorManager = new UnresolvedErrorManager(
+      dependencies.appLifecycleService,
+      this.context.events
+    );
     this.settingService = dependencies.settingService;
     this.databaseEventService = dependencies.databaseEventService;
     if (dependencies.registerLifecycleHandlers ?? true) {
@@ -83,6 +86,18 @@ class ReplicatorService extends ServiceBase {
     this._replicatorType = void 0;
     return true;
   }
+  async discardFailedReplicator(replicator) {
+    if (this._activeReplicator === replicator) {
+      this._activeReplicator = void 0;
+      this._replicatorType = void 0;
+    }
+    try {
+      await Promise.resolve(replicator.closeReplication());
+    } catch (error) {
+      this._log("Failed to close a replicator after its initialisation failed.", LOG_LEVEL_VERBOSE);
+      this._log(error, LOG_LEVEL_VERBOSE);
+    }
+  }
   async _initialiseReplicator() {
     const message = this.context.translate("Replicator.Message.InitialiseFatalError");
     const setting = this.settingService.currentSettings();
@@ -123,19 +138,23 @@ class ReplicatorService extends ServiceBase {
       this._replicatorType = replicatorType;
       this.replicationStatics.value = { ...DEFAULT_REPLICATION_STATICS };
       await yieldMicrotask();
-      if (!await newReplicator.initializeDatabaseForReplication()) {
-        this._log("Failed to initialise the replicator's local node information.");
-        this._activeReplicator = void 0;
-        this._replicatorType = void 0;
+      try {
+        if (!await newReplicator.initializeDatabaseForReplication()) {
+          this._log("Failed to initialise the replicator's local node information.");
+          await this.discardFailedReplicator(newReplicator);
+          this._unresolvedErrorManager.showError(message, LOG_LEVEL_NOTICE);
+          return false;
+        }
+        if (!await this.onReplicatorInitialised()) {
+          this._log("Failed to initialise the replicator, onReplicatorInitialised reported some problems.");
+          await this.discardFailedReplicator(newReplicator);
+          this._unresolvedErrorManager.showError(message, LOG_LEVEL_NOTICE);
+          return false;
+        }
+      } catch (error) {
+        await this.discardFailedReplicator(newReplicator);
         this._unresolvedErrorManager.showError(message, LOG_LEVEL_NOTICE);
-        return false;
-      }
-      if (!await this.onReplicatorInitialised()) {
-        this._log("Failed to initialise the replicator, onReplicatorInitialised reported some problems.");
-        this._activeReplicator = void 0;
-        this._replicatorType = void 0;
-        this._unresolvedErrorManager.showError(message, LOG_LEVEL_NOTICE);
-        return false;
+        throw error;
       }
       const remoteTypeDisplay = replicatorType === RemoteTypes.REMOTE_COUCHDB ? "CouchDB" : replicatorType;
       this._log(`Replicator (${remoteTypeDisplay}) initialised and activated`, LOG_LEVEL_VERBOSE);