Merge branch 'fix/redismq' of https://github.com/sij411/fedify into fix/redismq

sij411 · sij411 · commit 4da192152302 · 2026-01-24T15:49:45.000+09:00
diff --git a/.hongdown.toml b/.hongdown.toml
@@ -3,6 +3,7 @@ include = ["*.md", "**/*.md"]
 exclude = [
   "**/node_modules/**",
   "**/dist/**",
+  ".github/copilot-instructions.md",
   "AGENT.md",
   "CLAUDE.md",
   "GEMINI.md",
diff --git a/AGENTS.md b/AGENTS.md
diff --git a/CHANGES.md b/CHANGES.md
@@ -313,6 +313,21 @@ To be released.
 [#532]: https://github.com/fedify-dev/fedify/pull/532
 
 
+Version 1.10.2
+--------------
+
+Released on January 23, 2026.
+
+### @fedify/testing
+
+ -  Fixed `TestContext.getActorKeyPairs()` returning empty array instead of
+    calling registered key pairs dispatcher.  The method now properly invokes
+    the key pairs dispatcher when it is registered via
+    `setKeyPairsDispatcher()`. [[#530]]
+
+[#530]: https://github.com/fedify-dev/fedify/issues/530
+
+
 Version 1.10.1
 --------------
 
@@ -325,8 +340,6 @@ Released on January 22, 2026.
     invoke actor and object dispatchers when they are registered via
     `setActorDispatcher()` and `setObjectDispatcher()`.  [[#530]]
 
-[#530]: https://github.com/fedify-dev/fedify/issues/530
-
 
 Version 1.10.0
 --------------
@@ -425,6 +438,19 @@ Released on December 24, 2025.
  -  Implemented `list()` method in `WorkersKvStore`.  [[#498], [#500]]
 
 
+Version 1.9.4
+-------------
+
+Released on January 23, 2026.
+
+### @fedify/testing
+
+ -  Fixed `TestContext.getActorKeyPairs()` returning empty array instead of
+    calling registered key pairs dispatcher.  The method now properly invokes
+    the key pairs dispatcher when it is registered via
+    `setKeyPairsDispatcher()`. [[#530]]
+
+
 Version 1.9.3
 -------------
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -321,9 +321,9 @@ The repository is organized as a monorepo with the following packages:
 
  -  *packages/fedify/*: The main Fedify library (@fedify/fedify).  The library
     is built with Deno, and tested with Deno, Node.js, and [Bun].
-     -  *src/codegen/*: The code generation scripts.
- -  *packages/cli/*: The Fedify CLI (@fedify/cli).  The CLI is built with
-    [Deno].
+ -  *packages/cli/*: The Fedify CLI (@fedify/cli).  Built with [Deno] and
+    tested with Deno, Node.js, and [Bun].  Uses `deno compile` to create
+    standalone executables.
  -  *packages/amqp/*: AMQP/RabbitMQ driver (@fedify/amqp) for Fedify.
  -  *packages/cfworkers/*: Cloudflare Workers integration (@fedify/cfworkers) for
     Fedify.
@@ -344,10 +344,15 @@ The repository is organized as a monorepo with the following packages:
  -  *packages/sqlite/*: SQLite driver (@fedify/sqlite) for Fedify.
  -  *packages/sveltekit/*: SvelteKit integration (@fedify/sveltekit) for Fedify.
  -  *packages/testing/*: Testing utilities (@fedify/testing) for Fedify.
+ -  *packages/vocab/*: Activity Vocabulary library (@fedify/vocab) for Fedify.
  -  *packages/vocab-runtime/*: Runtime library for code-generated vocab
     (@fedify/vocab-runtime) for Fedify.
  -  *packages/vocab-tools/*: Code generation tools for Activity Vocabulary
     (@fedify/vocab-tools) for Fedify.
+ -  *packages/webfinger/*: WebFinger client library (@fedify/webfinger) for
+    ActivityPub.
+ -  *packages/fixture/*: Testing utilities (@fedify/fixture) providing
+    runtime-agnostic test adapters.
  -  *docs/*: The Fedify docs.  The docs are built with [Node.js] and
     [VitePress].
  -  *examples/*: The example projects.  Some examples are built with Deno, and
@@ -434,10 +439,11 @@ the `fedify lookup` subcommand, you can run the following command:
 mise run cli -- lookup @fedify@hollo.social
 ~~~~
 
-> [!TIP]
+> [!NOTE]
 >
-> Unlike the Fedify library, the Fedify CLI does not have to be tested with
-> Node.js and Bun; you can test the CLI with Deno only.
+> The Fedify CLI is tested with Deno, Node.js, and Bun like other packages.
+> However, for quick local testing during development, `mise run cli` uses
+> Deno directly without requiring a full multi-runtime test run.
 
 #### Running the tests
 
diff --git a/docs/README.md b/docs/README.md
@@ -19,3 +19,84 @@ to *http://localhost:5173/* to view the docs.
 [VitePress]: https://vitepress.dev/
 [Node.js]: https://nodejs.org/
 [pnpm]: https://pnpm.io/
+
+
+VitePress documentation conventions
+-----------------------------------
+
+The *docs/* directory uses VitePress with additional features beyond standard
+Markdown.
+
+### Twoslash code blocks
+
+Use the `twoslash` modifier to enable TypeScript type checking and hover
+information in code blocks:
+
+~~~~~ markdown
+~~~~ typescript twoslash
+import { createFederation } from "@fedify/fedify";
+
+const federation = createFederation({ kv: undefined! });
+~~~~
+~~~~~
+
+### Fixture variables
+
+When code examples need variables that shouldn't be shown to readers,
+declare them *before* the `// ---cut-before---` directive.  Content before
+this directive is compiled but hidden from display:
+
+~~~~~ markdown
+~~~~ typescript twoslash
+import type { KvStore } from "@fedify/fedify";
+declare const kv: KvStore;
+// ---cut-before---
+import { createFederation } from "@fedify/fedify";
+
+const federation = createFederation({ kv });
+~~~~
+~~~~~
+
+The reader sees only the code after `---cut-before---`, but TypeScript
+checks the entire block including the hidden fixture.
+
+### Code groups
+
+Use code groups to show the same content for different package managers
+or environments:
+
+~~~~~ markdown
+::: code-group
+
+~~~~ bash [Deno]
+deno add jsr:@fedify/fedify
+~~~~
+
+~~~~ bash [npm]
+npm add @fedify/fedify
+~~~~
+
+~~~~ bash [pnpm]
+pnpm add @fedify/fedify
+~~~~
+
+:::
+~~~~~
+
+### Internal links
+
+ -  When linking to other VitePress documents within the *docs/* directory,
+    use inline link syntax (e.g., `[text](./path/to/file.md)`) instead of
+    reference-style links.
+ -  Always use relative paths for internal links.
+ -  Include the `.md` extension in internal link paths.
+
+### Building documentation
+
+~~~~ bash
+mise run docs:build    # Build for production (runs Twoslash type checking)
+mise run docs          # Start development server
+~~~~
+
+Always run `mise run docs:build` before committing to catch Twoslash type
+errors.
diff --git a/mise.toml b/mise.toml
@@ -40,7 +40,13 @@ done
 # Code quality
 [tasks.check]
 description = "Check code formatting, linting, and type checking"
-depends = ["check:fmt", "check:lint", "check:types", "check:md", "check-versions"]
+depends = [
+  "check:fmt",
+  "check:lint",
+  "check:types",
+  "check:md",
+  "check-versions",
+]
 
 [tasks."check:fmt"]
 description = "Check code formatting"
diff --git a/packages/testing/src/mock.test.ts b/packages/testing/src/mock.test.ts
@@ -440,3 +440,73 @@ test("MockContext.getObject() returns null when no dispatcher registered", async
   });
   assertEquals(note, null);
 });
+
+test("MockContext.getActorKeyPairs() calls registered key pairs dispatcher", async () => {
+  const mockFederation = createFederation<void>();
+
+  // Generate a test RSA key pair
+  const keyPair = await crypto.subtle.generateKey(
+    {
+      name: "RSASSA-PKCS1-v1_5",
+      modulusLength: 2048,
+      publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
+      hash: "SHA-256",
+    },
+    true,
+    ["sign", "verify"],
+  );
+
+  // Register actor dispatcher with key pairs dispatcher
+  mockFederation
+    .setActorDispatcher("/users/{identifier}", (ctx, identifier) => {
+      return new Person({
+        id: ctx.getActorUri(identifier),
+        preferredUsername: identifier,
+      });
+    })
+    .setKeyPairsDispatcher((ctx, identifier) => {
+      return [
+        {
+          keyId: new URL(`${ctx.getActorUri(identifier).href}#main-key`),
+          privateKey: keyPair.privateKey,
+          publicKey: keyPair.publicKey,
+        },
+      ];
+    });
+
+  const context = mockFederation.createContext(
+    new URL("https://example.com"),
+    undefined,
+  );
+
+  const keyPairs = await context.getActorKeyPairs("alice");
+
+  assertEquals(keyPairs.length, 1);
+  assertEquals(
+    keyPairs[0].keyId.href,
+    "https://example.com/users/alice#main-key",
+  );
+  assertEquals(keyPairs[0].privateKey, keyPair.privateKey);
+  assertEquals(keyPairs[0].publicKey, keyPair.publicKey);
+  assertEquals(keyPairs[0].cryptographicKey.id?.href, keyPairs[0].keyId.href);
+  assertEquals(
+    keyPairs[0].cryptographicKey.ownerId?.href,
+    "https://example.com/users/alice",
+  );
+  assertEquals(keyPairs[0].multikey.id?.href, keyPairs[0].keyId.href);
+  assertEquals(
+    keyPairs[0].multikey.controllerId?.href,
+    "https://example.com/users/alice",
+  );
+});
+
+test("MockContext.getActorKeyPairs() returns empty array when no dispatcher registered", async () => {
+  const mockFederation = createFederation<void>();
+  const context = mockFederation.createContext(
+    new URL("https://example.com"),
+    undefined,
+  );
+
+  const keyPairs = await context.getActorKeyPairs("alice");
+  assertEquals(keyPairs, []);
+});
diff --git a/packages/testing/src/mock.ts b/packages/testing/src/mock.ts
@@ -10,6 +10,7 @@ import type {
   RequestContext,
   RouteActivityOptions,
 } from "@fedify/fedify/federation";
+import { CryptographicKey, Multikey } from "@fedify/vocab";
 import type {
   Activity,
   Collection,
@@ -179,6 +180,7 @@ class MockFederation<TContextData> implements Federation<TContextData> {
   // types present in Context.tracerProvider (issue #468).
   private webFingerDispatcher?: any;
   public actorDispatchers: Map<string, any> = new Map();
+  public actorKeyPairsDispatcher?: any;
   public actorPath?: string;
   public inboxPath?: string;
   public outboxPath?: string;
@@ -229,7 +231,10 @@ class MockFederation<TContextData> implements Federation<TContextData> {
     this.actorDispatchers.set(path, dispatcher);
     this.actorPath = path;
     return {
-      setKeyPairsDispatcher: () => this as any,
+      setKeyPairsDispatcher: (keyPairsDispatcher: any) => {
+        this.actorKeyPairsDispatcher = keyPairsDispatcher;
+        return this as any;
+      },
       mapHandle: () => this as any,
       mapAlias: () => this as any,
       authorize: () => this as any,
@@ -836,8 +841,32 @@ class MockContext<TContextData> implements Context<TContextData> {
     return null;
   }
 
-  getActorKeyPairs(_identifier: string): Promise<ActorKeyPair[]> {
-    return Promise.resolve([]);
+  async getActorKeyPairs(identifier: string): Promise<ActorKeyPair[]> {
+    if (
+      this.federation instanceof MockFederation &&
+      this.federation.actorKeyPairsDispatcher
+    ) {
+      const keyPairs = await this.federation.actorKeyPairsDispatcher(
+        this,
+        identifier,
+      );
+      // Wrap with CryptographicKey and Multikey objects like real implementation
+      const owner = this.getActorUri(identifier);
+      return keyPairs.map((kp: any) => ({
+        ...kp,
+        cryptographicKey: new CryptographicKey({
+          id: kp.keyId,
+          owner,
+          publicKey: kp.publicKey,
+        }),
+        multikey: new Multikey({
+          id: kp.keyId,
+          controller: owner,
+          publicKey: kp.publicKey,
+        }),
+      }));
+    }
+    return [];
   }
 
   getDocumentLoader(params: any): any {
