@salesforce/lds-runtime-webruntime 1.361.0 → 1.363.0

package/dist/{ldsWebruntimeOneRuntimeInit.js → ldsWebruntimeOneStoreInit.js}

@@ -16,7 +16,7 @@ import { getInstrumentation } from 'o11y/client';
 import { setServices } from 'force/luvioServiceProvisioner1';
 export { default, resolve, setServices } from 'force/luvioServiceProvisioner1';
 import { executeGlobalControllerRawResponse } from 'aura';
-import { HttpStatusCode as HttpStatusCode$2 } from 'force/luvioEngine';
+import { getSfapJwt } from 'force/clwrSfapExchange';
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -417,10 +417,17 @@ class AuraNetworkCommand extends NetworkCommand {
             longRunning: false,
             storable: false,
         };
+        this.networkPreference = 'aura';
+    }
+    get fetchParams() {
+        throw new Error('Fetch parameters must be specified when using HTTP transport on an Aura adapter');
     }
     coerceAuraErrors(auraErrors) {
         return toError(auraErrors[0]); // Default Implmentation stringifies the response
     }
+    async coerceFetchErrors(errorResponse) {
+        return toError(errorResponse.statusText); // Default Behavior
+    }
     convertAuraResponseToData(responsePromise, coerceError) {
         return responsePromise
             .then((response) => {
@@ -446,8 +453,49 @@ class AuraNetworkCommand extends NetworkCommand {
             }
         });
     }
+    convertFetchResponseToData(response) {
+        return response.then((response) => {
+            if (response.ok) {
+                return response
+                    .json()
+                    .then((json) => ok(json), (reason) => err(toError(reason)))
+                    .finally(() => {
+                    try {
+                        this.afterRequestHooks({ statusCode: response.status });
+                    }
+                    catch (e) { }
+                });
+            }
+            else {
+                return this.coerceFetchErrors(response)
+                    .then((coercedError) => {
+                    return err(coercedError);
+                })
+                    .finally(() => {
+                    try {
+                        this.afterRequestHooks({ statusCode: response.status });
+                    }
+                    catch (e) { }
+                });
+            }
+        }, (reason) => err(toError(reason)));
+    }
+    shouldUseAuraNetwork() {
+        return (this.services.auraNetwork !== undefined &&
+            (this.networkPreference === 'aura' || !this.services.fetch));
+    }
+    shouldUseFetch() {
+        return (this.services.fetch !== undefined &&
+            (this.networkPreference === 'http' || !this.services.auraNetwork));
+    }
     fetch() {
-        return this.convertAuraResponseToData(this.services.auraNetwork(this.endpoint, this.auraParams, this.actionConfig), this.coerceAuraErrors);
+        if (this.shouldUseAuraNetwork()) {
+            return this.convertAuraResponseToData(this.services.auraNetwork(this.endpoint, this.auraParams, this.actionConfig), this.coerceAuraErrors);
+        }
+        else if (this.shouldUseFetch()) {
+            return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+        }
+        return resolvedPromiseLike(err(toError('Aura/Fetch network services not found')));
     }
 }
 
