wrangler 0.0.0-ece06ea → 0.0.0-eebdb6c

package/src/__tests__/mock-cfetch.js

@@ -1,46 +0,0 @@
-// This file mocks ../cfetch.ts
-// so we can insert whatever responses we want from it
-
-const pathToRegexp = require("path-to-regexp");
-// TODO: add jsdoc style types here
-
-// type MockHandler = (resource: string, init?: RequestInit) => any; // TODO: use a generic here
-
-let mocks = [];
-
-function mockCfetch(resource, init) {
-  for (const { regexp, handler } of mocks) {
-    if (regexp.test(resource)) {
-      return handler(resource, init); // should we have some kind of fallthrough system? we'll see.
-    }
-  }
-  throw new Error(`no mocks found for ${resource}`);
-}
-
-function setMock(resource, handler) {
-  const mock = {
-    resource,
-    handler,
-    regexp: pathToRegexp(resource),
-  };
-  mocks.push(mock);
-  return () => {
-    mocks = mocks.filter((x) => x !== mock);
-  };
-}
-
-function unsetAllMocks() {
-  mocks = [];
-}
-
-const CF_API_BASE_URL =
-  process.env.CF_API_BASE_URL || "https://api.cloudflare.com/client/v4";
-
-Object.assign(module.exports, {
-  __esModule: true,
-  default: mockCfetch,
-  mockCfetch,
-  setMock,
-  unsetAllMocks,
-  CF_API_BASE_URL,
-});

package/src/cfetch.ts

@@ -1,72 +0,0 @@
-import fetch from "node-fetch";
-import type { RequestInit } from "node-fetch";
-import { getAPIToken } from "./user";
-import { loginOrRefreshIfRequired } from "./user";
-
-export const CF_API_BASE_URL =
-  process.env.CF_API_BASE_URL || "https://api.cloudflare.com/client/v4";
-
-export default async function fetchWithAuthAndLoginIfRequired<ResponseType>(
-  resource: string,
-  init: RequestInit = {}
-): Promise<ResponseType> {
-  const loggedIn = await loginOrRefreshIfRequired();
-  if (!loggedIn) {
-    throw new Error("Not logged in");
-  }
-  const apiToken = getAPIToken();
-  if (!apiToken) {
-    throw new Error("No API token found");
-  }
-  // @ts-expect-error Authorization isn't non HeadersInit, annoyingly
-  if (init.headers?.Authorization) {
-    throw new Error(
-      "fetchWithAuthAndLoginIfRequired will not add an authorisation header a request that already specifies it"
-    );
-  }
-  // should I bother with response code?
-  // maybe I can just throw the json error?
-
-  const response = await fetch(`${CF_API_BASE_URL}${resource}`, {
-    method: "GET",
-    ...init,
-    headers: {
-      ...(init.headers || {}),
-      Authorization: `Bearer ${apiToken}`,
-    },
-  });
-  const text = await response.text();
-  let json;
-  try {
-    json = JSON.parse(text);
-  } catch (parseError) {
-    // hate this edge case
-    // the only api call I know that doesn't return json is kv:key get <key>
-
-    // maybe it's a plain response
-    if (response.ok) {
-      // @ts-expect-error bleh
-      return text;
-    } else {
-      // UGH.
-      throw new Error(`${response.status}: ${response.statusText}`);
-    }
-  }
-
-  if (json.success) {
-    return json.result;
-  } else {
-    const errorDesc = json.errors?.[0];
-    if (errorDesc) {
-      // TODO: map .message to real human readable strings
-      const error = new Error(`${errorDesc.code}: ${errorDesc.message}`);
-      // @ts-expect-error hacksss
-      error.code = errorDesc.code;
-      throw error;
-    } else {
-      // This should almost never happen.
-      // ... which means it'll probably happen, lol.
-      throw new Error(`${response.status}: ${response.statusText}`);
-    }
-  }
-}

package/src/util/fetch.ts

@@ -1,74 +0,0 @@
-import fetch, { Headers } from "node-fetch";
-import type { Response, HeadersInit, RequestInit } from "node-fetch";
-
-/**
- * A `fetch()` function.
- *
- * @link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
- */
-export type Fetch = (input: string, init?: RequestInit) => Promise<Response>;
-
-/**
- * Default options for creating a `fetch()` function.
- */
-export interface FetchInit {
-  /**
-   * The host.
-   */
-  host?: string;
-  /**
-   * The user agent.
-   */
-  userAgent?: string;
-  /**
-   * The header map.
-   */
-  headers?: HeadersInit;
-}
-
-/**
- * Creates a custom `fetch()` function.
- */
-export function fetchIt(init: FetchInit = {}): Fetch {
-  const { host, headers: headersInit, userAgent } = init;
-
-  return async (input: string, init: RequestInit = {}) => {
-    if (input.startsWith("/")) {
-      input = `https://${host}${input}`;
-    }
-
-    const headers = new Headers(headersInit);
-    if (userAgent) {
-      headers.set("User-Agent", userAgent);
-    }
-    for (const [name, value] of new Headers(init.headers).entries()) {
-      headers.set(name, value);
-    }
-    init.headers = headers;
-
-    return fetch(input, init);
-  };
-}
-
-/**
- * A `fetch()` function that outputs a JSON response.
- */
-export type FetchJson = <T>(input: string, init?: RequestInit) => Promise<T>;
-
-/**
- * Creates a custom `fetch()` function for JSON responses.
- */
-export function fetchJson(init?: FetchInit): FetchJson {
-  const fetch = fetchIt(init);
-
-  return async (input: string, init: RequestInit = {}) => {
-    const response = await fetch(input, init);
-    const text = await response.text();
-
-    try {
-      return JSON.parse(text);
-    } catch (cause) {
-      throw new Error("Expected a JSON response, but instead got: " + text);
-    }
-  };
-}