Cleanup

Author: kasperpeulen

scripts/run-registry.ts

@@ -5,15 +5,14 @@ import type { Server } from 'node:http';
 import { join, resolve as resolvePath } from 'node:path';
 
 import { program } from 'commander';
-import detectFreePort from 'detect-port';
-import killProcessOnPort from 'kill-port';
 import pLimit from 'p-limit';
 import picocolors from 'picocolors';
 import { parseConfigFile, runServer } from 'verdaccio';
 
 import { npmAuth } from './npm-auth';
 import { maxConcurrentTasks } from './utils/concurrency';
 import { PACKS_DIRECTORY, ROOT_DIRECTORY } from './utils/constants';
+import { killPort } from './utils/port';
 import { getCodeWorkspaces } from './utils/workspace';
 
 program
@@ -37,29 +36,11 @@ const pathExists = async (p: string) => {
   }
 };
 
-const isPortUsed = async (port: number) => (await detectFreePort(port)) !== port;
-const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
-const kill = async (port: number) => {
-  if (await isPortUsed(port)) {
-    await killProcessOnPort(port);
-
-    let attempts = 0;
-    while ((await isPortUsed(port)) && attempts < 10) {
-      await sleep(1000);
-      attempts++;
-    }
-    if (await isPortUsed(port)) {
-      throw new Error(`Failed to free port ${port} after ${attempts} attempts`);
-    }
-  }
-};
-
 type Servers = { close: () => Promise<void> };
 const startVerdaccio = async () => {
   // Kill Verdaccio related processes if they are already running
-  await kill(6001);
-  await kill(6002);
+  await killPort(6001);
+  await killPort(6002);
 
   const ready = {
     proxy: false,
@@ -256,7 +237,10 @@ const run = async () => {
 };
 
 run().catch(async (e) => {
-  await servers?.close();
-  await rm(join(root, '.npmrc'), { force: true });
-  throw e;
+  try {
+    await servers?.close();
+  } finally {
+    await rm(join(root, '.npmrc'), { force: true });
+    throw e;
+  }
 });

scripts/tasks/run-registry.ts

@@ -1,9 +1,12 @@
-import detectFreePort from 'detect-port';
 import waitOn from 'wait-on';
 
 import type { Task } from '../task';
 import { CODE_DIRECTORY } from '../utils/constants';
 import { exec } from '../utils/exec';
+import { isPortUsed } from '../utils/port';
+
+const REGISTRY_PORT = 6001;
+const VERDACCIO_PORT = 6002;
 
 export async function runRegistry({ dryRun, debug }: { dryRun?: boolean; debug?: boolean }) {
   const controller = new AbortController();
@@ -20,20 +23,19 @@ export async function runRegistry({ dryRun, debug }: { dryRun?: boolean; debug?:
   });
   await waitOn({
     log: true,
-    resources: ['http://localhost:6001', 'http://localhost:6002'],
+    resources: [`http://localhost:${REGISTRY_PORT}`, `http://localhost:${VERDACCIO_PORT}`],
     interval: 16,
     timeout: 20000,
   });
   return controller;
 }
 
-const REGISTRY_PORT = 6001;
 export const runRegistryTask: Task = {
   description: 'Run the internal npm server',
   service: true,
   dependsOn: ['publish'],
   async ready() {
-    return (await detectFreePort(REGISTRY_PORT)) !== REGISTRY_PORT;
+    return (await isPortUsed(REGISTRY_PORT)) && (await isPortUsed(VERDACCIO_PORT));
   },
   async run(_, options) {
     return runRegistry(options);

scripts/utils/port.ts

@@ -0,0 +1,20 @@
+import detectFreePort from 'detect-port';
+import killProcessOnPort from 'kill-port';
+
+export const isPortUsed = async (port: number) => (await detectFreePort(port)) !== port;
+export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+export const killPort = async (port: number) => {
+  if (await isPortUsed(port)) {
+    await killProcessOnPort(port);
+
+    let attempts = 0;
+    while ((await isPortUsed(port)) && attempts < 20) {
+      await sleep(1000);
+      attempts++;
+    }
+    if (await isPortUsed(port)) {
+      throw new Error(`Failed to free port ${port} after ${attempts} attempts`);
+    }
+  }
+};