@serverkgg/bridge 0.1.2 → 0.1.3

package/src/manifest/manifest.ts

@@ -3,6 +3,7 @@ import { PORT_BLOCK_MAX_COUNT, PortJoin, PortProtocol, socketProtocolsOf } from
 import { BridgeIcon } from "../panel/bridgeIcon";
 import { BRIDGE_OPTION_VALUE_LENGTH_LIMIT, BRIDGE_VISIBLE_VALUES_LIMIT } from "../protocol/bridgeLimits";
 import { GameCategory } from "./category";
+import { type ManifestExtension, manifestExtensionsSchema } from "./extension";
 import { type GuideEntry, type GuideTag, guideEntrySchema, guideTagSchema } from "./guide";
 import { IMAGE_NAMESPACE } from "./image";
 import { PackageKind } from "./kind";
@@ -157,10 +158,12 @@ const manifestMetadataSchema = z.object({
 	category: z.enum(GameCategory),
 	logo: zAssetPath,
 	banner: zAssetPath,
+	extensions: manifestExtensionsSchema,
 });
 
 const botMetadataSchema = manifestMetadataSchema.omit({
 	category: true,
+	extensions: true,
 });
 
 const manifestResourcesSchema = z
@@ -764,6 +767,36 @@ const packageIssues = (manifest: PackageShape): CheckIssue[] => {
 	];
 };
 
