fix(cli): npx support

Author: tmm

.changeset/public-deserts-guess.md

@@ -0,0 +1,5 @@
+---
+'curl.md': patch
+---
+
+Fixed npx support

cli/src/cli.ts

@@ -27,11 +27,11 @@ const env = z.object({
 })
 
 const vars = z.object({
-  apiKey: z.custom<string | undefined>(),
-  baseUrl: z.custom<string>(),
-  client: z.custom<Client>(),
-  commands: z.custom<Command[]>(),
-  session: z.custom<Session.Data | null>(),
+  apiKey: z.custom<string>().optional(),
+  baseUrl: z.custom<string>().default(defaultBaseUrl),
+  client: z.custom<Client>().default(undefined as never),
+  commands: z.custom<Command[]>().default([]),
+  session: z.custom<Session.Data | null>().default(null),
 })
 
 const root = {

src/entry-server.ts

@@ -31,10 +31,23 @@ export default Sentry.withSentry<Env, QueueHandlerMessage>(
   {
     async fetch(request, env, ctx) {
       const url = new URL(request.url)
+
       const firstSegment = url.pathname.split('/')[1] ?? ''
+      const protocol =
+        request.headers.get('x-forwarded-proto') ??
+        (() => {
+          const cfVisitor = request.headers.get('cf-visitor')
+          if (!cfVisitor) return undefined
+          try {
+            return z.object({ scheme: z.string() }).parse(JSON.parse(cfVisitor)).scheme
+          } catch {
+            return undefined
+          }
+        })() ??
+        url.protocol.slice(0, -1)
 
       // Keep unauthenticated curl fetch paths working over HTTP, but enforce HTTPS elsewhere.
-      if (url.protocol === 'http:' && url.hostname === env.HOST) {
+      if (protocol === 'http' && url.hostname === env.HOST) {
         const isFetchPath = firstSegment.includes('.') || /^https?:$/.test(firstSegment)
         if (!isFetchPath) {
           url.protocol = 'https:'