npm - tnp-helpers - Versions diffs - 19.0.65 → 19.0.66 - Mend

tnp-helpers 19.0.65 → 19.0.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (118) hide show

package/lib/base/classes/base-cli-worker/base-cli-worker-controller.js CHANGED Viewed

@@ -13,8 +13,8 @@ exports.BaseCliWorkerController = void 0;
 const lib_1 = require("taon/lib");
 const lib_2 = require("tnp-core/lib");
 const base_cli_worker_config_1 = require("./base-cli-worker-config");
-let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.Base
-    .Controller {
+const base_cli_worker_utils_1 = require("./base-cli-worker.utils");
+let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.Base.Controller {
     /**
      * service id
      */
@@ -31,14 +31,21 @@ let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.B
     }
     //#endregion
     //#region api methods / kill
-    baseCLiWorkerCommand_kill() {
+    baseCLiWorkerCommand_kill(dontRemoveConfigFile) {
         //#region @backendFunc
         return async () => {
             console.log(`Killing worker "${this.cliWorkerServiceId}"...`);
-            setTimeout(() => {
+            setTimeout(async () => {
+                console.log(`Destroying context worker "${this.cliWorkerServiceId}"...`);
+                await this.ctx.destroy();
+                if (!dontRemoveConfigFile) {
+                    lib_2.Helpers.removeFileIfExists(base_cli_worker_utils_1.BaseCliWorkerUtils.getPathToProcessLocalInfoJson(this.cliWorkerServiceId));
+                }
                 lib_2.Helpers.clearConsole();
-                process.exit(0);
-            }, 1000); // TODO may be change to 0
+                setTimeout(() => {
+                    process.exit(0);
+                });
+            }); // TODO may be change to 0
         };
         //#endregion
     }
@@ -47,11 +54,17 @@ let BaseCliWorkerController = class BaseCliWorkerController extends lib_1.Taon.B
     info() {
         //#region @backendFunc
         return async () => {
-            return (`Service "${this.cliWorkerServiceId}" is ` +
-                `running healthy on port ${this.ctx.uriPort},
-      version: ${this.cliWorkerServiceVersion},
-      pid: ${process.pid}
-      `);
+            return `
+<html>
+<head><title>Service Info</title></head>
+<body>
+    <h1>Service "${this.cliWorkerServiceId}" is</h1>
+    <h1>running healthy on port ${this.ctx.uriPort} </h1>
+    <h4>version: ${this.cliWorkerServiceVersion}</h4>
+    <h4>pid: ${process.pid}</h4><br>
+</body>
+<html>
+      `;
         };
         //#endregion
     }
@@ -99,13 +112,13 @@ __decorate([
     __param(1, lib_1.Taon.Http.Param.Body('serviceVersion'))
 ], BaseCliWorkerController.prototype, "baseCLiWorkerCommand_initializeMetadata", null);
 __decorate([
-    lib_1.Taon.Http.GET()
+    lib_1.Taon.Http.GET(),
+    __param(0, lib_1.Taon.Http.Param.Query('dontRemoveConfigFile'))
 ], BaseCliWorkerController.prototype, "baseCLiWorkerCommand_kill", null);
 __decorate([
-    lib_1.Taon.Http.GET({
+    lib_1.Taon.Http.HTML({
         pathIsGlobal: true,
-        // overrideContentType: 'text/html',
-        // overridResponseType: 'text',
+        path: '/info',
     })
 ], BaseCliWorkerController.prototype, "info", null);
 __decorate([

package/lib/base/classes/base-cli-worker/base-cli-worker-controller.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base-cli-worker-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;;;;;;;;;;AAAA,kCAAgC;AAChC,sCAAuC;AAEvC,qEAA+D;~~AAKxD~~,IAAe,uBAAuB,GAAtC,MAAe,~~uBAAwB~~,SAAQ,UAAI,CAAC,IAAI~~;KAC5D~~,~~UAAU~~;~~IACX~~;;OAEG;IACK,kBAAkB,GAAW,IAAI,CAAC;IAClC,uBAAuB,GAAW,IAAI,CAAC;IAE/C,2CAA2C;IAE3C,uCAAuC,CACF,SAAiB,EACZ,cAAsB;QAE9D,sBAAsB;QACtB,OAAO,KAAK,IAAI,EAAE;YAChB,IAAI,CAAC,kBAAkB,GAAG,SAAS,CAAC;YACpC,IAAI,CAAC,uBAAuB,GAAG,cAAc,CAAC;QAChD,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,4BAA4B;IAE5B,yBAAyB;~~QACvB~~,sBAAsB;QACtB,OAAO,KAAK,IAAI,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,kBAAkB,MAAM,CAAC,CAAC;YAC9D,UAAU,CAAC,GAAG,EAAE;~~gBACd~~,aAAO,CAAC,YAAY,EAAE,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;~~YAClB~~,CAAC,~~EAAE~~,~~IAAI~~,CAAC,CAAC,CAAC,0BAA0B;~~QACtC~~,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,4BAA4B;~~IAM5B~~,IAAI;QACF,sBAAsB;QACtB,OAAO,KAAK,IAAI,EAAE;YAChB,OAAO,~~CACL,YAAY,~~IAAI,CAAC,kBAAkB~~,OAAO~~;~~gBAC1C~~,~~2BAA2B,~~IAAI,CAAC,GAAG,CAAC,OAAO;~~iBAClC~~,IAAI,CAAC,uBAAuB;~~aAChC~~,OAAO,CAAC,GAAG~~;OACjB~~,~~CACA,~~CAAC;QACJ,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,kCAAkC;IAElC,8BAA8B,CACJ,qBAA0C;QAElE,sBAAsB;QACtB,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,qBAAqB,GAAG,4CAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACxE,MAAM,aAAa,GAAG,4CAAmB,CAAC,IAAI,CAAC;gBAC7C,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,SAAS,EAAE,IAAI,CAAC,kBAAkB;gBAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,uBAAuB;aACtC,CAAC,CAAC;YACH,6CAA6C;YAC7C,+CAA+C;YAC/C,OAAO,qBAAqB,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACvD,CAAC,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,8CAA8C;IAE9C,uCAAuC,CACb,qBAA0C;QAElE,sBAAsB;QACtB,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,qBAAqB,GAAG,4CAAmB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;YACxE,MAAM,mBAAmB,GAAG,4CAAmB,CAAC,IAAI,CAAC;gBACnD,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,SAAS,EAAE,IAAI,CAAC,kBAAkB;gBAClC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;gBAC9B,OAAO,EAAE,IAAI,CAAC,uBAAuB;aACtC,CAAC,CAAC;YACH,+DAA+D;YAC/D,qDAAqD;YACrD,OAAO,mBAAmB,CAAC,iCAAiC,CAC1D,qBAAqB,CACtB,CAAC;QACJ,CAAC,CAAC;QACF,YAAY;IACd,CAAC;CAEF,CAAA;~~AAxGqB~~,0DAAuB;~~AAU3C~~;IADC,UAAI,CAAC,IAAI,CAAC,GAAG,EAAE;IAEb,WAAA,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACjC,WAAA,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;sFAQxC;AAKD;IADC,UAAI,CAAC,IAAI,CAAC,GAAG,EAAE;~~wEAWf~~;~~AASD~~;~~IALC~~,UAAI,CAAC,IAAI,CAAC,~~GAAG~~,CAAC;~~QACb~~,YAAY,EAAE,IAAI;QAClB,~~oCAAoC~~;~~QACpC,+BAA+B;KAChC~~,CAAC;~~mDAaD~~;AAKD;IADC,UAAI,CAAC,IAAI,CAAC,IAAI,EAAE;IAEd,WAAA,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;6EAgBxB;AAKD;IADC,UAAI,CAAC,IAAI,CAAC,IAAI,EAAE;IAEd,WAAA,UAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;sFAkBxB;~~kCAtGmB~~,uBAAuB;IAH5C,UAAI,CAAC,UAAU,CAAC;QACf,SAAS,EAAE,yBAAyB;KACrC,CAAC;GACoB,uBAAuB,~~CAwG5C~~"}
1	+ {"version":3,"file":"base-cli-worker-controller.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/base/classes/base-cli-worker/base-cli-worker-terminal-ui.d.ts CHANGED Viewed

@@ -7,7 +7,7 @@ export type BaseWorkerTerminalActionReturnType = {
         action: () => unknown | Promise<unknown>;
     };
 };
-export declare class BaseCliWorkerTerminalUI<WORKER extends BaseCliWorker<BaseCliWorkerController, any>> {
+export declare class BaseCliWorkerTerminalUI<WORKER extends BaseCliWorker<BaseCliWorkerController<any>, any>> {
     protected worker: WORKER;
     constructor(worker: WORKER);
     protected headerText(): Promise<string>;

package/lib/base/classes/base-cli-worker/base-cli-worker-terminal-ui.js CHANGED Viewed

@@ -31,10 +31,13 @@ class BaseCliWorkerTerminalUI {
      */
     async header() {
         //#region @backendFunc
-        lib_2.UtilsTerminal.drawBigText(await this.headerText(), {
-            align: this.headerTextAlign(),
-            style: this.textHeaderStyle(),
-        });
+        const headerText = await this.headerText();
+        if (headerText) {
+            lib_2.UtilsTerminal.drawBigText(await this.headerText(), {
+                align: this.headerTextAlign(),
+                style: this.textHeaderStyle(),
+            });
+        }
         //#endregion
     }
     //#endregion
@@ -44,7 +47,7 @@ class BaseCliWorkerTerminalUI {
         lib_2.Helpers.info(`
       Service ${lib_3.chalk.bold.red(this.worker.serviceID)}` +
             ` (version: ${this.worker.serviceVersion}) started..
-      Check info here http://localhost:${lib_3.chalk.bold(this.worker.processLocalInfoObj?.port?.toString())}/${'info'}
+      Check info here http://localhost:${lib_3.chalk.bold(this.worker.processLocalInfoObj?.port?.toString())}/api/${this.worker.workerContextTemplate().contextName}/${'info'}
       Worker started by ${lib_3.chalk.bold(lib_1.config.frameworkName)}
       (cwd: ${(0, lib_2.crossPlatformPath)(process.cwd())})
         `);
@@ -83,7 +86,8 @@ class BaseCliWorkerTerminalUI {
                 name: 'Open browser with service info',
                 action: async () => {
                     const openInBrowser = require('open');
-                    openInBrowser(`http://localhost:${this.worker.processLocalInfoObj.port}/info`);
+                    openInBrowser(`http://localhost:${this.worker.processLocalInfoObj.port}` +
+                        `/api/${this.worker.workerContextTemplate().contextName}/info`);
                 },
             },
             exit: {

package/lib/base/classes/base-cli-worker/base-cli-worker-terminal-ui.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"base-cli-worker-terminal-ui.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iBAAiB;AACjB,wCAAwC;AACxC,sCAKsB;AACtB,sCAAwC;AAaxC,MAAa,uBAAuB;IAGZ;IAAtB,YAAsB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAExC,6CAA6C;IACnC,KAAK,CAAC,UAAU;QACxB,OAAO,OAAC,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IACD,YAAY;IAEZ,+CAA+C;IACrC,eAAe;QACvB,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,YAAY;IAEZ,+CAA+C;IACrC,eAAe;QACvB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,YAAY;IAEZ,oCAAoC;IACpC;;OAEG;IACO,KAAK,CAAC,MAAM;QACpB,sBAAsB;QACtB,mBAAa,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,EAAE;~~YACjD~~,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE;~~YAC7B~~,KAAK,EAAE,IAAI,CAAC,eAAe,EAAE;~~SAC9B~~,CAAC,CAAC;~~QACH~~,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,uDAAuD;IACvD,KAAK,CAAC,sBAAsB;QAC1B,sBAAsB;QACtB,aAAO,CAAC,IAAI,CACV;gBACU,WAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC/C,cAAc,IAAI,CAAC,MAAM,CAAC,cAAc;yCACP,WAAK,CAAC,IAAI,CAC3C,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,IAAI,EAAE,QAAQ,EAAE,CAClD,IAAI,~~MAAuC~~;~~0BACxB~~,WAAK,CAAC,IAAI,CAAC,YAAM,CAAC,aAAa,CAAC;cAC5C,IAAA,uBAAiB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC;SACrC,CACJ,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,6CAA6C;IAC7C,IAAc,UAAU;QACtB,OAAO;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE,MAAM;aACb;SACF,CAAC;IACJ,CAAC;IACD,YAAY;IAEZ,2CAA2C;IAC3C,IAAc,YAAY;QACxB,OAAO;YACL,WAAW,EAAE;gBACX,IAAI,EAAE,gCAAgC;gBACtC,MAAM,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;aACvB;SACF,CAAC;IACJ,CAAC;IACD,YAAY;IAEZ,qDAAqD;IAC3C,wBAAwB,CAAC,OAGlC;QACC,sBAAsB;QACtB,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,YAAY,GAAG,OAAC,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,CAAC,CAAC,OAAO,CAAC,YAAY;YACtB,CAAC,CAAC,IAAI,CAAC;QAET,OAAO;YACL,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;YAClD,WAAW,EAAE;gBACX,IAAI,EAAE,gCAAgC;gBACtC,MAAM,EAAE,KAAK,IAAI,EAAE;oBACjB,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;oBACtC,aAAa,CACX,oBAAoB,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,IAAI,OAAO,~~CAChE~~,CAAC;gBACJ,CAAC;aACF;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,OAAO,CAAC,gBAAgB;oBAC5B,CAAC,CAAC,2BAA2B;oBAC7B,CAAC,CAAC,mBAAmB;gBACvB,MAAM,EAAE,KAAK,IAAI,EAAE;oBACjB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;wBAC7B,OAAO,IAAI,CAAC,CAAC,+BAA+B;oBAC9C,CAAC;oBACD,IACE,MAAM,mBAAa,CAAC,OAAO,CAAC;wBAC1B,YAAY,EAAE,KAAK;wBACnB,OAAO,EAAE,6CAA6C;qBACvD,CAAC,EACF,CAAC;~~wBACD~~,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;~~wBACzB~~,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBAClB,CAAC;gBACH,CAAC;aACF;SACF,CAAC;QACF,YAAY;IACd,CAAC;IACD,YAAY;IAEZ,yCAAyC;IAClC,KAAK,CAAC,UAAU,CAAC,OAEvB;QACC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC,mBAAa,CAAC,iBAAiB,EAAE,EAAE,CAAC;gBACvC,mBAAa,CAAC,YAAY,EAAE,CAAC;YAC/B,CAAC;YAED,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YAEpB,MAAM,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,MAAM,mBAAa,CAAC,MAAM,CAAuB;gBAC9D,OAAO;gBACP,QAAQ,EAAE,eAAe;aAC1B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAC;YAC9B,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,EAAE,CAAC;gBAChC,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,YAAY;IAEZ,kEAAkE;IAC3D,gCAAgC;QACrC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACxD,CAAC;CAEF;~~AA1JD~~,~~0DA0JC~~"}
1	+ {"version":3,"file":"base-cli-worker-terminal-ui.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}

package/lib/base/classes/base-cli-worker/base-cli-worker.d.ts CHANGED Viewed

@@ -1,8 +1,9 @@
-import { Taon } from 'taon';
+import { EndpointContext, Taon } from 'taon';
 import { BaseCliWorkerConfig } from './base-cli-worker-config';
 import type { BaseCliWorkerController } from './base-cli-worker-controller';
 import { BaseCliWorkerTerminalUI } from './base-cli-worker-terminal-ui';
-export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerController, TERMINAL_UI extends BaseCliWorkerTerminalUI<any>> {
+import { BaseCliMethodOptions } from './base-cli-worker.models';
+export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerController<any>, TERMINAL_UI extends BaseCliWorkerTerminalUI<any> = any> {
     /**
      * unique id for service
      */
@@ -16,15 +17,13 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      */
     readonly serviceVersion: string;
     readonly SPECIAL_WORKER_READY_MESSAGE = "$$$ WORKER_READY $$$";
+    /**
+     * dependency workers that should be started before this worker
+     */
+    readonly dependencyWorkers: Map<string, BaseCliWorker<any, any>>;
     readonly terminalUI: TERMINAL_UI;
     readonly workerContextTemplate: ReturnType<typeof Taon.createContextTemplate>;
-    private workerMainContext;
-    getRemoteControllerFor(ipAddressOfTaonInstance: string, port?: number): Promise<REMOTE_CTRL>;
-    private workerRemoteContext;
     readonly controllerClass: new () => REMOTE_CTRL;
-    private contextForRemoteConnection;
-    protected get pathToProcessLocalInfoJson(): string;
-    get processLocalInfoObj(): BaseCliWorkerConfig;
     constructor(
     /**
      * unique id for service
@@ -38,25 +37,19 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      * unique id for service
      */
     serviceVersion: string);
-    /**
-     * <strong>IMPORTANT USE ONLY IN DEVELOPMENT !!!</strong>
-     * for production use startDetachedIfNeedsToBeStarted()
-     * start normally process
-     * this will crash if process already started
-     */
-    startNormallyInCurrentProcess(options?: {
-        actionBeforeTerminalUI?: () => Promise<void>;
-    }): Promise<void>;
-    getControllerForRemoteConnection(options?: {
-        calledFrom?: string;
-    }): Promise<REMOTE_CTRL>;
-    startDetachedIfNeedsToBeStarted(options?: {
-        useCurrentWindowForDetach?: boolean;
-    }): Promise<void>;
+    get processLocalInfoObj(): BaseCliWorkerConfig;
+    getRemoteControllerFor<ctrl = REMOTE_CTRL>(options?: {
+        methodOptions: Partial<BaseCliMethodOptions>;
+        /**
+         * Optionally get other controller from remote context
+         */
+        controllerClass?: new () => ctrl;
+    }): Promise<ctrl>;
     /**
      * stop if started
      */
     kill(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
         dontRemoveConfigFile?: boolean;
     }): Promise<void>;
     /**
@@ -64,17 +57,45 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      * @param options.detached - default true
      */
     restart(options?: {
-        detached?: boolean;
-        useCurrentWindowForDetach?: boolean;
+        methodOptions?: BaseCliMethodOptions;
     }): Promise<void>;
     /**
      * only for cli start
      * @param cliParams on from cli
      */
-    cliStartProcedure(cliParams: any): Promise<void>;
+    cliStartProcedure(options: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<{
+        controller: REMOTE_CTRL;
+        worker: BaseCliWorker<any, any>;
+        serviceId: string;
+    }>;
+    protected getRemoteContextFor(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<EndpointContext>;
+    protected get pathToProcessLocalInfoJson(): string;
+    protected get processLocalInfoPortNotInited(): boolean;
+    protected get workerIsStarting(): boolean;
+    protected startDetachedIfNeedsToBeStarted(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<void>;
+    /**
+     * <strong>IMPORTANT USE ONLY IN DEVELOPMENT !!!</strong>
+     * for production use startDetachedIfNeedsToBeStarted()
+     * start normally process
+     * this will crash if process already started
+     */
+    protected startNormallyInCurrentProcess(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+        actionBeforeTerminalUI?: () => Promise<void>;
+    }): Promise<void>;
     protected preventExternalConfigChange(): void;
-    protected preventStartIfAlreadyStarted(): Promise<void>;
-    protected killWorkerWithLowerVersion(): Promise<void>;
+    protected preventStartIfAlreadyStarted(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<void>;
+    protected killWorkerWithLowerVersion(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<void>;
     /**
      * This has 2 purposes:
      * - infinite check when when detached process finished starting
@@ -82,17 +103,20 @@ export declare abstract class BaseCliWorker<REMOTE_CTRL extends BaseCliWorkerCon
      */
     protected isServiceHealthy(options: {
         healthCheckRequestTrys?: number;
+        methodOptions?: Partial<BaseCliMethodOptions>;
     }): Promise<boolean>;
     /**
      * start if not started detached process
      */
     protected startDetached(options?: {
-        useCurrentWindowForDetach?: boolean;
+        methodOptions?: Partial<BaseCliMethodOptions>;
     }): Promise<void>;
     private saveProcessInfo;
-    protected initializeWorkerMetadata(): Promise<void>;
-    protected waitForProcessPortSavedToDisk(options?: {
-        calledFrom?: string;
+    protected initializeWorkerMetadata(options?: {
+        methodOptions?: Partial<BaseCliMethodOptions>;
+    }): Promise<void>;
+    protected waitForProcessPortSavedToDisk(options: {
+        methodOptions: BaseCliMethodOptions;
     }): Promise<void>;
-    getServicePort(): Promise<number>;
+    protected getServicePort(): Promise<number>;
 }