@fedify/fedify 2.0.0-dev.1561 → 2.0.0-dev.158

package/dist/{runtime/authdocloader.test.js → utils/docloader.test.js}

@@ -3,25 +3,23 @@
       import { URLPattern } from "urlpattern-polyfill";
       globalThis.addEventListener = () => {};
     
-import { UrlError } from "../type-BMGxK0zE.js";
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
 import { assertEquals } from "../assert_equals-DSbWqCm3.js";
 import "../assert-MZs1qjMx.js";
 import "../assert_instance_of-DHz7EHNU.js";
-import "../lookup-IyAhz9I6.js";
-import "../actor-mhluotIb.js";
-import "../key-olV6hEgm.js";
-import { verifyRequest } from "../http-DTJgsmYR.js";
-import { getAuthenticatedDocumentLoader } from "../authdocloader-CN-tWO4K.js";
-import { mockDocumentLoader, test } from "../testing-DsuOHyiF.js";
-import "../std__assert-X-_kMxKM.js";
-import { assertRejects } from "../assert_rejects-DiIiJbZn.js";
-import "../assert_is_error-BPGph1Jx.js";
-import "../assert_not_equals-f3m3epl3.js";
-import "../assert_throws-BOO88avQ.js";
-import { rsaPrivateKey2 } from "../keys-O0-r0NpJ.js";
-import { esm_default } from "../esm-CtgLSZwm.js";
+import "../deno-CQV858ip.js";
+import "../key-C27c_yHR.js";
+import { verifyRequest } from "../http-CXG5ZFqn.js";
+import { getAuthenticatedDocumentLoader } from "../docloader-Csc8gQux.js";
+import "../std__assert-DWivtrGR.js";
+import { assertRejects } from "../assert_rejects-Ce45JcFg.js";
+import "../assert_throws-BNXdRGWP.js";
+import "../assert_not_equals-C80BG-_5.js";
+import { rsaPrivateKey2 } from "../keys-ZbcByPg9.js";
+import { esm_default } from "../esm-DGl7uK1r.js";
+import { UrlError } from "@fedify/vocab-runtime";
 
