@takosjp/yurucommu-core 3.4.5 → 4.1.0

package/src/backend/runtime/types.ts

@@ -58,82 +58,50 @@ export interface IDatabase {
 }
 
 /**
- * Object storage metadata
+ * Bodies accepted by the provider-neutral object store seam.
+ *
+ * A body is handed to an adapter exactly once. Adapters must not eagerly
+ * consume or clone streams; callers that need replayability own that concern.
  */
-export interface ObjectMetadata {
+export type ObjectStoreBody =
+  Blob | ReadableStream<Uint8Array> | ArrayBuffer | string;
+
+/** Options for writing one object. */
+export interface ObjectStorePutOptions {
   contentType?: string;
-  contentLength?: number;
-  etag?: string;
-  httpMetadata?: {
-    contentType?: string;
-    cacheControl?: string;
-    contentDisposition?: string;
-    contentEncoding?: string;
-    contentLanguage?: string;
-  };
-  customMetadata?: Record<string, string>;
 }
 
 /**
- * Storage object interface
+ * One object returned by an ObjectStore read.
+ *
+ * The body remains lazy and is consumed through the returned stream. Metadata
+ * is deliberately flat so callers do not depend on a vendor SDK's shape.
  */
-export interface StorageObject {
+export interface ObjectStoreObject {
   key: string;
-  body: ReadableStream | null;
-  bodyUsed: boolean;
-  /**
-   * HTTP `ETag` value to send to clients. Optional because not every
-   * backend (e.g. the in-memory test stub) tracks an etag.
-   */
-  httpEtag?: string;
-  arrayBuffer(): Promise<ArrayBuffer>;
-  text(): Promise<string>;
-  json<T = unknown>(): Promise<T>;
-  httpMetadata?: ObjectMetadata["httpMetadata"];
-  customMetadata?: Record<string, string>;
-}
-
-/**
- * List objects result
- */
-export interface ListObjectsResult {
-  objects: Array<{
-    key: string;
-    size: number;
-    uploaded: Date;
-    etag?: string;
-    httpMetadata?: ObjectMetadata["httpMetadata"];
-  }>;
-  truncated: boolean;
-  cursor?: string;
-  delimitedPrefixes?: string[];
+  body: ReadableStream<Uint8Array> | null;
+  contentType?: string;
+  etag?: string;
+  byteLength?: number;
 }
 
 /**
- * Object storage interface - abstracts R2Bucket
+ * Provider-neutral object storage seam.
+ *
+ * Implementations expose only the operations used by production code. Object
+ * enumeration and separate metadata probes are intentionally not part of the
+ * contract; batch deletion is represented by passing an array of keys.
  */
-export interface IObjectStorage {
+export interface ObjectStore {
   put(
     key: string,
-    value: Blob | ReadableStream | ArrayBuffer | string,
-    options?: {
-      httpMetadata?: ObjectMetadata["httpMetadata"];
-      customMetadata?: Record<string, string>;
-    },
+    value: ObjectStoreBody,
+    options?: ObjectStorePutOptions,
   ): Promise<void>;
 
-  get(key: string): Promise<StorageObject | null>;
-
-  delete(key: string | string[]): Promise<void>;
-
-  list(options?: {
-    prefix?: string;
-    limit?: number;
-    cursor?: string;
-    delimiter?: string;
-  }): Promise<ListObjectsResult>;
+  get(key: string): Promise<ObjectStoreObject | null>;
 
-  head(key: string): Promise<ObjectMetadata | null>;
+  delete(key: string | readonly string[]): Promise<void>;
 }
 
 /**
@@ -182,7 +150,7 @@ export interface IStaticAssets {
  */
 export interface RuntimeEnv {
   db: IDatabase;
-  storage?: IObjectStorage;
+  storage?: ObjectStore;
   kv?: IKeyValueStore;
   assets?: IStaticAssets;
 

package/src/backend/server.ts

@@ -89,6 +89,11 @@ type LocalRuntimeEnvKey = Exclude<keyof EnvVars, "APP_URL">;
 // setting without an explicit local-runtime decision, instead of silently
 // dropping authority/security configuration such as OIDC_OWNER_SUB.
 const ENV_PASSTHROUGH_KEY_SET: Record<LocalRuntimeEnvKey, true> = {
+  // Carried so a shared env file reads the same everywhere, but nothing here
+  // consults it: this server builds the runtime ports directly from its own
+  // compat classes rather than wrapping a Worker's bindings, so it is neither
+  // the `cloudflare` nor the `portable` lane. See runtime/lane.ts.
+  YURUCOMMU_RUNTIME_LANE: true,
   ENABLE_TAKOS_TOOLS: true,
   AUTH_PASSWORD_HASH: true,
   GOOGLE_CLIENT_ID: true,

package/src/backend/types.ts

@@ -1,7 +1,7 @@
 import type { Database } from "../db/index.ts";
 import type {
   IKeyValueStore,
-  IObjectStorage,
+  ObjectStore,
   IStaticAssets,
 } from "./runtime/types.ts";
 import type { IQueueProducer } from "./runtime/queue.ts";
@@ -16,6 +16,15 @@ import type {
 export interface EnvVars {
   APP_URL: string;
 
+  // What shape the Worker's bindings arrive in. Unset (or "cloudflare") = raw
+  // Cloudflare bindings, which is also what an ordinary-Workers Takoserver
+  // backend projects; "portable" = the edge.sql / edge.kv / edge.objects /
+  // edge.queue facades a wrapper host (self-host, managed
+  // Workers-for-Platforms) projects. The value is checked against the bindings
+  // and a disagreement refuses to start — see runtime/lane.ts and
+  // docs/design/runtime-lanes.md.
+  YURUCOMMU_RUNTIME_LANE?: string;
+
   // Takos-specific endpoints are opt-in (fail-close by default).
   ENABLE_TAKOS_TOOLS?: string;
 
@@ -133,8 +142,8 @@ export interface EnvVars {
 /**
  * Application Environment
  *
- * Uses the runtime-neutral `I*` contracts. The Cloudflare worker entry
- * wraps the native `D1Database` / `R2Bucket` / `KVNamespace` / `Fetcher`
+ * Uses the runtime-neutral contracts. The Cloudflare worker entry
+ * wraps the native `D1Database` / object bucket / `KVNamespace` / `Fetcher`
  * bindings with the adapters in `runtime/cloudflare.ts` before handing
  * the Env to Hono. The local runtime compatibility classes already
  * implement these contracts directly.
@@ -145,7 +154,7 @@ export interface EnvVars {
  */
 export type Env = {
   DB_INSTANCE: Database;
-  MEDIA?: IObjectStorage;
+  MEDIA?: ObjectStore;
   KV: IKeyValueStore;
   ASSETS?: IStaticAssets;
   DELIVERY_QUEUE?: IQueueProducer<DeliveryQueueMessageV1>;

package/src/db/index.ts

@@ -18,12 +18,13 @@ import { drizzle as drizzleD1, type DrizzleD1Database } from "drizzle-orm/d1";
 import type { LibSQLDatabase } from "drizzle-orm/libsql";
 import type { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
 import type { ResultSet } from "@libsql/client";
+import type { SqliteRemoteResult } from "drizzle-orm/sqlite-proxy";
 import { isNull } from "drizzle-orm";
 import * as schema from "./schema.ts";
 
 export type Database = BaseSQLiteDatabase<
   "async",
-  D1Result | ResultSet,
+  D1Result | ResultSet | SqliteRemoteResult,
   typeof schema
 >;