@fedify/vocab-runtime 2.4.0-dev.2063 → 2.4.0-dev.2071

package/dist/tests/docloader.test.mjs

@@ -1,7 +1,7 @@
-import { t as FetchError } from "./request-BT9FBhk6.mjs";
+import { t as FetchError } from "./request-DXvwmbWU.mjs";
 import { n as cid_v1_default, t as preloadedContexts } from "./contexts-BBX_qhBL.mjs";
 import { t as UrlError } from "./url-DgJM9WJn.mjs";
-import { n as getRemoteDocument, t as getDocumentLoader } from "./docloader-BFxwbqMx.mjs";
+import { n as getRemoteDocument, t as getDocumentLoader } from "./docloader-CKZdC6iZ.mjs";
 import { test } from "node:test";
 import { gzipSync } from "node:zlib";
 import { deepStrictEqual, ok, rejects } from "node:assert";

package/dist/tests/internal/portable-dereference.test.cjs

@@ -1,3 +1,4 @@
+const require_contexts = require("../contexts-Ch3v2Cgu.cjs");
 const require_url = require("../url-BqlldzT8.cjs");
 require("../jsonld-CmDhHNTx.cjs");
 let node_assert_strict = require("node:assert/strict");
@@ -17,6 +18,12 @@ const logger = (0, _logtape_logtape.getLogger)([
 */
 const MAX_GATEWAY_HINTS = 5;
 const LOCATION_HINT_PARAMETER = "@gateway";
+const BASELINE_CONTEXT_URLS = /* @__PURE__ */ new Set([
+	"https://w3id.org/identity/v1",
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/v1",
+	"https://w3id.org/security/data-integrity/v1"
+]);
 /**
 * Checks whether a URL is an FEP-ef61 portable ActivityPub IRI.
 *
@@ -76,6 +83,60 @@ function parseGatewayOrigin(gateway) {
 	if (url.protocol !== "http:" && url.protocol !== "https:" || url.href !== `${url.origin}/`) return null;
 	return url;
 }
+/**
+* Creates a context loader that returns the same context documents for the
+* whole dereference operation, so that the identity check, the proof
+* verifier, and the parser interpret the fetched document identically even
+* if the underlying loader is nondeterministic.  Failed loads are not
+* remembered, so a transient failure does not affect the next gateway.
+*
+* The parsed object keeps the loader for its own later dereferences, so
+* `release()` turns it into a plain pass-through to the underlying loader
+* once the operation is over.
+*
+* @internal Technically exported for generated vocabulary classes, but not
+* part of the public API contract.  This is not considered public API for
+* Semantic Versioning decisions.
+*/
+function createSnapshotContextLoader(contextLoader) {
+	for (let wrapped = snapshotLoaders.get(contextLoader); wrapped?.released; wrapped = snapshotLoaders.get(contextLoader)) contextLoader = wrapped.base;
+	const cache = /* @__PURE__ */ new Map();
+	let released = false;
+	const release = () => {
+		released = true;
+		state.released = true;
+		cache.clear();
+	};
+	const loader = async (url, options) => {
+		if (released) return await contextLoader(url, options);
+		const key = URL.canParse(url) ? new URL(url).href : url;
+		if (BASELINE_CONTEXT_URLS.has(key)) return {
+			contextUrl: null,
+			document: structuredClone(require_contexts.preloadedContexts[key]),
+			documentUrl: key
+		};
+		let promise = cache.get(key);
+		if (promise == null) {
+			const loading = contextLoader(url, options).then((document) => structuredClone(document));
+			promise = loading;
+			cache.set(key, loading);
+			loading.catch(() => {
+				if (cache.get(key) === loading) cache.delete(key);
+			});
+		}
+		return structuredClone(await promise);
+	};
+	const state = {
+		base: contextLoader,
+		released: false
+	};
+	snapshotLoaders.set(loader, state);
+	return {
+		loader,
+		release
+	};
+}
+const snapshotLoaders = /* @__PURE__ */ new WeakMap();
 //#endregion
 //#region src/internal/portable-dereference.test.ts
 const hrefs = (urls) => urls.map((url) => url.href);
@@ -120,4 +181,30 @@ const hrefs = (urls) => urls.map((url) => url.href);
 		4
 	].map((i) => `https://g${i}.example/`));
 });
