@dxos/phoenix 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/phoenix",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Basic node daemon.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
@@ -16,9 +20,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "bin",
     "dist",
@@ -26,10 +27,10 @@
   ],
   "dependencies": {
     "pkg-up": "^3.1.0",
-    "@dxos/async": "0.8.4-main.dedc0f3",
-    "@dxos/invariant": "0.8.4-main.dedc0f3",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/node-std": "0.8.4-main.dedc0f3"
+    "@dxos/async": "0.8.4-main.dfabb4ec29",
+    "@dxos/invariant": "0.8.4-main.dfabb4ec29",
+    "@dxos/node-std": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29"
   },
   "publishConfig": {
     "access": "public"

package/src/phoenix.node.test.ts

@@ -3,9 +3,8 @@
 //
 
 import { spawn } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
+import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { Trigger } from '@dxos/async';
@@ -13,7 +12,7 @@ import { Trigger } from '@dxos/async';
 import { Phoenix } from './phoenix';
 import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
 
-describe('DaemonManager', () => {
+describe.skipIf(process.env.CI)('DaemonManager', () => {
   test('kill process by pid', async () => {
     const child = spawn('node', ['-e', `(${neverEndingProcess.toString()})()`]);
     const trigger = new Trigger();
@@ -22,11 +21,9 @@ describe('DaemonManager', () => {
     });
 
     process.kill(child.pid!, 'SIGKILL');
-
     await trigger.wait({ timeout: 1_000 });
   });
 
-  // Fails on CI
   test('start/stop detached watchdog', async () => {
     const runId = Math.random().toString();
     const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
@@ -46,9 +43,11 @@ describe('DaemonManager', () => {
         errFile,
       });
 
-      await expect.poll(() => existsSync(params.logFile), { timeout: 1000 }).toBe(true);
-      const logs = readFileSync(params.logFile, { encoding: 'utf-8' });
-      expect(logs).to.contain('neverEndingProcess started');
+      // Poll for log content directly — the file is pre-created empty by Phoenix.start(),
+      // so polling for existence would resolve immediately before the child writes its output.
+      await expect
+        .poll(() => readFileSync(params.logFile, { encoding: 'utf-8' }), { timeout: 5000 })
+        .toContain('neverEndingProcess started');
     }
 
     // Stop
@@ -57,7 +56,6 @@ describe('DaemonManager', () => {
       expect(info.profile).to.equal(runId);
 
       await Phoenix.stop(pidFile);
-
       await expect.poll(() => readFileSync(logFile, { encoding: 'utf-8' })).toContain('Stopped with exit code');
     }
   });

package/src/phoenix.ts

@@ -5,14 +5,13 @@
 import { fork } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
-
 import pkgUp from 'pkg-up';
 
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
 import { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';
-import { type ProcessInfo, type WatchDogParams } from './watchdog';
+import { type ProcessInfo, type WatchDogProps } from './watchdog';
 
 const scriptDir = typeof __dirname === 'string' ? __dirname : dirname(new URL(import.meta.url).pathname);
 
@@ -23,7 +22,7 @@ export class Phoenix {
   /**
    * Starts detached watchdog process which starts and monitors selected command.
    */
-  static async start(params: WatchDogParams): Promise<ProcessInfo> {
+  static async start(params: WatchDogProps): Promise<ProcessInfo> {
     {
       // Clear stale pid file.
       if (existsSync(params.pidFile)) {

package/src/watchdog.node.test.ts

@@ -4,13 +4,12 @@
 
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-
 import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { TEST_DIR, clearFiles, neverEndingProcess } from './testing-utils';
 import { WatchDog } from './watchdog';
 
-describe('WatchDog', () => {
+describe.skipIf(process.env.CI)('WatchDog', () => {
   test('Start/stop process', async () => {
     const runId = Math.random();
     const pidFile = join(TEST_DIR, `pid-${runId}.pid`);
@@ -27,8 +26,8 @@ describe('WatchDog', () => {
     });
 
     expect(existsSync(pidFile)).to.be.false;
-    await watchDog.start();
 
+    await watchDog.start();
     expect(existsSync(pidFile)).to.be.true;
 
     await watchDog.kill();

package/src/watchdog.ts

@@ -12,14 +12,14 @@ import { log } from '@dxos/log';
 
 import { waitForPidDeletion, waitForPidFileBeingFilledWithInfo } from './utils';
 
-export type ProcessInfo = WatchDogParams & {
+export type ProcessInfo = WatchDogProps & {
   pid?: number;
   started?: number;
   restarts?: number;
   running?: boolean;
 };
 
-export type WatchDogParams = {
+export type WatchDogProps = {
   profile?: string; // Human readable process identifier
   pidFile: string; // Path to PID file
 
@@ -56,7 +56,7 @@ export class WatchDog {
   private _child?: ChildProcessWithoutNullStreams;
   private _restarts = 0;
 
-  constructor(private readonly _params: WatchDogParams) {}
+  constructor(private readonly _params: WatchDogProps) {}
 
   @synchronized
   async start(): Promise<void> {