@serverkgg/bridge 0.0.18 → 0.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@serverkgg/bridge",
-	"version": "0.0.18",
+	"version": "0.0.19",
 	"description": "Serverk game bridge and driver runtime, wire protocol, manifest schema, and maintainer CLI",
 	"homepage": "https://serverk.gg",
 	"license": "SEE LICENSE IN LICENSE.md",

package/src/core/bridgeValue.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, test } from "bun:test";
+import type { BridgeRow } from "./bridgeValue";
 import { isLocalizedText } from "./bridgeValue";
 
 describe("isLocalizedText", () => {
@@ -27,3 +28,20 @@ describe("isLocalizedText", () => {
 		).toBe(false);
 	});
 });
+
+describe("BridgeRow", () => {
+	test('carries a localized cell beside its scalars so a driver never writes "English / عربي" into one string', () => {
+		const row: BridgeRow = {
+			id: "u-1",
+			kills: 12,
+			banned: false,
+			status: {
+				ar: "متصل",
+				en: "Online",
+			},
+		};
+
+		expect(isLocalizedText(row.status)).toBe(true);
+		expect(isLocalizedText(row.kills)).toBe(false);
+	});
+});

package/src/core/bridgeValue.ts

@@ -2,15 +2,19 @@ export type BridgeValue = boolean | number | string | null;
 
 export type BridgeValues = Record<string, BridgeValue>;
 
-export type BridgeRow = BridgeValues & {
-	id: string;
-};
-
 export interface LocalizedText {
 	ar: string;
 	en: string;
 }
 
