creevey 0.10.0-beta.30 → 0.10.0-beta.32

package/src/server/selenium/webdriver.ts

@@ -42,7 +42,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   getSessionId(): Promise<string> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -89,7 +88,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   async loadStoriesFromBrowser(): Promise<StoriesRaw> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -98,7 +96,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   afterTest(test: ServerTest): Promise<void> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -110,7 +107,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
     ignoreElements?: string | string[] | null,
   ): Promise<Buffer> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -119,7 +115,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected waitForComplete(callback: (isCompleted: boolean) => void): void {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -128,7 +123,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected async selectStory(id: string, waitForReady?: boolean): Promise<boolean> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 
@@ -137,7 +131,6 @@ export class SeleniumWebdriver extends CreeveyWebdriverBase {
 
   protected async updateStoryArgs(story: StoryInput, updatedArgs: Args): Promise<void> {
     if (!this.#browser) {
-      // TODO Describe the error
       throw new Error('Browser is not initialized');
     }
 

package/src/server/telemetry.ts

@@ -181,8 +181,8 @@ export async function sendScreenshotsCount(
   const testsMeta = { runId: uuid, tests };
 
   const fullPathname = buildPathname('tests', testsMeta);
-  // NOTE: Keep request path shorter than 32k symbols
-  const chunksCount = Math.ceil(fullPathname.length / 32_000);
+  // NOTE: Keep request path shorter than 24k symbols
+  const chunksCount = Math.ceil(fullPathname.length / 24_000);
   let chunks: string[] = [];
   if (chunksCount > 1) {
     const testsString = JSON.stringify(tests);

package/src/server/utils.ts

@@ -8,6 +8,7 @@ import { register as esmRegister } from 'tsx/esm/api';
 import { register as cjsRegister } from 'tsx/cjs/api';
 import { SkipOptions, SkipOption, isDefined, TestData, noop, ServerTest, Worker } from '../types.js';
 import { emitShutdownMessage, sendShutdownMessage } from './messages.js';
+import { LOCALHOST_REGEXP } from './webdriver.js';
 import assert from 'assert';
 import pidtree from 'pidtree';
 
@@ -99,7 +100,7 @@ export async function shutdownWorkers(): Promise<void> {
           new Promise<void>((resolve) => {
             const timeout = setTimeout(() => {
               if (worker.process.pid) void killTree(worker.process.pid);
-            }, 10000);
+            }, 10_000);
             worker.on('exit', () => {
               clearTimeout(timeout);
               resolve();
@@ -134,10 +135,6 @@ export async function killTree(rootPid: number): Promise<void> {
   });
 }
 
-export function shutdown(): void {
-  process.exit();
-}
-
 export function shutdownWithError(): void {
   process.exit(1);
 }
@@ -261,25 +258,36 @@ export async function loadThroughTSX<T>(
   return result;
 }
 
-export function waitOnUrl(url: string, timeout: number, delay: number) {
+export function waitOnUrl(waitUrl: string, timeout: number, delay: number) {
+  const urls = [waitUrl];
+  if (!LOCALHOST_REGEXP.test(waitUrl)) {
+    const parsedUrl = new URL(waitUrl);
+    parsedUrl.host = 'localhost';
+    urls.push(parsedUrl.toString());
+  }
   const startTime = Date.now();
-  return new Promise<void>((resolve, reject) => {
-    const interval = setInterval(() => {
-      http
-        .get(url, (response) => {
-          if (response.statusCode === 200) {
-            clearInterval(interval);
-            resolve();
-          }
-        })
-        .on('error', () => {
-          // Ignore HTTP errors
-        });
-
-      if (Date.now() - startTime > timeout) {
-        clearInterval(interval);
-        reject(new Error(`${url} didn't respond within ${timeout / 1000} seconds`));
-      }
-    }, delay);
-  });
+  return Promise.race(
+    urls.map(
+      (url) =>
+        new Promise<void>((resolve, reject) => {
+          const interval = setInterval(() => {
+            http
+              .get(url, (response) => {
+                if (response.statusCode === 200) {
+                  clearInterval(interval);
+                  resolve();
+                }
+              })
+              .on('error', () => {
+                // Ignore HTTP errors
+              });
+
+            if (Date.now() - startTime > timeout) {
+              clearInterval(interval);
+              reject(new Error(`${url} didn't respond within ${timeout / 1000} seconds`));
+            }
+          }, delay);
+        }),
+    ),
+  );
 }

package/src/server/webdriver.ts

@@ -18,6 +18,19 @@ export const storybookRootID = 'storybook-root';
 export const LOCALHOST_REGEXP = /(localhost|127\.0\.0\.1)/i;
 const DOCKER_INTERNAL = 'host.docker.internal';
 
+let browserClosePromise: Promise<void> | null = null;
+
+export const openBrowser = () => {
+  let resolve: () => void;
+  browserClosePromise = new Promise((r) => (resolve = r));
+  return () => {
+    resolve();
+    browserClosePromise = null;
+  };
+};
+
+export const waitForBrowserClose = () => browserClosePromise;
+
 export async function resolveStorybookUrl(
   storybookUrl: string,
   checkUrl: (url: string) => Promise<boolean>,

package/src/types.ts

@@ -150,7 +150,6 @@ export interface BrowserConfigObject {
       screenshots?: boolean;
       snapshots?: boolean;
       sources?: boolean;
-      path: string;
     };
   };
 }
@@ -369,7 +368,6 @@ export interface Options {
   storybookUrl?: string;
   storybookPort?: string;
   storybookAutorunCmd?: string;
-  saveReport: boolean;
   failFast?: boolean;
   odiff?: boolean;
   noDocker?: boolean;