@luvio/environments 0.136.3 → 0.136.4

package/dist/es/es2018/environments.js

@@ -561,10 +561,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
         validateNotDisposed();
-        // return resolved promise here and wait for the L2 flush to happen in handleSuccessResponse,
-        // that flush will cause the onChanged handler to fire which will revive
-        // records to the main L1 store and call the base storeBroadcast
-        return Promise.resolve();
+        // publishing to L2 is essentially "broadcasting" because the onChanged
+        // handler will fire which will revive records to the main L1 store and
+        // call the base storeBroadcast
+        return publishChangesToDurableStore();
     };
     const publishChangesToDurableStore = function () {
         validateNotDisposed();
@@ -785,7 +785,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // we don't need to prime metadata
                 () => { });
                 snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-                await publishChangesToDurableStore();
             })();
             for (const key of keysToReviveAsArray) {
                 // we are overwriting the previous promise at this key, but that
@@ -813,7 +812,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             // so all we have to do is ingest then write to L2
             ingestStagingStore = buildIngestStagingStore(environment);
             snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-            await publishChangesToDurableStore();
         }
         if (snapshotFromMemoryIngest === undefined) {
             return undefined;
@@ -826,12 +824,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         const result = await reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(select, environment.createSnapshot, refresh));
         return result.snapshot;
     };
-    const handleErrorResponse = function (ingestAndBroadcastFunc) {
+    const handleErrorResponse = async function (ingestAndBroadcastFunc) {
         validateNotDisposed();
-        const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-        return publishChangesToDurableStore().then(() => {
-            return snapshotFromMemoryIngest;
-        });
+        ingestStagingStore = buildIngestStagingStore(environment);
+        return ingestAndBroadcastFunc();
     };
     const getNotifyChangeStoreEntries = function (keys) {
         validateNotDisposed();

package/dist/umd/es2018/environments.js

@@ -565,10 +565,10 @@
         };
         const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
             validateNotDisposed();
-            // return resolved promise here and wait for the L2 flush to happen in handleSuccessResponse,
-            // that flush will cause the onChanged handler to fire which will revive
-            // records to the main L1 store and call the base storeBroadcast
-            return Promise.resolve();
+            // publishing to L2 is essentially "broadcasting" because the onChanged
+            // handler will fire which will revive records to the main L1 store and
+            // call the base storeBroadcast
+            return publishChangesToDurableStore();
         };
         const publishChangesToDurableStore = function () {
             validateNotDisposed();
@@ -789,7 +789,6 @@
                     // we don't need to prime metadata
                     () => { });
                     snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-                    await publishChangesToDurableStore();
                 })();
                 for (const key of keysToReviveAsArray) {
                     // we are overwriting the previous promise at this key, but that
@@ -817,7 +816,6 @@
                 // so all we have to do is ingest then write to L2
                 ingestStagingStore = buildIngestStagingStore(environment);
                 snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-                await publishChangesToDurableStore();
             }
             if (snapshotFromMemoryIngest === undefined) {
                 return undefined;
@@ -830,12 +828,10 @@
             const result = await reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(select, environment.createSnapshot, refresh));
             return result.snapshot;
         };
-        const handleErrorResponse = function (ingestAndBroadcastFunc) {
+        const handleErrorResponse = async function (ingestAndBroadcastFunc) {
             validateNotDisposed();
-            const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-            return publishChangesToDurableStore().then(() => {
-                return snapshotFromMemoryIngest;
-            });
+            ingestStagingStore = buildIngestStagingStore(environment);
+            return ingestAndBroadcastFunc();
         };
         const getNotifyChangeStoreEntries = function (keys) {
             validateNotDisposed();

package/dist/umd/es5/environments.js

@@ -682,10 +682,10 @@
         };
         var storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
             validateNotDisposed();
-            // return resolved promise here and wait for the L2 flush to happen in handleSuccessResponse,
-            // that flush will cause the onChanged handler to fire which will revive
-            // records to the main L1 store and call the base storeBroadcast
-            return Promise.resolve();
+            // publishing to L2 is essentially "broadcasting" because the onChanged
+            // handler will fire which will revive records to the main L1 store and
+            // call the base storeBroadcast
+            return publishChangesToDurableStore();
         };
         var publishChangesToDurableStore = function () {
             validateNotDisposed();
@@ -927,9 +927,6 @@
                                             return [4 /*yield*/, ingestAndBroadcastFunc()];
                                         case 3:
                                             snapshotFromMemoryIngest = _a.sent();
-                                            return [4 /*yield*/, publishChangesToDurableStore()];
-                                        case 4:
-                                            _a.sent();
                                             return [2 /*return*/];
                                     }
                                 });
@@ -959,7 +956,7 @@
                                 }
                             }
                             return [7 /*endfinally*/];
-                        case 4: return [3 /*break*/, 8];
+                        case 4: return [3 /*break*/, 7];
                         case 5:
                             // we aren't doing any merging so we don't have to synchronize, the
                             // underlying DurableStore implementation takes care of R/W sync
@@ -968,11 +965,8 @@
                             return [4 /*yield*/, ingestAndBroadcastFunc()];
                         case 6:
                             snapshotFromMemoryIngest = _d.sent();
-                            return [4 /*yield*/, publishChangesToDurableStore()];
+                            _d.label = 7;
                         case 7:
-                            _d.sent();
-                            _d.label = 8;
-                        case 8:
                             if (snapshotFromMemoryIngest === undefined) {
                                 return [2 /*return*/, undefined];
                             }
@@ -981,7 +975,7 @@
                             }
                             _c = snapshotFromMemoryIngest, select = _c.select, refresh = _c.refresh;
                             return [4 /*yield*/, reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, function () { return environment.storeLookup(select, environment.createSnapshot, refresh); })];
-                        case 9:
+                        case 8:
                             result = _d.sent();
                             return [2 /*return*/, result.snapshot];
                     }
@@ -989,10 +983,12 @@
             });
         };
         var handleErrorResponse = function (ingestAndBroadcastFunc) {
-            validateNotDisposed();
-            var snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-            return publishChangesToDurableStore().then(function () {
-                return snapshotFromMemoryIngest;
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    validateNotDisposed();
+                    ingestStagingStore = buildIngestStagingStore(environment);
+                    return [2 /*return*/, ingestAndBroadcastFunc()];
+                });
             });
         };
         var getNotifyChangeStoreEntries = function (keys) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.136.3",
+    "version": "0.136.4",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -23,7 +23,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "^0.136.3"
+        "@luvio/engine": "^0.136.4"
     },
     "volta": {
         "extends": "../../../package.json"