+(0, node_test.test)("createSnapshotContextLoader() does not nest released snapshots", async () => {
+	const calls = [];
+	const base = (url) => {
+		calls.push(url);
+		return Promise.resolve({
+			contextUrl: null,
+			documentUrl: url,
+			document: { "@context": {} }
+		});
+	};
+	let loader = base;
+	for (let i = 0; i < 1e4; i++) {
+		const snapshot = createSnapshotContextLoader(loader);
+		snapshot.release();
+		loader = snapshot.loader;
+	}
+	await loader("https://example.com/context");
+	(0, node_assert_strict.deepStrictEqual)(calls, ["https://example.com/context"]);
+	const outer = createSnapshotContextLoader(base);
+	await outer.loader("https://example.com/context");
+	const inner = createSnapshotContextLoader(outer.loader);
+	await inner.loader("https://example.com/context");
+	(0, node_assert_strict.deepStrictEqual)(calls.length, 2);
+	inner.release();
+	outer.release();
+});
 //#endregion

package/dist/tests/internal/portable-dereference.test.mjs

@@ -1,3 +1,4 @@
+import { t as preloadedContexts } from "../contexts-BBX_qhBL.mjs";
 import { a as formatIri, m as parseIri } from "../url-DgJM9WJn.mjs";
 import "../jsonld-DweIJ07b.mjs";
 import { deepStrictEqual, ok, throws } from "node:assert/strict";
@@ -17,6 +18,12 @@ const logger = getLogger([
 */
 const MAX_GATEWAY_HINTS = 5;
 const LOCATION_HINT_PARAMETER = "@gateway";
+const BASELINE_CONTEXT_URLS = /* @__PURE__ */ new Set([
+	"https://w3id.org/identity/v1",
+	"https://www.w3.org/ns/activitystreams",
+	"https://w3id.org/security/v1",
+	"https://w3id.org/security/data-integrity/v1"
+]);
 /**
 * Checks whether a URL is an FEP-ef61 portable ActivityPub IRI.
 *
@@ -76,6 +83,60 @@ function parseGatewayOrigin(gateway) {
 	if (url.protocol !== "http:" && url.protocol !== "https:" || url.href !== `${url.origin}/`) return null;
 	return url;
 }
+/**
+* Creates a context loader that returns the same context documents for the
+* whole dereference operation, so that the identity check, the proof
+* verifier, and the parser interpret the fetched document identically even
+* if the underlying loader is nondeterministic.  Failed loads are not
+* remembered, so a transient failure does not affect the next gateway.
+*
+* The parsed object keeps the loader for its own later dereferences, so
+* `release()` turns it into a plain pass-through to the underlying loader
+* once the operation is over.
+*
+* @internal Technically exported for generated vocabulary classes, but not
+* part of the public API contract.  This is not considered public API for
+* Semantic Versioning decisions.
+*/
+function createSnapshotContextLoader(contextLoader) {
+	for (let wrapped = snapshotLoaders.get(contextLoader); wrapped?.released; wrapped = snapshotLoaders.get(contextLoader)) contextLoader = wrapped.base;
+	const cache = /* @__PURE__ */ new Map();
+	let released = false;
+	const release = () => {
+		released = true;
+		state.released = true;
+		cache.clear();
+	};
+	const loader = async (url, options) => {
+		if (released) return await contextLoader(url, options);
+		const key = URL.canParse(url) ? new URL(url).href : url;
+		if (BASELINE_CONTEXT_URLS.has(key)) return {
+			contextUrl: null,
+			document: structuredClone(preloadedContexts[key]),
+			documentUrl: key
+		};
+		let promise = cache.get(key);
+		if (promise == null) {
+			const loading = contextLoader(url, options).then((document) => structuredClone(document));
+			promise = loading;
+			cache.set(key, loading);
+			loading.catch(() => {
+				if (cache.get(key) === loading) cache.delete(key);
+			});
+		}
+		return structuredClone(await promise);
+	};
+	const state = {
+		base: contextLoader,
+		released: false
+	};
+	snapshotLoaders.set(loader, state);
+	return {
+		loader,
+		release
+	};
+}
+const snapshotLoaders = /* @__PURE__ */ new WeakMap();
 //#endregion
 //#region src/internal/portable-dereference.test.ts
 const hrefs = (urls) => urls.map((url) => url.href);
@@ -120,5 +181,31 @@ test("getPortableGatewayCandidates() reads @gateway hints", () => {
 		4
 	].map((i) => `https://g${i}.example/`));
 });
