@serverkgg/bridge 0.1.12 → 0.1.14

package/src/runtime/serve.ts

@@ -19,10 +19,17 @@ import { validateDriver } from "./bridgeDriver";
 import { createEventRing } from "./bridgeEvents";
 import { decideInstall, recountHold } from "./bridgeInstall";
 import { createBridgeLiveConfig } from "./bridgeLiveConfig";
-import { errorDetail, errorText, log as stdoutLog } from "./bridgeLog";
+import { errorDetail, errorText, print, log as stdoutLog } from "./bridgeLog";
 import { pendingResult, rejectedPending, unsupportedPending } from "./bridgePending";
-import { createBridgeRedaction, redactLocalized, redactLogger, secretFieldKeys } from "./bridgeRedaction";
+import {
+	createBridgeRedaction,
+	redactLocalized,
+	redactLogger,
+	redactPrinter,
+	secretFieldKeys,
+} from "./bridgeRedaction";
 import { createRegistry } from "./bridgeRegistry";
+import { idleSample, sampleResultOf } from "./bridgeSample";
 import { createServer } from "./bridgeServer";
 import { setupSummaryOf } from "./bridgeSetup";
 import { createSetupHandlers } from "./bridgeSetupHandlers";
@@ -182,6 +189,7 @@ export const serve = async (driver: BridgeDriver) => {
 		supervisor,
 		{
 			onLog: log,
+			onPrint: redactPrinter(print, redact),
 			onEmit(event, payload) {
 				ring.emit(event, payload);
 			},
@@ -259,10 +267,7 @@ export const serve = async (driver: BridgeDriver) => {
 		}
 
 		if (!supervisor.running) {
-			return {
-				online: null,
-				max: null,
-			};
+			return idleSample();
 		}
 
 		const stamp = performance.now();
@@ -271,12 +276,7 @@ export const serve = async (driver: BridgeDriver) => {
 			return sampled.value;
 		}
 
-		const result = await query.sample(context);
-
-		const value: BridgeSampleResult = {
-			online: result.online,
-			max: result.max,
-		};
+		const value = sampleResultOf(await query.sample(context));
 
 		sampled = {
 			value,

package/src/wire/panel.test.ts

@@ -13,6 +13,7 @@ import {
 	BridgePlace,
 	type BridgeSetupManifest,
 	BridgeSetupStepKind,
+	type BridgeTerminalManifest,
 	BridgeUploadMode,
 } from "@serverkgg/bridge/protocol";
 import { bridgeAvailabilitySchema, bridgeCellsSchema, bridgeManifestSchema } from "./panel";
@@ -783,3 +784,34 @@ describe("the availability schema", () => {
 		expect(parsed.modules[0]?.actions).toContain(BridgeAction.Availability);
 	});
 });
+
+const terminalManifest = (shell: boolean): BridgeManifest => ({
+	version: "1.0.0",
+	panel: null,
+	terminal: {
+		commands: [],
+		rules: [],
+		shell,
+	},
+	setup: null,
+	modules: [],
+	events: [],
+});
+
+describe("the terminal mirror", () => {
+	it("carries the shell flag through unchanged", () => {
+		expect(bridgeManifestSchema.parse(terminalManifest(true)).terminal?.shell).toBe(true);
+	});
+
+	it("defaults a terminal from an older bridge that carries no shell flag to false", () => {
+		const older = terminalManifest(true);
+
+		delete (older.terminal as Partial<BridgeTerminalManifest>).shell;
+
+		expect(bridgeManifestSchema.parse(older).terminal).toEqual({
+			commands: [],
+			rules: [],
+			shell: false,
+		});
+	});
+});

package/src/wire/panel.ts

@@ -318,6 +318,7 @@ export const bridgeTerminalRuleSchema: z.ZodType<BridgeTerminalRuleManifest> = z
 export const bridgeTerminalManifestSchema: z.ZodType<BridgeTerminalManifest> = z.object({
 	commands: z.array(bridgeTerminalCommandSchema).max(128),
 	rules: z.array(bridgeTerminalRuleSchema).max(64),
+	shell: z.boolean().default(false),
 });
 
 const setupStepBase = {