@luvio/environments 0.127.1 → 0.130.0

package/dist/es/es2018/environments.js

@@ -452,7 +452,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             throw new Error('This makeDurable instance has been disposed');
         }
     };
-    const unsubscribe = durableStore.registerOnChangedListener((changes) => {
+    const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
         const defaultSegmentKeys = [];
         const adapterContextSegmentKeys = [];
         for (let i = 0, len = changes.length; i < len; i++) {
@@ -481,11 +481,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             }
         }
         if (adapterContextKeysFromDifferentInstance.length > 0) {
-            // change handlers are sync, so kick off L2 read of the changed
-            // segment keys but we can't await it
-            durableStore
-                .getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment)
-                .then((entries) => {
+            try {
+                const entries = await durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment);
                 if (entries !== undefined) {
                     const entryKeys = keys(entries);
                     for (let i = 0, len = entryKeys.length; i < len; i++) {
@@ -494,8 +491,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                         contextStores[entryKey] = entry.data;
                     }
                 }
-            })
-                .catch(durableStoreErrorHandler);
+            }
+            catch (error) {
+                durableStoreErrorHandler(error);
+            }
         }
         // process default segment changes
         const defaultSegmentKeysLength = defaultSegmentKeys.length;
@@ -513,9 +512,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // call base environment storeEvict so this evict is not tracked for durable deletion
                 environment.storeEvict(key);
             }
-            return environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
+            await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
         }
-        return Promise.resolve();
     });
     const dispose = function () {
         validateNotDisposed();

package/dist/umd/es2018/environments.js

@@ -456,7 +456,7 @@
                 throw new Error('This makeDurable instance has been disposed');
             }
         };
-        const unsubscribe = durableStore.registerOnChangedListener((changes) => {
+        const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
             const defaultSegmentKeys = [];
             const adapterContextSegmentKeys = [];
             for (let i = 0, len = changes.length; i < len; i++) {
@@ -485,11 +485,8 @@
                 }
             }
             if (adapterContextKeysFromDifferentInstance.length > 0) {
-                // change handlers are sync, so kick off L2 read of the changed
-                // segment keys but we can't await it
-                durableStore
-                    .getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment)
-                    .then((entries) => {
+                try {
+                    const entries = await durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment);
                     if (entries !== undefined) {
                         const entryKeys = keys(entries);
                         for (let i = 0, len = entryKeys.length; i < len; i++) {
@@ -498,8 +495,10 @@
                             contextStores[entryKey] = entry.data;
                         }
                     }
-                })
-                    .catch(durableStoreErrorHandler);
+                }
+                catch (error) {
+                    durableStoreErrorHandler(error);
+                }
             }
             // process default segment changes
             const defaultSegmentKeysLength = defaultSegmentKeys.length;
@@ -517,9 +516,8 @@
                     // call base environment storeEvict so this evict is not tracked for durable deletion
                     environment.storeEvict(key);
                 }
-                return environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
+                await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
             }
-            return Promise.resolve();
         });
         const dispose = function () {
             validateNotDisposed();

package/dist/umd/es5/environments.js

@@ -535,6 +535,7 @@
      * @param instrumentation An instrumentation function implementation
      */
     function makeDurable(environment, _a) {
+        var _this = this;
         var durableStore = _a.durableStore, instrumentation = _a.instrumentation;
         var ingestStagingStore = null;
         var durableTTLStore = new DurableTTLStore(durableStore);
@@ -559,72 +560,82 @@
                 throw new Error('This makeDurable instance has been disposed');
             }
         };
