create-svc 0.1.43 → 0.1.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-svc",
-  "version": "0.1.43",
+  "version": "0.1.45",
   "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)" && 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"',
       ],
     });
   });

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,30 @@ 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}`;
+  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}"`,
+  ].join(" ");
+}
+
 export function buildLocalVerificationCommands(
   config: Pick<ScaffoldConfig, "apiHostname" | "framework" | "runtime"> & Partial<Pick<ScaffoldConfig, "target">>
 ): PostScaffoldCommand[] {

package/src/scaffold.test.ts

@@ -316,7 +316,7 @@ test("scaffolds the workers target with wrangler lifecycle commands", async () =
   const wranglerConfig = await Bun.file(join(generatedRoot, "wrangler.toml")).text();
   expect(wranglerConfig).toContain('name = "dns-api"');
   expect(wranglerConfig).toContain('compatibility_flags = ["nodejs_compat"]');
-  expect(wranglerConfig).toContain('pattern = "api.dns-api.anmho.com/*"');
+  expect(wranglerConfig).toContain('pattern = "api.dns-api.anmho.com"');
   expect(wranglerConfig).toContain('binding = "HYPERDRIVE"');
   expect(wranglerConfig).toContain('AUTH_ENABLED = "true"');
   expect(wranglerConfig).toContain('AUTH_AUDIENCE = "api://dns-api"');

package/src/service-runtime/workers/cli.ts

@@ -452,7 +452,7 @@ async function runDoctor() {
     if (!text.includes(`name = "${config.serviceName}"`)) {
       throw new Error(`wrangler.toml does not name ${config.serviceName}`);
     }
-    if (!text.includes(`pattern = "${config.hostname}/*"`)) {
+    if (!text.includes(`pattern = "${config.hostname}"`)) {
       throw new Error(`wrangler.toml does not route ${config.hostname}`);
     }
     return "name and custom domain route configured";

package/templates/targets/workers/wrangler.toml

@@ -16,7 +16,7 @@ AUTH_JWKS_URL = "{{AUTH_JWKS_URL}}"
 crons = ["*/15 * * * *"]
 
 [[routes]]
-pattern = "{{API_HOSTNAME}}/*"
+pattern = "{{API_HOSTNAME}}"
 custom_domain = true
 
 [[hyperdrive]]