@hasna/shortlinks 0.1.1 → 0.1.2

package/README.md

@@ -96,7 +96,7 @@ shortlinks cloudflare worker \
   --origin https://shortlinks.hasna.xyz
 ```
 
-Upsert DNS when `CLOUDFLARE_API_TOKEN` is available:
+Upsert DNS when `CLOUDFLARE_API_TOKEN` is available. Global API key auth is also supported with `CLOUDFLARE_API_KEY` plus `CLOUDFLARE_EMAIL`.
 
 ```bash
 shortlinks cloudflare dns has.na --target shortlinks.hasna.xyz

package/dist/cli/index.js

@@ -3224,11 +3224,25 @@ SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
 `);
   return { workerPath, wranglerPath };
 }
+function cloudflareAuthHeaders(token) {
+  const apiToken = token || process.env.CLOUDFLARE_API_TOKEN;
+  if (apiToken)
+    return { authorization: `Bearer ${apiToken}` };
+  const apiKey = process.env.CLOUDFLARE_API_KEY;
+  const email = process.env.CLOUDFLARE_EMAIL;
+  if (apiKey && email) {
+    return {
+      "x-auth-key": apiKey,
+      "x-auth-email": email
+    };
+  }
+  throw new Error("Cloudflare auth is required: set CLOUDFLARE_API_TOKEN, or CLOUDFLARE_API_KEY plus CLOUDFLARE_EMAIL.");
+}
 async function cloudflareRequest(token, path, init = {}) {
   const response = await fetch(`https://api.cloudflare.com/client/v4${path}`, {
     ...init,
     headers: {
-      authorization: `Bearer ${token}`,
+      ...cloudflareAuthHeaders(token),
       "content-type": "application/json",
       ...init.headers || {}
     }
@@ -3266,8 +3280,6 @@ async function upsertCloudflareDnsRecord(options) {
   });
   if (options.dryRun)
     return plan;
-  if (!token)
-    throw new Error("CLOUDFLARE_API_TOKEN is required unless --dry-run is used.");
   const zoneId = options.zoneId || await findCloudflareZoneId(plan.hostname, token);
   const existing = await cloudflareRequest(token, `/zones/${zoneId}/dns_records?type=CNAME&name=${encodeURIComponent(plan.hostname)}`);
   const payload = JSON.stringify(plan.dnsRecord);
@@ -3832,6 +3844,8 @@ program2.command("doctor").description("Check local shortlinks tooling and integ
       },
       environment: {
         cloudflare_api_token_present: Boolean(process.env.CLOUDFLARE_API_TOKEN),
+        cloudflare_api_key_present: Boolean(process.env.CLOUDFLARE_API_KEY),
+        cloudflare_email_present: Boolean(process.env.CLOUDFLARE_EMAIL),
         shortlinks_origin_present: Boolean(process.env.SHORTLINKS_ORIGIN)
       }
     };

package/dist/cloudflare.d.ts

@@ -36,7 +36,7 @@ export declare function writeWorkerFiles(options?: {
     workerPath: string;
     wranglerPath: string;
 };
-export declare function findCloudflareZoneId(hostname: string, token: string): Promise<string>;
+export declare function findCloudflareZoneId(hostname: string, token?: string): Promise<string>;
 export declare function upsertCloudflareDnsRecord(options: CloudflareDnsOptions): Promise<CloudflareSetupPlan | {
     id: string;
     action: "created" | "updated";

package/dist/cloudflare.js

@@ -87,11 +87,25 @@ SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
 `);
   return { workerPath, wranglerPath };
 }
+function cloudflareAuthHeaders(token) {
+  const apiToken = token || process.env.CLOUDFLARE_API_TOKEN;
+  if (apiToken)
+    return { authorization: `Bearer ${apiToken}` };
+  const apiKey = process.env.CLOUDFLARE_API_KEY;
+  const email = process.env.CLOUDFLARE_EMAIL;
+  if (apiKey && email) {
+    return {
+      "x-auth-key": apiKey,
+      "x-auth-email": email
+    };
+  }
+  throw new Error("Cloudflare auth is required: set CLOUDFLARE_API_TOKEN, or CLOUDFLARE_API_KEY plus CLOUDFLARE_EMAIL.");
+}
 async function cloudflareRequest(token, path, init = {}) {
   const response = await fetch(`https://api.cloudflare.com/client/v4${path}`, {
     ...init,
     headers: {
-      authorization: `Bearer ${token}`,
+      ...cloudflareAuthHeaders(token),
       "content-type": "application/json",
       ...init.headers || {}
     }
@@ -129,8 +143,6 @@ async function upsertCloudflareDnsRecord(options) {
   });
   if (options.dryRun)
     return plan;
-  if (!token)
-    throw new Error("CLOUDFLARE_API_TOKEN is required unless --dry-run is used.");
   const zoneId = options.zoneId || await findCloudflareZoneId(plan.hostname, token);
   const existing = await cloudflareRequest(token, `/zones/${zoneId}/dns_records?type=CNAME&name=${encodeURIComponent(plan.hostname)}`);
   const payload = JSON.stringify(plan.dnsRecord);

package/dist/index.js

@@ -656,11 +656,25 @@ SHORTLINKS_ORIGIN = "${options.origin || "https://shortlinks.example.com"}"
 `);
   return { workerPath, wranglerPath };
 }
+function cloudflareAuthHeaders(token) {
+  const apiToken = token || process.env.CLOUDFLARE_API_TOKEN;
+  if (apiToken)
+    return { authorization: `Bearer ${apiToken}` };
+  const apiKey = process.env.CLOUDFLARE_API_KEY;
+  const email = process.env.CLOUDFLARE_EMAIL;
+  if (apiKey && email) {
+    return {
+      "x-auth-key": apiKey,
+      "x-auth-email": email
+    };
+  }
+  throw new Error("Cloudflare auth is required: set CLOUDFLARE_API_TOKEN, or CLOUDFLARE_API_KEY plus CLOUDFLARE_EMAIL.");
+}
 async function cloudflareRequest(token, path, init = {}) {
   const response = await fetch(`https://api.cloudflare.com/client/v4${path}`, {
     ...init,
     headers: {
-      authorization: `Bearer ${token}`,
+      ...cloudflareAuthHeaders(token),
       "content-type": "application/json",
       ...init.headers || {}
     }
@@ -698,8 +712,6 @@ async function upsertCloudflareDnsRecord(options) {
   });
   if (options.dryRun)
     return plan;
-  if (!token)
-    throw new Error("CLOUDFLARE_API_TOKEN is required unless --dry-run is used.");
   const zoneId = options.zoneId || await findCloudflareZoneId(plan.hostname, token);
   const existing = await cloudflareRequest(token, `/zones/${zoneId}/dns_records?type=CNAME&name=${encodeURIComponent(plan.hostname)}`);
   const payload = JSON.stringify(plan.dnsRecord);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/shortlinks",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "CLI-only shortlink manager for custom domains, click tracking, Cloudflare setup, and @hasna cloud sync",
   "type": "module",
   "main": "dist/index.js",