clean up unauth calls

Author: ftheirs

package.json

@@ -15,7 +15,7 @@
     "run:with-logs": "pnpm build && pnpm with-logs",
     "test:run": "pnpm run:with-logs artillery run",
 
-    "test:msp-unauth": "pnpm test:run scenarios/artillery.msp-unauth.yml",
+    "test:unauth": "pnpm test:run scenarios/msp.unauth.yml",
     "test:examples.getProfile": "pnpm test:run scenarios/examples.getProfile.yml",
     "test:download": "pnpm test:run scenarios/download.yml"
   },

scenarios/artillery.msp-unauth.yml scenarios/msp.unauth.ymlscenarios/artillery.msp-unauth.yml renamed to scenarios/msp.unauth.yml

@@ -32,8 +32,9 @@ config:
       rampTo: 1
 
 scenarios:
-  - name: msp_unauth_load
+  - name: MSP_Unauthenticated_calls
     flow:
-      - function: mspUnauthLoad
+      - function: getHealth
+      - function: getInfo
 
 

src/processors/msp-unauth.ts

@@ -1,53 +1,26 @@
 import { MspClient } from "@storagehub-sdk/msp-client";
 import type { HttpClientConfig } from "@storagehub-sdk/core";
-import type { Logger } from "pino";
 import { getLogger } from "../log.js";
 import { readEnv } from "../config.js";
 import { NETWORKS } from "../networks.js";
-import type { Env } from "../config.js";
 import { createEmitter } from "../helpers/metrics.js";
 import type {
   ArtilleryContext,
   ArtilleryEvents,
 } from "../helpers/artillery.js";
+import { buildMspHttpClientConfig } from "../sdk/mspHttpConfig.js";
 
-function sleep(ms: number): Promise<void> {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
-function buildHttpConfig(env: Env): HttpClientConfig {
-  const network = NETWORKS[env.network];
-  const base: { baseUrl: string; timeoutMs?: number } = {
-    baseUrl: network.msp.baseUrl,
-  };
-  if (typeof network.msp.timeoutMs === "number") {
-    base.timeoutMs = network.msp.timeoutMs;
-  }
-  const overrideRaw = process.env.MSP_TIMEOUT_MS;
-  if (overrideRaw && overrideRaw.length > 0) {
-    const n = Number.parseInt(overrideRaw, 10);
-    if (Number.isFinite(n)) {
-      base.timeoutMs = n;
-    }
-  }
-  return base;
-}
-
-async function connectUnauth(env: Env, logger: Logger): Promise<MspClient> {
-  const config = buildHttpConfig(env);
-  logger.info({ baseUrl: config.baseUrl }, "msp unauth connect");
-  return await MspClient.connect(config, async () => undefined);
-}
-
-export async function mspUnauthLoad(
+export async function getHealth(
   context: ArtilleryContext,
   events: ArtilleryEvents
 ): Promise<void> {
   const m = createEmitter(context, events);
   const logger = getLogger();
   const env = readEnv();
+  const network = NETWORKS[env.network];
 
-  const client = await connectUnauth(env, logger);
+  const config = buildMspHttpClientConfig(network);
+  const client = await MspClient.connect(config);
 
   const healthStart = Date.now();
   try {
@@ -58,8 +31,19 @@ export async function mspUnauthLoad(
     m.counter("msp.req.err", 1);
     logger.debug({ err }, "msp unauth request error");
   }
+}
+
+export async function getInfo(
+  context: ArtilleryContext,
+  events: ArtilleryEvents
+): Promise<void> {
+  const m = createEmitter(context, events);
+  const logger = getLogger();
+  const env = readEnv();
+  const network = NETWORKS[env.network];
 
-  await sleep(1000);
+  const config = buildMspHttpClientConfig(network);
+  const client = await MspClient.connect(config);
 
   const infoStart = Date.now();
   try {