@theruansilva/omp-web 2.0.0
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/LICENSE +21 -0
- package/README.md +181 -0
- package/dist/cli/doctor.js +118 -0
- package/dist/cli/doctor.js.map +1 -0
- package/dist/cli/serviceTemplates.js +55 -0
- package/dist/cli/serviceTemplates.js.map +1 -0
- package/dist/cli/types.js +2 -0
- package/dist/cli/types.js.map +1 -0
- package/dist/cli.js +872 -0
- package/dist/cli.js.map +1 -0
- package/dist/client/assets/CodeViewer-CJNBz-Ox.js +4 -0
- package/dist/client/assets/TerminalPanel-B9-LUv7E.js +126 -0
- package/dist/client/assets/UnifiedDiffViewer-BUqme4se.js +34 -0
- package/dist/client/assets/index-DGBYb2j9.css +1 -0
- package/dist/client/assets/index-uWm_YNRB.js +4427 -0
- package/dist/client/assets/vendor-editor-core-D9EJm1dE.js +10 -0
- package/dist/client/assets/vendor-editor-languages-N6dcxgRO.js +26 -0
- package/dist/client/assets/vendor-terminal-DDGTF8rc.css +1 -0
- package/dist/client/assets/vendor-terminal-DjQ08hXu.js +16 -0
- package/dist/client/favicon-16x16.png +0 -0
- package/dist/client/favicon-180x180.png +0 -0
- package/dist/client/favicon-192x192.png +0 -0
- package/dist/client/favicon-32x32.png +0 -0
- package/dist/client/favicon-512x512.png +0 -0
- package/dist/client/favicon.ico +0 -0
- package/dist/client/favicon.png +0 -0
- package/dist/client/favicon.svg +11 -0
- package/dist/client/index.html +68 -0
- package/dist/client/manifest.webmanifest +36 -0
- package/dist/client-react/assets/index-BQ6zLLfz.js +51 -0
- package/dist/client-react/assets/index-Befs78HG.css +1 -0
- package/dist/client-react/index.html +16 -0
- package/dist/config.js +272 -0
- package/dist/config.js.map +1 -0
- package/dist/docker/ompWebDockerCommandPlan.js +211 -0
- package/dist/docker/ompWebDockerCommandPlan.js.map +1 -0
- package/dist/docker/piWebDockerCommandPlan.js +211 -0
- package/dist/docker/piWebDockerCommandPlan.js.map +1 -0
- package/dist/omp-web-plugins/info/omp-web-plugin.js +51 -0
- package/dist/omp-web-plugins/info/package.json +9 -0
- package/dist/omp-web-plugins/schedule-prompts/omp-web-plugin.js +43 -0
- package/dist/omp-web-plugins/schedule-prompts/package.json +9 -0
- package/dist/omp-web-plugins/schedule-prompts/schedulePromptsPanelElement.js +242 -0
- package/dist/omp-web-plugins/schedule-prompts/types.js +2 -0
- package/dist/omp-web-plugins/updates/omp-web-plugin.js +173 -0
- package/dist/omp-web-plugins/updates/package.json +9 -0
- package/dist/omp-web-plugins/updates/updatesLogic.js +97 -0
- package/dist/ompWebVersionReport.js +217 -0
- package/dist/ompWebVersionReport.js.map +1 -0
- package/dist/pi-web-plugins/info/package.json +9 -0
- package/dist/pi-web-plugins/info/pi-web-plugin.js +51 -0
- package/dist/pi-web-plugins/schedule-prompts/package.json +9 -0
- package/dist/pi-web-plugins/schedule-prompts/pi-web-plugin.js +43 -0
- package/dist/pi-web-plugins/schedule-prompts/schedulePromptsPanelElement.js +226 -0
- package/dist/pi-web-plugins/schedule-prompts/types.js +2 -0
- package/dist/pi-web-plugins/updates/package.json +9 -0
- package/dist/pi-web-plugins/updates/pi-web-plugin.js +173 -0
- package/dist/pi-web-plugins/updates/updatesLogic.js +97 -0
- package/dist/piWebVersionReport.js +225 -0
- package/dist/piWebVersionReport.js.map +1 -0
- package/dist/plugin-api/unstable.d.ts +22 -0
- package/dist/plugin-api.d.ts +197 -0
- package/dist/server/activity/workspaceActivityRoutes.js +4 -0
- package/dist/server/activity/workspaceActivityRoutes.js.map +1 -0
- package/dist/server/activity/workspaceActivityService.js +98 -0
- package/dist/server/activity/workspaceActivityService.js.map +1 -0
- package/dist/server/app.js +217 -0
- package/dist/server/app.js.map +1 -0
- package/dist/server/configRoutes.js +278 -0
- package/dist/server/configRoutes.js.map +1 -0
- package/dist/server/diagnostics/nodePtySpawnHelper.js +130 -0
- package/dist/server/diagnostics/nodePtySpawnHelper.js.map +1 -0
- package/dist/server/git/gitEnv.js +15 -0
- package/dist/server/git/gitEnv.js.map +1 -0
- package/dist/server/git/gitService.js +119 -0
- package/dist/server/git/gitService.js.map +1 -0
- package/dist/server/gitRoutes.js +29 -0
- package/dist/server/gitRoutes.js.map +1 -0
- package/dist/server/index.js +16 -0
- package/dist/server/index.js.map +1 -0
- package/dist/server/machines/machineClient.js +162 -0
- package/dist/server/machines/machineClient.js.map +1 -0
- package/dist/server/machines/machinePluginProxyRoutes.js +151 -0
- package/dist/server/machines/machinePluginProxyRoutes.js.map +1 -0
- package/dist/server/machines/machineProxyRoutes.js +152 -0
- package/dist/server/machines/machineProxyRoutes.js.map +1 -0
- package/dist/server/machines/machineRoutes.js +61 -0
- package/dist/server/machines/machineRoutes.js.map +1 -0
- package/dist/server/machines/machineService.js +230 -0
- package/dist/server/machines/machineService.js.map +1 -0
- package/dist/server/machines/machineStore.js +123 -0
- package/dist/server/machines/machineStore.js.map +1 -0
- package/dist/server/machines/proxyUtils.js +39 -0
- package/dist/server/machines/proxyUtils.js.map +1 -0
- package/dist/server/ompWebPluginService.js +298 -0
- package/dist/server/ompWebPluginService.js.map +1 -0
- package/dist/server/ompWebStatus.js +604 -0
- package/dist/server/ompWebStatus.js.map +1 -0
- package/dist/server/ompWebStatusCache.js +31 -0
- package/dist/server/ompWebStatusCache.js.map +1 -0
- package/dist/server/piPackageRoutes.js +85 -0
- package/dist/server/piPackageRoutes.js.map +1 -0
- package/dist/server/piPackageService.js +65 -0
- package/dist/server/piPackageService.js.map +1 -0
- package/dist/server/piWebPluginService.js +283 -0
- package/dist/server/piWebPluginService.js.map +1 -0
- package/dist/server/piWebStatus.js +602 -0
- package/dist/server/piWebStatus.js.map +1 -0
- package/dist/server/piWebStatusCache.js +32 -0
- package/dist/server/piWebStatusCache.js.map +1 -0
- package/dist/server/projects/directorySuggestions.js +37 -0
- package/dist/server/projects/directorySuggestions.js.map +1 -0
- package/dist/server/projects/projectService.js +31 -0
- package/dist/server/projects/projectService.js.map +1 -0
- package/dist/server/push/PushNotificationService.js +137 -0
- package/dist/server/push/PushNotificationService.js.map +1 -0
- package/dist/server/push/pushRoutes.js +50 -0
- package/dist/server/push/pushRoutes.js.map +1 -0
- package/dist/server/realtime/honoRealtimeSocket.js +32 -0
- package/dist/server/realtime/honoRealtimeSocket.js.map +1 -0
- package/dist/server/realtime/sessionEventHub.js +39 -0
- package/dist/server/realtime/sessionEventHub.js.map +1 -0
- package/dist/server/sessiond/sessionProxyRoutes.js +85 -0
- package/dist/server/sessiond/sessionProxyRoutes.js.map +1 -0
- package/dist/server/sessiond.js +104 -0
- package/dist/server/sessiond.js.map +1 -0
- package/dist/server/sessions/attachmentService.js +112 -0
- package/dist/server/sessions/attachmentService.js.map +1 -0
- package/dist/server/sessions/authProviderOptions.js +52 -0
- package/dist/server/sessions/authProviderOptions.js.map +1 -0
- package/dist/server/sessions/authRoutes.js +75 -0
- package/dist/server/sessions/authRoutes.js.map +1 -0
- package/dist/server/sessions/authService.js +105 -0
- package/dist/server/sessions/authService.js.map +1 -0
- package/dist/server/sessions/builtinCommands.js +31 -0
- package/dist/server/sessions/builtinCommands.js.map +1 -0
- package/dist/server/sessions/editPreview.js +196 -0
- package/dist/server/sessions/editPreview.js.map +1 -0
- package/dist/server/sessions/editTool.js +46 -0
- package/dist/server/sessions/editTool.js.map +1 -0
- package/dist/server/sessions/messagePaging.js +41 -0
- package/dist/server/sessions/messagePaging.js.map +1 -0
- package/dist/server/sessions/oauthLoginFlowService.js +136 -0
- package/dist/server/sessions/oauthLoginFlowService.js.map +1 -0
- package/dist/server/sessions/piAgentSession.js +472 -0
- package/dist/server/sessions/piAgentSession.js.map +1 -0
- package/dist/server/sessions/piSessionManagerGateway.js +133 -0
- package/dist/server/sessions/piSessionManagerGateway.js.map +1 -0
- package/dist/server/sessions/piSessionService.js +1737 -0
- package/dist/server/sessions/piSessionService.js.map +1 -0
- package/dist/server/sessions/schedulePrompt/schedulePromptService.js +46 -0
- package/dist/server/sessions/schedulePrompt/schedulePromptService.js.map +1 -0
- package/dist/server/sessions/schedulePrompt/scheduler.js +317 -0
- package/dist/server/sessions/schedulePrompt/scheduler.js.map +1 -0
- package/dist/server/sessions/schedulePrompt/storage.js +118 -0
- package/dist/server/sessions/schedulePrompt/storage.js.map +1 -0
- package/dist/server/sessions/schedulePrompt/tool.js +251 -0
- package/dist/server/sessions/schedulePrompt/tool.js.map +1 -0
- package/dist/server/sessions/schedulePrompt/types.js +2 -0
- package/dist/server/sessions/schedulePrompt/types.js.map +1 -0
- package/dist/server/sessions/sessionArchiveHelpers.js +186 -0
- package/dist/server/sessions/sessionArchiveHelpers.js.map +1 -0
- package/dist/server/sessions/sessionArchiveStore.js +254 -0
- package/dist/server/sessions/sessionArchiveStore.js.map +1 -0
- package/dist/server/sessions/sessionArchiveTree.js +35 -0
- package/dist/server/sessions/sessionArchiveTree.js.map +1 -0
- package/dist/server/sessions/sessionCleanup.js +157 -0
- package/dist/server/sessions/sessionCleanup.js.map +1 -0
- package/dist/server/sessions/sessionCommandService.js +349 -0
- package/dist/server/sessions/sessionCommandService.js.map +1 -0
- package/dist/server/sessions/sessionEventMapper.js +115 -0
- package/dist/server/sessions/sessionEventMapper.js.map +1 -0
- package/dist/server/sessions/sessionNameGenerator.js +61 -0
- package/dist/server/sessions/sessionNameGenerator.js.map +1 -0
- package/dist/server/sessions/sessionRoutes.js +419 -0
- package/dist/server/sessions/sessionRoutes.js.map +1 -0
- package/dist/server/sessions/sessionRuntimeStore.js +2 -0
- package/dist/server/sessions/sessionRuntimeStore.js.map +1 -0
- package/dist/server/sessions/spawnSessionTool.js +41 -0
- package/dist/server/sessions/spawnSessionTool.js.map +1 -0
- package/dist/server/sessions/spawnSubsessionTool.js +203 -0
- package/dist/server/sessions/spawnSubsessionTool.js.map +1 -0
- package/dist/server/sessions/spawnTargetResolver.js +36 -0
- package/dist/server/sessions/spawnTargetResolver.js.map +1 -0
- package/dist/server/sessions/subsessionLinks.js +171 -0
- package/dist/server/sessions/subsessionLinks.js.map +1 -0
- package/dist/server/sessions/subsessionTranscript.js +233 -0
- package/dist/server/sessions/subsessionTranscript.js.map +1 -0
- package/dist/server/storage/projectStore.js +83 -0
- package/dist/server/storage/projectStore.js.map +1 -0
- package/dist/server/terminalProxyRoutes.js +168 -0
- package/dist/server/terminalProxyRoutes.js.map +1 -0
- package/dist/server/terminals/terminalRoutes.js +177 -0
- package/dist/server/terminals/terminalRoutes.js.map +1 -0
- package/dist/server/terminals/terminalService.js +309 -0
- package/dist/server/terminals/terminalService.js.map +1 -0
- package/dist/server/terminals/terminalSize.js +17 -0
- package/dist/server/terminals/terminalSize.js.map +1 -0
- package/dist/server/testUtils.js +43 -0
- package/dist/server/testUtils.js.map +1 -0
- package/dist/server/types.js +2 -0
- package/dist/server/types.js.map +1 -0
- package/dist/server/utils.js +2 -0
- package/dist/server/utils.js.map +1 -0
- package/dist/server/webSocketBridge.js +55 -0
- package/dist/server/webSocketBridge.js.map +1 -0
- package/dist/server/workingDirectory.js +44 -0
- package/dist/server/workingDirectory.js.map +1 -0
- package/dist/server/workspaceExplorerRoutes.js +148 -0
- package/dist/server/workspaceExplorerRoutes.js.map +1 -0
- package/dist/server/workspaces/effectivePathAccess.js +27 -0
- package/dist/server/workspaces/effectivePathAccess.js.map +1 -0
- package/dist/server/workspaces/fileContentService.js +200 -0
- package/dist/server/workspaces/fileContentService.js.map +1 -0
- package/dist/server/workspaces/fileSuggestions.js +512 -0
- package/dist/server/workspaces/fileSuggestions.js.map +1 -0
- package/dist/server/workspaces/fileTreeService.js +27 -0
- package/dist/server/workspaces/fileTreeService.js.map +1 -0
- package/dist/server/workspaces/gitWorktreeDiscovery.js +34 -0
- package/dist/server/workspaces/gitWorktreeDiscovery.js.map +1 -0
- package/dist/server/workspaces/imagePreviewService.js +40 -0
- package/dist/server/workspaces/imagePreviewService.js.map +1 -0
- package/dist/server/workspaces/pathAccessPolicy.js +87 -0
- package/dist/server/workspaces/pathAccessPolicy.js.map +1 -0
- package/dist/server/workspaces/pathSafety.js +54 -0
- package/dist/server/workspaces/pathSafety.js.map +1 -0
- package/dist/server/workspaces/projectOmpWebConfig.js +56 -0
- package/dist/server/workspaces/projectOmpWebConfig.js.map +1 -0
- package/dist/server/workspaces/projectPiWebConfig.js +61 -0
- package/dist/server/workspaces/projectPiWebConfig.js.map +1 -0
- package/dist/server/workspaces/workspaceContext.js +8 -0
- package/dist/server/workspaces/workspaceContext.js.map +1 -0
- package/dist/server/workspaces/workspaceDeletionRoutes.js +113 -0
- package/dist/server/workspaces/workspaceDeletionRoutes.js.map +1 -0
- package/dist/server/workspaces/workspaceService.js +39 -0
- package/dist/server/workspaces/workspaceService.js.map +1 -0
- package/dist/sessiond/config.js +9 -0
- package/dist/sessiond/config.js.map +1 -0
- package/dist/sessiond/sessionDaemonClient.js +34 -0
- package/dist/sessiond/sessionDaemonClient.js.map +1 -0
- package/dist/shared/activity.js +26 -0
- package/dist/shared/activity.js.map +1 -0
- package/dist/shared/apiTypes.d.ts +769 -0
- package/dist/shared/apiTypes.js +11 -0
- package/dist/shared/apiTypes.js.map +1 -0
- package/dist/shared/capabilities.js +52 -0
- package/dist/shared/capabilities.js.map +1 -0
- package/dist/shared/federatedRoutes.js +81 -0
- package/dist/shared/federatedRoutes.js.map +1 -0
- package/dist/shared/machinePluginIds.js +41 -0
- package/dist/shared/machinePluginIds.js.map +1 -0
- package/dist/shared/ompWebStatusParsing.js +100 -0
- package/dist/shared/ompWebStatusParsing.js.map +1 -0
- package/dist/shared/piWebStatusParsing.js +102 -0
- package/dist/shared/piWebStatusParsing.js.map +1 -0
- package/dist/shared/pluginIds.js +5 -0
- package/dist/shared/pluginIds.js.map +1 -0
- package/dist/shared/promptAttachments.js +90 -0
- package/dist/shared/promptAttachments.js.map +1 -0
- package/dist/shared/thinkingLevels.d.ts +19 -0
- package/dist/shared/thinkingLevels.js +24 -0
- package/dist/shared/thinkingLevels.js.map +1 -0
- package/dist/shared/utils.js +10 -0
- package/dist/shared/utils.js.map +1 -0
- package/dist/shared/workspaceDeletion.js +12 -0
- package/dist/shared/workspaceDeletion.js.map +1 -0
- package/dist/shared/workspaceFiles.js +3 -0
- package/dist/shared/workspaceFiles.js.map +1 -0
- package/docs/assets/favicon.svg +11 -0
- package/docs/assets/omp-web-banner.png +0 -0
- package/docs/assets/omp-web-desktop.png +0 -0
- package/docs/assets/omp-web-mobile.png +0 -0
- package/docs/assets/omp-web-tablet.png +0 -0
- package/docs/config.md +208 -0
- package/docs/plugins.md +916 -0
- package/extensions/omp-web.ts +133 -0
- package/install.sh +5 -0
- package/package.json +134 -0
- package/plugin-api/unstable.d.ts +1 -0
- package/plugin-api.d.ts +1 -0
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { machineScopedPluginId, parseMachineScopedPluginId } from "../../shared/machinePluginIds.js";
|
|
2
|
+
import { isOmpWebPluginId } from "../../shared/pluginIds.js";
|
|
3
|
+
import { MachineService } from "./machineService.js";
|
|
4
|
+
import { filterSafeHeaders, sendGatewayErrorResponse } from "./proxyUtils.js";
|
|
5
|
+
import { isRecord } from "../utils.js";
|
|
6
|
+
const MACHINE_PLUGIN_MANIFEST_TIMEOUT_MS = 10_000;
|
|
7
|
+
export function registerMachinePluginProxyRoutes(app, machines = new MachineService()) {
|
|
8
|
+
app.get("/api/machines/:machineId/omp-web-plugins/manifest.json", async (c) => {
|
|
9
|
+
const machineId = c.req.param("machineId");
|
|
10
|
+
if (machineId === "local")
|
|
11
|
+
return c.json({ plugins: [] });
|
|
12
|
+
const client = await machines.remoteClient(machineId);
|
|
13
|
+
if (client === undefined)
|
|
14
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
15
|
+
try {
|
|
16
|
+
const response = await client.requestJson("GET", "/omp-web-plugins/manifest.json", undefined, { timeoutMs: MACHINE_PLUGIN_MANIFEST_TIMEOUT_MS });
|
|
17
|
+
if (response.statusCode === 404)
|
|
18
|
+
return c.json({ plugins: [] });
|
|
19
|
+
if (response.statusCode < 200 || response.statusCode >= 300) {
|
|
20
|
+
return c.json(response.body, response.statusCode);
|
|
21
|
+
}
|
|
22
|
+
return c.json(rewriteRemotePluginManifest(machineId, parseRemoteManifest(response.body)));
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
return sendGatewayErrorResponse(machineId, error);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
export async function proxyMachinePluginAsset(machines, scopedPluginId, assetPath, requestUrl) {
|
|
30
|
+
const remotePlugin = parseMachineScopedPluginId(scopedPluginId);
|
|
31
|
+
if (remotePlugin === undefined)
|
|
32
|
+
return null;
|
|
33
|
+
const client = await machines.remoteClient(remotePlugin.machineId);
|
|
34
|
+
if (client === undefined) {
|
|
35
|
+
return Response.json({ error: "Machine not found" }, { status: 404 });
|
|
36
|
+
}
|
|
37
|
+
const requestPath = remotePluginAssetRequestPath(remotePlugin, assetPath, requestUrl);
|
|
38
|
+
if (requestPath === undefined) {
|
|
39
|
+
return Response.json({ error: "Invalid remote PI WEB plugin asset path" }, { status: 400 });
|
|
40
|
+
}
|
|
41
|
+
try {
|
|
42
|
+
const upstream = await client.request("GET", requestPath);
|
|
43
|
+
const headers = filterSafeHeaders(upstream.headers);
|
|
44
|
+
return new Response(upstream.body, { status: upstream.statusCode, headers });
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
return sendGatewayErrorResponse(remotePlugin.machineId, error);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
function rewriteRemotePluginManifest(machineId, manifest) {
|
|
51
|
+
return {
|
|
52
|
+
plugins: manifest.plugins.flatMap((plugin) => {
|
|
53
|
+
const modulePath = remotePluginModulePath(plugin.id, plugin.module);
|
|
54
|
+
if (modulePath === undefined)
|
|
55
|
+
return [];
|
|
56
|
+
return [{
|
|
57
|
+
...plugin,
|
|
58
|
+
module: `/omp-web-plugins/${encodeURIComponent(machineScopedPluginId(machineId, plugin.id))}/${modulePath.path}${modulePath.query}`,
|
|
59
|
+
}];
|
|
60
|
+
}),
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
function remotePluginModulePath(pluginId, module) {
|
|
64
|
+
if (!isOmpWebPluginId(pluginId))
|
|
65
|
+
return undefined;
|
|
66
|
+
const prefix = `/omp-web-plugins/${encodeURIComponent(pluginId)}/`;
|
|
67
|
+
const base = new URL(prefix, "http://omp-web.local");
|
|
68
|
+
try {
|
|
69
|
+
const url = new URL(module, base);
|
|
70
|
+
if (url.origin !== base.origin || !url.pathname.startsWith(prefix))
|
|
71
|
+
return undefined;
|
|
72
|
+
const path = safeRemotePluginAssetPath(url.pathname.slice(prefix.length));
|
|
73
|
+
return path === undefined ? undefined : { path, query: url.search };
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
return undefined;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
function remotePluginAssetRequestPath(remotePlugin, assetPath, requestUrl) {
|
|
80
|
+
const path = safeRemotePluginAssetPath(assetPath);
|
|
81
|
+
if (path === undefined)
|
|
82
|
+
return undefined;
|
|
83
|
+
const query = requestUrl.includes("?") ? requestUrl.slice(requestUrl.indexOf("?")) : "";
|
|
84
|
+
return `/omp-web-plugins/${encodeURIComponent(remotePlugin.pluginId)}/${path}${query}`;
|
|
85
|
+
}
|
|
86
|
+
function safeRemotePluginAssetPath(path) {
|
|
87
|
+
const segments = [];
|
|
88
|
+
for (const rawSegment of path.split("/")) {
|
|
89
|
+
const segment = safeRemotePluginAssetPathSegment(rawSegment);
|
|
90
|
+
if (segment === undefined)
|
|
91
|
+
return undefined;
|
|
92
|
+
if (segment === "")
|
|
93
|
+
continue;
|
|
94
|
+
segments.push(segment);
|
|
95
|
+
}
|
|
96
|
+
if (segments.length === 0)
|
|
97
|
+
return undefined;
|
|
98
|
+
return segments.map((segment) => encodeURIComponent(segment)).join("/");
|
|
99
|
+
}
|
|
100
|
+
function safeRemotePluginAssetPathSegment(rawSegment) {
|
|
101
|
+
if (rawSegment === "" || rawSegment === ".")
|
|
102
|
+
return "";
|
|
103
|
+
if (/%(?:2f|5c)/iu.test(rawSegment))
|
|
104
|
+
return undefined;
|
|
105
|
+
let segment;
|
|
106
|
+
try {
|
|
107
|
+
segment = decodeURIComponent(rawSegment);
|
|
108
|
+
}
|
|
109
|
+
catch {
|
|
110
|
+
return undefined;
|
|
111
|
+
}
|
|
112
|
+
if (segment === "" || segment === ".")
|
|
113
|
+
return "";
|
|
114
|
+
if (segment === ".." || segment.includes("/") || segment.includes("\\") || hasControlCharacter(segment))
|
|
115
|
+
return undefined;
|
|
116
|
+
return segment;
|
|
117
|
+
}
|
|
118
|
+
function hasControlCharacter(value) {
|
|
119
|
+
for (let index = 0; index < value.length; index += 1) {
|
|
120
|
+
const code = value.charCodeAt(index);
|
|
121
|
+
if (code <= 0x1f || code === 0x7f)
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
function parseRemoteManifest(value) {
|
|
127
|
+
if (!isRecord(value) || !Array.isArray(value["plugins"]))
|
|
128
|
+
throw new Error("Invalid remote PI WEB plugin manifest");
|
|
129
|
+
return {
|
|
130
|
+
plugins: value["plugins"].map((entry) => {
|
|
131
|
+
if (!isRecord(entry) || typeof entry["id"] !== "string" || !isOmpWebPluginId(entry["id"]) || typeof entry["module"] !== "string" || entry["module"] === "") {
|
|
132
|
+
throw new Error("Invalid remote PI WEB plugin manifest entry");
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
id: entry["id"],
|
|
136
|
+
module: entry["module"],
|
|
137
|
+
...(typeof entry["source"] === "string" ? { source: entry["source"] } : {}),
|
|
138
|
+
...(typeof entry["scope"] === "string" ? { scope: entry["scope"] } : {}),
|
|
139
|
+
...(parseRemoteMachineSpecific(entry["machineSpecific"])),
|
|
140
|
+
};
|
|
141
|
+
}),
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
function parseRemoteMachineSpecific(value) {
|
|
145
|
+
if (value === undefined)
|
|
146
|
+
return {};
|
|
147
|
+
if (typeof value !== "boolean")
|
|
148
|
+
throw new Error("Invalid remote PI WEB plugin manifest entry");
|
|
149
|
+
return { machineSpecific: value };
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=machinePluginProxyRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"machinePluginProxyRoutes.js","sourceRoot":"","sources":["../../../src/server/machines/machinePluginProxyRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { FEDERATED_HTTP_ROUTES, FEDERATED_WEBSOCKET_ROUTES } from "../../shared/federatedRoutes.js";
|
|
2
|
+
import { mergeSelectedMachineConfig, parseOmpWebConfigResponseBody, parseSelectedMachineConfigRequest, selectedMachineConfigResponse } from "../configRoutes.js";
|
|
3
|
+
import { bridgeHonoSocketToUpstream } from "../webSocketBridge.js";
|
|
4
|
+
import { MachineService } from "./machineService.js";
|
|
5
|
+
import { filterSafeHeaders, sendGatewayErrorResponse } from "./proxyUtils.js";
|
|
6
|
+
import { errorMessage, isRecord } from "../utils.js";
|
|
7
|
+
export const REMOTE_HTTP_ROUTES = FEDERATED_HTTP_ROUTES;
|
|
8
|
+
export const REMOTE_WEBSOCKET_ROUTES = FEDERATED_WEBSOCKET_ROUTES;
|
|
9
|
+
export function registerMachineProxyRoutes(app, machines = new MachineService(), upgradeWebSocket) {
|
|
10
|
+
for (const spec of REMOTE_HTTP_ROUTES) {
|
|
11
|
+
const routePath = `/api/machines/:machineId${spec.path}`;
|
|
12
|
+
const handler = async (c) => {
|
|
13
|
+
const machineId = c.req.param("machineId") ?? "";
|
|
14
|
+
const method = c.req.method;
|
|
15
|
+
const contentType = c.req.header("content-type");
|
|
16
|
+
let body;
|
|
17
|
+
if (method !== "GET" && method !== "HEAD") {
|
|
18
|
+
if (contentType?.includes("application/octet-stream") || contentType?.includes("image/")) {
|
|
19
|
+
body = Buffer.from(await c.req.raw.arrayBuffer());
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
body = await c.req.raw.json().catch(() => undefined);
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return proxyHttpRequest(machines, spec, machineId, method, c.req.url, body, contentType);
|
|
26
|
+
};
|
|
27
|
+
if (spec.method === "GET")
|
|
28
|
+
app.get(routePath, handler);
|
|
29
|
+
else if (spec.method === "POST")
|
|
30
|
+
app.post(routePath, handler);
|
|
31
|
+
else if (spec.method === "PUT")
|
|
32
|
+
app.put(routePath, handler);
|
|
33
|
+
else if (spec.method === "DELETE")
|
|
34
|
+
app.delete(routePath, handler);
|
|
35
|
+
}
|
|
36
|
+
if (upgradeWebSocket !== undefined) {
|
|
37
|
+
for (const path of REMOTE_WEBSOCKET_ROUTES) {
|
|
38
|
+
app.get(`/api/machines/:machineId${path}`, upgradeWebSocket((c) => {
|
|
39
|
+
const machineId = c.req.param("machineId") ?? "";
|
|
40
|
+
let upstream;
|
|
41
|
+
return {
|
|
42
|
+
async onOpen(_evt, ws) {
|
|
43
|
+
if (machineId === "local") {
|
|
44
|
+
ws.close(1011, "Local machine route is not registered for this endpoint");
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
const client = await machines.remoteClient(machineId);
|
|
48
|
+
if (client === undefined) {
|
|
49
|
+
ws.close(1011, "Remote machine not found");
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
try {
|
|
53
|
+
upstream = client.connectWebSocket(remoteApiPath(machineId, c.req.url));
|
|
54
|
+
bridgeHonoSocketToUpstream(ws, upstream);
|
|
55
|
+
}
|
|
56
|
+
catch {
|
|
57
|
+
ws.close(1011, "Remote machine unavailable");
|
|
58
|
+
}
|
|
59
|
+
},
|
|
60
|
+
onClose() {
|
|
61
|
+
upstream?.close();
|
|
62
|
+
},
|
|
63
|
+
onError() {
|
|
64
|
+
upstream?.close();
|
|
65
|
+
},
|
|
66
|
+
};
|
|
67
|
+
}));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
async function proxyHttpRequest(machines, spec, machineId, method, requestUrl, body, contentType) {
|
|
72
|
+
if (machineId === "local") {
|
|
73
|
+
return Response.json({ error: "Local machine route is not registered for this endpoint" }, { status: 501 });
|
|
74
|
+
}
|
|
75
|
+
const client = await machines.remoteClient(machineId);
|
|
76
|
+
if (client === undefined) {
|
|
77
|
+
return Response.json({ error: "Machine not found" }, { status: 404 });
|
|
78
|
+
}
|
|
79
|
+
try {
|
|
80
|
+
const remotePath = remoteApiPath(machineId, requestUrl);
|
|
81
|
+
if (spec.path === "/config")
|
|
82
|
+
return await proxySelectedMachineConfigRequest(client, machineId, method, remotePath, body);
|
|
83
|
+
const requestOptions = proxyRequestOptions(spec, body, contentType);
|
|
84
|
+
const upstream = requestOptions === undefined
|
|
85
|
+
? await client.request(method, remotePath, body)
|
|
86
|
+
: await client.request(method, remotePath, body, requestOptions);
|
|
87
|
+
const headers = filterSafeHeaders(upstream.headers);
|
|
88
|
+
return new Response(upstream.body, { status: upstream.statusCode, headers });
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
if (isSelectedMachineConfigRequestError(error))
|
|
92
|
+
return Response.json({ error: errorMessage(error) }, { status: 400 });
|
|
93
|
+
return sendGatewayErrorResponse(machineId, error);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async function proxySelectedMachineConfigRequest(client, machineId, method, remotePath, body) {
|
|
97
|
+
if (method === "GET") {
|
|
98
|
+
return sendSelectedMachineConfigResponse(await client.requestJson("GET", remotePath), machineId);
|
|
99
|
+
}
|
|
100
|
+
if (method === "PUT") {
|
|
101
|
+
const patch = parseSelectedMachineConfigRequest(configPayload(body));
|
|
102
|
+
const currentResponse = await client.requestJson("GET", remotePath);
|
|
103
|
+
if (!isSuccessfulStatus(currentResponse.statusCode))
|
|
104
|
+
return sendUpstreamJsonResponse(currentResponse, machineId);
|
|
105
|
+
const current = parseOmpWebConfigResponseBody(currentResponse.body, "Remote machine config response");
|
|
106
|
+
const merged = mergeSelectedMachineConfig(current.config, patch);
|
|
107
|
+
return sendSelectedMachineConfigResponse(await client.requestJson("PUT", remotePath, { config: merged }), machineId);
|
|
108
|
+
}
|
|
109
|
+
return Response.json({ error: "Method not allowed" }, { status: 405 });
|
|
110
|
+
}
|
|
111
|
+
function configPayload(body) {
|
|
112
|
+
return isRecord(body) ? body["config"] : undefined;
|
|
113
|
+
}
|
|
114
|
+
function sendSelectedMachineConfigResponse(upstream, machineId) {
|
|
115
|
+
if (!isSuccessfulStatus(upstream.statusCode))
|
|
116
|
+
return sendUpstreamJsonResponse(upstream, machineId);
|
|
117
|
+
const headers = filterSafeHeaders(upstream.headers);
|
|
118
|
+
const data = selectedMachineConfigResponse(parseOmpWebConfigResponseBody(upstream.body, "Remote machine config response"));
|
|
119
|
+
return Response.json(data, { status: upstream.statusCode, headers });
|
|
120
|
+
}
|
|
121
|
+
function sendUpstreamJsonResponse(upstream, machineId) {
|
|
122
|
+
const headers = filterSafeHeaders(upstream.headers);
|
|
123
|
+
const payload = upstream.body ?? { error: "Remote machine config request failed", machineId, statusCode: upstream.statusCode };
|
|
124
|
+
return Response.json(payload, { status: upstream.statusCode, headers });
|
|
125
|
+
}
|
|
126
|
+
function isSuccessfulStatus(statusCode) {
|
|
127
|
+
return statusCode >= 200 && statusCode < 300;
|
|
128
|
+
}
|
|
129
|
+
function remoteApiPath(machineId, requestUrl) {
|
|
130
|
+
const machinePrefix = `/api/machines/${encodeURIComponent(machineId)}`;
|
|
131
|
+
const url = new URL(requestUrl, "http://localhost");
|
|
132
|
+
const fullPath = url.pathname + url.search;
|
|
133
|
+
const stripped = fullPath.startsWith(machinePrefix) ? fullPath.slice(machinePrefix.length) : fullPath;
|
|
134
|
+
const compatPath = stripped.startsWith("/") ? stripped : `/${stripped}`;
|
|
135
|
+
return `/api${compatPath}`;
|
|
136
|
+
}
|
|
137
|
+
function proxyRequestOptions(spec, body, contentType) {
|
|
138
|
+
const options = {};
|
|
139
|
+
if (spec.timeoutMs !== undefined)
|
|
140
|
+
options.timeoutMs = spec.timeoutMs;
|
|
141
|
+
if (isRawProxyBody(body) && contentType !== undefined && contentType !== "") {
|
|
142
|
+
options.contentType = contentType;
|
|
143
|
+
}
|
|
144
|
+
return Object.keys(options).length === 0 ? undefined : options;
|
|
145
|
+
}
|
|
146
|
+
function isRawProxyBody(body) {
|
|
147
|
+
return typeof body === "string" || body instanceof ArrayBuffer || ArrayBuffer.isView(body);
|
|
148
|
+
}
|
|
149
|
+
function isSelectedMachineConfigRequestError(error) {
|
|
150
|
+
return error instanceof Error && error.message.startsWith("PI WEB selected-machine config");
|
|
151
|
+
}
|
|
152
|
+
//# sourceMappingURL=machineProxyRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"machineProxyRoutes.js","sourceRoot":"","sources":["../../../src/server/machines/machineProxyRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { MachineService } from "./machineService.js";
|
|
2
|
+
import { errorMessage } from "../utils.js";
|
|
3
|
+
export function registerMachineRoutes(app, machines = new MachineService()) {
|
|
4
|
+
app.get("/api/machines", async (c) => c.json({ machines: await machines.list() }));
|
|
5
|
+
app.post("/api/machines", async (c) => {
|
|
6
|
+
try {
|
|
7
|
+
const body = await c.req.json();
|
|
8
|
+
return c.json(await machines.add(body));
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
return c.json({ error: errorMessage(error) }, 400);
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
app.get("/api/machines/:machineId/health", async (c) => {
|
|
15
|
+
const machineId = c.req.param("machineId");
|
|
16
|
+
const health = await machines.health(machineId);
|
|
17
|
+
if (health === undefined)
|
|
18
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
19
|
+
return c.json(health);
|
|
20
|
+
});
|
|
21
|
+
app.get("/api/machines/:machineId/runtime", async (c) => {
|
|
22
|
+
const machineId = c.req.param("machineId");
|
|
23
|
+
const runtime = await machines.runtime(machineId);
|
|
24
|
+
if (runtime === undefined)
|
|
25
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
26
|
+
return c.json(runtime);
|
|
27
|
+
});
|
|
28
|
+
app.get("/api/machines/:machineId", async (c) => {
|
|
29
|
+
const machineId = c.req.param("machineId");
|
|
30
|
+
const machine = await machines.get(machineId);
|
|
31
|
+
if (machine === undefined)
|
|
32
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
33
|
+
return c.json(machine);
|
|
34
|
+
});
|
|
35
|
+
app.patch("/api/machines/:machineId", async (c) => {
|
|
36
|
+
try {
|
|
37
|
+
const machineId = c.req.param("machineId");
|
|
38
|
+
const body = await c.req.json();
|
|
39
|
+
const machine = await machines.update(machineId, body);
|
|
40
|
+
if (machine === undefined)
|
|
41
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
42
|
+
return c.json(machine);
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
return c.json({ error: errorMessage(error) }, 400);
|
|
46
|
+
}
|
|
47
|
+
});
|
|
48
|
+
app.delete("/api/machines/:machineId", async (c) => {
|
|
49
|
+
try {
|
|
50
|
+
const machineId = c.req.param("machineId");
|
|
51
|
+
const removed = await machines.remove(machineId);
|
|
52
|
+
if (!removed)
|
|
53
|
+
return c.json({ error: "Machine not found" }, 404);
|
|
54
|
+
return c.json({ deleted: true });
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
return c.json({ error: errorMessage(error) }, 400);
|
|
58
|
+
}
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=machineRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"machineRoutes.js","sourceRoot":"","sources":["../../../src/server/machines/machineRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { parseOmpWebRuntimeResponse } from "../../shared/ompWebStatusParsing.js";
|
|
2
|
+
import { getOmpWebRuntime } from "../ompWebStatus.js";
|
|
3
|
+
import { DEFAULT_REMOTE_HEALTH_TIMEOUT_MS, RemoteMachineClient, validateConfiguredMachineHeaders } from "./machineClient.js";
|
|
4
|
+
import { MachineStore } from "./machineStore.js";
|
|
5
|
+
import { errorMessage, isRecord } from "../utils.js";
|
|
6
|
+
const LOCAL_MACHINE_TIMESTAMP = "1970-01-01T00:00:00.000Z";
|
|
7
|
+
const DEFAULT_HEALTH_CACHE_TTL_MS = 5_000;
|
|
8
|
+
export class MachineService {
|
|
9
|
+
constructor(store = new MachineStore(), deps = {}) {
|
|
10
|
+
this.store = store;
|
|
11
|
+
this.deps = deps;
|
|
12
|
+
this.healthCache = new Map();
|
|
13
|
+
this.runtimeCache = new Map();
|
|
14
|
+
}
|
|
15
|
+
async list() {
|
|
16
|
+
return [localMachine(), ...(await this.store.list()).map(publicMachine)];
|
|
17
|
+
}
|
|
18
|
+
async get(id) {
|
|
19
|
+
if (id === "local")
|
|
20
|
+
return localMachine();
|
|
21
|
+
const machine = (await this.store.list()).find((stored) => stored.id === id);
|
|
22
|
+
return machine === undefined ? undefined : publicMachine(machine);
|
|
23
|
+
}
|
|
24
|
+
async add(input) {
|
|
25
|
+
const name = validateName(input.name);
|
|
26
|
+
const baseUrl = validateBaseUrl(input.baseUrl);
|
|
27
|
+
const stored = await this.store.add({ name, baseUrl, ...optionalSecrets(input) });
|
|
28
|
+
return publicMachine(stored);
|
|
29
|
+
}
|
|
30
|
+
async update(id, input) {
|
|
31
|
+
if (id === "local")
|
|
32
|
+
throw new Error("Local machine cannot be changed");
|
|
33
|
+
const patch = {};
|
|
34
|
+
if (input.name !== undefined)
|
|
35
|
+
patch.name = validateName(input.name);
|
|
36
|
+
if (input.baseUrl !== undefined)
|
|
37
|
+
patch.baseUrl = validateBaseUrl(input.baseUrl);
|
|
38
|
+
if (input.token !== undefined)
|
|
39
|
+
patch.token = input.token;
|
|
40
|
+
if (input.headers !== undefined)
|
|
41
|
+
patch.headers = validateHeaders(input.headers);
|
|
42
|
+
const stored = await this.store.update(id, patch);
|
|
43
|
+
if (stored !== undefined) {
|
|
44
|
+
this.healthCache.delete(id);
|
|
45
|
+
this.runtimeCache.delete(id);
|
|
46
|
+
}
|
|
47
|
+
return stored === undefined ? undefined : publicMachine(stored);
|
|
48
|
+
}
|
|
49
|
+
async remove(id) {
|
|
50
|
+
if (id === "local")
|
|
51
|
+
throw new Error("Local machine cannot be deleted");
|
|
52
|
+
const removed = await this.store.remove(id);
|
|
53
|
+
if (removed) {
|
|
54
|
+
this.healthCache.delete(id);
|
|
55
|
+
this.runtimeCache.delete(id);
|
|
56
|
+
}
|
|
57
|
+
return removed;
|
|
58
|
+
}
|
|
59
|
+
async storedRemote(id) {
|
|
60
|
+
if (id === "local")
|
|
61
|
+
return undefined;
|
|
62
|
+
return (await this.store.list()).find((machine) => machine.id === id);
|
|
63
|
+
}
|
|
64
|
+
async remoteClient(id) {
|
|
65
|
+
const machine = await this.storedRemote(id);
|
|
66
|
+
return machine === undefined ? undefined : this.clientFor(machine);
|
|
67
|
+
}
|
|
68
|
+
async health(id) {
|
|
69
|
+
const cached = this.healthCache.get(id);
|
|
70
|
+
const now = Date.now();
|
|
71
|
+
if (cached !== undefined && cached.expiresAt > now)
|
|
72
|
+
return cached.health;
|
|
73
|
+
const health = id === "local" ? await this.localHealth() : await this.remoteHealth(id);
|
|
74
|
+
if (health === undefined)
|
|
75
|
+
return undefined;
|
|
76
|
+
this.healthCache.set(id, { expiresAt: now + DEFAULT_HEALTH_CACHE_TTL_MS, health });
|
|
77
|
+
return health;
|
|
78
|
+
}
|
|
79
|
+
async runtime(id) {
|
|
80
|
+
const cached = this.runtimeCache.get(id);
|
|
81
|
+
const now = Date.now();
|
|
82
|
+
if (cached !== undefined && cached.expiresAt > now)
|
|
83
|
+
return cached.runtime;
|
|
84
|
+
const runtime = id === "local" ? await this.localRuntime() : await this.remoteRuntime(id);
|
|
85
|
+
if (runtime === undefined)
|
|
86
|
+
return undefined;
|
|
87
|
+
this.runtimeCache.set(id, { expiresAt: now + DEFAULT_HEALTH_CACHE_TTL_MS, runtime });
|
|
88
|
+
return runtime;
|
|
89
|
+
}
|
|
90
|
+
async localHealth() {
|
|
91
|
+
const checkedAt = new Date().toISOString();
|
|
92
|
+
try {
|
|
93
|
+
const runtime = await (this.deps.localRuntime ?? getOmpWebRuntime)();
|
|
94
|
+
return {
|
|
95
|
+
machineId: "local",
|
|
96
|
+
ok: true,
|
|
97
|
+
checkedAt,
|
|
98
|
+
status: "online",
|
|
99
|
+
web: componentStatusFromRuntime(runtime.components.web),
|
|
100
|
+
sessiond: componentStatusFromRuntime(runtime.components.sessiond),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
catch (error) {
|
|
104
|
+
return { machineId: "local", ok: false, checkedAt, status: "error", error: errorMessage(error) };
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
async remoteHealth(id) {
|
|
108
|
+
const machine = await this.storedRemote(id);
|
|
109
|
+
if (machine === undefined)
|
|
110
|
+
return undefined;
|
|
111
|
+
const checkedAt = new Date().toISOString();
|
|
112
|
+
try {
|
|
113
|
+
const response = await this.clientFor(machine).requestJson("GET", "/api/omp-web/status", undefined, { timeoutMs: DEFAULT_REMOTE_HEALTH_TIMEOUT_MS });
|
|
114
|
+
if (response.statusCode >= 200 && response.statusCode < 300 && isOmpWebStatusResponse(response.body)) {
|
|
115
|
+
return { machineId: id, ok: true, checkedAt, status: "online", web: response.body.components.web, sessiond: response.body.components.sessiond };
|
|
116
|
+
}
|
|
117
|
+
return { machineId: id, ok: false, checkedAt, status: "error", error: `Remote health returned HTTP ${String(response.statusCode)}` };
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
return { machineId: id, ok: false, checkedAt, status: "offline", error: errorMessage(error) };
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
async localRuntime() {
|
|
124
|
+
const checkedAt = new Date().toISOString();
|
|
125
|
+
try {
|
|
126
|
+
return machineRuntime("local", checkedAt, await (this.deps.localRuntime ?? getOmpWebRuntime)());
|
|
127
|
+
}
|
|
128
|
+
catch (error) {
|
|
129
|
+
return { machineId: "local", ok: false, checkedAt, error: errorMessage(error) };
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
async remoteRuntime(id) {
|
|
133
|
+
const machine = await this.storedRemote(id);
|
|
134
|
+
if (machine === undefined)
|
|
135
|
+
return undefined;
|
|
136
|
+
const checkedAt = new Date().toISOString();
|
|
137
|
+
try {
|
|
138
|
+
const response = await this.clientFor(machine).requestJson("GET", "/api/omp-web/runtime", undefined, { timeoutMs: DEFAULT_REMOTE_HEALTH_TIMEOUT_MS });
|
|
139
|
+
const runtime = parseOmpWebRuntimeResponse(response.body);
|
|
140
|
+
if (response.statusCode >= 200 && response.statusCode < 300 && runtime !== undefined)
|
|
141
|
+
return machineRuntime(id, checkedAt, runtime);
|
|
142
|
+
return { machineId: id, ok: false, checkedAt, error: `Remote runtime returned HTTP ${String(response.statusCode)}` };
|
|
143
|
+
}
|
|
144
|
+
catch (error) {
|
|
145
|
+
return { machineId: id, ok: false, checkedAt, error: errorMessage(error) };
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
clientFor(machine) {
|
|
149
|
+
return this.deps.remoteClientFactory?.(machine) ?? new RemoteMachineClient(machine);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
export function localMachine() {
|
|
153
|
+
return { id: "local", name: "Local", kind: "local", createdAt: LOCAL_MACHINE_TIMESTAMP, updatedAt: LOCAL_MACHINE_TIMESTAMP };
|
|
154
|
+
}
|
|
155
|
+
function publicMachine(machine) {
|
|
156
|
+
return { id: machine.id, name: machine.name, kind: "remote", baseUrl: machine.baseUrl, createdAt: machine.createdAt, updatedAt: machine.updatedAt };
|
|
157
|
+
}
|
|
158
|
+
function validateName(value) {
|
|
159
|
+
const name = value?.trim();
|
|
160
|
+
if (name === undefined || name === "")
|
|
161
|
+
throw new Error("Machine name is required");
|
|
162
|
+
return name;
|
|
163
|
+
}
|
|
164
|
+
function validateBaseUrl(value) {
|
|
165
|
+
const raw = value?.trim();
|
|
166
|
+
if (raw === undefined || raw === "")
|
|
167
|
+
throw new Error("Machine baseUrl is required");
|
|
168
|
+
let url;
|
|
169
|
+
try {
|
|
170
|
+
url = new URL(raw);
|
|
171
|
+
}
|
|
172
|
+
catch {
|
|
173
|
+
throw new Error("Machine baseUrl must be a valid URL");
|
|
174
|
+
}
|
|
175
|
+
if (url.protocol !== "http:" && url.protocol !== "https:")
|
|
176
|
+
throw new Error("Machine baseUrl must use http or https");
|
|
177
|
+
if (url.username !== "" || url.password !== "")
|
|
178
|
+
throw new Error("Machine baseUrl must not include credentials");
|
|
179
|
+
if (url.search !== "" || url.hash !== "")
|
|
180
|
+
throw new Error("Machine baseUrl must not include query or hash");
|
|
181
|
+
return url.href.replace(/\/$/u, "");
|
|
182
|
+
}
|
|
183
|
+
function optionalSecrets(input) {
|
|
184
|
+
return {
|
|
185
|
+
...(input.token === undefined ? {} : { token: input.token }),
|
|
186
|
+
...(input.headers === undefined ? {} : { headers: validateHeaders(input.headers) }),
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
function validateHeaders(value) {
|
|
190
|
+
return validateConfiguredMachineHeaders(value) ?? {};
|
|
191
|
+
}
|
|
192
|
+
function componentStatusFromRuntime(runtime) {
|
|
193
|
+
return {
|
|
194
|
+
component: runtime.component,
|
|
195
|
+
label: runtime.label,
|
|
196
|
+
...(runtime.runtimeVersion === undefined ? {} : { runtimeVersion: runtime.runtimeVersion }),
|
|
197
|
+
stale: false,
|
|
198
|
+
available: runtime.available,
|
|
199
|
+
...(runtime.error === undefined ? {} : { error: runtime.error }),
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
function machineRuntime(machineId, checkedAt, runtime) {
|
|
203
|
+
return {
|
|
204
|
+
machineId,
|
|
205
|
+
ok: true,
|
|
206
|
+
checkedAt,
|
|
207
|
+
packageName: runtime.packageName,
|
|
208
|
+
generatedAt: runtime.generatedAt,
|
|
209
|
+
components: runtime.components,
|
|
210
|
+
capabilities: runtime.capabilities,
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
function isOmpWebStatusResponse(value) {
|
|
214
|
+
if (!isRecord(value))
|
|
215
|
+
return false;
|
|
216
|
+
const components = value["components"];
|
|
217
|
+
if (!isRecord(components))
|
|
218
|
+
return false;
|
|
219
|
+
return isOmpWebComponentStatus(components["web"]) && isOmpWebComponentStatus(components["sessiond"]);
|
|
220
|
+
}
|
|
221
|
+
function isOmpWebComponentStatus(value) {
|
|
222
|
+
if (!isRecord(value))
|
|
223
|
+
return false;
|
|
224
|
+
const component = value["component"];
|
|
225
|
+
return (component === "web" || component === "sessiond")
|
|
226
|
+
&& typeof value["label"] === "string"
|
|
227
|
+
&& typeof value["stale"] === "boolean"
|
|
228
|
+
&& typeof value["available"] === "boolean";
|
|
229
|
+
}
|
|
230
|
+
//# sourceMappingURL=machineService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"machineService.js","sourceRoot":"","sources":["../../../src/server/machines/machineService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gCAAgC,EAAE,mBAAmB,EAAsB,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AACjJ,OAAO,EAAE,YAAY,EAAsB,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAgBrD,MAAM,uBAAuB,GAAG,0BAA0B,CAAC;AAC3D,MAAM,2BAA2B,GAAG,KAAK,CAAC;AAE1C,MAAM,OAAO,cAAc;IAIzB,YAA6B,QAAQ,IAAI,YAAY,EAAE,EAAmB,OAAmC,EAAE;QAAlF,UAAK,GAAL,KAAK,CAAqB;QAAmB,SAAI,GAAJ,IAAI,CAAiC;QAH9F,gBAAW,GAAG,IAAI,GAAG,EAAwD,CAAC;QAC9E,iBAAY,GAAG,IAAI,GAAG,EAA0D,CAAC;IAEiB,CAAC;IAEpH,KAAK,CAAC,IAAI;QACR,OAAO,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAClB,IAAI,EAAE,KAAK,OAAO;YAAE,OAAO,YAAY,EAAE,CAAC;QAC1C,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7E,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAyB;QACjC,MAAM,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAClF,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,KAAyB;QAChD,IAAI,EAAE,KAAK,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvE,MAAM,KAAK,GAA2E,EAAE,CAAC;QACzF,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;YAAE,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,KAAK,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChF,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS;YAAE,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QACzD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS;YAAE,KAAK,CAAC,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAChF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,IAAI,EAAE,KAAK,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAU;QAC3B,IAAI,EAAE,KAAK,OAAO;YAAE,OAAO,SAAS,CAAC;QACrC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAU;QAC3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC5C,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG;YAAE,OAAO,MAAM,CAAC,MAAM,CAAC;QAEzE,MAAM,MAAM,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACvF,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC3C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,2BAA2B,EAAE,MAAM,EAAE,CAAC,CAAC;QACnF,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,SAAS,GAAG,GAAG;YAAE,OAAO,MAAM,CAAC,OAAO,CAAC;QAE1E,MAAM,OAAO,GAAG,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC1F,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC5C,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,2BAA2B,EAAE,OAAO,EAAE,CAAC,CAAC;QACrF,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,WAAW;QACvB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,gBAAgB,CAAC,EAAE,CAAC;YACrE,OAAO;gBACL,SAAS,EAAE,OAAO;gBAClB,EAAE,EAAE,IAAI;gBACR,SAAS;gBACT,MAAM,EAAE,QAAQ;gBAChB,GAAG,EAAE,0BAA0B,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBACvD,QAAQ,EAAE,0BAA0B,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC;aAClE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACnG,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY,CAAC,EAAU;QACnC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gCAAgC,EAAE,CAAC,CAAC;YACrJ,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,IAAI,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrG,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAClJ,CAAC;YACD,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,+BAA+B,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QACvI,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QAChG,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,OAAO,cAAc,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,gBAAgB,CAAC,EAAE,CAAC,CAAC;QAClG,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QAClF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,EAAU;QACpC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,sBAAsB,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,gCAAgC,EAAE,CAAC,CAAC;YACtJ,MAAM,OAAO,GAAG,0BAA0B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,IAAI,QAAQ,CAAC,UAAU,GAAG,GAAG,IAAI,OAAO,KAAK,SAAS;gBAAE,OAAO,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;YACpI,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,gCAAgC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC;QACvH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7E,CAAC;IACH,CAAC;IAEO,SAAS,CAAC,OAAsB;QACtC,OAAO,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACtF,CAAC;CAEF;AACD,MAAM,UAAU,YAAY;IAC1B,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,uBAAuB,EAAE,SAAS,EAAE,uBAAuB,EAAE,CAAC;AAC/H,CAAC;AAED,SAAS,aAAa,CAAC,OAAsB;IAC3C,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AACtJ,CAAC;AAED,SAAS,YAAY,CAAC,KAAyB;IAC7C,MAAM,IAAI,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC3B,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,KAAyB;IAChD,MAAM,GAAG,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACpF,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IACrH,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE,IAAI,GAAG,CAAC,QAAQ,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAChH,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE,IAAI,GAAG,CAAC,IAAI,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IAC5G,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,SAAS,eAAe,CAAC,KAAyB;IAChD,OAAO;QACL,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5D,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;KACpF,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAA6B;IACpD,OAAO,gCAAgC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AACvD,CAAC;AAGD,SAAS,0BAA0B,CAAC,OAA+B;IACjE,OAAO;QACL,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,GAAG,CAAC,OAAO,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3F,KAAK,EAAE,KAAK;QACZ,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,SAAiB,EAAE,SAAiB,EAAE,OAA8B;IAC1F,OAAO;QACL,SAAS;QACT,EAAE,EAAE,IAAI;QACR,SAAS;QACT,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,KAAc;IAC5C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,uBAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,uBAAuB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC;AACvG,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnC,MAAM,SAAS,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IACrC,OAAO,CAAC,SAAS,KAAK,KAAK,IAAI,SAAS,KAAK,UAAU,CAAC;WACnD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,QAAQ;WAClC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,SAAS;WACnC,OAAO,KAAK,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;AAC/C,CAAC"}
|