-//#region src/runtime/authdocloader.test.ts
+//#region src/utils/docloader.test.ts
 test("getAuthenticatedDocumentLoader()", async (t) => {
 	esm_default.spyGlobal();
 	esm_default.get("begin:https://example.com/object", async (cl) => {

package/dist/utils/kv-cache.test.js

@@ -0,0 +1,211 @@
+
+      import { Temporal } from "@js-temporal/polyfill";
+      import { URLPattern } from "urlpattern-polyfill";
+      globalThis.addEventListener = () => {};
+    
+import { mockDocumentLoader, test } from "../dist-B5f6a8Tt.js";
+import { MockKvStore, kvCache } from "../kv-cache-BEeqyGER.js";
+import { preloadedContexts } from "@fedify/vocab-runtime";
+import { deepStrictEqual, throws } from "node:assert";
+
+//#region src/utils/kv-cache.test.ts
+test("kvCache()", async (t) => {
+	const kv = new MockKvStore();
+	await t.step("cached", async () => {
+		const loader = kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [
+				["https://example.org/", Temporal.Duration.from({ days: 1 })],
+				[new URL("https://example.net/"), Temporal.Duration.from({ days: 1 })],
+				[new URLPattern("https://example.com/*"), Temporal.Duration.from({ days: 30 })]
+			],
+			prefix: ["_test", "cached"]
+		});
+		const result = await loader("https://example.com/object");
+		deepStrictEqual(result, {
+			contextUrl: null,
+			documentUrl: "https://example.com/object",
+			document: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				id: "https://example.com/object",
+				name: "Fetched object",
+				type: "Object"
+			}
+		});
+		const cache = await kv.get([
+			"_test",
+			"cached",
+			"https://example.com/object"
+		]);
+		deepStrictEqual(cache, result);
+		await kv.set([
+			"_test",
+			"cached",
+			"https://example.org/"
+		], {
+			contextUrl: null,
+			documentUrl: "https://example.org/",
+			document: { "id": "https://example.org/" }
+		});
+		const result2 = await loader("https://example.org/");
+		deepStrictEqual(result2, {
+			contextUrl: null,
+			documentUrl: "https://example.org/",
+			document: { "id": "https://example.org/" }
+		});
+		await kv.set([
+			"_test",
+			"cached",
+			"https://example.net/"
+		], {
+			contextUrl: null,
+			documentUrl: "https://example.net/",
+			document: { "id": "https://example.net/" }
+		});
+		const result3 = await loader("https://example.net/");
+		deepStrictEqual(result3, {
+			contextUrl: null,
+			documentUrl: "https://example.net/",
+			document: { "id": "https://example.net/" }
+		});
+	});
+	await t.step("not cached", async () => {
+		const loader = kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [],
+			prefix: ["_test", "not cached"]
+		});
+		const result = await loader("https://example.com/object");
+		deepStrictEqual(result, {
+			contextUrl: null,
+			documentUrl: "https://example.com/object",
+			document: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				id: "https://example.com/object",
+				name: "Fetched object",
+				type: "Object"
+			}
+		});
+		const cache = await kv.get([
+			"test2",
+			"not cached",
+			"https://example.com/object"
+		]);
+		deepStrictEqual(cache, void 0);
+	});
+	await t.step("maximum cache duration", () => {
+		throws(() => kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [["https://example.com/", Temporal.Duration.from({
+				days: 30,
+				seconds: 1
+			})]]
+		}), TypeError, "The maximum cache duration is 30 days");
+		throws(() => kvCache({
+			kv,
+			loader: mockDocumentLoader,
+			rules: [[new URLPattern("https://example.com/*"), Temporal.Duration.from({
+				days: 30,
+				seconds: 1
+			})]]
+		}), TypeError, "The maximum cache duration is 30 days");
+	});
+	await t.step("on kv store exception", async () => {
+		class KvStoreThrowsException {
+			get(_key) {
+				throw new Error("Failed to get key");
+			}
+			set(_key, _value, _options) {
+				throw new Error("Failed to set key");
+			}
+			delete(_key) {
+				throw new Error("Failed to delete key");
+			}
+			async *list(_prefix) {
+				throw new Error("Failed to list keys");
+			}
+		}
+		const loader = kvCache({
+			kv: new KvStoreThrowsException(),
+			loader: mockDocumentLoader,
+			rules: [
+				["https://example.org/", Temporal.Duration.from({ days: 1 })],
+				[new URL("https://example.net/"), Temporal.Duration.from({ days: 1 })],
+				[new URLPattern("https://example.com/*"), Temporal.Duration.from({ days: 30 })]
+			],
+			prefix: ["_test", "not cached"]
+		});
+		const result = await loader("https://example.com/object");
+		deepStrictEqual(result, {
+			contextUrl: null,
+			documentUrl: "https://example.com/object",
+			document: {
+				"@context": "https://www.w3.org/ns/activitystreams",
+				id: "https://example.com/object",
+				name: "Fetched object",
+				type: "Object"
+			}
+		});
+	});
+	await t.step("preloaded contexts bypass cache", async () => {
+		const kv$1 = new MockKvStore();
+		let loaderCalled = false;
+		const mockLoader = (url) => {
+			loaderCalled = true;
+			return Promise.resolve({
+				contextUrl: null,
+				documentUrl: url,
+				document: { "mock": "document" }
+			});
+		};
+		const loader = kvCache({
+			kv: kv$1,
+			loader: mockLoader,
+			prefix: ["_test", "preloaded"]
+		});
+		const activityStreamsUrl = "https://www.w3.org/ns/activitystreams";
+		loaderCalled = false;
+		const result = await loader(activityStreamsUrl);
+		deepStrictEqual(result, {
+			contextUrl: null,
+			documentUrl: activityStreamsUrl,
+			document: preloadedContexts[activityStreamsUrl]
+		});
+		deepStrictEqual(loaderCalled, false, "Loader should not be called for preloaded contexts");
+		const cachedValue = await kv$1.get([
+			"_test",
+			"preloaded",
+			activityStreamsUrl
+		]);
+		deepStrictEqual(cachedValue, void 0, "Preloaded contexts should not be cached in KV store");
+		const securityUrl = "https://w3id.org/security/v1";
+		loaderCalled = false;
+		const result2 = await loader(securityUrl);
+		deepStrictEqual(result2, {
+			contextUrl: null,
+			documentUrl: securityUrl,
+			document: preloadedContexts[securityUrl]
+		});
+		deepStrictEqual(loaderCalled, false, "Loader should not be called for preloaded contexts");
+		const nonPreloadedUrl = "https://example.com/not-preloaded";
+		loaderCalled = false;
+		const result3 = await loader(nonPreloadedUrl);
+		deepStrictEqual(result3, {
+			contextUrl: null,
+			documentUrl: nonPreloadedUrl,
+			document: { "mock": "document" }
+		});
+		deepStrictEqual(loaderCalled, true, "Loader should be called for non-preloaded URLs");
+		const cachedValue2 = await kv$1.get([
+			"_test",
+			"preloaded",
+			nonPreloadedUrl
+		]);
+		deepStrictEqual(cachedValue2, result3, "Non-preloaded URLs should be cached");
+	});
+});
+
+//#endregion