+export type BridgeCell = BridgeValue | LocalizedText;
+
+export type BridgeCells = Record<string, BridgeCell>;
+
+export type BridgeRow = BridgeCells & {
+	id: string;
+};
+
 export type BridgeCopy = LocalizedText | string;
 
 export const isLocalizedText = (value: unknown): value is LocalizedText => {

package/src/modules/bridge.ts

@@ -1,5 +1,7 @@
 import type { BridgeContext, BridgeExecResult, BridgeFileEntry, BridgeReply } from "../context";
 import type {
+	BridgeCell,
+	BridgeCells,
 	BridgeCopy,
 	BridgeInstallHold,
 	BridgeInstallOutcome,
@@ -83,6 +85,8 @@ export namespace Bridge {
 	export type CatalogPage = BridgeCatalogPage;
 	export type CatalogProvider = BridgeCatalogProvider;
 	export type CatalogQuery = BridgeCatalogQuery;
+	export type Cell = BridgeCell;
+	export type Cells = BridgeCells;
 	export type Collection<Row extends BridgeRow = BridgeRow> = BridgeCollectionModule<Row>;
 	export type Context = BridgeContext;
 	export type Copy = BridgeCopy;

package/src/rcon/rconAccess.test.ts

@@ -286,6 +286,35 @@ describe("rconAccessSections", () => {
 		expect(detail.empty).toBeDefined();
 	});
 
+	test("the two sections carry different titles so the panel never repeats a heading", () => {
+		const [form, detail] = rconAccessSections();
+
+		expect(form?.title).toEqual({
+			ar: "الوصول عن بُعد",
+			en: "Remote access",
+		});
+		expect(detail?.title).toEqual({
+			ar: "بيانات الوصول عن بُعد",
+			en: "Remote access details",
+		});
+		expect(detail?.title).not.toEqual(form?.title);
+	});
+
+	test("the detail is visible only while remote access is on", () => {
+		const [, detail] = rconAccessSections();
+
+		if (detail?.layout !== BridgeLayout.Detail) {
+			throw new Error("the second section is the detail");
+		}
+
+		expect(detail.visibleWhen).toEqual({
+			variable: RCON_ACCESS_VARIABLE,
+			values: [
+				"true",
+			],
+		});
+	});
+
 	test("a dedicated port opens a port and a shared one only turns access on", () => {
 		const [dedicated] = rconAccessSections({
 			portKey: RCON_ACCESS_PORT,

package/src/rcon/rconAccess.ts

@@ -49,6 +49,11 @@ const ACCESS_TITLE: LocalizedText = {
 	en: "Remote access",
 };
 
+const ACCESS_DETAIL_TITLE: LocalizedText = {
+	ar: "بيانات الوصول عن بُعد",
+	en: "Remote access details",
+};
+
 const ACCESS_DESCRIPTION: LocalizedText = {
 	ar: "الوصول عن بُعد يخلي أداة خارجية تتحكم بسيرفرك بكلمة المرور هذي. الكلمة تمشي على النت بدون تشفير، فاقفل الوصول لما ما فيه أداة تستخدمه، ولا تعطي الكلمة أحد. لو تسربت غيّرها على طول.",
 	en: "Remote access lets an external tool control your server with this password. The password crosses the internet in the clear, so turn remote access off when no tool is using it, and never share the password. Rotate it the moment it leaks.",
@@ -235,7 +240,7 @@ export const rconAccessSections = (options: RconAccessSectionsOptions = {}): Bri
 		{
 			layout: BridgeLayout.Detail,
 			id: DETAIL_SECTION_ID,
-			title: ACCESS_TITLE,
+			title: ACCESS_DETAIL_TITLE,
 			module: RCON_ACCESS_MODULE,
 			actions: [
 				{
@@ -255,6 +260,12 @@ export const rconAccessSections = (options: RconAccessSectionsOptions = {}): Bri
 				ar: "شغّل سيرفرك مرة عشان تتولد كلمة المرور.",
 				en: "Start your server once to generate the password.",
 			},
+			visibleWhen: {
+				variable: RCON_ACCESS_VARIABLE,
+				values: [
+					"true",
+				],
+			},
 		},
 	];
 };

package/src/wire/panel.test.ts

@@ -15,7 +15,7 @@ import {
 	BridgeSetupStepKind,
 	BridgeUploadMode,
 } from "@serverkgg/bridge/protocol";
-import { bridgeManifestSchema } from "./panel";
+import { bridgeCellsSchema, bridgeManifestSchema } from "./panel";
 
 const text = (value: string) => ({
 	ar: value,
@@ -683,3 +683,37 @@ describe("the placement mirror", () => {
 		expect(bridgeManifestSchema.parse(source)).toEqual(source);
 	});
 });
+
+describe("the cell schema", () => {
+	test("accepts a scalar and a localized cell", () => {
+		expect(
+			bridgeCellsSchema.parse({
+				id: "u-1",
+				kills: 12,
+				banned: false,
+				status: {
+					ar: "متصل",
+					en: "Online",
+				},
+			}),
+		).toEqual({
+			id: "u-1",
+			kills: 12,
+			banned: false,
+			status: {
+				ar: "متصل",
+				en: "Online",
+			},
+		});
+	});
+
+	test("rejects a cell that carries only one language", () => {
+		expect(
+			bridgeCellsSchema.safeParse({
+				status: {
+					ar: "متصل",
+				},
+			}).success,
+		).toBe(false);
+	});
+});

package/src/wire/panel.ts

@@ -68,6 +68,17 @@ export const panelTextSchema = z.object({
 	en: z.string().min(1).max(PANEL_TEXT_LENGTH_LIMIT),
 });
 
+export const bridgeCellSchema = z.union([
+	bridgeValueSchema,
+	panelTextSchema,
+]);
+
+export type BridgeCellInput = z.infer<typeof bridgeCellSchema>;
+
+export const bridgeCellsSchema = z.record(zKey, bridgeCellSchema);
+
+export type BridgeCellsInput = z.infer<typeof bridgeCellsSchema>;
+
 export const bridgeOptionSchema = z.object({
 	value: z.string().min(1).max(128),
 	label: panelTextSchema,