@luvio/environments 0.138.7 → 0.138.8-244.0

package/dist/es/es2018/environments.js

@@ -18,6 +18,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
     return false;
 }
 const DefaultDurableSegment = 'DEFAULT';
+const RedirectDurableSegment = 'REDIRECT_KEYS';
 
 const { keys, create, assign, freeze } = Object;
 const { isArray } = Array;
@@ -291,7 +292,7 @@ function copy(source) {
     }
     return { ...source };
 }
-function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
+function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
     const durableRecords = create(null);
     const evictedRecords = create(null);
     const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -320,7 +321,7 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
             };
         }
     }
-    const durableStoreOperations = [];
+    const durableStoreOperations = additionalDurableStoreOperations;
     // publishes
     const recordKeys = keys(durableRecords);
     if (recordKeys.length > 0) {
@@ -330,6 +331,18 @@ function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStor
             segment: DefaultDurableSegment,
         });
     }
+    // redirects
+    redirects.forEach((value, key) => {
+        durableStoreOperations.push({
+            type: 'setEntries',
+            entries: {
+                [key]: {
+                    data: { key, redirect: value },
+                },
+            },
+            segment: RedirectDurableSegment,
+        });
+    });
     // evicts
     const evictedKeys = keys(evictedRecords);
     if (evictedKeys.length > 0) {
@@ -378,6 +391,19 @@ function buildIngestStagingStore(environment) {
     return environment.storeBuildIngestionStagingStore();
 }
 
+async function reviveRedirects(durableStore, env) {
+    const entries = await durableStore.getAllEntries(RedirectDurableSegment);
+    if (entries) {
+        for (const durableEntry of Object.keys(entries)) {
+            const entry = entries[durableEntry];
+            const { data: { key, redirect }, } = entry;
+            if (entry) {
+                env.storeRedirect(key, redirect);
+            }
+        }
+    }
+}
+
 const AdapterContextSegment = 'ADAPTER-CONTEXT';
 const ADAPTER_CONTEXT_ID_SUFFIX = '__NAMED_CONTEXT';
 async function reviveOrCreateContext(adapterId, durableStore, durableStoreErrorHandler, contextStores, pendingContextStoreKeys, onContextLoaded) {
@@ -440,13 +466,18 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     // event. If this instance of makeDurable caused that L2 write we can ignore that
     // on change event. This Set helps us do that.
     const pendingContextStoreKeys = new Set();
+    // redirects that need to be flushed to the durable store
+    const pendingStoreRedirects = new Map();
     const contextStores = create(null);
     let initializationPromise = new Promise((resolve) => {
         const finish = () => {
             resolve();
             initializationPromise = undefined;
         };
-        reviveTTLOverrides(durableTTLStore, environment).then(finish);
+        Promise.all([
+            reviveTTLOverrides(durableTTLStore, environment),
+            reviveRedirects(durableStore, environment),
+        ]).then(finish);
     });
     //instrumentation for durable store errors
     const durableStoreErrorHandler = handleDurableStoreRejection(instrumentation);
@@ -459,6 +490,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
         const defaultSegmentKeys = [];
         const adapterContextSegmentKeys = [];
+        const redirectSegmentKeys = [];
+        let shouldBroadcast = false;
         for (let i = 0, len = changes.length; i < len; i++) {
             const change = changes[i];
             // we only care about changes to the data which is stored in the default
@@ -469,6 +502,20 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             else if (change.segment === AdapterContextSegment) {
                 adapterContextSegmentKeys.push(...change.ids);
             }
+            else if (change.segment === RedirectDurableSegment) {
+                redirectSegmentKeys.push(...change.ids);
+            }
+        }
+        if (redirectSegmentKeys.length > 0) {
+            const redirectEntries = await durableStore.getEntries(redirectSegmentKeys, RedirectDurableSegment);
+            if (redirectEntries !== undefined) {
+                const redirectKeys = Object.keys(redirectEntries);
+                for (const key of redirectKeys) {
+                    const redirectData = redirectEntries[key];
+                    environment.storeRedirect(redirectData.data.key, redirectData.data.redirect);
+                    shouldBroadcast = true;
+                }
+            }
         }
         // process adapter context changes
         const adapterContextKeysFromDifferentInstance = [];
@@ -505,10 +552,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         if (defaultSegmentKeysLength > 0) {
             for (let i = 0; i < defaultSegmentKeysLength; i++) {
                 const key = defaultSegmentKeys[i];
-                const 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
@@ -516,6 +559,9 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // call base environment storeEvict so this evict is not tracked for durable deletion
                 environment.storeEvict(key);
             }
+            shouldBroadcast = true;
+        }
+        if (shouldBroadcast) {
             await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
         }
     });