package/dist/utils/mod.cjs

@@ -0,0 +1,10 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        
+require('../http-DbACqYyq.cjs');
+const require_kv_cache = require('../kv-cache-rPOPQdj9.cjs');
+require('../utils-Db0ZmjcD.cjs');
+
+exports.getAuthenticatedDocumentLoader = require_kv_cache.getAuthenticatedDocumentLoader;
+exports.kvCache = require_kv_cache.kvCache;

package/dist/utils/mod.d.cts

@@ -0,0 +1,4 @@
+import "../http-ClB3pLcL.cjs";
+import "../kv-D8q9fLkA.cjs";
+import { getAuthenticatedDocumentLoader, kvCache } from "../mod-DcPRcifg.cjs";
+export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.d.ts

@@ -0,0 +1,6 @@
+import { Temporal } from "@js-temporal/polyfill";
+import { URLPattern } from "urlpattern-polyfill";
+import "../http-DLBDPal9.js";
+import "../kv-CtOmTRNc.js";
+import { getAuthenticatedDocumentLoader, kvCache } from "../mod-CJgbdSqb.js";
+export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils/mod.js

@@ -0,0 +1,9 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        
+import "../http-BizGfAHd.js";
+import { getAuthenticatedDocumentLoader, kvCache } from "../kv-cache-B7dwGQFA.js";
+import "../utils-Wranxuoe.js";
+
+export { getAuthenticatedDocumentLoader, kvCache };

package/dist/utils-Db0ZmjcD.cjs

@@ -0,0 +1,4 @@
+
+          const { Temporal } = require("@js-temporal/polyfill");
+          const { URLPattern } = require("urlpattern-polyfill");
+        

package/dist/utils-Wranxuoe.js

@@ -0,0 +1,4 @@
+
+          import { Temporal } from "@js-temporal/polyfill";
+          import { URLPattern } from "urlpattern-polyfill";
+        

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/fedify",
-  "version": "2.0.0-dev.1561+4bb27050",
+  "version": "2.0.0-dev.158+628cd89e",
   "description": "An ActivityPub server framework",
   "keywords": [
     "ActivityPub",
@@ -35,104 +35,118 @@
     "dist"
   ],
   "module": "./dist/mod.js",
+  "main": "./dist/mod.cjs",
   "types": "./dist/mod.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/mod.d.ts",
