fix: ensure cache-handler clones full errors (#9383)

* fix: ensure cache-handler clones full errors

* update test logging

* fix prettier

* fix tsc

* Fix lint

* improve setup

* fix ensure-cert

* attempt to add to trust store

* fixup tests

* rework holodeck init

* fix setup

* more cleanup

* fix prettier

* fix lint

.github/actions/setup/action.yml

@@ -76,7 +76,7 @@ runs:
       id: set-up-homebrew
       uses: Homebrew/actions/setup-homebrew@master
 
-    - name: 'Setup SSL Cert'
+    - name: 'Setup SSL Cert Infra'
       if: ${{ inputs.with-cert }}
       shell: bash
       run: |
@@ -105,6 +105,13 @@ runs:
       env:
         ADTL_ARGS: ${{ inputs.adtl-install-args }}
 
+    - name: 'Generate SSL Cert'
+      if: ${{ inputs.with-cert }}
+      shell: bash
+      # Generates the cert if needed, using our local copy of @warp-drive/holodeck
+      run: |
+        node ./packages/holodeck/server/ensure-cert.js
+
     - name: Setup Broccoli Caching
       if: ${{ inputs.restore-broccoli-cache == 'true' }}
       shell: bash

packages/diagnostic/server/index.js

@@ -12,11 +12,7 @@ const isBun = typeof Bun !== 'undefined';
 export default async function launch(config) {
   if (isBun) {
     debug(`Bun detected, using Bun.serve()`);
-    if (config.setup) {
-      debug(`Running configured setup hook`);
-      await config.setup();
-      debug(`Configured setup hook completed`);
-    }
+
     const { checkPort } = await import('./bun/port.js');
     const hostname = config.hostname ?? 'localhost';
     const protocol = config.protocol ?? 'http';
@@ -67,6 +63,17 @@ export default async function launch(config) {
         protocol,
         url: `${protocol}://${hostname}:${port}`,
       };
+
+      if (config.setup) {
+        debug(`Running configured setup hook`);
+        await config.setup({
+          port,
+          hostname,
+          protocol,
+        });
+        debug(`Configured setup hook completed`);
+      }
+
       await launchBrowsers(config, state);
     } catch (e) {
       error(`Error: ${e?.message ?? e}`);

packages/diagnostic/src/-types.ts

@@ -50,6 +50,7 @@ export type GlobalConfig<TC extends TestContext = TestContext> = {
   _current: SuiteReport | null;
   useTestem: boolean;
   useDiagnostic: boolean;
+  testTimeoutMs: number;
   concurrency: number;
   globalHooks: GlobalHooksStorage<TC>;
   totals: {
@@ -77,6 +78,14 @@ export interface Diagnostic {
   expect(count: number): void;
   step(name: string): void;
   verifySteps(steps: string[], message?: string): void;
+  /**
+   * Asserts that the actual value has at least the properties of the expected value.
+   * If additional properties are present on the actual value, they are ignored.
+   *
+   * @param actual
+   * @param expected
+   * @param message
+   */
   satisfies<T extends object, J extends T>(actual: J, expected: T, message?: string): void;
 }
 

packages/diagnostic/src/internals/config.ts

@@ -23,6 +23,7 @@ export const Config: GlobalConfig = {
   useTestem: typeof Testem !== 'undefined',
   // @ts-expect-error
   useDiagnostic: typeof Testem === 'undefined',
+  testTimeoutMs: 50,
   concurrency: 1,
   params: {
     hideReport: {
@@ -148,6 +149,7 @@ export type ConfigOptions = {
   params: Record<string, ParamConfig>;
   useTestem: boolean;
   useDiagnostic: boolean;
+  testTimeoutMs: number;
 };
 const configOptions = [
   'concurrency',
@@ -189,6 +191,8 @@ export function configure(options: Partial<ConfigOptions>): void {
     }
   });
 
+  Config.testTimeoutMs = options.testTimeoutMs ?? 0;
+
   // copy over any remaining params
   Object.assign(Config.params, options.params);
 }

packages/diagnostic/src/internals/run.ts

@@ -7,6 +7,15 @@ import { Diagnostic } from './diagnostic';
 
 export const PublicTestInfo = Symbol('TestInfo');
 
+function cancellable(promise: Promise<void>, timeout: number): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const id = setTimeout(() => {
+      reject(new Error('Test Timeout Exceeded: ' + timeout + 'ms'));
+    }, timeout);
+    promise.then(resolve, reject).finally(() => clearTimeout(id));
+  });
+}
+
 export async function runTest<TC extends TestContext>(
   moduleReport: ModuleReport,
   beforeChain: HooksCallback<TC>[],
@@ -56,7 +65,13 @@ export async function runTest<TC extends TestContext>(
   }
 
   try {
-    await test.cb.call(testContext, Assert);
+    const promise = test.cb.call(testContext, Assert);
+
+    if (promise instanceof Promise && Config.testTimeoutMs > 0) {
+      await cancellable(promise, Config.testTimeoutMs);
+    }
+
+    await promise;
   } catch (err) {
     Assert.pushResult({
       message: `Unexpected Test Failure: ${(err as Error).message}`,
@@ -68,20 +83,20 @@ export async function runTest<TC extends TestContext>(
     if (!Config.params.tryCatch.value) {
       throw err;
     }
-  }
-
-  for (const hook of afterChain) {
-    await hook.call(testContext, Assert);
-  }
-  Assert._finalize();
+  } finally {
+    for (const hook of afterChain) {
+      await hook.call(testContext, Assert);
+    }
+    Assert._finalize();
 
-  groupLogs() && console.groupEnd();
-  testReport.end = instrument() && performance.mark(`test:${test.module.moduleName} > ${test.name}:end`);
-  testReport.measure =
-    instrument() &&
-    performance.measure(`test:${test.module.moduleName} > ${test.name}`, testReport.start.name, testReport.end.name);
+    groupLogs() && console.groupEnd();
+    testReport.end = instrument() && performance.mark(`test:${test.module.moduleName} > ${test.name}:end`);
+    testReport.measure =
+      instrument() &&
+      performance.measure(`test:${test.module.moduleName} > ${test.name}`, testReport.start.name, testReport.end.name);
 
-  DelegatingReporter.onTestFinish(testReport);
+    DelegatingReporter.onTestFinish(testReport);
+  }
 }
 
 export async function runModule<TC extends TestContext>(

packages/holodeck/client/index.ts

@@ -4,6 +4,11 @@ import type { ScaffoldGenerator } from './mock';
 
 const TEST_IDS = new WeakMap<object, { id: string; request: number; mock: number }>();
 
+let HOST = 'https://localhost:1135/';
+export function setConfig({ host }: { host: string }) {
+  HOST = host.endsWith('/') ? host : `${host}/`;
+}
+
 export function setTestId(context: object, str: string | null) {
   if (str && TEST_IDS.has(context)) {
     throw new Error(`MockServerHandler is already configured with a testId.`);
@@ -68,7 +73,8 @@ export async function mock(owner: object, generate: ScaffoldGenerator, isRecordi
   }
   const testMockNum = test.mock++;
   if (getIsRecording() || isRecording) {
-    const url = `https://localhost:1135/__record?__xTestId=${test.id}&__xTestRequestNumber=${testMockNum}`;
+    const port = window.location.port ? `:${window.location.port}` : '';
+    const url = `${HOST}__record?__xTestId=${test.id}&__xTestRequestNumber=${testMockNum}`;
     await fetch(url, {
       method: 'POST',
       body: JSON.stringify(generate()),