fix(signal): preserve base URL path prefixes

steipete · VectorPeak · steipete · commit c4517a95a0b9 · 2026-07-18T07:10:42.000-07:00
Co-authored-by: VectorPeak &lt;73048950+VectorPeak@users.noreply.github.com&gt;
diff --git a/extensions/signal/src/client.test.ts b/extensions/signal/src/client.test.ts
@@ -92,6 +92,24 @@ describe("signalRpcRequest", () => {
     expect(result).toEqual({ version: "0.13.22" });
   });
 
+  it("preserves path-prefixed base URLs for RPC requests", async () => {
+    const serverUrl = await withSignalServer(async (req, res) => {
+      expect(req.method).toBe("POST");
+      expect(req.url).toBe("/signal/api/v1/rpc");
+      expect(JSON.parse(await readRequestBody(req))).toMatchObject({
+        method: "version",
+      });
+      res.writeHead(200, { "Content-Type": "application/json" });
+      res.end(JSON.stringify({ jsonrpc: "2.0", result: { version: "0.13.22" }, id: "test-id" }));
+    });
+
+    await expect(
+      signalRpcRequest<{ version: string }>("version", undefined, {
+        baseUrl: `${serverUrl}/signal/`,
+      }),
+    ).resolves.toEqual({ version: "0.13.22" });
+  });
+
   it("throws a wrapped error when RPC response JSON is malformed", async () => {
     const baseUrl = await withSignalServer((_req, res) => {
       res.writeHead(502, { "Content-Type": "text/plain" });
@@ -256,6 +274,21 @@ describe("signalCheck", () => {
     await expect(signalCheck(baseUrl)).resolves.toEqual({ ok: true, status: 204, error: null });
   });
 
+  it("preserves path-prefixed base URLs for health checks", async () => {
+    const serverUrl = await withSignalServer((req, res) => {
+      expect(req.method).toBe("GET");
+      expect(req.url).toBe("/signal/api/v1/check");
+      res.writeHead(204);
+      res.end();
+    });
+
+    await expect(signalCheck(`${serverUrl}/signal`)).resolves.toEqual({
+      ok: true,
+      status: 204,
+      error: null,
+    });
+  });
+
   it("returns an HTTP status failure for unhealthy checks", async () => {
     const baseUrl = await withSignalServer((_req, res) => {
       res.writeHead(503);
@@ -290,6 +323,25 @@ describe("streamSignalEvents", () => {
     expect(events).toEqual([{ id: "42", event: "message", data: '{"group":true}' }]);
   });
 
+  it("preserves path-prefixed base URLs for event streams", async () => {
+    type StreamEvent = Parameters<Parameters<typeof streamSignalEvents>[0]["onEvent"]>[0];
+    const events: StreamEvent[] = [];
+    const serverUrl = await withSignalServer((req, res) => {
+      expect(req.url).toBe("/signal/api/v1/events?account=%2B15555550123");
+      expect(req.headers.accept).toBe("text/event-stream");
+      res.writeHead(200, { "Content-Type": "text/event-stream" });
+      res.end('id: 42\nevent: message\ndata: {"group":true}\n\n');
+    });
+
+    await streamSignalEvents({
+      baseUrl: `${serverUrl}/signal`,
+      account: "+15555550123",
+      onEvent: (event) => events.push(event),
+    });
+
+    expect(events).toEqual([{ id: "42", event: "message", data: '{"group":true}' }]);
+  });
+
   it("propagates receive-handler failures to the stream", async () => {
     const appendError = new Error("durable append failed");
     const baseUrl = await withSignalServer((_req, res) => {
diff --git a/extensions/signal/src/client.ts b/extensions/signal/src/client.ts
@@ -68,7 +68,12 @@ function parseSignalBaseUrl(url: string): URL {
 }
 
 function resolveSignalEndpointUrl(baseUrl: string, pathname: string): URL {
-  return new URL(pathname, parseSignalBaseUrl(baseUrl));
+  const parsed = parseSignalBaseUrl(baseUrl);
+  const basePath = parsed.pathname.endsWith("/") ? parsed.pathname : `${parsed.pathname}/`;
+  parsed.pathname = `${basePath}${pathname.replace(/^\/+/, "")}`;
+  parsed.search = "";
+  parsed.hash = "";
+  return parsed;
 }
 
 function parseSignalRpcResponse<T>(text: string, status: number): SignalRpcResponse<T> {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,12 @@ function parseSignalBaseUrl(url: string): URL {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`function resolveSignalEndpointUrl(baseUrl: string, pathname: string): URL {`
`71`		`- return new URL(pathname, parseSignalBaseUrl(baseUrl));`
	`71`	`+ const parsed = parseSignalBaseUrl(baseUrl);`
	`72`	+ const basePath = parsed.pathname.endsWith("/") ? parsed.pathname : `${parsed.pathname}/`;
	`73`	+ parsed.pathname = `${basePath}${pathname.replace(/^\/+/, "")}`;
	`74`	`+ parsed.search = "";`
	`75`	`+ parsed.hash = "";`
	`76`	`+ return parsed;`
`72`	`77`	`}`
`73`	`78`
`74`	`79`	`function parseSignalRpcResponse<T>(text: string, status: number): SignalRpcResponse<T> {`