+      "types": {
+        "import": "./dist/mod.d.ts",
+        "require": "./dist/mod.d.cts",
+        "default": "./dist/mod.d.ts"
+      },
       "import": "./dist/mod.js",
+      "require": "./dist/mod.cjs",
       "default": "./dist/mod.js"
     },
     "./compat": {
-      "types": "./dist/compat/mod.d.ts",
+      "types": {
+        "import": "./dist/compat/mod.d.ts",
+        "require": "./dist/compat/mod.d.cts",
+        "default": "./dist/compat/mod.d.ts"
+      },
       "import": "./dist/compat/mod.js",
+      "require": "./dist/compat/mod.cjs",
       "default": "./dist/compat/mod.js"
     },
     "./federation": {
-      "types": "./dist/federation/mod.d.ts",
+      "types": {
+        "import": "./dist/federation/mod.d.ts",
+        "require": "./dist/federation/mod.d.cts",
+        "default": "./dist/federation/mod.d.ts"
+      },
       "import": "./dist/federation/mod.js",
+      "require": "./dist/federation/mod.cjs",
       "default": "./dist/federation/mod.js"
     },
     "./nodeinfo": {
-      "types": "./dist/nodeinfo/mod.d.ts",
+      "types": {
+        "import": "./dist/nodeinfo/mod.d.ts",
+        "require": "./dist/nodeinfo/mod.d.cts",
+        "default": "./dist/nodeinfo/mod.d.ts"
+      },
       "import": "./dist/nodeinfo/mod.js",
+      "require": "./dist/nodeinfo/mod.cjs",
       "default": "./dist/nodeinfo/mod.js"
     },
