creevey 0.10.0-beta.25 → 0.10.0-beta.27

package/src/server/selenium/internal.ts

@@ -430,7 +430,6 @@ export class InternalBrowser {
         gridUrl,
         viewport,
         storybookUrl: address,
-        resolveStorybookUrl: config.resolveStorybookUrl,
       });
 
       return done ? internalBrowser : null;
@@ -453,13 +452,11 @@ export class InternalBrowser {
     gridUrl,
     viewport,
     storybookUrl,
-    resolveStorybookUrl,
   }: {
     browserName: string;
     gridUrl: string;
     viewport?: { width: number; height: number };
     storybookUrl: string;
-    resolveStorybookUrl?: () => Promise<string>;
   }): Promise<boolean> {
     const sessionId = (await this.#browser.getSession()).getId();
     let browserHost = '';
@@ -483,7 +480,7 @@ export class InternalBrowser {
     return await runSequence(
       [
         () => this.#browser.manage().setTimeouts({ pageLoad: 60000, script: 60000 }),
-        () => this.openStorybookPage(storybookUrl, resolveStorybookUrl),
+        () => this.openStorybookPage(storybookUrl),
         () => this.waitForStorybook(),
         () => this.updateStorybookGlobals(),
         () => this.resolveCreeveyHost(),
@@ -500,25 +497,15 @@ export class InternalBrowser {
     );
   }
 
-  private async openStorybookPage(storybookUrl: string, resolver?: () => Promise<string>): Promise<void> {
+  private async openStorybookPage(storybookUrl: string): Promise<void> {
     if (!LOCALHOST_REGEXP.test(storybookUrl)) {
       return this.#browser.get(appendIframePath(storybookUrl));
     }
 
     try {
-      if (resolver) {
-        logger().debug('Resolving storybook url with custom resolver');
-
-        const resolvedUrl = await resolver();
-
-        logger().debug(`Resolver storybook url ${resolvedUrl}`);
-
-        await this.#browser.get(appendIframePath(resolvedUrl));
-      } else {
-        // TODO Pageload timeout 10s
-        // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
-        await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url));
-      }
+      // TODO Pageload timeout 10s
+      // NOTE: getUrlChecker already calls `browser.get` so we don't need another one
+      await resolveStorybookUrl(appendIframePath(storybookUrl), (url) => this.checkUrl(url));
     } catch (error) {
       logger().error('Failed to resolve storybook URL', error instanceof Error ? error.message : '');
       throw error;

package/src/server/selenium/selenoid.ts

@@ -2,7 +2,8 @@ import path from 'path';
 import assert from 'assert';
 import { lstatSync, existsSync } from 'fs';
 import { mkdir, writeFile, copyFile } from 'fs/promises';
-import sh from 'shelljs';
+import { exec, chmod } from 'shelljs';
+import kill from 'tree-kill';
 import { Config, BrowserConfigObject } from '../../types.js';
 import { downloadBinary, getCreeveyCache } from '../utils.js';
 import { pullImages, runImage } from '../docker.js';
@@ -91,12 +92,12 @@ export async function startSelenoidStandalone(config: Config, debug: boolean): P
 
   // TODO Download browser webdrivers
   try {
-    if (process.platform != 'win32') sh.chmod('+x', binaryPath);
+    if (process.platform != 'win32') chmod('+x', binaryPath);
   } catch {
     /* noop */
   }
 
-  const selenoidProcess = sh.exec(`${binaryPath} -conf ./browsers.json -disable-docker`, {
+  const selenoidProcess = exec(`${binaryPath} -conf ./browsers.json -disable-docker`, {
     async: true,
     cwd: selenoidConfigDir,
   });
@@ -106,7 +107,9 @@ export async function startSelenoidStandalone(config: Config, debug: boolean): P
     selenoidProcess.stderr?.pipe(process.stderr);
   }
 
-  subscribeOn('shutdown', () => selenoidProcess.kill());
+  subscribeOn('shutdown', () => {
+    if (selenoidProcess.pid) kill(selenoidProcess.pid);
+  });
 }
 
 export async function startSelenoidContainer(config: Config, debug: boolean): Promise<string> {

package/src/server/utils.ts

@@ -3,6 +3,7 @@ import https from 'https';
 import http from 'http';
 import cluster from 'cluster';
 import { dirname } from 'path';
+import kill from 'tree-kill';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { register as esmRegister } from 'tsx/esm/api';
 import { register as cjsRegister } from 'tsx/cjs/api';
@@ -97,7 +98,7 @@ export async function shutdownWorkers(): Promise<void> {
         (worker) =>
           new Promise<void>((resolve) => {
             const timeout = setTimeout(() => {
-              worker.kill();
+              if (worker.process.pid) kill(worker.process.pid);
             }, 10000);
             worker.on('exit', () => {
               clearTimeout(timeout);
@@ -113,7 +114,7 @@ export async function shutdownWorkers(): Promise<void> {
 export function gracefullyKill(worker: Worker): void {
   worker.isShuttingDown = true;
   const timeout = setTimeout(() => {
-    worker.kill();
+    if (worker.process.pid) kill(worker.process.pid);
   }, 10000);
   worker.on('exit', () => {
     clearTimeout(timeout);

package/src/types.ts

@@ -365,7 +365,9 @@ export interface Options {
   screenDir?: string;
   reportDir?: string;
   gridUrl?: string;
+  storybookStart?: boolean | string;
   storybookUrl?: string;
+  storybookPort?: string;
   storybookAutorunCmd?: string;
   saveReport: boolean;
   failFast?: boolean;