@dxos/phoenix 0.6.13 → 0.6.14-main.2b6a0f3
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/bin/watchdog +8 -7
- package/dist/lib/node/index.cjs +7 -6
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +264 -0
- package/dist/lib/node-esm/index.mjs.map +7 -0
- package/dist/lib/node-esm/meta.json +1 -0
- package/dist/types/src/phoenix.d.ts.map +1 -1
- package/dist/types/src/phoenix.node.test.d.ts +2 -0
- package/dist/types/src/phoenix.node.test.d.ts.map +1 -0
- package/dist/types/src/watchdog.node.test.d.ts +2 -0
- package/dist/types/src/watchdog.node.test.d.ts.map +1 -0
- package/package.json +8 -14
- package/src/{phoenix.test.ts → phoenix.node.test.ts} +6 -13
- package/src/phoenix.ts +3 -2
- package/src/{watchdog.test.ts → watchdog.node.test.ts} +2 -4
- package/dist/types/src/phoenix.test.d.ts +0 -2
- package/dist/types/src/phoenix.test.d.ts.map +0 -1
- package/dist/types/src/watchdog.test.d.ts +0 -2
- package/dist/types/src/watchdog.test.d.ts.map +0 -1
package/bin/watchdog
CHANGED
|
@@ -6,15 +6,16 @@ const { WatchDog } = require('../dist/lib/node/index.cjs');
|
|
|
6
6
|
const params = JSON.parse(process.argv[2]);
|
|
7
7
|
|
|
8
8
|
const watchdog = new WatchDog(params);
|
|
9
|
-
watchdog
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
9
|
+
watchdog
|
|
10
|
+
.start()
|
|
11
|
+
.then(() => {
|
|
12
|
+
log(`Watchdog started`);
|
|
13
|
+
})
|
|
14
|
+
.catch((err) => {
|
|
15
|
+
log.catch(err);
|
|
16
|
+
});
|
|
15
17
|
|
|
16
18
|
process.on('SIGINT', async () => {
|
|
17
19
|
await watchdog.stop();
|
|
18
20
|
process.exit(0);
|
|
19
21
|
});
|
|
20
|
-
|
package/dist/lib/node/index.cjs
CHANGED
|
@@ -45,6 +45,7 @@ var import_node_fs3 = require("node:fs");
|
|
|
45
45
|
var import_async2 = require("@dxos/async");
|
|
46
46
|
var import_invariant2 = require("@dxos/invariant");
|
|
47
47
|
var import_log2 = require("@dxos/log");
|
|
48
|
+
const import_meta = {};
|
|
48
49
|
var WATCHDOG_START_TIMEOUT = 1e4;
|
|
49
50
|
var WATCHDOG_STOP_TIMEOUT = 1e3;
|
|
50
51
|
var WATCHDOG_CHECK_INTERVAL = 50;
|
|
@@ -62,6 +63,7 @@ var waitForPidFileBeingFilledWithInfo = async (pidFile) => (0, import_async.wait
|
|
|
62
63
|
error: new Error("Lock file is not being propagated with info.")
|
|
63
64
|
});
|
|
64
65
|
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/phoenix/src/phoenix.ts";
|
|
66
|
+
var scriptDir = typeof __dirname === "string" ? __dirname : (0, import_node_path.dirname)(new URL(import_meta.url).pathname);
|
|
65
67
|
var Phoenix = class _Phoenix {
|
|
66
68
|
/**
|
|
67
69
|
* Starts detached watchdog process which starts and monitors selected command.
|
|
@@ -90,13 +92,12 @@ var Phoenix = class _Phoenix {
|
|
|
90
92
|
});
|
|
91
93
|
}
|
|
92
94
|
const watchdogPath = (0, import_node_path.join)((0, import_node_path.dirname)(import_pkg_up.default.sync({
|
|
93
|
-
cwd:
|
|
95
|
+
cwd: scriptDir
|
|
94
96
|
})), "bin", "watchdog");
|
|
95
97
|
const watchDog = (0, import_node_child_process.fork)(watchdogPath, [
|
|
96
98
|
JSON.stringify(params)
|
|
97
99
|
], {
|
|
98
|
-
detached: true
|
|
99
|
-
cwd: __dirname
|
|
100
|
+
detached: true
|
|
100
101
|
});
|
|
101
102
|
watchDog.on("exit", (code, signal) => {
|
|
102
103
|
if (code && code !== 0) {
|
|
@@ -105,7 +106,7 @@ var Phoenix = class _Phoenix {
|
|
|
105
106
|
signal
|
|
106
107
|
}, {
|
|
107
108
|
F: __dxlog_file,
|
|
108
|
-
L:
|
|
109
|
+
L: 53,
|
|
109
110
|
S: this,
|
|
110
111
|
C: (f, a) => f(...a)
|
|
111
112
|
});
|
|
@@ -116,7 +117,7 @@ var Phoenix = class _Phoenix {
|
|
|
116
117
|
err
|
|
117
118
|
}, {
|
|
118
119
|
F: __dxlog_file,
|
|
119
|
-
L:
|
|
120
|
+
L: 58,
|
|
120
121
|
S: this,
|
|
121
122
|
C: (f, a) => f(...a)
|
|
122
123
|
});
|
|
@@ -146,7 +147,7 @@ var Phoenix = class _Phoenix {
|
|
|
146
147
|
} catch (err) {
|
|
147
148
|
(0, import_invariant.invariant)(err instanceof Error, "Invalid error type", {
|
|
148
149
|
F: __dxlog_file,
|
|
149
|
-
L:
|
|
150
|
+
L: 86,
|
|
150
151
|
S: this,
|
|
151
152
|
A: [
|
|
152
153
|
"err instanceof Error",
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/phoenix.ts", "../../../src/utils.ts", "../../../src/defs.ts", "../../../src/watchdog.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { fork } from 'node:child_process';\nimport { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport pkgUp from 'pkg-up';\n\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nimport { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';\nimport { type ProcessInfo, type WatchDogParams } from './watchdog';\n\n/**\n * Utils to start/stop detached process with errors and logs handling.\n */\nexport class Phoenix {\n /**\n * Starts detached watchdog process which starts and monitors selected command.\n */\n static async start(params: WatchDogParams) {\n {\n // Clear stale pid file.\n if (existsSync(params.pidFile)) {\n await Phoenix.stop(params.pidFile);\n }\n\n await waitForPidDeletion(params.pidFile);\n }\n\n {\n // Create log folders.\n [params.logFile, params.errFile, params.pidFile].forEach((filename) => {\n if (!existsSync(filename)) {\n mkdirSync(dirname(filename), { recursive: true });\n writeFileSync(filename, '', { encoding: 'utf-8' });\n }\n });\n }\n\n const watchdogPath = join(dirname(pkgUp.sync({ cwd:
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,gCAAqB;AACrB,qBAA+E;AAC/E,uBAA8B;AAC9B,oBAAkB;AAElB,uBAA0B;AAC1B,iBAAoB;ACNpB,IAAAA,kBAAyC;AAEzC,mBAAiC;AEFjC,IAAAC,6BAA2D;AAC3D,IAAAD,kBAAsD;AAGtD,IAAAE,gBAA6B;AAC7B,IAAAC,oBAA0B;AAC1B,IAAAC,cAAoB
|
|
6
|
-
"names": ["import_node_fs", "import_node_child_process", "import_async", "import_invariant", "import_log", "WATCHDOG_START_TIMEOUT", "WATCHDOG_STOP_TIMEOUT", "WATCHDOG_CHECK_INTERVAL", "waitForPidDeletion", "pidFile", "waitForCondition", "condition", "existsSync", "timeout", "interval", "waitForPidFileBeingFilledWithInfo", "readFileSync", "encoding", "includes", "error", "Error", "Phoenix", "start", "params", "stop", "logFile", "errFile", "forEach", "filename", "mkdirSync", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { fork } from 'node:child_process';\nimport { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport pkgUp from 'pkg-up';\n\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nimport { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';\nimport { type ProcessInfo, type WatchDogParams } from './watchdog';\n\nconst scriptDir = typeof __dirname === 'string' ? __dirname : dirname(new URL(import.meta.url).pathname);\n\n/**\n * Utils to start/stop detached process with errors and logs handling.\n */\nexport class Phoenix {\n /**\n * Starts detached watchdog process which starts and monitors selected command.\n */\n static async start(params: WatchDogParams) {\n {\n // Clear stale pid file.\n if (existsSync(params.pidFile)) {\n await Phoenix.stop(params.pidFile);\n }\n\n await waitForPidDeletion(params.pidFile);\n }\n\n {\n // Create log folders.\n [params.logFile, params.errFile, params.pidFile].forEach((filename) => {\n if (!existsSync(filename)) {\n mkdirSync(dirname(filename), { recursive: true });\n writeFileSync(filename, '', { encoding: 'utf-8' });\n }\n });\n }\n\n const watchdogPath = join(dirname(pkgUp.sync({ cwd: scriptDir })!), 'bin', 'watchdog');\n\n const watchDog = fork(watchdogPath, [JSON.stringify(params)], {\n detached: true,\n });\n\n watchDog.on('exit', (code, signal) => {\n if (code && code !== 0) {\n log.error('Monitor died unexpectedly', { code, signal });\n }\n });\n\n watchDog.on('error', (err) => {\n log.error('Monitor error', { err });\n });\n\n await waitForPidFileBeingFilledWithInfo(params.pidFile);\n\n watchDog.disconnect();\n watchDog.unref();\n\n return Phoenix.info(params.pidFile);\n }\n\n /**\n * Stops detached watchdog process by PID info written down in PID file.\n */\n static async stop(pidFile: string, force = false) {\n if (!existsSync(pidFile)) {\n throw new Error('PID file does not exist');\n }\n const fileContent = readFileSync(pidFile, { encoding: 'utf-8' });\n if (!fileContent.includes('pid')) {\n throw new Error('Invalid PID file content');\n }\n\n const { pid } = JSON.parse(fileContent);\n const signal: NodeJS.Signals = force ? 'SIGKILL' : 'SIGINT';\n try {\n process.kill(pid, signal);\n } catch (err) {\n invariant(err instanceof Error, 'Invalid error type');\n if (err.message.includes('ESRCH') || err.name.includes('ESRCH')) {\n // Process is already dead.\n unlinkSync(pidFile);\n } else {\n throw err;\n }\n }\n }\n\n static info(pidFile: string): ProcessInfo {\n return JSON.parse(readFileSync(pidFile, { encoding: 'utf-8' }));\n }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { existsSync, readFileSync } from 'node:fs';\n\nimport { waitForCondition } from '@dxos/async';\n\nimport { WATCHDOG_CHECK_INTERVAL, WATCHDOG_START_TIMEOUT, WATCHDOG_STOP_TIMEOUT } from './defs';\n\nexport const waitForPidCreation = async (pidFile: string) =>\n waitForCondition({\n condition: () => existsSync(pidFile),\n timeout: WATCHDOG_START_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n });\n\nexport const waitForPidDeletion = async (pidFile: string) =>\n waitForCondition({\n condition: () => !existsSync(pidFile),\n timeout: WATCHDOG_STOP_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n });\n\nexport const waitForPidFileBeingFilledWithInfo = async (pidFile: string) =>\n waitForCondition({\n condition: () => readFileSync(pidFile, { encoding: 'utf-8' }).includes('pid'),\n timeout: WATCHDOG_START_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n error: new Error('Lock file is not being propagated with info.'),\n });\n", "//\n// Copyright 2023 DXOS.org\n//\n\nexport const LOCK_TIMEOUT = 1_000;\nexport const LOCK_CHECK_INTERVAL = 50;\nexport const WATCHDOG_START_TIMEOUT = 10_000;\nexport const WATCHDOG_STOP_TIMEOUT = 1_000;\nexport const WATCHDOG_CHECK_INTERVAL = 50;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type ChildProcessWithoutNullStreams, spawn } from 'node:child_process';\nimport { existsSync, unlinkSync, writeFileSync } from 'node:fs';\nimport { type FileHandle } from 'node:fs/promises';\n\nimport { synchronized } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nimport { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';\n\nexport type ProcessInfo = WatchDogParams & {\n pid?: number;\n started?: number;\n restarts?: number;\n running?: boolean;\n};\n\nexport type WatchDogParams = {\n profile?: string; // Human readable process identifier\n pidFile: string; // Path to PID file\n\n //\n // Log files and associated logging options for this instance\n //\n logFile: string; // Path to log output all logs\n errFile: string; // Path to log output from child stderr\n\n //\n // Basic configuration options\n //\n maxRestarts?: number | undefined; // Sets the maximum number of times a given script should run\n killTree?: boolean | undefined; // Kills the entire child process tree on `exit`\n\n //\n // Command to spawn as well as options and other vars\n // (env, cwd, etc) to pass along\n //\n command: string; // Binary to run (default: 'node')\n args?: string[] | undefined; // Additional arguments to pass to the script,\n\n //\n // More specific options to pass along to `child_process.spawn` which\n // will override anything passed to the `spawnWith` option\n //\n env?: NodeJS.ProcessEnv | undefined;\n cwd?: string | undefined;\n shell?: boolean | undefined;\n};\n\nexport class WatchDog {\n private _lock?: FileHandle; // TODO(burdon): Not used?\n private _child?: ChildProcessWithoutNullStreams;\n private _restarts = 0;\n\n constructor(private readonly _params: WatchDogParams) {}\n\n @synchronized\n async start() {\n const { cwd, shell, env, command, args } = { cwd: process.cwd(), ...this._params };\n\n this._log(`Spawning process \\`\\`\\`${command} ${args?.join(' ')}\\`\\`\\``);\n this._child = spawn(command, args, { cwd, shell, env, stdio: 'pipe' });\n\n this._child.stdout.on('data', (data: Uint8Array) => {\n this._log(String(data));\n });\n this._child.stderr.on('data', (data: Uint8Array) => {\n this._err(data);\n });\n this._child.on('close', async (code: number, signal: number | NodeJS.Signals) => {\n if (code && code !== 0 && signal !== 'SIGINT' && signal !== 'SIGKILL') {\n this._err(`Died unexpectedly with exit code ${code} (signal: ${signal}).`);\n await this.restart();\n }\n this._log(`Stopped with exit code ${code} (signal: ${signal}).`);\n if (existsSync(this._params.pidFile)) {\n unlinkSync(this._params.pidFile);\n }\n });\n\n const childInfo: ProcessInfo = {\n pid: this._child.pid,\n started: Date.now(),\n restarts: this._restarts,\n ...this._params,\n };\n\n writeFileSync(this._params.pidFile, JSON.stringify(childInfo, undefined, 2), { encoding: 'utf-8' });\n\n await waitForPidFileBeingFilledWithInfo(this._params.pidFile);\n }\n\n /**\n * Sends SIGKILL to the child process and the tree it spawned (if `killTree` param is `true`).\n */\n @synchronized\n async kill() {\n if (!this._child) {\n return;\n }\n\n await this._killWithSignal('SIGKILL');\n\n if (existsSync(this._params.pidFile)) {\n unlinkSync(this._params.pidFile);\n }\n\n await waitForPidDeletion(this._params.pidFile);\n }\n\n async restart() {\n await this.kill();\n if (this._params.maxRestarts !== undefined && this._restarts >= this._params.maxRestarts) {\n this._err('Max restarts number is reached');\n } else {\n log('Restarting...');\n this._restarts++;\n await this.start();\n }\n }\n\n async _killWithSignal(signal: number | NodeJS.Signals) {\n invariant(this._child?.pid, 'Child process has no pid.');\n this._child.kill(signal);\n this._child = undefined;\n }\n\n private _log(message: string | Uint8Array) {\n writeFileSync(this._params.logFile, message + '\\n', {\n flag: 'a+',\n encoding: 'utf-8',\n });\n }\n\n private _err(message: string | Uint8Array) {\n this._log(message);\n writeFileSync(this._params.errFile, message + '\\n', {\n flag: 'a+',\n encoding: 'utf-8',\n });\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["import_node_fs", "import_node_child_process", "import_async", "import_invariant", "import_log", "WATCHDOG_START_TIMEOUT", "WATCHDOG_STOP_TIMEOUT", "WATCHDOG_CHECK_INTERVAL", "waitForPidDeletion", "pidFile", "waitForCondition", "condition", "existsSync", "timeout", "interval", "waitForPidFileBeingFilledWithInfo", "readFileSync", "encoding", "includes", "error", "Error", "scriptDir", "__dirname", "dirname", "URL", "url", "pathname", "Phoenix", "start", "params", "stop", "logFile", "errFile", "forEach", "filename", "mkdirSync", "recursive", "writeFileSync", "watchdogPath", "join", "pkgUp", "sync", "cwd", "watchDog", "fork", "JSON", "stringify", "detached", "on", "code", "signal", "log", "err", "disconnect", "unref", "info", "force", "fileContent", "pid", "parse", "process", "kill", "invariant", "message", "name", "unlinkSync", "WatchDog", "constructor", "_params", "_restarts", "shell", "env", "command", "args", "_log", "_child", "spawn", "stdio", "stdout", "data", "String", "stderr", "_err", "restart", "childInfo", "started", "Date", "now", "restarts", "undefined", "_killWithSignal", "maxRestarts", "flag", "synchronized"]
|
|
7
7
|
}
|
package/dist/lib/node/meta.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/common/phoenix/src/defs.ts":{"bytes":1237,"imports":[],"format":"esm"},"packages/common/phoenix/src/utils.ts":{"bytes":3729,"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/defs.ts","kind":"import-statement","original":"./defs"}],"format":"esm"},"packages/common/phoenix/src/phoenix.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/common/phoenix/src/defs.ts":{"bytes":1237,"imports":[],"format":"esm"},"packages/common/phoenix/src/utils.ts":{"bytes":3729,"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/defs.ts","kind":"import-statement","original":"./defs"}],"format":"esm"},"packages/common/phoenix/src/phoenix.ts":{"bytes":11512,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/common/phoenix/src/watchdog.ts":{"bytes":14592,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/common/phoenix/src/index.ts":{"bytes":1023,"imports":[{"path":"packages/common/phoenix/src/phoenix.ts","kind":"import-statement","original":"./phoenix"},{"path":"packages/common/phoenix/src/watchdog.ts","kind":"import-statement","original":"./watchdog"}],"format":"esm"}},"outputs":{"packages/common/phoenix/dist/lib/node/index.cjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":14857},"packages/common/phoenix/dist/lib/node/index.cjs":{"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["Phoenix","WatchDog"],"entryPoint":"packages/common/phoenix/src/index.ts","inputs":{"packages/common/phoenix/src/phoenix.ts":{"bytesInOutput":3060},"packages/common/phoenix/src/utils.ts":{"bytesInOutput":586},"packages/common/phoenix/src/defs.ts":{"bytesInOutput":101},"packages/common/phoenix/src/index.ts":{"bytesInOutput":0},"packages/common/phoenix/src/watchdog.ts":{"bytesInOutput":3732}},"bytes":7799}}}
|
|
@@ -0,0 +1,264 @@
|
|
|
1
|
+
import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
|
|
2
|
+
|
|
3
|
+
// packages/common/phoenix/src/phoenix.ts
|
|
4
|
+
import { fork } from "node:child_process";
|
|
5
|
+
import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, unlinkSync, writeFileSync } from "node:fs";
|
|
6
|
+
import { dirname, join } from "node:path";
|
|
7
|
+
import pkgUp from "pkg-up";
|
|
8
|
+
import { invariant } from "@dxos/invariant";
|
|
9
|
+
import { log } from "@dxos/log";
|
|
10
|
+
|
|
11
|
+
// packages/common/phoenix/src/utils.ts
|
|
12
|
+
import { existsSync, readFileSync } from "node:fs";
|
|
13
|
+
import { waitForCondition } from "@dxos/async";
|
|
14
|
+
|
|
15
|
+
// packages/common/phoenix/src/defs.ts
|
|
16
|
+
var WATCHDOG_START_TIMEOUT = 1e4;
|
|
17
|
+
var WATCHDOG_STOP_TIMEOUT = 1e3;
|
|
18
|
+
var WATCHDOG_CHECK_INTERVAL = 50;
|
|
19
|
+
|
|
20
|
+
// packages/common/phoenix/src/utils.ts
|
|
21
|
+
var waitForPidDeletion = async (pidFile) => waitForCondition({
|
|
22
|
+
condition: () => !existsSync(pidFile),
|
|
23
|
+
timeout: WATCHDOG_STOP_TIMEOUT,
|
|
24
|
+
interval: WATCHDOG_CHECK_INTERVAL
|
|
25
|
+
});
|
|
26
|
+
var waitForPidFileBeingFilledWithInfo = async (pidFile) => waitForCondition({
|
|
27
|
+
condition: () => readFileSync(pidFile, {
|
|
28
|
+
encoding: "utf-8"
|
|
29
|
+
}).includes("pid"),
|
|
30
|
+
timeout: WATCHDOG_START_TIMEOUT,
|
|
31
|
+
interval: WATCHDOG_CHECK_INTERVAL,
|
|
32
|
+
error: new Error("Lock file is not being propagated with info.")
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
// packages/common/phoenix/src/phoenix.ts
|
|
36
|
+
var __dxlog_file = "/home/runner/work/dxos/dxos/packages/common/phoenix/src/phoenix.ts";
|
|
37
|
+
var scriptDir = typeof __dirname === "string" ? __dirname : dirname(new URL(import.meta.url).pathname);
|
|
38
|
+
var Phoenix = class _Phoenix {
|
|
39
|
+
/**
|
|
40
|
+
* Starts detached watchdog process which starts and monitors selected command.
|
|
41
|
+
*/
|
|
42
|
+
static async start(params) {
|
|
43
|
+
{
|
|
44
|
+
if (existsSync2(params.pidFile)) {
|
|
45
|
+
await _Phoenix.stop(params.pidFile);
|
|
46
|
+
}
|
|
47
|
+
await waitForPidDeletion(params.pidFile);
|
|
48
|
+
}
|
|
49
|
+
{
|
|
50
|
+
[
|
|
51
|
+
params.logFile,
|
|
52
|
+
params.errFile,
|
|
53
|
+
params.pidFile
|
|
54
|
+
].forEach((filename) => {
|
|
55
|
+
if (!existsSync2(filename)) {
|
|
56
|
+
mkdirSync(dirname(filename), {
|
|
57
|
+
recursive: true
|
|
58
|
+
});
|
|
59
|
+
writeFileSync(filename, "", {
|
|
60
|
+
encoding: "utf-8"
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
const watchdogPath = join(dirname(pkgUp.sync({
|
|
66
|
+
cwd: scriptDir
|
|
67
|
+
})), "bin", "watchdog");
|
|
68
|
+
const watchDog = fork(watchdogPath, [
|
|
69
|
+
JSON.stringify(params)
|
|
70
|
+
], {
|
|
71
|
+
detached: true
|
|
72
|
+
});
|
|
73
|
+
watchDog.on("exit", (code, signal) => {
|
|
74
|
+
if (code && code !== 0) {
|
|
75
|
+
log.error("Monitor died unexpectedly", {
|
|
76
|
+
code,
|
|
77
|
+
signal
|
|
78
|
+
}, {
|
|
79
|
+
F: __dxlog_file,
|
|
80
|
+
L: 53,
|
|
81
|
+
S: this,
|
|
82
|
+
C: (f, a) => f(...a)
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
watchDog.on("error", (err) => {
|
|
87
|
+
log.error("Monitor error", {
|
|
88
|
+
err
|
|
89
|
+
}, {
|
|
90
|
+
F: __dxlog_file,
|
|
91
|
+
L: 58,
|
|
92
|
+
S: this,
|
|
93
|
+
C: (f, a) => f(...a)
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
await waitForPidFileBeingFilledWithInfo(params.pidFile);
|
|
97
|
+
watchDog.disconnect();
|
|
98
|
+
watchDog.unref();
|
|
99
|
+
return _Phoenix.info(params.pidFile);
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Stops detached watchdog process by PID info written down in PID file.
|
|
103
|
+
*/
|
|
104
|
+
static async stop(pidFile, force = false) {
|
|
105
|
+
if (!existsSync2(pidFile)) {
|
|
106
|
+
throw new Error("PID file does not exist");
|
|
107
|
+
}
|
|
108
|
+
const fileContent = readFileSync2(pidFile, {
|
|
109
|
+
encoding: "utf-8"
|
|
110
|
+
});
|
|
111
|
+
if (!fileContent.includes("pid")) {
|
|
112
|
+
throw new Error("Invalid PID file content");
|
|
113
|
+
}
|
|
114
|
+
const { pid } = JSON.parse(fileContent);
|
|
115
|
+
const signal = force ? "SIGKILL" : "SIGINT";
|
|
116
|
+
try {
|
|
117
|
+
process.kill(pid, signal);
|
|
118
|
+
} catch (err) {
|
|
119
|
+
invariant(err instanceof Error, "Invalid error type", {
|
|
120
|
+
F: __dxlog_file,
|
|
121
|
+
L: 86,
|
|
122
|
+
S: this,
|
|
123
|
+
A: [
|
|
124
|
+
"err instanceof Error",
|
|
125
|
+
"'Invalid error type'"
|
|
126
|
+
]
|
|
127
|
+
});
|
|
128
|
+
if (err.message.includes("ESRCH") || err.name.includes("ESRCH")) {
|
|
129
|
+
unlinkSync(pidFile);
|
|
130
|
+
} else {
|
|
131
|
+
throw err;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
static info(pidFile) {
|
|
136
|
+
return JSON.parse(readFileSync2(pidFile, {
|
|
137
|
+
encoding: "utf-8"
|
|
138
|
+
}));
|
|
139
|
+
}
|
|
140
|
+
};
|
|
141
|
+
|
|
142
|
+
// packages/common/phoenix/src/watchdog.ts
|
|
143
|
+
import { spawn } from "node:child_process";
|
|
144
|
+
import { existsSync as existsSync3, unlinkSync as unlinkSync2, writeFileSync as writeFileSync2 } from "node:fs";
|
|
145
|
+
import { synchronized } from "@dxos/async";
|
|
146
|
+
import { invariant as invariant2 } from "@dxos/invariant";
|
|
147
|
+
import { log as log2 } from "@dxos/log";
|
|
148
|
+
function _ts_decorate(decorators, target, key, desc) {
|
|
149
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
150
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
151
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
152
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
153
|
+
}
|
|
154
|
+
var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/common/phoenix/src/watchdog.ts";
|
|
155
|
+
var WatchDog = class {
|
|
156
|
+
constructor(_params) {
|
|
157
|
+
this._params = _params;
|
|
158
|
+
this._restarts = 0;
|
|
159
|
+
}
|
|
160
|
+
async start() {
|
|
161
|
+
const { cwd, shell, env, command, args } = {
|
|
162
|
+
cwd: process.cwd(),
|
|
163
|
+
...this._params
|
|
164
|
+
};
|
|
165
|
+
this._log(`Spawning process \`\`\`${command} ${args?.join(" ")}\`\`\``);
|
|
166
|
+
this._child = spawn(command, args, {
|
|
167
|
+
cwd,
|
|
168
|
+
shell,
|
|
169
|
+
env,
|
|
170
|
+
stdio: "pipe"
|
|
171
|
+
});
|
|
172
|
+
this._child.stdout.on("data", (data) => {
|
|
173
|
+
this._log(String(data));
|
|
174
|
+
});
|
|
175
|
+
this._child.stderr.on("data", (data) => {
|
|
176
|
+
this._err(data);
|
|
177
|
+
});
|
|
178
|
+
this._child.on("close", async (code, signal) => {
|
|
179
|
+
if (code && code !== 0 && signal !== "SIGINT" && signal !== "SIGKILL") {
|
|
180
|
+
this._err(`Died unexpectedly with exit code ${code} (signal: ${signal}).`);
|
|
181
|
+
await this.restart();
|
|
182
|
+
}
|
|
183
|
+
this._log(`Stopped with exit code ${code} (signal: ${signal}).`);
|
|
184
|
+
if (existsSync3(this._params.pidFile)) {
|
|
185
|
+
unlinkSync2(this._params.pidFile);
|
|
186
|
+
}
|
|
187
|
+
});
|
|
188
|
+
const childInfo = {
|
|
189
|
+
pid: this._child.pid,
|
|
190
|
+
started: Date.now(),
|
|
191
|
+
restarts: this._restarts,
|
|
192
|
+
...this._params
|
|
193
|
+
};
|
|
194
|
+
writeFileSync2(this._params.pidFile, JSON.stringify(childInfo, void 0, 2), {
|
|
195
|
+
encoding: "utf-8"
|
|
196
|
+
});
|
|
197
|
+
await waitForPidFileBeingFilledWithInfo(this._params.pidFile);
|
|
198
|
+
}
|
|
199
|
+
/**
|
|
200
|
+
* Sends SIGKILL to the child process and the tree it spawned (if `killTree` param is `true`).
|
|
201
|
+
*/
|
|
202
|
+
async kill() {
|
|
203
|
+
if (!this._child) {
|
|
204
|
+
return;
|
|
205
|
+
}
|
|
206
|
+
await this._killWithSignal("SIGKILL");
|
|
207
|
+
if (existsSync3(this._params.pidFile)) {
|
|
208
|
+
unlinkSync2(this._params.pidFile);
|
|
209
|
+
}
|
|
210
|
+
await waitForPidDeletion(this._params.pidFile);
|
|
211
|
+
}
|
|
212
|
+
async restart() {
|
|
213
|
+
await this.kill();
|
|
214
|
+
if (this._params.maxRestarts !== void 0 && this._restarts >= this._params.maxRestarts) {
|
|
215
|
+
this._err("Max restarts number is reached");
|
|
216
|
+
} else {
|
|
217
|
+
log2("Restarting...", void 0, {
|
|
218
|
+
F: __dxlog_file2,
|
|
219
|
+
L: 120,
|
|
220
|
+
S: this,
|
|
221
|
+
C: (f, a) => f(...a)
|
|
222
|
+
});
|
|
223
|
+
this._restarts++;
|
|
224
|
+
await this.start();
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
async _killWithSignal(signal) {
|
|
228
|
+
invariant2(this._child?.pid, "Child process has no pid.", {
|
|
229
|
+
F: __dxlog_file2,
|
|
230
|
+
L: 127,
|
|
231
|
+
S: this,
|
|
232
|
+
A: [
|
|
233
|
+
"this._child?.pid",
|
|
234
|
+
"'Child process has no pid.'"
|
|
235
|
+
]
|
|
236
|
+
});
|
|
237
|
+
this._child.kill(signal);
|
|
238
|
+
this._child = void 0;
|
|
239
|
+
}
|
|
240
|
+
_log(message) {
|
|
241
|
+
writeFileSync2(this._params.logFile, message + "\n", {
|
|
242
|
+
flag: "a+",
|
|
243
|
+
encoding: "utf-8"
|
|
244
|
+
});
|
|
245
|
+
}
|
|
246
|
+
_err(message) {
|
|
247
|
+
this._log(message);
|
|
248
|
+
writeFileSync2(this._params.errFile, message + "\n", {
|
|
249
|
+
flag: "a+",
|
|
250
|
+
encoding: "utf-8"
|
|
251
|
+
});
|
|
252
|
+
}
|
|
253
|
+
};
|
|
254
|
+
_ts_decorate([
|
|
255
|
+
synchronized
|
|
256
|
+
], WatchDog.prototype, "start", null);
|
|
257
|
+
_ts_decorate([
|
|
258
|
+
synchronized
|
|
259
|
+
], WatchDog.prototype, "kill", null);
|
|
260
|
+
export {
|
|
261
|
+
Phoenix,
|
|
262
|
+
WatchDog
|
|
263
|
+
};
|
|
264
|
+
//# sourceMappingURL=index.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/phoenix.ts", "../../../src/utils.ts", "../../../src/defs.ts", "../../../src/watchdog.ts"],
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2023 DXOS.org\n//\n\nimport { fork } from 'node:child_process';\nimport { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport pkgUp from 'pkg-up';\n\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nimport { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';\nimport { type ProcessInfo, type WatchDogParams } from './watchdog';\n\nconst scriptDir = typeof __dirname === 'string' ? __dirname : dirname(new URL(import.meta.url).pathname);\n\n/**\n * Utils to start/stop detached process with errors and logs handling.\n */\nexport class Phoenix {\n /**\n * Starts detached watchdog process which starts and monitors selected command.\n */\n static async start(params: WatchDogParams) {\n {\n // Clear stale pid file.\n if (existsSync(params.pidFile)) {\n await Phoenix.stop(params.pidFile);\n }\n\n await waitForPidDeletion(params.pidFile);\n }\n\n {\n // Create log folders.\n [params.logFile, params.errFile, params.pidFile].forEach((filename) => {\n if (!existsSync(filename)) {\n mkdirSync(dirname(filename), { recursive: true });\n writeFileSync(filename, '', { encoding: 'utf-8' });\n }\n });\n }\n\n const watchdogPath = join(dirname(pkgUp.sync({ cwd: scriptDir })!), 'bin', 'watchdog');\n\n const watchDog = fork(watchdogPath, [JSON.stringify(params)], {\n detached: true,\n });\n\n watchDog.on('exit', (code, signal) => {\n if (code && code !== 0) {\n log.error('Monitor died unexpectedly', { code, signal });\n }\n });\n\n watchDog.on('error', (err) => {\n log.error('Monitor error', { err });\n });\n\n await waitForPidFileBeingFilledWithInfo(params.pidFile);\n\n watchDog.disconnect();\n watchDog.unref();\n\n return Phoenix.info(params.pidFile);\n }\n\n /**\n * Stops detached watchdog process by PID info written down in PID file.\n */\n static async stop(pidFile: string, force = false) {\n if (!existsSync(pidFile)) {\n throw new Error('PID file does not exist');\n }\n const fileContent = readFileSync(pidFile, { encoding: 'utf-8' });\n if (!fileContent.includes('pid')) {\n throw new Error('Invalid PID file content');\n }\n\n const { pid } = JSON.parse(fileContent);\n const signal: NodeJS.Signals = force ? 'SIGKILL' : 'SIGINT';\n try {\n process.kill(pid, signal);\n } catch (err) {\n invariant(err instanceof Error, 'Invalid error type');\n if (err.message.includes('ESRCH') || err.name.includes('ESRCH')) {\n // Process is already dead.\n unlinkSync(pidFile);\n } else {\n throw err;\n }\n }\n }\n\n static info(pidFile: string): ProcessInfo {\n return JSON.parse(readFileSync(pidFile, { encoding: 'utf-8' }));\n }\n}\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { existsSync, readFileSync } from 'node:fs';\n\nimport { waitForCondition } from '@dxos/async';\n\nimport { WATCHDOG_CHECK_INTERVAL, WATCHDOG_START_TIMEOUT, WATCHDOG_STOP_TIMEOUT } from './defs';\n\nexport const waitForPidCreation = async (pidFile: string) =>\n waitForCondition({\n condition: () => existsSync(pidFile),\n timeout: WATCHDOG_START_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n });\n\nexport const waitForPidDeletion = async (pidFile: string) =>\n waitForCondition({\n condition: () => !existsSync(pidFile),\n timeout: WATCHDOG_STOP_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n });\n\nexport const waitForPidFileBeingFilledWithInfo = async (pidFile: string) =>\n waitForCondition({\n condition: () => readFileSync(pidFile, { encoding: 'utf-8' }).includes('pid'),\n timeout: WATCHDOG_START_TIMEOUT,\n interval: WATCHDOG_CHECK_INTERVAL,\n error: new Error('Lock file is not being propagated with info.'),\n });\n", "//\n// Copyright 2023 DXOS.org\n//\n\nexport const LOCK_TIMEOUT = 1_000;\nexport const LOCK_CHECK_INTERVAL = 50;\nexport const WATCHDOG_START_TIMEOUT = 10_000;\nexport const WATCHDOG_STOP_TIMEOUT = 1_000;\nexport const WATCHDOG_CHECK_INTERVAL = 50;\n", "//\n// Copyright 2023 DXOS.org\n//\n\nimport { type ChildProcessWithoutNullStreams, spawn } from 'node:child_process';\nimport { existsSync, unlinkSync, writeFileSync } from 'node:fs';\nimport { type FileHandle } from 'node:fs/promises';\n\nimport { synchronized } from '@dxos/async';\nimport { invariant } from '@dxos/invariant';\nimport { log } from '@dxos/log';\n\nimport { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';\n\nexport type ProcessInfo = WatchDogParams & {\n pid?: number;\n started?: number;\n restarts?: number;\n running?: boolean;\n};\n\nexport type WatchDogParams = {\n profile?: string; // Human readable process identifier\n pidFile: string; // Path to PID file\n\n //\n // Log files and associated logging options for this instance\n //\n logFile: string; // Path to log output all logs\n errFile: string; // Path to log output from child stderr\n\n //\n // Basic configuration options\n //\n maxRestarts?: number | undefined; // Sets the maximum number of times a given script should run\n killTree?: boolean | undefined; // Kills the entire child process tree on `exit`\n\n //\n // Command to spawn as well as options and other vars\n // (env, cwd, etc) to pass along\n //\n command: string; // Binary to run (default: 'node')\n args?: string[] | undefined; // Additional arguments to pass to the script,\n\n //\n // More specific options to pass along to `child_process.spawn` which\n // will override anything passed to the `spawnWith` option\n //\n env?: NodeJS.ProcessEnv | undefined;\n cwd?: string | undefined;\n shell?: boolean | undefined;\n};\n\nexport class WatchDog {\n private _lock?: FileHandle; // TODO(burdon): Not used?\n private _child?: ChildProcessWithoutNullStreams;\n private _restarts = 0;\n\n constructor(private readonly _params: WatchDogParams) {}\n\n @synchronized\n async start() {\n const { cwd, shell, env, command, args } = { cwd: process.cwd(), ...this._params };\n\n this._log(`Spawning process \\`\\`\\`${command} ${args?.join(' ')}\\`\\`\\``);\n this._child = spawn(command, args, { cwd, shell, env, stdio: 'pipe' });\n\n this._child.stdout.on('data', (data: Uint8Array) => {\n this._log(String(data));\n });\n this._child.stderr.on('data', (data: Uint8Array) => {\n this._err(data);\n });\n this._child.on('close', async (code: number, signal: number | NodeJS.Signals) => {\n if (code && code !== 0 && signal !== 'SIGINT' && signal !== 'SIGKILL') {\n this._err(`Died unexpectedly with exit code ${code} (signal: ${signal}).`);\n await this.restart();\n }\n this._log(`Stopped with exit code ${code} (signal: ${signal}).`);\n if (existsSync(this._params.pidFile)) {\n unlinkSync(this._params.pidFile);\n }\n });\n\n const childInfo: ProcessInfo = {\n pid: this._child.pid,\n started: Date.now(),\n restarts: this._restarts,\n ...this._params,\n };\n\n writeFileSync(this._params.pidFile, JSON.stringify(childInfo, undefined, 2), { encoding: 'utf-8' });\n\n await waitForPidFileBeingFilledWithInfo(this._params.pidFile);\n }\n\n /**\n * Sends SIGKILL to the child process and the tree it spawned (if `killTree` param is `true`).\n */\n @synchronized\n async kill() {\n if (!this._child) {\n return;\n }\n\n await this._killWithSignal('SIGKILL');\n\n if (existsSync(this._params.pidFile)) {\n unlinkSync(this._params.pidFile);\n }\n\n await waitForPidDeletion(this._params.pidFile);\n }\n\n async restart() {\n await this.kill();\n if (this._params.maxRestarts !== undefined && this._restarts >= this._params.maxRestarts) {\n this._err('Max restarts number is reached');\n } else {\n log('Restarting...');\n this._restarts++;\n await this.start();\n }\n }\n\n async _killWithSignal(signal: number | NodeJS.Signals) {\n invariant(this._child?.pid, 'Child process has no pid.');\n this._child.kill(signal);\n this._child = undefined;\n }\n\n private _log(message: string | Uint8Array) {\n writeFileSync(this._params.logFile, message + '\\n', {\n flag: 'a+',\n encoding: 'utf-8',\n });\n }\n\n private _err(message: string | Uint8Array) {\n this._log(message);\n writeFileSync(this._params.errFile, message + '\\n', {\n flag: 'a+',\n encoding: 'utf-8',\n });\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["fork", "existsSync", "mkdirSync", "readFileSync", "unlinkSync", "writeFileSync", "dirname", "join", "pkgUp", "invariant", "log", "existsSync", "readFileSync", "waitForCondition", "WATCHDOG_START_TIMEOUT", "WATCHDOG_STOP_TIMEOUT", "WATCHDOG_CHECK_INTERVAL", "waitForPidDeletion", "pidFile", "waitForCondition", "condition", "existsSync", "timeout", "WATCHDOG_STOP_TIMEOUT", "interval", "WATCHDOG_CHECK_INTERVAL", "waitForPidFileBeingFilledWithInfo", "readFileSync", "encoding", "includes", "WATCHDOG_START_TIMEOUT", "error", "Error", "scriptDir", "__dirname", "dirname", "URL", "url", "pathname", "Phoenix", "start", "params", "existsSync", "pidFile", "stop", "waitForPidDeletion", "logFile", "errFile", "forEach", "filename", "mkdirSync", "recursive", "writeFileSync", "encoding", "watchdogPath", "join", "pkgUp", "sync", "cwd", "watchDog", "fork", "JSON", "stringify", "detached", "on", "code", "signal", "log", "error", "err", "waitForPidFileBeingFilledWithInfo", "disconnect", "unref", "info", "force", "Error", "fileContent", "readFileSync", "includes", "pid", "parse", "process", "kill", "invariant", "message", "name", "unlinkSync", "spawn", "existsSync", "unlinkSync", "writeFileSync", "synchronized", "invariant", "log", "WatchDog", "constructor", "_params", "_restarts", "start", "cwd", "shell", "env", "command", "args", "process", "_log", "join", "_child", "spawn", "stdio", "stdout", "on", "data", "String", "stderr", "_err", "code", "signal", "restart", "existsSync", "pidFile", "unlinkSync", "childInfo", "pid", "started", "Date", "now", "restarts", "writeFileSync", "JSON", "stringify", "undefined", "encoding", "waitForPidFileBeingFilledWithInfo", "kill", "_killWithSignal", "waitForPidDeletion", "maxRestarts", "log", "invariant", "message", "logFile", "flag", "errFile", "synchronized"]
|
|
7
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"inputs":{"packages/common/phoenix/src/defs.ts":{"bytes":1237,"imports":[],"format":"esm"},"packages/common/phoenix/src/utils.ts":{"bytes":3729,"imports":[{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/defs.ts","kind":"import-statement","original":"./defs"}],"format":"esm"},"packages/common/phoenix/src/phoenix.ts":{"bytes":11512,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/common/phoenix/src/watchdog.ts":{"bytes":14592,"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"packages/common/phoenix/src/utils.ts","kind":"import-statement","original":"./utils"}],"format":"esm"},"packages/common/phoenix/src/index.ts":{"bytes":1023,"imports":[{"path":"packages/common/phoenix/src/phoenix.ts","kind":"import-statement","original":"./phoenix"},{"path":"packages/common/phoenix/src/watchdog.ts","kind":"import-statement","original":"./watchdog"}],"format":"esm"}},"outputs":{"packages/common/phoenix/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":14859},"packages/common/phoenix/dist/lib/node-esm/index.mjs":{"imports":[{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"node:path","kind":"import-statement","external":true},{"path":"pkg-up","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"node:child_process","kind":"import-statement","external":true},{"path":"node:fs","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true}],"exports":["Phoenix","WatchDog"],"entryPoint":"packages/common/phoenix/src/index.ts","inputs":{"packages/common/phoenix/src/phoenix.ts":{"bytesInOutput":3060},"packages/common/phoenix/src/utils.ts":{"bytesInOutput":586},"packages/common/phoenix/src/defs.ts":{"bytesInOutput":101},"packages/common/phoenix/src/index.ts":{"bytesInOutput":0},"packages/common/phoenix/src/watchdog.ts":{"bytesInOutput":3732}},"bytes":7892}}}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"phoenix.d.ts","sourceRoot":"","sources":["../../../src/phoenix.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"phoenix.d.ts","sourceRoot":"","sources":["../../../src/phoenix.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAInE;;GAEG;AACH,qBAAa,OAAO;IAClB;;OAEG;WACU,KAAK,CAAC,MAAM,EAAE,cAAc;IA4CzC;;OAEG;WACU,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,UAAQ;IAwBhD,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW;CAG1C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"phoenix.node.test.d.ts","sourceRoot":"","sources":["../../../src/phoenix.node.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watchdog.node.test.d.ts","sourceRoot":"","sources":["../../../src/watchdog.node.test.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/phoenix",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.14-main.2b6a0f3",
|
|
4
4
|
"description": "Basic node daemon.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
7
7
|
"license": "MIT",
|
|
8
8
|
"author": "DXOS.org",
|
|
9
|
+
"sideEffects": false,
|
|
9
10
|
"exports": {
|
|
10
11
|
".": {
|
|
11
12
|
"node": {
|
|
12
|
-
"
|
|
13
|
+
"require": "./dist/lib/node/index.cjs",
|
|
14
|
+
"default": "./dist/lib/node-esm/index.mjs"
|
|
13
15
|
},
|
|
14
16
|
"types": "./dist/types/src/index.d.ts"
|
|
15
17
|
}
|
|
@@ -25,18 +27,10 @@
|
|
|
25
27
|
],
|
|
26
28
|
"dependencies": {
|
|
27
29
|
"pkg-up": "^3.1.0",
|
|
28
|
-
"@dxos/
|
|
29
|
-
"@dxos/
|
|
30
|
-
"@dxos/
|
|
31
|
-
"@dxos/
|
|
32
|
-
"@dxos/log": "0.6.13",
|
|
33
|
-
"@dxos/node-std": "0.6.13",
|
|
34
|
-
"@dxos/keys": "0.6.13",
|
|
35
|
-
"@dxos/util": "0.6.13"
|
|
36
|
-
},
|
|
37
|
-
"devDependencies": {
|
|
38
|
-
"@types/node": "^18.11.9",
|
|
39
|
-
"@types/ps-tree": "^1.1.2"
|
|
30
|
+
"@dxos/invariant": "0.6.14-main.2b6a0f3",
|
|
31
|
+
"@dxos/log": "0.6.14-main.2b6a0f3",
|
|
32
|
+
"@dxos/node-std": "0.6.14-main.2b6a0f3",
|
|
33
|
+
"@dxos/async": "0.6.14-main.2b6a0f3"
|
|
40
34
|
},
|
|
41
35
|
"publishConfig": {
|
|
42
36
|
"access": "public"
|
|
@@ -2,14 +2,12 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { expect } from 'chai';
|
|
6
5
|
import { spawn } from 'node:child_process';
|
|
7
6
|
import { existsSync, readFileSync } from 'node:fs';
|
|
8
7
|
import { join } from 'node:path';
|
|
9
|
-
import
|
|
8
|
+
import { onTestFinished, describe, expect, test } from 'vitest';
|
|
10
9
|
|
|
11
10
|
import { Trigger } from '@dxos/async';
|
|
12
|
-
import { afterTest, describe, test } from '@dxos/test';
|
|
13
11
|
|
|
14
12
|
import { Phoenix } from './phoenix';
|
|
15
13
|
import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
|
|
@@ -33,7 +31,7 @@ describe('DaemonManager', () => {
|
|
|
33
31
|
const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
|
|
34
32
|
const logFile = join(TEST_DIR, `file-${runId}.log`);
|
|
35
33
|
const errFile = join(TEST_DIR, `err-${runId}.log`);
|
|
36
|
-
|
|
34
|
+
onTestFinished(() => clearFiles(pidFile, logFile, errFile));
|
|
37
35
|
|
|
38
36
|
// Start
|
|
39
37
|
{
|
|
@@ -47,11 +45,9 @@ describe('DaemonManager', () => {
|
|
|
47
45
|
errFile,
|
|
48
46
|
});
|
|
49
47
|
|
|
50
|
-
await
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
expect(logs).to.contain('neverEndingProcess started');
|
|
54
|
-
}, 1000);
|
|
48
|
+
await expect.poll(() => existsSync(params.logFile), { timeout: 1000 }).toBe(true);
|
|
49
|
+
const logs = readFileSync(params.logFile, { encoding: 'utf-8' });
|
|
50
|
+
expect(logs).to.contain('neverEndingProcess started');
|
|
55
51
|
}
|
|
56
52
|
|
|
57
53
|
// Stop
|
|
@@ -61,10 +57,7 @@ describe('DaemonManager', () => {
|
|
|
61
57
|
|
|
62
58
|
await Phoenix.stop(pidFile);
|
|
63
59
|
|
|
64
|
-
await
|
|
65
|
-
const logs = readFileSync(logFile, { encoding: 'utf-8' });
|
|
66
|
-
expect(logs).to.contain('Stopped with exit code');
|
|
67
|
-
}, 1000);
|
|
60
|
+
await expect.poll(() => readFileSync(logFile, { encoding: 'utf-8' })).toContain('Stopped with exit code');
|
|
68
61
|
}
|
|
69
62
|
});
|
|
70
63
|
});
|
package/src/phoenix.ts
CHANGED
|
@@ -13,6 +13,8 @@ import { log } from '@dxos/log';
|
|
|
13
13
|
import { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';
|
|
14
14
|
import { type ProcessInfo, type WatchDogParams } from './watchdog';
|
|
15
15
|
|
|
16
|
+
const scriptDir = typeof __dirname === 'string' ? __dirname : dirname(new URL(import.meta.url).pathname);
|
|
17
|
+
|
|
16
18
|
/**
|
|
17
19
|
* Utils to start/stop detached process with errors and logs handling.
|
|
18
20
|
*/
|
|
@@ -40,11 +42,10 @@ export class Phoenix {
|
|
|
40
42
|
});
|
|
41
43
|
}
|
|
42
44
|
|
|
43
|
-
const watchdogPath = join(dirname(pkgUp.sync({ cwd:
|
|
45
|
+
const watchdogPath = join(dirname(pkgUp.sync({ cwd: scriptDir })!), 'bin', 'watchdog');
|
|
44
46
|
|
|
45
47
|
const watchDog = fork(watchdogPath, [JSON.stringify(params)], {
|
|
46
48
|
detached: true,
|
|
47
|
-
cwd: __dirname,
|
|
48
49
|
});
|
|
49
50
|
|
|
50
51
|
watchDog.on('exit', (code, signal) => {
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
// Copyright 2023 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { expect } from 'chai';
|
|
6
5
|
import { existsSync } from 'node:fs';
|
|
7
6
|
import { join } from 'node:path';
|
|
8
|
-
|
|
9
|
-
import { afterTest, describe, test } from '@dxos/test';
|
|
7
|
+
import { onTestFinished, describe, expect, test } from 'vitest';
|
|
10
8
|
|
|
11
9
|
import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
|
|
12
10
|
import { WatchDog } from './watchdog';
|
|
@@ -17,7 +15,7 @@ describe('WatchDog', () => {
|
|
|
17
15
|
const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
|
|
18
16
|
const logFile = join(TEST_DIR, `file-${runId}.log`);
|
|
19
17
|
const errFile = join(TEST_DIR, `err-${runId}.log`);
|
|
20
|
-
|
|
18
|
+
onTestFinished(() => clearFiles(pidFile, logFile, errFile));
|
|
21
19
|
|
|
22
20
|
const watchDog = new WatchDog({
|
|
23
21
|
command: 'node',
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"phoenix.test.d.ts","sourceRoot":"","sources":["../../../src/phoenix.test.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"watchdog.test.d.ts","sourceRoot":"","sources":["../../../src/watchdog.test.ts"],"names":[],"mappings":""}
|