-    "./runtime": {
-      "types": "./dist/runtime/mod.d.ts",
-      "import": "./dist/runtime/mod.js",
-      "default": "./dist/runtime/mod.js"
+    "./otel": {
+      "types": {
+        "import": "./dist/otel/mod.d.ts",
+        "require": "./dist/otel/mod.d.cts",
+        "default": "./dist/otel/mod.d.ts"
+      },
+      "import": "./dist/otel/mod.js",
+      "require": "./dist/otel/mod.cjs",
+      "default": "./dist/otel/mod.js"
     },
     "./sig": {
-      "types": "./dist/sig/mod.d.ts",
+      "types": {
+        "import": "./dist/sig/mod.d.ts",
+        "require": "./dist/sig/mod.d.cts",
+        "default": "./dist/sig/mod.d.ts"
+      },
       "import": "./dist/sig/mod.js",
+      "require": "./dist/sig/mod.cjs",
       "default": "./dist/sig/mod.js"
     },
-    "./vocab": {
-      "types": "./dist/vocab/mod.d.ts",
-      "import": "./dist/vocab/mod.js",
-      "default": "./dist/vocab/mod.js"
-    },
-    "./webfinger": {
-      "types": "./dist/webfinger/mod.d.ts",
-      "import": "./dist/webfinger/mod.js",
-      "default": "./dist/webfinger/mod.js"
-    },
-    "./x/cfworkers": {
-      "types": "./dist/x/cfworkers.d.ts",
-      "import": "./dist/x/cfworkers.js",
-      "default": "./dist/x/cfworkers.js"
-    },
-    "./x/hono": {
-      "types": "./dist/x/hono.d.ts",
-      "import": "./dist/x/hono.js",
-      "default": "./dist/x/hono.js"
-    },
-    "./x/sveltekit": {
-      "types": "./dist/x/sveltekit.d.ts",
-      "import": "./dist/x/sveltekit.js",
-      "default": "./dist/x/sveltekit.js"
+    "./utils": {
+      "types": {
+        "import": "./dist/utils/mod.d.ts",
+        "require": "./dist/utils/mod.d.cts",
+        "default": "./dist/utils/mod.d.ts"
+      },
+      "import": "./dist/utils/mod.js",
+      "require": "./dist/utils/mod.cjs",
+      "default": "./dist/utils/mod.js"
     }
   },
   "dependencies": {
-    "@cfworker/json-schema": "^4.1.1",
-    "@hugoalh/http-header-link": "^1.0.2",
     "@js-temporal/polyfill": "^0.5.1",
-    "@logtape/logtape": "^1.0.0",
-    "@multiformats/base-x": "^4.0.1",
+    "@logtape/logtape": "^1.3.5",
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/core": "^2.0.0",
+    "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "asn1js": "^3.0.5",
     "byte-encodings": "^1.0.11",
-    "es-toolkit": "^1.39.5",
+    "es-toolkit": "1.43.0",
     "json-canon": "^1.0.1",
-    "jsonld": "^8.3.2",
+    "jsonld": "^9.0.0",
     "multicodec": "^3.2.1",
-    "pkijs": "^3.2.4",
     "structured-field-values": "^2.0.4",
-    "uri-template-router": "^0.0.17",
+    "uri-template-router": "^1.0.0",
     "url-template": "^3.1.1",
-    "urlpattern-polyfill": "^10.1.0"
+    "urlpattern-polyfill": "^10.1.0",
+    "@fedify/vocab": "2.0.0-dev.158+628cd89e",
+    "@fedify/webfinger": "2.0.0-dev.158+628cd89e",
+    "@fedify/vocab-runtime": "2.0.0-dev.158+628cd89e"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20250529.0",
     "@std/assert": "npm:@jsr/std__assert@^0.226.0",
     "@std/path": "npm:@jsr/std__path@^1.0.6",
-    "@std/url": "npm:@jsr/std__url@1.0.0-rc.3",
-    "@std/yaml": "npm:@jsr/std__yaml@^1.0.6",
     "@types/node": "^24.2.1",
-    "fast-check": "^3.22.0",
-    "fetch-mock": "^12.5.2",
+    "fetch-mock": "^12.5.4",
     "miniflare": "^4.20250523.0",
     "tsdown": "^0.12.9",
     "tsx": "^4.19.4",
-    "typescript": "^5.9.2",
-    "wrangler": "^4.17.0"
+    "typescript": "^5.9.3",
+    "wrangler": "^4.17.0",
+    "@fedify/fixture": "2.0.0",
+    "@fedify/vocab-tools": "^2.0.0-dev.158+628cd89e"
   },
   "scripts": {
-    "build": "deno task codegen && tsdown",
-    "prepublish": "deno task codegen && tsdown",
-    "test": "deno task codegen && tsdown && cd dist/ && node --test",
-    "test:bun": "deno task codegen && tsdown && cd dist/ && bun test --timeout 60000",
+    "build": "tsdown",
+    "prepublish": "tsdown",
+    "test": "tsdown && cd dist/ && node --test",
+    "test:bun": "tsdown && cd dist/ && bun test --timeout 60000",
     "test:cfworkers": "deno task codegen && wrangler deploy --dry-run --outdir src/cfworkers && node --import=tsx src/cfworkers/client.ts"
   }
 }

package/dist/actor-C22bXuuC.d.ts

