wrangler 0.0.0-e5d3690 → 0.0.0-e60a675d

package/src/sites.tsx

@@ -1,243 +0,0 @@
-import * as path from "node:path";
-import { readdir, readFile, stat } from "node:fs/promises";
-import ignore from "ignore";
-import { XXHash64 } from "xxhash-addon";
-import { fetchResult } from "./cfetch";
-import type { Config } from "./config";
-import { listNamespaceKeys, listNamespaces, putBulkKeyValue } from "./kv";
-
-/** Paths to always ignore. */
-const ALWAYS_IGNORE = ["node_modules"];
-const HIDDEN_FILES_TO_INCLUDE = [
-  ".well-known", // See https://datatracker.ietf.org/doc/html/rfc8615
-];
-
-async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
-  const files = await readdir(dirPath, { withFileTypes: true });
-  for (const file of files) {
-    // Skip files that we never want to process.
-    if (ALWAYS_IGNORE.some((p) => file.name === p)) {
-      continue;
-    }
-    // Skip hidden files (starting with .) except for some special ones
-    if (
-      file.name.startsWith(".") &&
-      !HIDDEN_FILES_TO_INCLUDE.some((p) => file.name === p)
-    ) {
-      continue;
-    }
-    // TODO: follow symlinks??
-    if (file.isDirectory()) {
-      yield* await getFilesInFolder(path.join(dirPath, file.name));
-    } else {
-      yield path.join(dirPath, file.name);
-    }
-  }
-}
-
-/**
- * Create a hash key for the given content using the xxhash algorithm.
- *
- * Note we only return the first 10 characters, since we will also include the file name in the asset manifest key
- * the most important thing here is to detect changes of a single file to invalidate the cache and
- * it's impossible to serve two different files with the same name
- */
-function hashFileContent(content: string): string {
-  const hasher = new XXHash64();
-  hasher.update(Buffer.from(content));
-  const hash = hasher.digest();
-  return hash.toString("hex").substring(0, 10);
-}
-
-/**
- * Create a hashed asset key for the given asset.
- *
- * The key will change if the file path or content of the asset changes.
- * The algorithm used here matches that of Wrangler 1.
- */
-function hashAsset(filePath: string, content: string): string {
-  const extName = path.extname(filePath) || "";
-  const baseName = path.basename(filePath, extName);
-  const directory = path.dirname(filePath);
-  const hash = hashFileContent(content);
-  return urlSafe(path.join(directory, `${baseName}.${hash}${extName}`));
-}
-
-async function createKVNamespaceIfNotAlreadyExisting(
-  title: string,
-  accountId: string
-) {
-  // check if it already exists
-  // TODO: this is super inefficient, should be made better
-  const namespaces = await listNamespaces(accountId);
-  const found = namespaces.find((x) => x.title === title);
-  if (found) {
-    return { created: false, id: found.id };
-  }
-
-  // else we make the namespace
-  // TODO: use an export from ./kv
-  const json = await fetchResult<{ id: string }>(
-    `/accounts/${accountId}/storage/kv/namespaces`,
-    {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify({ title }),
-    }
-  );
-
-  return {
-    created: true,
-    id: json.id,
-  };
-}
-
-/**
- * Upload the assets found within the `dirPath` directory to the sites assets KV namespace for
- * the worker given by `scriptName`.
- *
- * @param accountId the account to upload to.
- * @param scriptName the name of the worker whose assets we are uploading.
- * @param siteAssets an objects describing what assets to upload, or undefined if there are no assets to upload.
- * @param preview if true then upload to a "preview" KV namespace.
- * @param _env (not implemented).
- * @returns a promise for an object mapping the relative paths of the assets to the key of that
- * asset in the KV namespace.
- */
-export async function syncAssets(
-  accountId: string,
-  scriptName: string,
-  siteAssets: AssetPaths | undefined,
-  preview: boolean,
-  _env?: string
-): Promise<{
-  manifest: { [filePath: string]: string } | undefined;
-  namespace: string | undefined;
-}> {
-  if (siteAssets === undefined) {
-    return { manifest: undefined, namespace: undefined };
-  }
-
-  const title = `__${scriptName}_sites_assets${preview ? "_preview" : ""}`;
-  const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
-    title,
-    accountId
-  );
-
-  // let's get all the keys in this namespace
-  const result = await listNamespaceKeys(accountId, namespace);
-  const keys = new Set(result.map((x) => x.name));
-
-  const manifest = {};
-  const upload: {
-    key: string;
-    value: string;
-    base64: boolean;
-  }[] = [];
-
-  const include = createPatternMatcher(siteAssets.includePatterns, false);
-  const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
-  // TODO: this can be more efficient by parallelising
-  for await (const file of getFilesInFolder(siteAssets.baseDirectory)) {
-    if (!include(file)) {
-      continue;
-    }
-    if (exclude(file)) {
-      continue;
-    }
-
-    await validateAssetSize(file);
-    console.log(`reading ${file}...`);
-    const content = await readFile(file, "base64");
-
-    const assetKey = hashAsset(file, content);
-    validateAssetKey(assetKey);
-
-    // now put each of the files into kv
-    if (!keys.has(assetKey)) {
-      console.log(`uploading as ${assetKey}...`);
-      upload.push({
-        key: assetKey,
-        value: content,
-        base64: true,
-      });
-    } else {
-      console.log(`skipping - already uploaded`);
-    }
-    manifest[path.relative(siteAssets.baseDirectory, file)] = assetKey;
-  }
-  await putBulkKeyValue(accountId, namespace, JSON.stringify(upload));
-  return { manifest, namespace };
-}
-
-function createPatternMatcher(
-  patterns: string[],
-  exclude: boolean
-): (filePath: string) => boolean {
-  if (patterns.length === 0) {
-    return (_filePath) => !exclude;
-  } else {
-    const ignorer = ignore().add(patterns);
-    return (filePath) => ignorer.test(filePath).ignored;
-  }
-}
-
-async function validateAssetSize(filePath: string) {
-  const { size } = await stat(filePath);
-  if (size > 25 * 1024 * 1024) {
-    throw new Error(
-      `File ${filePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
-    );
-  }
-}
-
-function validateAssetKey(assetKey: string) {
-  if (assetKey.length > 512) {
-    throw new Error(
-      `The asset path key "${assetKey}" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits",`
-    );
-  }
-}
-
-/**
- * Convert a filePath to be safe to use as a relative URL.
- *
- * Primarily this involves converting Windows backslashes to forward slashes.
- */
-function urlSafe(filePath: string): string {
-  return filePath.replace(/\\/g, "/");
-}
-
-/**
- * Information about the assets that should be uploaded
- */
-export interface AssetPaths {
-  baseDirectory: string;
-  includePatterns: string[];
-  excludePatterns: string[];
-}
-
-/**
- * Get an object that describes what assets to upload, if any.
- *
- * Uses the args (passed from the command line) if available,
- * falling back to those defined in the config.
- *
- * // TODO: Support for environments
- */
-export function getAssetPaths(
-  config: Config,
-  baseDirectory = config.site?.bucket,
-  includePatterns = config.site?.include ?? [],
-  excludePatterns = config.site?.exclude ?? []
-): undefined | AssetPaths {
-  return baseDirectory
-    ? {
-        baseDirectory,
-        includePatterns,
-        excludePatterns,
-      }
-    : undefined;
-}

