@luvio/environments 0.73.2 → 0.73.3

package/dist/es/es2018/environments.js

@@ -548,12 +548,9 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
         validateNotDisposed();
-        // for our environment we basically want a broadcast to be a "durable store broadcast",
-        // so we flush staging store to L2, which will cause the onChanged handler to fire
-        // which will revive records to the main L1 store and call the base storeBroadcast
-        // don't await the DS write - DS implementation will take care of R/W
-        // synchronization
-        publishChangesToDurableStore();
+        // no-op 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
     };
     const publishChangesToDurableStore = function () {
         validateNotDisposed();
@@ -697,14 +694,24 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             ingestStagingStore.records = existingRecords;
         }
         const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-        if (snapshotFromMemoryIngest === undefined) {
-            return undefined;
-        }
-        if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+        // now that ingestion is done flush staging store values to L2
+        return publishChangesToDurableStore().then(() => {
+            if (snapshotFromMemoryIngest === undefined) {
+                return undefined;
+            }
+            if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+                return snapshotFromMemoryIngest;
+            }
+            // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
+            return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh));
+        });
+    };
+    const handleErrorResponse = function (ingestAndBroadcastFunc) {
+        validateNotDisposed();
+        const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
+        return publishChangesToDurableStore().then(() => {
             return snapshotFromMemoryIngest;
-        }
-        // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
-        return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh));
+        });
     };
     environment.defaultCachePolicy = buildStaleWhileRevalidateImplementation(Number.MAX_SAFE_INTEGER);
     return create(environment, {
@@ -729,6 +736,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         getIngestStagingStoreRecords: { value: getIngestStagingStoreRecords },
         getIngestStagingStoreMetadata: { value: getIngestStagingStoreMetadata },
         handleSuccessResponse: { value: handleSuccessResponse },
+        handleErrorResponse: { value: handleErrorResponse },
     });
 }
 

package/dist/umd/es2018/environments.js

@@ -552,12 +552,9 @@
         };
         const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
             validateNotDisposed();
-            // for our environment we basically want a broadcast to be a "durable store broadcast",
-            // so we flush staging store to L2, which will cause the onChanged handler to fire
-            // which will revive records to the main L1 store and call the base storeBroadcast
-            // don't await the DS write - DS implementation will take care of R/W
-            // synchronization
-            publishChangesToDurableStore();
+            // no-op 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
         };
         const publishChangesToDurableStore = function () {
             validateNotDisposed();
@@ -701,14 +698,24 @@
                 ingestStagingStore.records = existingRecords;
             }
             const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-            if (snapshotFromMemoryIngest === undefined) {
-                return undefined;
-            }
-            if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+            // now that ingestion is done flush staging store values to L2
+            return publishChangesToDurableStore().then(() => {
+                if (snapshotFromMemoryIngest === undefined) {
+                    return undefined;
+                }
+                if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+                    return snapshotFromMemoryIngest;
+                }
+                // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
+                return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh));
+            });
+        };
+        const handleErrorResponse = function (ingestAndBroadcastFunc) {
+            validateNotDisposed();
+            const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
+            return publishChangesToDurableStore().then(() => {
                 return snapshotFromMemoryIngest;
-            }
-            // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
-            return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh));
+            });
         };
         environment.defaultCachePolicy = engine.buildStaleWhileRevalidateImplementation(Number.MAX_SAFE_INTEGER);
         return create(environment, {
@@ -733,6 +740,7 @@
             getIngestStagingStoreRecords: { value: getIngestStagingStoreRecords },
             getIngestStagingStoreMetadata: { value: getIngestStagingStoreMetadata },
             handleSuccessResponse: { value: handleSuccessResponse },
+            handleErrorResponse: { value: handleErrorResponse },
         });
     }
 

package/dist/umd/es5/environments.js

@@ -590,12 +590,9 @@
         };
         var storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
             validateNotDisposed();
-            // for our environment we basically want a broadcast to be a "durable store broadcast",
-            // so we flush staging store to L2, which will cause the onChanged handler to fire
-            // which will revive records to the main L1 store and call the base storeBroadcast
-            // don't await the DS write - DS implementation will take care of R/W
-            // synchronization
-            publishChangesToDurableStore();
+            // no-op 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
         };
         var publishChangesToDurableStore = function () {
             validateNotDisposed();
@@ -738,15 +735,25 @@
                 ingestStagingStore.records = existingRecords;
             }
             var snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-            if (snapshotFromMemoryIngest === undefined) {
-                return undefined;
-            }
-            if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+            // now that ingestion is done flush staging store values to L2
+            return publishChangesToDurableStore().then(function () {
+                if (snapshotFromMemoryIngest === undefined) {
+                    return undefined;
+                }
+                if (snapshotFromMemoryIngest.state !== 'Unfulfilled') {
+                    return snapshotFromMemoryIngest;
+                }
+                // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
+                return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, function () {
+                    return environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh);
+                });
+            });
+        };
+        var handleErrorResponse = function (ingestAndBroadcastFunc) {
+            validateNotDisposed();
+            var snapshotFromMemoryIngest = ingestAndBroadcastFunc();
+            return publishChangesToDurableStore().then(function () {
                 return snapshotFromMemoryIngest;
-            }
-            // if snapshot from staging store lookup is unfulfilled then do an L2 lookup
-            return reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, function () {
-                return environment.storeLookup(snapshotFromMemoryIngest.select, environment.createSnapshot, snapshotFromMemoryIngest.refresh);
             });
         };
         environment.defaultCachePolicy = engine.buildStaleWhileRevalidateImplementation(Number.MAX_SAFE_INTEGER);
@@ -772,6 +779,7 @@
             getIngestStagingStoreRecords: { value: getIngestStagingStoreRecords },
             getIngestStagingStoreMetadata: { value: getIngestStagingStoreMetadata },
             handleSuccessResponse: { value: handleSuccessResponse },
+            handleErrorResponse: { value: handleErrorResponse },
         });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.73.2",
+    "version": "0.73.3",
     "description": "Luvio Environments",
     "main": "dist/umd/es2018/environments.js",
     "module": "dist/es/es2018/environments.js",
@@ -26,6 +26,6 @@
         "dist/"
     ],
     "dependencies": {
-        "@luvio/engine": "0.73.2"
+        "@luvio/engine": "0.73.3"
     }
 }