@takosjp/yurucommu-core 3.0.2 → 3.2.0

package/packages/api/src/lib/api/stories.ts

@@ -1,4 +1,9 @@
-import type { ActorStories, Story, StoryOverlay } from "../../types/index.ts";
+import type {
+  ActorStories,
+  Story,
+  StoryOverlay,
+  StoryViewersResponse,
+} from "../../types/index.ts";
 import { normalizeActorStories, normalizeStory } from "./normalize.ts";
 import { apiDelete, apiFetch, apiPost, assertOk } from "./fetch.ts";
 
@@ -78,3 +83,13 @@ export async function shareStory(
   await assertOk(res, "Failed to share story");
   return (await res.json()) as { shared: boolean; share_count: number };
 }
+
+// Author-only "seen by" list for a story. GETs the same id-encoded path the
+// sibling like/share routes use.
+export async function getStoryViewers(
+  apId: string,
+): Promise<StoryViewersResponse> {
+  const res = await apiFetch(`/api/stories/${encodeURIComponent(apId)}/views`);
+  await assertOk(res, "Failed to fetch story viewers");
+  return (await res.json()) as StoryViewersResponse;
+}

package/packages/api/src/lib/api.ts

@@ -7,6 +7,7 @@ export * from "./api/posts.ts";
 export * from "./api/communities.ts";
 export * from "./api/dm.ts";
 export * from "./api/notifications.ts";
+export * from "./api/browser-push.ts";
 export * from "./api/search.ts";
 export * from "./api/media.ts";
 export * from "./api/stories.ts";

package/packages/api/src/social-server.ts

@@ -28,6 +28,8 @@ export interface SocialServerDiscovery {
     readonly timeline: string;
     readonly conversations: string;
     readonly notifications: string;
+    readonly notificationPushers: string;
+    /** @deprecated Use notificationPushers. */
     readonly mobilePushRegistrations: string;
   };
 }

package/packages/api/src/types/index.ts

@@ -102,6 +102,8 @@ export interface DMMessage {
   id: string;
   sender: DMSender;
   content: string;
+  /** Media attachments (image/video), same shape as post attachments. */
+  attachments?: MediaAttachment[];
   created_at: string;
 }
 
@@ -120,10 +122,47 @@ export interface Notification {
   type: "follow" | "follow_request" | "like" | "announce" | "reply" | "mention";
   actor: NotificationActor;
   object_ap_id: string | null;
+  target_kind: "post" | "story" | "profile" | "community" | "notifications";
+  target_id: string | null;
+  /** Same-origin in-app path. Clients must not treat this as an external URL. */
+  target_url: string;
   read: boolean;
   created_at: string;
 }
 
