@vibes.diy/api-impl 4.0.16 → 4.0.18
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/README.md +1 -1
- package/llm-chat.d.ts +3 -1
- package/llm-chat.js +2 -1
- package/llm-chat.js.map +1 -1
- package/package.json +6 -6
- package/request-idle-visibility.test.d.ts +1 -0
- package/request-idle-visibility.test.js +112 -0
- package/request-idle-visibility.test.js.map +1 -0
- package/vibes-diy-api-transport.js +18 -0
- package/vibes-diy-api-transport.js.map +1 -1
package/README.md
CHANGED
|
@@ -524,7 +524,7 @@ The `write-apps.ts` module applies transforms to uploaded files:
|
|
|
524
524
|
|
|
525
525
|
3. **Import Map Generation**
|
|
526
526
|
- Unknown packages → npm registry lookup for version → `esm.sh` URL
|
|
527
|
-
- Predefined mappings for React
|
|
527
|
+
- Predefined mappings for React (pinned via `lockedVersions.REACT`, kept equal to the workspace React), Fireproof, Clerk, etc.
|
|
528
528
|
- Output: `/~~calculated~~/import-map.json` with `transform: { type: "import-map" }`
|
|
529
529
|
|
|
530
530
|
### fsId Calculation
|
package/llm-chat.d.ts
CHANGED
|
@@ -28,7 +28,9 @@ export declare class LLMChatImpl implements LLMChat {
|
|
|
28
28
|
get appSlug(): string;
|
|
29
29
|
static open(open: ReqType<ReqOpenChat>, api: VibesDiyApiForLLMChat): Promise<Result<LLMChat>>;
|
|
30
30
|
private constructor();
|
|
31
|
-
promptFS(req: FSUpdate | VibeFile[]
|
|
31
|
+
promptFS(req: FSUpdate | VibeFile[], opts?: {
|
|
32
|
+
refFsId?: string;
|
|
33
|
+
}): Promise<Result<ResPromptChatSection, VibesDiyError>>;
|
|
32
34
|
prompt(msg: LLMRequest, opts?: {
|
|
33
35
|
inputImageBase64?: string;
|
|
34
36
|
dryRun?: boolean;
|
package/llm-chat.js
CHANGED
|
@@ -89,13 +89,14 @@ export class LLMChatImpl {
|
|
|
89
89
|
this.sectionStream = sectionEvents;
|
|
90
90
|
this.#teardown = teardown;
|
|
91
91
|
}
|
|
92
|
-
async promptFS(req) {
|
|
92
|
+
async promptFS(req, opts) {
|
|
93
93
|
if (isFSUpdate(req)) {
|
|
94
94
|
return this.api.request({
|
|
95
95
|
type: "vibes.diy.req-prompt-chat-section",
|
|
96
96
|
mode: "fs-update",
|
|
97
97
|
chatId: this.res.chatId,
|
|
98
98
|
outerTid: this.tid,
|
|
99
|
+
...(opts?.refFsId ? { refFsId: opts.refFsId } : {}),
|
|
99
100
|
fsUpdate: req,
|
|
100
101
|
}, {
|
|
101
102
|
resMatch: isResPromptChatSection,
|
package/llm-chat.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llm-chat.js","sourceRoot":"","sources":["../jsr/llm-chat.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"llm-chat.js","sourceRoot":"","sources":["../jsr/llm-chat.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/api-impl",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.18",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -8,11 +8,11 @@
|
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
10
|
"@adviser/cement": "~0.5.34",
|
|
11
|
-
"@vibes.diy/api-pkg": "4.0.
|
|
12
|
-
"@vibes.diy/api-types": "4.0.
|
|
13
|
-
"@vibes.diy/call-ai-v2": "4.0.
|
|
14
|
-
"@vibes.diy/identity": "4.0.
|
|
15
|
-
"@vibes.diy/vibe-types": "4.0.
|
|
11
|
+
"@vibes.diy/api-pkg": "4.0.18",
|
|
12
|
+
"@vibes.diy/api-types": "4.0.18",
|
|
13
|
+
"@vibes.diy/call-ai-v2": "4.0.18",
|
|
14
|
+
"@vibes.diy/identity": "4.0.18",
|
|
15
|
+
"@vibes.diy/vibe-types": "4.0.18",
|
|
16
16
|
"arktype": "~2.2.1",
|
|
17
17
|
"ws": "~8.21.0"
|
|
18
18
|
},
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
2
|
+
import { OnFunc, Result } from "@adviser/cement";
|
|
3
|
+
import { VibesDiyApi } from "./index.js";
|
|
4
|
+
function createMockConnection() {
|
|
5
|
+
const onMessage = OnFunc();
|
|
6
|
+
const onClose = OnFunc();
|
|
7
|
+
const onError = OnFunc();
|
|
8
|
+
const connection = {
|
|
9
|
+
ctx: {},
|
|
10
|
+
onMessage,
|
|
11
|
+
onClose,
|
|
12
|
+
onError,
|
|
13
|
+
send: () => Result.Ok(undefined),
|
|
14
|
+
close: async () => undefined,
|
|
15
|
+
};
|
|
16
|
+
const emitMessage = (message) => {
|
|
17
|
+
const payload = new Blob([new TextEncoder().encode(JSON.stringify(message))]);
|
|
18
|
+
const evt = {
|
|
19
|
+
type: "MessageEvent",
|
|
20
|
+
event: { data: payload },
|
|
21
|
+
};
|
|
22
|
+
onMessage.invoke(evt);
|
|
23
|
+
};
|
|
24
|
+
return { connection, emitMessage };
|
|
25
|
+
}
|
|
26
|
+
function createApi(connection, timeoutMs) {
|
|
27
|
+
class TestVibesDiyApi extends VibesDiyApi {
|
|
28
|
+
async getReadyConnection() {
|
|
29
|
+
return connection;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
const getToken = async () => Result.Ok({});
|
|
33
|
+
return new TestVibesDiyApi({
|
|
34
|
+
apiUrl: "http://localhost:9999/api",
|
|
35
|
+
getToken,
|
|
36
|
+
timeoutMs,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
function installFakeDocument(initial) {
|
|
40
|
+
const listeners = new Set();
|
|
41
|
+
const doc = {
|
|
42
|
+
visibilityState: initial,
|
|
43
|
+
addEventListener: (_type, cb) => listeners.add(cb),
|
|
44
|
+
removeEventListener: (_type, cb) => listeners.delete(cb),
|
|
45
|
+
};
|
|
46
|
+
globalThis.document = doc;
|
|
47
|
+
return {
|
|
48
|
+
setVisibility: (state) => {
|
|
49
|
+
doc.visibilityState = state;
|
|
50
|
+
for (const cb of [...listeners])
|
|
51
|
+
cb();
|
|
52
|
+
},
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
const originalDocument = globalThis.document;
|
|
56
|
+
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
57
|
+
describe("VibesDiyApi.request idle timeout vs page visibility", () => {
|
|
58
|
+
afterEach(() => {
|
|
59
|
+
if (originalDocument === undefined) {
|
|
60
|
+
delete globalThis.document;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
globalThis.document = originalDocument;
|
|
64
|
+
}
|
|
65
|
+
});
|
|
66
|
+
it("does not trip the idle timeout while the tab is hidden; a late response still resolves", async () => {
|
|
67
|
+
const { setVisibility } = installFakeDocument("visible");
|
|
68
|
+
const { connection, emitMessage } = createMockConnection();
|
|
69
|
+
const api = createApi(connection, 200);
|
|
70
|
+
let settled = false;
|
|
71
|
+
const requestPromise = api
|
|
72
|
+
.request({}, { tid: "t-hidden", resMatch: (r) => r.type === "test.res-ok" })
|
|
73
|
+
.finally(() => (settled = true));
|
|
74
|
+
await sleep(20);
|
|
75
|
+
setVisibility("hidden");
|
|
76
|
+
await sleep(600);
|
|
77
|
+
expect(settled).toBe(false);
|
|
78
|
+
setVisibility("visible");
|
|
79
|
+
emitMessage({
|
|
80
|
+
tid: "t-hidden",
|
|
81
|
+
src: "vibes.diy.server",
|
|
82
|
+
dst: "vibes.diy.client.test",
|
|
83
|
+
ttl: 10,
|
|
84
|
+
payload: { type: "test.res-ok" },
|
|
85
|
+
});
|
|
86
|
+
const result = await requestPromise;
|
|
87
|
+
expect(result.isOk()).toBe(true);
|
|
88
|
+
});
|
|
89
|
+
it("times out only after a full visible idle window once the tab returns", async () => {
|
|
90
|
+
const { setVisibility } = installFakeDocument("hidden");
|
|
91
|
+
const { connection } = createMockConnection();
|
|
92
|
+
const api = createApi(connection, 200);
|
|
93
|
+
let settled = false;
|
|
94
|
+
const requestPromise = api.request({}, { tid: "t-return", resMatch: () => false }).finally(() => (settled = true));
|
|
95
|
+
await sleep(600);
|
|
96
|
+
expect(settled).toBe(false);
|
|
97
|
+
setVisibility("visible");
|
|
98
|
+
await sleep(350);
|
|
99
|
+
const result = await requestPromise;
|
|
100
|
+
expect(result.isErr()).toBe(true);
|
|
101
|
+
expect(result.Err()).toMatchObject({ error: { code: "request-timeout" } });
|
|
102
|
+
});
|
|
103
|
+
it("keeps the plain idle timeout when no document exists (Node/CLI)", async () => {
|
|
104
|
+
delete globalThis.document;
|
|
105
|
+
const { connection } = createMockConnection();
|
|
106
|
+
const api = createApi(connection, 200);
|
|
107
|
+
const result = await api.request({}, { tid: "t-node", resMatch: () => false });
|
|
108
|
+
expect(result.isErr()).toBe(true);
|
|
109
|
+
expect(result.Err()).toMatchObject({ error: { code: "request-timeout" } });
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
//# sourceMappingURL=request-idle-visibility.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-idle-visibility.test.js","sourceRoot":"","sources":["../jsr/request-idle-visibility.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,14 +76,31 @@ export async function requestApiResponse(ctx, req, msgParam) {
|
|
|
76
76
|
},
|
|
77
77
|
});
|
|
78
78
|
let timer = undefined;
|
|
79
|
+
const doc = globalThis.document;
|
|
80
|
+
const isHidden = () => doc?.visibilityState === "hidden";
|
|
81
|
+
let hiddenDuringWindow = isHidden();
|
|
79
82
|
const resetIdleTimer = () => {
|
|
80
83
|
if (timer !== undefined)
|
|
81
84
|
clearTimeout(timer);
|
|
85
|
+
hiddenDuringWindow = isHidden();
|
|
82
86
|
timer = setTimeout(() => {
|
|
87
|
+
if (isHidden() || hiddenDuringWindow) {
|
|
88
|
+
resetIdleTimer();
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
83
91
|
waitForResponse.resolve(Result.Err(mkResError(`Request idle for ${idleMs}ms (no progress)`, "request-timeout")));
|
|
84
92
|
}, idleMs);
|
|
85
93
|
};
|
|
86
94
|
resetIdleTimer();
|
|
95
|
+
const onVisibilityChange = () => {
|
|
96
|
+
if (isHidden()) {
|
|
97
|
+
hiddenDuringWindow = true;
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
resetIdleTimer();
|
|
101
|
+
}
|
|
102
|
+
};
|
|
103
|
+
doc?.addEventListener?.("visibilitychange", onVisibilityChange);
|
|
87
104
|
const unreg = conn.onMessage((event) => {
|
|
88
105
|
resetIdleTimer();
|
|
89
106
|
const triggerPromise = evento.trigger({
|
|
@@ -106,6 +123,7 @@ export async function requestApiResponse(ctx, req, msgParam) {
|
|
|
106
123
|
const cleanup = () => {
|
|
107
124
|
if (timer !== undefined)
|
|
108
125
|
clearTimeout(timer);
|
|
126
|
+
doc?.removeEventListener?.("visibilitychange", onVisibilityChange);
|
|
109
127
|
unreg();
|
|
110
128
|
unregClose();
|
|
111
129
|
unregError();
|
|
@@ -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,GACX,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;
|
|
1
|
+
{"version":3,"file":"vibes-diy-api-transport.js","sourceRoot":"","sources":["../jsr/vibes-diy-api-transport.ts"],"names":[],"mappings":"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"}
|