@dbx-tools/tunnel 0.6.124 → 0.6.126
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.
- package/lib/src/supervisor.d.ts +1 -0
- package/lib/src/supervisor.js +12 -8
- package/package.json +8 -8
- package/src/supervisor.ts +15 -4
package/lib/src/supervisor.d.ts
CHANGED
package/lib/src/supervisor.js
CHANGED
|
@@ -1,18 +1,25 @@
|
|
|
1
1
|
import { async as asyncTools } from "@dbx-tools/shared-core";
|
|
2
2
|
const STABLE_CONNECTION_MS = 60_000;
|
|
3
|
+
const DEFAULT_SHUTDOWN_GRACE_MS = 10_000;
|
|
3
4
|
export function superviseProcessForever(options) {
|
|
4
5
|
const controller = new AbortController();
|
|
5
6
|
let child;
|
|
7
|
+
const terminateChild = () => {
|
|
8
|
+
const stoppingChild = child;
|
|
9
|
+
if (!stoppingChild)
|
|
10
|
+
return;
|
|
11
|
+
stoppingChild.kill("SIGTERM");
|
|
12
|
+
setTimeout(() => stoppingChild.kill("SIGKILL"), options.shutdownGraceMs ?? DEFAULT_SHUTDOWN_GRACE_MS).unref();
|
|
13
|
+
};
|
|
6
14
|
const stop = () => {
|
|
7
15
|
if (controller.signal.aborted)
|
|
8
16
|
return;
|
|
9
17
|
controller.abort();
|
|
10
|
-
|
|
11
|
-
child.kill("SIGTERM");
|
|
18
|
+
terminateChild();
|
|
12
19
|
process.off("exit", onProcessExit);
|
|
13
20
|
};
|
|
14
21
|
const onProcessExit = () => {
|
|
15
|
-
if (child
|
|
22
|
+
if (child)
|
|
16
23
|
child.kill("SIGTERM");
|
|
17
24
|
};
|
|
18
25
|
process.once("exit", onProcessExit);
|
|
@@ -60,13 +67,10 @@ function processOutcome(child, signal) {
|
|
|
60
67
|
};
|
|
61
68
|
const onExit = (code, exitSignal) => finish({ code, signal: exitSignal });
|
|
62
69
|
const onError = (error) => {
|
|
63
|
-
|
|
64
|
-
child.kill("SIGTERM");
|
|
70
|
+
child.kill("SIGTERM");
|
|
65
71
|
finish({ error });
|
|
66
72
|
};
|
|
67
73
|
const onAbort = () => {
|
|
68
|
-
if (!child.killed)
|
|
69
|
-
child.kill("SIGTERM");
|
|
70
74
|
finish({ signal: "SIGTERM" });
|
|
71
75
|
};
|
|
72
76
|
child.once("exit", onExit);
|
|
@@ -74,4 +78,4 @@ function processOutcome(child, signal) {
|
|
|
74
78
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
75
79
|
});
|
|
76
80
|
}
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/supervisor.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ChildProcess } from \"node:child_process\";\nimport { async as asyncTools, type Logger } from \"@dbx-tools/shared-core\";\n\nconst STABLE_CONNECTION_MS = 60_000;\nconst DEFAULT_SHUTDOWN_GRACE_MS = 10_000;\n\nexport interface ProcessSupervisor {\n  stop(): void;\n}\n\ntype ProcessOutcome = {\n  code?: number | null;\n  signal?: NodeJS.Signals | null;\n  error?: unknown;\n};\n\nexport function superviseProcessForever(options: {\n  name: string;\n  logger: Logger;\n  start: () => ChildProcess | Promise<ChildProcess>;\n  retryDelaysMs?: readonly number[];\n  shutdownGraceMs?: number;\n}): ProcessSupervisor {\n  const controller = new AbortController();\n  let child: ChildProcess | undefined;\n\n  const terminateChild = () => {\n    const stoppingChild = child;\n    if (!stoppingChild) return;\n    stoppingChild.kill(\"SIGTERM\");\n    setTimeout(\n      () => stoppingChild.kill(\"SIGKILL\"),\n      options.shutdownGraceMs ?? DEFAULT_SHUTDOWN_GRACE_MS,\n    ).unref();\n  };\n\n  const stop = () => {\n    if (controller.signal.aborted) return;\n    controller.abort();\n    terminateChild();\n    process.off(\"exit\", onProcessExit);\n  };\n  const onProcessExit = () => {\n    if (child) child.kill(\"SIGTERM\");\n  };\n  process.once(\"exit\", onProcessExit);\n\n  const run = async () => {\n    let failures = 0;\n    while (!controller.signal.aborted) {\n      const startedAt = Date.now();\n      let outcome: ProcessOutcome;\n      try {\n        child = await options.start();\n        outcome = await processOutcome(child, controller.signal);\n      } catch (error) {\n        outcome = { error };\n      } finally {\n        child = undefined;\n      }\n      if (controller.signal.aborted) return;\n      if (Date.now() - startedAt >= STABLE_CONNECTION_MS) failures = 0;\n      const delayMs = asyncTools.boundedRetryDelay(failures++, options.retryDelaysMs);\n      options.logger.warn(`${options.name} stopped; retrying`, { ...outcome, delayMs });\n      try {\n        await asyncTools.sleep(delayMs, controller.signal);\n      } catch {\n        return;\n      }\n    }\n  };\n\n  void run().catch((error) => options.logger.error(`${options.name} supervisor failed`, { error }));\n  return {\n    stop,\n  };\n}\n\nfunction processOutcome(child: ChildProcess, signal: AbortSignal): Promise<ProcessOutcome> {\n  return new Promise((resolve) => {\n    const finish = (outcome: ProcessOutcome) => {\n      child.off(\"exit\", onExit);\n      child.off(\"error\", onError);\n      signal.removeEventListener(\"abort\", onAbort);\n      resolve(outcome);\n    };\n    const onExit = (code: number | null, exitSignal: NodeJS.Signals | null) =>\n      finish({ code, signal: exitSignal });\n    const onError = (error: Error) => {\n      child.kill(\"SIGTERM\");\n      finish({ error });\n    };\n    const onAbort = () => {\n      finish({ signal: \"SIGTERM\" });\n    };\n    child.once(\"exit\", onExit);\n    child.once(\"error\", onError);\n    signal.addEventListener(\"abort\", onAbort, { once: true });\n  });\n}\n"]}
|
package/package.json
CHANGED
|
@@ -23,16 +23,16 @@
|
|
|
23
23
|
"typescript": "^5.9.3"
|
|
24
24
|
},
|
|
25
25
|
"peerDependencies": {
|
|
26
|
-
"@dbx-tools/email": "0.6.
|
|
26
|
+
"@dbx-tools/email": "0.6.126"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@databricks/appkit": "^0.60.0",
|
|
30
|
-
"@dbx-tools/appkit": "0.6.
|
|
31
|
-
"@dbx-tools/auth": "0.6.
|
|
32
|
-
"@dbx-tools/core": "0.6.
|
|
33
|
-
"@dbx-tools/email": "0.6.
|
|
34
|
-
"@dbx-tools/shared-auth": "0.6.
|
|
35
|
-
"@dbx-tools/shared-core": "0.6.
|
|
30
|
+
"@dbx-tools/appkit": "0.6.126",
|
|
31
|
+
"@dbx-tools/auth": "0.6.126",
|
|
32
|
+
"@dbx-tools/core": "0.6.126",
|
|
33
|
+
"@dbx-tools/email": "0.6.126",
|
|
34
|
+
"@dbx-tools/shared-auth": "0.6.126",
|
|
35
|
+
"@dbx-tools/shared-core": "0.6.126",
|
|
36
36
|
"http-proxy-3": "^1.23.1"
|
|
37
37
|
},
|
|
38
38
|
"main": "./lib/index.js",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"./package.json": "./package.json"
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
|
-
"version": "0.6.
|
|
52
|
+
"version": "0.6.126",
|
|
53
53
|
"types": "./lib/index.d.ts",
|
|
54
54
|
"type": "module",
|
|
55
55
|
"exports": {
|
package/src/supervisor.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { ChildProcess } from "node:child_process";
|
|
|
2
2
|
import { async as asyncTools, type Logger } from "@dbx-tools/shared-core";
|
|
3
3
|
|
|
4
4
|
const STABLE_CONNECTION_MS = 60_000;
|
|
5
|
+
const DEFAULT_SHUTDOWN_GRACE_MS = 10_000;
|
|
5
6
|
|
|
6
7
|
export interface ProcessSupervisor {
|
|
7
8
|
stop(): void;
|
|
@@ -18,18 +19,29 @@ export function superviseProcessForever(options: {
|
|
|
18
19
|
logger: Logger;
|
|
19
20
|
start: () => ChildProcess | Promise<ChildProcess>;
|
|
20
21
|
retryDelaysMs?: readonly number[];
|
|
22
|
+
shutdownGraceMs?: number;
|
|
21
23
|
}): ProcessSupervisor {
|
|
22
24
|
const controller = new AbortController();
|
|
23
25
|
let child: ChildProcess | undefined;
|
|
24
26
|
|
|
27
|
+
const terminateChild = () => {
|
|
28
|
+
const stoppingChild = child;
|
|
29
|
+
if (!stoppingChild) return;
|
|
30
|
+
stoppingChild.kill("SIGTERM");
|
|
31
|
+
setTimeout(
|
|
32
|
+
() => stoppingChild.kill("SIGKILL"),
|
|
33
|
+
options.shutdownGraceMs ?? DEFAULT_SHUTDOWN_GRACE_MS,
|
|
34
|
+
).unref();
|
|
35
|
+
};
|
|
36
|
+
|
|
25
37
|
const stop = () => {
|
|
26
38
|
if (controller.signal.aborted) return;
|
|
27
39
|
controller.abort();
|
|
28
|
-
|
|
40
|
+
terminateChild();
|
|
29
41
|
process.off("exit", onProcessExit);
|
|
30
42
|
};
|
|
31
43
|
const onProcessExit = () => {
|
|
32
|
-
if (child
|
|
44
|
+
if (child) child.kill("SIGTERM");
|
|
33
45
|
};
|
|
34
46
|
process.once("exit", onProcessExit);
|
|
35
47
|
|
|
@@ -75,11 +87,10 @@ function processOutcome(child: ChildProcess, signal: AbortSignal): Promise<Proce
|
|
|
75
87
|
const onExit = (code: number | null, exitSignal: NodeJS.Signals | null) =>
|
|
76
88
|
finish({ code, signal: exitSignal });
|
|
77
89
|
const onError = (error: Error) => {
|
|
78
|
-
|
|
90
|
+
child.kill("SIGTERM");
|
|
79
91
|
finish({ error });
|
|
80
92
|
};
|
|
81
93
|
const onAbort = () => {
|
|
82
|
-
if (!child.killed) child.kill("SIGTERM");
|
|
83
94
|
finish({ signal: "SIGTERM" });
|
|
84
95
|
};
|
|
85
96
|
child.once("exit", onExit);
|