create-svc 0.1.44 → 0.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.44",
+  "version": "0.1.47",
   "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

@@ -115,7 +115,7 @@ describe("buildDeploymentVerificationCommands", () => {
     });
   });
 
-  test("uses the workers service CLI for protected workers verification", () => {
+  test("uses public DNS resolution for Workers production verification", () => {
     expect(
       buildDeploymentVerificationCommands({
         target: "workers",
@@ -127,7 +127,7 @@ describe("buildDeploymentVerificationCommands", () => {
       command: "sh",
       args: [
         "-c",
-        'TOKEN="$(service auth token)" && curl --fail --show-error --silent -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

@@ -98,6 +98,16 @@ export function buildDeploymentVerificationCommands(
   config: Pick<ScaffoldConfig, "apiHostname" | "framework" | "runtime"> &
     Partial<Pick<ScaffoldConfig, "target" | "serviceName" | "gcpProject" | "region">>
 ): PostScaffoldCommand[] {
+  if (config.target === "workers") {
+    const host = config.apiHostname;
+    const tokenCommand = 'TOKEN="$(service auth token)"';
+    return [
+      workersCurlCommand(host, "/"),
+      workersCurlCommand(host, "/readyz"),
+      workersProtectedVerificationCommand(host, tokenCommand),
+    ];
+  }
+
   const origin = verificationOrigin(config);
   const tokenCommand = 'TOKEN="$(service auth token)"';
   return [
@@ -107,6 +117,31 @@ export function buildDeploymentVerificationCommands(
   ];
 }
 
+function workersCurlCommand(host: string, path: string): PostScaffoldCommand {
+  return shellVerificationCommand(workersCurlScript(host, path));
+}
+
+function workersProtectedVerificationCommand(host: string, tokenCommand: string): PostScaffoldCommand {
+  return shellVerificationCommand(
+    `${tokenCommand} && ${workersCurlScript(host, "/v1/admin/waitlist?limit=1", ['-H "Authorization: Bearer $TOKEN"'])}`
+  );
+}
+
+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 [
+    `(${curl})`,
+    "||",
+    `for IP in $(dig @1.1.1.1 +short ${host}); do`,
+    `${resolvedCurl}`,
+    "&& exit 0;",
+    "done;",
+    "exit 1",
+  ].join(" ");
+}
+
 export function buildLocalVerificationCommands(
   config: Pick<ScaffoldConfig, "apiHostname" | "framework" | "runtime"> & Partial<Pick<ScaffoldConfig, "target">>
 ): PostScaffoldCommand[] {

package/src/scaffold.test.ts

@@ -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/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}`);
 }