+const extensionIssues = (extensions: ManifestExtension[]): CheckIssue[] => {
+	return [
+		...duplicateIssues(
+			extensions,
+			(extension) => extension.kind,
+			(index) => [
+				"metadata",
+				"extensions",
+				index,
+				"kind",
+			],
+			(key) => `extension "${key}" is declared twice`,
+		),
+		...extensions.flatMap((extension, extensionIndex) =>
+			duplicateIssues(
+				extension.sources,
+				(source) => source,
+				(index) => [
+					"metadata",
+					"extensions",
+					extensionIndex,
+					"sources",
+					index,
+				],
+				(key) => `source "${key}" is listed twice for ${extension.kind}`,
+			),
+		),
+	];
+};
+
 const secretIssues = (secrets: ManifestSecret[]): CheckIssue[] => {
 	return duplicateIssues(
 		secrets,
@@ -801,6 +834,7 @@ export const gameManifestSchema = z
 
 		ctx.issues.push(
 			...packageIssues(manifest),
+			...extensionIssues(manifest.metadata.extensions),
 			...secretIssues(manifest.secrets),
 			...presenceIssues(manifest.presence),
 		);

package/src/net/loopback.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import { BridgeNetError } from "../core";
 import { loopbackJson, loopbackText } from "./loopback";
 import { LoopbackMethod } from "./loopbackMethod";
@@ -12,7 +12,7 @@ const serve = (handler: (request: Request) => Response | Promise<Response>) => {
 };
 
 describe("loopbackJson", () => {
-	test("reads a json body from a loopback server", async () => {
+	it("reads a json body from a loopback server", async () => {
 		const server = serve(() =>
 			Response.json({
 				online: 3,
@@ -32,7 +32,7 @@ describe("loopbackJson", () => {
 		}
 	});
 
-	test("sends the method, headers and body it is given", async () => {
+	it("sends the method, headers and body it is given", async () => {
 		let seen = "";
 
 		const server = serve(async (request) => {
@@ -58,7 +58,7 @@ describe("loopbackJson", () => {
 		}
 	});
 
-	test("raises a net error carrying the status when the server refuses", async () => {
+	it("raises a net error carrying the status when the server refuses", async () => {
 		const server = serve(
 			() =>
 				new Response("nope", {
@@ -76,7 +76,7 @@ describe("loopbackJson", () => {
 		}
 	});
 
-	test("raises a net error when the body is not json", async () => {
+	it("raises a net error when the body is not json", async () => {
 		const server = serve(() => new Response("not json"));
 
 		try {
@@ -89,7 +89,7 @@ describe("loopbackJson", () => {
 		}
 	});
 
-	test("times out against a server that never answers", async () => {
+	it("times out against a server that never answers", async () => {
 		const server = serve(async () => {
 			await Bun.sleep(600);
 
@@ -109,7 +109,7 @@ describe("loopbackJson", () => {
 });
 
 describe("loopback guard", () => {
-	test("refuses a host that is not loopback", async () => {
+	it("refuses a host that is not loopback", async () => {
 		for (const url of [
 			"https://api.curseforge.com/v1",
 			"http://10.0.0.5:8080/",
@@ -122,14 +122,14 @@ describe("loopback guard", () => {
 		}
 	});
 
-	test("refuses a scheme that is not http", async () => {
+	it("refuses a scheme that is not http", async () => {
 		const error = await loopbackText("file:///etc/passwd").catch((reason: unknown) => reason);
 
 		expect(error).toBeInstanceOf(BridgeNetError);
 		expect((error as BridgeNetError).message).toContain("is not an http url");
 	});
 
-	test("refuses a header carrying a line break", async () => {
+	it("refuses a header carrying a line break", async () => {
 		const error = await loopbackText("http://127.0.0.1:1/", {
 			headers: {
 				"x-token": "a\r\nx-admin: yes",
@@ -140,7 +140,7 @@ describe("loopback guard", () => {
 		expect((error as BridgeNetError).message).toContain("line break");
 	});
 
-	test("accepts localhost", async () => {
+	it("accepts localhost", async () => {
 		const server = serve(() => new Response("pong"));
 
 		try {

package/src/presence/rosterSync.test.ts

@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, test } from "bun:test";
+import { beforeEach, describe, expect, it } from "bun:test";
 import type { BridgeContext } from "../context";
 import type { BridgeValues } from "../core";
 import { BridgeEventName } from "../protocol";
@@ -42,7 +42,7 @@ beforeEach(() => {
 });
 
 describe("createRosterSync", () => {
-	test("emits a join for every player of the first sample", () => {
+	it("emits a join for every player of the first sample", () => {
 		const sync = roster();
 
 		sync.sync(context, [
@@ -74,7 +74,7 @@ describe("createRosterSync", () => {
 		]);
 	});
 
-	test("stays quiet while the roster does not change", () => {
+	it("stays quiet while the roster does not change", () => {
 		const sync = roster();
 		const rows = [
 			{
@@ -90,7 +90,7 @@ describe("createRosterSync", () => {
 		expect(emitted).toEqual([]);
 	});
 
-	test("emits a leave carrying the presence the player had", () => {
+	it("emits a leave carrying the presence the player had", () => {
 		const sync = roster();
 
 		sync.sync(context, [
@@ -113,7 +113,7 @@ describe("createRosterSync", () => {
 		]);
 	});
 
-	test("emits both sides of a swap in one sample", () => {
+	it("emits both sides of a swap in one sample", () => {
 		const sync = roster();
 
 		sync.sync(context, [
@@ -136,7 +136,7 @@ describe("createRosterSync", () => {
 		]);
 	});
 
-	test("reports who it believes is online", () => {
+	it("reports who it believes is online", () => {
 		const sync = roster();
 
 		sync.sync(context, [
@@ -158,7 +158,7 @@ describe("createRosterSync", () => {
 		expect(sync.online()).toEqual([]);
 	});
 
-	test("emits a fresh join after a clear", () => {
+	it("emits a fresh join after a clear", () => {
 		const sync = roster();
 		const rows = [
 			{

package/src/probes/a2s.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import { BridgeProbeCode, BridgeProbeError } from "../core";
 import { probeA2s } from "./a2s";
 
@@ -21,13 +21,13 @@ const listen = async (reply: Uint8Array | null) => {
 };
 
 describe("probeA2s", () => {
-	test("rejects with an unreachable probe error when nothing listens on the port", async () => {
+	it("rejects with an unreachable probe error when nothing listens on the port", async () => {
 		const probe = probeA2s(HOST, CLOSED_PORT, 2000);
 
 		await expect(probe).rejects.toBeInstanceOf(BridgeProbeError);
 	});
 
-	test("survives the port-unreachable the game leaves behind before it binds", async () => {
+	it("survives the port-unreachable the game leaves behind before it binds", async () => {
 		for (let attempt = 0; attempt < 3; attempt += 1) {
 			await probeA2s(HOST, CLOSED_PORT, 300).catch(() => null);
 		}
@@ -35,7 +35,7 @@ describe("probeA2s", () => {
 		expect(process.exitCode ?? 0).toBe(0);
 	});
 
-	test("times out against a port that never answers", async () => {
+	it("times out against a port that never answers", async () => {
 		const silent = await listen(null);
 
 		try {
@@ -48,7 +48,7 @@ describe("probeA2s", () => {
 		}
 	});
 
-	test("rejects a reply that is not an a2s frame", async () => {
+	it("rejects a reply that is not an a2s frame", async () => {
 		const noisy = await listen(
 			new Uint8Array([
 				1,

package/src/probes/minecraftPing.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import { BridgeProbeCode, BridgeProbeError } from "../core";
 import { parseStatus, probeMinecraftPing } from "./minecraftPing";
 
@@ -105,7 +105,7 @@ const listen = async (reply: Uint8Array | null, onServerName?: (serverName: stri
 };
 
 describe("reading a status response off the wire", () => {
-	test("a complete response gives the player counts, the version and the motd", () => {
+	it("a complete response gives the player counts, the version and the motd", () => {
 		expect(parseStatus(response(status))).toEqual({
 			players: {
 				online: 3,
@@ -116,7 +116,7 @@ describe("reading a status response off the wire", () => {
 		});
 	});
 
-	test("a response longer than one packet is still read, because the frame carries its own length", () => {
+	it("a response longer than one packet is still read, because the frame carries its own length", () => {
 		const packet = response(status);
 		const padded = new Uint8Array(packet.length + 4);
 
@@ -128,7 +128,7 @@ describe("reading a status response off the wire", () => {
 		});
 	});
 
-	test("a modern description object is read through its text", () => {
+	it("a modern description object is read through its text", () => {
 		expect(
 			parseStatus(
 				response({
@@ -141,7 +141,7 @@ describe("reading a status response off the wire", () => {
 		).toBe("hello");
 	});
 
-	test("a description we cannot read is dropped rather than failing the sample", () => {
+	it("a description we cannot read is dropped rather than failing the sample", () => {
 		expect(
 			parseStatus(
 				response({
@@ -162,7 +162,7 @@ describe("reading a status response off the wire", () => {
 		).toBeNull();
 	});
 
-	test("a missing version name is dropped rather than failing the sample", () => {
+	it("a missing version name is dropped rather than failing the sample", () => {
 		expect(
 			parseStatus(
 				response({
@@ -172,7 +172,7 @@ describe("reading a status response off the wire", () => {
 		).toBeNull();
 	});
 
-	test("fractional or negative counts are clamped to whole players", () => {
+	it("fractional or negative counts are clamped to whole players", () => {
 		expect(
 			parseStatus(
 				response({
@@ -188,7 +188,7 @@ describe("reading a status response off the wire", () => {
 		});
 	});
 
-	test("a response we have not fully received yet asks for more bytes", () => {
+	it("a response we have not fully received yet asks for more bytes", () => {
 		const packet = response(status);
 
 		expect(parseStatus(new Uint8Array(0))).toBeNull();
@@ -196,7 +196,7 @@ describe("reading a status response off the wire", () => {
 		expect(parseStatus(packet.subarray(0, packet.length - 4))).toBeNull();
 	});
 
-	test("a large payload whose length needs two varint bytes is read whole", () => {
+	it("a large payload whose length needs two varint bytes is read whole", () => {
 		const long = {
 			players: status.players,
 			description: "n".repeat(400),
@@ -205,11 +205,11 @@ describe("reading a status response off the wire", () => {
 		expect(parseStatus(response(long))?.description).toBe(long.description);
 	});
 
-	test("a packet that is not a status response is refused", () => {
+	it("a packet that is not a status response is refused", () => {
 		expect(() => parseStatus(response(status, 0x01))).toThrow();
 	});
 
-	test("a response with no player counts is refused, because a sample without them is a lie", () => {
+	it("a response with no player counts is refused, because a sample without them is a lie", () => {
 		expect(() =>
 			parseStatus(
 				response({
@@ -223,7 +223,7 @@ describe("reading a status response off the wire", () => {
 });
 
 describe("probeMinecraftPing", () => {
-	test("answers with the status a listening server sends back", async () => {
+	it("answers with the status a listening server sends back", async () => {
 		const server = await listen(response(status));
 
 		try {
@@ -246,7 +246,7 @@ describe("probeMinecraftPing", () => {
 		}
 	});
 
-	test("puts the server name in the handshake so a virtual host still answers", async () => {
+	it("puts the server name in the handshake so a virtual host still answers", async () => {
 		const seen: string[] = [];
 
 		const server = await listen(response(status), (serverName) => {
@@ -269,7 +269,7 @@ describe("probeMinecraftPing", () => {
 		}
 	});
 
-	test("falls back to the address when no server name is given", async () => {
+	it("falls back to the address when no server name is given", async () => {
 		const seen: string[] = [];
 
 		const server = await listen(response(status), (serverName) => {
@@ -291,7 +291,7 @@ describe("probeMinecraftPing", () => {
 		}
 	});
 
-	test("rejects as unreachable when nothing listens on the port", async () => {
+	it("rejects as unreachable when nothing listens on the port", async () => {
 		const error = await probeMinecraftPing(
 			{
 				address: HOST,
@@ -304,7 +304,7 @@ describe("probeMinecraftPing", () => {
 		expect((error as BridgeProbeError).code).toBe(BridgeProbeCode.Unreachable);
 	});
 
-	test("times out against a port that never answers", async () => {
+	it("times out against a port that never answers", async () => {
 		const silent = await listen(null);
 
 		try {
@@ -323,7 +323,7 @@ describe("probeMinecraftPing", () => {
 		}
 	});
 
-	test("rejects a reply that is not a status response", async () => {
+	it("rejects a reply that is not a status response", async () => {
 		const noisy = await listen(response(status, 0x01));
 
 		try {

package/src/probes/raknetPing.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import { BridgeProbeCode, BridgeProbeError } from "../core";
 import { parseUnconnectedPong, probeRaknetPing } from "./raknetPing";
 
@@ -64,7 +64,7 @@ const listen = async (reply: Uint8Array | null) => {
 };
 
 describe("reading an unconnected pong", () => {
-	test("a full advertisement gives the players, the version and the motd", () => {
+	it("a full advertisement gives the players, the version and the motd", () => {
 		expect(parseUnconnectedPong(pong(ADVERT))).toEqual({
 			players: {
 				online: 4,
@@ -79,7 +79,7 @@ describe("reading an unconnected pong", () => {
 		});
 	});
 
-	test("an advertisement that stops after the player counts is still read", () => {
+	it("an advertisement that stops after the player counts is still read", () => {
 		expect(parseUnconnectedPong(pong("MCPE;Serverk;800;1.21.60;2;8"))).toEqual({
 			players: {
 				online: 2,
@@ -94,7 +94,7 @@ describe("reading an unconnected pong", () => {
 		});
 	});
 
-	test("a pong with another packet id is refused", () => {
+	it("a pong with another packet id is refused", () => {
 		expect(() =>
 			parseUnconnectedPong(
 				pong(ADVERT, {
@@ -104,7 +104,7 @@ describe("reading an unconnected pong", () => {
 		).toThrow();
 	});
 
-	test("a pong without the raknet magic is refused", () => {
+	it("a pong without the raknet magic is refused", () => {
 		expect(() =>
 			parseUnconnectedPong(
 				pong(ADVERT, {
@@ -114,7 +114,7 @@ describe("reading an unconnected pong", () => {
 		).toThrow();
 	});
 
-	test("a pong that advertises more payload than it carries is refused", () => {
+	it("a pong that advertises more payload than it carries is refused", () => {
 		expect(() =>
 			parseUnconnectedPong(
 				pong(ADVERT, {
@@ -124,21 +124,21 @@ describe("reading an unconnected pong", () => {
 		).toThrow();
 	});
 
-	test("a pong without player counts is refused, because a sample without them is a lie", () => {
+	it("a pong without player counts is refused, because a sample without them is a lie", () => {
 		expect(() => parseUnconnectedPong(pong("MCPE;Serverk;800;1.21.60"))).toThrow();
 	});
 
-	test("a datagram larger than a pong can be is refused", () => {
+	it("a datagram larger than a pong can be is refused", () => {
 		expect(() => parseUnconnectedPong(pong("n".repeat(4096)))).toThrow();
 	});
 
-	test("a truncated datagram is refused", () => {
+	it("a truncated datagram is refused", () => {
 		expect(() => parseUnconnectedPong(new Uint8Array(8))).toThrow();
 	});
 });
 
 describe("probeRaknetPing", () => {
-	test("answers with the advertisement a listening server sends back", async () => {
+	it("answers with the advertisement a listening server sends back", async () => {
 		const server = await listen(pong(ADVERT));
 
 		try {
@@ -155,13 +155,13 @@ describe("probeRaknetPing", () => {
 		}
 	});
 
-	test("rejects with an unreachable probe error when nothing listens on the port", async () => {
+	it("rejects with an unreachable probe error when nothing listens on the port", async () => {
 		const probe = probeRaknetPing(HOST, CLOSED_PORT, 2000);
 
 		await expect(probe).rejects.toBeInstanceOf(BridgeProbeError);
 	});
 
-	test("times out against a port that never answers", async () => {
+	it("times out against a port that never answers", async () => {
 		const silent = await listen(null);
 
 		try {
@@ -174,7 +174,7 @@ describe("probeRaknetPing", () => {
 		}
 	});
 
-	test("rejects a reply that is not a raknet pong", async () => {
+	it("rejects a reply that is not a raknet pong", async () => {
 		const noisy = await listen(
 			new Uint8Array([
 				1,

package/src/rcon/rconAccess.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, it } from "bun:test";
 import type { BridgeContext } from "../context";
 import { BridgeDetailFormat, BridgeDetailTone, BridgeFormTarget, BridgeLayout } from "../panel";
 import {
@@ -55,7 +55,7 @@ const accessWith = (password: RconAccessPassword | null, rotate?: () => Promise<
 };
 
 describe("rconExposed", () => {
-	test("only the string true opens remote access", () => {
+	it("only the string true opens remote access", () => {
 		expect(
 			rconExposed(
 				stubContext({
@@ -68,7 +68,7 @@ describe("rconExposed", () => {
 });
 
 describe("rconBindHost", () => {
-	test("an exposed server binds every interface and a closed one stays on loopback", () => {
+	it("an exposed server binds every interface and a closed one stays on loopback", () => {
 		expect(
 			rconBindHost(
 				stubContext({
@@ -81,7 +81,7 @@ describe("rconBindHost", () => {
 });
 
 describe("createRconAccess", () => {
-	test("an exposed server reads as open", async () => {
+	it("an exposed server reads as open", async () => {
 		const detail = await accessWith({
 			value: "secret",
 			pending: false,
@@ -94,7 +94,7 @@ describe("createRconAccess", () => {
 
 		expect(detail?.id).toBe(RCON_ACCESS_MODULE);
 		expect(detail?.badges.map((badge) => badge.label.en)).toEqual([
-			"Open",
+			"On",
 		]);
 		expect(detail?.badges[0]?.tone).toBe(BridgeDetailTone.Success);
 		expect(detail?.actions).toEqual([
@@ -102,19 +102,19 @@ describe("createRconAccess", () => {
 		]);
 	});
 
-	test("a closed server reads as closed", async () => {
+	it("a closed server reads as closed", async () => {
 		const detail = await accessWith({
 			value: "secret",
 			pending: false,
 		}).read(stubContext().context);
 
 		expect(detail?.badges.map((badge) => badge.label.en)).toEqual([
-			"Closed",
+			"Off",
 		]);
 		expect(detail?.badges[0]?.tone).toBe(BridgeDetailTone.Neutral);
 	});
 
-	test("the port and the password are the two stats", async () => {
+	it("the port and the password are the two stats", async () => {
 		const detail = await accessWith({
 			value: "secret",
 			pending: false,
@@ -146,19 +146,19 @@ describe("createRconAccess", () => {
 		]);
 	});
 
-	test("a password waiting for the next restart carries the pending badge", async () => {
+	it("a password waiting for the next restart carries the pending badge", async () => {
 		const detail = await accessWith({
 			value: "next",
 			pending: true,
 		}).read(stubContext().context);
 
 		expect(detail?.badges.map((badge) => badge.label.en)).toEqual([
-			"Closed",
+			"Off",
 			"Applies after restart",
 		]);
 	});
 
-	test("an inactive port leaves the port stat empty instead of failing the read", async () => {
+	it("an inactive port leaves the port stat empty instead of failing the read", async () => {
 		const detail = await accessWith({
 			value: "secret",
 			pending: false,
@@ -172,11 +172,11 @@ describe("createRconAccess", () => {
 		expect(detail?.stats.find((stat) => stat.key === "password")?.value).toBe("secret");
 	});
 
-	test("a server with no password yet has no detail", async () => {
+	it("a server with no password yet has no detail", async () => {
 		expect(await accessWith(null).read(stubContext().context)).toBeNull();
 	});
 
-	test("rotating delegates to the driver, logs without the value and answers nothing", async () => {
+	it("rotating delegates to the driver, logs without the value and answers nothing", async () => {
 		let rotated = 0;
 
 		const access = accessWith(
@@ -199,7 +199,7 @@ describe("createRconAccess", () => {
 		]);
 	});
 
-	test("the protocol name names the detail and both stats", async () => {
+	it("the protocol name names the detail and both stats", async () => {
 		const detail = await createRconAccess({
 			protocol: {
 				ar: "Telnet",
@@ -232,7 +232,7 @@ describe("createRconAccess", () => {
 		]);
 	});
 
-	test("a tools line joins the security copy", async () => {
+	it("a tools line joins the security copy", async () => {
 		const detail = await createRconAccess({
 			tools: {
 				ar: "أدوات مثل RustAdmin.",
@@ -256,7 +256,7 @@ describe("createRconAccess", () => {
 });
 
 describe("rconAccessSections", () => {
-	test("the form declares the variable the manifest activates the port on", () => {
+	it("the form declares the variable the manifest activates the port on", () => {
 		const [form] = rconAccessSections();
 
 		expect(form?.layout).toBe(BridgeLayout.Form);
@@ -272,7 +272,7 @@ describe("rconAccessSections", () => {
 		]);
 	});
 
-	test("the detail points at the module and offers the rotate action", () => {
+	it("the detail points at the module and offers the rotate action", () => {
 		const [, detail] = rconAccessSections();
 
 		if (detail?.layout !== BridgeLayout.Detail) {
@@ -286,7 +286,7 @@ describe("rconAccessSections", () => {
 		expect(detail.empty).toBeDefined();
 	});
 
-	test("the two sections carry different titles so the panel never repeats a heading", () => {
+	it("the two sections carry different titles so the panel never repeats a heading", () => {
 		const [form, detail] = rconAccessSections();
 
 		expect(form?.title).toEqual({
@@ -300,7 +300,7 @@ describe("rconAccessSections", () => {
 		expect(detail?.title).not.toEqual(form?.title);
 	});
 
-	test("the detail is visible only while remote access is on", () => {
+	it("the detail is visible only while remote access is on", () => {
 		const [, detail] = rconAccessSections();
 
 		if (detail?.layout !== BridgeLayout.Detail) {
@@ -315,7 +315,7 @@ describe("rconAccessSections", () => {
 		});
 	});
 
-	test("a dedicated port opens a port and a shared one only turns access on", () => {
+	it("a dedicated port opens a port and a shared one only turns access on", () => {
 		const [dedicated] = rconAccessSections({
 			portKey: RCON_ACCESS_PORT,
 		});