fix: review fixes 3

Author: rocketraccoon

src/browser/commands/restoreState/index.ts

@@ -2,7 +2,6 @@ import fs from "fs-extra";
 
 import { restoreStorage } from "./restoreStorage";
 
-import * as logger from "../../../utils/logger";
 import type { Browser } from "../../types";
 import { DEVTOOLS_PROTOCOL, WEBDRIVER_PROTOCOL } from "../../../constants/config";
 import { getOverridesProtocol, getWebdriverFrames, SaveStateData } from "../saveState";
@@ -22,8 +21,7 @@ export default (browser: Browser): void => {
         const currentUrl = new URL(await session.getUrl());
 
         if (!currentUrl.origin || currentUrl.origin === "null") {
-            logger.error("Before restoreState first open page using url command");
-            process.exit(1);
+            throw new Error("Before restoreState first open page using url command");
         }
 
         const options = { ...browser.config.stateOpts, refresh: true, ..._options };
@@ -35,8 +33,7 @@ export default (browser: Browser): void => {
         }
 
         if (!restoreState) {
-            logger.error("Can't restore state: please provide a path to file or data");
-            process.exit(1);
+            throw new Error("Can't restore state: please provide a path to file or data");
         }
 
         if (restoreState?.cookies && options.cookieFilter) {

src/browser/commands/saveState/index.ts

@@ -9,6 +9,7 @@ import { Cookie } from "../../../types";
 import type { Browser } from "../../types";
 import { MasterEvents } from "../../../events";
 import { StateOpts } from "../../../config/types";
+import { addGlobalFileToRemove } from "../../../globalFilesToRemove";
 
 export type FrameData = StorageData;
 
@@ -39,8 +40,7 @@ export default (browser: ExistingBrowser): void => {
         const currentUrl = new URL(await session.getUrl());
 
         if (!currentUrl.origin || currentUrl.origin === "null") {
-            logger.error("Before saveState first open page using url command");
-            process.exit(1);
+            throw new Error("Before saveState first open page using url command");
         }
 
         const options = { ...browser.config.stateOpts, ..._options };
@@ -171,7 +171,7 @@ export default (browser: ExistingBrowser): void => {
 
             if (options.keepFile) {
                 logger.warn(
-                    "\x1b[31mPlease be aware that the file containing authorization data will not be automatically deleted after the tests are completed!!!\x1b[0m",
+                    "\x1b[31mOption keepFile in stateOpts now is true. Please be aware that the file containing authorization data will not be automatically deleted after the tests are completed!\x1b[0m",
                 );
             } else {
                 if (process.send) {
@@ -181,6 +181,8 @@ export default (browser: ExistingBrowser): void => {
                     });
                 }
 
+                addGlobalFileToRemove(options.path);
+
                 browser.emitter.emit(MasterEvents.ADD_FILE_TO_REMOVE, options.path);
             }
         }

src/browser/standalone/attachToBrowser.ts

@@ -5,6 +5,7 @@ import { AsyncEmitter, MasterEvents } from "../../events";
 import { BrowserName, type W3CBrowserName, type SessionOptions } from "./../types";
 import { getNormalizedBrowserName } from "../../utils/browser";
 import fs from "fs-extra";
+import { useGlobalFilesToRemove } from "../../globalFilesToRemove";
 
 export async function attachToBrowser(session: SessionOptions): Promise<WebdriverIO.Browser> {
     const browserName = session.sessionCaps?.browserName || BrowserName.CHROME;
@@ -62,7 +63,7 @@ export async function attachToBrowser(session: SessionOptions): Promise<Webdrive
             process.kill(session.driverPid, 9);
         }
 
-        if (filesToRemove.length > 0) {
+        if (filesToRemove.length > 0 && !useGlobalFilesToRemove()) {
             await Promise.all(filesToRemove.map(path => fs.remove(path)));
         }
     });

src/browser/standalone/launchBrowser.ts

@@ -9,6 +9,7 @@ import { LOCAL_GRID_URL } from "../../constants/config";
 import { WebdriverPool } from "../../browser-pool/webdriver-pool";
 import type { StandaloneBrowserOptionsInput } from "./types";
 import fs from "fs-extra";
+import { useGlobalFilesToRemove } from "../../globalFilesToRemove";
 
 const webdriverPool = new WebdriverPool();
 
@@ -49,6 +50,7 @@ export async function launchBrowser(
         user: options.user,
         key: options.key,
         prepareBrowser: options.prepareBrowser,
+        stateOpts: options.stateOpts,
     };
 
     const filesToRemove: string[] = [];
@@ -105,7 +107,7 @@ export async function launchBrowser(
         await existingBrowser.quit();
         await newBrowser.kill();
 
-        if (filesToRemove.length > 0) {
+        if (filesToRemove.length > 0 && !useGlobalFilesToRemove()) {
             await Promise.all(filesToRemove.map(path => fs.remove(path)));
         }
     });

src/browser/standalone/types.ts

@@ -20,6 +20,7 @@ export type StandaloneBrowserOptions = Pick<
     | "user"
     | "key"
     | "system"
+    | "stateOpts"
 >;
 
 export type StandaloneBrowserOptionsInput = Partial<Omit<StandaloneBrowserOptions, "system">> & {

src/globalFilesToRemove.ts

@@ -0,0 +1,22 @@
+const TESTPLANE_FILES_TO_REMOVE = Symbol.for("testplaneFilesToRemove");
+
+type TestplanaGlobal = typeof globalThis & {
+    [TESTPLANE_FILES_TO_REMOVE]?: string[];
+};
+
+export const initGlobalFilesToRemove = (): void => {
+    (global as TestplanaGlobal)[TESTPLANE_FILES_TO_REMOVE] = [];
+};
+
+export const useGlobalFilesToRemove = (): boolean =>
+    Array.isArray((global as TestplanaGlobal)[TESTPLANE_FILES_TO_REMOVE]);
+
+export const getGlobalFilesToRemove = (): string[] => (global as TestplanaGlobal)[TESTPLANE_FILES_TO_REMOVE] || [];
+
+export const addGlobalFileToRemove = (path: string): void => {
+    const filesToRemove = (global as TestplanaGlobal)[TESTPLANE_FILES_TO_REMOVE];
+
+    if (filesToRemove) {
+        filesToRemove.push(path);
+    }
+};

src/testplane.ts

@@ -21,6 +21,7 @@ import { preloadWebdriverIO } from "./utils/preload-utils";
 import { updateSelectivityHashes } from "./browser/cdp/selectivity";
 import { TagFilter } from "./utils/cli";
 import { ViteServer } from "./runner/browser-env/vite/server";
+import { getGlobalFilesToRemove, initGlobalFilesToRemove } from "./globalFilesToRemove";
 
 interface RunOpts {
     browsers: string[];
@@ -178,6 +179,8 @@ export class Testplane extends BaseTestplane {
 
         preloadWebdriverIO();
 
+        initGlobalFilesToRemove();
+
         if (this.config.beforeAll) {
             await this.config.beforeAll.call({ config: this.config }, { config: this.config });
         }
@@ -200,8 +203,10 @@ export class Testplane extends BaseTestplane {
             await this.config.afterAll.call({ config: this.config }, { config: this.config });
         }
 
-        if (this._filesToRemove.length > 0) {
-            await Promise.all(this._filesToRemove.map(path => fs.remove(path)));
+        const filesToRemove = [...new Set([...this._filesToRemove, ...getGlobalFilesToRemove()])];
+
+        if (filesToRemove.length > 0) {
+            await Promise.all(filesToRemove.map(path => fs.remove(path)));
         }
 
         return !this.isFailed();