startObserving: serialize database operations, and ignore current tra…

…nsaction context when setting heartbeat, poll timeouts
dexie · Oct 7, 2020 · 5237d33 · 5237d33
1 parent 0035e27
commit 5237d33
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/addons/Dexie.Observable/src/Dexie.Observable.js b/addons/Dexie.Observable/src/Dexie.Observable.js
@@ -243,7 +243,7 @@ function Observable(db) {
             }
             // Add new sync node or if this is a reopening of the database after a close() call, update it.
             return db.transaction('rw', '_syncNodes', () => {
-                return db._syncNodes
+                var currentMaster = db._syncNodes
                     .where('isMaster').equals(1)
                     .first(currentMaster => {
                         if (!currentMaster) {
@@ -256,18 +256,23 @@ function Observable(db) {
                             currentMaster.isMaster = 0;
                             return db._syncNodes.put(currentMaster);
                         }
-                    }).then(()=>{
-                        // Add our node to DB and start subscribing to events
-                        return db._syncNodes.add(mySyncNode.node).then(function() {
-                            Observable.on('latestRevisionIncremented', onLatestRevisionIncremented); // Wakeup when a new revision is available.
-                            Observable.on('beforeunload', onBeforeUnload);
-                            Observable.on('suicideNurseCall', onSuicide);
-                            Observable.on('intercomm', onIntercomm);
-                            // Start polling for changes and do cleanups:
-                            pollHandle = setTimeout(poll, LOCAL_POLL);
-                            // Start heartbeat
-                            heartbeatHandle = setTimeout(heartbeat, HEARTBEAT_INTERVAL);
-                        });
+                    });
+                Promise.all([currentMaster]);
+
+                // Add our node to DB and start subscribing to events
+                var currentNode = db._syncNodes.add(mySyncNode.node).then(function() {
+                    Observable.on('latestRevisionIncremented', onLatestRevisionIncremented); // Wakeup when a new revision is available.
+                    Observable.on('beforeunload', onBeforeUnload);
+                    Observable.on('suicideNurseCall', onSuicide);
+                    Observable.on('intercomm', onIntercomm);
+                });
+                Promise.all([currentNode]);
+
+                return Dexie.ignoreTransaction(function() {
+                    // Start polling for changes and do cleanups:
+                    pollHandle = setTimeout(poll, LOCAL_POLL);
+                    // Start heartbeat
+                    heartbeatHandle = setTimeout(heartbeat, HEARTBEAT_INTERVAL);
                 });
             }).then(function () {
                 cleanup();