@sproutboat/runtime 0.9.3 → 0.9.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @sproutboat/runtime
 
+## 0.9.5
+
+### Patch Changes
+
+- a357b91: Compile direct R2 transfer support only into artifacts that declare an R2 binding.
+
+## 0.9.4
+
+### Patch Changes
+
+- 38db17d: Fix broker-backed native-fetch builds after the direct R2 download ABI gained an ETag accessor.
+
 ## 0.9.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sproutboat/runtime",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "license": "MIT",
   "type": "module",
   "repository": {

package/src/transport-embedded.js

@@ -578,6 +578,7 @@ static void sb_r2_delete_blob(const char* path, const char* bucket, const char*
 // path before it allocates a PendingRequest body. The context owns only a file
 // descriptor and small metadata buffers; object bytes stay in the kernel page
 // cache until the final fixed-size digest pass.
+#ifdef SB_R2_TRANSFER
 typedef struct sb_r2_transfer_ctx {
   FILE* file;
   sqlite3* db;
@@ -805,6 +806,7 @@ size_t sb_r2_transfer_download_read(sb_r2_transfer_ctx* ctx, size_t offset, char
   return fread(out, 1, wanted, ctx->file);
 }
 void sb_r2_transfer_download_close(sb_r2_transfer_ctx* ctx) { if (ctx) { if (ctx->file) fclose(ctx->file); free(ctx); } }
+#endif
 
 // Run a script: one or more statements separated by semicolons. sqlite3_exec
 // handles the whole string, which prepare/step does not — it compiles the first

package/src/wrap.test.ts

@@ -0,0 +1,17 @@
+import { expect, test } from "bun:test";
+import { EMPTY_BINDINGS, wrapNativeFetchHandler } from "./wrap";
+
+const handler = "export default { fetch() { return new Response('ok'); } };";
+
+test("direct R2 transfer ABI is emitted only for an R2 binding", () => {
+  const empty = wrapNativeFetchHandler(handler, "", {}, EMPTY_BINDINGS);
+  expect(empty).not.toContain("sb_r2_transfer_open");
+
+  const r2 = wrapNativeFetchHandler(handler, "", {}, { ...EMPTY_BINDINGS, r2: ["OBJECTS"] });
+  expect(r2).toContain("sb_r2_transfer_open");
+});
+
+test("scrypt remains available without a capability declaration", () => {
+  const wrapped = wrapNativeFetchHandler(handler, "sb_scrypt", {}, EMPTY_BINDINGS);
+  expect(wrapped).toContain("sb_scrypt");
+});

package/src/wrap.ts

@@ -194,13 +194,14 @@ export function wrapNativeFetchHandler(
     `globalThis.__sbOutbound = ${JSON.stringify(bindings.outbound)};\n` +
     (assets ? `globalThis.__sbAssets = ${JSON.stringify(assets)};\n` : "");
   // The native transfer hook runs before JavaScript receives its Request. It
-  // has a real file-backed implementation only in embedded builds. The broker
-  // transport supplies ABI-compatible stubs because its separate transfer
-  // listener owns these URLs, while the shared uWebSockets patch is global.
+  // is only emitted for an R2 build, keeping its ABI out of applications that
+  // cannot issue an R2 ticket.
   const nativeTransferAbi =
-    transport === "embedded"
-      ? `Porffor.c\`const char* sb_standalone_app_name(void) { return ${JSON.stringify(appName)}; }\`;\n`
-      : "Porffor.c`typedef struct sb_r2_transfer_ctx { int unused; } sb_r2_transfer_ctx; int sb_r2_transfer_open(const char* a, const char* b, size_t c, sb_r2_transfer_ctx** d) { if (d) *d = 0; return 404; } int sb_r2_transfer_write(sb_r2_transfer_ctx* a, const char* b, size_t c) { return 404; } int sb_r2_transfer_finish(sb_r2_transfer_ctx* a) { return 404; } void sb_r2_transfer_abort(sb_r2_transfer_ctx* a) {} int sb_r2_transfer_download_open(const char* a, const char* b, sb_r2_transfer_ctx** c) { if (c) *c = 0; return 404; } size_t sb_r2_transfer_download_size(sb_r2_transfer_ctx* a) { return 0; } size_t sb_r2_transfer_download_read(sb_r2_transfer_ctx* a, size_t b, char* c, size_t d) { return 0; } void sb_r2_transfer_download_close(sb_r2_transfer_ctx* a) {}`;\n";
+    bindings.r2.length === 0
+      ? ""
+      : transport === "embedded"
+        ? `Porffor.c\`const char* sb_standalone_app_name(void) { return ${JSON.stringify(appName)}; }\`;\n`
+        : 'Porffor.c`typedef struct sb_r2_transfer_ctx { int unused; } sb_r2_transfer_ctx; int sb_r2_transfer_open(const char* a, const char* b, size_t c, sb_r2_transfer_ctx** d) { if (d) *d = 0; return 404; } int sb_r2_transfer_write(sb_r2_transfer_ctx* a, const char* b, size_t c) { return 404; } int sb_r2_transfer_finish(sb_r2_transfer_ctx* a) { return 404; } void sb_r2_transfer_abort(sb_r2_transfer_ctx* a) {} int sb_r2_transfer_download_open(const char* a, const char* b, sb_r2_transfer_ctx** c) { if (c) *c = 0; return 404; } size_t sb_r2_transfer_download_size(sb_r2_transfer_ctx* a) { return 0; } const char* sb_r2_transfer_download_etag(sb_r2_transfer_ctx* a) { return ""; } size_t sb_r2_transfer_download_read(sb_r2_transfer_ctx* a, size_t b, char* c, size_t d) { return 0; } void sb_r2_transfer_download_close(sb_r2_transfer_ctx* a) {}`;\n';
   const wire = hasBindings(bindings)
     ? `__sbInstallBindings(env, ${JSON.stringify(bindings)});\n`
     : "";