wrangler 0.0.0-e2f9bb2 → 0.0.0-e305903a

package/src/r2.ts

@@ -1,23 +1,26 @@
+import { Readable } from "node:stream";
 import { fetchResult } from "./cfetch";
+import { fetchR2Objects } from "./cfetch/internal";
+import type { HeadersInit } from "undici";
 
 /**
  * Information about a bucket, returned from `listR2Buckets()`.
  */
 export interface R2BucketInfo {
-  name: string;
-  creation_date: string;
+	name: string;
+	creation_date: string;
 }
 
 /**
  * Fetch a list of all the buckets under the given `accountId`.
  */
 export async function listR2Buckets(
-  accountId: string
+	accountId: string
 ): Promise<R2BucketInfo[]> {
-  const results = await fetchResult<{
-    buckets: R2BucketInfo[];
-  }>(`/accounts/${accountId}/r2/buckets`);
-  return results.buckets;
+	const results = await fetchResult<{
+		buckets: R2BucketInfo[];
+	}>(`/accounts/${accountId}/r2/buckets`);
+	return results.buckets;
 }
 
 /**
@@ -27,24 +30,102 @@ export async function listR2Buckets(
  * A bucket must be explicitly deleted to be replaced.
  */
 export async function createR2Bucket(
-  accountId: string,
-  bucketName: string
+	accountId: string,
+	bucketName: string
 ): Promise<void> {
-  return await fetchResult<void>(
-    `/accounts/${accountId}/r2/buckets/${bucketName}`,
-    { method: "PUT" }
-  );
+	return await fetchResult<void>(`/accounts/${accountId}/r2/buckets`, {
+		method: "POST",
+		body: JSON.stringify({ name: bucketName }),
+	});
 }
 
 /**
  * Delete a bucket with the given name
  */
 export async function deleteR2Bucket(
-  accountId: string,
-  bucketName: string
+	accountId: string,
+	bucketName: string
 ): Promise<void> {
-  return await fetchResult<void>(
-    `/accounts/${accountId}/r2/buckets/${bucketName}`,
-    { method: "DELETE" }
-  );
+	return await fetchResult<void>(
+		`/accounts/${accountId}/r2/buckets/${bucketName}`,
+		{ method: "DELETE" }
+	);
+}
+
+export function bucketAndKeyFromObjectPath(objectPath = ""): {
+	bucket: string;
+	key: string;
+} {
+	const match = /^([^/]+)\/(.*)/.exec(objectPath);
+	if (match === null) {
+		throw new Error(
+			`The object path must be in the form of {bucket}/{key} you provided ${objectPath}`
+		);
+	}
+
+	return { bucket: match[1], key: match[2] };
+}
+
+/**
+ * Downloads an object
+ */
+export async function getR2Object(
+	accountId: string,
+	bucketName: string,
+	objectName: string
+): Promise<Readable> {
+	const response = await fetchR2Objects(
+		`/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
+		{ method: "GET" }
+	);
+
+	return Readable.from(response.body);
+}
+
+/**
+ * Uploads an object
+ */
+export async function putR2Object(
+	accountId: string,
+	bucketName: string,
+	objectName: string,
+	object: Readable | Buffer,
+	options: Record<string, unknown>
+): Promise<void> {
+	const headerKeys = [
+		"content-length",
+		"content-type",
+		"content-disposition",
+		"content-encoding",
+		"content-language",
+		"cache-control",
+		"expires",
+	];
+	const headers: HeadersInit = {};
+	for (const key of headerKeys) {
+		const value = options[key] || "";
+		if (value && typeof value === "string") headers[key] = value;
+	}
+
+	await fetchR2Objects(
+		`/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
+		{
+			body: object,
+			headers,
+			method: "PUT",
+		}
+	);
+}
+/**
+ * Delete an Object
+ */
+export async function deleteR2Object(
+	accountId: string,
+	bucketName: string,
+	objectName: string
+): Promise<void> {
+	await fetchR2Objects(
+		`/accounts/${accountId}/r2/buckets/${bucketName}/objects/${objectName}`,
+		{ method: "DELETE" }
+	);
 }

package/src/selfsigned.d.ts

@@ -1,29 +1,29 @@
 declare module "selfsigned" {
-  import type { pki } from "node-forge";
+	import type { pki } from "node-forge";
 
-  export type Attributes = pki.CertificateField[];
+	export type Attributes = pki.CertificateField[];
 
-  export interface Options {
-    days?: number;
-    keySize?: number;
-    extensions?: unknown[];
-    algorithm?: string;
-    pkcs7?: boolean;
-    clientCertificate?: boolean;
-    clientCertificateCN?: string;
-  }
+	export interface Options {
+		days?: number;
+		keySize?: number;
+		extensions?: unknown[];
+		algorithm?: string;
+		pkcs7?: boolean;
+		clientCertificate?: boolean;
+		clientCertificateCN?: string;
+	}
 
-  export interface Certificate {
-    private: string;
-    public: string;
-    cert: string;
-    fingerprint: string;
-  }
+	export interface Certificate {
+		private: string;
+		public: string;
+		cert: string;
+		fingerprint: string;
+	}
 
-  export function generate(attrs?: Attributes, options?: Options): Certificate;
-  export function generate(
-    attrs: Attributes,
-    options: Options,
-    callback: (err: Error, certificate: Certificate) => void
-  ): void;
+	export function generate(attrs?: Attributes, options?: Options): Certificate;
+	export function generate(
+		attrs: Attributes,
+		options: Options,
+		callback: (err: Error, certificate: Certificate) => void
+	): void;
 }