-        var unsubscribe = durableStore.registerOnChangedListener(function (changes) {
-            var defaultSegmentKeys = [];
-            var adapterContextSegmentKeys = [];
-            for (var i = 0, len = changes.length; i < len; i++) {
-                var change = changes[i];
-                // we only care about changes to the data which is stored in the default
-                // segment or the adapter context
-                if (change.segment === DefaultDurableSegment) {
-                    defaultSegmentKeys.push.apply(defaultSegmentKeys, change.ids);
-                }
-                else if (change.segment === AdapterContextSegment) {
-                    adapterContextSegmentKeys.push.apply(adapterContextSegmentKeys, change.ids);
-                }
-            }
-            // process adapter context changes
-            var adapterContextKeysFromDifferentInstance = [];
-            for (var _i = 0, adapterContextSegmentKeys_1 = adapterContextSegmentKeys; _i < adapterContextSegmentKeys_1.length; _i++) {
-                var key = adapterContextSegmentKeys_1[_i];
-                if (pendingContextStoreKeys.has(key)) {
-                    // if this instance caused the L2 write then remove from the
-                    // "pending" Set and move on
-                    pendingContextStoreKeys.delete(key);
-                }
-                else {
-                    // else it came from another luvio instance and we need to
-                    // read from L2
-                    adapterContextKeysFromDifferentInstance.push(key);
-                }
-            }
-            if (adapterContextKeysFromDifferentInstance.length > 0) {
-                // change handlers are sync, so kick off L2 read of the changed
-                // segment keys but we can't await it
-                durableStore
-                    .getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment)
-                    .then(function (entries) {
-                    if (entries !== undefined) {
-                        var entryKeys = keys(entries);
-                        for (var i = 0, len = entryKeys.length; i < len; i++) {
-                            var entryKey = entryKeys[i];
-                            var entry = entries[entryKey];
-                            contextStores[entryKey] = entry.data;
+        var unsubscribe = durableStore.registerOnChangedListener(function (changes) { return __awaiter(_this, void 0, void 0, function () {
+            var defaultSegmentKeys, adapterContextSegmentKeys, i, len, change, adapterContextKeysFromDifferentInstance, _i, adapterContextSegmentKeys_1, key, entries, entryKeys, i, len, entryKey, entry, error_2, defaultSegmentKeysLength, i, key, canonical;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        defaultSegmentKeys = [];
+                        adapterContextSegmentKeys = [];
+                        for (i = 0, len = changes.length; i < len; i++) {
+                            change = changes[i];
+                            // we only care about changes to the data which is stored in the default
+                            // segment or the adapter context
+                            if (change.segment === DefaultDurableSegment) {
+                                defaultSegmentKeys.push.apply(defaultSegmentKeys, change.ids);
+                            }
+                            else if (change.segment === AdapterContextSegment) {
+                                adapterContextSegmentKeys.push.apply(adapterContextSegmentKeys, change.ids);
+                            }
                         }
-                    }
-                })
-                    .catch(durableStoreErrorHandler);
-            }
-            // process default segment changes
-            var defaultSegmentKeysLength = defaultSegmentKeys.length;
-            if (defaultSegmentKeysLength > 0) {
-                for (var i = 0; i < defaultSegmentKeysLength; i++) {
-                    var key = defaultSegmentKeys[i];
-                    var canonical = environment.storeGetCanonicalKey(key);
-                    if (canonical !== key) {
-                        continue;
-                    }
-                    // TODO: W-8909393 If expiration is the only thing that changed we should not evict the data... so
-                    // if we stored expiration and data at different keys (or same keys in different segments)
-                    // then we could know if only the expiration has changed and we wouldn't need to evict
-                    // and go through an entire broadcast/revive cycle for unchanged data
-                    // call base environment storeEvict so this evict is not tracked for durable deletion
-                    environment.storeEvict(key);
+                        adapterContextKeysFromDifferentInstance = [];
+                        for (_i = 0, adapterContextSegmentKeys_1 = adapterContextSegmentKeys; _i < adapterContextSegmentKeys_1.length; _i++) {
+                            key = adapterContextSegmentKeys_1[_i];
+                            if (pendingContextStoreKeys.has(key)) {
+                                // if this instance caused the L2 write then remove from the
+                                // "pending" Set and move on
+                                pendingContextStoreKeys.delete(key);
+                            }
+                            else {
+                                // else it came from another luvio instance and we need to
+                                // read from L2
+                                adapterContextKeysFromDifferentInstance.push(key);
+                            }
+                        }
+                        if (!(adapterContextKeysFromDifferentInstance.length > 0)) return [3 /*break*/, 4];
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment)];
+                    case 2:
+                        entries = _a.sent();
+                        if (entries !== undefined) {
+                            entryKeys = keys(entries);
+                            for (i = 0, len = entryKeys.length; i < len; i++) {
+                                entryKey = entryKeys[i];
+                                entry = entries[entryKey];
+                                contextStores[entryKey] = entry.data;
+                            }
+                        }
+                        return [3 /*break*/, 4];
+                    case 3:
+                        error_2 = _a.sent();
+                        durableStoreErrorHandler(error_2);
+                        return [3 /*break*/, 4];
+                    case 4:
+                        defaultSegmentKeysLength = defaultSegmentKeys.length;
+                        if (!(defaultSegmentKeysLength > 0)) return [3 /*break*/, 6];
+                        for (i = 0; i < defaultSegmentKeysLength; i++) {
+                            key = defaultSegmentKeys[i];
+                            canonical = environment.storeGetCanonicalKey(key);
+                            if (canonical !== key) {
+                                continue;
+                            }
+                            // TODO: W-8909393 If expiration is the only thing that changed we should not evict the data... so
+                            // if we stored expiration and data at different keys (or same keys in different segments)
+                            // then we could know if only the expiration has changed and we wouldn't need to evict
+                            // and go through an entire broadcast/revive cycle for unchanged data
+                            // call base environment storeEvict so this evict is not tracked for durable deletion
+                            environment.storeEvict(key);
+                        }
+                        return [4 /*yield*/, environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable)];
+                    case 5:
+                        _a.sent();
+                        _a.label = 6;
+                    case 6: return [2 /*return*/];
                 }
-                return environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
-            }
-            return Promise.resolve();
-        });
+            });
+        }); });
         var dispose = function () {
             validateNotDisposed();
             disposed = true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.127.1",
+    "version": "0.130.0",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -23,7 +23,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "0.127.1"
+        "@luvio/engine": "0.130.0"
     },
     "bundlesize": [
         {