@@ -566,12 +612,13 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         // call the base storeBroadcast
         return publishChangesToDurableStore();
     };
-    const publishChangesToDurableStore = function () {
+    const publishChangesToDurableStore = function (additionalDurableStoreOperations) {
         validateNotDisposed();
         if (ingestStagingStore === null) {
             return Promise.resolve();
         }
-        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler);
+        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+        pendingStoreRedirects.clear();
         ingestStagingStore = null;
         return promise;
     };
@@ -653,6 +700,7 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeRedirect = function (existingKey, canonicalKey) {
         validateNotDisposed();
+        pendingStoreRedirects.set(existingKey, canonicalKey);
         // call redirect on staging store so "old" keys are removed from L2 on
         // the next publishChangesToDurableStore.  NOTE: we don't need to call
         // redirect on the base environment store because staging store and base
@@ -746,7 +794,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         for (const cacheKeyMapKey of cacheKeyMapKeys) {
             const cacheKey = cacheKeyMap.get(cacheKeyMapKey);
             if (cacheKey.mergeable === true) {
-                keysToRevive.add(cacheKeyMapKey);
+                const canonical = environment.storeGetCanonicalKey(cacheKeyMapKey);
+                keysToRevive.add(canonical);
             }
         }
         let snapshotFromMemoryIngest = undefined;

package/dist/es/es2018/types/DurableStore.d.ts

@@ -42,7 +42,9 @@ export interface DurableStoreEvictOperation extends BaseOperation {
 }
 export type DurableStoreOperation<T> = DurableStoreSetOperation<T> | DurableStoreEvictOperation;
 export type DefaultDurableSegmentName = 'DEFAULT';
+export type RedirectDurableSegmentName = 'REDIRECT_KEYS';
 export declare const DefaultDurableSegment: DefaultDurableSegmentName;
+export declare const RedirectDurableSegment: RedirectDurableSegmentName;
 export interface DurableStoreChange {
     /** The entry IDs of the entries that have changed */
     ids: string[];

package/dist/es/es2018/types/makeDurable/flush.d.ts

@@ -1,4 +1,4 @@
 import type { InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from '../DurableStore';
+import type { DurableStore, DurableStoreOperation } from '../DurableStore';
 import type { DurableStoreRejectionHandler } from './error';
-export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler): Promise<void>;
+export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler, redirects: Map<string, string>, additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;

package/dist/es/es2018/types/makeDurable/redirects.d.ts

@@ -0,0 +1,7 @@
+import type { Environment } from '@luvio/engine';
+import type { DurableStore } from '../DurableStore';
+export interface RedirectData {
+    key: string;
+    redirect: string;
+}
+export declare function reviveRedirects(durableStore: DurableStore, env: Environment): Promise<void>;

package/dist/es/es2018/types/makeDurable.d.ts

@@ -1,5 +1,5 @@
 import type { Environment, RecordSource, InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from './DurableStore';
+import type { DurableStore, DurableStoreOperation } from './DurableStore';
 import type { InstrumentationFunction } from './makeDurable/error';
 import type { TTLOverridesMap } from './DurableTTLStore';
 export interface DurableEnvironment extends Environment {
@@ -8,9 +8,12 @@ export interface DurableEnvironment extends Environment {
      */
     dispose(): Promise<void>;
     /**
-     * publishes the pending changes to the durable store
+     * Publishes the pending changes in the ingestStagingStore to the durable store.
+     *
+     * Optionally takes in additional DurableStore operations to allow for an
+     * "atomic" transaction to the DurableStore.
      */
-    publishChangesToDurableStore(): Promise<void>;
+    publishChangesToDurableStore(additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;
     /**
      * gets all the stored ttl overrides stored in the durable store
      */

package/dist/umd/es2018/environments.js

@@ -22,6 +22,7 @@
         return false;
     }
     const DefaultDurableSegment = 'DEFAULT';
+    const RedirectDurableSegment = 'REDIRECT_KEYS';
 
     const { keys, create, assign, freeze } = Object;
     const { isArray } = Array;
@@ -295,7 +296,7 @@
         }
         return { ...source };
     }
-    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
+    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
         const durableRecords = create(null);
         const evictedRecords = create(null);
         const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -324,7 +325,7 @@
                 };
             }
         }
