@vibes.diy/api-impl 14.0.17 → 14.0.19
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 +6 -6
- package/request-validation.test.js +15 -0
- package/request-validation.test.js.map +1 -1
- package/vibes-diy-api-transport.js +6 -2
- package/vibes-diy-api-transport.js.map +1 -1
- package/websocket-connection.d.ts +1 -0
- package/websocket-connection.js +19 -0
- package/websocket-connection.js.map +1 -1
- package/websocket-connection.test.js +43 -1
- package/websocket-connection.test.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-impl",
|
|
3
|
-
"version": "14.0.
|
|
3
|
+
"version": "14.0.19",
|
|
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.34",
|
|
12
|
-
"@vibes.diy/api-pkg": "14.0.
|
|
13
|
-
"@vibes.diy/api-types": "14.0.
|
|
14
|
-
"@vibes.diy/call-ai-v2": "14.0.
|
|
15
|
-
"@vibes.diy/identity": "14.0.
|
|
16
|
-
"@vibes.diy/vibe-types": "14.0.
|
|
12
|
+
"@vibes.diy/api-pkg": "14.0.19",
|
|
13
|
+
"@vibes.diy/api-types": "14.0.19",
|
|
14
|
+
"@vibes.diy/call-ai-v2": "14.0.19",
|
|
15
|
+
"@vibes.diy/identity": "14.0.19",
|
|
16
|
+
"@vibes.diy/vibe-types": "14.0.19",
|
|
17
17
|
"arktype": "~2.2.3",
|
|
18
18
|
"ws": "~8.21.3"
|
|
19
19
|
},
|
|
@@ -71,4 +71,19 @@ describe("VibesDiyApi.request", () => {
|
|
|
71
71
|
expect(resMatch).toHaveBeenCalledTimes(1);
|
|
72
72
|
});
|
|
73
73
|
});
|
|
74
|
+
describe("VibesDiyApi.request when the socket never comes up", () => {
|
|
75
|
+
it("returns an Err instead of rejecting, so an awaiting caller settles (#5433)", async () => {
|
|
76
|
+
class NoConnectApi extends VibesDiyApi {
|
|
77
|
+
async getReadyConnection() {
|
|
78
|
+
throw new Error("WebSocket did not open within 20000ms");
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
const getToken = async () => Result.Ok({});
|
|
82
|
+
const api = new NoConnectApi({ apiUrl: "http://localhost:9999/api", getToken, timeoutMs: 2000 });
|
|
83
|
+
const result = await api.request({}, { resMatch: () => true });
|
|
84
|
+
expect(result.isErr()).toBe(true);
|
|
85
|
+
expect(result.Err()).toMatchObject({ error: { code: "websocket-connect-failed" } });
|
|
86
|
+
expect(result.Err().message).toContain("did not open");
|
|
87
|
+
});
|
|
88
|
+
});
|
|
74
89
|
//# sourceMappingURL=request-validation.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-validation.test.js","sourceRoot":"","sources":["../jsr/request-validation.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request-validation.test.js","sourceRoot":"","sources":["../jsr/request-validation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { msgBase, isResError, mkResError, isIndeterminateTokenError, AUTH_INDETERMINATE_CODE, } from "@vibes.diy/api-types";
|
|
2
|
-
import { Evento, Future, JSONEnDecoderSingleton, Result, Option, EventoResult, } from "@adviser/cement";
|
|
2
|
+
import { Evento, Future, exception2Result, JSONEnDecoderSingleton, Result, Option, EventoResult, } from "@adviser/cement";
|
|
3
3
|
import { W3CWebSocketEventEventoEnDecoder } from "@vibes.diy/api-pkg";
|
|
4
4
|
import { type } from "arktype";
|
|
5
5
|
export { AUTH_INDETERMINATE_CODE };
|
|
@@ -40,7 +40,11 @@ export async function sendApiMessage(ctx, req, msgParam) {
|
|
|
40
40
|
export async function requestApiResponse(ctx, req, msgParam) {
|
|
41
41
|
const tid = msgParam?.tid ?? ctx.cfg.sthis.nextId(12).str;
|
|
42
42
|
const idleMs = ctx.cfg.timeoutMs;
|
|
43
|
-
const
|
|
43
|
+
const rConn = await exception2Result(() => ctx.getReadyConnection());
|
|
44
|
+
if (rConn.isErr()) {
|
|
45
|
+
return Result.Err(mkResError(`WebSocket connect failed: ${rConn.Err().message}`, "websocket-connect-failed"));
|
|
46
|
+
}
|
|
47
|
+
const conn = rConn.Ok();
|
|
44
48
|
const evento = new Evento(new W3CWebSocketEventEventoEnDecoder());
|
|
45
49
|
const waitForResponse = new Future();
|
|
46
50
|
evento.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vibes-diy-api-transport.js","sourceRoot":"","sources":["../jsr/vibes-diy-api-transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACP,UAAU,EACV,UAAU,EACV,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,MAAM,EAEN,MAAM,EACN,sBAAsB,EACtB,MAAM,EACN,MAAM,EAGN,YAAY,GAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AA2D/B,OAAO,EAAE,uBAAuB,EAAE,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAgC,EAChC,GAAM,EACN,QAAsB;IAEtB,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,EAAE,GAAG,QAAQ,CAAC;IAInD,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAChF,MAAM,WAAW,GAAG,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAC7C,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACpB,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC;QACrC,IAAI,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;YACtB,IAAI,GAAG,SAAS,CAAC,EAAE,EAAE,CAAC;QACxB,CAAC;aAAM,IAAI,eAAe,KAAK,IAAI,IAAI,SAAS,EAAE,KAAK,EAAE,IAAI,yBAAyB,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAOxG,KAAK,WAAW,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC,GAAG,CACf,UAAU,CAAC,iFAAiF,EAAE,uBAAuB,CAAC,CACvH,CAAC;QACJ,CAAC;IAEH,CAAC;IACD,MAAM,MAAM,GAAY;QACtB,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM;QACnB,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;QACf,GAAG,EAAE,CAAC;QACN,GAAG,SAAS;QACZ,OAAO,EAAE;YACP,GAAG,GAAG;YACN,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1B;KACF,CAAC;IAEF,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC;IAE/B,MAAM,IAAI,GAAG,sBAAsB,EAAE,CAAC;IACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAEvC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,IAAI,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,OAAO,MAAM,CAAC,GAAG,CACf,UAAU,CAAC,+BAA+B,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAC3F,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,MAA6B,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAA8B,EAC9B,GAAM,EACN,QAKC;IAED,MAAM,GAAG,GAAG,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC;IAC1D,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"vibes-diy-api-transport.js","sourceRoot":"","sources":["../jsr/vibes-diy-api-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,5 @@ import { VibeDiyApiConnection } from "./api-connection.js";
|
|
|
2
2
|
export declare function formatWsEvent(event: unknown): string;
|
|
3
3
|
export declare function createWebSocket(url: string, ca?: string[]): Promise<WebSocket>;
|
|
4
4
|
export declare function resetVibesDiyWebSocketConnections(): void;
|
|
5
|
+
export declare const WS_OPEN_TIMEOUT_MS = 20000;
|
|
5
6
|
export declare function getVibesDiyWebSocketConnection(url: string, presetWs?: WebSocket, ca?: string[]): Promise<VibeDiyApiConnection>;
|
package/websocket-connection.js
CHANGED
|
@@ -35,6 +35,7 @@ export async function createWebSocket(url, ca) {
|
|
|
35
35
|
export function resetVibesDiyWebSocketConnections() {
|
|
36
36
|
vibesDiyApiPerConnection.reset();
|
|
37
37
|
}
|
|
38
|
+
export const WS_OPEN_TIMEOUT_MS = 20_000;
|
|
38
39
|
export function getVibesDiyWebSocketConnection(url, presetWs, ca) {
|
|
39
40
|
const wsSocketUrl = BuildURI.from(url)
|
|
40
41
|
.protocol(["https", "wss"].find((i) => URI.from(url).protocol.startsWith(i)) ? "wss:" : "ws:")
|
|
@@ -59,14 +60,30 @@ export function getVibesDiyWebSocketConnection(url, presetWs, ca) {
|
|
|
59
60
|
nativeClose?.();
|
|
60
61
|
return Result.Err(msg);
|
|
61
62
|
};
|
|
63
|
+
let openTimer = setTimeout(() => {
|
|
64
|
+
openTimer = undefined;
|
|
65
|
+
if (opened)
|
|
66
|
+
return;
|
|
67
|
+
evictIfCurrent();
|
|
68
|
+
nativeClose?.();
|
|
69
|
+
waitOpen.reject(new Error(`WebSocket did not open within ${WS_OPEN_TIMEOUT_MS}ms`));
|
|
70
|
+
}, WS_OPEN_TIMEOUT_MS);
|
|
71
|
+
const clearOpenTimer = () => {
|
|
72
|
+
if (openTimer !== undefined) {
|
|
73
|
+
clearTimeout(openTimer);
|
|
74
|
+
openTimer = undefined;
|
|
75
|
+
}
|
|
76
|
+
};
|
|
62
77
|
ws.onopen = () => {
|
|
63
78
|
opened = true;
|
|
79
|
+
clearOpenTimer();
|
|
64
80
|
waitOpen.resolve(ws);
|
|
65
81
|
};
|
|
66
82
|
ws.onerror = (event) => {
|
|
67
83
|
onError.invoke({ type: "ErrorEvent", event: event });
|
|
68
84
|
evictIfCurrent();
|
|
69
85
|
if (!opened) {
|
|
86
|
+
clearOpenTimer();
|
|
70
87
|
waitOpen.reject(new Error(`WebSocket error: ${formatWsEvent(event)}`));
|
|
71
88
|
}
|
|
72
89
|
};
|
|
@@ -74,6 +91,7 @@ export function getVibesDiyWebSocketConnection(url, presetWs, ca) {
|
|
|
74
91
|
evictIfCurrent();
|
|
75
92
|
onClose.invoke({ type: "CloseEvent", event: { wasClean: event.wasClean, code: event.code, reason: event.reason } });
|
|
76
93
|
if (!opened) {
|
|
94
|
+
clearOpenTimer();
|
|
77
95
|
waitOpen.reject(new Error(`WebSocket closed before open: code=${event.code} reason=${event.reason}`));
|
|
78
96
|
}
|
|
79
97
|
};
|
|
@@ -82,6 +100,7 @@ export function getVibesDiyWebSocketConnection(url, presetWs, ca) {
|
|
|
82
100
|
};
|
|
83
101
|
if (ws.readyState === WebSocket.OPEN) {
|
|
84
102
|
opened = true;
|
|
103
|
+
clearOpenTimer();
|
|
85
104
|
waitOpen.resolve(ws);
|
|
86
105
|
}
|
|
87
106
|
return waitOpen.asPromise().then((ws) => ({
|
|
@@ -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;AAI3G,MAAM,wBAAwB,GAAG,IAAI,eAAe,EAAwB,CAAC;AAO7E,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IAChE,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,KAA+G,CAAC;IAC5H,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,OAAO,CAAC;IAC9E,IAAI,GAAG,CAAC,KAAK,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC;IAClH,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjE,MAAM,MAAM,GAAG,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,OAAO,QAAQ,GAAG,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC;IACrC,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,IAAI,KAAK,EAAE;QAAE,OAAO,GAAG,CAAC,IAAI,CAAC;IACrE,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,GAAW,EAAE,EAAa;IAM9D,IAAI,OAAO,UAAU,CAAC,SAAS,KAAK,WAAW,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACpE,OAAO,IAAI,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAGD,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IAE9B,OAAO,IAAI,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAyB,CAAC;AAC/D,CAAC;AAkBD,MAAM,UAAU,iCAAiC;IAC/C,wBAAwB,CAAC,KAAK,EAAE,CAAC;AACnC,CAAC;
|
|
1
|
+
{"version":3,"file":"websocket-connection.js","sourceRoot":"","sources":["../jsr/websocket-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ vi.mock("ws", () => ({
|
|
|
16
16
|
return MockWsWebSocket;
|
|
17
17
|
},
|
|
18
18
|
}));
|
|
19
|
-
const { createWebSocket, formatWsEvent } = await import("./websocket-connection.js");
|
|
19
|
+
const { createWebSocket, formatWsEvent, getVibesDiyWebSocketConnection, resetVibesDiyWebSocketConnections, WS_OPEN_TIMEOUT_MS } = await import("./websocket-connection.js");
|
|
20
20
|
describe("formatWsEvent", () => {
|
|
21
21
|
it("returns strings verbatim", () => {
|
|
22
22
|
expect(formatWsEvent("network down")).toBe("network down");
|
|
@@ -90,4 +90,46 @@ describe("createWebSocket", () => {
|
|
|
90
90
|
expect(socket).toBeInstanceOf(MockWsWebSocket);
|
|
91
91
|
});
|
|
92
92
|
});
|
|
93
|
+
class StalledWebSocket {
|
|
94
|
+
readyState = 0;
|
|
95
|
+
closed = false;
|
|
96
|
+
onopen;
|
|
97
|
+
onerror;
|
|
98
|
+
onclose;
|
|
99
|
+
onmessage;
|
|
100
|
+
close() {
|
|
101
|
+
this.closed = true;
|
|
102
|
+
}
|
|
103
|
+
send() {
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
describe("getVibesDiyWebSocketConnection open deadline", () => {
|
|
107
|
+
afterEach(() => {
|
|
108
|
+
vi.useRealTimers();
|
|
109
|
+
resetVibesDiyWebSocketConnections();
|
|
110
|
+
vi.unstubAllGlobals();
|
|
111
|
+
});
|
|
112
|
+
it("rejects (and closes the socket) when the handshake never completes", async () => {
|
|
113
|
+
vi.useFakeTimers();
|
|
114
|
+
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
115
|
+
const stalled = new StalledWebSocket();
|
|
116
|
+
const pending = getVibesDiyWebSocketConnection("http://stalled.test/api", stalled).then(() => "resolved", (e) => `rejected: ${e instanceof Error ? e.message : String(e)}`);
|
|
117
|
+
await vi.advanceTimersByTimeAsync(WS_OPEN_TIMEOUT_MS + 1);
|
|
118
|
+
expect(await pending).toContain("did not open");
|
|
119
|
+
expect(stalled.closed).toBe(true);
|
|
120
|
+
});
|
|
121
|
+
it("does not trip the deadline once the socket opens", async () => {
|
|
122
|
+
vi.useFakeTimers();
|
|
123
|
+
vi.stubGlobal("WebSocket", { OPEN: 1 });
|
|
124
|
+
const ws = new StalledWebSocket();
|
|
125
|
+
const connPromise = getVibesDiyWebSocketConnection("http://opens.test/api", ws);
|
|
126
|
+
await vi.advanceTimersByTimeAsync(0);
|
|
127
|
+
ws.readyState = 1;
|
|
128
|
+
ws.onopen?.();
|
|
129
|
+
const conn = await connPromise;
|
|
130
|
+
expect(conn).toBeTruthy();
|
|
131
|
+
await vi.advanceTimersByTimeAsync(WS_OPEN_TIMEOUT_MS + 1);
|
|
132
|
+
expect(ws.closed).toBe(false);
|
|
133
|
+
});
|
|
134
|
+
});
|
|
93
135
|
//# sourceMappingURL=websocket-connection.test.js.map
|
|
@@ -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;AAK7D,MAAM,WAAW,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAEhE,MAAM,eAAe;IAEV,GAAG;IACH,IAAI;IAFb,YACS,GAAW,EACX,IAAwB;mBADxB,GAAG;oBACH,IAAI;IACV,CAAC;CACL;AAED,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC;IACnB,IAAI,SAAS;QACX,IAAI,WAAW,CAAC,aAAa,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,iFAAiF,CAAC,CAAC;QACrG,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;CACF,CAAC,CAAC,CAAC;AAEJ,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"websocket-connection.test.js","sourceRoot":"","sources":["../jsr/websocket-connection.test.ts"],"names":[],"mappings":"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"}
|