create-svc 0.1.81 → 0.1.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.81",
+  "version": "0.1.82",
   "description": "Local microservice bootstrap CLI for Cloud Run and Workers services with Neon-backed data.",
   "module": "index.ts",
   "type": "module",

package/src/service-runtime/cloudrun/deploy-args.ts

@@ -110,3 +110,7 @@ export function migrationCommandForRuntime(runtime: string): RuntimeMigrationCom
 
   throw new Error(`migrate is not available for ${runtime}`);
 }
+
+export function cloudRunServiceNamesForDestroy(serviceName: string) {
+  return [serviceName, `${serviceName}-worker`];
+}

package/src/service-runtime/cloudrun/deploy.ts

@@ -24,7 +24,7 @@ import {
   writeRenderedManifest,
   writeRenderedWorkerManifest,
 } from "./lib";
-import { migrationCommandForRuntime } from "./deploy-args";
+import { cloudRunServiceNamesForDestroy, migrationCommandForRuntime } from "./deploy-args";
 
 type DeployOptions = {
   bootstrapResult?: BootstrapResult;
@@ -49,7 +49,9 @@ export async function deploy(args = Bun.argv.slice(2), deployOptions: DeployOpti
       throw new Error("Refusing to destroy the main environment");
     }
 
-    await runStep(`Deleting Cloud Run service ${target.serviceName}`, () => deleteService(target.serviceName));
+    for (const serviceName of cloudRunServiceNamesForDestroy(target.serviceName)) {
+      await runStep(`Deleting Cloud Run service ${serviceName}`, () => deleteService(serviceName));
+    }
     await runStep(`Deleting Neon branch ${target.branchName}`, async () => {
       const branches = await listBranches(neon.projectId);
       const branch = branches.find((candidate: { name: string }) => candidate.name === target.branchName);

package/src/service-runtime/cloudrun/lib.test.ts

@@ -1,5 +1,5 @@
 import { afterEach, expect, test } from "bun:test";
-import { localDockerBuildArgs, migrationCommandForRuntime, parseDeployArgs } from "./deploy-args";
+import { cloudRunServiceNamesForDestroy, localDockerBuildArgs, migrationCommandForRuntime, parseDeployArgs } from "./deploy-args";
 
 const originalBuild = process.env.SERVICE_BUILD;
 const originalBuildStrategy = process.env.SERVICE_BUILD_STRATEGY;
@@ -49,3 +49,7 @@ test("migrationCommandForRuntime uses generated migration tooling", () => {
     args: ["migrate", "apply", "--env", "local"],
   });
 });
+
+test("cloudRunServiceNamesForDestroy includes api and worker services", () => {
+  expect(cloudRunServiceNamesForDestroy("omnichannel-pr-6")).toEqual(["omnichannel-pr-6", "omnichannel-pr-6-worker"]);
+});

package/src/service-runtime/local-dev.test.ts

@@ -56,6 +56,7 @@ describe("local dev cleanup", () => {
 
     try {
       await waitForServer(port);
+      await waitForServiceOwnedListener(root, port, child.pid);
 
       const result = await stopLocalDev({ root, dockerCompose: false, ports: [port] });
 
@@ -115,6 +116,18 @@ async function waitForListenerStop(port: number, pid: number) {
   throw new Error(`process ${pid} on port ${port} did not stop listening`);
 }
 
+async function waitForServiceOwnedListener(root: string, port: number, pid: number) {
+  const deadline = Date.now() + 5_000;
+  while (Date.now() < deadline) {
+    const plan = await buildLocalDevCleanupPlan({ root, dockerCompose: false, ports: [port] });
+    if (plan.portProcesses.some((process) => process.pid === pid && process.port === port)) {
+      return;
+    }
+    await Bun.sleep(50);
+  }
+  throw new Error(`process ${pid} on port ${port} was not detected as service-owned`);
+}
+
 async function isReachable(port: number) {
   try {
     const response = await fetch(`http://127.0.0.1:${port}`, { signal: AbortSignal.timeout(250) });