dexie-cloud-addon 4.0.0-beta.18 → 4.0.0-beta.19

package/dist/modern/service-worker.js

@@ -5179,16 +5179,19 @@ function syncIfPossible(db, cloudOptions, cloudSchema, options) {
     function _syncIfPossible() {
         return __awaiter$1(this, void 0, void 0, function* () {
             try {
-                if (db.cloud.usingServiceWorker) {
-                    if (IS_SERVICE_WORKER) {
-                        yield sync(db, cloudOptions, cloudSchema, options);
-                    }
+                if (db.cloud.isServiceWorkerDB) {
+                    // We are the dedicated sync SW:
+                    yield sync(db, cloudOptions, cloudSchema, options);
                 }
-                else {
+                else if (!db.cloud.usingServiceWorker) {
                     // We use a flow that is better suited for the case when multiple workers want to
                     // do the same thing.
                     yield performGuardedJob(db, CURRENT_SYNC_WORKER, '$jobs', () => sync(db, cloudOptions, cloudSchema, options));
                 }
+                else {
+                    assert(false);
+                    throw new Error('Internal _syncIfPossible() - invalid precondition - should not have been called.');
+                }
                 ongoingSyncs.delete(db);
                 console.debug('Done sync');
             }
@@ -5822,7 +5825,7 @@ function dexieCloud(dexie) {
         currentUserEmitter.next(UNAUTHORIZED_USER);
     });
     dexie.cloud = {
-        version: '4.0.0-beta.18',
+        version: '4.0.0-beta.19',
         options: Object.assign({}, DEFAULT_OPTIONS),
         schema: null,
         serverState: null,
@@ -5914,15 +5917,17 @@ function dexieCloud(dexie) {
     dexie.use(createImplicitPropSetterMiddleware(DexieCloudDB(dexie)));
     dexie.use(createIdGenerationMiddleware(DexieCloudDB(dexie)));
     function onDbReady(dexie) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter$1(this, void 0, void 0, function* () {
             closed = false; // As Dexie calls us, we are not closed anymore. Maybe reopened? Remember db.ready event is registered with sticky flag!
             const db = DexieCloudDB(dexie);
             // Setup default GUI:
-            if (!IS_SERVICE_WORKER) {
+            if (typeof window !== 'undefined' && typeof document !== 'undefined') {
                 if (!((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.customLoginGui)) {
                     subscriptions.push(setupDefaultGUI(dexie));
                 }
+            }
+            if (!db.cloud.isServiceWorkerDB) {
                 subscriptions.push(computeSyncState(db).subscribe(dexie.cloud.syncState));
             }
             //verifyConfig(db.cloud.options); Not needed (yet at least!)
@@ -5934,7 +5939,7 @@ function dexieCloud(dexie) {
                 ? yield navigator.serviceWorker.getRegistrations()
                 : [];
             const initiallySynced = yield db.transaction('rw', db.$syncState, () => __awaiter$1(this, void 0, void 0, function* () {
-                var _g, _h;
+                var _h, _j;
                 const { options, schema } = db.cloud;
                 const [persistedOptions, persistedSchema, persistedSyncState] = yield Promise.all([
                     db.getOptions(),
@@ -5953,7 +5958,7 @@ function dexieCloud(dexie) {
                         throw new Error(`Internal error`); // options cannot be null if configuredProgramatically is set.
                     yield db.$syncState.put(options, 'options');
                 }
-                if (((_g = db.cloud.options) === null || _g === void 0 ? void 0 : _g.tryUseServiceWorker) &&
+                if (((_h = db.cloud.options) === null || _h === void 0 ? void 0 : _h.tryUseServiceWorker) &&
                     'serviceWorker' in navigator &&
                     swRegistrations.length > 0 &&
                     !DISABLE_SERVICEWORKER_STRATEGY) {
@@ -5967,7 +5972,8 @@ function dexieCloud(dexie) {
                     // Not configured for using service worker or no service worker
                     // registration exists. Don't rely on service worker to do any job.
                     // Use LocalSyncWorker instead.
-                    if (((_h = db.cloud.options) === null || _h === void 0 ? void 0 : _h.tryUseServiceWorker) && !IS_SERVICE_WORKER) {
+                    if (((_j = db.cloud.options) === null || _j === void 0 ? void 0 : _j.tryUseServiceWorker) &&
+                        !db.cloud.isServiceWorkerDB) {
                         console.debug('dexie-cloud-addon: Not using service worker.', swRegistrations.length === 0
                             ? 'No SW registrations found.'
                             : 'serviceWorker' in navigator && DISABLE_SERVICEWORKER_STRATEGY
@@ -6015,7 +6021,7 @@ function dexieCloud(dexie) {
             }
             // Manage CurrentUser observable:
             throwIfClosed();
-            if (!IS_SERVICE_WORKER) {
+            if (!db.cloud.isServiceWorkerDB) {
                 subscriptions.push(liveQuery(() => db.getCurrentUser()).subscribe(currentUserEmitter));
                 // Manage PersistendSyncState observable:
                 subscriptions.push(liveQuery(() => db.getPersistedSyncState()).subscribe(db.cloud.persistedSyncState));
@@ -6042,7 +6048,7 @@ function dexieCloud(dexie) {
             }
             else if (((_e = db.cloud.options) === null || _e === void 0 ? void 0 : _e.databaseUrl) &&
                 db.cloud.schema &&
-                !IS_SERVICE_WORKER) {
+                !db.cloud.isServiceWorkerDB) {
                 // There's no SW. Start SyncWorker instead.
                 localSyncWorker = LocalSyncWorker(db, db.cloud.options, db.cloud.schema);
                 localSyncWorker.start();
@@ -6050,7 +6056,7 @@ function dexieCloud(dexie) {
             }
             // Listen to online event and do sync.
             throwIfClosed();
-            if (!IS_SERVICE_WORKER) {
+            if (!db.cloud.isServiceWorkerDB) {
                 subscriptions.push(fromEvent(self, 'online').subscribe(() => {
                     console.debug('online!');
                     db.syncStateChangedEvent.next({
@@ -6064,16 +6070,16 @@ function dexieCloud(dexie) {
                     });
                 }));
             }
-            // Connect WebSocket only if we're a browser window
-            if (typeof window !== 'undefined' &&
-                !IS_SERVICE_WORKER &&
-                ((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl)) {
+            // Connect WebSocket unless we
+            if (((_f = db.cloud.options) === null || _f === void 0 ? void 0 : _f.databaseUrl) &&
+                !((_g = db.cloud.options) === null || _g === void 0 ? void 0 : _g.disableWebSocket) &&
+                !IS_SERVICE_WORKER) {
                 subscriptions.push(connectWebSocket(db));
             }
         });
     }
 }
-dexieCloud.version = '4.0.0-beta.18';
+dexieCloud.version = '4.0.0-beta.19';
 Dexie.Cloud = dexieCloud;
 
 // In case the SW lives for a while, let it reuse already opened connections:
@@ -6110,12 +6116,15 @@ function syncDB(dbName, purpose) {
                 console.debug('Dexie Cloud SW: Creating new Dexie instance for', dbName);
                 const dexie = new Dexie(dbName, { addons: [dexieCloud] });
                 db = DexieCloudDB(dexie);
+                db.cloud.isServiceWorkerDB = true;
                 dexie.on('versionchange', stopManagingDB);
                 yield db.dx.open(); // Makes sure db.cloud.options and db.cloud.schema are read from db,
-                if (!managedDBs.get(dbName)) {
+                if (managedDBs.get(dbName)) {
                     // Avoid race conditions.
-                    managedDBs.set(dbName, db);
+                    db.close();
+                    return yield _syncDB(dbName, purpose);
                 }
+                managedDBs.set(dbName, db);
             }
             if (!((_a = db.cloud.options) === null || _a === void 0 ? void 0 : _a.databaseUrl)) {
                 console.error(`Dexie Cloud: No databaseUrl configured`);