wrangler 0.0.0-ece06ea → 0.0.0-eebdb6c

package/src/api/worker.ts

@@ -62,22 +62,40 @@ export interface CfModule {
   type?: CfModuleType;
 }
 
+/**
+ * A map of variable names to values.
+ */
+interface CfVars {
+  [key: string]: string;
+}
+
 /**
  * A KV namespace.
  */
-export interface CfKvNamespace {
-  /**
-   * The namespace ID.
-   */
-  namespaceId: string;
+interface CfKvNamespace {
+  binding: string;
+  id: string;
 }
 
-export interface CfDurableObject {
+/**
+ * A Durable Object.
+ */
+interface CfDurableObject {
+  name: string;
   class_name: string;
   script_name?: string;
 }
 
-interface CfDOMigrations {
+/**
+ * A Service.
+ */
+interface CfService {
+  name: string;
+  service: string;
+  environment: string;
+}
+
+export interface CfDurableObjectMigrations {
   old_tag?: string;
   new_tag: string;
   steps: {
@@ -87,35 +105,6 @@ interface CfDOMigrations {
   }[];
 }
 
-/**
- * A `WebCrypto` key.
- *
- * @link https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/importKey
- */
-export interface CfCryptoKey {
-  /**
-   * The format.
-   */
-  format: string;
-  /**
-   * The algorithm.
-   */
-  algorithm: string;
-  /**
-   * The usages.
-   */
-  usages: string[];
-  /**
-   * The data.
-   */
-  data: BufferSource | JsonWebKey;
-}
-
-/**
- * A variable (aka. environment variable).
- */
-export type CfVariable = string | CfKvNamespace | CfCryptoKey | CfDurableObject;
-
 /**
  * Options for creating a `CfWorker`.
  */
@@ -123,7 +112,7 @@ export interface CfWorkerInit {
   /**
    * The name of the worker.
    */
-  name: string;
+  name: string | void;
   /**
    * The entrypoint module.
    */
@@ -133,10 +122,15 @@ export interface CfWorkerInit {
    */
   modules: void | CfModule[];
   /**
-   * The map of names to variables. (aka. environment variables)
+   * All the bindings
    */
-  variables?: { [name: string]: CfVariable };
-  migrations: void | CfDOMigrations;
+  bindings: {
+    kv_namespaces?: CfKvNamespace[];
+    durable_objects?: { bindings: CfDurableObject[] };
+    vars?: CfVars;
+    services?: CfService[];
+  };
+  migrations: void | CfDurableObjectMigrations;
   compatibility_date: string | void;
   compatibility_flags: void | string[];
   usage_model: void | "bundled" | "unbound";

package/src/cfetch/index.ts

@@ -0,0 +1,103 @@
+import type { RequestInit } from "node-fetch";
+import { URLSearchParams } from "url";
+import { fetchInternal } from "./internal";
+
+// Check out https://api.cloudflare.com/ for API docs.
+
+export { CF_API_BASE_URL } from "./internal";
+
+export interface FetchError {
+  code: number;
+  message: string;
+}
+export interface FetchResult<ResponseType = unknown> {
+  success: boolean;
+  result: ResponseType;
+  errors: FetchError[];
+  messages: string[];
+  result_info?: unknown;
+}
+
+/**
+ * Make a fetch request for a raw JSON value.
+ */
+export async function fetchRaw<ResponseType>(
+  resource: string,
+  init: RequestInit = {},
+  queryParams?: URLSearchParams
+): Promise<ResponseType> {
+  return fetchInternal<ResponseType>(resource, init, queryParams);
+}
+
+/**
+ * Make a fetch request, and extract the `result` from the JSON response.
+ */
+export async function fetchResult<ResponseType>(
+  resource: string,
+  init: RequestInit = {},
+  queryParams?: URLSearchParams
+): Promise<ResponseType> {
+  const json = await fetchInternal<FetchResult<ResponseType>>(
+    resource,
+    init,
+    queryParams
+  );
+  if (json.success) {
+    return json.result;
+  } else {
+    throwFetchError(resource, json);
+  }
+}
+
+/**
+ * Make a fetch request for a list of values,
+ * extracting the `result` from the JSON response,
+ * and repeating the request if the results are paginated.
+ */
+export async function fetchListResult<ResponseType>(
+  resource: string,
+  init: RequestInit = {},
+  queryParams?: URLSearchParams
+): Promise<ResponseType[]> {
+  const results: ResponseType[] = [];
+  let getMoreResults = true;
+  let cursor: string | undefined;
+  while (getMoreResults) {
+    if (cursor) {
+      queryParams = new URLSearchParams(queryParams);
+      queryParams.set("cursor", cursor);
+    }
+    const json = await fetchInternal<FetchResult<ResponseType[]>>(
+      resource,
+      init,
+      queryParams
+    );
+    if (json.success) {
+      results.push(...json.result);
+      if (hasCursor(json.result_info)) {
+        cursor = json.result_info?.cursor;
+      } else {
+        getMoreResults = false;
+      }
+    } else {
+      throwFetchError(resource, json);
+    }
+  }
+  return results;
+}
+
+function throwFetchError(
+  resource: string,
+  response: FetchResult<unknown>
+): never {
+  response.messages.forEach((message) => console.warn(message));
+  const errors = response.errors
+    .map((error) => `${error.code}: ${error.message}`)
+    .join("\n");
+  throw new Error(`Failed to fetch ${resource} - ${errors}`);
+}
+
+function hasCursor(result_info: unknown): result_info is { cursor: string } {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return (result_info as any)?.cursor !== undefined;
+}

package/src/cfetch/internal.ts

@@ -0,0 +1,69 @@
+import fetch from "node-fetch";
+import type { RequestInit, HeadersInit } from "node-fetch";
+import { getAPIToken, loginOrRefreshIfRequired } from "../user";
+
+export const CF_API_BASE_URL =
+  process.env.CF_API_BASE_URL || "https://api.cloudflare.com/client/v4";
+
+/**
+ * Make a fetch request to the Cloudflare API.
+ *
+ * This function handles acquiring the API token and logging the caller in, as necessary.
+ *
+ * Check out https://api.cloudflare.com/ for API docs.
+ *
+ * This function should not be used directly, instead use the functions in `cfetch/index.ts`.
+ */
+export async function fetchInternal<ResponseType>(
+  resource: string,
+  init: RequestInit = {},
+  queryParams?: URLSearchParams
+): Promise<ResponseType> {
+  await requireLoggedIn();
+  const apiToken = requireApiToken();
+  const headers = cloneHeaders(init.headers);
+  addAuthorizationHeader(headers, apiToken);
+
+  const queryString = queryParams ? `?${queryParams.toString()}` : "";
+  const response = await fetch(`${CF_API_BASE_URL}${resource}${queryString}`, {
+    method: "GET",
+    ...init,
+    headers,
+  });
+
+  if (response.ok) {
+    return (await response.json()) as ResponseType;
+  } else {
+    throw new Error(
+      `Failed to fetch ${resource} - ${response.status}: ${response.statusText}`
+    );
+  }
+}
+
+async function requireLoggedIn(): Promise<void> {
+  const loggedIn = await loginOrRefreshIfRequired();
+  if (!loggedIn) {
+    throw new Error("Not logged in.");
+  }
+}
+
+function requireApiToken(): string {
+  const apiToken = getAPIToken();
+  if (!apiToken) {
+    throw new Error("No API token found.");
+  }
+  return apiToken;
+}
+
+function cloneHeaders(headers: HeadersInit): HeadersInit {
+  return { ...headers };
+}
+
+function addAuthorizationHeader(headers: HeadersInit, apiToken: string): void {
+  if (headers["Authorization"]) {
+    throw new Error(
+      "The request already specifies an authorisation header - cannot add a new one."
+    );
+  }
+  headers["Authorization"] = `Bearer ${apiToken}`;
+}

package/src/cli.ts

@@ -1,10 +1,9 @@
+import { hideBin } from "yargs/helpers";
 import { main } from ".";
 
-main(process.argv.slice(2)).catch((cause) => {
-  const { name, message } = cause;
-  if (name === "CloudflareError") {
-    console.error("\x1b[31m", message);
-    return;
-  }
-  throw cause;
+main(hideBin(process.argv)).catch(() => {
+  // The logging of any error that was thrown from `main()` is handled in the `yargs.fail()` handler.
+  // Here we just want to ensure that the process exits with a non-zero code.
+  // We don't want to do this inside the `main()` function, since that would kill the process when running our tests.
+  process.exit(1);
 });

package/src/config.ts

@@ -1,7 +1,7 @@
 // we're going to manually write both the type definition AND
 // the validator for the config, so that we can give better error messages
 
-type DOMigration = {
+type DurableObjectMigration = {
   tag: string;
   new_classes?: string[];
   renamed_classes?: string[];
@@ -25,13 +25,13 @@ type Dev = {
   upstream_protocol?: string;
 };
 
-type Vars = { [key: string]: string };
+export type Vars = { [key: string]: string };
 
 type Cron = string; // TODO: we should be able to parse a cron pattern with ts
 
 type KVNamespace = {
-  binding?: string;
-  preview_id: string;
+  binding: string;
+  preview_id?: string;
   id: string;
 };
 
@@ -41,6 +41,12 @@ type DurableObject = {
   script_name?: string;
 };
 
+type Service = {
+  name: string;
+  service: string;
+  environment: string;
+};
+
 type Build = {
   command?: string;
   cwd?: string;
@@ -81,12 +87,13 @@ type Env = {
   site?: Site;
   jsx_factory?: string; // inherited
   jsx_fragment?: string; // inherited
-  polyfill_node?: boolean; //inherited
   // we should use typescript to parse cron patterns
   triggers?: { crons: Cron[] }; // inherited
   vars?: Vars;
   durable_objects?: { bindings: DurableObject[] };
   kv_namespaces?: KVNamespace[];
+  experimental_services?: Service[];
+  migrations?: DurableObjectMigration[];
   usage_model?: UsageModel; // inherited
 };
 
@@ -108,11 +115,11 @@ export type Config = {
   webpack_config?: string; // inherited
   jsx_factory?: string; // inherited
   jsx_fragment?: string; // inherited
-  polyfill_node?: boolean; //inherited
   vars?: Vars;
-  migrations?: DOMigration[];
   durable_objects?: { bindings: DurableObject[] };
   kv_namespaces?: KVNamespace[];
+  experimental_services?: Service[];
+  migrations?: DurableObjectMigration[];
   site?: Site; // inherited
   // we should use typescript to parse cron patterns
   triggers?: { crons: Cron[] }; // inherited