WIP R2 API #355
WIP R2 API #355
Conversation
Deploying with
|
| Latest commit: |
a01fd01
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://b2153ba2.cf-miniflare.pages.dev |
| Branch Preview URL: | https://tre-r2.cf-miniflare.pages.dev |
| function throwR2Error(method: Method, status: number, message: string): void { | ||
| throw new Error(`R2 ${method} failed: (${status}) ${message}`); | ||
| } |
There was a problem hiding this comment.
Rather than throwing a generic Error here, I'd throw a subclass of HttpError, similar to KVError here:
This will ensure:
- Correct HTTP response codes get returned
- Error messages in the runtime match what would occur when deployed
These error messages probably don't need to include the HTTP method too. I think this gets added by the runtime.
There was a problem hiding this comment.
Fixed (kinda) in the latest push. I have a subclass of Error export class R2Error extends Error, which encodes the status code & CF error code (I didn't actually think of subclassing HttpError, primarily because each error needs explicitly caught and converted to a response, as the runtime needs each error formatted fairly specifically)
| "R2 put() accepts only nulls, strings, Blobs, ArrayBuffers, ArrayBufferViews, and ReadableStreams as values." | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export class R2Gateway { |
There was a problem hiding this comment.
My thinking with R2Gateway is that it contains shared code between R2Router, and a future R2Bucket class that we might implement (when we start thinking about integration testing for users' workers). R2 bucket bindings are instances of R2Bucket in the runtime.
This means that we probably don't need to return R2Object(Body)s from methods in R2Gateway, as this would be the responsibility of R2Bucket. At this stage, I don't actually think we need the R2Object/R2ObjectBody classes. Similarly, R2Gateway#put should probably just take a Uint8Array value instead of an R2PutValueType. We're always going to pass a Uint8Array from R2Router, and R2PutValueType normalisation should go in R2Bucket.
Essentially, everything that's defined in the runtime's C++ files will go in the future R2Bucket class, and everything that's in the R2 gateway worker should get split between R2Router and R2Gateway classes. 🙂
|
Apologies @mrbbot! This wasn't quite ready for review—it should be now. I'll go through and have a check of your comments and fix any that are still relevant with the new code |
Working (probably), but still writing tests