Merge branch 'main' into main

Author: 2chanhaeng

CHANGES.md

@@ -59,6 +59,35 @@ To be released.
 [#656]: https://github.com/fedify-dev/fedify/pull/656
 
 
+Version 2.1.4
+-------------
+
+Released on April 7, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `sendActivity()` not awaiting `fanoutQueue.enqueue()` in the fanout
+    path, which could cause fanout messages to be silently dropped on runtimes
+    like Cloudflare Workers that may terminate an isolate as soon as the
+    response is sent.  [[#661]]
+
+[#661]: https://github.com/fedify-dev/fedify/issues/661
+
+### @fedify/cfworkers
+
+ -  Fixed a TypeScript type mismatch that occurred when passing
+    `wrangler types`-generated binding types (e.g. `KVNamespace`, `Queue`)
+    to `WorkersKvStore` and `WorkersMessageQueue` constructors.  The package
+    previously imported these types from
+    `@cloudflare/workers-types/experimental`, which includes extra members
+    (such as `KVNamespace.deleteBulk()`) absent from types generated by
+    `wrangler types`, causing TypeScript assignment errors at the call site.
+    The import now uses the stable `@cloudflare/workers-types` entrypoint,
+    whose definitions match what `wrangler types` generates.  [[#662]]
+
+[#662]: https://github.com/fedify-dev/fedify/issues/662
+
+
 Version 2.1.3
 -------------
 
@@ -320,6 +349,31 @@ Released on March 24, 2026.
 [#599]: https://github.com/fedify-dev/fedify/pull/599
 
 
+Version 2.0.11
+--------------
+
+Released on April 7, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `sendActivity()` not awaiting `fanoutQueue.enqueue()` in the fanout
+    path, which could cause fanout messages to be silently dropped on runtimes
+    like Cloudflare Workers that may terminate an isolate as soon as the
+    response is sent.  [[#661]]
+
+### @fedify/cfworkers
+
+ -  Fixed a TypeScript type mismatch that occurred when passing
+    `wrangler types`-generated binding types (e.g. `KVNamespace`, `Queue`)
+    to `WorkersKvStore` and `WorkersMessageQueue` constructors.  The package
+    previously imported these types from
+    `@cloudflare/workers-types/experimental`, which includes extra members
+    (such as `KVNamespace.deleteBulk()`) absent from types generated by
+    `wrangler types`, causing TypeScript assignment errors at the call site.
+    The import now uses the stable `@cloudflare/workers-types` entrypoint,
+    whose definitions match what `wrangler types` generates.  [[#662]]
+
+
 Version 2.0.10
 --------------
 
@@ -1097,6 +1151,19 @@ Released on February 22, 2026.
 [#351]: https://github.com/fedify-dev/fedify/issues/351
 
 
+Version 1.10.7
+--------------
+
+Released on April 7, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `sendActivity()` not awaiting `fanoutQueue.enqueue()` in the fanout
+    path, which could cause fanout messages to be silently dropped on runtimes
+    like Cloudflare Workers that may terminate an isolate as soon as the
+    response is sent.  [[#661]]
+
+
 Version 1.10.6
 --------------
 
@@ -1284,6 +1351,19 @@ Released on December 24, 2025.
  -  Implemented `list()` method in `WorkersKvStore`.  [[#498], [#500]]
 
 
+Version 1.9.8
+-------------
+
+Released on April 7, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `sendActivity()` not awaiting `fanoutQueue.enqueue()` in the fanout
+    path, which could cause fanout messages to be silently dropped on runtimes
+    like Cloudflare Workers that may terminate an isolate as soon as the
+    response is sent.  [[#661]]
+
+
 Version 1.9.7
 -------------
 

packages/cfworkers/src/mod.ts

@@ -12,7 +12,7 @@ import type {
   KVNamespace,
   MessageSendRequest,
   Queue,
-} from "@cloudflare/workers-types/experimental";
+} from "@cloudflare/workers-types";
 import type {
   KvKey,
   KvStore,

packages/fedify/src/federation/middleware.test.ts

@@ -3001,6 +3001,88 @@ test("ContextImpl.sendActivity()", async (t) => {
     ]);
   });
 
+  await t.step(
+    "fanout: fanoutQueue.enqueue() is awaited before sendActivity() returns",
+    async () => {
+      // Regression test for <https://github.com/fedify-dev/fedify/issues/661>.
+      // The fanout branch of sendActivityInternal() must await
+      // fanoutQueue.enqueue() so that the message is guaranteed to be
+      // enqueued before sendActivity() returns.  On runtimes like Cloudflare
+      // Workers that may terminate an isolate as soon as the response is sent,
+      // a floating (non-awaited) enqueue() promise can be silently dropped,
+      // causing fanout messages to be lost.
+      //
+      // This test uses a queue whose enqueue() resolves only after a
+      // macro-task delay (setTimeout 0).  If enqueue() is not awaited,
+      // sendActivity() will return before the message is recorded, and the
+      // assertion below will fail.
+      const asyncEnqueued: Message[] = [];
+      const asyncQueue: MessageQueue = {
+        enqueue(message: Message): Promise<void> {
+          return new Promise<void>((resolve) => {
+            setTimeout(() => {
+              asyncEnqueued.push(message);
+              resolve();
+            }, 0);
+          });
+        },
+        async listen(): Promise<void> {},
+      };
+      const fed = new FederationImpl<void>({
+        kv,
+        contextLoaderFactory: () => mockDocumentLoader,
+        queue: asyncQueue,
+        manuallyStartQueue: true,
+      });
+      fed
+        .setActorDispatcher("/{identifier}", async (ctx, identifier) => {
+          if (identifier !== "john") return null;
+          const keys = await ctx.getActorKeyPairs(identifier);
+          return new vocab.Person({
+            id: ctx.getActorUri(identifier),
+            preferredUsername: "john",
+            publicKey: keys[0].cryptographicKey,
+            assertionMethods: keys.map((k) => k.multikey),
+          });
+        })
+        .setKeyPairsDispatcher((_ctx, identifier) => {
+          if (identifier !== "john") return [];
+          return [
+            { privateKey: rsaPrivateKey2, publicKey: rsaPublicKey2.publicKey! },
+            {
+              privateKey: ed25519PrivateKey,
+              publicKey: ed25519PublicKey.publicKey!,
+            },
+          ];
+        });
+      const ctx3 = new ContextImpl({
+        data: undefined,
+        federation: fed,
+        url: new URL("https://example.com/"),
+        documentLoader: mockDocumentLoader,
+        contextLoader: mockDocumentLoader,
+      });
+      const activity = new vocab.Create({
+        id: new URL("https://example.com/activity/1"),
+        actor: new URL("https://example.com/person"),
+      });
+      await ctx3.sendActivity(
+        { username: "john" },
+        {
+          id: new URL("https://example.com/recipient"),
+          inboxId: new URL("https://example.com/inbox"),
+        },
+        activity,
+        { fanout: "force" },
+      );
+      assertEquals(
+        asyncEnqueued.length,
+        1,
+        "fanoutQueue.enqueue() must be awaited before sendActivity() returns",
+      );
+    },
+  );
+
   collectionSyncHeader = null;
 
   await t.step("followers collection without syncCollection", async () => {

packages/fedify/src/federation/middleware.ts

@@ -2363,7 +2363,7 @@ export class ContextImpl<TContextData> implements Context<TContextData> {
     if (!this.federation.manuallyStartQueue) {
       this.federation._startQueueInternal(this.data);
     }
-    this.federation.fanoutQueue.enqueue(
+    await this.federation.fanoutQueue.enqueue(
       message,
       { orderingKey: options.orderingKey },
     );