@takosjp/yurucommu-core 3.4.5 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takosjp/yurucommu-core",
-  "version": "3.4.5",
+  "version": "4.0.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.0.0",
   "description": "Typed client SDK and public API contract for yurucommu-server clients.",
   "license": "AGPL-3.0-only",
   "type": "module",

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

@@ -38,11 +38,16 @@ export {
 } from "./runtime/managed-relational.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

@@ -235,7 +235,7 @@ media.post("/upload", async (c) => {
     // memory budget.
     if (isVideo) {
       await media.put(r2Key, file, {
-        httpMetadata: { contentType },
+        contentType,
       });
     } else {
       const original = new Uint8Array(await file.arrayBuffer());
@@ -247,7 +247,7 @@ media.post("/upload", async (c) => {
         cleaned.byteOffset + cleaned.byteLength,
       ) as ArrayBuffer;
       await media.put(r2Key, cleanedBuffer, {
-        httpMetadata: { contentType },
+        contentType,
       });
     }
 
@@ -579,13 +579,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