dexie-cloud-addon 4.0.0-beta.16 → 4.0.0-beta.17

package/dist/module-es5/dexie-cloud-addon.js

@@ -101,7 +101,7 @@ function __spreadArray$1(to, from, pack) {
  *
  * ==========================================================================
  *
- * Version 4.0.0-beta.16, Fri Apr 01 2022
+ * Version 4.0.0-beta.17, Fri Apr 08 2022
  *
  * https://dexie.org
  *
@@ -5296,160 +5296,16 @@ function overrideParseStoresSpec(origFunc, dexie) {
         return rv;
     };
 }
-var SECONDS = 1000;
-var MINUTES = 60 * SECONDS;
-var myId = randomString(16);
-var GUARDED_JOB_HEARTBEAT = 1 * SECONDS;
-var GUARDED_JOB_TIMEOUT = 1 * MINUTES;
-function performGuardedJob(db, jobName, jobsTableName, job, _e) {
-    var _f = _e === void 0 ? {} : _e, awaitRemoteJob = _f.awaitRemoteJob;
-    return __awaiter$1(this, void 0, void 0, function () {
-        function aquireLock() {
-            return __awaiter$1(this, void 0, void 0, function () {
-                var gotTheLock, jobDoneObservable, err_1;
-                var _this_1 = this;
-                return __generator$1(this, function (_e) {
-                    switch (_e.label) {
-                        case 0: return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                                var currentWork;
-                                return __generator$1(this, function (_e) {
-                                    switch (_e.label) {
-                                        case 0: return [4 /*yield*/, jobsTable.get(jobName)];
-                                        case 1:
-                                            currentWork = _e.sent();
-                                            if (!!currentWork) return [3 /*break*/, 3];
-                                            // No one else is working. Let's record that we are.
-                                            return [4 /*yield*/, jobsTable.add({
-                                                    nodeId: myId,
-                                                    started: new Date(),
-                                                    heartbeat: new Date()
-                                                }, jobName)];
-                                        case 2:
-                                            // No one else is working. Let's record that we are.
-                                            _e.sent();
-                                            return [2 /*return*/, true];
-                                        case 3:
-                                            if (!(currentWork.heartbeat.getTime() <
-                                                Date.now() - GUARDED_JOB_TIMEOUT)) return [3 /*break*/, 5];
-                                            console.warn("Latest ".concat(jobName, " worker seem to have died.\n"), "The dead job started:", currentWork.started, "\n", "Last heart beat was:", currentWork.heartbeat, '\n', "We're now taking over!");
-                                            // Now, take over!
-                                            return [4 /*yield*/, jobsTable.put({
-                                                    nodeId: myId,
-                                                    started: new Date(),
-                                                    heartbeat: new Date()
-                                                }, jobName)];
-                                        case 4:
-                                            // Now, take over!
-                                            _e.sent();
-                                            return [2 /*return*/, true];
-                                        case 5: return [2 /*return*/, false];
-                                    }
-                                });
-                            }); })];
-                        case 1:
-                            gotTheLock = _e.sent();
-                            if (gotTheLock)
-                                return [2 /*return*/, true];
-                            if (!awaitRemoteJob) return [3 /*break*/, 6];
-                            _e.label = 2;
-                        case 2:
-                            _e.trys.push([2, 4, , 6]);
-                            jobDoneObservable = from$1(liveQuery(function () { return jobsTable.get(jobName); })).pipe(timeout(GUARDED_JOB_TIMEOUT), filter(function (job) { return !job; }));
-                            return [4 /*yield*/, jobDoneObservable.toPromise()];
-                        case 3:
-                            _e.sent();
-                            return [2 /*return*/, false];
-                        case 4:
-                            err_1 = _e.sent();
-                            if (err_1.name !== 'TimeoutError') {
-                                throw err_1;
-                            }
-                            return [4 /*yield*/, aquireLock()];
-                        case 5: 
-                        // Timeout stopped us! Try aquire the lock now.
-                        // It will likely succeed this time unless
-                        // another client took it.
-                        return [2 /*return*/, _e.sent()];
-                        case 6: return [2 /*return*/, false];
-                    }
-                });
-            });
-        }
-        var jobsTable, heartbeat;
-        var _this_1 = this;
-        return __generator$1(this, function (_g) {
-            switch (_g.label) {
-                case 0:
-                    jobsTable = db.table(jobsTableName);
-                    return [4 /*yield*/, aquireLock()];
-                case 1:
-                    if (!_g.sent()) return [3 /*break*/, 6];
-                    heartbeat = setInterval(function () {
-                        jobsTable.update(jobName, function (job) {
-                            if (job.nodeId === myId) {
-                                job.heartbeat = new Date();
-                            }
-                        });
-                    }, GUARDED_JOB_HEARTBEAT);
-                    _g.label = 2;
-                case 2:
-                    _g.trys.push([2, , 4, 6]);
-                    return [4 /*yield*/, job()];
-                case 3: return [2 /*return*/, _g.sent()];
-                case 4:
-                    // Stop heartbeat
-                    clearInterval(heartbeat);
-                    // Remove the persisted job state:
-                    return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            var currentWork;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0: return [4 /*yield*/, jobsTable.get(jobName)];
-                                    case 1:
-                                        currentWork = _e.sent();
-                                        if (currentWork && currentWork.nodeId === myId) {
-                                            jobsTable.delete(jobName);
-                                        }
-                                        return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 5:
-                    // Remove the persisted job state:
-                    _g.sent();
-                    return [7 /*endfinally*/];
-                case 6: return [2 /*return*/];
-            }
-        });
-    });
-}
 function performInitialSync(db, cloudOptions, cloudSchema) {
     return __awaiter$1(this, void 0, void 0, function () {
-        var _this_1 = this;
         return __generator$1(this, function (_e) {
             switch (_e.label) {
                 case 0:
-                    console.debug("Performing initial sync");
-                    return [4 /*yield*/, performGuardedJob(db, 'initialSync', '$jobs', function () { return __awaiter$1(_this_1, void 0, void 0, function () {
-                            var syncState;
-                            return __generator$1(this, function (_e) {
-                                switch (_e.label) {
-                                    case 0: return [4 /*yield*/, db.getPersistedSyncState()];
-                                    case 1:
-                                        syncState = _e.sent();
-                                        if (!!(syncState === null || syncState === void 0 ? void 0 : syncState.initiallySynced)) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, sync(db, cloudOptions, cloudSchema, { isInitialSync: true })];
-                                    case 2:
-                                        _e.sent();
-                                        _e.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        }); }, { awaitRemoteJob: true } // Don't return until the job is done!
-                        )];
+                    console.debug('Performing initial sync');
+                    return [4 /*yield*/, sync(db, cloudOptions, cloudSchema, { isInitialSync: true })];
                 case 1:
                     _e.sent();
-                    console.debug("Done initial sync");
+                    console.debug('Done initial sync');
                     return [2 /*return*/];
             }
         });
@@ -5885,6 +5741,135 @@ function isSyncNeeded(db) {
         });
     });
 }
+var SECONDS = 1000;
+var MINUTES = 60 * SECONDS;
+var myId = randomString(16);
+var GUARDED_JOB_HEARTBEAT = 1 * SECONDS;
+var GUARDED_JOB_TIMEOUT = 1 * MINUTES;
+function performGuardedJob(db, jobName, jobsTableName, job, _e) {
+    var _f = _e === void 0 ? {} : _e, awaitRemoteJob = _f.awaitRemoteJob;
+    return __awaiter$1(this, void 0, void 0, function () {
+        function aquireLock() {
+            return __awaiter$1(this, void 0, void 0, function () {
+                var gotTheLock, jobDoneObservable, err_1;
+                var _this_1 = this;
+                return __generator$1(this, function (_e) {
+                    switch (_e.label) {
+                        case 0: return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
+                                var currentWork;
+                                return __generator$1(this, function (_e) {
+                                    switch (_e.label) {
+                                        case 0: return [4 /*yield*/, jobsTable.get(jobName)];
+                                        case 1:
+                                            currentWork = _e.sent();
+                                            if (!!currentWork) return [3 /*break*/, 3];
+                                            // No one else is working. Let's record that we are.
+                                            return [4 /*yield*/, jobsTable.add({
+                                                    nodeId: myId,
+                                                    started: new Date(),
+                                                    heartbeat: new Date()
+                                                }, jobName)];
+                                        case 2:
+                                            // No one else is working. Let's record that we are.
+                                            _e.sent();
+                                            return [2 /*return*/, true];
+                                        case 3:
+                                            if (!(currentWork.heartbeat.getTime() <
+                                                Date.now() - GUARDED_JOB_TIMEOUT)) return [3 /*break*/, 5];
+                                            console.warn("Latest ".concat(jobName, " worker seem to have died.\n"), "The dead job started:", currentWork.started, "\n", "Last heart beat was:", currentWork.heartbeat, '\n', "We're now taking over!");
+                                            // Now, take over!
+                                            return [4 /*yield*/, jobsTable.put({
+                                                    nodeId: myId,
+                                                    started: new Date(),
+                                                    heartbeat: new Date()
+                                                }, jobName)];
+                                        case 4:
+                                            // Now, take over!
+                                            _e.sent();
+                                            return [2 /*return*/, true];
+                                        case 5: return [2 /*return*/, false];
+                                    }
+                                });
+                            }); })];
+                        case 1:
+                            gotTheLock = _e.sent();
+                            if (gotTheLock)
+                                return [2 /*return*/, true];
+                            if (!awaitRemoteJob) return [3 /*break*/, 6];
+                            _e.label = 2;
+                        case 2:
+                            _e.trys.push([2, 4, , 6]);
+                            jobDoneObservable = from$1(liveQuery(function () { return jobsTable.get(jobName); })).pipe(timeout(GUARDED_JOB_TIMEOUT), filter(function (job) { return !job; }));
+                            return [4 /*yield*/, jobDoneObservable.toPromise()];
+                        case 3:
+                            _e.sent();
+                            return [2 /*return*/, false];
+                        case 4:
+                            err_1 = _e.sent();
+                            if (err_1.name !== 'TimeoutError') {
+                                throw err_1;
+                            }
+                            return [4 /*yield*/, aquireLock()];
+                        case 5: 
+                        // Timeout stopped us! Try aquire the lock now.
+                        // It will likely succeed this time unless
+                        // another client took it.
+                        return [2 /*return*/, _e.sent()];
+                        case 6: return [2 /*return*/, false];
+                    }
+                });
+            });
+        }
+        var jobsTable, heartbeat;
+        var _this_1 = this;
+        return __generator$1(this, function (_g) {
+            switch (_g.label) {
+                case 0:
+                    jobsTable = db.table(jobsTableName);
+                    return [4 /*yield*/, aquireLock()];
+                case 1:
+                    if (!_g.sent()) return [3 /*break*/, 6];
+                    heartbeat = setInterval(function () {
+                        jobsTable.update(jobName, function (job) {
+                            if (job.nodeId === myId) {
+                                job.heartbeat = new Date();
+                            }
+                        });
+                    }, GUARDED_JOB_HEARTBEAT);
+                    _g.label = 2;
+                case 2:
+                    _g.trys.push([2, , 4, 6]);
+                    return [4 /*yield*/, job()];
+                case 3: return [2 /*return*/, _g.sent()];
+                case 4:
+                    // Stop heartbeat
+                    clearInterval(heartbeat);
+                    // Remove the persisted job state:
+                    return [4 /*yield*/, db.transaction('rw!', jobsTableName, function () { return __awaiter$1(_this_1, void 0, void 0, function () {
+                            var currentWork;
+                            return __generator$1(this, function (_e) {
+                                switch (_e.label) {
+                                    case 0: return [4 /*yield*/, jobsTable.get(jobName)];
+                                    case 1:
+                                        currentWork = _e.sent();
+                                        if (!(currentWork && currentWork.nodeId === myId)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, jobsTable.delete(jobName)];
+                                    case 2:
+                                        _e.sent();
+                                        _e.label = 3;
+                                    case 3: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                case 5:
+                    // Remove the persisted job state:
+                    _g.sent();
+                    return [7 /*endfinally*/];
+                case 6: return [2 /*return*/];
+            }
+        });
+    });
+}
 var ongoingSyncs = new WeakMap();
 function syncIfPossible(db, cloudOptions, cloudSchema, options) {
     var ongoing = ongoingSyncs.get(db);
@@ -6815,7 +6800,7 @@ function dexieCloud(dexie) {
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
     dexie.cloud = {
-        version: '4.0.0-beta.16',
+        version: '4.0.0-beta.17',
         options: __assign({}, DEFAULT_OPTIONS),
         schema: null,
         serverState: null,
@@ -7145,7 +7130,7 @@ function dexieCloud(dexie) {
         });
     }
 }
-dexieCloud.version = '4.0.0-beta.16';
+dexieCloud.version = '4.0.0-beta.17';
 Dexie.Cloud = dexieCloud;
 
 export { dexieCloud as default, dexieCloud, getTiedObjectId, getTiedRealmId };