@distilled.cloud/cloudflare 0.10.0 → 0.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distilled.cloud/cloudflare",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/alchemy-run/distilled",
@@ -56,14 +56,14 @@
     "fmt": "oxfmt --write src",
     "lint": "oxlint --fix src",
     "check": "tsgo && oxlint src && oxfmt --check src",
-    "test": "bunx vitest run test --exclude specs",
+    "test": "vitest run --exclude specs",
     "publish:npm": "bun run build && bun publish --access public",
     "generate": "bun run scripts/generate.ts && oxlint --fix src && oxfmt --write src && oxfmt --write src",
     "specs:fetch": "git submodule update --force --init --recursive --depth=1 specs/cloudflare-typescript && git -C specs/cloudflare-typescript checkout -- .",
     "specs:update": "git -C specs/cloudflare-typescript fetch && git -C specs/cloudflare-typescript checkout main && git -C specs/cloudflare-typescript pull"
   },
   "dependencies": {
-    "@distilled.cloud/core": "0.10.0",
+    "@distilled.cloud/core": "0.10.2",
     "effect": "4.0.0-beta.48"
   },
   "devDependencies": {

package/src/services/queues.ts

@@ -378,7 +378,7 @@ export interface CreateConsumerRequest {
     retryDelay?: number;
   };
   /** Body param: */
-  type?: "worker";
+  type: "worker" | "http_pull";
 }
 
 export const CreateConsumerRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
@@ -403,7 +403,7 @@ export const CreateConsumerRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
       }),
     ),
   ),
-  type: Schema.optional(Schema.Literal("worker")),
+  type: Schema.Literals(["worker", "http_pull"]),
 }).pipe(
   Schema.encodeKeys({
     deadLetterQueue: "dead_letter_queue",
@@ -1068,11 +1068,12 @@ export interface PushMessageRequest {
 export const PushMessageRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
   queueId: Schema.String.pipe(T.HttpPath("queueId")),
   accountId: Schema.String.pipe(T.HttpPath("account_id")),
-  body: Schema.optional(Schema.String).pipe(T.HttpBody()),
+  body: Schema.optional(Schema.String),
   contentType: Schema.optional(Schema.Literal("text")),
   delaySeconds: Schema.optional(Schema.Number),
 }).pipe(
   Schema.encodeKeys({
+    body: "body",
     contentType: "content_type",
     delaySeconds: "delay_seconds",
   }),

package/src/services/r2-data-catalog.ts

@@ -20,7 +20,7 @@ export class InvalidCredential extends Schema.TaggedErrorClass<InvalidCredential
   "InvalidCredential",
   { code: Schema.Number, message: Schema.String },
 ) {}
-T.applyErrorMatchers(InvalidCredential, [{ code: 30004 }]);
+T.applyErrorMatchers(InvalidCredential, [{ code: 30004 }, { code: 30005 }]);
 
 export class InvalidRoute extends Schema.TaggedErrorClass<InvalidRoute>()(
   "InvalidRoute",

package/src/services/r2.ts

@@ -11,6 +11,7 @@ import * as API from "../client/api.ts";
 import * as T from "../traits.ts";
 import type { Credentials } from "../credentials.ts";
 import { type DefaultErrors } from "../errors.ts";
+import { UploadableSchema } from "../schemas.ts";
 import { SensitiveString } from "../sensitive.ts";
 
 // =============================================================================
@@ -2532,8 +2533,149 @@ export const deleteBucketSippy: API.OperationMethod<
 // Object
 // =============================================================================
 
+export interface GetObjectRequest {
+  /** Name of the R2 bucket. */
+  bucketName: string;
+  /** Key (name) of the object. */
+  objectName: string;
+  /** Account ID. */
+  accountId: string;
+  /** Jurisdiction where objects in this bucket are guaranteed to be stored. */
+  cfR2Jurisdiction?: "default" | "eu" | "fedramp";
+}
+
+export const GetObjectRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+  bucketName: Schema.String.pipe(T.HttpPath("bucketName")),
+  objectName: Schema.String.pipe(T.HttpPath("objectName")),
+  accountId: Schema.String.pipe(T.HttpPath("account_id")),
+  cfR2Jurisdiction: Schema.optional(
+    Schema.Literals(["default", "eu", "fedramp"]),
+  ).pipe(T.HttpHeader("cf-r2-jurisdiction")),
+}).pipe(
+  T.Http({
+    method: "GET",
+    path: "/accounts/{account_id}/r2/buckets/{bucketName}/objects/{objectName}",
+  }),
+) as unknown as Schema.Schema<GetObjectRequest>;
+
+export type GetObjectResponse = File | Blob;
+
+export const GetObjectResponse =
+  /*@__PURE__*/ /*#__PURE__*/ UploadableSchema.pipe(T.HttpFormDataFile()).pipe(
+    T.ResponsePath("result"),
+  ) as unknown as Schema.Schema<GetObjectResponse>;
+
+export type GetObjectError =
+  | DefaultErrors
+  | NoSuchBucket
+  | InvalidRoute
+  | NoRoute;
+
+export const getObject: API.OperationMethod<
+  GetObjectRequest,
+  GetObjectResponse,
+  GetObjectError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: GetObjectRequest,
+  output: GetObjectResponse,
+  errors: [NoSuchBucket, InvalidRoute, NoRoute],
+}));
+
+export interface PutObjectRequest {
+  /** Name of the R2 bucket. */
+  bucketName: string;
+  /** Key (name) of the object. */
+  objectName: string;
+  /** Account ID. */
+  accountId: string;
+  /** Jurisdiction where objects in this bucket are guaranteed to be stored. */
+  cfR2Jurisdiction?: "default" | "eu" | "fedramp";
+  /** MIME type of the object. */
+  contentType?: string;
+  /** Content disposition of the object. */
+  contentDisposition?: string;
+  /** Content encoding of the object. */
+  contentEncoding?: string;
+  /** Content language of the object. */
+  contentLanguage?: string;
+  /** Content length of the object in bytes. */
+  contentLength?: string;
+  /** Cache control directives for the object. */
+  cacheControl?: string;
+  /** Expiration date of the object. */
+  expires?: string;
+  /** Storage class for the object. */
+  cfR2StorageClass?: "Standard" | "InfrequentAccess";
+  body: File | Blob;
+}
+
+export const PutObjectRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
+  bucketName: Schema.String.pipe(T.HttpPath("bucketName")),
+  objectName: Schema.String.pipe(T.HttpPath("objectName")),
+  accountId: Schema.String.pipe(T.HttpPath("account_id")),
+  cfR2Jurisdiction: Schema.optional(
+    Schema.Literals(["default", "eu", "fedramp"]),
+  ).pipe(T.HttpHeader("cf-r2-jurisdiction")),
+  contentType: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("content-type"),
+  ),
+  contentDisposition: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("content-disposition"),
+  ),
+  contentEncoding: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("content-encoding"),
+  ),
+  contentLanguage: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("content-language"),
+  ),
+  contentLength: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("content-length"),
+  ),
+  cacheControl: Schema.optional(Schema.String).pipe(
+    T.HttpHeader("cache-control"),
+  ),
+  expires: Schema.optional(Schema.String).pipe(T.HttpHeader("expires")),
+  cfR2StorageClass: Schema.optional(
+    Schema.Literals(["Standard", "InfrequentAccess"]),
+  ).pipe(T.HttpHeader("cf-r2-storage-class")),
+  body: UploadableSchema.pipe(T.HttpFormDataFile()).pipe(T.HttpBody()),
+}).pipe(
+  T.Http({
+    method: "PUT",
+    path: "/accounts/{account_id}/r2/buckets/{bucketName}/objects/{objectName}",
+    contentType: "multipart",
+  }),
+) as unknown as Schema.Schema<PutObjectRequest>;
+
+export type PutObjectResponse = unknown;
+
+export const PutObjectResponse =
+  /*@__PURE__*/ /*#__PURE__*/ Schema.Unknown.pipe(
+    T.ResponsePath("result"),
+  ) as unknown as Schema.Schema<PutObjectResponse>;
+
+export type PutObjectError =
+  | DefaultErrors
+  | NoSuchBucket
+  | InvalidRoute
+  | NoRoute;
+
+export const putObject: API.OperationMethod<
+  PutObjectRequest,
+  PutObjectResponse,
+  PutObjectError,
+  Credentials | HttpClient.HttpClient
+> = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
+  input: PutObjectRequest,
+  output: PutObjectResponse,
+  errors: [NoSuchBucket, InvalidRoute, NoRoute],
+}));
+
 export interface DeleteObjectRequest {
+  /** Name of the R2 bucket. */
   bucketName: string;
+  /** Key (name) of the object. */
   objectName: string;
   /** Account ID. */
   accountId: string;

package/src/services/request-tracers.ts

@@ -70,7 +70,7 @@ export const CreateTraceRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
         plainText: "plain_text",
       }),
     ),
