@komaci/prefetch 240.1.3 → 242.1.0

package/build/modules/komaci/prefetch/prefetch.js

@@ -43,7 +43,8 @@ export function prefetch(routes = [], pageReferences = [], config) {
 
         if (config && config.onStateChanged) config.onStateChanged(status);
       },
-      instrumentationContext: config?.instrumentationContext
+      instrumentationContext: config?.instrumentationContext,
+      downloadImage: config?.downloadImage
     };
     getPrefetchService(router, pageReferences, wrappedConfig);
   });

package/build/modules/komaci/prefetchService/prefetchService.js

@@ -1,7 +1,6 @@
 import { ERROR_PREFIX, PrefetchStatusStates as STATE } from 'komaci/prefetchTypes';
 import { getInstrumentation } from 'o11y/client';
 import { getBulkAdgResolver } from 'komaci/resolver';
-import ResolverConfig from 'komaci/resolverConfig';
 import { InstrumentedAction } from 'komaci/instrumentedAction';
 import { bulkResolveSchema, prefetchSchema, prefetchServiceSchema, totalRoutingSchema } from 'o11y_schema/sf_komaci';
 const NO_ADG_MODULE_FOUND = 'No ADG module found for given address.';
@@ -36,17 +35,7 @@ export class PrefetchService {
     this._activity = this._instrumentation.startActivity('prefetch', this.apiOptions);
     this._size = addresses.length; //FIXME: to use o11y.startActivity() when o11y available
 
-    this._startTime = Date.now(); // setting Instrumentation into ResolverConfig singleton so that the Resolver can
-    // access the rootActivityId to enable multiple root activity instrumentation
-
-    if (this.config?.instrumentationContext && ResolverConfig) {
-      ResolverConfig.InstrumentationContext = this.config.instrumentationContext;
-    }
-
-    if (this.config?.downloadImage && ResolverConfig) {
-      ResolverConfig.DownloadImage = this.config.downloadImage;
-    }
-
+    this._startTime = Date.now();
     this.prefetch(addresses);
   }
   /**
@@ -301,7 +290,18 @@ export class PrefetchService {
       resolverInputStatus
     };
     bulkResolutionGroup.adgInputs = adgInputs;
-    bulkResolutionGroup.bulkResolver = getBulkAdgResolver(adgFn, adgInputs, this.onBulkResolutionStatus.bind(this, bulkResolutionGroup, action));
+    const bulkResolutionStatusCbs = {
+      bulkResolutionStatusCb: this.onBulkResolutionStatus.bind(this, bulkResolutionGroup, action),
+      overallBulkResolutionStatusCb: undefined
+    };
+    const environmentCfg = {
+      instrumentationCtx: this.apiOptions.instrumentationContext,
+      downloadImageFunc: this.config.downloadImage,
+      MaxResolutionDepth: 512,
+      WireTimeout: 180 * 1000,
+      WireSlowRunningTimeout: 30 * 1000
+    };
+    bulkResolutionGroup.bulkResolver = getBulkAdgResolver(adgFn, adgInputs, bulkResolutionStatusCbs, environmentCfg);
     this.resolutionGroups.push(bulkResolutionGroup);
     bulkResolutionGroup.bulkResolver.start();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@komaci/prefetch",
-    "version": "240.1.3",
+    "version": "242.1.0",
     "description": "Komaci prefetch service.",
     "homepage": "https://komaci.dev/",
     "repository": {
@@ -26,14 +26,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@komaci/module-shared": "240.1.3",
-        "@komaci/resolver": "240.1.3",
+        "@komaci/module-shared": "242.1.0",
+        "@komaci/resolver": "242.1.0",
         "@lwrjs/router": "0.6.0-alpha.15",
         "o11y": "^240.7.0",
         "o11y_schema": "^240.11.0"
     },
     "devDependencies": {
-        "@komaci/types": "240.1.3",
+        "@komaci/types": "242.1.0",
         "wait-for-expect": "^3.0.2"
     }
 }