@takosjp/yurucommu-core 3.4.5 → 4.1.0

package/README.en.md

@@ -87,6 +87,9 @@ Takos core. See [`AGENTS.md`](AGENTS.md) for the full product boundary.
 
 ## Documentation
 
+- [Runtime lanes](docs/design/runtime-lanes.md) — how the bindings differ between
+  a raw-Cloudflare deployment and one on a host that projects the portable
+  facades, and how a deployment declares which it is
 - [Deployment guide](https://yurucommu.com/help/deployment.html)
 - [Getting started](https://yurucommu.com/help/getting-started.html)
 - [Help site](https://yurucommu.com/help/)

package/README.md

@@ -86,6 +86,8 @@ Yurucommu は ActivityPub 連合・コンテンツ配送・ユーザー identity
 
 ## ドキュメント
 
+- [Runtime lanes](docs/design/runtime-lanes.md) — raw Cloudflare binding と
+  portable facade で binding の形が変わる点と、その宣言方法
 - [Deployment guide](https://yurucommu.com/help/deployment.html)
 - [Getting started](https://yurucommu.com/help/getting-started.html)
 - [Help site](https://yurucommu.com/help/)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takosjp/yurucommu-core",
-  "version": "3.4.5",
+  "version": "4.1.0",
   "license": "AGPL-3.0-only",
   "type": "module",
   "workspaces": [

package/packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takosjp/yurucommu-api",
-  "version": "3.4.5",
+  "version": "4.1.0",
   "description": "Typed client SDK and public API contract for yurucommu-server clients.",
   "license": "AGPL-3.0-only",
   "type": "module",

package/src/backend/index.ts

@@ -5,9 +5,12 @@ import type { Env, EnvVars, Variables } from "./types.ts";
 import { extractActorFromSession } from "./lib/session-actor.ts";
 import { isBackendPath } from "./lib/backend-paths.ts";
 import {
-  wrapCloudflareBindings,
-  wrapCloudflareMessageBatch,
-} from "./runtime/cloudflare.ts";
+  resolveRuntimeLane,
+  wrapRuntimeBindings,
+  wrapRuntimeMessageBatch,
+  type PortableWorkerBindings,
+} from "./runtime/lane.ts";
+import type { EdgeQueueBatch } from "./runtime/edge-facades.ts";
 import {
   getMobileOidcAudience,
   getOidcClientCredentials,
@@ -992,15 +995,17 @@ export async function handleYurucommuQueueBatch(
   batch.ackAll();
 }
 
-type WorkerBindings = EnvVars & {
-  DB: D1Database;
-  MEDIA?: R2Bucket;
-  KV: KVNamespace;
+/**
+ * Bindings that are not the runtime ports, and so pass through whichever lane
+ * wrapper runs. Durable Objects live here: Takoform's Worker Version form has
+ * no Durable Object binding, so on the portable lane both are simply unbound
+ * and the routes that need them answer 503, exactly as on a Cloudflare
+ * deployment that did not declare them.
+ */
+type PassthroughBindings = EnvVars & {
   ASSETS?: Fetcher;
-  DELIVERY_QUEUE?: Queue<DeliveryQueueMessageV1>;
-  DELIVERY_DLQ?: Queue<DeliveryDlqMessageV1>;
-  // Signaling hub Durable Object namespace (call feature). wrapCloudflareBindings
-  // spreads it through untouched (it is not DB/MEDIA/KV/ASSETS) so app code and
+  // Signaling hub Durable Object namespace (call feature). The lane wrappers
+  // spread it through untouched (it is not DB/MEDIA/KV/ASSETS) so app code and
   // the rtc routes read it as c.env.CALL_SIGNALING.
   CALL_SIGNALING?: DurableObjectNamespace;
   // Per-user realtime event stream Durable Object namespace. Same pass-through
@@ -1009,6 +1014,26 @@ type WorkerBindings = EnvVars & {
   REALTIME_STREAM?: DurableObjectNamespace;
 };
 
+/**
+ * What this Worker may be handed.
+ *
+ * Raw Cloudflare bindings, or the portable facades a wrapper host projects.
+ * `wrapRuntimeBindings` decides which by reading the deployment's declared
+ * `YURUCOMMU_RUNTIME_LANE` and proving it against the bindings that actually
+ * arrived; see runtime/lane.ts.
+ */
+type WorkerBindings = PassthroughBindings &
+  (
+    | {
+        DB: D1Database;
+        MEDIA?: R2Bucket;
+        KV: KVNamespace;
+        DELIVERY_QUEUE?: Queue<DeliveryQueueMessageV1>;
+        DELIVERY_DLQ?: Queue<DeliveryDlqMessageV1>;
+      }
+    | PortableWorkerBindings
+  );
+
 function isMaterializedRuntimeEnv(
   bindings: WorkerBindings | Env,
 ): bindings is Env {
@@ -1021,16 +1046,19 @@ export default {
     bindings: WorkerBindings,
     ctx: ExecutionContext,
   ): Promise<Response> {
-    return app.fetch(request, wrapCloudflareBindings(bindings), ctx);
+    return app.fetch(request, wrapRuntimeBindings(bindings), ctx);
   },
 
   async queue(
-    batch: MessageBatch<DeliveryQueueMessageV1 | DeliveryDlqMessageV1>,
+    batch:
+      | MessageBatch<DeliveryQueueMessageV1 | DeliveryDlqMessageV1>
+      | EdgeQueueBatch,
     bindings: WorkerBindings,
   ): Promise<void> {
+    const lane = resolveRuntimeLane(bindings.YURUCOMMU_RUNTIME_LANE);
     return handleYurucommuQueueBatch(
-      wrapCloudflareMessageBatch(batch),
-      wrapCloudflareBindings(bindings),
+      wrapRuntimeMessageBatch(batch, lane),
+      wrapRuntimeBindings(bindings),
     );
   },
 
@@ -1041,7 +1069,7 @@ export default {
   ): Promise<void> {
     const env = isMaterializedRuntimeEnv(bindings)
       ? bindings
-      : wrapCloudflareBindings(bindings);
+      : wrapRuntimeBindings(bindings);
     await runYurucommuRetention(env);
   },
 };

package/src/backend/lib/blocklist-purge.ts

@@ -24,7 +24,7 @@ import {
   storyVotes,
 } from "../../db/index.ts";
 import type { Database } from "../../db/index.ts";
-import type { IObjectStorage } from "../runtime/types.ts";
+import type { ObjectStore } from "../runtime/types.ts";
 import { chunkForInClause, D1_IN_CHUNK } from "./chunk.ts";
 import { normalizeDomain } from "./blocklist.ts";
 import { isSameActivityPubActor } from "./activitypub-actor-identity.ts";
@@ -112,7 +112,7 @@ function activityPubUrlHostMatchesDomain(
 async function purgeObjects(
   db: Database,
   apIds: string[],
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<void> {
   if (apIds.length === 0) return;
   const parentRows = await db
@@ -544,7 +544,7 @@ async function purgeActorInteractionEdges(
 async function purgeMatchingObjects(
   db: Database,
   where: SQL,
-  media?: IObjectStorage,
+  media?: ObjectStore,
   onPageDeleted?: (count: number) => void,
 ): Promise<void> {
   let cursor: string | undefined;
@@ -604,7 +604,7 @@ async function purgeMatchingActivities(
 async function purgeActorObjects(
   db: Database,
   blockedApId: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
   onPageDeleted?: (count: number) => void,
 ): Promise<void> {
   let cursor: string | undefined;
@@ -666,7 +666,7 @@ async function purgeActorActivities(
 export async function purgeActorContent(
   db: Database,
   blockedApId: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<BlocklistContentPurgeResult> {
   let deletedObjects = 0;
   let deletedActivities = 0;
@@ -704,7 +704,7 @@ export async function purgeActorContent(
 export async function purgeDomainContent(
   db: Database,
   domainOrUrl: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<BlocklistContentPurgeResult> {
   const domain = normalizeDomain(domainOrUrl);
   if (!domain) {

package/src/backend/public.ts

@@ -36,13 +36,78 @@ export {
   createManagedRelationalDatabase,
   type ManagedRelationalDatabaseOptions,
 } from "./runtime/managed-relational.ts";
+// The portable lane: the binding facades a wrapper host projects, and the lane
+// selector that proves a deployment's declared lane against the bindings that
+// actually arrived.
+export {
+  DEFAULT_RUNTIME_LANE,
+  RUNTIME_LANE_VAR,
+  RUNTIME_LANES,
+  RuntimeLaneError,
+  assertRuntimeLaneBindings,
+  resolveRuntimeLane,
+  type CloudflareWorkerBindings,
+  type PortableWorkerBindings,
+  type RuntimeLane,
+  wrapPortableBindings,
+  wrapRuntimeBindings,
+  wrapRuntimeMessageBatch,
+} from "./runtime/lane.ts";
+export {
+  EDGE_KV_MAX_EXPIRATION_TTL_SECONDS,
+  EDGE_KV_MIN_EXPIRATION_TTL_SECONDS,
+  isEdgeObjectsBinding,
+  isEdgeQueueBatch,
+  isEdgeSqlBinding,
+  isNativeD1Database,
+  isNativeR2Bucket,
+  type EdgeKvBinding,
+  type EdgeObjectsBinding,
+  type EdgeQueueBatch,
+  type EdgeQueueBinding,
+  type EdgeSqlBinding,
+  type EdgeSqlResult,
+  type EdgeSqlValue,
+} from "./runtime/edge-facades.ts";
+export {
+  EdgeKeyValueOptionError,
+  EdgeKeyValueStore,
+  EdgeKeyValueValueError,
+  wrapEdgeKv,
+} from "./runtime/edge-kv.ts";
+export {
+  EdgeSqlShapeError,
+  createEdgeSqlDatabase,
+} from "./runtime/edge-sql.ts";
+export {
+  ProxyColumnMismatchError,
+  positionalRow,
+  rewriteProjection,
+  type ProjectedStatement,
+  type RewrittenStatement,
+} from "./runtime/sqlite-proxy-rows.ts";
+export {
+  EdgeQueueShapeError,
+  wrapEdgeMessageBatch,
+  wrapEdgeQueue,
+} from "./runtime/edge-queue.ts";
+export {
+  EdgeObjectStorage,
+  EdgeObjectsShapeError,
+  wrapEdgeObjects,
+} from "./runtime/edge-objects.ts";
 export type {
   IKeyValueStore,
-  IObjectStorage,
-  ListObjectsResult,
-  ObjectMetadata,
-  StorageObject,
+  ObjectStore,
+  ObjectStoreBody,
+  ObjectStoreObject,
+  ObjectStorePutOptions,
 } from "./runtime/types.ts";
+export {
+  createS3FetchObjectStore,
+  S3FetchObjectStoreError,
+  type S3ObjectFetcher,
+} from "./runtime/s3-fetch.ts";
 export type {
   IQueueBatch,
   IQueueMessage,

package/src/backend/routes/account-teardown.ts

@@ -47,7 +47,7 @@ import {
 } from "../../db/index.ts";
 import type { Database } from "../../db/index.ts";
 import type { Env } from "../types.ts";
-import type { IObjectStorage } from "../runtime/types.ts";
+import type { ObjectStore } from "../runtime/types.ts";
 import { activityApId, generateId } from "../federation-helpers.ts";
 import { chunkForInClause } from "../lib/chunk.ts";
 import { snapshotAndEnqueueFollowerDeliveries } from "../lib/delivery/queue-batching.ts";
@@ -80,7 +80,7 @@ interface BatchableDb {
  */
 export async function purgeActorMediaUploads(
   db: Database,
-  media: IObjectStorage | undefined,
+  media: ObjectStore | undefined,
   apId: string,
 ): Promise<void> {
   const uploads = await db

package/src/backend/routes/apps.ts

@@ -230,7 +230,7 @@ appsApiRoutes.post(
       }
       const r2Key = `${appPrefix}${normalizedPath}`;
       await media.put(r2Key, contentBytes, {
-        httpMetadata: { contentType },
+        contentType,
       });
 
       results.push({ path: normalizedPath, status: "uploaded" });
@@ -276,14 +276,13 @@ appsServeRoutes.get("/:clientId/:appName/*", async (c) => {
 
   const object = await media.get(r2Key);
   if (object) {
-    const contentType =
-      object.httpMetadata?.contentType ?? inferContentType(filePath);
+    const contentType = object.contentType ?? inferContentType(filePath);
     const headers = createHostedHeaders(
       contentType,
       filePath.includes("/assets/")
         ? "public, max-age=31536000, immutable"
         : "public, max-age=3600",
-      object.httpEtag,
+      object.etag,
     );
     return new Response(object.body, { headers });
   }
@@ -296,7 +295,7 @@ appsServeRoutes.get("/:clientId/:appName/*", async (c) => {
       const headers = createHostedHeaders(
         "text/html; charset=utf-8",
         "no-cache",
-        indexObject.httpEtag,
+        indexObject.etag,
       );
       return new Response(indexObject.body, { headers });
     }

package/src/backend/routes/media.ts

@@ -234,8 +234,12 @@ media.post("/upload", async (c) => {
     // transcode pipeline, and buffering a 40MB video would pressure the Worker
     // memory budget.
     if (isVideo) {
+      // The Blob is handed over whole rather than as a bare stream: an
+      // ObjectStore adapter reads `File.size` from it, so the portable
+      // `edge.objects` lane can declare the length while streaming instead of
+      // buffering the whole video in the Worker to discover it.
       await media.put(r2Key, file, {
-        httpMetadata: { contentType },
+        contentType,
       });
     } else {
       const original = new Uint8Array(await file.arrayBuffer());
@@ -247,7 +251,7 @@ media.post("/upload", async (c) => {
         cleaned.byteOffset + cleaned.byteLength,
       ) as ArrayBuffer;
       await media.put(r2Key, cleanedBuffer, {
-        httpMetadata: { contentType },
+        contentType,
       });
     }
 
@@ -579,13 +583,12 @@ async function serveMediaByR2Key(c: MediaContext, r2Key: string) {
     const object = await media.get(r2Key);
     if (!object) return c.notFound();
 
-    const contentType =
-      object.httpMetadata?.contentType || "application/octet-stream";
+    const contentType = object.contentType || "application/octet-stream";
     const cacheScope = authResult.isPublic ? "public" : "private";
     const maxAge = contentType.startsWith("video/")
       ? CACHE_MAX_AGE_VIDEO
       : CACHE_MAX_AGE_IMAGE;
-    const etag = object.httpEtag;
+    const etag = object.etag;
 
     if (!object.body) {
       return c.body(null, 200, {

package/src/backend/routes/posts/delete-cascade.ts

@@ -21,7 +21,7 @@
 
 import { and, asc, eq, gt, inArray, isNull, or, sql } from "drizzle-orm";
 import type { D1Statement, Database } from "../../../db/index.ts";
-import type { IObjectStorage } from "../../runtime/types.ts";
+import type { ObjectStore } from "../../runtime/types.ts";
 import {
   activities,
   actors,
@@ -80,7 +80,7 @@ async function deleteAttachedMediaUploadsForObject(
   db: Database,
   obj: CascadeObject,
   removedObjectApIds: ReadonlySet<string>,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<{
   mediaKeys: string[];
   mediaUploadIds: string[];
@@ -191,7 +191,7 @@ async function deleteAttachedMediaUploadsForObject(
  * system's already-accepted media failure mode.
  */
 export async function purgeMediaBlobs(
-  media: IObjectStorage | undefined,
+  media: ObjectStore | undefined,
   keys: string[],
 ): Promise<void> {
   if (!media || keys.length === 0) return;
@@ -220,7 +220,7 @@ export async function reapReplacedMediaUrl(
   db: Database,
   oldUrl: string | null | undefined,
   uploaderApId: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<void> {
   try {
     if (!oldUrl || !oldUrl.startsWith("/media/")) return;
@@ -303,7 +303,7 @@ export async function reapReplacedMediaUrl(
 export async function deleteObjectCascade(
   db: Database,
   objectApId: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<string[]> {
   return await deleteObjectsCascade(db, [objectApId], media);
 }
@@ -316,7 +316,7 @@ export async function deleteObjectCascade(
 export async function prepareObjectDeleteCascade(
   db: Database,
   objectApId: string,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<{
   mediaKeys: string[];
   statements: readonly [D1Statement, ...D1Statement[]];
@@ -392,7 +392,7 @@ export async function prepareObjectDeleteCascade(
 export async function deleteObjectsCascade(
   db: Database,
   objectApIds: string[],
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<string[]> {
   const uniqueApIds = [...new Set(objectApIds)];
   if (uniqueApIds.length === 0) return [];

package/src/backend/routes/stories/query-helpers.ts

@@ -8,7 +8,7 @@ import {
   objects,
   storyVotes,
 } from "../../../db/index.ts";
-import type { IObjectStorage } from "../../runtime/types.ts";
+import type { ObjectStore } from "../../runtime/types.ts";
 import {
   formatUsername,
   objectApId,
@@ -314,7 +314,7 @@ export function buildAuthor(
 
 export async function cleanupExpiredStories(
   db: Database,
-  media?: IObjectStorage,
+  media?: ObjectStore,
 ): Promise<number> {
   const now = new Date().toISOString();
 

package/src/backend/routes/stories/routes.ts

@@ -18,7 +18,7 @@ import {
   purgeMediaBlobs,
 } from "../posts/delete-cascade.ts";
 import type { Env, Variables } from "../../types.ts";
-import type { IObjectStorage } from "../../runtime/types.ts";
+import type { ObjectStore } from "../../runtime/types.ts";
 import {
   activityApId,
   actorApId,
@@ -61,10 +61,7 @@ const stories = new Hono<{ Bindings: Env; Variables: Variables }>();
 // at most one fallback pass runs at a time per isolate.
 let expiredStoryCleanupInFlight = false;
 
-function maybeCleanupExpiredStories(
-  db: Database,
-  media?: IObjectStorage,
-): void {
+function maybeCleanupExpiredStories(db: Database, media?: ObjectStore): void {
   if (expiredStoryCleanupInFlight) return;
   if (Math.random() >= 0.01) return; // ~1% of feed requests per isolate