-        const durableStoreOperations = [];
+        const durableStoreOperations = additionalDurableStoreOperations;
         // publishes
         const recordKeys = keys(durableRecords);
         if (recordKeys.length > 0) {
@@ -334,6 +335,18 @@
                 segment: DefaultDurableSegment,
             });
         }
+        // redirects
+        redirects.forEach((value, key) => {
+            durableStoreOperations.push({
+                type: 'setEntries',
+                entries: {
+                    [key]: {
+                        data: { key, redirect: value },
+                    },
+                },
+                segment: RedirectDurableSegment,
+            });
+        });
         // evicts
         const evictedKeys = keys(evictedRecords);
         if (evictedKeys.length > 0) {
@@ -382,6 +395,19 @@
         return environment.storeBuildIngestionStagingStore();
     }
 
+    async function reviveRedirects(durableStore, env) {
+        const entries = await durableStore.getAllEntries(RedirectDurableSegment);
+        if (entries) {
+            for (const durableEntry of Object.keys(entries)) {
+                const entry = entries[durableEntry];
+                const { data: { key, redirect }, } = entry;
+                if (entry) {
+                    env.storeRedirect(key, redirect);
+                }
+            }
+        }
+    }
+
     const AdapterContextSegment = 'ADAPTER-CONTEXT';
     const ADAPTER_CONTEXT_ID_SUFFIX = '__NAMED_CONTEXT';
     async function reviveOrCreateContext(adapterId, durableStore, durableStoreErrorHandler, contextStores, pendingContextStoreKeys, onContextLoaded) {
@@ -444,13 +470,18 @@
         // event. If this instance of makeDurable caused that L2 write we can ignore that
         // on change event. This Set helps us do that.
         const pendingContextStoreKeys = new Set();
+        // redirects that need to be flushed to the durable store
+        const pendingStoreRedirects = new Map();
         const contextStores = create(null);
         let initializationPromise = new Promise((resolve) => {
             const finish = () => {
                 resolve();
                 initializationPromise = undefined;
             };
-            reviveTTLOverrides(durableTTLStore, environment).then(finish);
+            Promise.all([
+                reviveTTLOverrides(durableTTLStore, environment),
+                reviveRedirects(durableStore, environment),
+            ]).then(finish);
         });
         //instrumentation for durable store errors
         const durableStoreErrorHandler = handleDurableStoreRejection(instrumentation);
@@ -463,6 +494,8 @@
         const unsubscribe = durableStore.registerOnChangedListener(async (changes) => {
             const defaultSegmentKeys = [];
             const adapterContextSegmentKeys = [];
+            const redirectSegmentKeys = [];
+            let shouldBroadcast = false;
             for (let i = 0, len = changes.length; i < len; i++) {
                 const change = changes[i];
                 // we only care about changes to the data which is stored in the default
@@ -473,6 +506,20 @@
                 else if (change.segment === AdapterContextSegment) {
                     adapterContextSegmentKeys.push(...change.ids);
                 }
+                else if (change.segment === RedirectDurableSegment) {
+                    redirectSegmentKeys.push(...change.ids);
+                }
+            }
+            if (redirectSegmentKeys.length > 0) {
+                const redirectEntries = await durableStore.getEntries(redirectSegmentKeys, RedirectDurableSegment);
+                if (redirectEntries !== undefined) {
+                    const redirectKeys = Object.keys(redirectEntries);
+                    for (const key of redirectKeys) {
+                        const redirectData = redirectEntries[key];
+                        environment.storeRedirect(redirectData.data.key, redirectData.data.redirect);
+                        shouldBroadcast = true;
+                    }
+                }
             }
             // process adapter context changes
             const adapterContextKeysFromDifferentInstance = [];
@@ -509,10 +556,6 @@
             if (defaultSegmentKeysLength > 0) {
                 for (let i = 0; i < defaultSegmentKeysLength; i++) {
                     const key = defaultSegmentKeys[i];
-                    const 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
@@ -520,6 +563,9 @@
                     // call base environment storeEvict so this evict is not tracked for durable deletion
                     environment.storeEvict(key);
                 }
+                shouldBroadcast = true;
+            }
+            if (shouldBroadcast) {
                 await environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable);
             }
         });
