@fedify/vocab 2.3.0-dev.1189 → 2.3.0-dev.1190

package/deno.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.3.0-dev.1189+97e55e59",
+  "version": "2.3.0-dev.1190+2dfa46e0",
   "license": "MIT",
   "exports": {
     ".": "./src/mod.ts"

package/dist/mod.cjs

@@ -33,7 +33,7 @@ let _fedify_vocab_runtime_temporal = require("@fedify/vocab-runtime/temporal");
 let es_toolkit = require("es-toolkit");
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.3.0-dev.1189+97e55e59";
+var version = "2.3.0-dev.1190+2dfa46e0";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -47372,7 +47372,7 @@ function getActorDiscoveryInstruments(meterProvider) {
 function getActorDiscoveryRemoteHost(actor) {
 	const id = actor instanceof URL ? actor : actor.id;
 	if (id == null) return void 0;
-	return id.hostname === "" ? void 0 : id.hostname;
+	return id.host === "" ? void 0 : id.host;
 }
 var ActorHandleNotFoundError = class extends TypeError {
 	constructor() {
@@ -47635,7 +47635,7 @@ function getLookupRemoteHost(identifier) {
 	} catch {
 		return extractHandleHost(identifier.startsWith("@") ? identifier.slice(1) : identifier);
 	}
-	if (url.hostname !== "") return url.hostname;
+	if (url.host !== "") return url.host;
 	if (url.protocol === "acct:") return extractHandleHost(url.pathname);
 }
 function extractHandleHost(handle) {
@@ -47644,7 +47644,7 @@ function extractHandleHost(handle) {
 	const candidate = handle.slice(at + 1);
 	if (/[/?#\s]/.test(candidate)) return void 0;
 	try {
-		return new URL(`https://${candidate}`).hostname || void 0;
+		return new URL(`https://${candidate}`).host || void 0;
 	} catch {
 		return;
 	}

package/dist/mod.js

@@ -9,7 +9,7 @@ import { isTemporalDuration, isTemporalInstant } from "@fedify/vocab-runtime/tem
 import { delay } from "es-toolkit";
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.3.0-dev.1189+97e55e59";
+var version = "2.3.0-dev.1190+2dfa46e0";
 //#endregion
 //#region src/type.ts
 function getTypeId(object) {
@@ -47348,7 +47348,7 @@ function getActorDiscoveryInstruments(meterProvider) {
 function getActorDiscoveryRemoteHost(actor) {
 	const id = actor instanceof URL ? actor : actor.id;
 	if (id == null) return void 0;
-	return id.hostname === "" ? void 0 : id.hostname;
+	return id.host === "" ? void 0 : id.host;
 }
 var ActorHandleNotFoundError = class extends TypeError {
 	constructor() {
@@ -47611,7 +47611,7 @@ function getLookupRemoteHost(identifier) {
 	} catch {
 		return extractHandleHost(identifier.startsWith("@") ? identifier.slice(1) : identifier);
 	}
-	if (url.hostname !== "") return url.hostname;
+	if (url.host !== "") return url.host;
 	if (url.protocol === "acct:") return extractHandleHost(url.pathname);
 }
 function extractHandleHost(handle) {
@@ -47620,7 +47620,7 @@ function extractHandleHost(handle) {
 	const candidate = handle.slice(at + 1);
 	if (/[/?#\s]/.test(candidate)) return void 0;
 	try {
-		return new URL(`https://${candidate}`).hostname || void 0;
+		return new URL(`https://${candidate}`).host || void 0;
 	} catch {
 		return;
 	}

package/dist-tests/{actor-CFYfbiwh.mjs → actor-CY7bpkap.mjs}

@@ -1206,7 +1206,7 @@ var esm_default = new class FetchMock {
 //#endregion
 //#region deno.json
 var name = "@fedify/vocab";
-var version = "2.3.0-dev.1189+97e55e59";
+var version = "2.3.0-dev.1190+2dfa46e0";
 //#endregion
 //#region src/actor.ts
 const ACTOR_DISCOVERY_HISTOGRAM_BUCKETS = [
@@ -1248,7 +1248,7 @@ function getActorDiscoveryInstruments(meterProvider) {
 function getActorDiscoveryRemoteHost(actor) {
 	const id = actor instanceof URL ? actor : actor.id;
 	if (id == null) return void 0;
-	return id.hostname === "" ? void 0 : id.hostname;
+	return id.host === "" ? void 0 : id.host;
 }
 var ActorHandleNotFoundError = class extends TypeError {
 	constructor() {

package/dist-tests/actor.test.mjs

@@ -1,7 +1,7 @@
 import "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
 import { j as __exportAll, r as Application, u as Group, v as Organization, w as Service, y as Person } from "./vocab-B0Z-tH4q.mjs";
-import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-CFYfbiwh.mjs";
+import { a as normalizeActorHandle, c as esm_default, i as isActor, n as getActorHandle, r as getActorTypeName, t as getActorClassByTypeName } from "./actor-CY7bpkap.mjs";
 import { createTestMeterProvider, test } from "@fedify/fixture";
 import { deepStrictEqual, ok, rejects, strictEqual, throws } from "node:assert/strict";
 //#region ../../node_modules/.pnpm/fast-check@3.23.2/node_modules/fast-check/lib/esm/check/precondition/PreconditionFailure.js
@@ -5744,6 +5744,15 @@ test("getActorHandle() records activitypub.actor.discovery counter", { permissio
 			ok(duration != null);
 			deepStrictEqual(duration.attributes["activitypub.actor.discovery.result"], "not_found");
 		});
+		await t.step("records non-default ports for actor IDs", async () => {
+			esm_default.removeRoutes();
+			esm_default.get("begin:https://foo.example.com:8443/.well-known/webfinger?", { status: 404 });
+			const [meterProvider, recorder] = createTestMeterProvider();
+			await rejects(() => getActorHandle(new URL("https://foo.example.com:8443/@john"), { meterProvider }), TypeError);
+			const counter = recorder.getMeasurement("activitypub.actor.discovery");
+			ok(counter != null);
+			deepStrictEqual(counter.attributes["activitypub.remote.host"], "foo.example.com:8443");
+		});
 		await t.step("records result=error when a malformed WebFinger alias throws TypeError", async () => {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://foo.example.com/.well-known/webfinger?", {

package/dist-tests/lookup.test.mjs

@@ -1,7 +1,7 @@
 import { Temporal } from "@js-temporal/polyfill";
 globalThis.addEventListener = () => {};
 import { g as Object$1, h as Note, i as Collection, y as Person } from "./vocab-B0Z-tH4q.mjs";
-import { c as esm_default, i as isActor, o as name, s as version } from "./actor-CFYfbiwh.mjs";
+import { c as esm_default, i as isActor, o as name, s as version } from "./actor-CY7bpkap.mjs";
 import { t as getTypeId } from "./type-Cf-vxmre.mjs";
 import { t as assertInstanceOf } from "./utils-CE8Dk5hm.mjs";
 import { createTestMeterProvider, createTestTracerProvider, mockDocumentLoader, test } from "@fedify/fixture";
@@ -87,7 +87,7 @@ function getLookupRemoteHost(identifier) {
 	} catch {
 		return extractHandleHost(identifier.startsWith("@") ? identifier.slice(1) : identifier);
 	}
-	if (url.hostname !== "") return url.hostname;
+	if (url.host !== "") return url.host;
 	if (url.protocol === "acct:") return extractHandleHost(url.pathname);
 }
 function extractHandleHost(handle) {
@@ -96,7 +96,7 @@ function extractHandleHost(handle) {
 	const candidate = handle.slice(at + 1);
 	if (/[/?#\s]/.test(candidate)) return void 0;
 	try {
-		return new URL(`https://${candidate}`).hostname || void 0;
+		return new URL(`https://${candidate}`).host || void 0;
 	} catch {
 		return;
 	}
@@ -753,6 +753,23 @@ test("lookupObject() records activitypub.object.lookup counter", {
 			deepStrictEqual(counters[0].attributes["activitypub.lookup.kind"], "object");
 			deepStrictEqual(counters[0].attributes["activitypub.remote.host"], "example.com");
 		});
+		await t.step("records non-default ports for URL identifiers", async () => {
+			const [meterProvider, recorder] = createTestMeterProvider();
+			assertInstanceOf(await lookupObject("https://example.com:8443/object", {
+				documentLoader: (url) => Promise.resolve({
+					contextUrl: null,
+					documentUrl: url,
+					document: {
+						"@context": "https://www.w3.org/ns/activitystreams",
+						id: url,
+						type: "Note"
+					}
+				}),
+				contextLoader: mockDocumentLoader,
+				meterProvider
+			}), Object$1);
+			deepStrictEqual(recorder.getMeasurement("activitypub.object.lookup")?.attributes["activitypub.remote.host"], "example.com:8443");
+		});
 		await t.step("records kind=other on null result", async () => {
 			esm_default.removeRoutes();
 			esm_default.get("begin:https://example.com/.well-known/webfinger", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fedify/vocab",
-  "version": "2.3.0-dev.1189+97e55e59",
+  "version": "2.3.0-dev.1190+2dfa46e0",
   "homepage": "https://fedify.dev/",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "es-toolkit": "1.46.1",
     "jsonld": "^9.0.0",
     "pkijs": "^3.3.3",
-    "@fedify/vocab-tools": "2.3.0-dev.1189+97e55e59",
-    "@fedify/vocab-runtime": "2.3.0-dev.1189+97e55e59",
-    "@fedify/webfinger": "2.3.0-dev.1189+97e55e59"
+    "@fedify/vocab-tools": "2.3.0-dev.1190+2dfa46e0",
+    "@fedify/webfinger": "2.3.0-dev.1190+2dfa46e0",
+    "@fedify/vocab-runtime": "2.3.0-dev.1190+2dfa46e0"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",

package/src/actor.test.ts

@@ -297,6 +297,31 @@ test("getActorHandle() records activitypub.actor.discovery counter", {
       },
     );
 
+    await t.step(
+      "records non-default ports for actor IDs",
+      async () => {
+        fetchMock.removeRoutes();
+        fetchMock.get(
+          "begin:https://foo.example.com:8443/.well-known/webfinger?",
+          { status: 404 },
+        );
+        const [meterProvider, recorder] = createTestMeterProvider();
+        await rejects(
+          () =>
+            getActorHandle(new URL("https://foo.example.com:8443/@john"), {
+              meterProvider,
+            }),
+          TypeError,
+        );
+        const counter = recorder.getMeasurement("activitypub.actor.discovery");
+        ok(counter != null);
+        deepStrictEqual(
+          counter.attributes["activitypub.remote.host"],
+          "foo.example.com:8443",
+        );
+      },
+    );
+
     await t.step(
       "records result=error when a malformed WebFinger alias throws TypeError",
       async () => {

package/src/actor.ts

@@ -93,7 +93,7 @@ function getActorDiscoveryRemoteHost(
 ): string | undefined {
   const id = actor instanceof URL ? actor : actor.id;
   if (id == null) return undefined;
-  return id.hostname === "" ? undefined : id.hostname;
+  return id.host === "" ? undefined : id.host;
 }
 
 // Subclass of TypeError that preserves the documented `throws {TypeError}`

package/src/lookup.test.ts

@@ -765,6 +765,33 @@ test("lookupObject() records activitypub.object.lookup counter", {
       );
     });
 
+    await t.step(
+      "records non-default ports for URL identifiers",
+      async () => {
+        const [meterProvider, recorder] = createTestMeterProvider();
+        const object = await lookupObject("https://example.com:8443/object", {
+          documentLoader: (url) =>
+            Promise.resolve({
+              contextUrl: null,
+              documentUrl: url,
+              document: {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                id: url,
+                type: "Note",
+              },
+            }),
+          contextLoader: mockDocumentLoader,
+          meterProvider,
+        });
+        assertInstanceOf(object, Object);
+        const counter = recorder.getMeasurement("activitypub.object.lookup");
+        deepStrictEqual(
+          counter?.attributes["activitypub.remote.host"],
+          "example.com:8443",
+        );
+      },
+    );
+
     await t.step("records kind=other on null result", async () => {
       fetchMock.removeRoutes();
       fetchMock.get("begin:https://example.com/.well-known/webfinger", {

package/src/lookup.ts

@@ -67,13 +67,13 @@ function getLookupRemoteHost(identifier: string | URL): string | undefined {
       return extractHandleHost(stripped);
     }
   }
-  if (url.hostname !== "") return url.hostname;
-  // `acct:` URIs are opaque (no `//host` form), so the URL hostname is
-  // empty.  The user and authority live in `url.pathname` as
+  if (url.host !== "") return url.host;
+  // `acct:` URIs are opaque (no `//host` form), so the URL host is empty.
+  // The user and authority live in `url.pathname` as
   // `user@host`; reuse the same handle-extraction logic, which both
   // takes only the substring after the last `@` and refuses to record
   // anything that looks like a path / query / fragment rather than a
-  // bare hostname.
+  // bare host.
   if (url.protocol === "acct:") return extractHandleHost(url.pathname);
   return undefined;
 }
@@ -87,9 +87,9 @@ function extractHandleHost(handle: string): string | undefined {
   // the metric attribute, so we drop the host entirely in those cases.
   if (/[/?#\s]/.test(candidate)) return undefined;
   // Round-trip through `URL` so the parser validates the authority and
-  // strips any port/userinfo before we record it.
+  // strips any userinfo before we record it.
   try {
-    return new URL(`https://${candidate}`).hostname || undefined;
+    return new URL(`https://${candidate}`).host || undefined;
   } catch {
     return undefined;
   }