@salesforce/lds-runtime-mobile 1.110.2 → 1.111.1

package/dist/main.js

@@ -1055,10 +1055,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
         validateNotDisposed();
-        // return resolved promise here and wait for the L2 flush to happen in handleSuccessResponse,
-        // that flush will cause the onChanged handler to fire which will revive
-        // records to the main L1 store and call the base storeBroadcast
-        return Promise.resolve();
+        // publishing to L2 is essentially "broadcasting" because the onChanged
+        // handler will fire which will revive records to the main L1 store and
+        // call the base storeBroadcast
+        return publishChangesToDurableStore();
     };
     const publishChangesToDurableStore = function () {
         validateNotDisposed();
@@ -1279,7 +1279,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // we don't need to prime metadata
                 () => { });
                 snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-                await publishChangesToDurableStore();
             })();
             for (const key of keysToReviveAsArray) {
                 // we are overwriting the previous promise at this key, but that
@@ -1307,7 +1306,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             // so all we have to do is ingest then write to L2
             ingestStagingStore = buildIngestStagingStore(environment);
             snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-            await publishChangesToDurableStore();
         }
         if (snapshotFromMemoryIngest === undefined) {
             return undefined;
@@ -1320,12 +1318,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         const result = await reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(select, environment.createSnapshot, refresh));
         return result.snapshot;
     };
