@salesforce/lds-runtime-mobile 1.352.0 → 1.353.0

package/dist/main.js

@@ -53,7 +53,7 @@ const { entries: entries$3, keys: keys$5 } = Object;
 
 const UI_API_BASE_URI = '/services/data/v64.0/ui-api';
 
-let instrumentation$1 = {
+let instrumentation$2 = {
     aggregateUiChunkCount: (_cb) => { },
     aggregateUiConnectError: () => { },
     duplicateRequest: (_cb) => { },
@@ -65,7 +65,7 @@ let instrumentation$1 = {
     networkRateLimitExceeded: () => { },
 };
 function instrument(newInstrumentation) {
-    instrumentation$1 = Object.assign(instrumentation$1, newInstrumentation);
+    instrumentation$2 = Object.assign(instrumentation$2, newInstrumentation);
 }
 
 const LDS_RECORDS_AGGREGATE_UI = 'LDS_Records_AggregateUi';
@@ -135,7 +135,7 @@ function mergeRecordFields$2(first, second) {
  *  would otherwise cause a query length exception.
  */
 function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resourceRequest, resourceRequestContext) {
-    instrumentation$1.getRecordAggregateInvoke();
+    instrumentation$2.getRecordAggregateInvoke();
     return networkAdapter(resourceRequest, resourceRequestContext).then((resp) => {
         const { body } = resp;
         // This response body could be an executeAggregateUi, which we don't natively support.
@@ -151,7 +151,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
         }
         const merged = body.compositeResponse.reduce((seed, response) => {
             if (response.httpStatusCode !== HttpStatusCode.Ok) {
-                instrumentation$1.getRecordAggregateReject(() => recordId);
+                instrumentation$2.getRecordAggregateReject(() => recordId);
                 throw createErrorResponse(HttpStatusCode.ServerError, {
                     error: response.message,
                 });
@@ -161,7 +161,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
             }
             return mergeRecordFields$2(seed, response.body);
         }, null);
-        instrumentation$1.getRecordAggregateResolve(() => {
+        instrumentation$2.getRecordAggregateResolve(() => {
             return {
                 recordId,
                 apiName: merged.apiName,
@@ -169,7 +169,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
         });
         return createOkResponse$1(merged);
     }, (err) => {
-        instrumentation$1.getRecordAggregateReject(() => recordId);
+        instrumentation$2.getRecordAggregateReject(() => recordId);
         // rethrow error
         throw err;
     });
@@ -247,7 +247,7 @@ function buildAndDispatchGetRecordAggregateUi(recordId, req, params) {
     const { networkAdapter, resourceRequest, resourceRequestContext } = req;
     const compositeRequest = buildGetRecordByFieldsCompositeRequest(resourceRequest, params);
     // W-12245125: Emit chunk size metrics
-    instrumentation$1.aggregateUiChunkCount(() => compositeRequest.length);
+    instrumentation$2.aggregateUiChunkCount(() => compositeRequest.length);
     const aggregateUiParams = {
         compositeRequest,
     };
@@ -491,7 +491,7 @@ function platformNetworkAdapter(baseNetworkAdapter) {
     return (resourceRequest, resourceRequestContext) => {
         if (!tokenBucket.take(1)) {
             // We are hitting rate limiting, add some metrics
-            instrumentation$1.networkRateLimitExceeded();
+            instrumentation$2.networkRateLimitExceeded();
         }
         const salesforceRequest = {
             networkAdapter: baseNetworkAdapter,
@@ -52402,6 +52402,8 @@ const NimbusBinaryStore = {
     },
 };
 
+const priming_session_batch={namespace:"sf.lds",name:"PrimingSessionBatch",pbjsSchema:{"nested":{"sf":{"nested":{"lds":{"nested":{"PrimingSessionBatch":{"fields":{"container":{"id":8,"type":"string"},"idCount":{"id":1,"type":"uint32"},"missingCount":{"id":3,"type":"uint32"},"wasFromPagination":{"id":5,"type":"bool"},"successCount":{"id":2,"type":"uint32"},"paginationCount":{"id":6,"type":"uint32"},"conflictedCount":{"id":4,"type":"uint32"},"ingestDuration":{"id":7,"type":"double"}}}}}}}}}};
+
 class EventEmitter {
     constructor() {
         // @ts-ignore typescript doesn't like us setting this to an empty object for some reason
@@ -52515,6 +52517,12 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
                 fieldUnion.push(`${fieldName}.Id`);
                 includesSpanningFields = true;
             }
+            else {
+                // Field exists on record but not in object info.
+                // Fall back to getRecords resolver in this case.
+                fieldUnion.push(fieldName);
+                includesSpanningFields = true;
+            }
         }
         else {
             fieldUnion.push(fieldName);
@@ -52740,8 +52748,17 @@ class ConflictPool {
     }
 }
 
+const instrumentation$1 = getInstrumentation(O11Y_NAMESPACE_LDS_MOBILE);
 const DEFAULT_BATCH_SIZE = 500;
 const DEFAULT_CONCURRENCY = 6;
+const MAX_RETRY_COUNT = 2;
+const SESSION_BATCH_SIZE = 'priming-session-batch-size';
+const SESSION_CONCURRENCY_LIMIT = 'priming-session-concurrency-limit';
+const SESSION_ENQUEUE_RECORD_COUNT = 'priming-session-enqueue-record-count';
+const SESSION_INGEST_WRITTEN = 'priming-session-ingest-written-count';
+const SESSION_INGEST_CONFLICTED = 'priming-session-ingest-conflicted-count';
+const SESSION_INGEST_ERRORS = 'priming-session-ingest-error-count';
+const SESSION_INGEST_DURATION = 'priming-session-ingest-duration';
 class PrimingSession extends EventEmitter {
     constructor(config) {
         super();
@@ -52753,6 +52770,9 @@ class PrimingSession extends EventEmitter {
         this.ldsRecordRefresher = config.ldsRecordRefresher;
         this.networkWorkerPool = new AsyncWorkerPool(this.concurrency);
         this.conflictPool = new ConflictPool(config.store, this.objectInfoLoader);
+        this.retryTracker = new Map();
+        instrumentation$1.trackValue(SESSION_BATCH_SIZE, config.batchSize ? config.batchSize : 0);
+        instrumentation$1.trackValue(SESSION_CONCURRENCY_LIMIT, config.concurrency ? config.concurrency : 0);
     }
     // function that enqueues priming work
     async enqueue(work) {
@@ -52771,6 +52791,9 @@ class PrimingSession extends EventEmitter {
             unavailableTypes,
         });
         if (unavailableIds.length > 0) {
+            for (const id of unavailableIds) {
+                this.retryTracker.delete(id);
+            }
             this.emit('error', {
                 ids: unavailableIds,
                 code: 'precondition-error',
@@ -52784,8 +52807,40 @@ class PrimingSession extends EventEmitter {
     cancel() {
         this.networkWorkerPool.cancel();
     }
-    enqueueBatches(batches) {
+    handleInstrumentation(activity, stats, errors) {
+        const schema = priming_session_batch;
+        const userData = {
+            ...stats,
+        };
+        if (errors.length) {
+            for (const error in errors) {
+                activity.error(error, schema, userData);
+            }
+        }
+        else {
+            activity.stop(schema, userData);
+        }
+    }
+    enqueueBatches(batches, paginationCount = 0) {
         for (const batch of batches) {
+            instrumentation$1.trackValue(SESSION_ENQUEUE_RECORD_COUNT, batch.ids.length);
+            const o11yActivity = instrumentation$1.startActivity('primingSessionBatch');
+            let stats = {
+                idCount: 0,
+                successCount: 0,
+                missingCount: 0,
+                conflictedCount: 0,
+                wasFromPagination: false,
+                paginationCount: 0,
+                ingestDuration: 0,
+                container: '',
+            };
+            let errors = [];
+            if (paginationCount > 0) {
+                stats.wasFromPagination = true;
+                stats.paginationCount = paginationCount;
+            }
+            stats.idCount = batch.ids.length;
             const queuedTime = Date.now();
             this.networkWorkerPool.push({
                 workFn: (abortController) => {
@@ -52795,6 +52850,9 @@ class PrimingSession extends EventEmitter {
                         .fetchRecordData(batch, abortController)
                         .then(async (results) => {
                         if (abortController.aborted) {
+                            for (const id of batch.ids) {
+                                this.retryTracker.delete(id);
+                            }
                             return;
                         }
                         this.emit('batch-fetched', {
@@ -52802,12 +52860,20 @@ class PrimingSession extends EventEmitter {
                             duration: Date.now() - workTime,
                         });
                         for (const result of results) {
-                            this.processFetchedRecords(result, abortController);
+                            const returnedError = this.processFetchedRecords(result, abortController, stats);
+                            if (returnedError) {
+                                errors.push(returnedError);
+                            }
                         }
-                        this.handlePaginations(results, batch);
+                        this.handlePaginations(results, batch, paginationCount);
+                    })
+                        .finally(() => {
+                        this.handleInstrumentation(o11yActivity, stats, errors);
                     });
                 },
                 cancelFn: () => {
+                    errors.push('cancelled');
+                    this.handleInstrumentation(o11yActivity, stats, errors);
                     this.emit('error', {
                         ids: batch.ids,
                         code: 'canceled',
@@ -52817,7 +52883,7 @@ class PrimingSession extends EventEmitter {
             });
         }
     }
-    handlePaginations(results, batch) {
+    handlePaginations(results, batch, paginationCount) {
         const ids = this.recordLoader.getMissingIdsWithPagination(results);
         if (ids.size > 0) {
             const batches = chunk(Array.from(ids), this.batchSize).map((chunkOfIds) => ({
@@ -52826,10 +52892,10 @@ class PrimingSession extends EventEmitter {
                 fields: batch.fields,
                 objectInfo: batch.objectInfo,
             }));
-            this.enqueueBatches(batches);
+            this.enqueueBatches(batches, paginationCount + 1);
         }
     }
-    processFetchedRecords(result, abortController) {
+    processFetchedRecords(result, abortController, stats) {
         if (result.ok === false) {
             const { error } = result;
             let primingError = 'unknown';
@@ -52844,10 +52910,14 @@ class PrimingSession extends EventEmitter {
                 code: primingError,
                 message: `${result.messages.join(',')}`,
             });
-            return;
+            for (const id of result.missingIds) {
+                this.retryTracker.delete(id);
+            }
+            return error;
         }
         const { missingIds } = result;
         if (missingIds.length > 0 && !this.recordLoader.isResultWithPagination(result)) {
+            stats.missingCount = missingIds.length;
             this.emit('error', {
                 ids: missingIds,
                 code: 'not-found',
@@ -52855,11 +52925,17 @@ class PrimingSession extends EventEmitter {
             });
         }
         const { records } = result;
+        stats.successCount = records.length;
         const beforeWrite = Date.now();
         // dispatch the write but DO NOT wait on it to unblock the network pool
         this.recordIngestor
             .insertRecords(records, false)
             .then(({ written, conflicted, errors }) => {
+            instrumentation$1.trackValue(SESSION_INGEST_WRITTEN, written.length);
+            instrumentation$1.trackValue(SESSION_INGEST_CONFLICTED, conflicted.length);
+            instrumentation$1.trackValue(SESSION_INGEST_ERRORS, errors.length);
+            instrumentation$1.trackValue(SESSION_INGEST_DURATION, Date.now() - beforeWrite);
+            stats.conflictedCount = conflicted.length;
             this.emit('batch-written', {
                 written,
                 conflicted,
@@ -52867,6 +52943,17 @@ class PrimingSession extends EventEmitter {
                 duration: Date.now() - beforeWrite,
             });
             if (abortController.aborted) {
+                for (const id of written) {
+                    this.retryTracker.delete(id);
+                }
+                for (const id of conflicted) {
+                    this.retryTracker.delete(id);
+                }
+                for (const error of errors) {
+                    for (const id of error.ids) {
+                        this.retryTracker.delete(id);
+                    }
+                }
                 return;
             }
             if (errors.length > 0) {
@@ -52876,11 +52963,17 @@ class PrimingSession extends EventEmitter {
                         code: 'unknown',
                         message: message,
                     });
+                    for (const id of ids) {
+                        this.retryTracker.delete(id);
+                    }
                 });
             }
             // now that the records are persisted, emit the primed event
             if (written.length > 0) {
                 this.emit('primed', Array.from(written));
+                for (const id of written) {
+                    this.retryTracker.delete(id);
+                }
             }
             // if any records could not be written to the store because there were conflicts, handle the conflicts
             if (conflicted.length > 0) {
@@ -52891,14 +52984,39 @@ class PrimingSession extends EventEmitter {
     async handleWriteConflicts(records, conflicted, abortController) {
         const result = await this.conflictPool.enqueueConflictedRecords(records.filter((x) => conflicted.includes(x.id)), abortController);
         if (abortController.aborted) {
+            for (const id of conflicted) {
+                this.retryTracker.delete(id);
+            }
             return;
         }
-        if (Object.keys(result.additionalWork.records).length > 0) {
+        if (keys$2(result.additionalWork.records).length > 0) {
             this.emit('conflict', {
                 ids: Object.values(result.additionalWork.records).flatMap((record) => record.ids),
                 resolution: 'priming-refresh',
             });
-            this.enqueue(result.additionalWork);
+            // we're re-enqueuing here, so apply retry limits which may change the batches
+            let limitedResult = this.applyRetryLimits(result.additionalWork);
+            this.enqueue(limitedResult.additionalWork);
+            if (limitedResult.recordsNeedingRefetch.size > 0) {
+                for (const key in keys$2(limitedResult.recordsNeedingRefetch)) {
+                    const value = limitedResult.recordsNeedingRefetch.get(key);
+                    if (result.recordsNeedingRefetch.has(key)) {
+                        let existing = result.recordsNeedingRefetch.get(key);
+                        existing = {
+                            // merge the ids
+                            ids: [...existing.ids, ...value.ids],
+                            // This is safe because they derive from the same
+                            // input, no chance of getting a new field in the
+                            // limited result
+                            fields: existing.fields,
+                        };
+                        result.recordsNeedingRefetch.set(key, existing);
+                    }
+                    else {
+                        result.recordsNeedingRefetch.set(key, value);
+                    }
+                }
+            }
         }
         if (result.resolvedRecords.length > 0) {
             this.emit('conflict', {
@@ -52906,8 +53024,14 @@ class PrimingSession extends EventEmitter {
                 resolution: 'priming-merge',
             });
             this.emit('primed', result.resolvedRecords);
+            for (const id of result.resolvedRecords) {
+                this.retryTracker.delete(id);
+            }
         }
         if (result.recordsToWrite.length > 0) {
+            for (const record of result.recordsToWrite) {
+                this.retryTracker.delete(record.id);
+            }
             const { written, errors, conflicted } = await this.recordIngestor.insertRecords(result.recordsToWrite, true);
             if (written.length > 0) {
                 const ids = Array.from(written);
@@ -52934,10 +53058,16 @@ class PrimingSession extends EventEmitter {
         if (result.recordsNeedingRefetch.size > 0) {
             const { loaded, errored } = await this.ldsRecordRefresher.loadRecords(result.recordsNeedingRefetch);
             if (loaded.length > 0) {
+                for (const id of loaded) {
+                    this.retryTracker.delete(id);
+                }
                 this.emit('conflict', { resolution: 'lds-refresh', ids: loaded });
                 this.emit('primed', loaded);
             }
             if (errored.length > 0) {
+                for (const id of errored) {
+                    this.retryTracker.delete(id);
+                }
                 this.emit('error', {
                     ids: errored,
                     code: 'unknown',
@@ -52946,6 +53076,50 @@ class PrimingSession extends EventEmitter {
             }
         }
     }
+    applyRetryLimits(primingWork) {
+        // retryable work goes back into priming session
+        let retryableWork = {
+            type: 'record-fields',
+            records: {},
+        };
+        // refetchable work gets delegated to getRecords
+        let refetchableWork = new Map();
+        for (const key of keys$2(primingWork.records)) {
+            let work = primingWork.records[key];
+            let limitedIds = [];
+            for (const id of work.ids) {
+                let retryCount = this.retryTracker.get(id) || 0;
+                retryCount += 1;
+                if (retryCount > MAX_RETRY_COUNT) {
+                    limitedIds.push(id);
+                    this.retryTracker.delete(id);
+                }
+                else {
+                    this.retryTracker.set(id, retryCount);
+                }
+            }
+            if (limitedIds.length < work.ids.length) {
+                retryableWork.records[key] = {
+                    ids: work.ids.filter((id) => limitedIds.indexOf(id) === -1),
+                    fields: work.fields,
+                };
+            }
+            if (limitedIds.length > 0) {
+                this.emit('retry-limit-reached', { ids: limitedIds });
+                refetchableWork.set(key, {
+                    ids: limitedIds,
+                    fields: work.fields,
+                });
+            }
+        }
+        return {
+            additionalWork: retryableWork,
+            recordsNeedingRefetch: refetchableWork,
+            resolvedRecords: [],
+            recordsToWrite: [],
+            errors: [],
+        };
+    }
     async fetchMetadata(batches) {
         const apiNames = Array.from(batches.reduce((acc, x) => {
             return acc.add(x.type);
@@ -52953,20 +53127,20 @@ class PrimingSession extends EventEmitter {
         const objectInfoMap = await this.objectInfoLoader.getObjectInfos(apiNames);
         const unavailableTypes = apiNames.filter((x) => !objectInfoMap[x]);
         const availableTypes = apiNames.filter((x) => objectInfoMap[x]);
-        const unavilableBatches = batches.filter((x) => unavailableTypes.includes(x.type));
+        const unavailableBatches = batches.filter((x) => unavailableTypes.includes(x.type));
         const availableBatches = batches
             .filter((x) => !unavailableTypes.includes(x.type))
             .map((x) => {
             return { ...x, objectInfo: objectInfoMap[x.type] };
         });
-        const unavailableIds = unavilableBatches.reduce((acc, x) => {
+        const unavailableIds = unavailableBatches.reduce((acc, x) => {
             acc.push(...x.ids);
             return acc;
         }, []);
         return {
             apiNames,
             availableBatches,
-            unavilableBatches,
+            unavailableBatches,
             unavailableTypes,
             availableTypes,
             unavailableIds,
@@ -53196,7 +53370,9 @@ class RecordLoaderGraphQL extends NetworkRecordLoader {
             return acc;
         }, {});
         fields['Id'] = { value: id, displayValue: null };
-        fields['RecordTypeId'] = { value: recordTypeId, displayValue: null };
+        if (objectInfo.fields['RecordTypeId'] !== undefined) {
+            fields['RecordTypeId'] = { value: recordTypeId, displayValue: null };
+        }
         let recordTypeInfo = null;
         if (recordTypeId !== null &&
             objectInfo.recordTypeInfos &&
@@ -55496,4 +55672,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.352.0-9307541b03
+// version: 1.353.0-cc9b469dc4

package/dist/types/priming/ConflictPool.d.ts

@@ -4,7 +4,7 @@ import type { PrimingStore } from './PrimingStore';
 import type { PrimingWork } from './types';
 import type { ObjectInfoLoader } from './ObjectInfoLoader';
 type ConflictResolutionError = 'object-info-missing';
-interface ConflictResolutionResult {
+export interface ConflictResolutionResult {
     additionalWork: PrimingWork;
     recordsToWrite: DurableRecordRepresentation[];
     resolvedRecords: string[];

package/dist/types/priming/PrimingSession.d.ts

@@ -5,6 +5,7 @@ import type { ObjectInfoLoader } from './ObjectInfoLoader';
 import type { PrimingStore } from './PrimingStore';
 import type { LdsRecordRefresher } from './LdsRecordRefresher';
 import { EventEmitter } from './Emitter';
+export declare const instrumentation: import("o11y/dist/modules/o11y/client/interfaces").Instrumentation;
 export interface PrimingSessionConfig {
     store: PrimingStore;
     recordLoader: RecordLoader;
@@ -36,6 +37,9 @@ export interface PrimingEvents {
         errors: string[];
         duration: number;
     };
+    'retry-limit-reached': {
+        ids: string[];
+    };
 }
 interface EventErrorPayload {
     ids: string[];
@@ -56,13 +60,16 @@ export declare class PrimingSession extends EventEmitter<PrimingEvents> {
     private networkWorkerPool;
     private conflictPool;
     private ldsRecordRefresher;
+    private retryTracker;
     constructor(config: PrimingSessionConfig);
     enqueue(work: PrimingWork): Promise<void>;
     cancel(): void;
+    private handleInstrumentation;
     private enqueueBatches;
     private handlePaginations;
     private processFetchedRecords;
     private handleWriteConflicts;
+    private applyRetryLimits;
     private fetchMetadata;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-mobile",
-    "version": "1.352.0",
+    "version": "1.353.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS runtime for mobile/hybrid environments.",
     "main": "dist/main.js",
@@ -32,23 +32,24 @@
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-mobile"
     },
     "dependencies": {
-        "@salesforce/lds-adapters-uiapi": "^1.352.0",
-        "@salesforce/lds-bindings": "^1.352.0",
-        "@salesforce/lds-instrumentation": "^1.352.0",
+        "@salesforce/lds-adapters-uiapi": "^1.353.0",
+        "@salesforce/lds-bindings": "^1.353.0",
+        "@salesforce/lds-instrumentation": "^1.353.0",
         "@salesforce/user": "0.0.21",
-        "o11y": "250.7.0"
+        "o11y": "250.7.0",
+        "o11y_schema": "256.126.0"
     },
     "devDependencies": {
-        "@salesforce/lds-adapters-graphql": "^1.352.0",
-        "@salesforce/lds-drafts": "^1.352.0",
-        "@salesforce/lds-durable-records": "^1.352.0",
-        "@salesforce/lds-network-adapter": "^1.352.0",
-        "@salesforce/lds-network-nimbus": "^1.352.0",
-        "@salesforce/lds-store-binary": "^1.352.0",
-        "@salesforce/lds-store-nimbus": "^1.352.0",
-        "@salesforce/lds-store-sql": "^1.352.0",
-        "@salesforce/lds-utils-adapters": "^1.352.0",
-        "@salesforce/nimbus-plugin-lds": "^1.352.0",
+        "@salesforce/lds-adapters-graphql": "^1.353.0",
+        "@salesforce/lds-drafts": "^1.353.0",
+        "@salesforce/lds-durable-records": "^1.353.0",
+        "@salesforce/lds-network-adapter": "^1.353.0",
+        "@salesforce/lds-network-nimbus": "^1.353.0",
+        "@salesforce/lds-store-binary": "^1.353.0",
+        "@salesforce/lds-store-nimbus": "^1.353.0",
+        "@salesforce/lds-store-sql": "^1.353.0",
+        "@salesforce/lds-utils-adapters": "^1.353.0",
+        "@salesforce/nimbus-plugin-lds": "^1.353.0",
         "babel-plugin-dynamic-import-node": "^2.3.3",
         "wait-for-expect": "^3.0.2"
     },

package/sfdc/main.js

@@ -53,7 +53,7 @@ const { entries: entries$3, keys: keys$5 } = Object;
 
 const UI_API_BASE_URI = '/services/data/v64.0/ui-api';
 
-let instrumentation$1 = {
+let instrumentation$2 = {
     aggregateUiChunkCount: (_cb) => { },
     aggregateUiConnectError: () => { },
     duplicateRequest: (_cb) => { },
@@ -65,7 +65,7 @@ let instrumentation$1 = {
     networkRateLimitExceeded: () => { },
 };
 function instrument(newInstrumentation) {
-    instrumentation$1 = Object.assign(instrumentation$1, newInstrumentation);
+    instrumentation$2 = Object.assign(instrumentation$2, newInstrumentation);
 }
 
 const LDS_RECORDS_AGGREGATE_UI = 'LDS_Records_AggregateUi';
@@ -135,7 +135,7 @@ function mergeRecordFields$2(first, second) {
  *  would otherwise cause a query length exception.
  */
 function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resourceRequest, resourceRequestContext) {
-    instrumentation$1.getRecordAggregateInvoke();
+    instrumentation$2.getRecordAggregateInvoke();
     return networkAdapter(resourceRequest, resourceRequestContext).then((resp) => {
         const { body } = resp;
         // This response body could be an executeAggregateUi, which we don't natively support.
@@ -151,7 +151,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
         }
         const merged = body.compositeResponse.reduce((seed, response) => {
             if (response.httpStatusCode !== HttpStatusCode.Ok) {
-                instrumentation$1.getRecordAggregateReject(() => recordId);
+                instrumentation$2.getRecordAggregateReject(() => recordId);
                 throw createErrorResponse(HttpStatusCode.ServerError, {
                     error: response.message,
                 });
@@ -161,7 +161,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
             }
             return mergeRecordFields$2(seed, response.body);
         }, null);
-        instrumentation$1.getRecordAggregateResolve(() => {
+        instrumentation$2.getRecordAggregateResolve(() => {
             return {
                 recordId,
                 apiName: merged.apiName,
@@ -169,7 +169,7 @@ function dispatchSplitRecordAggregateUiAction(recordId, networkAdapter, resource
         });
         return createOkResponse$1(merged);
     }, (err) => {
-        instrumentation$1.getRecordAggregateReject(() => recordId);
+        instrumentation$2.getRecordAggregateReject(() => recordId);
         // rethrow error
         throw err;
     });
@@ -247,7 +247,7 @@ function buildAndDispatchGetRecordAggregateUi(recordId, req, params) {
     const { networkAdapter, resourceRequest, resourceRequestContext } = req;
     const compositeRequest = buildGetRecordByFieldsCompositeRequest(resourceRequest, params);
     // W-12245125: Emit chunk size metrics
-    instrumentation$1.aggregateUiChunkCount(() => compositeRequest.length);
+    instrumentation$2.aggregateUiChunkCount(() => compositeRequest.length);
     const aggregateUiParams = {
         compositeRequest,
     };
@@ -491,7 +491,7 @@ function platformNetworkAdapter(baseNetworkAdapter) {
     return (resourceRequest, resourceRequestContext) => {
         if (!tokenBucket.take(1)) {
             // We are hitting rate limiting, add some metrics
-            instrumentation$1.networkRateLimitExceeded();
+            instrumentation$2.networkRateLimitExceeded();
         }
         const salesforceRequest = {
             networkAdapter: baseNetworkAdapter,
@@ -52402,6 +52402,8 @@ const NimbusBinaryStore = {
     },
 };
 
+const priming_session_batch={namespace:"sf.lds",name:"PrimingSessionBatch",pbjsSchema:{"nested":{"sf":{"nested":{"lds":{"nested":{"PrimingSessionBatch":{"fields":{"container":{"id":8,"type":"string"},"idCount":{"id":1,"type":"uint32"},"missingCount":{"id":3,"type":"uint32"},"wasFromPagination":{"id":5,"type":"bool"},"successCount":{"id":2,"type":"uint32"},"paginationCount":{"id":6,"type":"uint32"},"conflictedCount":{"id":4,"type":"uint32"},"ingestDuration":{"id":7,"type":"double"}}}}}}}}}};
+
 class EventEmitter {
     constructor() {
         // @ts-ignore typescript doesn't like us setting this to an empty object for some reason
@@ -52515,6 +52517,12 @@ function buildFieldUnionArray(existingRecord, incomingRecord, objectInfo) {
                 fieldUnion.push(`${fieldName}.Id`);
                 includesSpanningFields = true;
             }
+            else {
+                // Field exists on record but not in object info.
+                // Fall back to getRecords resolver in this case.
+                fieldUnion.push(fieldName);
+                includesSpanningFields = true;
+            }
         }
         else {
             fieldUnion.push(fieldName);
@@ -52740,8 +52748,17 @@ class ConflictPool {
     }
 }
 
+const instrumentation$1 = getInstrumentation(O11Y_NAMESPACE_LDS_MOBILE);
 const DEFAULT_BATCH_SIZE = 500;
 const DEFAULT_CONCURRENCY = 6;
+const MAX_RETRY_COUNT = 2;
+const SESSION_BATCH_SIZE = 'priming-session-batch-size';
+const SESSION_CONCURRENCY_LIMIT = 'priming-session-concurrency-limit';
+const SESSION_ENQUEUE_RECORD_COUNT = 'priming-session-enqueue-record-count';
+const SESSION_INGEST_WRITTEN = 'priming-session-ingest-written-count';
+const SESSION_INGEST_CONFLICTED = 'priming-session-ingest-conflicted-count';
+const SESSION_INGEST_ERRORS = 'priming-session-ingest-error-count';
+const SESSION_INGEST_DURATION = 'priming-session-ingest-duration';
 class PrimingSession extends EventEmitter {
     constructor(config) {
         super();
@@ -52753,6 +52770,9 @@ class PrimingSession extends EventEmitter {
         this.ldsRecordRefresher = config.ldsRecordRefresher;
         this.networkWorkerPool = new AsyncWorkerPool(this.concurrency);
         this.conflictPool = new ConflictPool(config.store, this.objectInfoLoader);
+        this.retryTracker = new Map();
+        instrumentation$1.trackValue(SESSION_BATCH_SIZE, config.batchSize ? config.batchSize : 0);
+        instrumentation$1.trackValue(SESSION_CONCURRENCY_LIMIT, config.concurrency ? config.concurrency : 0);
     }
     // function that enqueues priming work
     async enqueue(work) {
@@ -52771,6 +52791,9 @@ class PrimingSession extends EventEmitter {
             unavailableTypes,
         });
         if (unavailableIds.length > 0) {
+            for (const id of unavailableIds) {
+                this.retryTracker.delete(id);
+            }
             this.emit('error', {
                 ids: unavailableIds,
                 code: 'precondition-error',
@@ -52784,8 +52807,40 @@ class PrimingSession extends EventEmitter {
     cancel() {
         this.networkWorkerPool.cancel();
     }
-    enqueueBatches(batches) {
+    handleInstrumentation(activity, stats, errors) {
+        const schema = priming_session_batch;
+        const userData = {
+            ...stats,
+        };
+        if (errors.length) {
+            for (const error in errors) {
+                activity.error(error, schema, userData);
+            }
+        }
+        else {
+            activity.stop(schema, userData);
+        }
+    }
+    enqueueBatches(batches, paginationCount = 0) {
         for (const batch of batches) {
+            instrumentation$1.trackValue(SESSION_ENQUEUE_RECORD_COUNT, batch.ids.length);
+            const o11yActivity = instrumentation$1.startActivity('primingSessionBatch');
+            let stats = {
+                idCount: 0,
+                successCount: 0,
+                missingCount: 0,
+                conflictedCount: 0,
+                wasFromPagination: false,
+                paginationCount: 0,
+                ingestDuration: 0,
+                container: '',
+            };
+            let errors = [];
+            if (paginationCount > 0) {
+                stats.wasFromPagination = true;
+                stats.paginationCount = paginationCount;
+            }
+            stats.idCount = batch.ids.length;
             const queuedTime = Date.now();
             this.networkWorkerPool.push({
                 workFn: (abortController) => {
@@ -52795,6 +52850,9 @@ class PrimingSession extends EventEmitter {
                         .fetchRecordData(batch, abortController)
                         .then(async (results) => {
                         if (abortController.aborted) {
+                            for (const id of batch.ids) {
+                                this.retryTracker.delete(id);
+                            }
                             return;
                         }
                         this.emit('batch-fetched', {
@@ -52802,12 +52860,20 @@ class PrimingSession extends EventEmitter {
                             duration: Date.now() - workTime,
                         });
                         for (const result of results) {
-                            this.processFetchedRecords(result, abortController);
+                            const returnedError = this.processFetchedRecords(result, abortController, stats);
+                            if (returnedError) {
+                                errors.push(returnedError);
+                            }
                         }
-                        this.handlePaginations(results, batch);
+                        this.handlePaginations(results, batch, paginationCount);
+                    })
+                        .finally(() => {
+                        this.handleInstrumentation(o11yActivity, stats, errors);
                     });
                 },
                 cancelFn: () => {
+                    errors.push('cancelled');
+                    this.handleInstrumentation(o11yActivity, stats, errors);
                     this.emit('error', {
                         ids: batch.ids,
                         code: 'canceled',
@@ -52817,7 +52883,7 @@ class PrimingSession extends EventEmitter {
             });
         }
     }
-    handlePaginations(results, batch) {
+    handlePaginations(results, batch, paginationCount) {
         const ids = this.recordLoader.getMissingIdsWithPagination(results);
         if (ids.size > 0) {
             const batches = chunk(Array.from(ids), this.batchSize).map((chunkOfIds) => ({
@@ -52826,10 +52892,10 @@ class PrimingSession extends EventEmitter {
                 fields: batch.fields,
                 objectInfo: batch.objectInfo,
             }));
-            this.enqueueBatches(batches);
+            this.enqueueBatches(batches, paginationCount + 1);
         }
     }
-    processFetchedRecords(result, abortController) {
+    processFetchedRecords(result, abortController, stats) {
         if (result.ok === false) {
             const { error } = result;
             let primingError = 'unknown';
@@ -52844,10 +52910,14 @@ class PrimingSession extends EventEmitter {
                 code: primingError,
                 message: `${result.messages.join(',')}`,
             });
-            return;
+            for (const id of result.missingIds) {
+                this.retryTracker.delete(id);
+            }
+            return error;
         }
         const { missingIds } = result;
         if (missingIds.length > 0 && !this.recordLoader.isResultWithPagination(result)) {
+            stats.missingCount = missingIds.length;
             this.emit('error', {
                 ids: missingIds,
                 code: 'not-found',
@@ -52855,11 +52925,17 @@ class PrimingSession extends EventEmitter {
             });
         }
         const { records } = result;
+        stats.successCount = records.length;
         const beforeWrite = Date.now();
         // dispatch the write but DO NOT wait on it to unblock the network pool
         this.recordIngestor
             .insertRecords(records, false)
             .then(({ written, conflicted, errors }) => {
+            instrumentation$1.trackValue(SESSION_INGEST_WRITTEN, written.length);
+            instrumentation$1.trackValue(SESSION_INGEST_CONFLICTED, conflicted.length);
+            instrumentation$1.trackValue(SESSION_INGEST_ERRORS, errors.length);
+            instrumentation$1.trackValue(SESSION_INGEST_DURATION, Date.now() - beforeWrite);
+            stats.conflictedCount = conflicted.length;
             this.emit('batch-written', {
                 written,
                 conflicted,
@@ -52867,6 +52943,17 @@ class PrimingSession extends EventEmitter {
                 duration: Date.now() - beforeWrite,
             });
             if (abortController.aborted) {
+                for (const id of written) {
+                    this.retryTracker.delete(id);
+                }
+                for (const id of conflicted) {
+                    this.retryTracker.delete(id);
+                }
+                for (const error of errors) {
+                    for (const id of error.ids) {
+                        this.retryTracker.delete(id);
+                    }
+                }
                 return;
             }
             if (errors.length > 0) {
@@ -52876,11 +52963,17 @@ class PrimingSession extends EventEmitter {
                         code: 'unknown',
                         message: message,
                     });
+                    for (const id of ids) {
+                        this.retryTracker.delete(id);
+                    }
                 });
             }
             // now that the records are persisted, emit the primed event
             if (written.length > 0) {
                 this.emit('primed', Array.from(written));
+                for (const id of written) {
+                    this.retryTracker.delete(id);
+                }
             }
             // if any records could not be written to the store because there were conflicts, handle the conflicts
             if (conflicted.length > 0) {
@@ -52891,14 +52984,39 @@ class PrimingSession extends EventEmitter {
     async handleWriteConflicts(records, conflicted, abortController) {
         const result = await this.conflictPool.enqueueConflictedRecords(records.filter((x) => conflicted.includes(x.id)), abortController);
         if (abortController.aborted) {
+            for (const id of conflicted) {
+                this.retryTracker.delete(id);
+            }
             return;
         }
-        if (Object.keys(result.additionalWork.records).length > 0) {
+        if (keys$2(result.additionalWork.records).length > 0) {
             this.emit('conflict', {
                 ids: Object.values(result.additionalWork.records).flatMap((record) => record.ids),
                 resolution: 'priming-refresh',
             });
-            this.enqueue(result.additionalWork);
+            // we're re-enqueuing here, so apply retry limits which may change the batches
+            let limitedResult = this.applyRetryLimits(result.additionalWork);
+            this.enqueue(limitedResult.additionalWork);
+            if (limitedResult.recordsNeedingRefetch.size > 0) {
+                for (const key in keys$2(limitedResult.recordsNeedingRefetch)) {
+                    const value = limitedResult.recordsNeedingRefetch.get(key);
+                    if (result.recordsNeedingRefetch.has(key)) {
+                        let existing = result.recordsNeedingRefetch.get(key);
+                        existing = {
+                            // merge the ids
+                            ids: [...existing.ids, ...value.ids],
+                            // This is safe because they derive from the same
+                            // input, no chance of getting a new field in the
+                            // limited result
+                            fields: existing.fields,
+                        };
+                        result.recordsNeedingRefetch.set(key, existing);
+                    }
+                    else {
+                        result.recordsNeedingRefetch.set(key, value);
+                    }
+                }
+            }
         }
         if (result.resolvedRecords.length > 0) {
             this.emit('conflict', {
@@ -52906,8 +53024,14 @@ class PrimingSession extends EventEmitter {
                 resolution: 'priming-merge',
             });
             this.emit('primed', result.resolvedRecords);
+            for (const id of result.resolvedRecords) {
+                this.retryTracker.delete(id);
+            }
         }
         if (result.recordsToWrite.length > 0) {
+            for (const record of result.recordsToWrite) {
+                this.retryTracker.delete(record.id);
+            }
             const { written, errors, conflicted } = await this.recordIngestor.insertRecords(result.recordsToWrite, true);
             if (written.length > 0) {
                 const ids = Array.from(written);
@@ -52934,10 +53058,16 @@ class PrimingSession extends EventEmitter {
         if (result.recordsNeedingRefetch.size > 0) {
             const { loaded, errored } = await this.ldsRecordRefresher.loadRecords(result.recordsNeedingRefetch);
             if (loaded.length > 0) {
+                for (const id of loaded) {
+                    this.retryTracker.delete(id);
+                }
                 this.emit('conflict', { resolution: 'lds-refresh', ids: loaded });
                 this.emit('primed', loaded);
             }
             if (errored.length > 0) {
+                for (const id of errored) {
+                    this.retryTracker.delete(id);
+                }
                 this.emit('error', {
                     ids: errored,
                     code: 'unknown',
@@ -52946,6 +53076,50 @@ class PrimingSession extends EventEmitter {
             }
         }
     }
+    applyRetryLimits(primingWork) {
+        // retryable work goes back into priming session
+        let retryableWork = {
+            type: 'record-fields',
+            records: {},
+        };
+        // refetchable work gets delegated to getRecords
+        let refetchableWork = new Map();
+        for (const key of keys$2(primingWork.records)) {
+            let work = primingWork.records[key];
+            let limitedIds = [];
+            for (const id of work.ids) {
+                let retryCount = this.retryTracker.get(id) || 0;
+                retryCount += 1;
+                if (retryCount > MAX_RETRY_COUNT) {
+                    limitedIds.push(id);
+                    this.retryTracker.delete(id);
+                }
+                else {
+                    this.retryTracker.set(id, retryCount);
+                }
+            }
+            if (limitedIds.length < work.ids.length) {
+                retryableWork.records[key] = {
+                    ids: work.ids.filter((id) => limitedIds.indexOf(id) === -1),
+                    fields: work.fields,
+                };
+            }
+            if (limitedIds.length > 0) {
+                this.emit('retry-limit-reached', { ids: limitedIds });
+                refetchableWork.set(key, {
+                    ids: limitedIds,
+                    fields: work.fields,
+                });
+            }
+        }
+        return {
+            additionalWork: retryableWork,
+            recordsNeedingRefetch: refetchableWork,
+            resolvedRecords: [],
+            recordsToWrite: [],
+            errors: [],
+        };
+    }
     async fetchMetadata(batches) {
         const apiNames = Array.from(batches.reduce((acc, x) => {
             return acc.add(x.type);
@@ -52953,20 +53127,20 @@ class PrimingSession extends EventEmitter {
         const objectInfoMap = await this.objectInfoLoader.getObjectInfos(apiNames);
         const unavailableTypes = apiNames.filter((x) => !objectInfoMap[x]);
         const availableTypes = apiNames.filter((x) => objectInfoMap[x]);
-        const unavilableBatches = batches.filter((x) => unavailableTypes.includes(x.type));
+        const unavailableBatches = batches.filter((x) => unavailableTypes.includes(x.type));
         const availableBatches = batches
             .filter((x) => !unavailableTypes.includes(x.type))
             .map((x) => {
             return { ...x, objectInfo: objectInfoMap[x.type] };
         });
-        const unavailableIds = unavilableBatches.reduce((acc, x) => {
+        const unavailableIds = unavailableBatches.reduce((acc, x) => {
             acc.push(...x.ids);
             return acc;
         }, []);
         return {
             apiNames,
             availableBatches,
-            unavilableBatches,
+            unavailableBatches,
             unavailableTypes,
             availableTypes,
             unavailableIds,
@@ -53196,7 +53370,9 @@ class RecordLoaderGraphQL extends NetworkRecordLoader {
             return acc;
         }, {});
         fields['Id'] = { value: id, displayValue: null };
-        fields['RecordTypeId'] = { value: recordTypeId, displayValue: null };
+        if (objectInfo.fields['RecordTypeId'] !== undefined) {
+            fields['RecordTypeId'] = { value: recordTypeId, displayValue: null };
+        }
         let recordTypeInfo = null;
         if (recordTypeId !== null &&
             objectInfo.recordTypeInfos &&
@@ -55496,4 +55672,4 @@ register({
 });
 
 export { O11Y_NAMESPACE_LDS_MOBILE, getRuntime, ingest$1o as ingestDenormalizedRecordRepresentation, registerReportObserver, reportGraphqlQueryParseError };
-// version: 1.352.0-9307541b03
+// version: 1.353.0-cc9b469dc4

package/sfdc/types/priming/ConflictPool.d.ts

@@ -4,7 +4,7 @@ import type { PrimingStore } from './PrimingStore';
 import type { PrimingWork } from './types';
 import type { ObjectInfoLoader } from './ObjectInfoLoader';
 type ConflictResolutionError = 'object-info-missing';
-interface ConflictResolutionResult {
+export interface ConflictResolutionResult {
     additionalWork: PrimingWork;
     recordsToWrite: DurableRecordRepresentation[];
     resolvedRecords: string[];

package/sfdc/types/priming/PrimingSession.d.ts

@@ -5,6 +5,7 @@ import type { ObjectInfoLoader } from './ObjectInfoLoader';
 import type { PrimingStore } from './PrimingStore';
 import type { LdsRecordRefresher } from './LdsRecordRefresher';
 import { EventEmitter } from './Emitter';
+export declare const instrumentation: import("o11y/dist/modules/o11y/client/interfaces").Instrumentation;
 export interface PrimingSessionConfig {
     store: PrimingStore;
     recordLoader: RecordLoader;
@@ -36,6 +37,9 @@ export interface PrimingEvents {
         errors: string[];
         duration: number;
     };
+    'retry-limit-reached': {
+        ids: string[];
+    };
 }
 interface EventErrorPayload {
     ids: string[];
@@ -56,13 +60,16 @@ export declare class PrimingSession extends EventEmitter<PrimingEvents> {
     private networkWorkerPool;
     private conflictPool;
     private ldsRecordRefresher;
+    private retryTracker;
     constructor(config: PrimingSessionConfig);
     enqueue(work: PrimingWork): Promise<void>;
     cancel(): void;
+    private handleInstrumentation;
     private enqueueBatches;
     private handlePaginations;
     private processFetchedRecords;
     private handleWriteConflicts;
+    private applyRetryLimits;
     private fetchMetadata;
 }
 export {};