Merge pull request #254 from ringcentral/WAT-4303

WAT-4303
ringcentral · Jan 22, 2025 · af96aa9 · af96aa9
2 parents 74470de + e884be1
commit af96aa9
Show file tree

Hide file tree

Showing 8 changed files with 3,535 additions and 1,315 deletions.
diff --git a/core/cli/package.json b/core/cli/package.json
@@ -12,7 +12,6 @@
   "dependencies": {
     "@testring/browser-proxy": "0.7.0",
     "@testring/cli-config": "0.7.0",
-    "@testring/devtool-backend": "0.7.0",
     "@testring/fs-reader": "0.7.0",
     "@testring/fs-store": "0.7.0",
     "@testring/http-api": "0.7.0",

diff --git a/core/cli/src/commands/runCommand.ts b/core/cli/src/commands/runCommand.ts
@@ -10,7 +10,6 @@ import {
     BrowserProxyController,
 } from '@testring/browser-proxy';
 import {ICLICommand, IConfig, ITransport} from '@testring/types';
-import {DevtoolServerController} from '@testring/devtool-backend';
 
 import {FSStoreServer} from '@testring/fs-store';
 
@@ -23,7 +22,6 @@ class RunCommand implements ICLICommand {
     private browserProxyController: BrowserProxyController;
     private testRunController: TestRunController;
     private httpServer: HttpServer;
-    private devtoolServerController: DevtoolServerController;
 
     private fsStoreServer: FSStoreServer;
 
@@ -61,14 +59,9 @@ class RunCommand implements ICLICommand {
     }
 
     async execute() {
-        const devtoolEnabled = this.config.devtool;
-
-        if (devtoolEnabled) {
-            this.devtoolServerController = await this.initDevtoolServer();
-        }
 
         const testWorker = new TestWorker(this.transport, {
-            waitForRelease: devtoolEnabled,
+            waitForRelease: false,
             localWorker: this.config.workerLimit === 'local',
             screenshots: this.config.screenshots,
         });
@@ -81,9 +74,7 @@ class RunCommand implements ICLICommand {
         this.testRunController = new TestRunController(
             this.config,
             testWorker,
-            this.devtoolServerController
-                ? this.devtoolServerController.getRuntimeConfiguration()
-                : null,
+            null,
         );
 
         this.webApplicationController = new WebApplicationController(
@@ -111,7 +102,6 @@ class RunCommand implements ICLICommand {
                 testRunController: this.testRunController,
                 httpClientInstance: httpClient,
                 httpServer: this.httpServer,
-                devtool: this.devtoolServerController,
             },
             this.config,
         );
@@ -147,29 +137,16 @@ class RunCommand implements ICLICommand {
         }
     }
 
-    async initDevtoolServer() {
-        this.logger.info('Recorder Server is enabled');
-
-        const devtoolServerController = new DevtoolServerController(
-            this.transport,
-        );
-        await devtoolServerController.init();
-
-        return devtoolServerController;
-    }
-
     async shutdown() {
         const httpServer = this.httpServer;
         const testRunController = this.testRunController;
         const browserProxyController = this.browserProxyController;
         const webApplicationController = this.webApplicationController;
-        const devtoolServer = this.devtoolServerController;
 
         this.httpServer = null as any;
         this.testRunController = null as any;
         this.browserProxyController = null as any;
         this.webApplicationController = null as any;
-        this.devtoolServerController = null as any;
 
         this.fsWriterQueueServer && this.fsWriterQueueServer.cleanUpTransport();
         this.fsWriterQueueServer = null as any;
@@ -178,7 +155,6 @@ class RunCommand implements ICLICommand {
         webApplicationController && webApplicationController.kill();
         testRunController && (await testRunController.kill());
         browserProxyController && (await browserProxyController.kill());
-        devtoolServer && (await devtoolServer.kill());
     }
 }
 

diff --git a/core/cli/src/index.ts b/core/cli/src/index.ts
@@ -67,7 +67,7 @@ createField('envConfig', {
 });
 
 createField('devtool', {
-    describe: 'Passed to enable recorder/debug server',
+    describe: 'Passed to enable recorder/debug server - deprecated',
     type: 'boolean',
 });
 

diff --git a/core/plugin-api/src/plugin-api.ts b/core/plugin-api/src/plugin-api.ts
@@ -4,7 +4,6 @@ import {FSReaderAPI} from './modules/fs-reader';
 import {LoggerAPI} from './modules/logger';
 import {TestWorkerAPI} from './modules/test-worker';
 import {TestRunControllerAPI} from './modules/test-run-controller';
-import {DevtoolAPI} from './modules/devtool';
 import {HttpServerAPI} from './modules/http-server';
 import {FSStoreServerAPI} from './modules/fs-store-server';
 
@@ -46,10 +45,6 @@ export class PluginAPI {
         return this.modules.httpClientInstance;
     }
 
-    getDevtool(): DevtoolAPI {
-        return new DevtoolAPI(this.pluginName, this.modules.devtool);
-    }
-
     getFSStoreServer(): FSStoreServerAPI {
         return new FSStoreServerAPI(
             this.pluginName,

diff --git a/core/types/src/plugin.ts b/core/types/src/plugin.ts
@@ -6,7 +6,6 @@ import {IPluggableModule} from './pluggable-module';
 import {IBrowserProxyController} from './browser-proxy';
 import {IHttpClient} from './http-api';
 import {
-    IDevtoolServerController,
     IHttpServerController,
 } from './devtool-backend';
 
@@ -22,6 +21,5 @@ export interface IPluginModules {
     browserProxy: IBrowserProxyController & IPluggableModule;
     httpClientInstance: IHttpClient;
     httpServer: IHttpServerController & IPluggableModule;
-    devtool: IDevtoolServerController & IPluggableModule;
     fsStoreServer: IPluggableModule;
 }