Merge tag '2.1.5'

dahlia · dahlia · commit 41046619b0b4 · 2026-04-08T15:16:22.000+09:00
Fedify 2.1.5
diff --git a/CHANGES.md b/CHANGES.md
@@ -59,6 +59,43 @@ To be released.
 [#656]: https://github.com/fedify-dev/fedify/pull/656
 
 
+Version 2.1.5
+-------------
+
+Released on April 8, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `Context.getActorKeyPairs()` assigning the same key ID to both
+    the `CryptographicKey` (used for HTTP Signatures and Linked Data
+    Signatures) and the `Multikey` (used for Object Integrity Proofs) within
+    an `ActorKeyPair`.  The `Multikey` now receives a distinct ID
+    (`#multikey-1`, `#multikey-2`, …) so that the actor document no longer
+    contains two objects sharing the same `id`, which was invalid JSON-LD.
+    Object Integrity Proof signatures now reference the correct `Multikey` ID
+    instead of the `CryptographicKey` ID.  [[#663]]
+
+ -  Object Integrity Proofs signing now takes place before activity fanout,
+    so all recipients receive the same pre-signed activity.  Previously, OIP
+    signing was deferred until after fanout, meaning each fanout worker would
+    re-sign independently with potentially different timestamps and the fanout
+    message itself contained an unsigned activity.
+
+[#663]: https://github.com/fedify-dev/fedify/issues/663
+
+### @fedify/cfworkers
+
+ -  Fixed a remaining TypeScript type mismatch for Cloudflare Workers users who
+    pass `wrangler types` or `@cloudflare/vite-plugin` generated KV bindings to
+    `WorkersKvStore`.  The package now accepts a minimal structural KV binding
+    interface for `WorkersKvStore` and `WorkersMessageQueue`'s `orderingKv`
+    option instead of requiring the nominal `KVNamespace` type imported from
+    `@cloudflare/workers-types`, so generated local declarations compile
+    without casts or `@ts-expect-error`.  [[#665]]
+
+[#665]: https://github.com/fedify-dev/fedify/issues/665
+
+
 Version 2.1.4
 -------------
 
@@ -349,6 +386,39 @@ Released on March 24, 2026.
 [#599]: https://github.com/fedify-dev/fedify/pull/599
 
 
+Version 2.0.12
+--------------
+
+Released on April 8, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `Context.getActorKeyPairs()` assigning the same key ID to both
+    the `CryptographicKey` (used for HTTP Signatures and Linked Data
+    Signatures) and the `Multikey` (used for Object Integrity Proofs) within
+    an `ActorKeyPair`.  The `Multikey` now receives a distinct ID
+    (`#multikey-1`, `#multikey-2`, …) so that the actor document no longer
+    contains two objects sharing the same `id`, which was invalid JSON-LD.
+    Object Integrity Proof signatures now reference the correct `Multikey` ID
+    instead of the `CryptographicKey` ID.  [[#663]]
+
+ -  Object Integrity Proofs signing now takes place before activity fanout,
+    so all recipients receive the same pre-signed activity.  Previously, OIP
+    signing was deferred until after fanout, meaning each fanout worker would
+    re-sign independently with potentially different timestamps and the fanout
+    message itself contained an unsigned activity.
+
+### @fedify/cfworkers
+
+ -  Fixed a remaining TypeScript type mismatch for Cloudflare Workers users who
+    pass `wrangler types` or `@cloudflare/vite-plugin` generated KV bindings to
+    `WorkersKvStore`.  The package now accepts a minimal structural KV binding
+    interface for `WorkersKvStore` and `WorkersMessageQueue`'s `orderingKv`
+    option instead of requiring the nominal `KVNamespace` type imported from
+    `@cloudflare/workers-types`, so generated local declarations compile
+    without casts or `@ts-expect-error`.  [[#665]]
+
+
 Version 2.0.11
 --------------
 
@@ -1151,6 +1221,29 @@ Released on February 22, 2026.
 [#351]: https://github.com/fedify-dev/fedify/issues/351
 
 
+Version 1.10.8
+--------------
+
+Released on April 8, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `Context.getActorKeyPairs()` assigning the same key ID to both
+    the `CryptographicKey` (used for HTTP Signatures and Linked Data
+    Signatures) and the `Multikey` (used for Object Integrity Proofs) within
+    an `ActorKeyPair`.  The `Multikey` now receives a distinct ID
+    (`#multikey-1`, `#multikey-2`, …) so that the actor document no longer
+    contains two objects sharing the same `id`, which was invalid JSON-LD.
+    Object Integrity Proof signatures now reference the correct `Multikey` ID
+    instead of the `CryptographicKey` ID.  [[#663]]
+
+ -  Object Integrity Proofs signing now takes place before activity fanout,
+    so all recipients receive the same pre-signed activity.  Previously, OIP
+    signing was deferred until after fanout, meaning each fanout worker would
+    re-sign independently with potentially different timestamps and the fanout
+    message itself contained an unsigned activity.
+
+
 Version 1.10.7
 --------------
 
@@ -1351,6 +1444,29 @@ Released on December 24, 2025.
  -  Implemented `list()` method in `WorkersKvStore`.  [[#498], [#500]]
 
 
+Version 1.9.9
+-------------
+
+Released on April 8, 2026.
+
+### @fedify/fedify
+
+ -  Fixed `Context.getActorKeyPairs()` assigning the same key ID to both
+    the `CryptographicKey` (used for HTTP Signatures and Linked Data
+    Signatures) and the `Multikey` (used for Object Integrity Proofs) within
+    an `ActorKeyPair`.  The `Multikey` now receives a distinct ID
+    (`#multikey-1`, `#multikey-2`, …) so that the actor document no longer
+    contains two objects sharing the same `id`, which was invalid JSON-LD.
+    Object Integrity Proof signatures now reference the correct `Multikey` ID
+    instead of the `CryptographicKey` ID.  [[#663]]
+
+ -  Object Integrity Proofs signing now takes place before activity fanout,
+    so all recipients receive the same pre-signed activity.  Previously, OIP
+    signing was deferred until after fanout, meaning each fanout worker would
+    re-sign independently with potentially different timestamps and the fanout
+    message itself contained an unsigned activity.
+
+
 Version 1.9.8
 -------------
 
diff --git a/packages/cfworkers/package.json b/packages/cfworkers/package.json
@@ -66,6 +66,7 @@
     "build": "pnpm --filter @fedify/cfworkers... run build:self",
     "prepack": "pnpm build",
     "prepublish": "pnpm build",
-    "test": "vitest run"
+    "pretest": "pnpm build",
+    "test": "tsc -p test/typecheck/tsconfig.json --noEmit && vitest run"
   }
 }
diff --git a/packages/cfworkers/src/mod.ts b/packages/cfworkers/src/mod.ts
@@ -8,11 +8,7 @@
  * @module
  * @since 1.9.0
  */
-import type {
-  KVNamespace,
-  MessageSendRequest,
-  Queue,
-} from "@cloudflare/workers-types";
+import type { MessageSendRequest, Queue } from "@cloudflare/workers-types";
 import type {
   KvKey,
   KvStore,
@@ -27,6 +23,67 @@ interface KvMetadata {
   expires?: number;
 }
 
+interface WorkersKvNamespaceGetWithMetadataResult<Value, Metadata> {
+  readonly value: Value | null;
+  readonly metadata: Metadata | null;
+}
+
+interface WorkersKvNamespaceListKey<Metadata, Key extends string = string> {
+  readonly name: Key;
+  readonly expiration?: number;
+  readonly metadata?: Metadata;
+}
+
+interface WorkersKvNamespaceListResult<Metadata, Key extends string = string> {
+  readonly list_complete: boolean;
+  readonly keys: readonly WorkersKvNamespaceListKey<Metadata, Key>[];
+  readonly cursor?: string;
+}
+
+interface WorkersKvNamespaceListOptions {
+  readonly limit?: number;
+  readonly prefix?: string | null;
+  readonly cursor?: string | null;
+}
+
+interface WorkersKvNamespacePutOptions {
+  readonly expiration?: number;
+  readonly expirationTtl?: number;
+  readonly metadata?: unknown;
+}
+
+/**
+ * Minimal Cloudflare Workers KV binding shape used by this package.
+ * Compatible with both `@cloudflare/workers-types` and `wrangler types`
+ * generated declarations.
+ * @since 2.0.12
+ */
+export interface WorkersKvNamespaceLike<Key extends string = string> {
+  get(key: Key): Promise<string | null>;
+  get<ExpectedValue = unknown>(
+    key: Key,
+    type: "json",
+  ): Promise<ExpectedValue | null>;
+  getWithMetadata<Metadata = unknown>(
+    key: Key,
+  ): Promise<WorkersKvNamespaceGetWithMetadataResult<string, Metadata>>;
+  getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+    key: Key,
+    type: "json",
+  ): Promise<
+    WorkersKvNamespaceGetWithMetadataResult<ExpectedValue, Metadata>
+  >;
+  put(
+    key: Key,
+    value: string,
+    options?: WorkersKvNamespacePutOptions,
+  ): Promise<void>;
+  delete(key: Key): Promise<void>;
+  list<Metadata = unknown>(
+    options?: WorkersKvNamespaceListOptions,
+  ): Promise<WorkersKvNamespaceListResult<Metadata, Key>>;
+}
+
 /**
  * Internal message wrapper that includes ordering key metadata.
  */
@@ -74,9 +131,9 @@ export interface ProcessMessageResult {
  * @since 1.9.0
  */
 export class WorkersKvStore implements KvStore {
-  #namespace: KVNamespace<string>;
+  #namespace: WorkersKvNamespaceLike<string>;
 
-  constructor(namespace: KVNamespace<string>) {
+  constructor(namespace: WorkersKvNamespaceLike<string>) {
     this.#namespace = namespace;
   }
 
@@ -202,7 +259,7 @@ export interface WorkersMessageQueueOptions {
    * guarantees are best-effort.  For strict ordering requirements, consider
    * using Durable Objects.
    */
-  readonly orderingKv?: KVNamespace<string>;
+  readonly orderingKv?: WorkersKvNamespaceLike<string>;
 
   /**
    * The prefix for ordering key lock keys.  Defaults to `"__fedify_ordering_"`.
@@ -233,7 +290,7 @@ export interface WorkersMessageQueueOptions {
  */
 export class WorkersMessageQueue implements MessageQueue {
   #queue: Queue;
-  #orderingKv?: KVNamespace<string>;
+  #orderingKv?: WorkersKvNamespaceLike<string>;
   #orderingKeyPrefix: string;
   #orderingLockTtl: number;
 
diff --git a/packages/cfworkers/test/typecheck/tsconfig.json b/packages/cfworkers/test/typecheck/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "./**/*.ts"
+  ]
+}
diff --git a/packages/cfworkers/test/typecheck/wrangler-generated-kv.ts b/packages/cfworkers/test/typecheck/wrangler-generated-kv.ts
@@ -0,0 +1,69 @@
+import type { Queue } from "@cloudflare/workers-types";
+import { WorkersKvStore, WorkersMessageQueue } from "../../dist/mod.js";
+
+interface GeneratedKvGetWithMetadataResult<Value, Metadata> {
+  readonly value: Value | null;
+  readonly metadata: Metadata | null;
+  readonly cacheStatus: string | null;
+}
+
+interface GeneratedKvListKey<Metadata, Key extends string = string> {
+  readonly name: Key;
+  readonly expiration?: number;
+  readonly metadata?: Metadata;
+}
+
+type GeneratedKvListResult<Metadata, Key extends string = string> =
+  | {
+    readonly list_complete: false;
+    readonly keys: readonly GeneratedKvListKey<Metadata, Key>[];
+    readonly cursor: string;
+    readonly cacheStatus: string | null;
+  }
+  | {
+    readonly list_complete: true;
+    readonly keys: readonly GeneratedKvListKey<Metadata, Key>[];
+    readonly cacheStatus: string | null;
+  };
+
+/**
+ * Mirrors the minimal single-key Cloudflare KV declaration shape emitted by
+ * `wrangler types`, but comes from a distinct local declaration source.
+ */
+interface GeneratedKvNamespace<Key extends string = string> {
+  get(key: Key): Promise<string | null>;
+  get<ExpectedValue = unknown>(
+    key: Key,
+    type: "json",
+  ): Promise<ExpectedValue | null>;
+  getWithMetadata<Metadata = unknown>(
+    key: Key,
+  ): Promise<GeneratedKvGetWithMetadataResult<string, Metadata>>;
+  getWithMetadata<ExpectedValue = unknown, Metadata = unknown>(
+    key: Key,
+    type: "json",
+  ): Promise<GeneratedKvGetWithMetadataResult<ExpectedValue, Metadata>>;
+  put(
+    key: Key,
+    value: string | ArrayBuffer | ArrayBufferView | ReadableStream,
+    options?: {
+      expiration?: number;
+      expirationTtl?: number;
+      metadata?: any | null;
+    },
+  ): Promise<void>;
+  delete(key: Key): Promise<void>;
+  list<Metadata = unknown>(
+    options?: {
+      limit?: number;
+      prefix?: string | null;
+      cursor?: string | null;
+    },
+  ): Promise<GeneratedKvListResult<Metadata, Key>>;
+}
+
+declare const queue: Queue;
+declare const generatedKv: GeneratedKvNamespace<string>;
+
+new WorkersKvStore(generatedKv);
+new WorkersMessageQueue(queue, { orderingKv: generatedKv });
diff --git a/packages/fedify/src/federation/context.ts b/packages/fedify/src/federation/context.ts
@@ -876,7 +876,10 @@ export interface GetSignedKeyOptions {
  */
 export interface ActorKeyPair extends CryptoKeyPair {
   /**
-   * The URI of the public key, which is used for verifying HTTP Signatures.
+   * The URI of the public key for {@link CryptographicKey}, which is used for
+   * verifying HTTP Signatures and Linked Data Signatures.  Note that this is
+   * the ID of the {@link cryptographicKey}, not of the {@link multikey};
+   * the {@link Multikey} instance has a distinct ID of its own.
    */
   readonly keyId: URL;
 
diff --git a/packages/fedify/src/federation/middleware.test.ts b/packages/fedify/src/federation/middleware.test.ts
diff --git a/packages/fedify/src/federation/middleware.ts b/packages/fedify/src/federation/middleware.ts

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@`
`66`	`66`	`"build": "pnpm --filter @fedify/cfworkers... run build:self",`
`67`	`67`	`"prepack": "pnpm build",`
`68`	`68`	`"prepublish": "pnpm build",`
`69`		`- "test": "vitest run"`
	`69`	`+ "pretest": "pnpm build",`
	`70`	`+ "test": "tsc -p test/typecheck/tsconfig.json --noEmit && vitest run"`
`70`	`71`	`}`
`71`	`72`	`}`