@openchamber/web 1.23.2 → 1.24.1
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/bin/cli.test.js +7 -6
- package/bin/lib/cli-http.js +5 -1
- package/dist/assets/{CodeMirrorCommentWidgets-DdNGwbBw.js → CodeMirrorCommentWidgets-DvUH815P.js} +1 -1
- package/dist/assets/DiffView-DkC3xlRJ.js +4 -0
- package/dist/assets/FilesView-D0bM9FVB.js +13 -0
- package/dist/assets/GitView-Bxuv3dfP.js +6 -0
- package/dist/assets/GuestAttachDialog-B0u3Q5uO.js +1 -0
- package/dist/assets/{JsonTreeView-Chzx5Y6N.js → JsonTreeView-BBVPFM5K.js} +1 -1
- package/dist/assets/LinearIssuesView-UI1FcSC8.js +1 -0
- package/dist/assets/{MarkdownImageGallery-CugnrZ6f.js → MarkdownImageGallery-CUJxH8Le.js} +1 -1
- package/dist/assets/MarkdownRendererImpl-D5BZOg8X.js +12 -0
- package/dist/assets/{OnboardingScreen-hH9xcTjA.js → OnboardingScreen-5Gou9cGD.js} +1 -1
- package/dist/assets/{PatchDiff-DRgNYc9l.js → PatchDiff-C4rE5k6z.js} +1 -1
- package/dist/assets/{PierreDiffViewer-ZT2CKuzJ.js → PierreDiffViewer-ByRVu6ss.js} +5 -5
- package/dist/assets/PlanView-u2yi5XGJ.js +5 -0
- package/dist/assets/PluginPane-QxjsKYeO.js +3 -0
- package/dist/assets/SettingsView-Fo5ZqMaT.js +29 -0
- package/dist/assets/{SettingsWindow-DisOghhD.js → SettingsWindow-HVDVANjJ.js} +1 -1
- package/dist/assets/SubmoduleDiffSummary-D3hzkybB.js +1 -0
- package/dist/assets/ToolOutputDialog-3J6IRayW.js +15 -0
- package/dist/assets/{ToolPartDiffPreview-oWxWCu-4.js → ToolPartDiffPreview-DarxPjSd.js} +2 -2
- package/dist/assets/{VirtualizedFileDiff-CiyrAq_I.js → VirtualizedFileDiff-CZgXWHjU.js} +4 -4
- package/dist/assets/{WalkthroughView-CKTevaea.js → WalkthroughView-wSpED5L4.js} +2 -2
- package/dist/assets/appThemeRegistry-Cf8KitzT.js +1 -0
- package/dist/assets/commitAndPush-DZnzlhvc.js +1 -0
- package/dist/assets/{computeVirtualFileMetrics-SUWoTyPe.js → computeVirtualFileMetrics-VYnT_A2h.js} +1 -1
- package/dist/assets/de-BM_8EDD3.js +10 -0
- package/dist/assets/es-CxZjlqpo.js +16 -0
- package/dist/assets/fr-VCixCnMW.js +14 -0
- package/dist/assets/{index-C4jJ3Ur5.js → index-3U4CtS9b.js} +1 -1
- package/dist/assets/index-B9Hvzjwl.css +1 -0
- package/dist/assets/index-DLHQogv8.js +40 -0
- package/dist/assets/{isDiffPlainText-DfG0cZxr.js → isDiffPlainText-ImDG3Uhg.js} +1 -1
- package/dist/assets/{isFilePlainText-CyNivOCU.js → isFilePlainText-D_YDVYDb.js} +1 -1
- package/dist/assets/ja-CZ5k_GyD.js +16 -0
- package/dist/assets/ko-7YM3A1Xh.js +16 -0
- package/dist/assets/{main-B8cGozKr.js → main-CycplCph.js} +2 -2
- package/dist/assets/main-DFYTCx5o.js +896 -0
- package/dist/assets/{markdown-shiki.worker-D5fBU-lw.js → markdown-shiki.worker-CahLvHIq.js} +5 -5
- package/dist/assets/markdownCore-DHvqMxPn.js +5 -0
- package/dist/assets/{miniChat-Cay99IxR.js → miniChat-DIQKfY2V.js} +2 -2
- package/dist/assets/{mobile-Zfhix7nz.js → mobile-BMwz5q-m.js} +2 -2
- package/dist/assets/{patchFileDiff-CJ5AN9Ql.js → patchFileDiff-DDQ6Rq5e.js} +3 -3
- package/dist/assets/pl-BcgDO_w5.js +16 -0
- package/dist/assets/{pt-BR-CLosVawq.js → pt-BR-CU2u_1q5.js} +4 -4
- package/dist/assets/renderElectronMiniChatApp-3_d6g6CU.js +2 -0
- package/dist/assets/renderMobileApp-D0Y8DtkA.js +25 -0
- package/dist/assets/runtimeEndpointReset-DhC3REb2.js +25 -0
- package/dist/assets/{scheduledTasksApi-CGFV4Pap.js → scheduledTasksApi-D8pq6gQz.js} +1 -1
- package/dist/assets/shikiHighlight-1imXsir9.js +1 -0
- package/dist/assets/textMateThemeFromAppTheme-Dgqc63LZ.js +1 -0
- package/dist/assets/tr-DuYhOzNe.js +7 -0
- package/dist/assets/uk-Cuk7-uvq.js +16 -0
- package/dist/assets/useAppFontEffects-BItUWdo4.js +7333 -0
- package/dist/assets/useInlineCommentController-CkbKsm7m.js +2 -0
- package/dist/assets/useRootScrollLock-vmzxZjWA.js +2 -0
- package/dist/assets/{vendor-base-ui-BY_5qla_.js → vendor-base-ui-CsXYnR5c.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-ES33GhKK.js → vendor-codemirror-language-data-BDyxuqK4.js} +2 -2
- package/dist/assets/vendor-framer-motion-Bq3iTZ6r.js +1 -0
- package/dist/assets/{vendor-motion-dom-D_o3BTI3.js → vendor-motion-dom-DcCgeG69.js} +1 -1
- package/dist/assets/vendor-strip-json-comments-5dJlOkP1.js +4 -0
- package/dist/assets/{vendor-tanstack-react-virtual-g05Cx3z9.js → vendor-tanstack-react-virtual-ClYN8CzB.js} +1 -1
- package/dist/assets/{vendor-tanstack-virtual-core-Dubg10g5.js → vendor-tanstack-virtual-core-BewVQryB.js} +1 -1
- package/dist/assets/{vendor-zod-B6551dwG.js → vendor-zod-fZppILAM.js} +4 -4
- package/dist/assets/{web-components-CJZwV5BE.js → web-components-D7FinaeH.js} +2 -2
- package/dist/assets/zh-CN-CUWoiRHd.js +16 -0
- package/dist/assets/zh-TW-CQ8EBSBN.js +16 -0
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +4 -4
- package/dist/mobile.html +4 -4
- package/package.json +9 -6
- package/server/built-in-extensions/registry.json +4 -0
- package/server/index.d.ts +2 -0
- package/server/index.js +41 -10
- package/server/lib/changelog/update-notes.js +2 -1
- package/server/lib/changelog/update-notes.test.js +19 -0
- package/server/lib/event-stream/DOCUMENTATION.md +23 -0
- package/server/lib/event-stream/delta-coalescer.js +0 -0
- package/server/lib/event-stream/delta-coalescer.test.js +292 -0
- package/server/lib/event-stream/global-hub.js +53 -23
- package/server/lib/event-stream/global-hub.test.js +160 -0
- package/server/lib/event-stream/global-ws-bridge.js +1 -0
- package/server/lib/event-stream/index.js +4 -0
- package/server/lib/fs/DOCUMENTATION.md +8 -0
- package/server/lib/fs/git-process.test.js +77 -0
- package/server/lib/fs/routes.js +2 -1
- package/server/lib/fs/search.js +2 -1
- package/server/lib/git/DOCUMENTATION.md +19 -4
- package/server/lib/git/routes.js +16 -3
- package/server/lib/git/serial-refresh.js +93 -0
- package/server/lib/git/serial-refresh.test.js +112 -0
- package/server/lib/git/service.js +336 -62
- package/server/lib/git/service.test.js +400 -0
- package/server/lib/github/pr-status.js +5 -5
- package/server/lib/github/pr-status.test.js +1 -1
- package/server/lib/github/routes.js +4 -4
- package/server/lib/guests/DOCUMENTATION.md +68 -0
- package/server/lib/guests/auth-store.js +184 -0
- package/server/lib/guests/auth-store.test.js +112 -0
- package/server/lib/guests/background.test.js +83 -0
- package/server/lib/guests/builtins.js +34 -0
- package/server/lib/guests/builtins.test.js +174 -0
- package/server/lib/guests/catalog.js +477 -0
- package/server/lib/guests/catalog.test.js +390 -0
- package/server/lib/guests/clone.js +297 -0
- package/server/lib/guests/extract-zip.js +136 -0
- package/server/lib/guests/extract-zip.test.js +109 -0
- package/server/lib/guests/files.js +308 -0
- package/server/lib/guests/files.test.js +262 -0
- package/server/lib/guests/grant-scope.js +81 -0
- package/server/lib/guests/grant-scope.test.js +75 -0
- package/server/lib/guests/host-session.js +73 -0
- package/server/lib/guests/host-session.test.js +30 -0
- package/server/lib/guests/html-styles.js +6 -0
- package/server/lib/guests/html-styles.test.js +45 -0
- package/server/lib/guests/html-tokens.js +73 -0
- package/server/lib/guests/html-tokens.test.js +53 -0
- package/server/lib/guests/install.js +406 -0
- package/server/lib/guests/install.test.js +338 -0
- package/server/lib/guests/oauth.js +501 -0
- package/server/lib/guests/oauth.test.js +481 -0
- package/server/lib/guests/persist.js +336 -0
- package/server/lib/guests/persist.test.js +288 -0
- package/server/lib/guests/request.js +112 -0
- package/server/lib/guests/request.test.js +206 -0
- package/server/lib/guests/routes.js +838 -0
- package/server/lib/guests/service.js +538 -0
- package/server/lib/guests/service.test.js +277 -0
- package/server/lib/guests/sockets.js +129 -0
- package/server/lib/guests/sockets.test.js +110 -0
- package/server/lib/guests/ssh-install.test.js +188 -0
- package/server/lib/guests/storage.js +68 -0
- package/server/lib/guests/storage.test.js +59 -0
- package/server/lib/guests/updates.js +294 -0
- package/server/lib/guests/updates.test.js +334 -0
- package/server/lib/guests/upload.js +50 -0
- package/server/lib/guests/upload.test.js +131 -0
- package/server/lib/linear/DOCUMENTATION.md +1 -1
- package/server/lib/message-queue/DOCUMENTATION.md +6 -0
- package/server/lib/message-queue/runtime.js +5 -0
- package/server/lib/message-queue/runtime.test.js +32 -1
- package/server/lib/openchamber-control/DOCUMENTATION.md +6 -0
- package/server/lib/openchamber-sessions/routes.js +44 -11
- package/server/lib/openchamber-sessions/routes.test.js +47 -0
- package/server/lib/opencode/DOCUMENTATION.md +40 -0
- package/server/lib/opencode/core-routes.js +39 -1
- package/server/lib/opencode/feature-routes-runtime.js +15 -0
- package/server/lib/opencode/lifecycle-process.test.js +84 -0
- package/server/lib/opencode/lifecycle.js +54 -67
- package/server/lib/opencode/settings-helpers.js +3 -0
- package/server/lib/opencode/settings-normalization-runtime.js +2 -0
- package/server/lib/opencode/settings-normalization-runtime.test.js +13 -0
- package/server/lib/opencode/settings-registry.json +12 -0
- package/server/lib/opencode/shutdown-runtime.js +3 -0
- package/server/lib/opencode/shutdown-runtime.test.js +24 -0
- package/server/lib/opencode/theme-archive.js +53 -0
- package/server/lib/opencode/theme-catalog.js +171 -0
- package/server/lib/opencode/theme-catalog.test.js +125 -0
- package/server/lib/opencode/theme-import.test.js +144 -0
- package/server/lib/opencode/theme-runtime.js +100 -28
- package/server/lib/opencode/theme-runtime.test.js +15 -0
- package/server/lib/permission-auto-accept/DOCUMENTATION.md +8 -0
- package/server/lib/permission-auto-accept/runtime.js +13 -0
- package/server/lib/permission-auto-accept/runtime.test.js +37 -1
- package/server/lib/quota/DOCUMENTATION.md +0 -1
- package/server/lib/quota/providers/index.js +0 -7
- package/server/lib/routing/DOCUMENTATION.md +81 -0
- package/server/lib/routing/defaults.js +98 -0
- package/server/lib/routing/feature-flag.js +11 -0
- package/server/lib/routing/history.js +34 -0
- package/server/lib/routing/jev.js +98 -0
- package/server/lib/routing/routes.http.test.js +100 -0
- package/server/lib/routing/routes.js +81 -0
- package/server/lib/routing/runtime.js +217 -0
- package/server/lib/routing/runtime.test.js +188 -0
- package/server/lib/routing/store.js +249 -0
- package/server/lib/routing/store.test.js +96 -0
- package/server/lib/security/request-security.js +9 -5
- package/server/lib/security/request-security.test.js +37 -0
- package/server/lib/terminal/DOCUMENTATION.md +2 -0
- package/server/lib/terminal/runtime.js +17 -2
- package/server/lib/terminal/runtime.test.js +45 -0
- package/server/lib/ui-auth/DOCUMENTATION.md +8 -0
- package/server/lib/ui-auth/session-cookie.js +51 -0
- package/server/lib/ui-auth/session-cookie.test.js +46 -0
- package/server/lib/ui-auth/ui-auth.js +56 -17
- package/server/lib/ui-auth/ui-auth.test.js +96 -0
- package/dist/assets/DiffView-GYriC0Wk.js +0 -4
- package/dist/assets/DirtyBranchSwitchDialog-Bv0C99hc.js +0 -1
- package/dist/assets/FilesView-2Lin13wx.js +0 -13
- package/dist/assets/GitView-9wKba3UO.js +0 -6
- package/dist/assets/LinearIssuesView-DXS9QJiR.js +0 -1
- package/dist/assets/MarkdownRendererImpl-CaMyct2Q.js +0 -12
- package/dist/assets/PlanView-DiTBm2BD.js +0 -5
- package/dist/assets/SettingsView-CN8VeM99.js +0 -28
- package/dist/assets/ToolOutputDialog-BqiKydxR.js +0 -15
- package/dist/assets/appThemeRegistry-BK0dHKa6.js +0 -1
- package/dist/assets/de-DQWC94VK.js +0 -10
- package/dist/assets/es-DixFUD3m.js +0 -16
- package/dist/assets/fr-D6u8tvfA.js +0 -14
- package/dist/assets/index-BvpFzhLs.js +0 -40
- package/dist/assets/index-n5p3SnES.css +0 -1
- package/dist/assets/ja-4u4pCorB.js +0 -16
- package/dist/assets/ko-C27-LW_b.js +0 -16
- package/dist/assets/main-tEA-fFPg.js +0 -930
- package/dist/assets/markdownCore-kyGrWGsn.js +0 -5
- package/dist/assets/pl-FtCjsNdW.js +0 -16
- package/dist/assets/registerCustomTheme-BBXUCRnG.js +0 -1
- package/dist/assets/renderElectronMiniChatApp-CuHOGlF4.js +0 -2
- package/dist/assets/renderMobileApp-C4X_KUH8.js +0 -25
- package/dist/assets/runtimeEndpointReset-CMg-KUx3.js +0 -41
- package/dist/assets/shikiHighlight-DdKWYWrV.js +0 -1
- package/dist/assets/tr-D2j6wUez.js +0 -7
- package/dist/assets/uk-C6IzmwM_.js +0 -16
- package/dist/assets/useAppFontEffects-DgCHy6Mr.js +0 -7282
- package/dist/assets/useGitComparison-BIaI0WZI.js +0 -1
- package/dist/assets/useInlineCommentController-2wcCtpM3.js +0 -2
- package/dist/assets/useRootScrollLock-CbWA03xR.js +0 -1
- package/dist/assets/vendor-framer-motion-livSKyyV.js +0 -1
- package/dist/assets/zh-CN-Wl6tIDz1.js +0 -16
- package/dist/assets/zh-TW-hgphoWSN.js +0 -16
- package/server/lib/quota/providers/crof.js +0 -96
- package/server/lib/quota/providers/crof.test.js +0 -98
|
@@ -0,0 +1,277 @@
|
|
|
1
|
+
import { afterEach, describe, expect, test } from 'bun:test';
|
|
2
|
+
import fs from 'node:fs/promises';
|
|
3
|
+
import os from 'node:os';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
|
|
6
|
+
import {
|
|
7
|
+
getServiceStatus,
|
|
8
|
+
proxyGuestServiceRequest,
|
|
9
|
+
readServicePid,
|
|
10
|
+
stopAllGuestServices,
|
|
11
|
+
stopGuestService,
|
|
12
|
+
} from './service.js';
|
|
13
|
+
import { setCapabilityGrants, writeExtensionStore } from './persist.js';
|
|
14
|
+
|
|
15
|
+
const writeFixture = async () => {
|
|
16
|
+
const dir = await fs.mkdtemp(path.join(os.tmpdir(), 'oc-service-'));
|
|
17
|
+
const persistPath = path.join(dir, 'extensions.json');
|
|
18
|
+
const packageRoot = path.join(dir, 'docker');
|
|
19
|
+
await fs.mkdir(path.join(packageRoot, 'service'), { recursive: true });
|
|
20
|
+
await fs.writeFile(path.join(packageRoot, 'service', 'main.js'), `
|
|
21
|
+
import http from 'node:http';
|
|
22
|
+
const port = Number(process.env.OPENCHAMBER_SERVICE_PORT);
|
|
23
|
+
const token = process.env.OPENCHAMBER_SERVICE_TOKEN;
|
|
24
|
+
http.createServer((req, res) => {
|
|
25
|
+
if (req.headers.authorization !== \`Bearer \${token}\`) {
|
|
26
|
+
res.writeHead(401);
|
|
27
|
+
res.end('no');
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
if (req.url === '/health') {
|
|
31
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
32
|
+
res.end(JSON.stringify({ ok: true }));
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
if (req.url === '/ping') {
|
|
36
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
37
|
+
res.end(JSON.stringify({ pong: true }));
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
res.writeHead(404);
|
|
41
|
+
res.end('missing');
|
|
42
|
+
}).listen(port, '127.0.0.1');
|
|
43
|
+
`);
|
|
44
|
+
await writeExtensionStore(persistPath, { paths: [packageRoot], sources: {}, capabilityGrants: {} });
|
|
45
|
+
return { dir, persistPath, packageRoot };
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
afterEach(async () => {
|
|
49
|
+
await stopAllGuestServices();
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
describe('guest service proxy', () => {
|
|
53
|
+
test('refuses when permissions need a grant', async () => {
|
|
54
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
55
|
+
try {
|
|
56
|
+
await expect(proxyGuestServiceRequest({
|
|
57
|
+
guestId: 'docker',
|
|
58
|
+
packageRoot,
|
|
59
|
+
service: {
|
|
60
|
+
entry: 'service/main.js',
|
|
61
|
+
permissions: { exec: ['docker'] },
|
|
62
|
+
},
|
|
63
|
+
granted: [],
|
|
64
|
+
persistPath,
|
|
65
|
+
method: 'GET',
|
|
66
|
+
path: '/ping',
|
|
67
|
+
})).rejects.toMatchObject({ code: 'NO_SERVICE' });
|
|
68
|
+
expect(getServiceStatus('docker')).toBe('stopped');
|
|
69
|
+
} finally {
|
|
70
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test('refuses when the extension is disabled', async () => {
|
|
75
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
76
|
+
try {
|
|
77
|
+
await writeExtensionStore(persistPath, {
|
|
78
|
+
paths: [packageRoot],
|
|
79
|
+
sources: {},
|
|
80
|
+
capabilityGrants: { docker: ['service'] },
|
|
81
|
+
disabledGuests: { docker: true },
|
|
82
|
+
});
|
|
83
|
+
await expect(proxyGuestServiceRequest({
|
|
84
|
+
guestId: 'docker',
|
|
85
|
+
guestName: 'Docker',
|
|
86
|
+
packageRoot,
|
|
87
|
+
service: {
|
|
88
|
+
entry: 'service/main.js',
|
|
89
|
+
permissions: { exec: ['docker'] },
|
|
90
|
+
},
|
|
91
|
+
granted: ['service'],
|
|
92
|
+
persistPath,
|
|
93
|
+
method: 'GET',
|
|
94
|
+
path: '/ping',
|
|
95
|
+
})).rejects.toMatchObject({
|
|
96
|
+
code: 'DISABLED',
|
|
97
|
+
message: 'Docker is disabled in Settings → Extensions.',
|
|
98
|
+
});
|
|
99
|
+
expect(getServiceStatus('docker')).toBe('stopped');
|
|
100
|
+
} finally {
|
|
101
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
test('spawns, proxies, and reports ready', async () => {
|
|
106
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
107
|
+
try {
|
|
108
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
109
|
+
const result = await proxyGuestServiceRequest({
|
|
110
|
+
guestId: 'docker',
|
|
111
|
+
packageRoot,
|
|
112
|
+
service: {
|
|
113
|
+
entry: 'service/main.js',
|
|
114
|
+
permissions: { exec: ['docker'] },
|
|
115
|
+
},
|
|
116
|
+
granted: ['service'],
|
|
117
|
+
persistPath,
|
|
118
|
+
method: 'GET',
|
|
119
|
+
path: '/ping',
|
|
120
|
+
});
|
|
121
|
+
expect(result).toEqual({ status: 200, body: '{"pong":true}' });
|
|
122
|
+
expect(getServiceStatus('docker')).toBe('ready');
|
|
123
|
+
await stopGuestService('docker');
|
|
124
|
+
expect(getServiceStatus('docker')).toBe('stopped');
|
|
125
|
+
} finally {
|
|
126
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
|
|
130
|
+
test('coalesces parallel first requests onto one spawn', async () => {
|
|
131
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
132
|
+
try {
|
|
133
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
134
|
+
const service = {
|
|
135
|
+
entry: 'service/main.js',
|
|
136
|
+
permissions: { exec: ['docker'] },
|
|
137
|
+
};
|
|
138
|
+
const results = await Promise.all([
|
|
139
|
+
proxyGuestServiceRequest({
|
|
140
|
+
guestId: 'docker',
|
|
141
|
+
packageRoot,
|
|
142
|
+
service,
|
|
143
|
+
granted: ['service'],
|
|
144
|
+
persistPath,
|
|
145
|
+
method: 'GET',
|
|
146
|
+
path: '/ping',
|
|
147
|
+
}),
|
|
148
|
+
proxyGuestServiceRequest({
|
|
149
|
+
guestId: 'docker',
|
|
150
|
+
packageRoot,
|
|
151
|
+
service,
|
|
152
|
+
granted: ['service'],
|
|
153
|
+
persistPath,
|
|
154
|
+
method: 'GET',
|
|
155
|
+
path: '/ping',
|
|
156
|
+
}),
|
|
157
|
+
proxyGuestServiceRequest({
|
|
158
|
+
guestId: 'docker',
|
|
159
|
+
packageRoot,
|
|
160
|
+
service,
|
|
161
|
+
granted: ['service'],
|
|
162
|
+
persistPath,
|
|
163
|
+
method: 'GET',
|
|
164
|
+
path: '/ping',
|
|
165
|
+
}),
|
|
166
|
+
]);
|
|
167
|
+
expect(results).toEqual([
|
|
168
|
+
{ status: 200, body: '{"pong":true}' },
|
|
169
|
+
{ status: 200, body: '{"pong":true}' },
|
|
170
|
+
{ status: 200, body: '{"pong":true}' },
|
|
171
|
+
]);
|
|
172
|
+
expect(getServiceStatus('docker')).toBe('ready');
|
|
173
|
+
} finally {
|
|
174
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
175
|
+
}
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
test('rejects a path with a scheme', async () => {
|
|
179
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
180
|
+
try {
|
|
181
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
182
|
+
await expect(proxyGuestServiceRequest({
|
|
183
|
+
guestId: 'docker',
|
|
184
|
+
packageRoot,
|
|
185
|
+
service: { entry: 'service/main.js' },
|
|
186
|
+
granted: ['service'],
|
|
187
|
+
persistPath,
|
|
188
|
+
method: 'GET',
|
|
189
|
+
path: 'http://evil.example/ping',
|
|
190
|
+
})).rejects.toMatchObject({ code: 'BAD_PATH' });
|
|
191
|
+
} finally {
|
|
192
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
193
|
+
}
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
describe('pause during startup', () => {
|
|
198
|
+
test('a stop that lands while the service is coming up wins', async () => {
|
|
199
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
200
|
+
try {
|
|
201
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
202
|
+
const pending = proxyGuestServiceRequest({
|
|
203
|
+
guestId: 'docker',
|
|
204
|
+
packageRoot,
|
|
205
|
+
service: { entry: 'service/main.js', permissions: { exec: ['docker'] } },
|
|
206
|
+
granted: ['service'],
|
|
207
|
+
persistPath,
|
|
208
|
+
method: 'GET',
|
|
209
|
+
path: '/ping',
|
|
210
|
+
});
|
|
211
|
+
// Stop while the process is coming up: the start must notice and not
|
|
212
|
+
// hand a ready service to the request that began it.
|
|
213
|
+
const startedAt = Date.now();
|
|
214
|
+
while (getServiceStatus('docker') !== 'starting' && Date.now() - startedAt < 5_000) {
|
|
215
|
+
await new Promise((resolve) => setTimeout(resolve, 5));
|
|
216
|
+
}
|
|
217
|
+
expect(getServiceStatus('docker')).toBe('starting');
|
|
218
|
+
await stopGuestService('docker');
|
|
219
|
+
await expect(pending).rejects.toMatchObject({ code: 'NO_SERVICE' });
|
|
220
|
+
expect(getServiceStatus('docker')).toBe('stopped');
|
|
221
|
+
} finally {
|
|
222
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
223
|
+
}
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
describe('pause before the request reads the store', () => {
|
|
228
|
+
test('a stop that lands before the first read still wins', async () => {
|
|
229
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
230
|
+
try {
|
|
231
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
232
|
+
const pending = proxyGuestServiceRequest({
|
|
233
|
+
guestId: 'docker',
|
|
234
|
+
packageRoot,
|
|
235
|
+
service: { entry: 'service/main.js', permissions: { exec: ['docker'] } },
|
|
236
|
+
granted: ['service'],
|
|
237
|
+
persistPath,
|
|
238
|
+
method: 'GET',
|
|
239
|
+
path: '/ping',
|
|
240
|
+
});
|
|
241
|
+
await stopGuestService('docker');
|
|
242
|
+
await expect(pending).rejects.toMatchObject({ code: 'NO_SERVICE' });
|
|
243
|
+
expect(getServiceStatus('docker')).toBe('stopped');
|
|
244
|
+
} finally {
|
|
245
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
246
|
+
}
|
|
247
|
+
});
|
|
248
|
+
});
|
|
249
|
+
|
|
250
|
+
describe('restart after the process died', () => {
|
|
251
|
+
test('the next request restarts the service instead of reading the cleanup as a pause', async () => {
|
|
252
|
+
const { dir, persistPath, packageRoot } = await writeFixture();
|
|
253
|
+
try {
|
|
254
|
+
await setCapabilityGrants('docker', persistPath, ['service']);
|
|
255
|
+
const params = {
|
|
256
|
+
guestId: 'docker',
|
|
257
|
+
packageRoot,
|
|
258
|
+
service: { entry: 'service/main.js', permissions: { exec: ['docker'] } },
|
|
259
|
+
granted: ['service'],
|
|
260
|
+
persistPath,
|
|
261
|
+
method: 'GET',
|
|
262
|
+
path: '/ping',
|
|
263
|
+
};
|
|
264
|
+
expect(await proxyGuestServiceRequest(params)).toEqual({ status: 200, body: '{"pong":true}' });
|
|
265
|
+
// Kill the process behind the host's back, the way a crash would.
|
|
266
|
+
const pid = readServicePid('docker');
|
|
267
|
+
process.kill(pid, 'SIGKILL');
|
|
268
|
+
const startedAt = Date.now();
|
|
269
|
+
while (getServiceStatus('docker') === 'ready' && Date.now() - startedAt < 5_000) {
|
|
270
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
271
|
+
}
|
|
272
|
+
expect(await proxyGuestServiceRequest(params)).toEqual({ status: 200, body: '{"pong":true}' });
|
|
273
|
+
} finally {
|
|
274
|
+
await fs.rm(dir, { recursive: true, force: true });
|
|
275
|
+
}
|
|
276
|
+
});
|
|
277
|
+
});
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import fs from 'node:fs/promises';
|
|
2
|
+
import os from 'node:os';
|
|
3
|
+
import path from 'node:path';
|
|
4
|
+
|
|
5
|
+
const SOCKET_PLATFORMS = new Set(['linux', 'darwin', 'win32']);
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* @param {string} value
|
|
9
|
+
* @param {string} [home]
|
|
10
|
+
*/
|
|
11
|
+
export const expandHomePath = (value, home = process.env.HOME || os.homedir()) => {
|
|
12
|
+
if (value === '~') {
|
|
13
|
+
return home;
|
|
14
|
+
}
|
|
15
|
+
if (value.startsWith('~/') || value.startsWith('~\\')) {
|
|
16
|
+
return path.join(home, value.slice(2));
|
|
17
|
+
}
|
|
18
|
+
return value;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* @param {{ id: string, candidatesByPlatform?: Partial<Record<'linux' | 'darwin' | 'win32', string[]>> }} binding
|
|
23
|
+
* @param {NodeJS.Platform} [platform]
|
|
24
|
+
* @param {string} [home]
|
|
25
|
+
*/
|
|
26
|
+
export const platformSocketCandidates = (
|
|
27
|
+
binding,
|
|
28
|
+
platform = process.platform,
|
|
29
|
+
home = process.env.HOME || os.homedir(),
|
|
30
|
+
) => {
|
|
31
|
+
if (!SOCKET_PLATFORMS.has(platform)) {
|
|
32
|
+
return [];
|
|
33
|
+
}
|
|
34
|
+
const list = binding.candidatesByPlatform?.[platform] ?? [];
|
|
35
|
+
return list.map((entry) => expandHomePath(entry, home));
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* @param {{ id: string, candidatesByPlatform?: Partial<Record<'linux' | 'darwin' | 'win32', string[]>> }} binding
|
|
40
|
+
* @param {{
|
|
41
|
+
* override?: string | null,
|
|
42
|
+
* platform?: NodeJS.Platform,
|
|
43
|
+
* access?: (candidate: string) => Promise<void>,
|
|
44
|
+
* home?: string,
|
|
45
|
+
* }} [options]
|
|
46
|
+
* @returns {Promise<string | null>}
|
|
47
|
+
*/
|
|
48
|
+
export const resolveSocketBinding = async (binding, options = {}) => {
|
|
49
|
+
const {
|
|
50
|
+
override = null,
|
|
51
|
+
platform = process.platform,
|
|
52
|
+
access = (candidate) => fs.access(candidate),
|
|
53
|
+
home = process.env.HOME || os.homedir(),
|
|
54
|
+
} = options;
|
|
55
|
+
if (typeof override === 'string' && override.trim()) {
|
|
56
|
+
return expandHomePath(override.trim(), home);
|
|
57
|
+
}
|
|
58
|
+
for (const candidate of platformSocketCandidates(binding, platform, home)) {
|
|
59
|
+
try {
|
|
60
|
+
await access(candidate);
|
|
61
|
+
return candidate;
|
|
62
|
+
} catch {
|
|
63
|
+
// try next candidate
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return null;
|
|
67
|
+
};
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* @param {Array<{ id: string, candidatesByPlatform?: Partial<Record<'linux' | 'darwin' | 'win32', string[]>> }>} bindings
|
|
71
|
+
* @param {Record<string, string>} [overrides]
|
|
72
|
+
* @param {{
|
|
73
|
+
* platform?: NodeJS.Platform,
|
|
74
|
+
* access?: (candidate: string) => Promise<void>,
|
|
75
|
+
* home?: string,
|
|
76
|
+
* }} [options]
|
|
77
|
+
*/
|
|
78
|
+
export const buildPublicSocketBindings = async (bindings, overrides = {}, options = {}) => {
|
|
79
|
+
const {
|
|
80
|
+
platform = process.platform,
|
|
81
|
+
access,
|
|
82
|
+
home = process.env.HOME || os.homedir(),
|
|
83
|
+
} = options;
|
|
84
|
+
/** @type {Array<{ id: string, candidates: string[], resolved: string | null, override: string | null }>} */
|
|
85
|
+
const out = [];
|
|
86
|
+
for (const binding of bindings) {
|
|
87
|
+
const rawOverride = overrides[binding.id];
|
|
88
|
+
const override = typeof rawOverride === 'string' && rawOverride.trim()
|
|
89
|
+
? expandHomePath(rawOverride.trim(), home)
|
|
90
|
+
: null;
|
|
91
|
+
const candidates = platformSocketCandidates(binding, platform, home);
|
|
92
|
+
const resolved = await resolveSocketBinding(binding, {
|
|
93
|
+
override: rawOverride,
|
|
94
|
+
platform,
|
|
95
|
+
access,
|
|
96
|
+
home,
|
|
97
|
+
});
|
|
98
|
+
out.push({
|
|
99
|
+
id: binding.id,
|
|
100
|
+
candidates,
|
|
101
|
+
resolved,
|
|
102
|
+
override,
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
return out;
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
/**
|
|
109
|
+
* @param {Array<{ id: string, candidatesByPlatform?: Partial<Record<'linux' | 'darwin' | 'win32', string[]>> }>} bindings
|
|
110
|
+
* @param {Record<string, string>} [overrides]
|
|
111
|
+
* @param {{
|
|
112
|
+
* platform?: NodeJS.Platform,
|
|
113
|
+
* access?: (candidate: string) => Promise<void>,
|
|
114
|
+
* home?: string,
|
|
115
|
+
* }} [options]
|
|
116
|
+
* @returns {Promise<Record<string, string>>}
|
|
117
|
+
*/
|
|
118
|
+
export const resolveServiceSocketEnv = async (bindings, overrides = {}, options = {}) => {
|
|
119
|
+
const publicBindings = await buildPublicSocketBindings(bindings, overrides, options);
|
|
120
|
+
/** @type {Record<string, string>} */
|
|
121
|
+
const sockets = {};
|
|
122
|
+
for (const binding of publicBindings) {
|
|
123
|
+
if (!binding.resolved) {
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
sockets[binding.id] = binding.resolved;
|
|
127
|
+
}
|
|
128
|
+
return sockets;
|
|
129
|
+
};
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { describe, expect, test } from 'bun:test';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
|
|
4
|
+
import {
|
|
5
|
+
buildPublicSocketBindings,
|
|
6
|
+
expandHomePath,
|
|
7
|
+
resolveServiceSocketEnv,
|
|
8
|
+
resolveSocketBinding,
|
|
9
|
+
} from './sockets.js';
|
|
10
|
+
|
|
11
|
+
const dockerBinding = {
|
|
12
|
+
id: 'docker',
|
|
13
|
+
candidatesByPlatform: {
|
|
14
|
+
linux: ['/var/run/docker.sock', '/run/user/1000/docker.sock'],
|
|
15
|
+
darwin: ['~/.docker/run/docker.sock', '~/.colima/default/docker.sock'],
|
|
16
|
+
win32: ['//./pipe/docker_engine'],
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
describe('expandHomePath', () => {
|
|
21
|
+
test('expands ~ and leaves absolute paths alone', () => {
|
|
22
|
+
expect(expandHomePath('~/run/docker.sock', '/Users/user')).toBe(
|
|
23
|
+
path.join('/Users/user', 'run/docker.sock'),
|
|
24
|
+
);
|
|
25
|
+
expect(expandHomePath('/var/run/docker.sock', '/Users/user')).toBe('/var/run/docker.sock');
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
describe('resolveSocketBinding', () => {
|
|
30
|
+
test('override wins before candidates', async () => {
|
|
31
|
+
const resolved = await resolveSocketBinding(dockerBinding, {
|
|
32
|
+
override: '~/custom.sock',
|
|
33
|
+
platform: 'darwin',
|
|
34
|
+
home: '/Users/user',
|
|
35
|
+
access: async () => {
|
|
36
|
+
throw new Error('should not access');
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
expect(resolved).toBe(path.join('/Users/user', 'custom.sock'));
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
test('picks the first existing candidate for the platform', async () => {
|
|
43
|
+
const seen = [];
|
|
44
|
+
const resolved = await resolveSocketBinding(dockerBinding, {
|
|
45
|
+
platform: 'linux',
|
|
46
|
+
access: async (candidate) => {
|
|
47
|
+
seen.push(candidate);
|
|
48
|
+
if (candidate !== '/run/user/1000/docker.sock') {
|
|
49
|
+
throw Object.assign(new Error('missing'), { code: 'ENOENT' });
|
|
50
|
+
}
|
|
51
|
+
},
|
|
52
|
+
});
|
|
53
|
+
expect(resolved).toBe('/run/user/1000/docker.sock');
|
|
54
|
+
expect(seen).toEqual(['/var/run/docker.sock', '/run/user/1000/docker.sock']);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test('returns null when nothing exists', async () => {
|
|
58
|
+
const resolved = await resolveSocketBinding(dockerBinding, {
|
|
59
|
+
platform: 'darwin',
|
|
60
|
+
home: '/Users/user',
|
|
61
|
+
access: async () => {
|
|
62
|
+
throw Object.assign(new Error('missing'), { code: 'ENOENT' });
|
|
63
|
+
},
|
|
64
|
+
});
|
|
65
|
+
expect(resolved).toBeNull();
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
describe('buildPublicSocketBindings', () => {
|
|
70
|
+
test('exposes candidates, override, and resolved for the catalog', async () => {
|
|
71
|
+
const [binding] = await buildPublicSocketBindings(
|
|
72
|
+
[dockerBinding],
|
|
73
|
+
{ docker: '/tmp/docker.sock' },
|
|
74
|
+
{
|
|
75
|
+
platform: 'darwin',
|
|
76
|
+
home: '/Users/user',
|
|
77
|
+
access: async () => undefined,
|
|
78
|
+
},
|
|
79
|
+
);
|
|
80
|
+
expect(binding).toEqual({
|
|
81
|
+
id: 'docker',
|
|
82
|
+
candidates: [
|
|
83
|
+
path.join('/Users/user', '.docker/run/docker.sock'),
|
|
84
|
+
path.join('/Users/user', '.colima/default/docker.sock'),
|
|
85
|
+
],
|
|
86
|
+
resolved: '/tmp/docker.sock',
|
|
87
|
+
override: '/tmp/docker.sock',
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
describe('resolveServiceSocketEnv', () => {
|
|
93
|
+
test('builds OPENCHAMBER_SERVICE_SOCKETS map from resolved bindings', async () => {
|
|
94
|
+
const env = await resolveServiceSocketEnv(
|
|
95
|
+
[dockerBinding],
|
|
96
|
+
{},
|
|
97
|
+
{
|
|
98
|
+
platform: 'linux',
|
|
99
|
+
access: async (candidate) => {
|
|
100
|
+
if (candidate !== '/var/run/docker.sock') {
|
|
101
|
+
throw Object.assign(new Error('missing'), { code: 'ENOENT' });
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
);
|
|
106
|
+
expect(env).toEqual({
|
|
107
|
+
docker: '/var/run/docker.sock',
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
});
|