@vampgg/utils 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/extension-router.d.mts

@@ -148,5 +148,17 @@ declare class TempoExtensionRouter<Ctx extends {
   private send;
   handle(_req: Message, _ctx: Ctx): Promise<Message>;
 }
+type ExtensionSenderContext = {
+  sender: Runtime.MessageSender;
+};
+/**
+ * Inbound guard + dispatch for the background/service-worker `runtime.onMessage`
+ * hook, which the router does not install itself. Only frames from this
+ * extension that decode to a Message with a registered methodId are processed;
+ * everything else (other extensions, reply frames, malformed traffic) is
+ * ignored. Replies travel back through the router's send path, so this never
+ * uses `sendResponse`.
+ */
+declare function createExtensionListener(router: Pick<TempoExtensionRouter<ExtensionSenderContext>, "process">, registry: ServiceRegistry): (raw: unknown, sender: Runtime.MessageSender) => undefined;
 //#endregion
-export { ExtensionBaseRouter, TempoExtensionRouter, TempoExtensionRouterConfiguration };
+export { ExtensionBaseRouter, ExtensionSenderContext, TempoExtensionRouter, TempoExtensionRouterConfiguration, createExtensionListener };

package/dist/extension-router.mjs

@@ -1,7 +1,7 @@
 import { Message } from "./bebop.mjs";
 import { RouterCore } from "./router-core.mjs";
 import { Metadata, TempoError, TempoStatusCode, TempoUtil, TempoVersion } from "@tempojs/common";
-import { tabs } from "webextension-polyfill";
+import { runtime, tabs } from "webextension-polyfill";
 import { TempoRouterConfiguration } from "@tempojs/server";
 //#region src/extension-router.ts
 /**
@@ -190,19 +190,39 @@ var TempoExtensionRouter = class extends ExtensionBaseRouter {
 		});
 	}
 	async send(sender, message) {
-		if (!sender.tab?.id || sender.tab?.discarded === true) {
-			this.logger.warn(`ignoring message to discarded tab`, { tab: sender.tab });
-			return;
-		}
+		const payload = Array.from(Message.encode(message));
 		try {
-			await tabs.sendMessage(sender.tab.id, Array.from(Message.encode(message)));
+			if (sender.tab?.id !== void 0 && sender.tab.discarded !== true) await tabs.sendMessage(sender.tab.id, payload);
+			else await runtime.sendMessage(payload);
 		} catch (e) {
-			this.logger.error("failed to send message, tab is likely inactive", {}, e);
+			this.logger.debug("extension reply not delivered; receiver likely gone", { tab: sender.tab }, e);
 		}
 	}
 	async handle(_req, _ctx) {
 		return Message({});
 	}
 };
+/**
+* Inbound guard + dispatch for the background/service-worker `runtime.onMessage`
+* hook, which the router does not install itself. Only frames from this
+* extension that decode to a Message with a registered methodId are processed;
+* everything else (other extensions, reply frames, malformed traffic) is
+* ignored. Replies travel back through the router's send path, so this never
+* uses `sendResponse`.
+*/
+function createExtensionListener(router, registry) {
+	return (raw, sender) => {
+		if (sender.id !== runtime.id) return void 0;
+		if (!Array.isArray(raw)) return void 0;
+		let message;
+		try {
+			message = Message(Message.decode(new Uint8Array(raw)));
+		} catch {
+			return;
+		}
+		if (message.methodId === void 0 || !registry.getMethod(message.methodId)) return;
+		router.process(message, Message({}), { sender });
+	};
+}
 //#endregion
-export { ExtensionBaseRouter, TempoExtensionRouter, TempoExtensionRouterConfiguration };
+export { ExtensionBaseRouter, TempoExtensionRouter, TempoExtensionRouterConfiguration, createExtensionListener };

package/dist/service-registry.d.mts

@@ -0,0 +1,21 @@
+import { TempoLogger } from "@tempojs/common";
+import { BebopMethodAny, ServiceRegistry } from "@tempojs/server";
+
+//#region src/service-registry.d.ts
+/**
+ * One router takes one registry, but a host can generate services across
+ * several packages (each with its own registry class). Method ids are
+ * service+method hashes (collision-free across services), so first-hit-wins
+ * lookup is safe. Generated `init()` is destructive (moves the
+ * decorator-registered singleton out of a static map), so it must run exactly
+ * once — the router constructor also calls `init()`.
+ */
+declare class CompositeServiceRegistry extends ServiceRegistry {
+  #private;
+  private readonly registries;
+  constructor(logger: TempoLogger, registries: readonly ServiceRegistry[]);
+  init(): void;
+  getMethod(methodId: number): BebopMethodAny | undefined;
+}
+//#endregion
+export { CompositeServiceRegistry };

package/dist/service-registry.mjs

@@ -0,0 +1,31 @@
+import { ServiceRegistry } from "@tempojs/server";
+//#region src/service-registry.ts
+/**
+* One router takes one registry, but a host can generate services across
+* several packages (each with its own registry class). Method ids are
+* service+method hashes (collision-free across services), so first-hit-wins
+* lookup is safe. Generated `init()` is destructive (moves the
+* decorator-registered singleton out of a static map), so it must run exactly
+* once — the router constructor also calls `init()`.
+*/
+var CompositeServiceRegistry = class extends ServiceRegistry {
+	registries;
+	#initialized = false;
+	constructor(logger, registries) {
+		super(logger);
+		this.registries = registries;
+	}
+	init() {
+		if (this.#initialized) return;
+		this.#initialized = true;
+		for (const registry of this.registries) registry.init();
+	}
+	getMethod(methodId) {
+		for (const registry of this.registries) {
+			const method = registry.getMethod(methodId);
+			if (method) return method;
+		}
+	}
+};
+//#endregion
+export { CompositeServiceRegistry };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vampgg/utils",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.5",
   "description": "Tempo RPC, Bebop serialization, transports, and async primitives for @vampgg.",
   "homepage": "https://github.com/sammccord/vamp/tree/main/packages/utils#readme",
   "bugs": {
@@ -29,6 +29,7 @@
     "./extension-router": "./dist/extension-router.mjs",
     "./pino-logger": "./dist/pino-logger.mjs",
     "./router-core": "./dist/router-core.mjs",
+    "./service-registry": "./dist/service-registry.mjs",
     "./worker-channel": "./dist/worker-channel.mjs",
     "./worker-router": "./dist/worker-router.mjs",
     "./ws-channel": "./dist/ws-channel.mjs",