@dxos/phoenix 0.1.58-main.88ec9da → 0.1.58-main.935caa2

package/dist/types/src/daemon-manager.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=daemon-manager.test.d.ts.map

package/dist/types/src/daemon-manager.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"daemon-manager.test.d.ts","sourceRoot":"","sources":["../../../src/daemon-manager.test.ts"],"names":[],"mappings":""}

package/dist/types/src/defs.d.ts

@@ -1,6 +1,4 @@
 export declare const LOCK_TIMEOUT = 1000;
 export declare const LOCK_CHECK_INTERVAL = 50;
-export declare const WATCHDOG_START_TIMEOUT = 10000;
-export declare const WATCHDOG_STOP_TIMEOUT = 1000;
-export declare const WATCHDOG_CHECK_INTERVAL = 50;
+export declare const DAEMON_START_TIMEOUT = 10000;
 //# sourceMappingURL=defs.d.ts.map

package/dist/types/src/defs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../../src/defs.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,OAAQ,CAAC;AAClC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAC7C,eAAO,MAAM,qBAAqB,OAAQ,CAAC;AAC3C,eAAO,MAAM,uBAAuB,KAAK,CAAC"}
+{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../../src/defs.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,OAAQ,CAAC;AAClC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AACtC,eAAO,MAAM,oBAAoB,QAAS,CAAC"}

package/dist/types/src/index.d.ts

@@ -1,3 +1,3 @@
-export * from './phoenix';
+export * from './daemon-manager';
 export * from './watchdog';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAQA,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAQA,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}

package/dist/types/src/utils.d.ts

@@ -1,4 +1,4 @@
-export declare const waitForPidCreation: (pidFile: string) => Promise<boolean>;
-export declare const waitForPidDeletion: (pidFile: string) => Promise<boolean>;
-export declare const waitForPidFileBeingFilledWithInfo: (pidFile: string) => Promise<boolean>;
+export declare const waitForLockAcquisition: (lockFile: string) => Promise<boolean>;
+export declare const waitForLockFileBeingFilledWithInfo: (lockFile: string) => Promise<boolean>;
+export declare const waitForLockRelease: (lockFile: string) => Promise<boolean>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/types/src/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,kBAAkB,YAAmB,MAAM,qBAKpD,CAAC;AAEL,eAAO,MAAM,kBAAkB,YAAmB,MAAM,qBAKpD,CAAC;AAEL,eAAO,MAAM,iCAAiC,YAAmB,MAAM,qBAMnE,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/utils.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,sBAAsB,aAAoB,MAAM,qBAMzD,CAAC;AAEL,eAAO,MAAM,kCAAkC,aAAoB,MAAM,qBAMrE,CAAC;AAEL,eAAO,MAAM,kBAAkB,aAAoB,MAAM,qBAMrD,CAAC"}

package/dist/types/src/watchdog.d.ts

@@ -1,36 +1,55 @@
 /// <reference types="node" />
+export type DaemonInfo = {
+    pid: number;
+    command: string;
+    args: string[];
+    cwd: string;
+    timestamp: number;
+};
 export type ProcessInfo = WatchDogParams & {
     pid?: number;
-    started?: number;
+    timestamp?: number;
     restarts?: number;
     running?: boolean;
 };
