@salesforce/lds-runtime-mobile 1.144.0 → 1.146.0

package/dist/main.js

@@ -518,6 +518,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
     return false;
 }
 const DefaultDurableSegment = 'DEFAULT';
+const RedirectDurableSegment = 'REDIRECT_KEYS';
 
 const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
 
@@ -761,7 +762,7 @@ class DurableTTLStore {
     }
 }
 
-function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations = []) {
+function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
     const durableRecords = create$5(null);
     const evictedRecords = create$5(null);
     const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -798,6 +799,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$6(evictedRecords);
     if (evictedKeys.length > 0) {
@@ -843,6 +856,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) {
@@ -906,13 +932,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$5(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);
@@ -925,6 +956,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
@@ -935,6 +968,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 = [];
@@ -971,10 +1018,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
@@ -982,6 +1025,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);
         }
     });
@@ -1037,7 +1083,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         if (ingestStagingStore === null) {
             return Promise.resolve();
         }
-        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations);
+        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+        pendingStoreRedirects.clear();
         ingestStagingStore = null;
         return promise;
     };
@@ -1119,6 +1166,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
@@ -4830,7 +4878,6 @@ function buildLuvioOverrideForDraftAdapters(luvio, handler, extractTargetIdFromC
 }
 
 const DraftIdMappingKeyPrefix240 = 'DraftIdMapping::';
