dexbot 1.3.3 → 1.4.1

package/dist/modules/key_store.js

@@ -1,19 +1,53 @@
 'use strict';
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DirectKeyStore = exports.DaemonKeyStore = void 0;
 exports.setKeyStore = setKeyStore;
 exports.resetKeyStore = resetKeyStore;
 exports.getKeyStore = getKeyStore;
-const chainKeys = require('./chain_keys');
-const credentialPolicy = require('./credential_policy');
-const credentialRuntime = require('./credential_runtime');
-const { executeOperationsViaCredentialDaemon, BroadcastUncertainError, } = require('./dexbot_credential_client');
-const { DAEMON_ERRORS } = require('./constants');
-const { PATHS } = require('./paths');
-const { getStorage } = require('./storage');
-const storage = getStorage();
-const { runtime } = require('./runtime');
-const { sleep } = require('./order/utils/system');
+const chainKeys = __importStar(require("./chain_keys"));
+const credentialPolicy = __importStar(require("./credential_policy"));
+const credentialRuntime = __importStar(require("./credential_runtime"));
+const dexbot_credential_client_1 = require("./dexbot_credential_client");
+const constants_1 = require("./constants");
+const paths_1 = require("./paths");
+const storage_1 = require("./storage");
+const runtime_1 = require("./runtime");
+const system_1 = require("./order/utils/system");
+const errors_1 = require("./utils/errors");
+const storage = (0, storage_1.getStorage)();
 class DaemonKeyStore {
     async resolveSigningKey(accountName, vaultSecret, chainClient) {
         if (vaultSecret) {
@@ -22,7 +56,7 @@ class DaemonKeyStore {
         if (await chainKeys.isDaemonResponsive()) {
             try {
                 const sessionId = await chainKeys.probeAccountInDaemon(accountName);
-                const botHmacSecret = credentialPolicy.loadBotHmacSecret(accountName, PATHS.PROFILES.DAEMON_POLICIES_JSON, { quiet: true });
+                const botHmacSecret = credentialPolicy.loadBotHmacSecret(accountName, paths_1.PATHS.PROFILES.DAEMON_POLICIES_JSON, { quiet: true });
                 return chainKeys.createDaemonSigningToken(accountName, { sessionId, botHmacSecret });
             }
             catch {
@@ -39,7 +73,7 @@ class DaemonKeyStore {
     async executeOperations(accountName, operations, signingKey, extraOptions = {}) {
         if (this.isDaemonSigningKey(signingKey)) {
             try {
-                const result = await executeOperationsViaCredentialDaemon(accountName, operations, {
+                const result = await (0, dexbot_credential_client_1.executeOperationsViaCredentialDaemon)(accountName, operations, {
                     socketPath: signingKey.socketPath,
                     sessionId: signingKey.sessionId || null,
                     botHmacSecret: signingKey.botHmacSecret || null,
@@ -56,17 +90,17 @@ class DaemonKeyStore {
                 };
             }
             catch (err) {
-                if (err instanceof BroadcastUncertainError)
+                if (err instanceof dexbot_credential_client_1.BroadcastUncertainError)
                     throw err;
-                if (err.message && (err.message.includes(DAEMON_ERRORS.SESSION_EXPIRED) || err.message.includes(DAEMON_ERRORS.SOURCE_AUTH_DENIED))) {
-                    const isSourceAuthError = err.message.includes(DAEMON_ERRORS.SOURCE_AUTH_DENIED);
+                if ((0, errors_1.getErrorMessage)(err) && ((0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SESSION_EXPIRED) || (0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SOURCE_AUTH_DENIED))) {
+                    const isSourceAuthError = (0, errors_1.getErrorMessage)(err).includes(constants_1.DAEMON_ERRORS.SOURCE_AUTH_DENIED);
                     if (isSourceAuthError) {
                         try {
-                            const readyFile = credentialRuntime.getCredentialReadyFilePath({ root: PATHS.PROJECT_ROOT });
+                            const readyFile = credentialRuntime.getCredentialReadyFilePath({ root: paths_1.PATHS.PROJECT_ROOT });
                             if (storage.exists(readyFile)) {
                                 const daemonInfo = storage.readJSON(readyFile);
                                 if (daemonInfo && typeof daemonInfo.pid === 'number') {
-                                    runtime.kill(daemonInfo.pid, 'SIGHUP');
+                                    runtime_1.runtime.kill(daemonInfo.pid, 'SIGHUP');
                                 }
                             }
                         }
@@ -75,9 +109,9 @@ class DaemonKeyStore {
                     const newSessionId = await chainKeys.probeAccountInDaemon(accountName);
                     signingKey.sessionId = newSessionId;
                     if (isSourceAuthError) {
-                        await sleep(500);
+                        await (0, system_1.sleep)(500);
                     }
-                    const retryResult = await executeOperationsViaCredentialDaemon(accountName, operations, {
+                    const retryResult = await (0, dexbot_credential_client_1.executeOperationsViaCredentialDaemon)(accountName, operations, {
                         socketPath: signingKey.socketPath,
                         sessionId: signingKey.sessionId,
                         botHmacSecret: signingKey.botHmacSecret || null,

package/dist/modules/key_store.js.map

@@ -1 +1 @@
-{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../../modules/key_store.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAqKb,kCAEC;AAED,sCAEC;AAED,kCAKC;AAhLD,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,gBAAgB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACxD,MAAM,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAC1D,MAAM,EACF,oCAAoC,EACpC,uBAAuB,GAC1B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAC1C,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACjD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACrC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AAC5C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;AAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACzC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAclD,MAAa,cAAc;IACvB,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,WAAiB,EAAE,WAAiB;QAC7E,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,MAAM,SAAS,CAAC,kBAAkB,EAAE,EAAE,CAAC;YACvC,IAAI,CAAC;gBACD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;gBACpE,MAAM,aAAa,GAAG,gBAAgB,CAAC,iBAAiB,CACpD,WAAW,EACX,KAAK,CAAC,QAAQ,CAAC,oBAAoB,EACnC,EAAE,KAAK,EAAE,IAAI,EAAE,CAClB,CAAC;gBACF,OAAO,SAAS,CAAC,wBAAwB,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;YACzF,CAAC;YAAC,MAAM,CAAC;gBACL,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;gBACpD,OAAO,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;YAC/E,CAAC;QACL,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;QACpD,OAAO,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAC/E,CAAC;IAED,kBAAkB,CAAC,GAAQ;QACvB,OAAO,SAAS,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,UAAiB,EAAE,UAAe,EAAE,eAAoC,EAAE;QACnH,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,oCAAoC,CAAC,WAAW,EAAE,UAAU,EAAE;oBAC/E,UAAU,EAAE,UAAU,CAAC,UAAU;oBACjC,SAAS,EAAE,UAAU,CAAC,SAAS,IAAI,IAAI;oBACvC,aAAa,EAAE,UAAU,CAAC,aAAa,IAAI,IAAI;oBAC/C,WAAW,EAAE,WAAW;oBACxB,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,IAAI;oBACnC,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClE,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpF,GAAG,CAAC,OAAO,YAAY,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC1G,CAAC,CAAC;gBACH,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,GAAG,EAAE,MAAM,CAAC,GAAG,IAAI,IAAI;oBACvB,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE;iBAC7F,CAAC;YACN,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAChB,IAAI,GAAG,YAAY,uBAAuB;oBAAE,MAAM,GAAG,CAAC;gBACtD,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC,EAAE,CAAC;oBACjI,MAAM,iBAAiB,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;oBACjF,IAAI,iBAAiB,EAAE,CAAC;wBACpB,IAAI,CAAC;4BACD,MAAM,SAAS,GAAG,iBAAiB,CAAC,0BAA0B,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;4BAC7F,IAAI,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;gCAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gCAC/C,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;oCACnD,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;gCAC3C,CAAC;4BACL,CAAC;wBACL,CAAC;wBAAC,MAAM,CAAC,CAAA,CAAC;oBACd,CAAC;oBAED,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;oBACvE,UAAU,CAAC,SAAS,GAAG,YAAY,CAAC;oBAEpC,IAAI,iBAAiB,EAAE,CAAC;wBACpB,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;oBACrB,CAAC;oBAED,MAAM,WAAW,GAAG,MAAM,oCAAoC,CAAC,WAAW,EAAE,UAAU,EAAE;wBACpF,UAAU,EAAE,UAAU,CAAC,UAAU;wBACjC,SAAS,EAAE,UAAU,CAAC,SAAS;wBAC/B,aAAa,EAAE,UAAU,CAAC,aAAa,IAAI,IAAI;wBAC/C,WAAW,EAAE,WAAW;wBACxB,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,IAAI;wBACnC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACpF,GAAG,CAAC,OAAO,YAAY,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC1G,CAAC,CAAC;oBACH,OAAO;wBACH,OAAO,EAAE,IAAI;wBACb,GAAG,EAAE,WAAW,CAAC,GAAG,IAAI,IAAI;wBAC5B,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE;qBACvG,CAAC;gBACN,CAAC;gBACD,MAAM,GAAG,CAAC;YACd,CAAC;QACL,CAAC;QAED,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC,WAAW,CAAC;QACtB,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC;YAC9B,IAAI,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,UAAU,EAAE,CAAC;gBACvC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;CACJ;AAxGD,wCAwGC;AAED,MAAa,cAAc;IACvB,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,WAAiB,EAAE,WAAiB;QAC7E,IAAI,WAAW,EAAE,CAAC;YACd,OAAO,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;QACpD,OAAO,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;IAC/E,CAAC;IAED,kBAAkB,CAAC,IAAS,IAAa,OAAO,KAAK,CAAC,CAAC,CAAC;IAExD,KAAK,CAAC,iBAAiB,CAAC,WAAmB,EAAE,UAAiB,EAAE,UAAe;QAC3E,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAC/D,MAAM,GAAG,CAAC,WAAW,CAAC;QACtB,MAAM,EAAE,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC;QACvB,KAAK,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC;YAC1B,MAAM,UAAU,GAAG,EAAE,CAAC,OAAO,CAAC;YAC9B,IAAI,OAAO,EAAE,CAAC,UAAU,CAAC,KAAK,UAAU,EAAE,CAAC;gBACvC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,KAAK,CAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;YAC1E,CAAC;QACL,CAAC;QACD,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;QACrB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC7B,CAAC;CACJ;AA3BD,wCA2BC;AAED,IAAI,SAAS,GAAoB,IAAI,CAAC;AAEtC,SAAgB,WAAW,CAAC,IAAqB;IAC7C,SAAS,GAAG,IAAI,CAAC;AACrB,CAAC;AAED,SAAgB,aAAa;IACzB,SAAS,GAAG,IAAI,CAAC;AACrB,CAAC;AAED,SAAgB,WAAW;IACvB,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;IACrC,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC"}
+{"version":3,"file":"key_store.js","sourceRoot":"","sources":["../../modules/key_store.ts"],"names":[],"mappings":"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"}

package/dist/modules/launcher/bot_supervisor.d.ts

@@ -1,85 +1,42 @@
+declare const SOCKET_PATH: string;
 declare function usesAmaGridPrice(bot: any): boolean;
 declare function parseCronExpression(expression: any): {
-    minute: Set<unknown>;
-    hour: Set<unknown>;
-    dayOfMonth: Set<unknown>;
-    month: Set<unknown>;
-    dayOfWeek: Set<unknown>;
+    minute: Set<unknown> | null;
+    hour: Set<unknown> | null;
+    dayOfMonth: Set<unknown> | null;
+    month: Set<unknown> | null;
+    dayOfWeek: Set<unknown> | null;
 };
-declare function getNextCronDate(schedule: any, fromDate?: Date): Date;
+declare function getNextCronDate(schedule: any, fromDate?: any): Date;
 declare function forwardSignal(child: any, signal: any): void;
-declare function isPidAlive(pid: any): any;
+declare function isPidAlive(pid: any): boolean;
 declare function waitForPidExit(pid: any, timeoutMs: any): Promise<boolean>;
-declare function readProcArgs(pid: any): any;
-declare function readProcCwd(pid: any): any;
-declare function normalizeProcScriptArg(arg: any, cwd: any): any;
-declare function scriptPathForRoot(root: any, scriptSegments: any, ext: any): any;
-declare function candidateRuntimeScriptPaths(scriptSegments: any): Set<any>;
+declare function readProcArgs(pid: any): string[];
+declare function readProcCwd(pid: any): string;
+declare function normalizeProcScriptArg(arg: any, cwd: any): string;
+declare function scriptPathForRoot(root: any, scriptSegments: any, ext: any): string;
+declare function candidateRuntimeScriptPaths(scriptSegments: any): Set<string>;
 declare function pidMatchesScriptCandidates(pid: any, expectedPaths: any): boolean;
 declare function isNodeProcessWithExactScript(pid: any, scriptSegments: any): boolean;
-declare function readMarketAdapterLockPid(): number;
-declare function stopMarketAdapterFromLock(timeoutMs?: number): Promise<{
-    pid: number;
+declare function readMarketAdapterLockPid(): number | null;
+declare function stopMarketAdapterFromLock(timeoutMs?: any): Promise<{
+    pid: number | null;
     stopped: boolean;
 }>;
-declare function getChildRSS(child: any): any;
+declare function getChildRSS(child: any): number;
 declare function waitForChildSpawn(child: any): Promise<unknown>;
 declare function formatUptime(ms: any): string;
-declare function createBotSupervisor({ bots, buildEnv, spawnFn, log, logError, controlSocket, getChildRss, memoryCheckIntervalMs, statusLogIntervalMs, setTimeoutFn, clearTimeoutFn, nowFn, stopMarketAdapter, updaterActive, }?: {
-    bots?: any;
-    buildEnv?: any;
-    spawnFn?: any;
-    log?: (...args: any[]) => void;
-    logError?: (...args: any[]) => void;
-    controlSocket?: boolean;
-    getChildRss?: typeof getChildRSS;
-    memoryCheckIntervalMs?: any;
-    statusLogIntervalMs?: any;
-    setTimeoutFn?: typeof setTimeout;
-    clearTimeoutFn?: typeof clearTimeout;
-    nowFn?: () => number;
-    stopMarketAdapter?: typeof stopMarketAdapterFromLock;
-    updaterActive?: any;
-}): {
+declare function createBotSupervisor({ bots, buildEnv, spawnFn, log, logError, controlSocket, getChildRss, memoryCheckIntervalMs, statusLogIntervalMs, setTimeoutFn, clearTimeoutFn, nowFn, stopMarketAdapter, updaterActive, }?: any): {
     start: () => Promise<Map<any, any>>;
-    shutdown: ({ preserveSockets }?: {
-        preserveSockets?: any[];
-    }) => Promise<unknown>;
+    shutdown: ({ preserveSockets }?: any) => Promise<unknown>;
     shutdownSignalHandler: (signal: any) => void;
-    getStatus: () => {};
+    getStatus: () => Record<string, any>;
     printStatusSummary: () => void;
     restartAll: () => Promise<void>;
-    restartRunning: ({ logAction }?: {
-        logAction?: boolean;
-    }) => Promise<void>;
+    restartRunning: ({ logAction }?: any) => Promise<void>;
     stopAll: () => void;
     hasUserStopped: () => boolean;
-    waitForStableStartup: ({ timeoutMs, pollIntervalMs }?: {
-        timeoutMs?: number;
-        pollIntervalMs?: number;
-    }) => Promise<void>;
+    waitForStableStartup: ({ timeoutMs, pollIntervalMs }?: any) => Promise<void>;
 };
-declare const _default: {
-    createBotSupervisor: typeof createBotSupervisor;
-    SOCKET_PATH: any;
-    parseCronExpression: typeof parseCronExpression;
-    getNextCronDate: typeof getNextCronDate;
-    forwardSignal: typeof forwardSignal;
-    isPidAlive: typeof isPidAlive;
-    waitForPidExit: typeof waitForPidExit;
-    readProcArgs: typeof readProcArgs;
-    readProcCwd: typeof readProcCwd;
-    normalizeProcScriptArg: typeof normalizeProcScriptArg;
-    scriptPathForRoot: typeof scriptPathForRoot;
-    candidateRuntimeScriptPaths: typeof candidateRuntimeScriptPaths;
-    pidMatchesScriptCandidates: typeof pidMatchesScriptCandidates;
-    isNodeProcessWithExactScript: typeof isNodeProcessWithExactScript;
-    readMarketAdapterLockPid: typeof readMarketAdapterLockPid;
-    stopMarketAdapterFromLock: typeof stopMarketAdapterFromLock;
-    usesAmaGridPrice: typeof usesAmaGridPrice;
-    waitForChildSpawn: typeof waitForChildSpawn;
-    getChildRSS: typeof getChildRSS;
-    formatUptime: typeof formatUptime;
-};
-export = _default;
+export { createBotSupervisor, SOCKET_PATH, parseCronExpression, getNextCronDate, forwardSignal, isPidAlive, waitForPidExit, readProcArgs, readProcCwd, normalizeProcScriptArg, scriptPathForRoot, candidateRuntimeScriptPaths, pidMatchesScriptCandidates, isNodeProcessWithExactScript, readMarketAdapterLockPid, stopMarketAdapterFromLock, usesAmaGridPrice, waitForChildSpawn, getChildRSS, formatUptime };
 //# sourceMappingURL=bot_supervisor.d.ts.map

package/dist/modules/launcher/bot_supervisor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bot_supervisor.d.ts","sourceRoot":"","sources":["../../../modules/launcher/bot_supervisor.ts"],"names":[],"mappings":"AAsCA,iBAAS,gBAAgB,CAAC,GAAG,KAAA,WAG5B;AAgID,iBAAS,mBAAmB,CAAC,UAAU,KAAA;;;;;;EAYtC;AAqBD,iBAAS,eAAe,CAAC,QAAQ,KAAA,EAAE,QAAQ,OAAa,QAYvD;AAqBD,iBAAS,aAAa,CAAC,KAAK,KAAA,EAAE,MAAM,KAAA,QAOnC;AAED,iBAAS,UAAU,CAAC,GAAG,KAAA,OAOtB;AAED,iBAAe,cAAc,CAAC,GAAG,KAAA,EAAE,SAAS,KAAA,oBAO3C;AAED,iBAAS,YAAY,CAAC,GAAG,KAAA,OAExB;AAED,iBAAS,WAAW,CAAC,GAAG,KAAA,OAEvB;AAED,iBAAS,sBAAsB,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,OAMvC;AAED,iBAAS,iBAAiB,CAAC,IAAI,KAAA,EAAE,cAAc,KAAA,EAAE,GAAG,KAAA,OAKnD;AAED,iBAAS,2BAA2B,CAAC,cAAc,KAAA,YAmBlD;AAED,iBAAS,0BAA0B,CAAC,GAAG,KAAA,EAAE,aAAa,KAAA,WAgBrD;AAED,iBAAS,4BAA4B,CAAC,GAAG,KAAA,EAAE,cAAc,KAAA,WAExD;AAED,iBAAS,wBAAwB,WAQhC;AAED,iBAAe,yBAAyB,CAAC,SAAS,SAAO;;;GAoBxD;AAED,iBAAS,WAAW,CAAC,KAAK,KAAA,OAazB;AAED,iBAAS,iBAAiB,CAAC,KAAK,KAAA,oBAsB/B;AAED,iBAAS,YAAY,CAAC,EAAE,KAAA,UASvB;AAED,iBAAS,mBAAmB,CAAC,EACzB,IAAW,EACX,QAA8B,EAC9B,OAAe,EACf,GAA0D,EAC1D,QAAiE,EACjE,aAAwD,EACxD,WAAyB,EACzB,qBAAgD,EAChD,mBAA4C,EAC5C,YAAyB,EACzB,cAA6B,EAC7B,KAAwB,EACxB,iBAA6C,EAC7C,aAA8B,GACjC;;;;;;;;;;;;;;;CAAK;;;;;;;;;;;;;;;;;;EA2pBL;;;;;;;;;;;;;;;;;;;;;;;AAED,kBAqBE"}
+{"version":3,"file":"bot_supervisor.d.ts","sourceRoot":"","sources":["../../../modules/launcher/bot_supervisor.ts"],"names":[],"mappings":"AAuBA,QAAA,MAAM,WAAW,QAAoE,CAAC;AAiBtF,iBAAS,gBAAgB,CAAC,GAAG,EAAE,GAAG,WAGjC;AAgID,iBAAS,mBAAmB,CAAC,UAAU,EAAE,GAAG;;;;;;EAY3C;AAqBD,iBAAS,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,GAAE,GAAgB,QAYjE;AAqBD,iBAAS,aAAa,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,QAO7C;AAED,iBAAS,UAAU,CAAC,GAAG,EAAE,GAAG,WAO3B;AAED,iBAAe,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,oBAOrD;AAED,iBAAS,YAAY,CAAC,GAAG,EAAE,GAAG,YAE7B;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,GAAG,UAE5B;AAED,iBAAS,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAMjD;AAED,iBAAS,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,UAKlE;AAED,iBAAS,2BAA2B,CAAC,cAAc,EAAE,GAAG,eAmBvD;AAED,iBAAS,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,WAgB/D;AAED,iBAAS,4BAA4B,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,WAElE;AAED,iBAAS,wBAAwB,kBAQhC;AAED,iBAAe,yBAAyB,CAAC,SAAS,GAAE,GAAU;;;GAoB7D;AAED,iBAAS,WAAW,CAAC,KAAK,EAAE,GAAG,UAc9B;AAED,iBAAS,iBAAiB,CAAC,KAAK,EAAE,GAAG,oBAsBpC;AAED,iBAAS,YAAY,CAAC,EAAE,EAAE,GAAG,UAS5B;AAED,iBAAS,mBAAmB,CAAC,EACzB,IAAW,EACX,QAA8B,EAC9B,OAAe,EACf,GAA+D,EAC/D,QAAsE,EACtE,aAAwD,EACxD,WAAyB,EACzB,qBAAgD,EAChD,mBAA4C,EAC5C,YAAyB,EACzB,cAA6B,EAC7B,KAAwB,EACxB,iBAA6C,EAC7C,aAA8B,GACjC,GAAE,GAAQ;;qCA2hB2C,GAAG;oCANd,GAAG;;;;qCAyEU,GAAG;;;2DAlXuB,GAAG;EA+apF;AAED,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,0BAA0B,EAAE,4BAA4B,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA"}