@@ -723,6 +771,9 @@ function mergeCacheControlConfigs(baseConfig, overrides) {
  * @typeParam ExtraServices additional named services needed by a subclass
  */
 class AuraCacheControlCommand extends CacheControlCommand {
+    get fetchParams() {
+        throw new Error('Fetch parameters must be specified when using HTTP transport on an Aura adapter');
+    }
     constructor(services) {
         super(services);
         this.services = services;
@@ -732,13 +783,31 @@ class AuraCacheControlCommand extends CacheControlCommand {
             longRunning: false,
             storable: false,
         };
+        this.networkPreference = 'aura';
+    }
+    shouldUseAuraNetwork() {
+        return (this.services.auraNetwork !== undefined &&
+            (this.networkPreference === 'aura' || !this.services.fetch));
+    }
+    shouldUseFetch() {
+        return (this.services.fetch !== undefined &&
+            (this.networkPreference === 'http' || !this.services.auraNetwork));
     }
     requestFromNetwork() {
-        return this.convertAuraResponseToData(this.services.auraNetwork(this.endpoint, this.auraParams, this.actionConfig), (errs) => this.coerceError(errs));
+        if (this.shouldUseAuraNetwork()) {
+            return this.convertAuraResponseToData(this.services.auraNetwork(this.endpoint, this.auraParams, this.actionConfig), (errs) => this.coerceError(errs));
+        }
+        else if (this.shouldUseFetch()) {
+            return this.convertFetchResponseToData(this.services.fetch(...this.fetchParams));
+        }
+        return resolvedPromiseLike(err(toError('Aura/Fetch network services not found')));
     }
     coerceError(auraErrors) {
         return toError(auraErrors[0]); // Default Implementation stringifies the response
     }
+    async coerceFetchError(errorResponse) {
+        return toError(errorResponse.statusText); // Default Behavior
+    }
     convertAuraResponseToData(responsePromise, coerceError) {
         return responsePromise
             .then((response) => {
@@ -764,6 +833,33 @@ class AuraCacheControlCommand extends CacheControlCommand {
             }
         });
     }
+    convertFetchResponseToData(response) {
+        return response.then((response) => {
+            if (response.ok) {
+                return response
+                    .json()
+                    .then((json) => ok(json), (reason) => err(toError(reason)))
+                    .finally(() => {
+                    try {
+                        this.afterRequestHooks({ statusCode: response.status });
+                    }
+                    catch (e) { }
+                });
+            }
+            else {
+                return this.coerceFetchError(response)
+                    .then((coercedError) => {
+                    return err(coercedError);
+                })
+                    .finally(() => {
+                    try {
+                        this.afterRequestHooks({ statusCode: response.status });
+                    }
+                    catch (e) { }
+                });
+            }
+        }, (reason) => err(toError(reason)));
+    }
 }
 
 /**
@@ -2628,14 +2724,18 @@ class JwtManager {
  */
 
 
-function buildServiceDescriptor(interceptors = { request: [] }) {
+function buildServiceDescriptor(interceptors = { request: [], response: [] }) {
     return {
         type: 'fetch',
         version: '1.0',
         service: function (...args) {
-            const { request: requestInterceptors = [] } = interceptors;
+            const { request: requestInterceptors = [], response: responseInterceptors = [] } = interceptors;
             const pending = requestInterceptors.reduce((previousPromise, interceptor) => previousPromise.then(interceptor), resolvedPromiseLike(args));
-            return pending.then((args) => fetch(...args));
+            return pending
+                .then((args) => fetch(...args))
+                .then((response) => {
+                return responseInterceptors.reduce((previousPromise, interceptor) => previousPromise.then(interceptor), resolvedPromiseLike(response));
+            });
         },
     };
 }
@@ -2724,52 +2824,20 @@ function buildJwtRequestHeaderInterceptor(jwtManager, jwtRequestModifier = (_e,
     };
 }
 
-const SFAP_EXCHANGE_PATH = '/webruntime/sfap-info';
-/**
- * We expect jwt info and baseUri to be present in the response.
- *
- * @param response
- */
-function validateResponse(response) {
-    if (!response || !response.jwt || !response.baseUri) {
-        // wrapped the invocation in env conditional
-        // eslint-disable-next-line @salesforce/lds/no-error-in-production
-        throw new Error(`Expected jwt info and baseUri to be present but instead got: ${JSON.stringify(response)}`);
-    }
-}
 /**
  * Resolves Jwt token for SFAP by calling Aura action
  * {@link JwtResolver} for platform SFAP
  */
 const platformSfapJwtResolver = {
     getJwt() {
-        return new Promise((resolve, reject) => {
-            fetch(SFAP_EXCHANGE_PATH)
-                .then((res) => res.json())
-                .then((response) => {
-                if (process.env.NODE_ENV !== 'production') {
-                    validateResponse(response);
-                }
+        return new Promise((resolve) => {
+            getSfapJwt().then((response) => {
                 resolve({
                     jwt: response.jwt,
                     extraInfo: {
                         baseUri: response.baseUri,
                     },
                 });
-            })
-                .catch((error) => {
-                if (error instanceof Error) {
-                    reject(error.message);
-                    return;
-                }
-                // AuraFetchResponse errors
-                const { status } = error;
-                if (status !== HttpStatusCode$2.ServerError) {
-                    // ConnectInJavaError
-                    reject(error.body.message);
-                    return;
-                }
-                reject(error.body.error);
             });
         });
     },
@@ -2902,4 +2970,4 @@ const services = [
     buildServiceDescriptor$2(),
 ];
 setServices(services);
-// version: 1.361.0-6a70680f2b
+// version: 1.363.0-99132bb508

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@salesforce/lds-runtime-webruntime",
-    "version": "1.361.0",
+    "version": "1.363.0",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Webruntime runtime",
-    "main": "dist/ldsWebruntimeOneRuntimeInit.js",
-    "module": "dist/ldsWebruntimeOneRuntimeInit.js",
+    "main": "dist/ldsWebruntimeOneStoreInit.js",
+    "module": "dist/ldsWebruntimeOneStoreInit.js",
     "types": "dist/types/main.d.ts",
     "files": [
         "dist"
@@ -12,16 +12,16 @@
     "exports": {
         ".": {
             "types": "./dist/types/main.d.ts",
-            "import": "./dist/ldsWebruntimeOneRuntimeInit.js",
-            "default": "./dist/ldsWebruntimeOneRuntimeInit.js"
+            "import": "./dist/ldsWebruntimeOneStoreInit.js",
+            "default": "./dist/ldsWebruntimeOneStoreInit.js"
         }
     },
     "sfdc": {
-        "path": "forcelds/ldsWebruntimeOneRuntimeInit/",
-        "publishedFileName": "ldsWebruntimeOneRuntimeInit.js",
+        "path": "forcelds/ldsWebruntimeOneStoreInit/",
+        "publishedFileName": "ldsWebruntimeOneStoreInit.js",
         "overrides": {
             "artifactDirectory": "dist",
-            "outputModuleName": "ldsWebruntimeOneRuntimeInit"
+            "outputModuleName": "ldsWebruntimeOneStoreInit"
         }
     },
     "scripts": {
@@ -32,40 +32,40 @@
         "test:debug": "node --inspect-brk ../../node_modules/.bin/jest --runInBand",
         "test:size": "luvioBundlesize",
         "release:corejar": "yarn build && ../core-build/scripts/core.js --name=lds-runtime-webruntime",
-        "ready": "yarn build && yarn test:unit && yarn test:size && yarn release:corejar"
+        "ready": "yarn build && jest --collectCoverage && yarn test:size && yarn release:corejar"
     },
     "devDependencies": {
-        "@luvio/service-provisioner": "5.40.3",
-        "@luvio/tools-core": "5.40.3",
+        "@luvio/service-provisioner": "5.41.0",
+        "@luvio/tools-core": "5.41.0",
         "jwt-encode": "1.0.1"
     },
     "dependencies": {
-        "@luvio/command-aura-network": "5.40.3",
-        "@luvio/command-aura-normalized-cache-control": "5.40.3",
-        "@luvio/command-aura-resource-cache-control": "5.40.3",
-        "@luvio/command-fetch-network": "5.40.3",
-        "@luvio/command-http-normalized-cache-control": "5.40.3",
-        "@luvio/command-ndjson": "5.40.3",
-        "@luvio/command-network": "5.40.3",
-        "@luvio/command-sse": "5.40.3",
-        "@luvio/command-streaming": "5.40.3",
-        "@luvio/jwt-manager": "5.40.3",
+        "@luvio/command-aura-network": "5.41.0",
+        "@luvio/command-aura-normalized-cache-control": "5.41.0",
+        "@luvio/command-aura-resource-cache-control": "5.41.0",
+        "@luvio/command-fetch-network": "5.41.0",
+        "@luvio/command-http-normalized-cache-control": "5.41.0",
+        "@luvio/command-ndjson": "5.41.0",
+        "@luvio/command-network": "5.41.0",
+        "@luvio/command-sse": "5.41.0",
+        "@luvio/command-streaming": "5.41.0",
+        "@luvio/jwt-manager": "5.41.0",
         "@luvio/network-adapter-composable": "0.158.1",
         "@luvio/network-adapter-fetch": "0.158.1",
-        "@luvio/service-aura-network": "5.40.3",
-        "@luvio/service-cache": "5.40.3",
-        "@luvio/service-cache-control": "5.40.3",
-        "@luvio/service-cache-inclusion-policy": "5.40.3",
-        "@luvio/service-fetch-network": "5.40.3",
-        "@luvio/service-instrument-command": "5.40.3",
-        "@luvio/service-pubsub": "5.40.3",
-        "@luvio/service-store": "5.40.3",
-        "@luvio/utils": "5.40.3",
-        "@salesforce/lds-adapters-uiapi-lex": "^1.361.0"
+        "@luvio/service-aura-network": "5.41.0",
+        "@luvio/service-cache": "5.41.0",
+        "@luvio/service-cache-control": "5.41.0",
+        "@luvio/service-cache-inclusion-policy": "5.41.0",
+        "@luvio/service-fetch-network": "5.41.0",
+        "@luvio/service-instrument-command": "5.41.0",
+        "@luvio/service-pubsub": "5.41.0",
+        "@luvio/service-store": "5.41.0",
+        "@luvio/utils": "5.41.0",
+        "@salesforce/lds-adapters-uiapi-lex": "^1.363.0"
     },
     "luvioBundlesize": [
         {
-            "path": "./dist/ldsWebruntimeOneRuntimeInit.js",
+            "path": "./dist/ldsWebruntimeOneStoreInit.js",
             "maxSize": {
                 "none": "120 kB",
                 "min": "50 kB",