@salesforce/lds-network-fetch 1.396.0 → 1.397.0

package/dist/ldsNetworkFetch.js

@@ -769,9 +769,24 @@ function checkLdsStorageCacheOrFetch(resourceRequest, resourceRequestContext, st
     }
     return platformFetchAdapterWithInterceptors(resourceRequest, resourceRequestContext, requestInterceptors);
 }
+// Copied from requestId generation on core
+function generateRequestId() {
+    function guid() {
+        function s4() {
+            return Math.floor((1 + Math.random()) * 0x10000)
+                .toString(16)
+                .substring(1);
+        }
+        return s4() + s4();
+    }
+    return [Math.round(Date.now() * 1000000), guid(), Math.round(Math.random() * 100000000)]
+        .join('')
+        .substring(0, 18);
+}
 
 // noop implementation for when one is not provided
 let internalRequestTracker = {
+    hasTracker: () => false,
     registerHandler: (_request, _name, _loadedCheck) => { },
     markFinished: (_request) => { },
 };
@@ -801,8 +816,9 @@ function handleSendFetchRequest(resourceRequest, resourceRequestContext, interce
     const path = `${baseUri}${basePath}`;
     const storageAndLogger = getStorageAndLogger(path);
     const transactionKey = getTransactionKey$1(resourceRequest);
+    const trackerId = generateRequestId();
     const response = checkLdsStorageCacheOrFetch(resourceRequest, resourceRequestContext, storageAndLogger, transactionKey, interceptors.request);
-    internalRequestTracker.registerHandler(response, 'lds-inflight-network-request', () => {
+    internalRequestTracker.registerHandler(trackerId, 'lds-inflight-network-request', () => {
         // return false until we signal we are finished
         return false;
     });
@@ -818,7 +834,7 @@ function handleSendFetchRequest(resourceRequest, resourceRequestContext, interce
         internalRequestLogger.reject(resourceRequest, error);
     });
     return interceptedResponse.finally(() => {
-        internalRequestTracker.markFinished(interceptedResponse);
+        internalRequestTracker.markFinished(trackerId);
     });
 }
 /**
@@ -829,7 +845,8 @@ function handleSendFetchRequest(resourceRequest, resourceRequestContext, interce
  * @returns lexNetworkAdapter {@link NetworkAdapter}
  */
 function setupLexNetworkAdapter(requestTracker, requestLogger, interceptors) {
-    internalRequestTracker = requestTracker || internalRequestTracker;
+    internalRequestTracker =
+        requestTracker && requestTracker.hasTracker() ? requestTracker : internalRequestTracker;
     internalRequestLogger = requestLogger || internalRequestLogger;
     return async (resourceRequest, resourceRequestContext) => {
         return handleSendFetchRequest(resourceRequest, resourceRequestContext, interceptors ?? { request: [], response: [] });
@@ -854,5 +871,5 @@ function instrument(newInstrumentation) {
     Object.assign(instrumentation, newInstrumentation);
 }
 
-export { instrument, setupFetchNetworkAdapter, setupLexNetworkAdapter };
-// version: 1.396.0-08650966f4
+export { generateRequestId, instrument, internalRequestTracker, setupFetchNetworkAdapter, setupLexNetworkAdapter };
+// version: 1.397.0-08bd11d0bc

package/dist/types/main.d.ts

@@ -1,4 +1,5 @@
-export { setupFetchNetworkAdapter, setupLexNetworkAdapter } from './networkAdapter';
+export { internalRequestTracker, setupFetchNetworkAdapter, setupLexNetworkAdapter, } from './networkAdapter';
 export type { RequestLogger, RequestTracker } from './networkAdapter';
+export { generateRequestId } from './utils';
 export type { RequestInterceptor, ResponseInterceptor, Interceptors } from './utils';
 export { instrument, FetchNetworkInstrumentation } from './instrumentation';

package/dist/types/networkAdapter.d.ts

@@ -1,9 +1,11 @@
 import type { NetworkAdapter, ResourceRequest } from '@luvio/engine';
 import { Interceptors } from './utils';
 export type RequestTracker = {
+    hasTracker: () => boolean;
     registerHandler: (request: any, name: string, loadedCheck: () => boolean) => void;
     markFinished: (request: any) => void;
 };
+export declare let internalRequestTracker: RequestTracker;
 export type RequestLogger = {
     resolve: (request: ResourceRequest, response: any) => void;
     reject: (request: ResourceRequest, error: Error) => void;

package/dist/types/utils.d.ts

@@ -26,4 +26,5 @@ export type Interceptors = {
  * @returns Promise<FetchResponse<any> - Promise that resolves to a fetch response.
  */
 export declare function checkLdsStorageCacheOrFetch(resourceRequest: ResourceRequest, resourceRequestContext: ResourceRequestContext, storageAndLogger: LdsStorageConfig | null, transactionKey: string, requestInterceptors?: RequestInterceptor[]): Promise<FetchResponse<any>>;
+export declare function generateRequestId(): string;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-network-fetch",
-    "version": "1.396.0",
+    "version": "1.397.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS Network Adapter using fetch",
     "main": "dist/ldsNetworkFetch.js",
@@ -38,6 +38,6 @@
         "@luvio/network-adapter-fetch": "0.158.7"
     },
     "devDependencies": {
-        "@salesforce/lds-network-aura": "^1.396.0"
+        "@salesforce/lds-network-aura": "^1.397.0"
     }
 }