@vibes.diy/api-impl 14.3.322 → 14.3.323
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-impl",
|
|
3
|
-
"version": "14.3.
|
|
3
|
+
"version": "14.3.323",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"@adviser/cement": "~0.5.37",
|
|
12
|
-
"@vibes.diy/api-pkg": "14.3.
|
|
13
|
-
"@vibes.diy/api-types": "14.3.
|
|
14
|
-
"@vibes.diy/call-ai-v2": "14.3.
|
|
15
|
-
"@vibes.diy/identity": "14.3.
|
|
16
|
-
"@vibes.diy/vibe-types": "14.3.
|
|
12
|
+
"@vibes.diy/api-pkg": "14.3.323",
|
|
13
|
+
"@vibes.diy/api-types": "14.3.323",
|
|
14
|
+
"@vibes.diy/call-ai-v2": "14.3.323",
|
|
15
|
+
"@vibes.diy/identity": "14.3.323",
|
|
16
|
+
"@vibes.diy/vibe-types": "14.3.323",
|
|
17
17
|
"arktype": "~2.2.9",
|
|
18
18
|
"ws": "~8.22.2"
|
|
19
19
|
},
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { VibeDiyApiConnection } from "./api-connection.js";
|
|
2
2
|
import { formatWsEvent } from "@vibes.diy/api-types";
|
|
3
|
+
import type { ClientOptions } from "ws";
|
|
3
4
|
import { type ProxyConnector, type WsProxyDecision, type WsProxyEnv } from "./ws-proxy.js";
|
|
4
5
|
export { formatWsEvent };
|
|
5
6
|
export interface WsDialOptions {
|
|
@@ -7,10 +8,19 @@ export interface WsDialOptions {
|
|
|
7
8
|
readonly connectionKey?: string;
|
|
8
9
|
readonly proxyEnv?: WsProxyEnv;
|
|
9
10
|
}
|
|
11
|
+
export interface WsModule {
|
|
12
|
+
readonly WebSocket: new (url: string, opts: ClientOptions) => unknown;
|
|
13
|
+
}
|
|
14
|
+
export interface WebSocketImpl {
|
|
15
|
+
readonly globalWebSocket: (new (url: string) => WebSocket) | undefined;
|
|
16
|
+
readonly loadWs: () => Promise<WsModule>;
|
|
17
|
+
}
|
|
18
|
+
export declare function runtimeWebSocketImpl(): WebSocketImpl;
|
|
10
19
|
export declare function createWebSocket(url: string, opts?: {
|
|
11
20
|
readonly ca?: string[];
|
|
12
21
|
readonly proxy?: WsProxyDecision;
|
|
13
22
|
readonly connector?: ProxyConnector;
|
|
23
|
+
readonly impl?: WebSocketImpl;
|
|
14
24
|
}): Promise<WebSocket>;
|
|
15
25
|
export declare function resetVibesDiyWebSocketConnections(): void;
|
|
16
26
|
export declare const WS_OPEN_TIMEOUT_MS = 20000;
|
package/websocket-connection.js
CHANGED
|
@@ -3,15 +3,22 @@ import { formatWsEvent } from "@vibes.diy/api-types";
|
|
|
3
3
|
import { describeWsProxyDecision, resolveWsProxy } from "./ws-proxy.js";
|
|
4
4
|
const vibesDiyApiPerConnection = new KeyedResolvOnce();
|
|
5
5
|
export { formatWsEvent };
|
|
6
|
+
export function runtimeWebSocketImpl() {
|
|
7
|
+
return {
|
|
8
|
+
globalWebSocket: typeof globalThis.WebSocket === "undefined" ? undefined : globalThis.WebSocket,
|
|
9
|
+
loadWs: () => import("ws"),
|
|
10
|
+
};
|
|
11
|
+
}
|
|
6
12
|
export async function createWebSocket(url, opts = {}) {
|
|
7
13
|
const { ca, proxy, connector } = opts;
|
|
14
|
+
const impl = opts.impl ?? runtimeWebSocketImpl();
|
|
8
15
|
if (proxy?.kind === "invalid") {
|
|
9
16
|
throw new Error(proxy.message);
|
|
10
17
|
}
|
|
11
|
-
if (
|
|
12
|
-
return new
|
|
18
|
+
if (impl.globalWebSocket !== undefined && ca === undefined && proxy?.kind !== "proxy") {
|
|
19
|
+
return new impl.globalWebSocket(url);
|
|
13
20
|
}
|
|
14
|
-
const ws = await
|
|
21
|
+
const ws = await impl.loadWs();
|
|
15
22
|
if (proxy?.kind === "proxy") {
|
|
16
23
|
if (connector === undefined) {
|
|
17
24
|
throw new Error("a proxy is configured but this runtime has no CONNECT tunnel connector");
|
|
@@ -53,6 +60,8 @@ function describeTarget(wsSocketUrl) {
|
|
|
53
60
|
return `host ${uri.hostname}:${port}`;
|
|
54
61
|
}
|
|
55
62
|
const WS_READY_STATE_OPEN = 1;
|
|
63
|
+
const WS_READY_STATE_CLOSING = 2;
|
|
64
|
+
const WS_READY_STATE_CLOSED = 3;
|
|
56
65
|
export function getVibesDiyWebSocketConnection(url, presetWs, opts = {}) {
|
|
57
66
|
const { ca, connectionKey, proxyEnv } = opts;
|
|
58
67
|
const wsSocketUrl = BuildURI.from(url)
|
|
@@ -128,7 +137,7 @@ export function getVibesDiyWebSocketConnection(url, presetWs, opts = {}) {
|
|
|
128
137
|
ws.onmessage = (event) => {
|
|
129
138
|
onMessage.invoke({ type: "MessageEvent", event });
|
|
130
139
|
};
|
|
131
|
-
if (ws.readyState ===
|
|
140
|
+
if (ws.readyState === WS_READY_STATE_OPEN) {
|
|
132
141
|
opened = true;
|
|
133
142
|
clearOpenTimer();
|
|
134
143
|
waitOpen.resolve(ws);
|
|
@@ -145,7 +154,7 @@ export function getVibesDiyWebSocketConnection(url, presetWs, opts = {}) {
|
|
|
145
154
|
},
|
|
146
155
|
isOpen: () => ws.readyState === WS_READY_STATE_OPEN,
|
|
147
156
|
send: (data) => {
|
|
148
|
-
if (ws.readyState ===
|
|
157
|
+
if (ws.readyState === WS_READY_STATE_CLOSING || ws.readyState === WS_READY_STATE_CLOSED) {
|
|
149
158
|
return fail(`WebSocket is not open (readyState=${ws.readyState})`);
|
|
150
159
|
}
|
|
151
160
|
const rSend = exception2Result(() => ws.send(data));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../jsr/websocket-connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAE3G,OAAO,EAAE,aAAa,EAA4E,MAAM,sBAAsB,CAAC;AAE/H,OAAO,EAAE,uBAAuB,EAAE,cAAc,EAA8D,MAAM,eAAe,CAAC;AAEpI,MAAM,wBAAwB,GAAG,IAAI,eAAe,EAAwB,CAAC;AAI7E,OAAO,EAAE,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../jsr/websocket-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
2
|
-
|
|
3
|
-
class
|
|
2
|
+
import { createWebSocket, formatWsEvent, getVibesDiyWebSocketConnection, resetVibesDiyWebSocketConnections, WS_OPEN_TIMEOUT_MS, } from "./websocket-connection.js";
|
|
3
|
+
class FakeWsWebSocket {
|
|
4
4
|
url;
|
|
5
5
|
opts;
|
|
6
6
|
constructor(url, opts) {
|
|
@@ -8,15 +8,17 @@ class MockWsWebSocket {
|
|
|
8
8
|
this.opts = opts;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}));
|
|
19
|
-
|
|
11
|
+
class FakeGlobalWebSocket {
|
|
12
|
+
url;
|
|
13
|
+
constructor(url) {
|
|
14
|
+
this.url = url;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function fakeImpl(globalWebSocket) {
|
|
18
|
+
const loadWs = vi.fn(() => Promise.resolve({ WebSocket: FakeWsWebSocket }));
|
|
19
|
+
return { impl: { globalWebSocket, loadWs }, loadWs };
|
|
20
|
+
}
|
|
21
|
+
const fakeGlobal = FakeGlobalWebSocket;
|
|
20
22
|
describe("formatWsEvent", () => {
|
|
21
23
|
it("returns strings verbatim", () => {
|
|
22
24
|
expect(formatWsEvent("network down")).toBe("network down");
|
|
@@ -63,40 +65,25 @@ describe("formatWsEvent", () => {
|
|
|
63
65
|
});
|
|
64
66
|
});
|
|
65
67
|
describe("createWebSocket", () => {
|
|
66
|
-
afterEach(() => {
|
|
67
|
-
vi.unstubAllGlobals();
|
|
68
|
-
wsMockState.throwOnAccess = true;
|
|
69
|
-
});
|
|
70
68
|
it("uses the global WebSocket constructor when present and no ca is configured, without importing ws", async () => {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
constructor(url) {
|
|
74
|
-
this.url = url;
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
vi.stubGlobal("WebSocket", FakeGlobalWebSocket);
|
|
78
|
-
const socket = await createWebSocket("wss://example.test/socket");
|
|
69
|
+
const { impl, loadWs } = fakeImpl(fakeGlobal);
|
|
70
|
+
const socket = await createWebSocket("wss://example.test/socket", { impl });
|
|
79
71
|
expect(socket).toBeInstanceOf(FakeGlobalWebSocket);
|
|
80
72
|
expect(socket.url).toBe("wss://example.test/socket");
|
|
73
|
+
expect(loadWs).not.toHaveBeenCalled();
|
|
81
74
|
});
|
|
82
75
|
it("still falls back to ws when a custom ca is configured, even with a global WebSocket present", async () => {
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
vi.stubGlobal("WebSocket", FakeGlobalWebSocket);
|
|
90
|
-
wsMockState.throwOnAccess = false;
|
|
91
|
-
const socket = await createWebSocket("wss://example.test/socket", { ca: ["-----BEGIN CERTIFICATE-----"] });
|
|
92
|
-
expect(socket).toBeInstanceOf(MockWsWebSocket);
|
|
76
|
+
const { impl, loadWs } = fakeImpl(fakeGlobal);
|
|
77
|
+
const socket = await createWebSocket("wss://example.test/socket", { ca: ["-----BEGIN CERTIFICATE-----"], impl });
|
|
78
|
+
expect(loadWs).toHaveBeenCalledTimes(1);
|
|
79
|
+
expect(socket).toBeInstanceOf(FakeWsWebSocket);
|
|
93
80
|
expect(socket.opts?.ca).toEqual(["-----BEGIN CERTIFICATE-----"]);
|
|
94
81
|
});
|
|
95
82
|
it("falls back to ws when no global WebSocket is available", async () => {
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
expect(socket).toBeInstanceOf(
|
|
83
|
+
const { impl, loadWs } = fakeImpl(undefined);
|
|
84
|
+
const socket = await createWebSocket("wss://example.test/socket", { impl });
|
|
85
|
+
expect(loadWs).toHaveBeenCalledTimes(1);
|
|
86
|
+
expect(socket).toBeInstanceOf(FakeWsWebSocket);
|
|
100
87
|
});
|
|
101
88
|
});
|
|
102
89
|
class StalledWebSocket {
|
|
@@ -115,7 +102,6 @@ class StalledWebSocket {
|
|
|
115
102
|
describe("getVibesDiyWebSocketConnection connection sharing", () => {
|
|
116
103
|
afterEach(() => {
|
|
117
104
|
resetVibesDiyWebSocketConnections();
|
|
118
|
-
vi.unstubAllGlobals();
|
|
119
105
|
});
|
|
120
106
|
async function openConn(url, ws, connectionKey) {
|
|
121
107
|
const p = getVibesDiyWebSocketConnection(url, ws, { connectionKey });
|
|
@@ -125,13 +111,11 @@ describe("getVibesDiyWebSocketConnection connection sharing", () => {
|
|
|
125
111
|
return p;
|
|
126
112
|
}
|
|
127
113
|
it("shares one connection per URL by default", async () => {
|
|
128
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
129
114
|
const a = await openConn("http://shared.test/api", new StalledWebSocket());
|
|
130
115
|
const b = await getVibesDiyWebSocketConnection("http://shared.test/api", new StalledWebSocket());
|
|
131
116
|
expect(b).toBe(a);
|
|
132
117
|
});
|
|
133
118
|
it("gives a keyed holder a socket of its own, which a sibling's close cannot take down", async () => {
|
|
134
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
135
119
|
const sharedWs = new StalledWebSocket();
|
|
136
120
|
const ownWs = new StalledWebSocket();
|
|
137
121
|
const shared = await openConn("http://roll.test/api", sharedWs);
|
|
@@ -142,7 +126,6 @@ describe("getVibesDiyWebSocketConnection connection sharing", () => {
|
|
|
142
126
|
expect(ownWs.closed).toBe(false);
|
|
143
127
|
});
|
|
144
128
|
it("reports isOpen from the socket's live readyState", async () => {
|
|
145
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
146
129
|
const ws = new StalledWebSocket();
|
|
147
130
|
const conn = await openConn("http://isopen.test/api", ws);
|
|
148
131
|
expect(conn.isOpen?.()).toBe(true);
|
|
@@ -150,7 +133,6 @@ describe("getVibesDiyWebSocketConnection connection sharing", () => {
|
|
|
150
133
|
expect(conn.isOpen?.()).toBe(false);
|
|
151
134
|
});
|
|
152
135
|
it("keeps one socket per holder, so the same key resolves to the same connection", async () => {
|
|
153
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
154
136
|
const first = await openConn("http://stable.test/api", new StalledWebSocket(), "rep-1");
|
|
155
137
|
const again = await getVibesDiyWebSocketConnection("http://stable.test/api", new StalledWebSocket(), {
|
|
156
138
|
connectionKey: "rep-1",
|
|
@@ -161,10 +143,8 @@ describe("getVibesDiyWebSocketConnection connection sharing", () => {
|
|
|
161
143
|
describe("getVibesDiyWebSocketConnection proxy routes", () => {
|
|
162
144
|
afterEach(() => {
|
|
163
145
|
resetVibesDiyWebSocketConnections();
|
|
164
|
-
vi.unstubAllGlobals();
|
|
165
146
|
});
|
|
166
147
|
it("does not share one socket between holders that route differently", async () => {
|
|
167
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
168
148
|
const open = (proxyEnv) => {
|
|
169
149
|
const ws = new StalledWebSocket();
|
|
170
150
|
ws.readyState = 1;
|
|
@@ -182,11 +162,9 @@ describe("getVibesDiyWebSocketConnection open deadline", () => {
|
|
|
182
162
|
afterEach(() => {
|
|
183
163
|
vi.useRealTimers();
|
|
184
164
|
resetVibesDiyWebSocketConnections();
|
|
185
|
-
vi.unstubAllGlobals();
|
|
186
165
|
});
|
|
187
166
|
it("rejects (and closes the socket) when the handshake never completes", async () => {
|
|
188
167
|
vi.useFakeTimers();
|
|
189
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
190
168
|
const stalled = new StalledWebSocket();
|
|
191
169
|
const pending = getVibesDiyWebSocketConnection("http://stalled.test/api", stalled).then(() => "resolved", (e) => `rejected: ${e instanceof Error ? e.message : String(e)}`);
|
|
192
170
|
await vi.advanceTimersByTimeAsync(WS_OPEN_TIMEOUT_MS + 1);
|
|
@@ -195,7 +173,6 @@ describe("getVibesDiyWebSocketConnection open deadline", () => {
|
|
|
195
173
|
});
|
|
196
174
|
it("does not trip the deadline once the socket opens", async () => {
|
|
197
175
|
vi.useFakeTimers();
|
|
198
|
-
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
199
176
|
const ws = new StalledWebSocket();
|
|
200
177
|
const connPromise = getVibesDiyWebSocketConnection("http://opens.test/api", ws);
|
|
201
178
|
await vi.advanceTimersByTimeAsync(0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-connection.test.js","sourceRoot":"","sources":["../jsr/websocket-connection.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-connection.test.js","sourceRoot":"","sources":["../jsr/websocket-connection.test.ts"],"names":[],"mappings":"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"}
|