ref #24 in progress

do not call handler if cancel call were an internal call
convertigo · Dec 21, 2020 · b7d893e · b7d893e
1 parent 4619293
commit b7d893e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "c8osdkjscore",
-  "version": "3.0.11-beta55",
+  "version": "3.0.11-beta56",
   "description": "convertigo's sdk js core",
   "main": "bundle/index.umd.js",
   "module": "src/index.js",

diff --git a/src/c8o/c8oManagerDatabase.ts b/src/c8o/c8oManagerDatabase.ts
@@ -103,6 +103,7 @@ export class C8oManagerDatabase {
                                     }
                                     rep.finished = false;
                                     rep.canceled = false;
+                                    rep.manual_canceled = false;
                                     rep.database.startAllReplications(rep.parameters, rep.listener, handler1, rep.id, this.mutexCreateReplication);
                                     break;
                                 case "push":
@@ -113,6 +114,7 @@ export class C8oManagerDatabase {
                                     }
                                     rep.finished = false;
                                     rep.canceled = false;
+                                    rep.manual_canceled = false;
                                     rep.database.startPushReplication(rep.parameters, rep.listener, handler2, rep.id, this.mutexCreateReplication);
 
                                     break;
@@ -124,6 +126,7 @@ export class C8oManagerDatabase {
                                     }
                                     rep.canceled = false;
                                     rep.finished = false;
+                                    rep.manual_canceled = false;
                                     rep.database.startPullReplication(rep.parameters, rep.listener, handler3, rep.id, this.mutexCreateReplication);
                                     break;
                             }

diff --git a/src/c8o/fullSyncDatabase.ts b/src/c8o/fullSyncDatabase.ts
@@ -45,6 +45,7 @@ export class C8oFullSyncDatabase {
      */
     private syncFullSyncReplication: FullSyncReplication = new FullSyncReplication();
 
+    private manual_canceled = false;
     private remotePouchHeader;
     private _id;
     private to_cancel = [];
@@ -353,7 +354,10 @@ export class C8oFullSyncDatabase {
                     if(mutex != undefined){
                         mutex.release();
                     }
-                    handler();
+                    if(!this.manual_canceled){
+                        handler();
+                    }
+
                 }
                 else if (continuous) {
                     rep.cancel();
@@ -435,7 +439,9 @@ export class C8oFullSyncDatabase {
                         mutex.release();
                     }
                     this.c8o.log._trace("Replication is finished, modifying its state");
-                    handler();
+                    if(!this.manual_canceled){
+                        handler();
+                    }
                 }
             }).on("error", (err) => {
                 rep.cancel();
@@ -586,7 +592,9 @@ export class C8oFullSyncDatabase {
                     if(mutex != undefined){
                         mutex.release();
                     }
-                    handler();
+                    if(!this.manual_canceled){
+                        handler();
+                    }
                 }
                 if (continuous) {
                     rep.cancel();
@@ -640,7 +648,9 @@ export class C8oFullSyncDatabase {
                         mutex.release();
                     }
                     this.c8o.log._trace("Replication is finished, modifying its state");
-                    handler();
+                    if(!this.manual_canceled){
+                        handler();
+                    }
                 }
             }).on("error", (err) => {
                 rep.cancel();
@@ -717,6 +727,7 @@ export class C8oFullSyncDatabase {
      */
     public cancelPullReplication(): void {
         if (this.pullFullSyncReplication.replication != undefined) {
+            this.manual_canceled = true;
             this.pullFullSyncReplication.replication.cancel();
         }
     }
@@ -726,6 +737,7 @@ export class C8oFullSyncDatabase {
      */
     public cancelPushReplication(): void {
         if (this.pushFullSyncReplication.replication != undefined) {
+            this.manual_canceled = true;
             this.pushFullSyncReplication.replication.cancel();
         }
     }
@@ -735,6 +747,7 @@ export class C8oFullSyncDatabase {
      */
     public cancelSyncReplication(): void {
         if (this.syncFullSyncReplication.replication != undefined) {
+            this.manual_canceled = true;
             this.syncFullSyncReplication.replication.cancel();
         }
     }