-    const handleErrorResponse = function (ingestAndBroadcastFunc) {
+    const handleErrorResponse = async function (ingestAndBroadcastFunc) {
         validateNotDisposed();
-        const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-        return publishChangesToDurableStore().then(() => {
-            return snapshotFromMemoryIngest;
-        });
+        ingestStagingStore = buildIngestStagingStore(environment);
+        return ingestAndBroadcastFunc();
     };
     const getNotifyChangeStoreEntries = function (keys) {
         validateNotDisposed();
@@ -4350,6 +4346,58 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
  * For full license text, see the LICENSE.txt file
  */
 
+/* Ideally we would use AbortController but it does not exist in V8, if it is ever polyfilled we can swap for it */
+class LdsAbortController {
+    constructor() {
+        this.signal = new AbortSignal();
+    }
+    abort() {
+        this.signal.abort();
+    }
+}
+class AbortSignal {
+    constructor() {
+        this._aborted = false;
+        this.listeners = new Map();
+    }
+    get aborted() {
+        return this._aborted;
+    }
+    addEventListener(type, listener) {
+        let listeners = this.listeners.get(type);
+        if (!listeners) {
+            listeners = new Set();
+            this.listeners.set(type, listeners);
+        }
+        listeners.add(listener);
+    }
+    removeEventListener(type, listener) {
+        const listeners = this.listeners.get(type);
+        if (listeners) {
+            listeners.delete(listener);
+            if (listeners.size === 0) {
+                this.listeners.delete(type);
+            }
+        }
+    }
+    dispatchEvent(event) {
+        const listeners = this.listeners.get(event.type);
+        if (listeners) {
+            for (const listener of listeners) {
+                listener(this, event);
+            }
+        }
+        return !event.defaultPrevented;
+    }
+    abort() {
+        if (!this.aborted) {
+            this._aborted = true;
+            const abortEvent = new Event('abort');
+            this.dispatchEvent(abortEvent);
+        }
+    }
+}
+
 class AsyncWorkerPool {
     constructor(concurrency) {
         this.queue = [];
@@ -4360,51 +4408,57 @@ class AsyncWorkerPool {
         return new Promise((resolve, reject) => {
             this.queue.push({
                 ...work,
-                workFn: () => work.workFn().then(resolve).catch(reject),
+                workFn: (abortController) => work.workFn(abortController).then(resolve).catch(reject),
             });
             this.doWork();
         });
     }
-    async cancel() {
-        const promises = [];
-        const cancellingWork = [
-            ...this.activeWork.splice(0, this.activeWork.length),
-            ...this.queue.splice(0, this.queue.length),
-        ];
-        cancellingWork.forEach((work) => {
-            const { cancelFn } = work;
+    /**
+     * cancel all work in the queue and active work
+     * @returns true if all work was cancelled, false if any work could not be cancelled
+     */
+    cancel() {
+        let success = true;
+        for (const { cancelFn } of this.queue) {
+            if (cancelFn) {
+                try {
+                    cancelFn();
+                }
+                catch (_a) {
+                    success = false;
+                }
+            }
+        }
+        this.queue = [];
+        for (const { abortController, cancelFn } of this.activeWork) {
+            abortController.abort();
             if (cancelFn) {
-                promises.push(cancelFn());
+                try {
+                    cancelFn();
+                }
+                catch (_b) {
+                    success = false;
+                }
             }
-        });
-        await promiseAllSettled(promises);
+        }
+        this.activeWork = [];
+        return success;
     }
     doWork() {
         while (this.queue.length > 0 && this.activeWork.length < this.concurrency) {
             const work = this.queue.shift();
             if (work) {
-                this.activeWork.push(work);
+                const abortController = new LdsAbortController();
+                const newWork = { ...work, abortController };
+                this.activeWork.push(newWork);
                 const { workFn } = work;
-                workFn()
-                    .then()
-                    .finally(() => {
-                    this.activeWork = this.activeWork.filter((w) => w !== work);
+                workFn(abortController).finally(() => {
+                    this.activeWork = this.activeWork.filter((w) => w !== newWork);
                     this.doWork();
                 });
             }
         }
     }
-}
-function promiseAllSettled(promises) {
-    return Promise.all(promises.map((promise) => promise
-        .then((value) => ({
-        status: 'fulfilled',
-        value,
-    }))
-        .catch((reason) => ({
-        status: 'rejected',
-        reason,
-    }))));
 }
 
 /**
@@ -14934,9 +14988,10 @@ const DEFAULT_BATCH_SIZE = 500;
 const DEFAULT_CONCURRENCY = 6;
 class PrimingSession extends EventEmitter {
     constructor(config) {
+        var _a, _b;
         super();
-        this.batchSize = config.batchSize || DEFAULT_BATCH_SIZE;
-        this.concurrency = config.concurrency || DEFAULT_CONCURRENCY;
+        this.batchSize = (_a = config.batchSize) !== null && _a !== void 0 ? _a : DEFAULT_BATCH_SIZE;
+        this.concurrency = (_b = config.concurrency) !== null && _b !== void 0 ? _b : DEFAULT_CONCURRENCY;
         this.recordLoader = config.recordLoader;
         this.recordIngestor = config.recordIngestor;
         this.objectInfoLoader = config.objectInfoLoader;
@@ -14964,12 +15019,20 @@ class PrimingSession extends EventEmitter {
             this.enqueueBatches(availableBatches);
         }
     }
+    cancel() {
+        this.networkWorkerPool.cancel();
+    }
     // parallelizes batches of priming work
     enqueueBatches(batches) {
         for (const batch of batches) {
             this.networkWorkerPool.push({
-                workFn: () => {
-                    return this.recordLoader.fetchRecordData(batch).then(async (result) => {
+                workFn: (abortController) => {
+                    return this.recordLoader
+                        .fetchRecordData(batch, abortController)
+                        .then(async (result) => {
+                        if (abortController.signal.aborted) {
+                            return;
+                        }
                         if (result.ok === false) {
                             const { error } = result;
                             const primingError = error === 'network-error' ? 'service-unavailable' : 'unknown';
@@ -14993,6 +15056,9 @@ class PrimingSession extends EventEmitter {
                         this.recordIngestor
                             .insertRecords(records)
                             .then(({ written, conflicted }) => {
+                            if (abortController.signal.aborted) {
+                                return;
+                            }
                             // now that the records are persisted, emit the primed event
                             if (written.length > 0) {
                                 this.emit('primed', Array.from(written));
@@ -15009,6 +15075,13 @@ class PrimingSession extends EventEmitter {
                         });
                     });
                 },
+                cancelFn: () => {
+                    this.emit('error', {
+                        ids: batch.ids,
+                        code: 'canceled',
+                        message: `batch canceled`,
+                    });
+                },
             });
         }
     }
@@ -15034,8 +15107,6 @@ class PrimingSession extends EventEmitter {
 }
 
 const requiredPrefix = `required_`;
-// note this is automatically incremented by scripts/release/bump-api-version.js at each release
-const apiVersion = `v58.0`;
 const requiredFieldMap = {
     ApiName: 'ApiName',
     Id: 'Id',
@@ -15049,10 +15120,10 @@ class RecordLoaderGraphQL {
     constructor(networkAdapter) {
         this.networkAdapter = networkAdapter;
     }
-    async fetchRecordData(batch) {
+    async fetchRecordData(batch, abortController) {
         let rep;
         try {
-            rep = await this.callGraphQL(batch);
+            rep = await this.callGraphQL(batch, abortController);
         }
         catch (e) {
             return {
@@ -15094,25 +15165,9 @@ class RecordLoaderGraphQL {
             missingIds: Array.from(seenRecords),
         };
     }
-    async callGraphQL(batch) {
+    callGraphQL(batch, abortController) {
         const query = this.generateGraphQLQuery(batch.type, batch.fields);
-        const response = await this.networkAdapter({
-            baseUri: `/services/data/${apiVersion}`,
-            basePath: '/graphql',
-            method: 'POST',
-            priority: 'background',
-            body: {
-                query,
-                variables: {
-                    ids: batch.ids,
-                    first: batch.ids.length,
-                },
-            },
-            queryParams: {},
-            urlParams: {},
-            headers: {},
-        }, {});
-        return response.body;
+        return this.networkAdapter.postGraphQL(query, { ids: batch.ids, first: batch.ids.length }, abortController);
     }
     generateGraphQLQuery(type, fields) {
         const fieldList = Object.keys(requiredFieldMap)
@@ -15248,8 +15303,57 @@ function instrumentPrimingSession(session) {
     return session;
 }
 
+// so eslint doesn't complain about nimbus
+/* global __nimbus */
+// note this is automatically incremented by scripts/release/bump-api-version.js at each release
+const apiVersion = `v58.0`;
+class NimbusPrimingNetworkAdapter {
+    postGraphQL(query, variables, abortController) {
+        return new Promise((resolve, reject) => {
+            let listener;
+            const unregisterListener = () => {
+                if (listener) {
+                    abortController.signal.removeEventListener('abort', listener);
+                }
+            };
+            __nimbus.plugins.LdsNetworkAdapter
+                .sendRequest({
+                method: 'POST',
+                path: `/services/data/${apiVersion}/graphql`,
+                body: JSON.stringify({
+                    query,
+                    variables,
+                }),
+                headers: {},
+                queryParams: {},
+                priority: 'background',
+                observabilityContext: {},
+            }, (response) => {
+                unregisterListener();
+                const { body } = response;
+                if (body) {
+                    resolve(JSON.parse(body));
+                }
+                else {
+                    reject(new Error('No body returned from graphql endpoint'));
+                }
+            }, (error) => {
+                unregisterListener();
+                reject(error);
+            })
+                .then((cancellationToken) => {
+                listener = () => {
+                    __nimbus.plugins.LdsNetworkAdapter.cancelRequest(cancellationToken);
+                };
+                abortController.signal.addEventListener('abort', listener);
+            });
+        });
+    }
+}
+
 function primingSessionFactory(config) {
-    const { networkAdapter, store, objectInfoService, getLuvio } = config;
+    const { store, objectInfoService, getLuvio } = config;
+    const networkAdapter = new NimbusPrimingNetworkAdapter();
     const recordLoader = new RecordLoaderGraphQL(networkAdapter);
     const recordIngestor = new RecordIngestor(store, getLuvio);
     const session = new PrimingSession({
@@ -15375,7 +15479,6 @@ function getRuntime() {
         createPrimingSession: (config) => {
             return primingSessionFactory({
                 store: lazyBaseDurableStore,
-                networkAdapter: lazyNetworkAdapter,
                 objectInfoService: lazyObjectInfoService,
                 getLuvio: () => lazyLuvio,
                 concurrency: config.concurrency,
@@ -15398,4 +15501,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.110.2-c54b4a458
+// version: 1.111.1-dfc59aa0e

package/dist/priming/NimbusPrimingNetworkAdapter.d.ts

@@ -0,0 +1,6 @@
+import type { PrimingNetworkAdapter } from '@salesforce/lds-priming';
+import type { GraphQLRepresentation } from '@salesforce/lds-adapters-uiapi';
+import type { LdsAbortController } from '@salesforce/lds-utils-adapters';
+export declare class NimbusPrimingNetworkAdapter implements PrimingNetworkAdapter {
+    postGraphQL(query: string, variables: Record<string, any>, abortController: LdsAbortController): Promise<GraphQLRepresentation>;
+}

package/dist/priming/primingSessionFactory.d.ts

@@ -1,10 +1,9 @@
 import { PrimingSession } from '@salesforce/lds-priming';
-import type { Luvio, NetworkAdapter } from '@luvio/engine';
+import type { Luvio } from '@luvio/engine';
 import type { NimbusSqliteStore } from '../durableStore/NimbusSqliteStore/NimbusSqliteStore';
 import type { ObjectInfoService } from '../main';
 export interface PrimingSessionFactoryConfig {
     store: NimbusSqliteStore;
-    networkAdapter: NetworkAdapter;
     objectInfoService: ObjectInfoService;
     getLuvio: () => Luvio;
     concurrency?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.110.2",
+    "version": "1.111.1",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -32,27 +32,27 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-mobile"
     },
     "dependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.110.2",
-        "@salesforce/lds-bindings": "^1.110.2",
-        "@salesforce/lds-instrumentation": "^1.110.2",
-        "@salesforce/lds-priming": "^1.110.2",
+        "@salesforce/lds-adapters-uiapi": "^1.111.1",
+        "@salesforce/lds-bindings": "^1.111.1",
+        "@salesforce/lds-instrumentation": "^1.111.1",
+        "@salesforce/lds-priming": "^1.111.1",
         "@salesforce/user": "0.0.12",
         "o11y": "244.0.0"
     },
     "devDependencies": {
-        "@luvio/engine": "0.135.4",
-        "@luvio/environments": "0.135.4",
-        "@luvio/graphql-parser": "0.135.4",
-        "@salesforce/lds-adapters-graphql": "^1.110.2",
-        "@salesforce/lds-drafts": "^1.110.2",
-        "@salesforce/lds-drafts-adapters-uiapi": "^1.110.2",
-        "@salesforce/lds-graphql-eval": "^1.110.2",
-        "@salesforce/lds-network-adapter": "^1.110.2",
-        "@salesforce/lds-network-nimbus": "^1.110.2",
-        "@salesforce/lds-store-binary": "^1.110.2",
-        "@salesforce/lds-store-sql": "^1.110.2",
-        "@salesforce/lds-utils-adapters": "^1.110.2",
-        "@salesforce/nimbus-plugin-lds": "^1.110.2",
+        "@luvio/engine": "0.136.5",
+        "@luvio/environments": "0.136.5",
+        "@luvio/graphql-parser": "0.136.5",
+        "@salesforce/lds-adapters-graphql": "^1.111.1",
+        "@salesforce/lds-drafts": "^1.111.1",
+        "@salesforce/lds-drafts-adapters-uiapi": "^1.111.1",
+        "@salesforce/lds-graphql-eval": "^1.111.1",
+        "@salesforce/lds-network-adapter": "^1.111.1",
+        "@salesforce/lds-network-nimbus": "^1.111.1",
+        "@salesforce/lds-store-binary": "^1.111.1",
+        "@salesforce/lds-store-sql": "^1.111.1",
+        "@salesforce/lds-utils-adapters": "^1.111.1",
+        "@salesforce/nimbus-plugin-lds": "^1.111.1",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -1055,10 +1055,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
     };
     const storeBroadcast = function (_rebuildSnapshot, _snapshotDataAvailable) {
         validateNotDisposed();
-        // return resolved promise here and wait for the L2 flush to happen in handleSuccessResponse,
-        // that flush will cause the onChanged handler to fire which will revive
-        // records to the main L1 store and call the base storeBroadcast
-        return Promise.resolve();
+        // publishing to L2 is essentially "broadcasting" because the onChanged
+        // handler will fire which will revive records to the main L1 store and
+        // call the base storeBroadcast
+        return publishChangesToDurableStore();
     };
     const publishChangesToDurableStore = function () {
         validateNotDisposed();
@@ -1279,7 +1279,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
                 // we don't need to prime metadata
                 () => { });
                 snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-                await publishChangesToDurableStore();
             })();
             for (const key of keysToReviveAsArray) {
                 // we are overwriting the previous promise at this key, but that
@@ -1307,7 +1306,6 @@ function makeDurable(environment, { durableStore, instrumentation }) {
             // so all we have to do is ingest then write to L2
             ingestStagingStore = buildIngestStagingStore(environment);
             snapshotFromMemoryIngest = await ingestAndBroadcastFunc();
-            await publishChangesToDurableStore();
         }
         if (snapshotFromMemoryIngest === undefined) {
             return undefined;
@@ -1320,12 +1318,10 @@ function makeDurable(environment, { durableStore, instrumentation }) {
         const result = await reviveSnapshot(environment, durableStore, snapshotFromMemoryIngest, durableStoreErrorHandler, () => environment.storeLookup(select, environment.createSnapshot, refresh));
         return result.snapshot;
     };
-    const handleErrorResponse = function (ingestAndBroadcastFunc) {
+    const handleErrorResponse = async function (ingestAndBroadcastFunc) {
         validateNotDisposed();
-        const snapshotFromMemoryIngest = ingestAndBroadcastFunc();
-        return publishChangesToDurableStore().then(() => {
-            return snapshotFromMemoryIngest;
-        });
+        ingestStagingStore = buildIngestStagingStore(environment);
+        return ingestAndBroadcastFunc();
     };
     const getNotifyChangeStoreEntries = function (keys) {
         validateNotDisposed();
@@ -4350,6 +4346,58 @@ function makeStoreEval(preconditioner, objectInfoService, userId, contextProvide
  * For full license text, see the LICENSE.txt file
  */
 
+/* Ideally we would use AbortController but it does not exist in V8, if it is ever polyfilled we can swap for it */
+class LdsAbortController {
+    constructor() {
+        this.signal = new AbortSignal();
+    }
+    abort() {
+        this.signal.abort();
+    }
+}
+class AbortSignal {
+    constructor() {
+        this._aborted = false;
+        this.listeners = new Map();
+    }
+    get aborted() {
+        return this._aborted;
+    }
+    addEventListener(type, listener) {
+        let listeners = this.listeners.get(type);
+        if (!listeners) {
+            listeners = new Set();
+            this.listeners.set(type, listeners);
+        }
+        listeners.add(listener);
+    }
+    removeEventListener(type, listener) {
+        const listeners = this.listeners.get(type);
+        if (listeners) {
+            listeners.delete(listener);
+            if (listeners.size === 0) {
+                this.listeners.delete(type);
+            }
+        }
+    }
+    dispatchEvent(event) {
+        const listeners = this.listeners.get(event.type);
+        if (listeners) {
+            for (const listener of listeners) {
+                listener(this, event);
+            }
+        }
+        return !event.defaultPrevented;
+    }
+    abort() {
+        if (!this.aborted) {
+            this._aborted = true;
+            const abortEvent = new Event('abort');
+            this.dispatchEvent(abortEvent);
+        }
+    }
+}
+
 class AsyncWorkerPool {
     constructor(concurrency) {
         this.queue = [];
@@ -4360,51 +4408,57 @@ class AsyncWorkerPool {
         return new Promise((resolve, reject) => {
             this.queue.push({
                 ...work,
-                workFn: () => work.workFn().then(resolve).catch(reject),
+                workFn: (abortController) => work.workFn(abortController).then(resolve).catch(reject),
             });
             this.doWork();
         });
     }
-    async cancel() {
-        const promises = [];
-        const cancellingWork = [
-            ...this.activeWork.splice(0, this.activeWork.length),
-            ...this.queue.splice(0, this.queue.length),
-        ];
-        cancellingWork.forEach((work) => {
-            const { cancelFn } = work;
+    /**
+     * cancel all work in the queue and active work
+     * @returns true if all work was cancelled, false if any work could not be cancelled
+     */
+    cancel() {
+        let success = true;
+        for (const { cancelFn } of this.queue) {
+            if (cancelFn) {
+                try {
+                    cancelFn();
+                }
+                catch (_a) {
+                    success = false;
+                }
+            }
+        }
+        this.queue = [];
+        for (const { abortController, cancelFn } of this.activeWork) {
+            abortController.abort();
             if (cancelFn) {
-                promises.push(cancelFn());
+                try {
+                    cancelFn();
+                }
+                catch (_b) {
+                    success = false;
+                }
             }
-        });
-        await promiseAllSettled(promises);
+        }
+        this.activeWork = [];
+        return success;
     }
     doWork() {
         while (this.queue.length > 0 && this.activeWork.length < this.concurrency) {
             const work = this.queue.shift();
             if (work) {
-                this.activeWork.push(work);
+                const abortController = new LdsAbortController();
+                const newWork = { ...work, abortController };
+                this.activeWork.push(newWork);
                 const { workFn } = work;
-                workFn()
-                    .then()
-                    .finally(() => {
-                    this.activeWork = this.activeWork.filter((w) => w !== work);
+                workFn(abortController).finally(() => {
+                    this.activeWork = this.activeWork.filter((w) => w !== newWork);
                     this.doWork();
                 });
             }
         }
     }
-}
-function promiseAllSettled(promises) {
-    return Promise.all(promises.map((promise) => promise
-        .then((value) => ({
-        status: 'fulfilled',
-        value,
-    }))
-        .catch((reason) => ({
-        status: 'rejected',
-        reason,
-    }))));
 }
 
 /**
@@ -14934,9 +14988,10 @@ const DEFAULT_BATCH_SIZE = 500;
 const DEFAULT_CONCURRENCY = 6;
 class PrimingSession extends EventEmitter {
     constructor(config) {
+        var _a, _b;
         super();
-        this.batchSize = config.batchSize || DEFAULT_BATCH_SIZE;
-        this.concurrency = config.concurrency || DEFAULT_CONCURRENCY;
+        this.batchSize = (_a = config.batchSize) !== null && _a !== void 0 ? _a : DEFAULT_BATCH_SIZE;
+        this.concurrency = (_b = config.concurrency) !== null && _b !== void 0 ? _b : DEFAULT_CONCURRENCY;
         this.recordLoader = config.recordLoader;
         this.recordIngestor = config.recordIngestor;
         this.objectInfoLoader = config.objectInfoLoader;
@@ -14964,12 +15019,20 @@ class PrimingSession extends EventEmitter {
             this.enqueueBatches(availableBatches);
         }
     }
+    cancel() {
+        this.networkWorkerPool.cancel();
+    }
     // parallelizes batches of priming work
     enqueueBatches(batches) {
         for (const batch of batches) {
             this.networkWorkerPool.push({
-                workFn: () => {
-                    return this.recordLoader.fetchRecordData(batch).then(async (result) => {
+                workFn: (abortController) => {
+                    return this.recordLoader
+                        .fetchRecordData(batch, abortController)
+                        .then(async (result) => {
+                        if (abortController.signal.aborted) {
+                            return;
+                        }
                         if (result.ok === false) {
                             const { error } = result;
                             const primingError = error === 'network-error' ? 'service-unavailable' : 'unknown';
@@ -14993,6 +15056,9 @@ class PrimingSession extends EventEmitter {
                         this.recordIngestor
                             .insertRecords(records)
                             .then(({ written, conflicted }) => {
+                            if (abortController.signal.aborted) {
+                                return;
+                            }
                             // now that the records are persisted, emit the primed event
                             if (written.length > 0) {
                                 this.emit('primed', Array.from(written));
@@ -15009,6 +15075,13 @@ class PrimingSession extends EventEmitter {
                         });
                     });
                 },
+                cancelFn: () => {
+                    this.emit('error', {
+                        ids: batch.ids,
+                        code: 'canceled',
+                        message: `batch canceled`,
+                    });
+                },
             });
         }
     }
@@ -15034,8 +15107,6 @@ class PrimingSession extends EventEmitter {
 }
 
 const requiredPrefix = `required_`;
-// note this is automatically incremented by scripts/release/bump-api-version.js at each release
-const apiVersion = `v58.0`;
 const requiredFieldMap = {
     ApiName: 'ApiName',
     Id: 'Id',
@@ -15049,10 +15120,10 @@ class RecordLoaderGraphQL {
     constructor(networkAdapter) {
         this.networkAdapter = networkAdapter;
     }
-    async fetchRecordData(batch) {
+    async fetchRecordData(batch, abortController) {
         let rep;
         try {
-            rep = await this.callGraphQL(batch);
+            rep = await this.callGraphQL(batch, abortController);
         }
         catch (e) {
             return {
@@ -15094,25 +15165,9 @@ class RecordLoaderGraphQL {
             missingIds: Array.from(seenRecords),
         };
     }
-    async callGraphQL(batch) {
+    callGraphQL(batch, abortController) {
         const query = this.generateGraphQLQuery(batch.type, batch.fields);
-        const response = await this.networkAdapter({
-            baseUri: `/services/data/${apiVersion}`,
-            basePath: '/graphql',
-            method: 'POST',
-            priority: 'background',
-            body: {
-                query,
-                variables: {
-                    ids: batch.ids,
-                    first: batch.ids.length,
-                },
-            },
-            queryParams: {},
-            urlParams: {},
-            headers: {},
-        }, {});
-        return response.body;
+        return this.networkAdapter.postGraphQL(query, { ids: batch.ids, first: batch.ids.length }, abortController);
     }
     generateGraphQLQuery(type, fields) {
         const fieldList = Object.keys(requiredFieldMap)
@@ -15248,8 +15303,57 @@ function instrumentPrimingSession(session) {
     return session;
 }
 
+// so eslint doesn't complain about nimbus
+/* global __nimbus */
+// note this is automatically incremented by scripts/release/bump-api-version.js at each release
+const apiVersion = `v58.0`;
+class NimbusPrimingNetworkAdapter {
+    postGraphQL(query, variables, abortController) {
+        return new Promise((resolve, reject) => {
+            let listener;
+            const unregisterListener = () => {
+                if (listener) {
+                    abortController.signal.removeEventListener('abort', listener);
+                }
+            };
+            __nimbus.plugins.LdsNetworkAdapter
+                .sendRequest({
+                method: 'POST',
+                path: `/services/data/${apiVersion}/graphql`,
+                body: JSON.stringify({
+                    query,
+                    variables,
+                }),
+                headers: {},
+                queryParams: {},
+                priority: 'background',
+                observabilityContext: {},
+            }, (response) => {
+                unregisterListener();
+                const { body } = response;
+                if (body) {
+                    resolve(JSON.parse(body));
+                }
+                else {
+                    reject(new Error('No body returned from graphql endpoint'));
+                }
+            }, (error) => {
+                unregisterListener();
+                reject(error);
+            })
+                .then((cancellationToken) => {
+                listener = () => {
+                    __nimbus.plugins.LdsNetworkAdapter.cancelRequest(cancellationToken);
+                };
+                abortController.signal.addEventListener('abort', listener);
+            });
+        });
+    }
+}
+
 function primingSessionFactory(config) {
-    const { networkAdapter, store, objectInfoService, getLuvio } = config;
+    const { store, objectInfoService, getLuvio } = config;
+    const networkAdapter = new NimbusPrimingNetworkAdapter();
     const recordLoader = new RecordLoaderGraphQL(networkAdapter);
     const recordIngestor = new RecordIngestor(store, getLuvio);
     const session = new PrimingSession({
@@ -15375,7 +15479,6 @@ function getRuntime() {
         createPrimingSession: (config) => {
             return primingSessionFactory({
                 store: lazyBaseDurableStore,
-                networkAdapter: lazyNetworkAdapter,
                 objectInfoService: lazyObjectInfoService,
                 getLuvio: () => lazyLuvio,
                 concurrency: config.concurrency,
@@ -15398,4 +15501,4 @@ register({
 });
 
 export { getRuntime, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.110.2-c54b4a458
+// version: 1.111.1-dfc59aa0e

package/sfdc/priming/NimbusPrimingNetworkAdapter.d.ts

@@ -0,0 +1,6 @@
+import type { PrimingNetworkAdapter } from '@salesforce/lds-priming';
+import type { GraphQLRepresentation } from '@salesforce/lds-adapters-uiapi';
+import type { LdsAbortController } from '@salesforce/lds-utils-adapters';
+export declare class NimbusPrimingNetworkAdapter implements PrimingNetworkAdapter {
+    postGraphQL(query: string, variables: Record<string, any>, abortController: LdsAbortController): Promise<GraphQLRepresentation>;
+}

package/sfdc/priming/primingSessionFactory.d.ts

@@ -1,10 +1,9 @@
 import { PrimingSession } from '@salesforce/lds-priming';
-import type { Luvio, NetworkAdapter } from '@luvio/engine';
+import type { Luvio } from '@luvio/engine';
 import type { NimbusSqliteStore } from '../durableStore/NimbusSqliteStore/NimbusSqliteStore';
 import type { ObjectInfoService } from '../main';
 export interface PrimingSessionFactoryConfig {
     store: NimbusSqliteStore;
-    networkAdapter: NetworkAdapter;
     objectInfoService: ObjectInfoService;
     getLuvio: () => Luvio;
     concurrency?: number;