-export type WatchDogParams = {
-    profile?: string;
-    pidFile: string;
+export type Lock = {
+    lockFile: string;
+};
+export type Logs = {
     logFile: string;
     errFile: string;
+};
+export type ChildParams = {
+    uid: string;
     maxRestarts?: number | undefined;
     killTree?: boolean | undefined;
-    command: string;
+    command?: string;
     args?: string[] | undefined;
     env?: NodeJS.ProcessEnv | undefined;
     cwd?: string | undefined;
     shell?: boolean | undefined;
 };
+export type WatchDogParams = ChildParams & Lock & Logs;
 export declare class WatchDog {
     private readonly _params;
     private _lock?;
     private _child?;
     private _restarts;
+    private _processCtx?;
     constructor(_params: WatchDogParams);
     start(): Promise<void>;
+    /**
+     * Sends SIGINT to the child process and the tree it spawned (if `killTree` param is `true`).
+     */
+    stop(): Promise<void>;
     /**
      * Sends SIGKILL to the child process and the tree it spawned (if `killTree` param is `true`).
      */
     kill(): Promise<void>;
     restart(): Promise<void>;
     _killWithSignal(signal: number | NodeJS.Signals): Promise<void>;
+    private _acquireLock;
+    private _releaseLock;
     private _log;
     private _err;
 }

package/dist/types/src/watchdog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watchdog.d.ts","sourceRoot":"","sources":["../../../src/watchdog.ts"],"names":[],"mappings":";AAcA,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAKhB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAKhB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAM/B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAM5B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,qBAAa,QAAQ;IAKP,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJpC,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,MAAM,CAAC,CAAiC;IAChD,OAAO,CAAC,SAAS,CAAK;gBAEO,OAAO,EAAE,cAAc;IAG9C,KAAK;IAmCX;;OAEG;IAEG,IAAI;IAcJ,OAAO;IAWP,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO;IAMrD,OAAO,CAAC,IAAI;IAOZ,OAAO,CAAC,IAAI;CAOb"}
+{"version":3,"file":"watchdog.d.ts","sourceRoot":"","sources":["../../../src/watchdog.ts"],"names":[],"mappings":";AAkBA,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,cAAc,GAAG;IACzC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAIjB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,GAAG,EAAE,MAAM,CAAC;IAKZ,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAM/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAM5B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;IACpC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;AAEvD,qBAAa,QAAQ;IAMP,OAAO,CAAC,QAAQ,CAAC,OAAO;IALpC,OAAO,CAAC,KAAK,CAAC,CAAa;IAC3B,OAAO,CAAC,MAAM,CAAC,CAAiC;IAChD,OAAO,CAAC,SAAS,CAAK;IACtB,OAAO,CAAC,WAAW,CAAC,CAAU;gBAED,OAAO,EAAE,cAAc;IAG9C,KAAK;IAmDX;;OAEG;IAEG,IAAI;IAUV;;OAEG;IAEG,IAAI;IAUJ,OAAO;IAWP,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,OAAO;YAuBvC,YAAY;YAQZ,YAAY;IAS1B,OAAO,CAAC,IAAI;IAOZ,OAAO,CAAC,IAAI;CAOb"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/phoenix",
-  "version": "0.1.58-main.88ec9da",
+  "version": "0.1.58-main.935caa2",
   "description": "Basic node daemon.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -13,17 +13,20 @@
     "src"
   ],
   "dependencies": {
+    "fs-extra": "^8.1.0",
     "pkg-up": "^3.1.0",
-    "@dxos/async": "0.1.58-main.88ec9da",
-    "@dxos/context": "0.1.58-main.88ec9da",
-    "@dxos/invariant": "0.1.58-main.88ec9da",
-    "@dxos/keys": "0.1.58-main.88ec9da",
-    "@dxos/lock-file": "0.1.58-main.88ec9da",
-    "@dxos/log": "0.1.58-main.88ec9da",
-    "@dxos/node-std": "0.1.58-main.88ec9da",
-    "@dxos/util": "0.1.58-main.88ec9da"
+    "ps-tree": "^1.2.0",
+    "@dxos/async": "0.1.58-main.935caa2",
+    "@dxos/context": "0.1.58-main.935caa2",
+    "@dxos/invariant": "0.1.58-main.935caa2",
+    "@dxos/keys": "0.1.58-main.935caa2",
+    "@dxos/lock-file": "0.1.58-main.935caa2",
+    "@dxos/log": "0.1.58-main.935caa2",
+    "@dxos/node-std": "0.1.58-main.935caa2",
+    "@dxos/util": "0.1.58-main.935caa2"
   },
   "devDependencies": {
+    "@types/fs-extra": "^9.0.4",
     "@types/node": "^18.11.9",
     "@types/ps-tree": "^1.1.2"
   },

package/src/{phoenix.test.ts → daemon-manager.test.ts}

@@ -3,16 +3,18 @@
 //
 
 import { expect } from 'chai';
+import fse from 'fs-extra';
 import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import waitForExpect from 'wait-for-expect';
 
 import { Trigger } from '@dxos/async';
+import { PublicKey } from '@dxos/keys';
 import { afterTest, describe, test } from '@dxos/test';
 
-import { Phoenix } from './phoenix';
-import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
+import { DaemonManager } from './daemon-manager';
+import { TEST_DIR, neverEndingProcess } from './testing-utils';
 
 describe('DaemonManager', () => {
   test('kill process by pid', async () => {
@@ -28,23 +30,21 @@ describe('DaemonManager', () => {
   });
 
   // Fails on CI
-  test('start/stop detached watchdog', async () => {
-    const runId = Math.random().toString();
-    const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
-    const logFile = join(TEST_DIR, `file-${runId}.log`);
-    const errFile = join(TEST_DIR, `err-${runId}.log`);
-    afterTest(() => clearFiles(pidFile, logFile, errFile));
+  test.skip('start/stop detached watchdog', async () => {
+    const uid = `test-${PublicKey.random().toHex()}`;
+    const root = join(TEST_DIR, uid);
+    afterTest(() => {
+      fse.removeSync(root);
+    });
 
     // Start
     {
-      const params = await Phoenix.start({
-        profile: runId,
+      const manager = new DaemonManager(root);
+      const params = await manager.start({
+        uid,
         command: 'node',
         args: ['-e', `(${neverEndingProcess.toString()})()`],
         maxRestarts: 0,
-        pidFile,
-        logFile,
-        errFile,
       });
 
       await waitForExpect(() => {
@@ -56,13 +56,17 @@ describe('DaemonManager', () => {
 
     // Stop
     {
-      const info = Phoenix.info(pidFile);
-      expect(info.profile).to.equal(runId);
+      const manager = new DaemonManager(root);
+      const info = await manager.list();
+      expect(info.length).to.equal(1);
+      expect(info[0].running).to.be.true;
+      expect(info[0].uid).to.equal(uid);
+      expect(await manager.isRunning(uid)).to.be.true;
 
-      await Phoenix.stop(pidFile);
+      const params = await manager.stop(uid);
 
       await waitForExpect(() => {
-        const logs = readFileSync(logFile, { encoding: 'utf-8' });
+        const logs = readFileSync(params.logFile, { encoding: 'utf-8' });
         expect(logs).to.contain('Stopped with exit code');
       }, 1000);
     }

package/src/daemon-manager.ts

@@ -0,0 +1,138 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { fork } from 'node:child_process';
+import { existsSync, mkdirSync, readFileSync, unlinkSync } from 'node:fs';
+import { readdir } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
+import pkgUp from 'pkg-up';
+
+import { invariant } from '@dxos/invariant';
+import { LockFile } from '@dxos/lock-file';
+import { log } from '@dxos/log';
+
+import { waitForLockAcquisition, waitForLockFileBeingFilledWithInfo, waitForLockRelease } from './utils';
+import { ChildParams, Logs, Lock, ProcessInfo, WatchDogParams } from './watchdog';
+
+const LOCK_FILE_NAME = 'lockfile';
+
+/**
+ * Params to start a daemon.
+ * User have no control over the lock file.
+ */
+export type StartParams = ChildParams & Partial<Logs>;
+
+export class DaemonManager {
+  constructor(private readonly _rootPath: string) {
+    if (!existsSync(join(_rootPath, 'profile'))) {
+      mkdirSync(join(_rootPath, 'profile'), { recursive: true });
+    }
+  }
+
+  private _getConfigFiles(uid: string): Logs & Lock {
+    const defaultConfigDir = join(this._rootPath, 'profile', uid);
+    if (!existsSync(defaultConfigDir)) {
+      mkdirSync(defaultConfigDir, { recursive: true });
+    }
+    return {
+      lockFile: join(defaultConfigDir, LOCK_FILE_NAME),
+      logFile: join(defaultConfigDir, 'file.log'),
+      errFile: join(defaultConfigDir, 'err.log'),
+    };
+  }
+
+  async start(params: StartParams) {
+    invariant(params.command, 'command is required');
+    const watchDogParams: WatchDogParams = {
+      ...this._getConfigFiles(params.uid),
+      ...params,
+    };
+
+    {
+      // Create log folders.
+      mkdirSync(dirname(watchDogParams.logFile), { recursive: true });
+      mkdirSync(dirname(watchDogParams.errFile), { recursive: true });
+    }
+
+    {
+      // Clear stale lock file if process is not running.
+      if (await LockFile.isLocked(watchDogParams.lockFile)) {
+        throw new Error('Lock file is already locked.');
+      }
+      unlinkSync(watchDogParams.lockFile);
+    }
+
+    const watchdogPath = join(dirname(pkgUp.sync({ cwd: __dirname })!), 'bin', 'watchdog');
+
+    const watchDog = fork(watchdogPath, [JSON.stringify(watchDogParams)], {
+      detached: true,
+      cwd: __dirname,
+    });
+
+    watchDog.on('exit', (code, signal) => {
+      if (code && code !== 0) {
+        log.error('Monitor died unexpectedly', { code, signal });
+      }
+    });
+
+    await waitForLockAcquisition(watchDogParams.lockFile);
+    await waitForLockFileBeingFilledWithInfo(watchDogParams.lockFile);
+
+    watchDog.disconnect();
+    watchDog.unref();
+
+    return this.getInfo(params.uid);
+  }
+
+  async stop(uid: string, force?: boolean) {
+    const lockFile = this._getConfigFiles(uid).lockFile;
+    const processInfo = JSON.parse(readFileSync(lockFile, { encoding: 'utf-8' }));
+    try {
+      if (force) {
+        process.kill(processInfo.pid, 'SIGKILL');
+      } else {
+        process.kill(processInfo.pid, 'SIGINT');
+      }
+    } catch (err) {
+      invariant(err instanceof Error, 'Invalid error type.');
+      if (!err.name.includes('ESRCH') && !err.message.includes('ESRCH')) {
+        throw err;
+      }
+    }
+    await waitForLockRelease(lockFile);
+
+    return this.getInfo(uid);
+  }
+
+  async list(): Promise<ProcessInfo[]> {
+    const uids = (await readdir(join(this._rootPath, 'profile'))).filter((uid) => !uid.startsWith('.'));
+
+    return Promise.all(
+      uids.map(async (uid) => {
+        return this.getInfo(uid);
+      }),
+    );
+  }
+
+  async getInfo(uid: string): Promise<ProcessInfo> {
+    const files = this._getConfigFiles(uid);
+
+    let info: ProcessInfo = { running: await LockFile.isLocked(files.lockFile), uid, ...files };
+    if (existsSync(files.lockFile)) {
+      try {
+        info = {
+          ...info,
+          ...JSON.parse(readFileSync(files.lockFile, { encoding: 'utf-8' })),
+        };
+      } catch (err) {}
+    }
+
+    return info;
+  }
+
+  async isRunning(uid: string): Promise<boolean> {
+    const lockFile = this._getConfigFiles(uid).lockFile;
+    return LockFile.isLocked(lockFile);
+  }
+}

package/src/defs.ts

@@ -4,6 +4,4 @@
 
 export const LOCK_TIMEOUT = 1_000;
 export const LOCK_CHECK_INTERVAL = 50;
-export const WATCHDOG_START_TIMEOUT = 10_000;
-export const WATCHDOG_STOP_TIMEOUT = 1_000;
-export const WATCHDOG_CHECK_INTERVAL = 50;
+export const DAEMON_START_TIMEOUT = 10_000;

package/src/index.ts

@@ -6,5 +6,5 @@
 // Copyright (C) 2010 Charlie Robbins & the Contributors
 //
 
-export * from './phoenix';
+export * from './daemon-manager';
 export * from './watchdog';

package/src/utils.ts

@@ -2,30 +2,33 @@
 // Copyright 2023 DXOS.org
 //
 
-import { existsSync, readFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 
 import { waitForCondition } from '@dxos/async';
+import { LockFile } from '@dxos/lock-file';
 
-import { WATCHDOG_CHECK_INTERVAL, WATCHDOG_START_TIMEOUT, WATCHDOG_STOP_TIMEOUT } from './defs';
+import { LOCK_CHECK_INTERVAL, LOCK_TIMEOUT } from './defs';
 
-export const waitForPidCreation = async (pidFile: string) =>
+export const waitForLockAcquisition = async (lockFile: string) =>
   waitForCondition({
-    condition: () => existsSync(pidFile),
-    timeout: WATCHDOG_START_TIMEOUT,
-    interval: WATCHDOG_CHECK_INTERVAL,
+    condition: async () => await LockFile.isLocked(lockFile),
+    timeout: LOCK_TIMEOUT,
+    interval: LOCK_CHECK_INTERVAL,
+    error: new Error('Lock file is not being acquired.'),
   });
 
-export const waitForPidDeletion = async (pidFile: string) =>
+export const waitForLockFileBeingFilledWithInfo = async (lockFile: string) =>
   waitForCondition({
-    condition: () => !existsSync(pidFile),
-    timeout: WATCHDOG_STOP_TIMEOUT,
-    interval: WATCHDOG_CHECK_INTERVAL,
+    condition: () => readFileSync(lockFile, { encoding: 'utf-8' }).includes('pid'),
+    timeout: LOCK_TIMEOUT,
+    interval: LOCK_CHECK_INTERVAL,
+    error: new Error('Lock file is not being propagated with info.'),
   });
 
-export const waitForPidFileBeingFilledWithInfo = async (pidFile: string) =>
+export const waitForLockRelease = async (lockFile: string) =>
   waitForCondition({
-    condition: () => readFileSync(pidFile, { encoding: 'utf-8' }).includes('pid'),
-    timeout: WATCHDOG_START_TIMEOUT,
-    interval: WATCHDOG_CHECK_INTERVAL,
-    error: new Error('Lock file is not being propagated with info.'),
+    condition: async () => !(await LockFile.isLocked(lockFile)),
+    timeout: LOCK_TIMEOUT,
+    interval: LOCK_CHECK_INTERVAL,
+    error: new Error('Lock file is not being released.'),
   });

package/src/watchdog.test.ts

@@ -3,9 +3,10 @@
 //
 
 import { expect } from 'chai';
-import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
+import { asyncTimeout } from '@dxos/async';
+import { LockFile } from '@dxos/lock-file';
 import { afterTest, describe, test } from '@dxos/test';
 
 import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
@@ -14,25 +15,26 @@ import { WatchDog } from './watchdog';
 describe('WatchDog', () => {
   test('Start/stop process', async () => {
     const runId = Math.random();
-    const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
+    const lockFile = join(TEST_DIR, `lock-${runId}.lock`);
     const logFile = join(TEST_DIR, `file-${runId}.log`);
     const errFile = join(TEST_DIR, `err-${runId}.log`);
-    afterTest(() => clearFiles(pidFile, logFile, errFile));
+    afterTest(() => clearFiles(lockFile, logFile, errFile));
 
     const watchDog = new WatchDog({
+      uid: 'test',
       command: 'node',
       args: ['-e', `(${neverEndingProcess.toString()})()`],
-      pidFile,
+      lockFile,
       logFile,
       errFile,
     });
 
-    expect(existsSync(pidFile)).to.be.false;
+    expect(await asyncTimeout(LockFile.isLocked(lockFile), 1000)).to.be.false;
     await watchDog.start();
 
-    expect(existsSync(pidFile)).to.be.true;
+    expect(await asyncTimeout(LockFile.isLocked(lockFile), 1000)).to.be.true;
 
-    await watchDog.kill();
-    expect(existsSync(pidFile)).to.be.false;
+    await watchDog.stop();
+    expect(await asyncTimeout(LockFile.isLocked(lockFile), 1000)).to.be.false;
   });
 });