+test("createSnapshotContextLoader() does not nest released snapshots", async () => {
+	const calls = [];
+	const base = (url) => {
+		calls.push(url);
+		return Promise.resolve({
+			contextUrl: null,
+			documentUrl: url,
+			document: { "@context": {} }
+		});
+	};
+	let loader = base;
+	for (let i = 0; i < 1e4; i++) {
+		const snapshot = createSnapshotContextLoader(loader);
+		snapshot.release();
+		loader = snapshot.loader;
+	}
+	await loader("https://example.com/context");
+	deepStrictEqual(calls, ["https://example.com/context"]);
+	const outer = createSnapshotContextLoader(base);
+	await outer.loader("https://example.com/context");
+	const inner = createSnapshotContextLoader(outer.loader);
+	await inner.loader("https://example.com/context");
+	deepStrictEqual(calls.length, 2);
+	inner.release();
+	outer.release();
+});
 //#endregion
 export {};

package/dist/tests/{request-BT9FBhk6.mjs → request-DXvwmbWU.mjs}

@@ -1,7 +1,7 @@
 import process from "node:process";
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2063+366c0362";
+var version = "2.4.0-dev.2071+8b9dccb9";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/{request-jWhPNG9V.cjs → request-D_TFIuTp.cjs}

@@ -3,7 +3,7 @@ let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);
 //#region deno.json
 var name = "@fedify/vocab-runtime";
-var version = "2.4.0-dev.2063+366c0362";
+var version = "2.4.0-dev.2071+8b9dccb9";
 //#endregion
 //#region src/request.ts
 /**

package/dist/tests/request.test.cjs

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-emK7D4bc.cjs");
-const require_request = require("./request-jWhPNG9V.cjs");
+const require_request = require("./request-D_TFIuTp.cjs");
 let node_test = require("node:test");
 let node_process = require("node:process");
 node_process = require_rolldown_runtime.__toESM(node_process, 1);

package/dist/tests/request.test.mjs

@@ -1,4 +1,4 @@
-import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-BT9FBhk6.mjs";
+import { n as createActivityPubRequest, o as version, r as getUserAgent } from "./request-DXvwmbWU.mjs";
 import { test } from "node:test";
 import process from "node:process";
 import { deepStrictEqual } from "node:assert";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab-runtime",
-  "version": "2.4.0-dev.2063+366c0362",
+  "version": "2.4.0-dev.2071+8b9dccb9",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",

package/src/internal/portable-dereference.test.ts

@@ -1,7 +1,9 @@
 import { deepStrictEqual, ok, throws } from "node:assert/strict";
 import { test } from "node:test";
+import type { DocumentLoader } from "../docloader.ts";
 import { parseIri } from "../url.ts";
 import {
+  createSnapshotContextLoader,
   getPortableGatewayCandidates,
   isPortableIri,
 } from "./portable-dereference.ts";
@@ -72,3 +74,33 @@ test("getPortableGatewayCandidates() reads @gateway hints", () => {
     [0, 1, 2, 3, 4].map((i) => `https://g${i}.example/`),
   );
 });
+
+test("createSnapshotContextLoader() does not nest released snapshots", async () => {
+  const calls: string[] = [];
+  const base: DocumentLoader = (url) => {
+    calls.push(url);
+    return Promise.resolve({
+      contextUrl: null,
+      documentUrl: url,
+      document: { "@context": {} },
+    });
+  };
+  let loader = base;
+  for (let i = 0; i < 10000; i++) {
+    const snapshot = createSnapshotContextLoader(loader);
+    snapshot.release();
+    loader = snapshot.loader;
+  }
+  // A deep chain of wrappers would overflow the stack here:
+  await loader("https://example.com/context");
+  deepStrictEqual(calls, ["https://example.com/context"]);
+
+  // Snapshots still in use are kept, so a nested snapshot sees their cache:
+  const outer = createSnapshotContextLoader(base);
+  await outer.loader("https://example.com/context");
+  const inner = createSnapshotContextLoader(outer.loader);
+  await inner.loader("https://example.com/context");
+  deepStrictEqual(calls.length, 2);
+  inner.release();
+  outer.release();
+});