-const DraftKeyMappingKeyPrefix = 'DraftKeyMapping::V2::';
 const DRAFT_ID_MAPPINGS_SEGMENT = 'DRAFT_ID_MAPPINGS';
 function isLegacyDraftIdMapping(key, data) {
     return key.startsWith(DraftIdMappingKeyPrefix240);
@@ -4840,9 +4887,6 @@ function isLegacyDraftIdMapping(key, data) {
 function getRecordKeyForId$1(id) {
     return `UiApi::RecordRepresentation:${id}`;
 }
-function generateDraftIdMappingKey(draftIdMapping) {
-    return `${DraftKeyMappingKeyPrefix}${draftIdMapping.draftKey}::${draftIdMapping.canonicalKey}`;
-}
 /**
  *
  * @param mappingIds (optional) requested mapping ids, if undefined all will be retrieved
@@ -4876,6 +4920,15 @@ async function getDraftIdMappings(durableStore, mappingIds) {
     }
     return mappings;
 }
+async function clearDraftIdSegment(durableStore) {
+    const entries = await durableStore.getAllEntries(DRAFT_ID_MAPPINGS_SEGMENT);
+    if (entries) {
+        const keys$1 = keys$4(entries);
+        if (keys$1.length > 0) {
+            await durableStore.evictEntries(keys$1, DRAFT_ID_MAPPINGS_SEGMENT);
+        }
+    }
+}
 
 /**
  * Generates a time-ordered, unique id to associate with a DraftAction. Ensures
@@ -4966,9 +5019,6 @@ function customActionHandler(executor, id, draftQueue) {
         });
         return queueOperations;
     };
-    const getRedirectMappings = (_action) => {
-        return undefined;
-    };
     return {
         handlerId: id,
         enqueue: (data) => {
@@ -4980,7 +5030,6 @@ function customActionHandler(executor, id, draftQueue) {
         handleReplaceAction: () => {
             throw Error('replaceAction not supported for custom actions');
         },
-        getRedirectMappings,
         handleActionRemoved: () => Promise.resolve(),
         handleActionCompleted: () => Promise.resolve(),
         handleActionEnqueued: () => Promise.resolve(),
@@ -5155,17 +5204,11 @@ class DurableDraftQueue {
                 const handler = this.getHandler(action.handler);
                 let queue = await this.getQueueActions();
                 const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
-                const idAndKeyMappings = handler.getRedirectMappings(action);
-                const keyMappings = idAndKeyMappings === undefined
-                    ? undefined
-                    : idAndKeyMappings.map((m) => {
-                        return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
-                    });
-                await this.draftStore.completeAction(queueOperations, keyMappings);
-                queue = await this.getQueueActions();
+                // write the queue operations to the store prior to ingesting the result
+                await this.draftStore.completeAction(queueOperations);
+                await handler.handleActionCompleted(action, queueOperations, values$1(this.handlers));
                 this.retryIntervalMilliseconds = 0;
                 this.uploadingActionId = undefined;
-                await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
                 await this.notifyChangedListeners({
                     type: DraftQueueEventType.ActionCompleted,
                     action,
@@ -5488,7 +5531,7 @@ class DurableDraftStore {
         };
         return this.enqueueAction(deleteAction);
     }
-    completeAction(queueOperations, mappings) {
+    completeAction(queueOperations) {
         const action = () => {
             const durableStoreOperations = [];
             const { draftStore } = this;
@@ -5521,18 +5564,6 @@ class DurableDraftStore {
                     });
                 }
             }
-            if (mappings !== undefined) {
-                const entries = {};
-                for (const mapping of mappings) {
-                    const mappingKey = generateDraftIdMappingKey(mapping);
-                    entries[mappingKey] = { data: mapping };
-                }
-                durableStoreOperations.push({
-                    entries,
-                    type: 'setEntries',
-                    segment: DRAFT_ID_MAPPINGS_SEGMENT,
-                });
-            }
             return this.durableStore.batchOperations(durableStoreOperations);
         };
         return this.enqueueAction(action);
@@ -5811,7 +5842,7 @@ class AbstractResourceRequestActionHandler {
             },
         ];
     }
-    async handleActionCompleted(action, queueOperations, _queue, allHandlers) {
+    async handleActionCompleted(action, queueOperations, allHandlers) {
         const { data: request, tag } = action;
         const { method } = request;
         if (method === 'delete') {
@@ -5925,11 +5956,18 @@ class AbstractResourceRequestActionHandler {
     async ingestResponses(responses, action) {
         const luvio = this.getLuvio();
         await luvio.handleSuccessResponse(() => {
+            if (action.status === DraftActionStatus.Completed) {
+                const mappings = this.getRedirectMappings(action);
+                if (mappings) {
+                    mappings.forEach((mapping) => {
+                        luvio.storeRedirect(mapping.draftKey, mapping.canonicalKey);
+                    });
+                }
+            }
             for (const entry of responses) {
                 const { response, synchronousIngest } = entry;
                 synchronousIngest(response, action);
             }
-            // must call base broadcast
             return luvio.storeBroadcast();
         }, 
         // getTypeCacheKeysRecord uses the response, not the full path factory
@@ -6258,6 +6296,8 @@ class DraftManager {
 
 function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueue) {
     const draftMetadata = {};
+    // in 246 luvio took charge of persisting redirect mappings, this needs to stick around
+    // for a couple of releases to support older environments
     // setup existing store redirects when bootstrapping the environment
     (async () => {
         const mappings = await getDraftIdMappings(durableStore);
@@ -6265,23 +6305,9 @@ function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueu
             const { draftKey, canonicalKey } = mapping;
             env.storeRedirect(draftKey, canonicalKey);
         });
+        await env.storeBroadcast(env.rebuildSnapshot, env.snapshotAvailable);
+        await clearDraftIdSegment(durableStore);
     })();
-    durableStore.registerOnChangedListener(async (changes) => {
-        const draftIdMappingsIds = [];
-        for (let i = 0, len = changes.length; i < len; i++) {
-            const change = changes[i];
-            if (change.segment === DRAFT_ID_MAPPINGS_SEGMENT) {
-                draftIdMappingsIds.push(...change.ids);
-            }
-        }
-        if (draftIdMappingsIds.length > 0) {
-            const mappings = await getDraftIdMappings(durableStore, draftIdMappingsIds);
-            mappings.forEach((mapping) => {
-                const { draftKey, canonicalKey } = mapping;
-                env.storeRedirect(draftKey, canonicalKey);
-            });
-        }
-    });
     const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
         const queue = await draftQueue.getQueueActions();
         if (queue.length === 0) {
@@ -14717,6 +14743,7 @@ function instrumentAdapter(adapter, metadata) {
     return instrumentAdapter$1(instrumentedMobileAdapter, metadata, {
         trackL1Hits: true,
         trackL2Hits: true,
+        trackCacheMisses: true,
         reportObserver: (report) => {
             for (const observer of reportObservers) {
                 observer(report);
@@ -15019,7 +15046,7 @@ class NimbusSqliteStore {
     registerOnChangedListener(listener) {
         let unsubscribeId = undefined;
         this.plugin
-            .registerOnChangedListener((changes) => {
+            .registerOnChangedListener(async (changes) => {
             const durableChanges = changes.map((c) => {
                 return {
                     type: c.type === 'upsert' ? 'setEntries' : 'evictEntries',
@@ -15028,7 +15055,7 @@ class NimbusSqliteStore {
                     segment: c.context.segment,
                 };
             });
-            listener(durableChanges);
+            await listener(durableChanges);
         })
             .then((unsub) => {
             unsubscribeId = unsub;
@@ -15970,4 +15997,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.144.0-ac4b15ad8
+// version: 1.146.0-6ca270a7a

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.144.0",
+    "version": "1.146.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",

package/sfdc/main.js

@@ -518,6 +518,7 @@ function isDeprecatedDurableStoreEntry(durableRecord) {
     return false;
 }
 const DefaultDurableSegment = 'DEFAULT';
+const RedirectDurableSegment = 'REDIRECT_KEYS';
 
 const { keys: keys$6, create: create$5, assign: assign$4, freeze: freeze$1 } = Object;
 
@@ -761,7 +762,7 @@ class DurableTTLStore {
     }
 }
 
-function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations = []) {
+function flushInMemoryStoreValuesToDurableStore(store, durableStore, durableStoreErrorHandler, redirects, additionalDurableStoreOperations = []) {
     const durableRecords = create$5(null);
     const evictedRecords = create$5(null);
     const { records, metadata: storeMetadata, visitedIds, refreshedIds, } = store.fallbackStringKeyInMemoryStore;
@@ -798,6 +799,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$6(evictedRecords);
     if (evictedKeys.length > 0) {
@@ -843,6 +856,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) {
@@ -906,13 +932,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$5(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);
@@ -925,6 +956,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
@@ -935,6 +968,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 = [];
@@ -971,10 +1018,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
@@ -982,6 +1025,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);
         }
     });
@@ -1037,7 +1083,8 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         if (ingestStagingStore === null) {
             return Promise.resolve();
         }
-        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, additionalDurableStoreOperations);
+        const promise = flushInMemoryStoreValuesToDurableStore(ingestStagingStore, durableStore, durableStoreErrorHandler, new Map(pendingStoreRedirects), additionalDurableStoreOperations);
+        pendingStoreRedirects.clear();
         ingestStagingStore = null;
         return promise;
     };
@@ -1119,6 +1166,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
@@ -4830,7 +4878,6 @@ function buildLuvioOverrideForDraftAdapters(luvio, handler, extractTargetIdFromC
 }
 
 const DraftIdMappingKeyPrefix240 = 'DraftIdMapping::';
-const DraftKeyMappingKeyPrefix = 'DraftKeyMapping::V2::';
 const DRAFT_ID_MAPPINGS_SEGMENT = 'DRAFT_ID_MAPPINGS';
 function isLegacyDraftIdMapping(key, data) {
     return key.startsWith(DraftIdMappingKeyPrefix240);
@@ -4840,9 +4887,6 @@ function isLegacyDraftIdMapping(key, data) {
 function getRecordKeyForId$1(id) {
     return `UiApi::RecordRepresentation:${id}`;
 }
-function generateDraftIdMappingKey(draftIdMapping) {
-    return `${DraftKeyMappingKeyPrefix}${draftIdMapping.draftKey}::${draftIdMapping.canonicalKey}`;
-}
 /**
  *
  * @param mappingIds (optional) requested mapping ids, if undefined all will be retrieved
@@ -4876,6 +4920,15 @@ async function getDraftIdMappings(durableStore, mappingIds) {
     }
     return mappings;
 }
+async function clearDraftIdSegment(durableStore) {
+    const entries = await durableStore.getAllEntries(DRAFT_ID_MAPPINGS_SEGMENT);
+    if (entries) {
+        const keys$1 = keys$4(entries);
+        if (keys$1.length > 0) {
+            await durableStore.evictEntries(keys$1, DRAFT_ID_MAPPINGS_SEGMENT);
+        }
+    }
+}
 
 /**
  * Generates a time-ordered, unique id to associate with a DraftAction. Ensures
@@ -4966,9 +5019,6 @@ function customActionHandler(executor, id, draftQueue) {
         });
         return queueOperations;
     };
-    const getRedirectMappings = (_action) => {
-        return undefined;
-    };
     return {
         handlerId: id,
         enqueue: (data) => {
@@ -4980,7 +5030,6 @@ function customActionHandler(executor, id, draftQueue) {
         handleReplaceAction: () => {
             throw Error('replaceAction not supported for custom actions');
         },
-        getRedirectMappings,
         handleActionRemoved: () => Promise.resolve(),
         handleActionCompleted: () => Promise.resolve(),
         handleActionEnqueued: () => Promise.resolve(),
@@ -5155,17 +5204,11 @@ class DurableDraftQueue {
                 const handler = this.getHandler(action.handler);
                 let queue = await this.getQueueActions();
                 const queueOperations = handler.getQueueOperationsForCompletingDrafts(queue, action);
-                const idAndKeyMappings = handler.getRedirectMappings(action);
-                const keyMappings = idAndKeyMappings === undefined
-                    ? undefined
-                    : idAndKeyMappings.map((m) => {
-                        return { draftKey: m.draftKey, canonicalKey: m.canonicalKey };
-                    });
-                await this.draftStore.completeAction(queueOperations, keyMappings);
-                queue = await this.getQueueActions();
+                // write the queue operations to the store prior to ingesting the result
+                await this.draftStore.completeAction(queueOperations);
+                await handler.handleActionCompleted(action, queueOperations, values$1(this.handlers));
                 this.retryIntervalMilliseconds = 0;
                 this.uploadingActionId = undefined;
-                await handler.handleActionCompleted(action, queueOperations, queue, values$1(this.handlers));
                 await this.notifyChangedListeners({
                     type: DraftQueueEventType.ActionCompleted,
                     action,
@@ -5488,7 +5531,7 @@ class DurableDraftStore {
         };
         return this.enqueueAction(deleteAction);
     }
-    completeAction(queueOperations, mappings) {
+    completeAction(queueOperations) {
         const action = () => {
             const durableStoreOperations = [];
             const { draftStore } = this;
@@ -5521,18 +5564,6 @@ class DurableDraftStore {
                     });
                 }
             }
-            if (mappings !== undefined) {
-                const entries = {};
-                for (const mapping of mappings) {
-                    const mappingKey = generateDraftIdMappingKey(mapping);
-                    entries[mappingKey] = { data: mapping };
-                }
-                durableStoreOperations.push({
-                    entries,
-                    type: 'setEntries',
-                    segment: DRAFT_ID_MAPPINGS_SEGMENT,
-                });
-            }
             return this.durableStore.batchOperations(durableStoreOperations);
         };
         return this.enqueueAction(action);
@@ -5811,7 +5842,7 @@ class AbstractResourceRequestActionHandler {
             },
         ];
     }
-    async handleActionCompleted(action, queueOperations, _queue, allHandlers) {
+    async handleActionCompleted(action, queueOperations, allHandlers) {
         const { data: request, tag } = action;
         const { method } = request;
         if (method === 'delete') {
@@ -5925,11 +5956,18 @@ class AbstractResourceRequestActionHandler {
     async ingestResponses(responses, action) {
         const luvio = this.getLuvio();
         await luvio.handleSuccessResponse(() => {
+            if (action.status === DraftActionStatus.Completed) {
+                const mappings = this.getRedirectMappings(action);
+                if (mappings) {
+                    mappings.forEach((mapping) => {
+                        luvio.storeRedirect(mapping.draftKey, mapping.canonicalKey);
+                    });
+                }
+            }
             for (const entry of responses) {
                 const { response, synchronousIngest } = entry;
                 synchronousIngest(response, action);
             }
-            // must call base broadcast
             return luvio.storeBroadcast();
         }, 
         // getTypeCacheKeysRecord uses the response, not the full path factory
@@ -6258,6 +6296,8 @@ class DraftManager {
 
 function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueue) {
     const draftMetadata = {};
+    // in 246 luvio took charge of persisting redirect mappings, this needs to stick around
+    // for a couple of releases to support older environments
     // setup existing store redirects when bootstrapping the environment
     (async () => {
         const mappings = await getDraftIdMappings(durableStore);
@@ -6265,23 +6305,9 @@ function makeEnvironmentDraftAware(luvio, env, durableStore, handlers, draftQueu
             const { draftKey, canonicalKey } = mapping;
             env.storeRedirect(draftKey, canonicalKey);
         });
+        await env.storeBroadcast(env.rebuildSnapshot, env.snapshotAvailable);
+        await clearDraftIdSegment(durableStore);
     })();
-    durableStore.registerOnChangedListener(async (changes) => {
-        const draftIdMappingsIds = [];
-        for (let i = 0, len = changes.length; i < len; i++) {
-            const change = changes[i];
-            if (change.segment === DRAFT_ID_MAPPINGS_SEGMENT) {
-                draftIdMappingsIds.push(...change.ids);
-            }
-        }
-        if (draftIdMappingsIds.length > 0) {
-            const mappings = await getDraftIdMappings(durableStore, draftIdMappingsIds);
-            mappings.forEach((mapping) => {
-                const { draftKey, canonicalKey } = mapping;
-                env.storeRedirect(draftKey, canonicalKey);
-            });
-        }
-    });
     const handleSuccessResponse = async function (ingestAndBroadcastFunc, getResponseCacheKeysFunc) {
         const queue = await draftQueue.getQueueActions();
         if (queue.length === 0) {
@@ -14717,6 +14743,7 @@ function instrumentAdapter(adapter, metadata) {
     return instrumentAdapter$1(instrumentedMobileAdapter, metadata, {
         trackL1Hits: true,
         trackL2Hits: true,
+        trackCacheMisses: true,
         reportObserver: (report) => {
             for (const observer of reportObservers) {
                 observer(report);
@@ -15019,7 +15046,7 @@ class NimbusSqliteStore {
     registerOnChangedListener(listener) {
         let unsubscribeId = undefined;
         this.plugin
-            .registerOnChangedListener((changes) => {
+            .registerOnChangedListener(async (changes) => {
             const durableChanges = changes.map((c) => {
                 return {
                     type: c.type === 'upsert' ? 'setEntries' : 'evictEntries',
@@ -15028,7 +15055,7 @@ class NimbusSqliteStore {
                     segment: c.context.segment,
                 };
             });
-            listener(durableChanges);
+            await listener(durableChanges);
         })
             .then((unsub) => {
             unsubscribeId = unsub;
@@ -15970,4 +15997,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.144.0-ac4b15ad8
+// version: 1.146.0-6ca270a7a