package/src/tail.tsx

@@ -1,73 +0,0 @@
-import WebSocket from "ws";
-import { version as packageVersion } from "../package.json";
-import { fetchResult } from "./cfetch";
-
-export type TailApiResponse = {
-  id: string;
-  url: string;
-  expires_at: Date;
-};
-
-function makeCreateTailUrl(accountId: string, workerName: string): string {
-  return `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
-}
-
-function makeDeleteTailUrl(
-  accountId: string,
-  workerName: string,
-  tailId: string
-): string {
-  return `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
-}
-
-/// Creates a tail, but doesn't connect to it.
-async function createTailButDontConnect(
-  accountId: string,
-  workerName: string
-): Promise<TailApiResponse> {
-  const createTailUrl = makeCreateTailUrl(accountId, workerName);
-  /// https://api.cloudflare.com/#worker-tail-logs-start-tail
-  return await fetchResult<TailApiResponse>(createTailUrl, {
-    method: "POST",
-  });
-}
-
-export async function createTail(
-  accountId: string,
-  workerName: string,
-  _filters: Filters
-): Promise<{
-  tail: WebSocket;
-  expiration: Date;
-  deleteTail: () => Promise<void>;
-}> {
-  const {
-    id: tailId,
-    url: websocketUrl,
-    expires_at: expiration,
-  } = await createTailButDontConnect(accountId, workerName);
-  const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId);
-
-  // deletes the tail
-  async function deleteTail() {
-    await fetchResult(deleteUrl, { method: "DELETE" });
-  }
-
-  const tail = new WebSocket(websocketUrl, "trace-v1", {
-    headers: {
-      "Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
-      "User-Agent": `wrangler-js/${packageVersion}`,
-    },
-  });
-
-  // TODO: send filters as well
-  return { tail, expiration, deleteTail };
-}
-
-export type Filters = {
-  status?: "ok" | "error" | "canceled";
-  header?: string;
-  method?: string;
-  "sampling-rate"?: number;
-  search?: string;
-};