nterminal 1.2.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/.env.example +12 -0
- package/LICENSE +674 -0
- package/README.md +181 -0
- package/assets/brand/app-icon-1024.png +0 -0
- package/assets/brand/app-icon-384.png +0 -0
- package/assets/brand/apple-touch-icon-360.png +0 -0
- package/assets/brand/favicon-32.png +0 -0
- package/assets/brand/favicon-64.png +0 -0
- package/assets/brand/favicon-96.png +0 -0
- package/assets/brand/favicon.svg +4 -0
- package/assets/brand/nterminal-mark-64.png +0 -0
- package/assets/brand/nterminal-mark.svg +4 -0
- package/assets/brand/nterminal-wordmark-486x68.png +0 -0
- package/assets/brand/nterminal-wordmark.svg +3 -0
- package/assets/screenshot/scr.png +0 -0
- package/bin/nterminal.js +114 -0
- package/dist/client/apple-touch-icon.png +0 -0
- package/dist/client/assets/MarkdownPreview-BeDi-V7k.js +29 -0
- package/dist/client/assets/MesloLGS-NF-Bold-Italic-DwFsXcwX.ttf +0 -0
- package/dist/client/assets/MesloLGS-NF-Bold-kN-HYz-g.ttf +0 -0
- package/dist/client/assets/MesloLGS-NF-Italic-CMg1T6-G.ttf +0 -0
- package/dist/client/assets/MesloLGS-NF-Regular-Cxr8pvCI.ttf +0 -0
- package/dist/client/assets/index-BQkKYjXb.js +33 -0
- package/dist/client/assets/index-WqeS39wU.css +1 -0
- package/dist/client/assets/notifications/character-2258.mp4 +0 -0
- package/dist/client/assets/notifications/character-2260.mp4 +0 -0
- package/dist/client/assets/notifications/character-2272.mp4 +0 -0
- package/dist/client/brand/nterminal-mark-64.png +0 -0
- package/dist/client/brand/nterminal-mark.svg +4 -0
- package/dist/client/brand/nterminal-wordmark-486x68.png +0 -0
- package/dist/client/brand/nterminal-wordmark.svg +3 -0
- package/dist/client/icons/app-icon-1024.png +0 -0
- package/dist/client/icons/app-icon-384.png +0 -0
- package/dist/client/icons/favicon-32.png +0 -0
- package/dist/client/icons/favicon-64.png +0 -0
- package/dist/client/icons/favicon-96.png +0 -0
- package/dist/client/icons/favicon.svg +4 -0
- package/dist/client/index.html +21 -0
- package/dist/client/manifest.webmanifest +24 -0
- package/dist/scripts/generate-secrets.js +3 -0
- package/dist/scripts/generate-secrets.js.map +1 -0
- package/dist/scripts/onboarding.js +814 -0
- package/dist/scripts/onboarding.js.map +1 -0
- package/dist/scripts/proxySetup.js +1007 -0
- package/dist/scripts/proxySetup.js.map +1 -0
- package/dist/server/agent/agentAuth.d.ts +6 -0
- package/dist/server/agent/agentAuth.js +35 -0
- package/dist/server/agent/agentAuth.js.map +1 -0
- package/dist/server/agent/agentProxy.d.ts +5 -0
- package/dist/server/agent/agentProxy.js +63 -0
- package/dist/server/agent/agentProxy.js.map +1 -0
- package/dist/server/agent/agentRoutes.d.ts +9 -0
- package/dist/server/agent/agentRoutes.js +327 -0
- package/dist/server/agent/agentRoutes.js.map +1 -0
- package/dist/server/agent/agentWebSocketProxy.d.ts +3 -0
- package/dist/server/agent/agentWebSocketProxy.js +65 -0
- package/dist/server/agent/agentWebSocketProxy.js.map +1 -0
- package/dist/server/auth/authService.d.ts +100 -0
- package/dist/server/auth/authService.js +415 -0
- package/dist/server/auth/authService.js.map +1 -0
- package/dist/server/auth/cookies.d.ts +11 -0
- package/dist/server/auth/cookies.js +39 -0
- package/dist/server/auth/cookies.js.map +1 -0
- package/dist/server/auth/ipMatch.d.ts +14 -0
- package/dist/server/auth/ipMatch.js +103 -0
- package/dist/server/auth/ipMatch.js.map +1 -0
- package/dist/server/auth/rateLimit.d.ts +17 -0
- package/dist/server/auth/rateLimit.js +25 -0
- package/dist/server/auth/rateLimit.js.map +1 -0
- package/dist/server/auth/totpService.d.ts +10 -0
- package/dist/server/auth/totpService.js +37 -0
- package/dist/server/auth/totpService.js.map +1 -0
- package/dist/server/config.d.ts +27 -0
- package/dist/server/config.js +138 -0
- package/dist/server/config.js.map +1 -0
- package/dist/server/files/fileExplorerService.d.ts +38 -0
- package/dist/server/files/fileExplorerService.js +551 -0
- package/dist/server/files/fileExplorerService.js.map +1 -0
- package/dist/server/files/rootToken.d.ts +51 -0
- package/dist/server/files/rootToken.js +139 -0
- package/dist/server/files/rootToken.js.map +1 -0
- package/dist/server/http.d.ts +13 -0
- package/dist/server/http.js +69 -0
- package/dist/server/http.js.map +1 -0
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.js +45 -0
- package/dist/server/index.js.map +1 -0
- package/dist/server/routes/agentManagementRoutes.d.ts +9 -0
- package/dist/server/routes/agentManagementRoutes.js +304 -0
- package/dist/server/routes/agentManagementRoutes.js.map +1 -0
- package/dist/server/routes/authRoutes.d.ts +10 -0
- package/dist/server/routes/authRoutes.js +95 -0
- package/dist/server/routes/authRoutes.js.map +1 -0
- package/dist/server/routes/fileRoutes.d.ts +11 -0
- package/dist/server/routes/fileRoutes.js +185 -0
- package/dist/server/routes/fileRoutes.js.map +1 -0
- package/dist/server/routes/notificationAssetRoutes.d.ts +9 -0
- package/dist/server/routes/notificationAssetRoutes.js +280 -0
- package/dist/server/routes/notificationAssetRoutes.js.map +1 -0
- package/dist/server/routes/securityRoutes.d.ts +7 -0
- package/dist/server/routes/securityRoutes.js +53 -0
- package/dist/server/routes/securityRoutes.js.map +1 -0
- package/dist/server/routes/socketBackpressure.d.ts +26 -0
- package/dist/server/routes/socketBackpressure.js +63 -0
- package/dist/server/routes/socketBackpressure.js.map +1 -0
- package/dist/server/routes/terminalLayoutRoutes.d.ts +9 -0
- package/dist/server/routes/terminalLayoutRoutes.js +108 -0
- package/dist/server/routes/terminalLayoutRoutes.js.map +1 -0
- package/dist/server/routes/terminalRoutes.d.ts +14 -0
- package/dist/server/routes/terminalRoutes.js +177 -0
- package/dist/server/routes/terminalRoutes.js.map +1 -0
- package/dist/server/routes/terminalWebSocket.d.ts +9 -0
- package/dist/server/routes/terminalWebSocket.js +129 -0
- package/dist/server/routes/terminalWebSocket.js.map +1 -0
- package/dist/server/routes/totpRoutes.d.ts +7 -0
- package/dist/server/routes/totpRoutes.js +46 -0
- package/dist/server/routes/totpRoutes.js.map +1 -0
- package/dist/server/routes/updateRoutes.d.ts +7 -0
- package/dist/server/routes/updateRoutes.js +24 -0
- package/dist/server/routes/updateRoutes.js.map +1 -0
- package/dist/server/routes/uploadRoutes.d.ts +9 -0
- package/dist/server/routes/uploadRoutes.js +95 -0
- package/dist/server/routes/uploadRoutes.js.map +1 -0
- package/dist/server/storage/fileStore.d.ts +90 -0
- package/dist/server/storage/fileStore.js +275 -0
- package/dist/server/storage/fileStore.js.map +1 -0
- package/dist/server/system/stats.d.ts +2 -0
- package/dist/server/system/stats.js +37 -0
- package/dist/server/system/stats.js.map +1 -0
- package/dist/server/terminal/NodePtyAdapter.d.ts +4 -0
- package/dist/server/terminal/NodePtyAdapter.js +14 -0
- package/dist/server/terminal/NodePtyAdapter.js.map +1 -0
- package/dist/server/terminal/PtyAdapter.d.ts +57 -0
- package/dist/server/terminal/PtyAdapter.js +2 -0
- package/dist/server/terminal/PtyAdapter.js.map +1 -0
- package/dist/server/terminal/TerminalManager.d.ts +74 -0
- package/dist/server/terminal/TerminalManager.js +561 -0
- package/dist/server/terminal/TerminalManager.js.map +1 -0
- package/dist/server/terminal/TmuxPtyAdapter.d.ts +25 -0
- package/dist/server/terminal/TmuxPtyAdapter.js +543 -0
- package/dist/server/terminal/TmuxPtyAdapter.js.map +1 -0
- package/dist/server/terminal/codexTranscriptSource.d.ts +9 -0
- package/dist/server/terminal/codexTranscriptSource.js +144 -0
- package/dist/server/terminal/codexTranscriptSource.js.map +1 -0
- package/dist/server/terminal/cwdResolver.d.ts +8 -0
- package/dist/server/terminal/cwdResolver.js +37 -0
- package/dist/server/terminal/cwdResolver.js.map +1 -0
- package/dist/server/terminal/outputBuffer.d.ts +7 -0
- package/dist/server/terminal/outputBuffer.js +17 -0
- package/dist/server/terminal/outputBuffer.js.map +1 -0
- package/dist/server/terminal/transcriptHistory.d.ts +7 -0
- package/dist/server/terminal/transcriptHistory.js +315 -0
- package/dist/server/terminal/transcriptHistory.js.map +1 -0
- package/dist/server/update/gitUpdate.d.ts +27 -0
- package/dist/server/update/gitUpdate.js +241 -0
- package/dist/server/update/gitUpdate.js.map +1 -0
- package/dist/server/uploads/uploadPaths.d.ts +18 -0
- package/dist/server/uploads/uploadPaths.js +116 -0
- package/dist/server/uploads/uploadPaths.js.map +1 -0
- package/dist/server/uploads/uploadService.d.ts +21 -0
- package/dist/server/uploads/uploadService.js +230 -0
- package/dist/server/uploads/uploadService.js.map +1 -0
- package/dist/shared/layoutState.d.ts +6 -0
- package/dist/shared/layoutState.js +115 -0
- package/dist/shared/layoutState.js.map +1 -0
- package/dist/shared/notificationAssets.d.ts +9 -0
- package/dist/shared/notificationAssets.js +27 -0
- package/dist/shared/notificationAssets.js.map +1 -0
- package/dist/shared/protocol.d.ts +308 -0
- package/dist/shared/protocol.js +29 -0
- package/dist/shared/protocol.js.map +1 -0
- package/dist/shared/types.d.ts +56 -0
- package/dist/shared/types.js +2 -0
- package/dist/shared/types.js.map +1 -0
- package/docs/assets/nterminal-workspace.png +0 -0
- package/docs/configuration.md +97 -0
- package/docs/features.md +126 -0
- package/docs/onboarding.md +122 -0
- package/docs/operations.md +112 -0
- package/docs/terminal-history.md +54 -0
- package/package.json +85 -0
- package/public/apple-touch-icon.png +0 -0
- package/public/assets/notifications/character-2258.mp4 +0 -0
- package/public/assets/notifications/character-2260.mp4 +0 -0
- package/public/assets/notifications/character-2272.mp4 +0 -0
- package/public/brand/nterminal-mark-64.png +0 -0
- package/public/brand/nterminal-mark.svg +4 -0
- package/public/brand/nterminal-wordmark-486x68.png +0 -0
- package/public/brand/nterminal-wordmark.svg +3 -0
- package/public/icons/app-icon-1024.png +0 -0
- package/public/icons/app-icon-384.png +0 -0
- package/public/icons/favicon-32.png +0 -0
- package/public/icons/favicon-64.png +0 -0
- package/public/icons/favicon-96.png +0 -0
- package/public/icons/favicon.svg +4 -0
- package/public/manifest.webmanifest +24 -0
- package/scripts/nterminalctl +588 -0
|
@@ -0,0 +1,280 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { createReadStream } from 'node:fs';
|
|
3
|
+
import { mkdir, open, rename, rm, stat } from 'node:fs/promises';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { builtInNotificationAssets } from '../../shared/notificationAssets.js';
|
|
6
|
+
import { requireAllowedOrigin } from './authRoutes.js';
|
|
7
|
+
import { authenticateTerminalRequest } from './terminalRoutes.js';
|
|
8
|
+
const notificationAssetMaxBytes = 5 * 1024 * 1024;
|
|
9
|
+
const allowedContentTypes = new Map([
|
|
10
|
+
['video/mp4', '.mp4'],
|
|
11
|
+
['video/webm', '.webm']
|
|
12
|
+
]);
|
|
13
|
+
class NotificationAssetError extends Error {
|
|
14
|
+
statusCode;
|
|
15
|
+
code;
|
|
16
|
+
constructor(statusCode, code) {
|
|
17
|
+
super(code);
|
|
18
|
+
this.statusCode = statusCode;
|
|
19
|
+
this.code = code;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
export async function registerNotificationAssetRoutes(app, config, services) {
|
|
23
|
+
app.get('/api/notification-assets', async (request, reply) => {
|
|
24
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
25
|
+
if (!auth)
|
|
26
|
+
return reply;
|
|
27
|
+
const state = await services.fileStore.read();
|
|
28
|
+
return notificationAssetListResponse(state.notificationAssets, state.notificationAssetDisabledIds);
|
|
29
|
+
});
|
|
30
|
+
app.post('/api/notification-assets', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
31
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
32
|
+
if (!auth)
|
|
33
|
+
return reply;
|
|
34
|
+
if (!request.isMultipart()) {
|
|
35
|
+
return reply.code(400).send({ error: 'multipart_required' });
|
|
36
|
+
}
|
|
37
|
+
const part = await request.file({
|
|
38
|
+
limits: {
|
|
39
|
+
files: 1,
|
|
40
|
+
fileSize: notificationAssetMaxBytes + 1,
|
|
41
|
+
parts: 1
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
if (!part) {
|
|
45
|
+
return reply.code(400).send({ error: 'notification_asset_required' });
|
|
46
|
+
}
|
|
47
|
+
const contentType = part.mimetype;
|
|
48
|
+
if (!isAllowedContentType(contentType)) {
|
|
49
|
+
await drain(part.file);
|
|
50
|
+
return reply.code(415).send({ error: 'unsupported_notification_asset_type' });
|
|
51
|
+
}
|
|
52
|
+
const root = notificationAssetRoot(config);
|
|
53
|
+
const id = randomUUID();
|
|
54
|
+
const storedFilename = `${id}${allowedContentTypes.get(contentType)}`;
|
|
55
|
+
const tempPath = path.join(root, `${storedFilename}.${process.pid}.tmp`);
|
|
56
|
+
const finalPath = path.join(root, storedFilename);
|
|
57
|
+
let size = 0;
|
|
58
|
+
try {
|
|
59
|
+
size = await writeLimitedFile(part.file, tempPath, notificationAssetMaxBytes);
|
|
60
|
+
if (size === 0) {
|
|
61
|
+
await rm(tempPath, { force: true });
|
|
62
|
+
return reply.code(400).send({ error: 'empty_notification_asset' });
|
|
63
|
+
}
|
|
64
|
+
await rename(tempPath, finalPath);
|
|
65
|
+
}
|
|
66
|
+
catch (error) {
|
|
67
|
+
await rm(tempPath, { force: true });
|
|
68
|
+
if (error instanceof NotificationAssetError) {
|
|
69
|
+
return reply.code(error.statusCode).send({ error: error.code });
|
|
70
|
+
}
|
|
71
|
+
throw error;
|
|
72
|
+
}
|
|
73
|
+
const asset = {
|
|
74
|
+
id,
|
|
75
|
+
filename: sanitizeFilename(part.filename, contentType),
|
|
76
|
+
storedFilename,
|
|
77
|
+
contentType,
|
|
78
|
+
size,
|
|
79
|
+
createdAt: new Date().toISOString()
|
|
80
|
+
};
|
|
81
|
+
await services.fileStore.update((state) => ({ ...state, notificationAssets: [...state.notificationAssets, asset] }), { flush: 'immediate' });
|
|
82
|
+
return reply.code(201).send({ asset: toSummary(asset, isNotificationAssetEnabled(asset.id, new Set())) });
|
|
83
|
+
});
|
|
84
|
+
app.put('/api/notification-assets/selection', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
85
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
86
|
+
if (!auth)
|
|
87
|
+
return reply;
|
|
88
|
+
const enabledAssetIds = Array.isArray(request.body?.enabledAssetIds) ? request.body.enabledAssetIds : null;
|
|
89
|
+
if (!enabledAssetIds) {
|
|
90
|
+
return reply.code(400).send({ error: 'invalid_notification_asset_selection' });
|
|
91
|
+
}
|
|
92
|
+
const uniqueEnabledAssetIds = Array.from(new Set(enabledAssetIds.filter((assetId) => typeof assetId === 'string')));
|
|
93
|
+
if (uniqueEnabledAssetIds.length === 0) {
|
|
94
|
+
return reply.code(400).send({ error: 'notification_asset_selection_required' });
|
|
95
|
+
}
|
|
96
|
+
let nextState;
|
|
97
|
+
try {
|
|
98
|
+
nextState = await services.fileStore.update((state) => {
|
|
99
|
+
const knownAssetIds = notificationAssetIds(state.notificationAssets);
|
|
100
|
+
const unknownAssetId = uniqueEnabledAssetIds.find((assetId) => !knownAssetIds.has(assetId));
|
|
101
|
+
if (unknownAssetId) {
|
|
102
|
+
throw new NotificationAssetError(400, 'unknown_notification_asset');
|
|
103
|
+
}
|
|
104
|
+
const enabledSet = new Set(uniqueEnabledAssetIds);
|
|
105
|
+
return {
|
|
106
|
+
...state,
|
|
107
|
+
notificationAssetDisabledIds: Array.from(knownAssetIds).filter((assetId) => !enabledSet.has(assetId))
|
|
108
|
+
};
|
|
109
|
+
}, { flush: 'immediate' });
|
|
110
|
+
}
|
|
111
|
+
catch (error) {
|
|
112
|
+
if (error instanceof NotificationAssetError) {
|
|
113
|
+
return reply.code(error.statusCode).send({ error: error.code });
|
|
114
|
+
}
|
|
115
|
+
throw error;
|
|
116
|
+
}
|
|
117
|
+
return notificationAssetListResponse(nextState.notificationAssets, nextState.notificationAssetDisabledIds);
|
|
118
|
+
});
|
|
119
|
+
app.delete('/api/notification-assets/:id', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
120
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
121
|
+
if (!auth)
|
|
122
|
+
return reply;
|
|
123
|
+
const currentState = await services.fileStore.read();
|
|
124
|
+
const removed = currentState.notificationAssets.find((asset) => asset.id === request.params.id);
|
|
125
|
+
if (!removed) {
|
|
126
|
+
return reply.code(404).send({ error: 'notification_asset_not_found' });
|
|
127
|
+
}
|
|
128
|
+
await services.fileStore.update((state) => ({
|
|
129
|
+
...state,
|
|
130
|
+
notificationAssets: state.notificationAssets.filter((asset) => asset.id !== request.params.id),
|
|
131
|
+
notificationAssetDisabledIds: state.notificationAssetDisabledIds.filter((assetId) => assetId !== request.params.id)
|
|
132
|
+
}), { flush: 'immediate' });
|
|
133
|
+
await rm(path.join(notificationAssetRoot(config), removed.storedFilename), { force: true });
|
|
134
|
+
return reply.code(204).send();
|
|
135
|
+
});
|
|
136
|
+
app.get('/api/notification-assets/:id/content', async (request, reply) => {
|
|
137
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
138
|
+
if (!auth)
|
|
139
|
+
return reply;
|
|
140
|
+
const state = await services.fileStore.read();
|
|
141
|
+
const asset = state.notificationAssets.find((candidate) => candidate.id === request.params.id);
|
|
142
|
+
if (!asset) {
|
|
143
|
+
return reply.code(404).send({ error: 'notification_asset_not_found' });
|
|
144
|
+
}
|
|
145
|
+
return sendAssetContent(request, reply, config, asset);
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
function notificationAssetListResponse(assets, disabledIds) {
|
|
149
|
+
const disabledSet = new Set(disabledIds);
|
|
150
|
+
return {
|
|
151
|
+
assets: [
|
|
152
|
+
...builtInNotificationAssets.map((asset) => ({
|
|
153
|
+
...asset,
|
|
154
|
+
source: 'built-in',
|
|
155
|
+
enabled: isNotificationAssetEnabled(asset.id, disabledSet)
|
|
156
|
+
})),
|
|
157
|
+
...assets.map((asset) => toSummary(asset, isNotificationAssetEnabled(asset.id, disabledSet)))
|
|
158
|
+
],
|
|
159
|
+
maxFileBytes: notificationAssetMaxBytes
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
function toSummary(asset, enabled) {
|
|
163
|
+
return {
|
|
164
|
+
id: asset.id,
|
|
165
|
+
filename: asset.filename,
|
|
166
|
+
source: 'uploaded',
|
|
167
|
+
enabled,
|
|
168
|
+
contentType: asset.contentType,
|
|
169
|
+
size: asset.size,
|
|
170
|
+
createdAt: asset.createdAt,
|
|
171
|
+
url: `/api/notification-assets/${encodeURIComponent(asset.id)}/content`
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
function notificationAssetIds(assets) {
|
|
175
|
+
return new Set([...builtInNotificationAssets.map((asset) => asset.id), ...assets.map((asset) => asset.id)]);
|
|
176
|
+
}
|
|
177
|
+
function isNotificationAssetEnabled(assetId, disabledIds) {
|
|
178
|
+
return !disabledIds.has(assetId);
|
|
179
|
+
}
|
|
180
|
+
function notificationAssetRoot(config) {
|
|
181
|
+
return path.join(path.dirname(config.statePath), 'notification-assets');
|
|
182
|
+
}
|
|
183
|
+
function isAllowedContentType(value) {
|
|
184
|
+
return value === 'video/mp4' || value === 'video/webm';
|
|
185
|
+
}
|
|
186
|
+
function sanitizeFilename(filename, contentType) {
|
|
187
|
+
const fallback = `notification${allowedContentTypes.get(contentType)}`;
|
|
188
|
+
const base = path.basename(filename || fallback).replace(/[\u0000-\u001f\u007f]/g, '').trim();
|
|
189
|
+
return (base || fallback).slice(0, 160);
|
|
190
|
+
}
|
|
191
|
+
async function writeLimitedFile(stream, filePath, maxBytes) {
|
|
192
|
+
await mkdir(path.dirname(filePath), { recursive: true, mode: 0o700 });
|
|
193
|
+
const handle = await open(filePath, 'wx', 0o600);
|
|
194
|
+
let bytes = 0;
|
|
195
|
+
let tooLarge = false;
|
|
196
|
+
try {
|
|
197
|
+
for await (const chunk of stream) {
|
|
198
|
+
const buffer = typeof chunk === 'string' ? Buffer.from(chunk) : Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
|
|
199
|
+
bytes += buffer.length;
|
|
200
|
+
if (bytes > maxBytes) {
|
|
201
|
+
tooLarge = true;
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
await handle.write(buffer);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
finally {
|
|
208
|
+
await handle.close();
|
|
209
|
+
}
|
|
210
|
+
if (tooLarge) {
|
|
211
|
+
throw new NotificationAssetError(413, 'notification_asset_too_large');
|
|
212
|
+
}
|
|
213
|
+
return bytes;
|
|
214
|
+
}
|
|
215
|
+
async function sendAssetContent(request, reply, config, asset) {
|
|
216
|
+
const filePath = path.join(notificationAssetRoot(config), asset.storedFilename);
|
|
217
|
+
let fileStat;
|
|
218
|
+
try {
|
|
219
|
+
fileStat = await stat(filePath);
|
|
220
|
+
}
|
|
221
|
+
catch (error) {
|
|
222
|
+
if (error.code === 'ENOENT') {
|
|
223
|
+
return reply.code(404).send({ error: 'notification_asset_file_not_found' });
|
|
224
|
+
}
|
|
225
|
+
throw error;
|
|
226
|
+
}
|
|
227
|
+
reply.type(asset.contentType);
|
|
228
|
+
reply.header('Cache-Control', 'no-store');
|
|
229
|
+
reply.header('Accept-Ranges', 'bytes');
|
|
230
|
+
const range = parseRangeHeader(request.headers.range, fileStat.size);
|
|
231
|
+
if (range === 'invalid') {
|
|
232
|
+
reply.header('Content-Range', `bytes */${fileStat.size}`);
|
|
233
|
+
return reply.code(416).send();
|
|
234
|
+
}
|
|
235
|
+
if (range) {
|
|
236
|
+
reply.header('Content-Range', `bytes ${range.start}-${range.end}/${fileStat.size}`);
|
|
237
|
+
reply.header('Content-Length', String(range.end - range.start + 1));
|
|
238
|
+
return reply.code(206).send(createReadStream(filePath, range));
|
|
239
|
+
}
|
|
240
|
+
reply.header('Content-Length', String(fileStat.size));
|
|
241
|
+
return reply.send(createReadStream(filePath));
|
|
242
|
+
}
|
|
243
|
+
function parseRangeHeader(value, size) {
|
|
244
|
+
if (!value) {
|
|
245
|
+
return null;
|
|
246
|
+
}
|
|
247
|
+
const match = /^bytes=(\d*)-(\d*)$/.exec(value.trim());
|
|
248
|
+
if (!match) {
|
|
249
|
+
return 'invalid';
|
|
250
|
+
}
|
|
251
|
+
const [, startText, endText] = match;
|
|
252
|
+
if (!startText && !endText) {
|
|
253
|
+
return 'invalid';
|
|
254
|
+
}
|
|
255
|
+
if (!startText) {
|
|
256
|
+
const suffixLength = Number(endText);
|
|
257
|
+
if (!Number.isInteger(suffixLength) || suffixLength <= 0) {
|
|
258
|
+
return 'invalid';
|
|
259
|
+
}
|
|
260
|
+
return {
|
|
261
|
+
start: Math.max(size - suffixLength, 0),
|
|
262
|
+
end: Math.max(size - 1, 0)
|
|
263
|
+
};
|
|
264
|
+
}
|
|
265
|
+
const start = Number(startText);
|
|
266
|
+
const end = endText ? Number(endText) : size - 1;
|
|
267
|
+
if (!Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end < start || start >= size) {
|
|
268
|
+
return 'invalid';
|
|
269
|
+
}
|
|
270
|
+
return {
|
|
271
|
+
start,
|
|
272
|
+
end: Math.min(end, size - 1)
|
|
273
|
+
};
|
|
274
|
+
}
|
|
275
|
+
async function drain(stream) {
|
|
276
|
+
for await (const _chunk of stream) {
|
|
277
|
+
// Consume invalid uploads so the multipart parser can finish cleanly.
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
//# sourceMappingURL=notificationAssetRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"notificationAssetRoutes.js","sourceRoot":"","sources":["../../../src/server/routes/notificationAssetRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { FastifyInstance } from 'fastify';
|
|
2
|
+
import type { AppConfig } from '../config.js';
|
|
3
|
+
import type { AuthService } from '../auth/authService.js';
|
|
4
|
+
export interface SecurityRouteServices {
|
|
5
|
+
authService: AuthService;
|
|
6
|
+
}
|
|
7
|
+
export declare function registerSecurityRoutes(app: FastifyInstance, config: AppConfig, services: SecurityRouteServices): Promise<void>;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { AuthError } from '../auth/authService.js';
|
|
2
|
+
import { cookieNames } from '../auth/cookies.js';
|
|
3
|
+
import { requireAllowedOrigin } from './authRoutes.js';
|
|
4
|
+
import { authenticateTerminalRequest } from './terminalRoutes.js';
|
|
5
|
+
export async function registerSecurityRoutes(app, config, services) {
|
|
6
|
+
app.get('/api/auth/devices', async (request, reply) => {
|
|
7
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
8
|
+
if (!auth)
|
|
9
|
+
return reply;
|
|
10
|
+
const deviceToken = request.cookies[cookieNames.device];
|
|
11
|
+
return { devices: await services.authService.listTrustedDevices(deviceToken) };
|
|
12
|
+
});
|
|
13
|
+
app.delete('/api/auth/devices/:id', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
14
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
15
|
+
if (!auth)
|
|
16
|
+
return reply;
|
|
17
|
+
await services.authService.revokeTrustedDevice(request.params.id);
|
|
18
|
+
return reply.code(204).send();
|
|
19
|
+
});
|
|
20
|
+
app.get('/api/auth/networks', async (request, reply) => {
|
|
21
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
22
|
+
if (!auth)
|
|
23
|
+
return reply;
|
|
24
|
+
return { networks: await services.authService.listIpRules() };
|
|
25
|
+
});
|
|
26
|
+
app.post('/api/auth/networks', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
27
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
28
|
+
if (!auth)
|
|
29
|
+
return reply;
|
|
30
|
+
const value = request.body?.value;
|
|
31
|
+
if (typeof value !== 'string' || !value.trim()) {
|
|
32
|
+
return reply.code(400).send({ error: 'value_required' });
|
|
33
|
+
}
|
|
34
|
+
try {
|
|
35
|
+
const rule = await services.authService.addIpRule(value, typeof request.body?.label === 'string' ? request.body.label : '');
|
|
36
|
+
return reply.code(201).send({ network: rule });
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (error instanceof AuthError) {
|
|
40
|
+
return reply.code(error.statusCode).send({ error: error.code.toLowerCase() });
|
|
41
|
+
}
|
|
42
|
+
throw error;
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
app.delete('/api/auth/networks/:id', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
46
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
47
|
+
if (!auth)
|
|
48
|
+
return reply;
|
|
49
|
+
await services.authService.removeIpRule(request.params.id);
|
|
50
|
+
return reply.code(204).send();
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=securityRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"securityRoutes.js","sourceRoot":"","sources":["../../../src/server/routes/securityRoutes.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAMlE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,GAAoB,EAAE,MAAiB,EAAE,QAA+B;IACnH,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACpD,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,WAAW,GAAI,OAAO,CAAC,OAA8C,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChG,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC,WAAW,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CACR,uBAAuB,EACvB,EAAE,UAAU,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAChF,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC;IAChE,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,IAAI,CACN,oBAAoB,EACpB,EAAE,UAAU,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAChF,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;QAClC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,EAAE,OAAO,OAAO,CAAC,IAAI,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5H,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CACF,CAAC;IAEF,GAAG,CAAC,MAAM,CACR,wBAAwB,EACxB,EAAE,UAAU,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAChF,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,2BAA2B,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACrF,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,MAAM,QAAQ,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC,CACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
export interface BackpressureSocket {
|
|
2
|
+
readonly bufferedAmount: number;
|
|
3
|
+
isOpen(): boolean;
|
|
4
|
+
}
|
|
5
|
+
export interface BackpressureSink {
|
|
6
|
+
pause(): void;
|
|
7
|
+
resume(): void;
|
|
8
|
+
}
|
|
9
|
+
export interface BackpressureOptions {
|
|
10
|
+
highWaterBytes: number;
|
|
11
|
+
lowWaterBytes: number;
|
|
12
|
+
pollMs: number;
|
|
13
|
+
}
|
|
14
|
+
export declare class SocketBackpressure {
|
|
15
|
+
private readonly socket;
|
|
16
|
+
private readonly sink;
|
|
17
|
+
private readonly options;
|
|
18
|
+
private paused;
|
|
19
|
+
private drainTimer;
|
|
20
|
+
constructor(socket: BackpressureSocket, sink: BackpressureSink, options: BackpressureOptions);
|
|
21
|
+
observe(): void;
|
|
22
|
+
dispose(): void;
|
|
23
|
+
private startDrainPoll;
|
|
24
|
+
private stopDrainPoll;
|
|
25
|
+
private tick;
|
|
26
|
+
}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
// Watermark-based backpressure for a WebSocket-like sender. The route polls
|
|
2
|
+
// `bufferedAmount` after each send; once it crosses `highWaterBytes` the sink
|
|
3
|
+
// (a TerminalAttachment) is told to pause its PTY. While paused, we sample
|
|
4
|
+
// `bufferedAmount` on `pollMs` and resume once it drains back below
|
|
5
|
+
// `lowWaterBytes`. The split watermarks give the socket headroom and avoid
|
|
6
|
+
// thrashing between pause and resume on every send.
|
|
7
|
+
export class SocketBackpressure {
|
|
8
|
+
socket;
|
|
9
|
+
sink;
|
|
10
|
+
options;
|
|
11
|
+
paused = false;
|
|
12
|
+
drainTimer = null;
|
|
13
|
+
constructor(socket, sink, options) {
|
|
14
|
+
this.socket = socket;
|
|
15
|
+
this.sink = sink;
|
|
16
|
+
this.options = options;
|
|
17
|
+
}
|
|
18
|
+
// Call after each socket.send to re-evaluate backpressure.
|
|
19
|
+
observe() {
|
|
20
|
+
if (this.paused)
|
|
21
|
+
return;
|
|
22
|
+
if (this.socket.bufferedAmount <= this.options.highWaterBytes)
|
|
23
|
+
return;
|
|
24
|
+
this.paused = true;
|
|
25
|
+
this.sink.pause();
|
|
26
|
+
this.startDrainPoll();
|
|
27
|
+
}
|
|
28
|
+
// Stop polling. Does NOT release a held pause — the sink (attachment) is
|
|
29
|
+
// responsible for releasing on its own dispose, so we don't double-resume
|
|
30
|
+
// when both the socket and the attachment close.
|
|
31
|
+
dispose() {
|
|
32
|
+
this.stopDrainPoll();
|
|
33
|
+
}
|
|
34
|
+
startDrainPoll() {
|
|
35
|
+
if (this.drainTimer)
|
|
36
|
+
return;
|
|
37
|
+
this.drainTimer = setInterval(() => this.tick(), this.options.pollMs);
|
|
38
|
+
if (typeof this.drainTimer.unref === 'function') {
|
|
39
|
+
this.drainTimer.unref();
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
stopDrainPoll() {
|
|
43
|
+
if (this.drainTimer) {
|
|
44
|
+
clearInterval(this.drainTimer);
|
|
45
|
+
this.drainTimer = null;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
tick() {
|
|
49
|
+
if (!this.socket.isOpen()) {
|
|
50
|
+
this.stopDrainPoll();
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (this.socket.bufferedAmount > this.options.lowWaterBytes) {
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
56
|
+
this.stopDrainPoll();
|
|
57
|
+
if (this.paused) {
|
|
58
|
+
this.paused = false;
|
|
59
|
+
this.sink.resume();
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=socketBackpressure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"socketBackpressure.js","sourceRoot":"","sources":["../../../src/server/routes/socketBackpressure.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,8EAA8E;AAC9E,2EAA2E;AAC3E,oEAAoE;AACpE,2EAA2E;AAC3E,oDAAoD;AAkBpD,MAAM,OAAO,kBAAkB;IAKV;IACA;IACA;IANX,MAAM,GAAG,KAAK,CAAC;IACf,UAAU,GAA0B,IAAI,CAAC;IAEjD,YACmB,MAA0B,EAC1B,IAAsB,EACtB,OAA4B;QAF5B,WAAM,GAAN,MAAM,CAAoB;QAC1B,SAAI,GAAJ,IAAI,CAAkB;QACtB,YAAO,GAAP,OAAO,CAAqB;IAC5C,CAAC;IAEJ,2DAA2D;IAC3D,OAAO;QACL,IAAI,IAAI,CAAC,MAAM;YAAE,OAAO;QACxB,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc;YAAE,OAAO;QACtE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,CAAC,cAAc,EAAE,CAAC;IACxB,CAAC;IAED,yEAAyE;IACzE,0EAA0E;IAC1E,iDAAiD;IACjD,OAAO;QACL,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAEO,cAAc;QACpB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO;QAC5B,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtE,IAAI,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;YAChD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAEO,IAAI;QACV,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC5D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { FastifyInstance } from 'fastify';
|
|
2
|
+
import type { AuthService } from '../auth/authService.js';
|
|
3
|
+
import type { AppConfig } from '../config.js';
|
|
4
|
+
import type { FileStore } from '../storage/fileStore.js';
|
|
5
|
+
export interface TerminalLayoutRouteServices {
|
|
6
|
+
authService: AuthService;
|
|
7
|
+
fileStore: FileStore;
|
|
8
|
+
}
|
|
9
|
+
export declare function registerTerminalLayoutRoutes(app: FastifyInstance, config: AppConfig, services: TerminalLayoutRouteServices): Promise<void>;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { normalizeTerminalLayoutState } from '../../shared/layoutState.js';
|
|
2
|
+
import { requireAllowedOrigin } from './authRoutes.js';
|
|
3
|
+
import { authenticateTerminalRequest } from './terminalRoutes.js';
|
|
4
|
+
class RevisionConflict extends Error {
|
|
5
|
+
current;
|
|
6
|
+
constructor(current) {
|
|
7
|
+
super('Stale terminal layout revision');
|
|
8
|
+
this.current = current;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export async function registerTerminalLayoutRoutes(app, config, services) {
|
|
12
|
+
// Local server layout.
|
|
13
|
+
app.get('/api/terminal-layout', async (request, reply) => {
|
|
14
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
15
|
+
if (!auth) {
|
|
16
|
+
return reply;
|
|
17
|
+
}
|
|
18
|
+
const state = await services.fileStore.read();
|
|
19
|
+
return terminalLayoutResponse(state.terminalLayout);
|
|
20
|
+
});
|
|
21
|
+
app.put('/api/terminal-layout', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => saveLayout(services, request, reply, {
|
|
22
|
+
read: (state) => state.terminalLayout,
|
|
23
|
+
write: (state, layout) => ({ ...state, terminalLayout: layout })
|
|
24
|
+
}));
|
|
25
|
+
// Per-agent layout, stored on the main (not proxied to the agent).
|
|
26
|
+
app.get('/api/agents/:agentId/terminal-layout', async (request, reply) => {
|
|
27
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
28
|
+
if (!auth) {
|
|
29
|
+
return reply;
|
|
30
|
+
}
|
|
31
|
+
const state = await services.fileStore.read();
|
|
32
|
+
if (!state.agents.some((agent) => agent.id === request.params.agentId)) {
|
|
33
|
+
return reply.code(404).send({ error: 'agent_not_found' });
|
|
34
|
+
}
|
|
35
|
+
return terminalLayoutResponse(state.agentLayouts[request.params.agentId] ?? null);
|
|
36
|
+
});
|
|
37
|
+
app.put('/api/agents/:agentId/terminal-layout', { preHandler: (request, reply) => requireAllowedOrigin(config, request, reply) }, async (request, reply) => {
|
|
38
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
39
|
+
if (!auth) {
|
|
40
|
+
return reply;
|
|
41
|
+
}
|
|
42
|
+
const agentId = request.params.agentId;
|
|
43
|
+
const state = await services.fileStore.read();
|
|
44
|
+
if (!state.agents.some((agent) => agent.id === agentId)) {
|
|
45
|
+
return reply.code(404).send({ error: 'agent_not_found' });
|
|
46
|
+
}
|
|
47
|
+
return saveLayout(services, request, reply, {
|
|
48
|
+
read: (current) => current.agentLayouts[agentId] ?? null,
|
|
49
|
+
write: (current, layout) => ({ ...current, agentLayouts: { ...current.agentLayouts, [agentId]: layout } })
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
async function saveLayout(services, request, reply, slot) {
|
|
54
|
+
const auth = await authenticateTerminalRequest(services.authService, request, reply);
|
|
55
|
+
if (!auth) {
|
|
56
|
+
return reply;
|
|
57
|
+
}
|
|
58
|
+
const body = parseUpdateRequest(request.body);
|
|
59
|
+
if (!body) {
|
|
60
|
+
return reply.code(400).send({ error: 'invalid_terminal_layout' });
|
|
61
|
+
}
|
|
62
|
+
try {
|
|
63
|
+
const next = await services.fileStore.update((state) => {
|
|
64
|
+
const currentRevision = slot.read(state)?.revision ?? 0;
|
|
65
|
+
if (body.baseRevision !== undefined && body.baseRevision !== currentRevision) {
|
|
66
|
+
throw new RevisionConflict(slot.read(state));
|
|
67
|
+
}
|
|
68
|
+
const layout = {
|
|
69
|
+
layout: body.layout,
|
|
70
|
+
revision: currentRevision + 1,
|
|
71
|
+
updatedAt: new Date().toISOString()
|
|
72
|
+
};
|
|
73
|
+
return slot.write(state, layout);
|
|
74
|
+
});
|
|
75
|
+
return terminalLayoutResponse(slot.read(next));
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
78
|
+
if (error instanceof RevisionConflict) {
|
|
79
|
+
return reply.code(409).send(terminalLayoutResponse(error.current));
|
|
80
|
+
}
|
|
81
|
+
throw error;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function parseUpdateRequest(value) {
|
|
85
|
+
if (!value || typeof value !== 'object') {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
const request = value;
|
|
89
|
+
const layout = normalizeTerminalLayoutState(request.layout);
|
|
90
|
+
if (!layout) {
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
if (request.baseRevision !== undefined && (!Number.isInteger(request.baseRevision) || request.baseRevision < 0)) {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
return request.baseRevision === undefined ? { layout } : { layout, baseRevision: request.baseRevision };
|
|
97
|
+
}
|
|
98
|
+
function terminalLayoutResponse(stored) {
|
|
99
|
+
if (!stored) {
|
|
100
|
+
return { layout: null, revision: 0, updatedAt: null };
|
|
101
|
+
}
|
|
102
|
+
return {
|
|
103
|
+
layout: stored.layout,
|
|
104
|
+
revision: stored.revision,
|
|
105
|
+
updatedAt: stored.updatedAt
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=terminalLayoutRoutes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"terminalLayoutRoutes.js","sourceRoot":"","sources":["../../../src/server/routes/terminalLayoutRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
|
|
2
|
+
import type { AppConfig } from '../config.js';
|
|
3
|
+
import type { AuthService } from '../auth/authService.js';
|
|
4
|
+
import type { TerminalManager } from '../terminal/TerminalManager.js';
|
|
5
|
+
export interface TerminalRouteServices {
|
|
6
|
+
authService: AuthService;
|
|
7
|
+
terminalManager: TerminalManager;
|
|
8
|
+
}
|
|
9
|
+
interface AuthContext {
|
|
10
|
+
sessionId?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare function authenticateTerminalRequest(authService: AuthService, request: FastifyRequest, reply?: FastifyReply): Promise<AuthContext | null>;
|
|
13
|
+
export declare function registerTerminalRoutes(app: FastifyInstance, config: AppConfig, services: TerminalRouteServices): Promise<void>;
|
|
14
|
+
export {};
|