create-svc 0.1.45 → 0.1.48

package/package.json

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

package/src/post-scaffold.test.ts

@@ -2,9 +2,9 @@ import { describe, expect, test } from "bun:test";
 import {
   buildDeploymentVerificationCommands,
   buildLocalVerificationCommands,
+  buildLocalPreparationCommands,
   buildPostScaffoldCommands,
   buildPreGitBootstrapCommands,
-  shouldRunLocalMigrate,
 } from "./post-scaffold";
 
 describe("buildPostScaffoldCommands", () => {
@@ -38,10 +38,16 @@ describe("buildPreGitBootstrapCommands", () => {
   });
 });
 
-describe("shouldRunLocalMigrate", () => {
-  test("skips local migrate before Workers dev", () => {
-    expect(shouldRunLocalMigrate({ target: "workers" })).toBe(false);
-    expect(shouldRunLocalMigrate({ target: "cloudrun" })).toBe(true);
+describe("buildLocalPreparationCommands", () => {
+  test("starts local Postgres before migrating Workers dev", () => {
+    expect(buildLocalPreparationCommands({ target: "workers" })).toEqual([
+      { command: "bun", args: ["run", "./scripts/ensure-local-db.ts"] },
+      { command: "bun", args: ["run", "migrate"] },
+    ]);
+  });
+
+  test("runs migrations directly for Cloud Run dev", () => {
+    expect(buildLocalPreparationCommands({ target: "cloudrun" })).toEqual([{ command: "bun", args: ["run", "migrate"] }]);
   });
 });
 
@@ -127,7 +133,7 @@ describe("buildDeploymentVerificationCommands", () => {
       command: "sh",
       args: [
         "-c",
-        'TOKEN="$(service auth token)" && IP="$(dig @1.1.1.1 +short api.launch.anmho.com | head -n 1)" && test -n "$IP" && curl --fail --show-error --silent --resolve "api.launch.anmho.com:443:$IP" -H "Authorization: Bearer $TOKEN" "https://api.launch.anmho.com/v1/admin/waitlist?limit=1"',
+        'TOKEN="$(service auth token)" && (curl --fail --show-error --silent -H "Authorization: Bearer $TOKEN" "https://api.launch.anmho.com/v1/admin/waitlist?limit=1") || for IP in $(dig @1.1.1.1 +short api.launch.anmho.com); do curl --fail --show-error --silent --resolve "api.launch.anmho.com:443:$IP" -H "Authorization: Bearer $TOKEN" "https://api.launch.anmho.com/v1/admin/waitlist?limit=1" && exit 0; done; exit 1',
       ],
     });
   });

package/src/post-scaffold.ts

@@ -58,8 +58,8 @@ export function runPreGitBootstrapFlow(config: Pick<ScaffoldConfig, "framework">
 }
 
 async function startLocalDevelopment(config: Pick<ScaffoldConfig, "target">, cwd: string) {
-  if (shouldRunLocalMigrate(config)) {
-    run("bun", ["run", "migrate"], { cwd });
+  for (const command of buildLocalPreparationCommands(config)) {
+    run(command.command, command.args, { cwd });
   }
   await mkdir(join(cwd, ".service"), { recursive: true });
   const child = Bun.spawn(["sh", "-c", "exec bun run dev > .service/local-dev.log 2>&1 < /dev/null"], {
@@ -74,8 +74,14 @@ async function startLocalDevelopment(config: Pick<ScaffoldConfig, "target">, cwd
   await Bun.write(join(cwd, ".service", "local-dev.pid"), `${child.pid}\n`);
 }
 
-export function shouldRunLocalMigrate(config: Pick<ScaffoldConfig, "target">) {
-  return config.target !== "workers";
+export function buildLocalPreparationCommands(config: Pick<ScaffoldConfig, "target">): PostScaffoldCommand[] {
+  if (config.target === "workers") {
+    return [
+      { command: "bun", args: ["run", "./scripts/ensure-local-db.ts"] },
+      { command: "bun", args: ["run", "migrate"] },
+    ];
+  }
+  return [{ command: "bun", args: ["run", "migrate"] }];
 }
 
 function runWithRetries(command: PostScaffoldCommand, options: CommandOptions, attempts: number, delayMs: number) {
@@ -129,15 +135,16 @@ function workersProtectedVerificationCommand(host: string, tokenCommand: string)
 
 function workersCurlScript(host: string, path: string, flags: string[] = []) {
   const url = `https://${host}${path}`;
+  const curl = ["curl --fail --show-error --silent", ...flags, `"${url}"`].join(" ");
+  const resolvedCurl = ["curl --fail --show-error --silent", `--resolve "${host}:443:$IP"`, ...flags, `"${url}"`].join(" ");
   return [
-    `IP="$(dig @1.1.1.1 +short ${host} | head -n 1)"`,
-    "&&",
-    'test -n "$IP"',
-    "&&",
-    "curl --fail --show-error --silent",
-    `--resolve "${host}:443:$IP"`,
-    ...flags,
-    `"${url}"`,
+    `(${curl})`,
+    "||",
+    `for IP in $(dig @1.1.1.1 +short ${host}); do`,
+    `${resolvedCurl}`,
+    "&& exit 0;",
+    "done;",
+    "exit 1",
   ].join(" ");
 }
 

package/src/scaffold.test.ts

@@ -307,7 +307,7 @@ test("scaffolds the workers target with wrangler lifecycle commands", async () =
 
   const packageJson = await Bun.file(join(generatedRoot, "package.json")).text();
   expect(packageJson).toContain('"@anmho/authctl": "0.1.1"');
-  expect(packageJson).toContain('"dev": "wrangler dev"');
+  expect(packageJson).toContain('"dev": "bun run ./scripts/dev.ts wrangler dev"');
   expect(packageJson).toContain('"service": "service"');
   expect(packageJson).toContain('"auth": "service auth"');
   expect(packageJson).toContain('"wrangler"');
@@ -320,6 +320,9 @@ test("scaffolds the workers target with wrangler lifecycle commands", async () =
   expect(wranglerConfig).toContain('binding = "HYPERDRIVE"');
   expect(wranglerConfig).toContain('AUTH_ENABLED = "true"');
   expect(wranglerConfig).toContain('AUTH_AUDIENCE = "api://dns-api"');
+  const authSource = await Bun.file(join(generatedRoot, "src", "auth.ts")).text();
+  expect(authSource).toContain('alg === "EdDSA"');
+  expect(authSource).toContain('name: "Ed25519"');
 
   const entrypoint = await Bun.file(join(generatedRoot, "src", "index.ts")).text();
   expect(entrypoint).toContain("/v1/waitlist");

package/templates/shared/scripts/dev.ts

@@ -8,15 +8,20 @@ if (command.length === 0) {
 }
 
 await ensureLocalPostgres();
+const localEnv = await readLocalEnv();
+const env = {
+  ...Bun.env,
+  ...localEnv,
+};
+if (env.DATABASE_URL && !env.CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE) {
+  env.CLOUDFLARE_HYPERDRIVE_LOCAL_CONNECTION_STRING_HYPERDRIVE = env.DATABASE_URL;
+}
 
 const child = Bun.spawn(command, {
   stdin: "inherit",
   stdout: "inherit",
   stderr: "inherit",
-  env: {
-    ...Bun.env,
-    ...(await readLocalEnv()),
-  },
+  env,
 });
 
 process.exit(await child.exited);

package/templates/targets/workers/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "wrangler dev",
+    "dev": "bun run ./scripts/dev.ts wrangler dev",
     "service": "service",
     "migrate": "service migrate",
     "seed": "service seed",

package/templates/targets/workers/src/auth.ts

@@ -132,6 +132,12 @@ function importAlgorithm(alg: string, key: JsonWebKey) {
       verify: { name: "ECDSA", hash: "SHA-256" },
     } as const;
   }
+  if (alg === "EdDSA" && key.crv === "Ed25519") {
+    return {
+      import: { name: "Ed25519" },
+      verify: { name: "Ed25519" },
+    } as const;
+  }
   throw new Error(`unsupported jwt alg: ${alg}`);
 }