@@ -570,12 +616,13 @@
             // call the base storeBroadcast
             return publishChangesToDurableStore();
         };
-        const publishChangesToDurableStore = function () {
+        const publishChangesToDurableStore = function (additionalDurableStoreOperations) {
             validateNotDisposed();
             if (ingestStagingStore === null) {
                 return Promise.resolve();
             }
-            const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler);
+            const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+            pendingStoreRedirects.clear();
             ingestStagingStore = null;
             return promise;
         };
@@ -657,6 +704,7 @@
         };
         const storeRedirect = function (existingKey, canonicalKey) {
             validateNotDisposed();
+            pendingStoreRedirects.set(existingKey, canonicalKey);
             // call redirect on staging store so "old" keys are removed from L2 on
             // the next publishChangesToDurableStore.  NOTE: we don't need to call
             // redirect on the base environment store because staging store and base
@@ -750,7 +798,8 @@
             for (const cacheKeyMapKey of cacheKeyMapKeys) {
                 const cacheKey = cacheKeyMap.get(cacheKeyMapKey);
                 if (cacheKey.mergeable === true) {
-                    keysToRevive.add(cacheKeyMapKey);
+                    const canonical = environment.storeGetCanonicalKey(cacheKeyMapKey);
+                    keysToRevive.add(canonical);
                 }
             }
             let snapshotFromMemoryIngest = undefined;

package/dist/umd/es2018/types/DurableStore.d.ts

@@ -42,7 +42,9 @@ export interface DurableStoreEvictOperation extends BaseOperation {
 }
 export type DurableStoreOperation<T> = DurableStoreSetOperation<T> | DurableStoreEvictOperation;
 export type DefaultDurableSegmentName = 'DEFAULT';
+export type RedirectDurableSegmentName = 'REDIRECT_KEYS';
 export declare const DefaultDurableSegment: DefaultDurableSegmentName;
+export declare const RedirectDurableSegment: RedirectDurableSegmentName;
 export interface DurableStoreChange {
     /** The entry IDs of the entries that have changed */
     ids: string[];

package/dist/umd/es2018/types/makeDurable/flush.d.ts

@@ -1,4 +1,4 @@
 import type { InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from '../DurableStore';
+import type { DurableStore, DurableStoreOperation } from '../DurableStore';
 import type { DurableStoreRejectionHandler } from './error';
-export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler): Promise<void>;
+export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler, redirects: Map<string, string>, additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;

package/dist/umd/es2018/types/makeDurable/redirects.d.ts

@@ -0,0 +1,7 @@
+import type { Environment } from '@luvio/engine';
+import type { DurableStore } from '../DurableStore';
+export interface RedirectData {
+    key: string;
+    redirect: string;
+}
+export declare function reviveRedirects(durableStore: DurableStore, env: Environment): Promise<void>;

package/dist/umd/es2018/types/makeDurable.d.ts

@@ -1,5 +1,5 @@
 import type { Environment, RecordSource, InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from './DurableStore';
+import type { DurableStore, DurableStoreOperation } from './DurableStore';
 import type { InstrumentationFunction } from './makeDurable/error';
 import type { TTLOverridesMap } from './DurableTTLStore';
 export interface DurableEnvironment extends Environment {
@@ -8,9 +8,12 @@ export interface DurableEnvironment extends Environment {
      */
     dispose(): Promise<void>;
     /**
-     * publishes the pending changes to the durable store
+     * Publishes the pending changes in the ingestStagingStore to the durable store.
+     *
+     * Optionally takes in additional DurableStore operations to allow for an
+     * "atomic" transaction to the DurableStore.
      */
-    publishChangesToDurableStore(): Promise<void>;
+    publishChangesToDurableStore(additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;
     /**
      * gets all the stored ttl overrides stored in the durable store
      */

package/dist/umd/es5/environments.js

@@ -22,6 +22,7 @@
         return false;
     }
     var DefaultDurableSegment = 'DEFAULT';
+    var RedirectDurableSegment = 'REDIRECT_KEYS';
 
     /******************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -376,7 +377,8 @@
         }
         return __assign({}, source);
     }
-    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler) {
+    function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations) {
+        if (additionalDurableStoreOperations === void 0) { additionalDurableStoreOperations = []; }
         var durableRecords = create(null);
         var evictedRecords = create(null);
         var _a = store.fallbackStringKeyInMemoryStore, records = _a.records, storeMetadata = _a.metadata, visitedIds = _a.visitedIds, refreshedIds = _a.refreshedIds;
@@ -402,7 +404,7 @@
                 durableRecords[key].metadata = __assign(__assign({}, metadata), { metadataVersion: DURABLE_METADATA_VERSION });
             }
         }
-        var durableStoreOperations = [];
+        var durableStoreOperations = additionalDurableStoreOperations;
         // publishes
         var recordKeys = keys(durableRecords);
         if (recordKeys.length > 0) {
@@ -412,6 +414,19 @@
                 segment: DefaultDurableSegment,
             });
         }
+        // redirects
+        redirects.forEach(function (value, key) {
+            var _a;
+            durableStoreOperations.push({
+                type: 'setEntries',
+                entries: (_a = {},
+                    _a[key] = {
+                        data: { key: key, redirect: value },
+                    },
+                    _a),
+                segment: RedirectDurableSegment,
+            });
+        });
         // evicts
         var evictedKeys = keys(evictedRecords);
         if (evictedKeys.length > 0) {
@@ -470,6 +485,30 @@
         return environment.storeBuildIngestionStagingStore();
     }
 
+    function reviveRedirects(durableStore, env) {
+        return __awaiter(this, void 0, void 0, function () {
+            var entries, _i, _a, durableEntry, entry, _b, key, redirect;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0: return [4 /*yield*/, durableStore.getAllEntries(RedirectDurableSegment)];
+                    case 1:
+                        entries = _c.sent();
+                        if (entries) {
+                            for (_i = 0, _a = Object.keys(entries); _i < _a.length; _i++) {
+                                durableEntry = _a[_i];
+                                entry = entries[durableEntry];
+                                _b = entry.data, key = _b.key, redirect = _b.redirect;
+                                if (entry) {
+                                    env.storeRedirect(key, redirect);
+                                }
+                            }
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
+
     var AdapterContextSegment = 'ADAPTER-CONTEXT';
     var ADAPTER_CONTEXT_ID_SUFFIX = '__NAMED_CONTEXT';
     function reviveOrCreateContext(adapterId, durableStore, durableStoreErrorHandler, contextStores, pendingContextStoreKeys, onContextLoaded) {
@@ -548,13 +587,18 @@
         // event. If this instance of makeDurable caused that L2 write we can ignore that
         // on change event. This Set helps us do that.
         var pendingContextStoreKeys = new Set();
+        // redirects that need to be flushed to the durable store
+        var pendingStoreRedirects = new Map();
         var contextStores = create(null);
         var initializationPromise = new Promise(function (resolve) {
             var finish = function () {
                 resolve();
                 initializationPromise = undefined;
             };
-            reviveTTLOverrides(durableTTLStore, environment).then(finish);
+            Promise.all([
+                reviveTTLOverrides(durableTTLStore, environment),
+                reviveRedirects(durableStore, environment),
+            ]).then(finish);
         });
         //instrumentation for durable store errors
         var durableStoreErrorHandler = handleDurableStoreRejection(instrumentation);
@@ -565,12 +609,14 @@
             }
         };
         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) {
+            var defaultSegmentKeys, adapterContextSegmentKeys, redirectSegmentKeys, shouldBroadcast, i, len, change, redirectEntries, redirectKeys, _i, redirectKeys_1, key, redirectData, adapterContextKeysFromDifferentInstance, _a, adapterContextSegmentKeys_1, key, entries, entryKeys, i, len, entryKey, entry, error_2, defaultSegmentKeysLength, i, key;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         defaultSegmentKeys = [];
                         adapterContextSegmentKeys = [];
+                        redirectSegmentKeys = [];
+                        shouldBroadcast = false;
                         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
@@ -581,10 +627,28 @@
                             else if (change.segment === AdapterContextSegment) {
                                 adapterContextSegmentKeys.push.apply(adapterContextSegmentKeys, change.ids);
                             }
+                            else if (change.segment === RedirectDurableSegment) {
+                                redirectSegmentKeys.push.apply(redirectSegmentKeys, change.ids);
+                            }
+                        }
+                        if (!(redirectSegmentKeys.length > 0)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, durableStore.getEntries(redirectSegmentKeys, RedirectDurableSegment)];
+                    case 1:
+                        redirectEntries = _b.sent();
+                        if (redirectEntries !== undefined) {
+                            redirectKeys = Object.keys(redirectEntries);
+                            for (_i = 0, redirectKeys_1 = redirectKeys; _i < redirectKeys_1.length; _i++) {
+                                key = redirectKeys_1[_i];
+                                redirectData = redirectEntries[key];
+                                environment.storeRedirect(redirectData.data.key, redirectData.data.redirect);
+                                shouldBroadcast = true;
+                            }
                         }
+                        _b.label = 2;
+                    case 2:
                         adapterContextKeysFromDifferentInstance = [];
-                        for (_i = 0, adapterContextSegmentKeys_1 = adapterContextSegmentKeys; _i < adapterContextSegmentKeys_1.length; _i++) {
-                            key = adapterContextSegmentKeys_1[_i];
+                        for (_a = 0, adapterContextSegmentKeys_1 = adapterContextSegmentKeys; _a < adapterContextSegmentKeys_1.length; _a++) {
+                            key = adapterContextSegmentKeys_1[_a];
                             if (pendingContextStoreKeys.has(key)) {
                                 // if this instance caused the L2 write then remove from the
                                 // "pending" Set and move on
@@ -596,13 +660,13 @@
                                 adapterContextKeysFromDifferentInstance.push(key);
                             }
                         }
-                        if (!(adapterContextKeysFromDifferentInstance.length > 0)) return [3 /*break*/, 4];
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, 3, , 4]);
+                        if (!(adapterContextKeysFromDifferentInstance.length > 0)) return [3 /*break*/, 6];
+                        _b.label = 3;
+                    case 3:
+                        _b.trys.push([3, 5, , 6]);
                         return [4 /*yield*/, durableStore.getEntries(adapterContextKeysFromDifferentInstance, AdapterContextSegment)];
-                    case 2:
-                        entries = _a.sent();
+                    case 4:
+                        entries = _b.sent();
                         if (entries !== undefined) {
                             entryKeys = keys(entries);
                             for (i = 0, len = entryKeys.length; i < len; i++) {
@@ -611,32 +675,31 @@
                                 contextStores[entryKey] = entry.data;
                             }
                         }
-                        return [3 /*break*/, 4];
-                    case 3:
-                        error_2 = _a.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        error_2 = _b.sent();
                         durableStoreErrorHandler(error_2);
-                        return [3 /*break*/, 4];
-                    case 4:
+                        return [3 /*break*/, 6];
+                    case 6:
                         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;
+                        if (defaultSegmentKeysLength > 0) {
+                            for (i = 0; i < defaultSegmentKeysLength; i++) {
+                                key = defaultSegmentKeys[i];
+                                // 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);
                             }
-                            // 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);
+                            shouldBroadcast = true;
                         }
+                        if (!shouldBroadcast) return [3 /*break*/, 8];
                         return [4 /*yield*/, environment.storeBroadcast(rebuildSnapshot, environment.snapshotAvailable)];
-                    case 5:
-                        _a.sent();
-                        _a.label = 6;
-                    case 6: return [2 /*return*/];
+                    case 7:
+                        _b.sent();
+                        _b.label = 8;
+                    case 8: return [2 /*return*/];
                 }
             });
         }); });
