@sproutboat/runtime 0.9.5 → 0.10.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @sproutboat/runtime
 
+## 0.10.0
+
+### Minor Changes
+
+- 7287d9b: KV: native key expiration (baronunread/sproutboat#58). `env.KV.put(key, value, { expirationTtl })` / `{ expiration }` now match the Cloudflare Workers contract: `expirationTtl` is seconds from now (rejected below 60, matching CF), `expiration` is an absolute unix-seconds timestamp. An expired key reads as absent from `get()` and is omitted from `list()`; the row is hard-deleted lazily the next time it's touched by a get. No new transport op — both `expirationTtl` and `expiration` are optional fields on the existing `kv.put` frame, so an older broker/prelude pair that ignores them keeps working exactly as before.
+- 7287d9b: Version metadata binding (baronunread/sproutboat#126). `sproutboat.jsonc` gains a `version_metadata` key naming a binding (like wrangler's `[version_metadata]`), and `wrapNativeFetchHandler` bakes `env.<binding> = { id, tag, timestamp }` directly into the module at build time — no broker round trip. `id`/`tag`/`timestamp` are supplied by the caller (the CLI derives them from the artifact digest, the project name, and the build time); this package only wires the config field through and does the baking.
+
+## 0.9.6
+
+### Patch Changes
+
+- f070d70: Revert native R2 transfer size-gating (#202). It saved ~11KB of `__text`
+  (~1.3% of a typical binary) and on macOS didn't even change the shipped
+  file size, since `__TEXT` is page-aligned. Not worth the `#ifdef`
+  guard-placement bug class it introduced. R2 transfer support is native code
+  again, always compiled in with 404 stubs where unused, same as before #202.
+
 ## 0.9.5
 
 ### Patch Changes

package/package.json

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

package/src/native-fetch-prelude.js

@@ -1170,8 +1170,11 @@ globalThis.__sbInstallBindings = function (target, bindings) {
         const r = __sbRpc("kv.get", { ns, key: String(key) });
         return r.found ? r.value : null;
       },
-      put(key, value) {
-        __sbRpc("kv.put", { ns, key: String(key), value: String(value) });
+      put(key, value, options) {
+        const msg = { ns, key: String(key), value: String(value) };
+        if (options && options.expirationTtl != null) msg.expirationTtl = Number(options.expirationTtl);
+        else if (options && options.expiration != null) msg.expiration = Number(options.expiration);
+        __sbRpc("kv.put", msg);
       },
       delete(key) {
         __sbRpc("kv.delete", { ns, key: String(key) });

package/src/transport-embedded.js

@@ -578,7 +578,6 @@ 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;
@@ -806,7 +805,6 @@ 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
@@ -1781,8 +1779,13 @@ function __sbEnsureSchema() {
   const s = __sbStore();
   __sbSql(
     s,
-    "CREATE TABLE IF NOT EXISTS kv (ns TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, PRIMARY KEY (ns, key))",
+    "CREATE TABLE IF NOT EXISTS kv (ns TEXT NOT NULL, key TEXT NOT NULL, value TEXT NOT NULL, " +
+      "expires_at INTEGER, PRIMARY KEY (ns, key))",
   );
+  const kvColumns = __sbSql(s, "PRAGMA table_info(kv)", []).rows;
+  let hasKvExpiresAt = false;
+  for (let i = 0; i < kvColumns.length; i++) if (kvColumns[i][1] === "expires_at") hasKvExpiresAt = true;
+  if (!hasKvExpiresAt) __sbSql(s, "ALTER TABLE kv ADD COLUMN expires_at INTEGER", []);
   // #56 — no `body` column: an object's bytes live in their own file under
   // "<data-dir>/r2-blobs/" (sb_r2_put_c/sb_r2_get_c), never in the sqlite row.
   __sbSql(
@@ -1871,16 +1874,29 @@ function __sbEmbeddedDispatch(msg) {
   if (op === "ping") return { ok: true, op: "pong", echo: msg.msg };
 
   if (op === "kv.get") {
-    const r = __sbSql(store, "SELECT value FROM kv WHERE ns = ? AND key = ?", [msg.ns, msg.key]);
-    return r.rows.length
-      ? { ok: true, found: true, value: r.rows[0][0] }
-      : { ok: true, found: false, value: null };
+    const r = __sbSql(store, "SELECT value, expires_at FROM kv WHERE ns = ? AND key = ?", [msg.ns, msg.key]);
+    if (!r.rows.length) return { ok: true, found: false, value: null };
+    const expiresAt = r.rows[0][1];
+    if (expiresAt != null && expiresAt <= Date.now()) {
+      __sbSql(store, "DELETE FROM kv WHERE ns = ? AND key = ?", [msg.ns, msg.key]);
+      return { ok: true, found: false, value: null };
+    }
+    return { ok: true, found: true, value: r.rows[0][0] };
   }
   if (op === "kv.put") {
+    // #58 — CF rejects expirationTtl under 60 seconds; matched here.
+    let expiresAt = null;
+    if (msg.expirationTtl != null) {
+      const ttl = Number(msg.expirationTtl);
+      if (!(ttl >= 60)) throw new Error("expirationTtl must be at least 60 seconds");
+      expiresAt = Date.now() + ttl * 1000;
+    } else if (msg.expiration != null) {
+      expiresAt = Number(msg.expiration) * 1000;
+    }
     __sbSql(
       store,
-      "INSERT INTO kv (ns, key, value) VALUES (?1,?2,?3) ON CONFLICT (ns, key) DO UPDATE SET value = ?3",
-      [msg.ns, msg.key, msg.value],
+      "INSERT INTO kv (ns, key, value, expires_at) VALUES (?1,?2,?3,?4) ON CONFLICT (ns, key) DO UPDATE SET value = ?3, expires_at = ?4",
+      [msg.ns, msg.key, msg.value, expiresAt],
     );
     return { ok: true };
   }
@@ -1889,10 +1905,11 @@ function __sbEmbeddedDispatch(msg) {
     return { ok: true };
   }
   if (op === "kv.list") {
-    const r = __sbSql(store, "SELECT key FROM kv WHERE ns = ? AND key LIKE ? || '%' ORDER BY key", [
-      msg.ns,
-      msg.prefix || "",
-    ]);
+    const r = __sbSql(
+      store,
+      "SELECT key FROM kv WHERE ns = ? AND key LIKE ? || '%' AND (expires_at IS NULL OR expires_at > ?) ORDER BY key",
+      [msg.ns, msg.prefix || "", Date.now()],
+    );
     const keys = [];
     for (let i = 0; i < r.rows.length; i++) keys.push(r.rows[i][0]);
     return { ok: true, keys };

package/src/wrap.ts

@@ -177,6 +177,13 @@ export function wrapNativeFetchHandler(
   assets?: { manifest: unknown; files: Record<string, string> },
   /** The selected transport determines whether the direct-transfer C ABI is real or stubbed. */
   transport: Transport = "broker",
+  /**
+   * #126 — `env.<binding> = { id, tag, timestamp }`. Baked at build time from the
+   * artifact digest, like `vars`: the control plane's own deployment id is a
+   * separate, later-assigned thing (minted at upload), so this is the artifact's
+   * own self-describing identity rather than a broker round trip.
+   */
+  versionMetadata?: { binding: string; id: string; tag: string; timestamp: string },
 ): string {
   const neutralised = neutraliseExports(source);
   if (neutralised === null || !/\bfetch\s*\(/.test(source)) {
@@ -184,6 +191,13 @@ export function wrapNativeFetchHandler(
   }
 
   const env = `const env = ${JSON.stringify(vars)};\nglobalThis.env = env;\n`;
+  const versionMetadataLine = versionMetadata
+    ? `env[${JSON.stringify(versionMetadata.binding)}] = ${JSON.stringify({
+        id: versionMetadata.id,
+        tag: versionMetadata.tag,
+        timestamp: versionMetadata.timestamp,
+      })};\n`
+    : "";
   // Baked, not a binding: the date belongs to the artifact, and a handler must
   // not be able to change the semantics it was compiled against at runtime.
   const compat =
@@ -194,14 +208,13 @@ 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
-  // is only emitted for an R2 build, keeping its ABI out of applications that
-  // cannot issue an R2 ticket.
+  // 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.
   const nativeTransferAbi =
-    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';
+    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`
     : "";
@@ -216,7 +229,7 @@ export function wrapNativeFetchHandler(
     : "";
 
   return (
-    `${prelude}\n${nativeTransferAbi}${compat}${env}${wire}` +
+    `${prelude}\n${nativeTransferAbi}${compat}${env}${versionMetadataLine}${wire}` +
     `${neutralised}\n` +
     `${registerDO}${triggers}` +
     `export default {\n  port: ${port},\n  fetch(request) { return __sbEntry(__sbHandlers, request); }\n};\n`

package/src/wrap.test.ts

@@ -1,17 +0,0 @@
-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");
-});