+export type NotificationPusherProduct = "yurucommu" | "yurume";
+
+export interface NotificationPusherInput {
+  kind: "http";
+  app_id: string;
+  pushkey: string;
+  app_display_name?: string;
+  device_display_name?: string;
+  profile_tag?: string;
+  lang?: string;
+  data: {
+    url: string;
+    format?: "event_id_only" | "full";
+    [key: string]: unknown;
+  };
+}
+
+export interface NotificationPusherRegistration {
+  id: string;
+  kind: "http";
+  app_id: string;
+  app_display_name?: string;
+  device_display_name?: string;
+  profile_tag?: string;
+  lang?: string;
+  data: Record<string, unknown>;
+  gateway_url: string;
+  product: NotificationPusherProduct;
+  scope: string | null;
+  registered_at: string;
+  last_seen_at: string;
+}
+
 // Story attachment (image or video)
 export interface StoryAttachment {
   type: string; // "Document" or "Video"
@@ -150,7 +189,6 @@ export interface StoryOverlay {
   // Question-specific
   name?: string; // Question text
   oneOf?: Array<{ type: string; name: string }>; // Options
-  closed?: string; // Close time
   // Link-specific
   href?: string;
   // Generic
@@ -184,6 +222,18 @@ export interface ActorStories {
   has_unviewed: boolean;
 }
 
+// A single viewer in a story's "seen by" list (author-only).
+export interface StoryViewer {
+  actor: PostAuthor;
+  viewed_at: string;
+}
+
+// Response of GET /api/stories/:id/views (author-only "seen by").
+export interface StoryViewersResponse {
+  view_count: number;
+  viewers: StoryViewer[];
+}
+
 // Short-lived actor status note. This is the Instagram-Notes-style current
 // status surface, not the ActivityPub `Note` object used for normal posts.
 export interface ActorNote {

package/src/backend/index.ts

@@ -1,5 +1,6 @@
 import { Hono, type Context } from "hono";
 import { MOBILE_PUSH_REGISTRATION_PATH } from "./lib/mobile-contract.ts";
+import { NOTIFICATION_PUSHER_REGISTRATION_PATH } from "./lib/notification-pusher-contract.ts";
 import type { Env, EnvVars, Variables } from "./types.ts";
 import { extractActorFromSession } from "./lib/session-actor.ts";
 import { isBackendPath } from "./lib/backend-paths.ts";
@@ -27,6 +28,7 @@ import recommendationsRoutes from "./routes/recommendations.ts";
 import { moderationRoutes } from "./routes/moderation.ts";
 import { appsApiRoutes, appsServeRoutes } from "./routes/apps.ts";
 import mobileRoutes from "./routes/mobile.ts";
+import notificationPusherRoutes from "./routes/notification-pushers.ts";
 
 import { rateLimit, RateLimitConfigs } from "./middleware/rate-limit.ts";
 import { csrfProtection } from "./middleware/csrf.ts";
@@ -38,6 +40,7 @@ import {
 import { logger } from "./lib/logger.ts";
 
 const log = logger.child({ component: "backend.index" });
+let lastNotificationPushRecoverySweep = 0;
 import type { MessageBatch } from "@cloudflare/workers-types";
 import type {
   DeliveryDlqMessageV1,
@@ -47,6 +50,7 @@ import {
   handleDeliveryDlqBatch,
   handleDeliveryQueueBatch,
 } from "./lib/delivery/queue.ts";
+import { enqueuePendingNotificationPushJobs } from "./lib/notification-push.ts";
 
 type YurucommuApp = Hono<{ Bindings: Env; Variables: Variables }>;
 
@@ -106,6 +110,7 @@ const DEFAULT_DISCOVERY_OPTIONS = {
     "activitypub.server.v1",
     "client.yurucommu.feed.v1",
     "client.yurume.messages.v1",
+    "notification.pushers.v1",
   ],
 } satisfies Required<YurucommuBackendDiscoveryOptionsV1>;
 
@@ -245,6 +250,8 @@ function buildSocialServerDiscovery(
       timeline: `${appUrl}/api/timeline`,
       conversations: `${appUrl}/api/dm/contacts`,
       notifications: `${appUrl}/api/notifications`,
+      notificationPushers: `${appUrl}${NOTIFICATION_PUSHER_REGISTRATION_PATH}`,
+      // Retained for older mobile clients. New clients use notificationPushers.
       mobilePushRegistrations: `${appUrl}${MOBILE_PUSH_REGISTRATION_PATH}`,
     },
   };
@@ -545,6 +552,27 @@ function applyGlobalMiddleware(app: YurucommuApp): void {
   app.use("*", async (c, next) => {
     c.set("db", c.env.DB_INSTANCE);
     await next();
+
+    // Every unread inbox insert is captured by the DB outbox trigger. Flush it
+    // after the request instead of wiring every follow/like/story/DM write path
+    // separately (which is both leak- and duplicate-prone). Queue binding is
+    // optional; when absent this is an immediate no-op and the durable rows stay
+    // pending until a correctly configured runtime handles later traffic.
+    const method = c.req.method.toUpperCase();
+    const now = Date.now();
+    const mutating = !["GET", "HEAD", "OPTIONS"].includes(method);
+    const recoveryDue = now - lastNotificationPushRecoverySweep >= 60_000;
+    if (mutating || recoveryDue) {
+      if (recoveryDue) lastNotificationPushRecoverySweep = now;
+      try {
+        await enqueuePendingNotificationPushJobs(c.env);
+      } catch (error) {
+        log.error("Failed to enqueue notification push outbox", {
+          event: "notification.push.enqueue_failed",
+          error,
+        });
+      }
+    }
   });
 
   app.use("/api/*", async (c, next) => {
@@ -690,6 +718,7 @@ function mountCoreRoutes(app: YurucommuApp): void {
   });
 
   app.route("/api/notifications", notificationsRoutes);
+  app.route("/api/notifications/pushers", notificationPusherRoutes);
   app.route("/api/mobile", mobileRoutes);
   app.route("/api/stories", storiesRoutes);
   app.route("/api/search", searchRoutes);

package/src/backend/lib/delivery/queue.ts

@@ -21,6 +21,10 @@ import { computeDeliveryJobId, safeEndpointHost } from "./transformers.ts";
 import { emitMetric } from "./metrics.ts";
 import { logger } from "../logger.ts";
 import { filterBlockedActorApIds, isActorBlocked } from "../blocklist.ts";
+import {
+  enqueuePendingNotificationPushJobs,
+  processNotificationPushJob,
+} from "../notification-push.ts";
 
 const log = logger.child({ component: "delivery.queue" });
 
@@ -471,6 +475,9 @@ export async function handleDeliveryQueueBatch(
         case "reconcile_job":
           await processReconcileJob(db, env, body, message);
           break;
+        case "notification_push":
+          await processNotificationPushJob(env, body, message);
+          break;
         default:
           assertNever(body);
       }
@@ -512,6 +519,17 @@ export async function handleDeliveryQueueBatch(
       }
     },
   );
+
+  // Community fanout can create local inbox rows inside this consumer rather
+  // than an HTTP request. Flush the same DB-triggered outbox choke point here.
+  try {
+    await enqueuePendingNotificationPushJobs(env);
+  } catch (error) {
+    log.error("Failed to enqueue notification push outbox", {
+      event: "notification.push.enqueue_failed",
+      error,
+    });
+  }
 }
 
 export async function handleDeliveryDlqBatch(

package/src/backend/lib/delivery/types.ts

@@ -60,12 +60,24 @@ export type DeliveryReconcileJobMessageV1 = {
   scheduledAt: string; // ISO8601 UTC
 };
 
+/**
+ * Product notification delivery. The queue carries only the durable outbox id;
+ * device pushkeys, gateway URLs, and notification content remain in the DB.
+ */
+export type DeliveryNotificationPushMessageV1 = {
+  version: typeof DELIVERY_QUEUE_MESSAGE_VERSION;
+  type: "notification_push";
+  jobId: string;
+  scheduledAt: string; // ISO8601 UTC
+};
+
 export type DeliveryQueueMessageV1 =
   | DeliveryFanoutFollowersMessageV1
   | DeliveryFanoutCommunityMessageV1
   | DeliveryResolveActorMessageV1
   | DeliveryDeliverEndpointMessageV1
-  | DeliveryReconcileJobMessageV1;
+  | DeliveryReconcileJobMessageV1
+  | DeliveryNotificationPushMessageV1;
 
 export type DeliveryDlqMessageV1 = {
   version: typeof DELIVERY_QUEUE_MESSAGE_VERSION;
@@ -116,6 +128,8 @@ export function isDeliveryQueueMessageV1(
         typeof v.reconcileAttempt === "number" &&
         typeof v.scheduledAt === "string"
       );
+    case "notification_push":
+      return typeof v.jobId === "string" && typeof v.scheduledAt === "string";
     default:
       return false;
   }