@@ -1,130 +0,0 @@
-import { Temporal } from "@js-temporal/polyfill";
-import { URLPattern } from "urlpattern-polyfill";
-import { GetUserAgentOptions } from "./docloader-CxWcuWqQ.js";
-import { Application, Group, Organization, Person, Service } from "./vocab-SOE1ifCr.js";
-import { TracerProvider } from "@opentelemetry/api";
-
-//#region src/vocab/actor.d.ts
-/**
- * Actor types are {@link Object} types that are capable of performing
- * activities.
- */
-type Actor = Application | Group | Organization | Person | Service;
-/**
- * Checks if the given object is an {@link Actor}.
- * @param object The object to check.
- * @returns `true` if the given object is an {@link Actor}.
- */
-declare function isActor(object: unknown): object is Actor;
-/**
- * A string representation of an actor type name.
- */
-type ActorTypeName = "Application" | "Group" | "Organization" | "Person" | "Service";
-/**
- * Gets the type name of the given actor.
- * @param actor The actor to get the type name of.
- * @returns The type name of the given actor.
- */
-declare function getActorTypeName(actor: Actor): ActorTypeName;
-/**
- * Gets the actor class by the given type name.
- * @param typeName The type name to get the actor class by.
- * @returns The actor class by the given type name.
- */
-declare function getActorClassByTypeName(typeName: ActorTypeName): typeof Application | typeof Group | typeof Organization | typeof Person | typeof Service;
-/**
- * Options for {@link getActorHandle}.
- * @since 1.3.0
- */
-interface GetActorHandleOptions extends NormalizeActorHandleOptions {
-  /**
-   * The options for making `User-Agent` header.
-   * If a string is given, it is used as the `User-Agent` header value.
-   * If an object is given, it is passed to {@link getUserAgent} to generate
-   * the `User-Agent` header value.
-   * @since 1.3.0
-   */
-  userAgent?: GetUserAgentOptions | string;
-  /**
-   * The OpenTelemetry tracer provider.  If omitted, the global tracer provider
-   * is used.
-   * @since 1.3.0
-   */
-  tracerProvider?: TracerProvider;
-}
-/**
- * Gets the actor handle, of the form `@username@domain`, from the given actor
- * or an actor URI.
- *
- * @example
- * ``` typescript
- * // Get the handle of an actor object:
- * await getActorHandle(
- *   new Person({ id: new URL("https://fosstodon.org/users/hongminhee") })
- * );
- *
- * // Get the handle of an actor URI:
- * await getActorHandle(new URL("https://fosstodon.org/users/hongminhee"));
- * ```
- *
- * @param actor The actor or actor URI to get the handle from.
- * @param options The extra options for getting the actor handle.
- * @returns The actor handle.  It starts with `@` and is followed by the
- *          username and domain, separated by `@` by default (it can be
- *          customized with the options).
- * @throws {TypeError} If the actor does not have enough information to get the
- *                     handle.
- * @since 0.4.0
- */
-declare function getActorHandle(actor: Actor | URL, options?: GetActorHandleOptions): Promise<`@${string}@${string}` | `${string}@${string}`>;
-/**
- * Options for {@link normalizeActorHandle}.
- * @since 0.9.0
- */
-interface NormalizeActorHandleOptions {
-  /**
-   * Whether to trim the leading `@` from the actor handle.  Turned off by
-   * default.
-   */
-  trimLeadingAt?: boolean;
-  /**
-   * Whether to convert the domain part of the actor handle to punycode, if it
-   * is an internationalized domain name.  Turned off by default.
-   */
-  punycode?: boolean;
-}
-/**
- * Normalizes the given actor handle.
- * @param handle The full handle of the actor to normalize.
- * @param options The options for normalizing the actor handle.
- * @returns The normalized actor handle.
- * @throws {TypeError} If the actor handle is invalid.
- * @since 0.9.0
- */
-declare function normalizeActorHandle(handle: string, options?: NormalizeActorHandleOptions): `@${string}@${string}` | `${string}@${string}`;
-/**
- * The object that can be a recipient of an activity.
- *
- * Note that every {@link Actor} is also a {@link Recipient}.
- */
-interface Recipient {
-  /**
-   * The URI of the actor.
-   */
-  readonly id: URL | null;
-  /**
-   * The URI of the actor's inbox.
-   */
-  readonly inboxId: URL | null;
-  /**
-   * The endpoints of the actor.
-   */
-  readonly endpoints?: {
-    /**
-     * The URI of the actor's shared inbox.
-     */
-    sharedInbox: URL | null;
-  } | null;
-}
-//#endregion
-export { Actor, ActorTypeName, GetActorHandleOptions, NormalizeActorHandleOptions, Recipient, getActorClassByTypeName, getActorHandle, getActorTypeName, isActor, normalizeActorHandle };