@@ -687,12 +750,13 @@
             // call the base storeBroadcast
             return publishChangesToDurableStore();
         };
-        var publishChangesToDurableStore = function () {
+        var publishChangesToDurableStore = function (additionalDurableStoreOperations) {
             validateNotDisposed();
             if (ingestStagingStore === null) {
                 return Promise.resolve();
             }
-            var promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler);
+            var promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+            pendingStoreRedirects.clear();
             ingestStagingStore = null;
             return promise;
         };
@@ -774,6 +838,7 @@
         };
         var storeRedirect = function (existingKey, canonicalKey) {
             validateNotDisposed();
+            pendingStoreRedirects.set(existingKey, canonicalKey);
             // call redirect on staging store so "old" keys are removed from L2 on
             // the next publishChangesToDurableStore.  NOTE: we don't need to call
             // redirect on the base environment store because staging store and base
@@ -868,7 +933,7 @@
         };
         var handleSuccessResponse = function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
             return __awaiter(this, void 0, void 0, function () {
-                var cacheKeyMap, cacheKeyMapKeys, keysToRevive, _i, cacheKeyMapKeys_1, cacheKeyMapKey, cacheKey, snapshotFromMemoryIngest, keysToReviveAsArray, readWritePromise, _a, keysToReviveAsArray_1, key, _b, keysToReviveAsArray_2, key, pendingPromise, _c, select, refresh, result;
+                var cacheKeyMap, cacheKeyMapKeys, keysToRevive, _i, cacheKeyMapKeys_1, cacheKeyMapKey, cacheKey, canonical, snapshotFromMemoryIngest, keysToReviveAsArray, readWritePromise, _a, keysToReviveAsArray_1, key, _b, keysToReviveAsArray_2, key, pendingPromise, _c, select, refresh, result;
                 var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
@@ -881,7 +946,8 @@
                                 cacheKeyMapKey = cacheKeyMapKeys_1[_i];
                                 cacheKey = cacheKeyMap.get(cacheKeyMapKey);
                                 if (cacheKey.mergeable === true) {
-                                    keysToRevive.add(cacheKeyMapKey);
+                                    canonical = environment.storeGetCanonicalKey(cacheKeyMapKey);
+                                    keysToRevive.add(canonical);
                                 }
                             }
                             snapshotFromMemoryIngest = undefined;

package/dist/umd/es5/types/DurableStore.d.ts

@@ -42,7 +42,9 @@ export interface DurableStoreEvictOperation extends BaseOperation {
 }
 export type DurableStoreOperation<T> = DurableStoreSetOperation<T> | DurableStoreEvictOperation;
 export type DefaultDurableSegmentName = 'DEFAULT';
+export type RedirectDurableSegmentName = 'REDIRECT_KEYS';
 export declare const DefaultDurableSegment: DefaultDurableSegmentName;
+export declare const RedirectDurableSegment: RedirectDurableSegmentName;
 export interface DurableStoreChange {
     /** The entry IDs of the entries that have changed */
     ids: string[];

package/dist/umd/es5/types/makeDurable/flush.d.ts

@@ -1,4 +1,4 @@
 import type { InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from '../DurableStore';
+import type { DurableStore, DurableStoreOperation } from '../DurableStore';
 import type { DurableStoreRejectionHandler } from './error';
-export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler): Promise<void>;
+export declare function flushInMemoryStoreValuesToDurableStore(store: InMemoryStore, durableStore: DurableStore, durableStoreErrorHandler: DurableStoreRejectionHandler, redirects: Map<string, string>, additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;

package/dist/umd/es5/types/makeDurable/redirects.d.ts

@@ -0,0 +1,7 @@
+import type { Environment } from '@luvio/engine';
+import type { DurableStore } from '../DurableStore';
+export interface RedirectData {
+    key: string;
+    redirect: string;
+}
+export declare function reviveRedirects(durableStore: DurableStore, env: Environment): Promise<void>;

package/dist/umd/es5/types/makeDurable.d.ts

@@ -1,5 +1,5 @@
 import type { Environment, RecordSource, InMemoryStore } from '@luvio/engine';
-import type { DurableStore } from './DurableStore';
+import type { DurableStore, DurableStoreOperation } from './DurableStore';
 import type { InstrumentationFunction } from './makeDurable/error';
 import type { TTLOverridesMap } from './DurableTTLStore';
 export interface DurableEnvironment extends Environment {
@@ -8,9 +8,12 @@ export interface DurableEnvironment extends Environment {
      */
     dispose(): Promise<void>;
     /**
-     * publishes the pending changes to the durable store
+     * Publishes the pending changes in the ingestStagingStore to the durable store.
+     *
+     * Optionally takes in additional DurableStore operations to allow for an
+     * "atomic" transaction to the DurableStore.
      */
-    publishChangesToDurableStore(): Promise<void>;
+    publishChangesToDurableStore(additionalDurableStoreOperations?: DurableStoreOperation<unknown>[]): Promise<void>;
     /**
      * gets all the stored ttl overrides stored in the durable store
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/environments",
-    "version": "0.138.7",
+    "version": "0.138.8-244.0",
     "description": "Luvio Environments",
     "repository": {
         "type": "git",
@@ -23,7 +23,7 @@
         "watch": "yarn build --watch"
     },
     "dependencies": {
-        "@luvio/engine": "^0.138.7"
+        "@luvio/engine": "0.138.8-244.0"
     },
     "volta": {
         "extends": "../../../package.json"
@@ -32,8 +32,8 @@
         {
             "path": "./dist/es/es2018/environments.js",
             "maxSize": {
-                "none": "40 kB",
-                "min": "11.5 kB",
+                "none": "41 kB",
+                "min": "12 kB",
                 "compressed": "8 kB"
             }
         }