wrangler 0.0.0-e1c615f → 0.0.0-e1d2fd668

package/src/cfetch/index.ts

@@ -1,102 +0,0 @@
-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 } {
-  return (result_info as { cursor } | undefined)?.cursor !== undefined;
-}

package/src/cfetch/internal.ts

@@ -1,69 +0,0 @@
-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,9 +0,0 @@
-import { hideBin } from "yargs/helpers";
-import { main } from ".";
-
-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,131 +0,0 @@
-// 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 DurableObjectMigration = {
-  tag: string;
-  new_classes?: string[];
-  renamed_classes?: string[];
-  deleted_classes?: string[];
-};
-
-type Project = "webpack" | "javascript" | "rust";
-
-type Site = {
-  // inherited
-  bucket: string;
-  "entry-point": string;
-  include?: string[];
-  exclude?: string[];
-};
-
-type Dev = {
-  ip?: string;
-  port?: number;
-  local_protocol?: string;
-  upstream_protocol?: 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;
-  id: string;
-};
-
-type DurableObject = {
-  name: string;
-  class_name: string;
-  script_name?: string;
-};
-
-type Service = {
-  name: string;
-  service: string;
-  environment: string;
-};
-
-type Build = {
-  command?: string;
-  cwd?: string;
-  watch_dir?: string;
-} & (
-  | {
-      upload?: {
-        format: "service-worker";
-        main: string;
-      };
-    }
-  | {
-      upload?: {
-        format: "modules";
-        dir?: string;
-        main?: string;
-        rules?: {
-          type: "ESModule" | "CommonJS" | "Text" | "Data" | "CompiledWasm";
-          globs: string[]; // can we use typescript for these patterns?
-          fallthrough?: boolean;
-        };
-      };
-    }
-);
-
-type UsageModel = "bundled" | "unbound";
-
-type Env = {
-  name?: string; // inherited
-  account_id?: string; // inherited
-  workers_dev?: boolean; // inherited
-  compatibility_date?: string; // inherited
-  compatibility_flags?: string[]; // inherited
-  zone_id?: string; // inherited
-  routes?: string[]; // inherited
-  route?: string; // inherited
-  webpack_config?: string; // inherited
-  site?: Site;
-  jsx_factory?: string; // inherited
-  jsx_fragment?: string; // 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
-};
-
-export type Config = {
-  name?: string; // inherited
-  account_id?: string; // inherited
-  // @deprecated Don't use this
-  type?: Project; // top level
-  compatibility_date?: string; // inherited
-  compatibility_flags?: string[]; // inherited
-  // -- there's some mutually exclusive logic for this next block,
-  // but I didn't bother for now
-  workers_dev?: boolean; // inherited
-  zone_id?: string; // inherited
-  routes?: string[]; // inherited
-  route?: string; // inherited
-  // -- end mutually exclusive stuff
-  // @deprecated Don't use this
-  webpack_config?: string; // inherited
-  jsx_factory?: string; // inherited
-  jsx_fragment?: string; // inherited
-  vars?: Vars;
-  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
-  dev?: Dev;
-  usage_model?: UsageModel; // inherited
-  // top level
-  build?: Build;
-  env?: { [envName: string]: void | Env };
-};