-  ).pipe(T.HttpBody()),
+  ),
   context: Schema.optional(
     Schema.Struct({
       botScore: Schema.optional(Schema.Number),
@@ -120,6 +120,7 @@ export const CreateTraceRequest = /*@__PURE__*/ /*#__PURE__*/ Schema.Struct({
   Schema.encodeKeys({
     method: "method",
     url: "url",
+    body: "body",
     context: "context",
     cookies: "cookies",
     headers: "headers",

package/src/services/workers.ts

@@ -35,6 +35,17 @@ export class DomainNotFound extends Schema.TaggedErrorClass<DomainNotFound>()(
 ) {}
 T.applyErrorMatchers(DomainNotFound, [{ code: 100114 }]);
 
+export class DuplicateMigrationTarget extends Schema.TaggedErrorClass<DuplicateMigrationTarget>()(
+  "DuplicateMigrationTarget",
+  { code: Schema.Number, message: Schema.String },
+) {}
+T.applyErrorMatchers(DuplicateMigrationTarget, [
+  {
+    code: 10074,
+    message: { includes: "cannot be the target of more than one migration" },
+  },
+]);
+
 export class DurableObjectMustBeSqlite extends Schema.TaggedErrorClass<DurableObjectMustBeSqlite>()(
   "DurableObjectMustBeSqlite",
   { code: Schema.Number, message: Schema.String },
@@ -7472,7 +7483,8 @@ export type PutScriptError =
   | DefaultErrors
   | InvalidRoute
   | InvalidWorkerScript
-  | DurableObjectMustBeSqlite;
+  | DurableObjectMustBeSqlite
+  | DuplicateMigrationTarget;
 
 export const putScript: API.OperationMethod<
   PutScriptRequest,
@@ -7482,7 +7494,12 @@ export const putScript: API.OperationMethod<
 > = /*@__PURE__*/ /*#__PURE__*/ API.make(() => ({
   input: PutScriptRequest,
   output: PutScriptResponse,
-  errors: [InvalidRoute, InvalidWorkerScript, DurableObjectMustBeSqlite],
+  errors: [
+    InvalidRoute,
+    InvalidWorkerScript,
+    DurableObjectMustBeSqlite,
+    DuplicateMigrationTarget,
+  ],
 }));
 
 export interface DeleteScriptRequest {