@ash-ai/server 0.0.3 → 0.0.5
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/dist/__tests__/attachments.test.d.ts +2 -0
- package/dist/__tests__/attachments.test.d.ts.map +1 -0
- package/dist/__tests__/attachments.test.js +57 -0
- package/dist/__tests__/attachments.test.js.map +1 -0
- package/dist/__tests__/bundle.test.d.ts +2 -0
- package/dist/__tests__/bundle.test.d.ts.map +1 -0
- package/dist/__tests__/bundle.test.js +55 -0
- package/dist/__tests__/bundle.test.js.map +1 -0
- package/dist/__tests__/coordinator.test.d.ts +2 -0
- package/dist/__tests__/coordinator.test.d.ts.map +1 -0
- package/dist/__tests__/coordinator.test.js +283 -0
- package/dist/__tests__/coordinator.test.js.map +1 -0
- package/dist/__tests__/crypto.test.d.ts +2 -0
- package/dist/__tests__/crypto.test.d.ts.map +1 -0
- package/dist/__tests__/crypto.test.js +72 -0
- package/dist/__tests__/crypto.test.js.map +1 -0
- package/dist/__tests__/file-store.test.d.ts +2 -0
- package/dist/__tests__/file-store.test.d.ts.map +1 -0
- package/dist/__tests__/file-store.test.js +105 -0
- package/dist/__tests__/file-store.test.js.map +1 -0
- package/dist/__tests__/files.test.js +18 -5
- package/dist/__tests__/files.test.js.map +1 -1
- package/dist/__tests__/multi-tenant.test.js +15 -1
- package/dist/__tests__/multi-tenant.test.js.map +1 -1
- package/dist/__tests__/openapi.test.js +6 -3
- package/dist/__tests__/openapi.test.js.map +1 -1
- package/dist/__tests__/queue.test.d.ts +2 -0
- package/dist/__tests__/queue.test.d.ts.map +1 -0
- package/dist/__tests__/queue.test.js +151 -0
- package/dist/__tests__/queue.test.js.map +1 -0
- package/dist/__tests__/usage.test.d.ts +2 -0
- package/dist/__tests__/usage.test.d.ts.map +1 -0
- package/dist/__tests__/usage.test.js +74 -0
- package/dist/__tests__/usage.test.js.map +1 -0
- package/dist/auth.d.ts +6 -2
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +23 -5
- package/dist/auth.js.map +1 -1
- package/dist/crypto.d.ts +14 -0
- package/dist/crypto.d.ts.map +1 -0
- package/dist/crypto.js +45 -0
- package/dist/crypto.js.map +1 -0
- package/dist/db/drizzle-db.d.ts +129 -0
- package/dist/db/drizzle-db.d.ts.map +1 -0
- package/dist/db/drizzle-db.js +789 -0
- package/dist/db/drizzle-db.js.map +1 -0
- package/dist/db/index.d.ts +129 -3
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +147 -8
- package/dist/db/index.js.map +1 -1
- package/dist/db/schema.pg.d.ts +1642 -0
- package/dist/db/schema.pg.d.ts.map +1 -0
- package/dist/db/schema.pg.js +151 -0
- package/dist/db/schema.pg.js.map +1 -0
- package/dist/db/schema.sqlite.d.ts +1800 -0
- package/dist/db/schema.sqlite.d.ts.map +1 -0
- package/dist/db/schema.sqlite.js +151 -0
- package/dist/db/schema.sqlite.js.map +1 -0
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -95
- package/dist/index.js.map +1 -1
- package/dist/queue/processor.d.ts +51 -0
- package/dist/queue/processor.d.ts.map +1 -0
- package/dist/queue/processor.js +98 -0
- package/dist/queue/processor.js.map +1 -0
- package/dist/routes/attachments.d.ts +3 -0
- package/dist/routes/attachments.d.ts.map +1 -0
- package/dist/routes/attachments.js +168 -0
- package/dist/routes/attachments.js.map +1 -0
- package/dist/routes/credentials.d.ts +11 -0
- package/dist/routes/credentials.d.ts.map +1 -0
- package/dist/routes/credentials.js +120 -0
- package/dist/routes/credentials.js.map +1 -0
- package/dist/routes/files.d.ts.map +1 -1
- package/dist/routes/files.js +97 -31
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/health.d.ts.map +1 -1
- package/dist/routes/health.js +9 -1
- package/dist/routes/health.js.map +1 -1
- package/dist/routes/queue.d.ts +3 -0
- package/dist/routes/queue.d.ts.map +1 -0
- package/dist/routes/queue.js +144 -0
- package/dist/routes/queue.js.map +1 -0
- package/dist/routes/runners.d.ts +5 -0
- package/dist/routes/runners.d.ts.map +1 -1
- package/dist/routes/runners.js +42 -5
- package/dist/routes/runners.js.map +1 -1
- package/dist/routes/sessions.d.ts +2 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +218 -12
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/usage.d.ts +3 -0
- package/dist/routes/usage.d.ts.map +1 -0
- package/dist/routes/usage.js +64 -0
- package/dist/routes/usage.js.map +1 -0
- package/dist/routes/workspace.d.ts +4 -0
- package/dist/routes/workspace.d.ts.map +1 -0
- package/dist/routes/workspace.js +123 -0
- package/dist/routes/workspace.js.map +1 -0
- package/dist/runner/coordinator.d.ts +77 -9
- package/dist/runner/coordinator.d.ts.map +1 -1
- package/dist/runner/coordinator.js +163 -89
- package/dist/runner/coordinator.js.map +1 -1
- package/dist/runner/local-backend.d.ts +1 -0
- package/dist/runner/local-backend.d.ts.map +1 -1
- package/dist/runner/local-backend.js +8 -0
- package/dist/runner/local-backend.js.map +1 -1
- package/dist/runner/remote-backend.d.ts +2 -0
- package/dist/runner/remote-backend.d.ts.map +1 -1
- package/dist/runner/remote-backend.js +9 -0
- package/dist/runner/remote-backend.js.map +1 -1
- package/dist/runner/runner-client.d.ts +6 -0
- package/dist/runner/runner-client.d.ts.map +1 -1
- package/dist/runner/runner-client.js +15 -0
- package/dist/runner/runner-client.js.map +1 -1
- package/dist/runner/types.d.ts +6 -0
- package/dist/runner/types.d.ts.map +1 -1
- package/dist/schemas.d.ts.map +1 -1
- package/dist/schemas.js +85 -1
- package/dist/schemas.js.map +1 -1
- package/dist/server.d.ts +31 -0
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +176 -0
- package/dist/server.js.map +1 -0
- package/dist/telemetry/exporter.d.ts +16 -0
- package/dist/telemetry/exporter.d.ts.map +1 -0
- package/dist/telemetry/exporter.js +89 -0
- package/dist/telemetry/exporter.js.map +1 -0
- package/dist/usage/extractor.d.ts +18 -0
- package/dist/usage/extractor.d.ts.map +1 -0
- package/dist/usage/extractor.js +48 -0
- package/dist/usage/extractor.js.map +1 -0
- package/drizzle/pg/0000_thick_loners.sql +75 -0
- package/drizzle/pg/0001_rare_lester.sql +13 -0
- package/drizzle/pg/0002_short_shinko_yamashiro.sql +1 -0
- package/drizzle/pg/0003_remarkable_mastermind.sql +14 -0
- package/drizzle/pg/0004_warm_reaper.sql +18 -0
- package/drizzle/pg/0005_overconfident_mole_man.sql +14 -0
- package/drizzle/pg/0006_third_shiva.sql +13 -0
- package/drizzle/pg/0007_keen_shockwave.sql +2 -0
- package/drizzle/pg/meta/0000_snapshot.json +648 -0
- package/drizzle/pg/meta/0001_snapshot.json +743 -0
- package/drizzle/pg/meta/0002_snapshot.json +749 -0
- package/drizzle/pg/meta/0003_snapshot.json +841 -0
- package/drizzle/pg/meta/0004_snapshot.json +974 -0
- package/drizzle/pg/meta/0005_snapshot.json +1079 -0
- package/drizzle/pg/meta/0006_snapshot.json +1193 -0
- package/drizzle/pg/meta/0007_snapshot.json +1199 -0
- package/drizzle/pg/meta/_journal.json +62 -0
- package/drizzle/sqlite/0000_massive_kinsey_walden.sql +75 -0
- package/drizzle/sqlite/0001_quiet_phantom_reporter.sql +13 -0
- package/drizzle/sqlite/0002_broad_sheva_callister.sql +1 -0
- package/drizzle/sqlite/0003_thankful_agent_brand.sql +14 -0
- package/drizzle/sqlite/0004_productive_wolverine.sql +18 -0
- package/drizzle/sqlite/0005_chilly_carlie_cooper.sql +14 -0
- package/drizzle/sqlite/0006_workable_starfox.sql +13 -0
- package/drizzle/sqlite/0007_quick_hemingway.sql +19 -0
- package/drizzle/sqlite/meta/0000_snapshot.json +503 -0
- package/drizzle/sqlite/meta/0001_snapshot.json +587 -0
- package/drizzle/sqlite/meta/0002_snapshot.json +594 -0
- package/drizzle/sqlite/meta/0003_snapshot.json +685 -0
- package/drizzle/sqlite/meta/0004_snapshot.json +807 -0
- package/drizzle/sqlite/meta/0005_snapshot.json +897 -0
- package/drizzle/sqlite/meta/0006_snapshot.json +981 -0
- package/drizzle/sqlite/meta/0007_snapshot.json +988 -0
- package/drizzle/sqlite/meta/_journal.json +62 -0
- package/package.json +10 -5
- package/dist/__tests__/schema.test.d.ts +0 -2
- package/dist/__tests__/schema.test.d.ts.map +0 -1
- package/dist/__tests__/schema.test.js +0 -31
- package/dist/__tests__/schema.test.js.map +0 -1
- package/dist/db/dump-schema.d.ts +0 -10
- package/dist/db/dump-schema.d.ts.map +0 -1
- package/dist/db/dump-schema.js +0 -64
- package/dist/db/dump-schema.js.map +0 -1
- package/dist/db/pg.d.ts +0 -52
- package/dist/db/pg.d.ts.map +0 -1
- package/dist/db/pg.js +0 -398
- package/dist/db/pg.js.map +0 -1
- package/dist/db/sqlite.d.ts +0 -51
- package/dist/db/sqlite.d.ts.map +0 -1
- package/dist/db/sqlite.js +0 -412
- package/dist/db/sqlite.js.map +0 -1
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { join, basename } from 'node:path';
|
|
3
|
+
import { existsSync } from 'node:fs';
|
|
4
|
+
import { writeFile, mkdir, readFile, unlink } from 'node:fs/promises';
|
|
5
|
+
import { insertAttachment, getAttachment, listAttachmentsBySession, getSession, deleteAttachment } from '../db/index.js';
|
|
6
|
+
/** Sanitize a filename: strip path separators and directory traversal. */
|
|
7
|
+
function sanitizeFilename(raw) {
|
|
8
|
+
// Take only the basename (strips directories), then remove null bytes
|
|
9
|
+
let name = basename(raw).replace(/\0/g, '');
|
|
10
|
+
// Reject hidden files starting with dot that could be .env etc.
|
|
11
|
+
if (!name || name === '.' || name === '..') {
|
|
12
|
+
name = 'unnamed';
|
|
13
|
+
}
|
|
14
|
+
return name;
|
|
15
|
+
}
|
|
16
|
+
/** Maximum attachment size (default 10 MB). */
|
|
17
|
+
const MAX_ATTACHMENT_SIZE = parseInt(process.env.ASH_MAX_ATTACHMENT_SIZE || String(10 * 1024 * 1024), 10);
|
|
18
|
+
export function attachmentRoutes(app, dataDir) {
|
|
19
|
+
// Upload attachment to a session (stores in local data dir)
|
|
20
|
+
app.post('/api/sessions/:id/attachments', {
|
|
21
|
+
schema: {
|
|
22
|
+
tags: ['sessions'],
|
|
23
|
+
params: {
|
|
24
|
+
type: 'object',
|
|
25
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
26
|
+
required: ['id'],
|
|
27
|
+
},
|
|
28
|
+
body: {
|
|
29
|
+
type: 'object',
|
|
30
|
+
properties: {
|
|
31
|
+
filename: { type: 'string', minLength: 1 },
|
|
32
|
+
mimeType: { type: 'string', default: 'application/octet-stream' },
|
|
33
|
+
content: { type: 'string', description: 'Base64-encoded file content' },
|
|
34
|
+
messageId: { type: 'string', format: 'uuid', description: 'Message to attach to (optional — can be linked later)' },
|
|
35
|
+
},
|
|
36
|
+
required: ['filename', 'content'],
|
|
37
|
+
},
|
|
38
|
+
response: {
|
|
39
|
+
201: {
|
|
40
|
+
type: 'object',
|
|
41
|
+
properties: { attachment: { $ref: 'Attachment#' } },
|
|
42
|
+
required: ['attachment'],
|
|
43
|
+
},
|
|
44
|
+
400: { $ref: 'ApiError#' },
|
|
45
|
+
404: { $ref: 'ApiError#' },
|
|
46
|
+
413: { $ref: 'ApiError#' },
|
|
47
|
+
},
|
|
48
|
+
},
|
|
49
|
+
}, async (req, reply) => {
|
|
50
|
+
const session = await getSession(req.params.id);
|
|
51
|
+
if (!session || session.tenantId !== req.tenantId) {
|
|
52
|
+
return reply.status(404).send({ error: 'Session not found', statusCode: 404 });
|
|
53
|
+
}
|
|
54
|
+
const { filename: rawFilename, mimeType, content, messageId } = req.body;
|
|
55
|
+
const filename = sanitizeFilename(rawFilename);
|
|
56
|
+
const buffer = Buffer.from(content, 'base64');
|
|
57
|
+
if (buffer.length === 0) {
|
|
58
|
+
return reply.status(400).send({ error: 'Empty attachment content', statusCode: 400 });
|
|
59
|
+
}
|
|
60
|
+
if (buffer.length > MAX_ATTACHMENT_SIZE) {
|
|
61
|
+
return reply.status(413).send({ error: `Attachment too large (max ${MAX_ATTACHMENT_SIZE} bytes)`, statusCode: 413 });
|
|
62
|
+
}
|
|
63
|
+
const id = randomUUID();
|
|
64
|
+
const effectiveMessageId = messageId || 'unlinked';
|
|
65
|
+
const storagePath = join('attachments', session.id, id, filename);
|
|
66
|
+
const fullPath = join(dataDir, storagePath);
|
|
67
|
+
// Store file locally (async I/O to avoid blocking event loop)
|
|
68
|
+
await mkdir(join(dataDir, 'attachments', session.id, id), { recursive: true });
|
|
69
|
+
await writeFile(fullPath, buffer);
|
|
70
|
+
// Also write to sandbox workspace if it exists
|
|
71
|
+
const workspaceDir = join(dataDir, 'sandboxes', session.sandboxId, 'workspace');
|
|
72
|
+
if (existsSync(workspaceDir)) {
|
|
73
|
+
const attachDir = join(workspaceDir, 'attachments');
|
|
74
|
+
await mkdir(attachDir, { recursive: true });
|
|
75
|
+
await writeFile(join(attachDir, filename), buffer);
|
|
76
|
+
}
|
|
77
|
+
const attachment = await insertAttachment(id, req.tenantId, effectiveMessageId, session.id, filename, mimeType ?? 'application/octet-stream', buffer.length, storagePath);
|
|
78
|
+
return reply.status(201).send({ attachment });
|
|
79
|
+
});
|
|
80
|
+
// List attachments for a session
|
|
81
|
+
app.get('/api/sessions/:id/attachments', {
|
|
82
|
+
schema: {
|
|
83
|
+
tags: ['sessions'],
|
|
84
|
+
params: {
|
|
85
|
+
type: 'object',
|
|
86
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
87
|
+
required: ['id'],
|
|
88
|
+
},
|
|
89
|
+
response: {
|
|
90
|
+
200: {
|
|
91
|
+
type: 'object',
|
|
92
|
+
properties: {
|
|
93
|
+
attachments: { type: 'array', items: { $ref: 'Attachment#' } },
|
|
94
|
+
},
|
|
95
|
+
required: ['attachments'],
|
|
96
|
+
},
|
|
97
|
+
404: { $ref: 'ApiError#' },
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
}, async (req, reply) => {
|
|
101
|
+
const session = await getSession(req.params.id);
|
|
102
|
+
if (!session || session.tenantId !== req.tenantId) {
|
|
103
|
+
return reply.status(404).send({ error: 'Session not found', statusCode: 404 });
|
|
104
|
+
}
|
|
105
|
+
const attachments = await listAttachmentsBySession(session.id, req.tenantId);
|
|
106
|
+
return reply.send({ attachments });
|
|
107
|
+
});
|
|
108
|
+
// Download an attachment by ID
|
|
109
|
+
app.get('/api/attachments/:id', {
|
|
110
|
+
schema: {
|
|
111
|
+
tags: ['attachments'],
|
|
112
|
+
params: {
|
|
113
|
+
type: 'object',
|
|
114
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
115
|
+
required: ['id'],
|
|
116
|
+
},
|
|
117
|
+
response: {
|
|
118
|
+
404: { $ref: 'ApiError#' },
|
|
119
|
+
},
|
|
120
|
+
},
|
|
121
|
+
}, async (req, reply) => {
|
|
122
|
+
const attachment = await getAttachment(req.params.id);
|
|
123
|
+
if (!attachment || attachment.tenantId !== req.tenantId) {
|
|
124
|
+
return reply.status(404).send({ error: 'Attachment not found', statusCode: 404 });
|
|
125
|
+
}
|
|
126
|
+
const fullPath = join(dataDir, attachment.storagePath);
|
|
127
|
+
if (!existsSync(fullPath)) {
|
|
128
|
+
return reply.status(404).send({ error: 'Attachment file not found on disk', statusCode: 404 });
|
|
129
|
+
}
|
|
130
|
+
const fileContent = await readFile(fullPath);
|
|
131
|
+
// Encode filename per RFC 5987 for safe Content-Disposition
|
|
132
|
+
const encodedFilename = encodeURIComponent(attachment.filename).replace(/'/g, '%27');
|
|
133
|
+
return reply
|
|
134
|
+
.header('Content-Type', attachment.mimeType)
|
|
135
|
+
.header('X-Content-Type-Options', 'nosniff')
|
|
136
|
+
.header('Content-Disposition', `attachment; filename*=UTF-8''${encodedFilename}`)
|
|
137
|
+
.send(fileContent);
|
|
138
|
+
});
|
|
139
|
+
// Delete an attachment
|
|
140
|
+
app.delete('/api/attachments/:id', {
|
|
141
|
+
schema: {
|
|
142
|
+
tags: ['attachments'],
|
|
143
|
+
params: {
|
|
144
|
+
type: 'object',
|
|
145
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
146
|
+
required: ['id'],
|
|
147
|
+
},
|
|
148
|
+
response: {
|
|
149
|
+
204: { type: 'null' },
|
|
150
|
+
404: { $ref: 'ApiError#' },
|
|
151
|
+
},
|
|
152
|
+
},
|
|
153
|
+
}, async (req, reply) => {
|
|
154
|
+
const attachment = await getAttachment(req.params.id);
|
|
155
|
+
if (!attachment || attachment.tenantId !== req.tenantId) {
|
|
156
|
+
return reply.status(404).send({ error: 'Attachment not found', statusCode: 404 });
|
|
157
|
+
}
|
|
158
|
+
// Best-effort delete from disk
|
|
159
|
+
const fullPath = join(dataDir, attachment.storagePath);
|
|
160
|
+
try {
|
|
161
|
+
await unlink(fullPath);
|
|
162
|
+
}
|
|
163
|
+
catch { /* file may be gone */ }
|
|
164
|
+
await deleteAttachment(req.params.id);
|
|
165
|
+
return reply.status(204).send();
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
//# sourceMappingURL=attachments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"attachments.js","sourceRoot":"","sources":["../../src/routes/attachments.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { FastifyInstance } from 'fastify';
|
|
2
|
+
export declare function credentialRoutes(app: FastifyInstance): void;
|
|
3
|
+
/**
|
|
4
|
+
* Decrypt a credential by ID. Returns the plaintext key or null.
|
|
5
|
+
* Used internally by session creation to inject credentials into sandbox env.
|
|
6
|
+
*/
|
|
7
|
+
export declare function decryptCredential(credentialId: string, tenantId: string): Promise<{
|
|
8
|
+
type: string;
|
|
9
|
+
key: string;
|
|
10
|
+
} | null>;
|
|
11
|
+
//# sourceMappingURL=credentials.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/routes/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAO/C,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,CAoG3D;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAY7H"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { insertCredential, getCredential, listCredentials, deleteCredentialById } from '../db/index.js';
|
|
3
|
+
import { encrypt, decrypt } from '../crypto.js';
|
|
4
|
+
const MASTER_KEY = process.env.ASH_CREDENTIAL_KEY;
|
|
5
|
+
export function credentialRoutes(app) {
|
|
6
|
+
// Store a new credential
|
|
7
|
+
app.post('/api/credentials', {
|
|
8
|
+
schema: {
|
|
9
|
+
tags: ['credentials'],
|
|
10
|
+
body: {
|
|
11
|
+
type: 'object',
|
|
12
|
+
properties: {
|
|
13
|
+
type: { type: 'string', enum: ['anthropic', 'openai', 'custom'] },
|
|
14
|
+
key: { type: 'string', minLength: 1 },
|
|
15
|
+
label: { type: 'string' },
|
|
16
|
+
},
|
|
17
|
+
required: ['type', 'key'],
|
|
18
|
+
},
|
|
19
|
+
response: {
|
|
20
|
+
201: {
|
|
21
|
+
type: 'object',
|
|
22
|
+
properties: {
|
|
23
|
+
credential: {
|
|
24
|
+
type: 'object',
|
|
25
|
+
properties: {
|
|
26
|
+
id: { type: 'string' },
|
|
27
|
+
type: { type: 'string' },
|
|
28
|
+
label: { type: 'string' },
|
|
29
|
+
active: { type: 'boolean' },
|
|
30
|
+
createdAt: { type: 'string' },
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
35
|
+
400: { $ref: 'ApiError#' },
|
|
36
|
+
500: { $ref: 'ApiError#' },
|
|
37
|
+
},
|
|
38
|
+
},
|
|
39
|
+
}, async (req, reply) => {
|
|
40
|
+
if (!MASTER_KEY) {
|
|
41
|
+
return reply.status(500).send({ error: 'Credential storage not configured (ASH_CREDENTIAL_KEY not set)', statusCode: 500 });
|
|
42
|
+
}
|
|
43
|
+
const { type, key, label } = req.body;
|
|
44
|
+
const id = randomUUID();
|
|
45
|
+
const { encrypted, iv, authTag, salt } = encrypt(key, MASTER_KEY);
|
|
46
|
+
const credential = await insertCredential(id, req.tenantId, type, encrypted, iv, authTag, label ?? '', salt);
|
|
47
|
+
return reply.status(201).send({ credential });
|
|
48
|
+
});
|
|
49
|
+
// List credentials (no plaintext returned)
|
|
50
|
+
app.get('/api/credentials', {
|
|
51
|
+
schema: {
|
|
52
|
+
tags: ['credentials'],
|
|
53
|
+
response: {
|
|
54
|
+
200: {
|
|
55
|
+
type: 'object',
|
|
56
|
+
properties: {
|
|
57
|
+
credentials: {
|
|
58
|
+
type: 'array',
|
|
59
|
+
items: {
|
|
60
|
+
type: 'object',
|
|
61
|
+
properties: {
|
|
62
|
+
id: { type: 'string' },
|
|
63
|
+
type: { type: 'string' },
|
|
64
|
+
label: { type: 'string' },
|
|
65
|
+
active: { type: 'boolean' },
|
|
66
|
+
createdAt: { type: 'string' },
|
|
67
|
+
lastUsedAt: { type: ['string', 'null'] },
|
|
68
|
+
},
|
|
69
|
+
},
|
|
70
|
+
},
|
|
71
|
+
},
|
|
72
|
+
},
|
|
73
|
+
},
|
|
74
|
+
},
|
|
75
|
+
}, async (req, reply) => {
|
|
76
|
+
const creds = await listCredentials(req.tenantId);
|
|
77
|
+
return reply.send({ credentials: creds });
|
|
78
|
+
});
|
|
79
|
+
// Delete credential
|
|
80
|
+
app.delete('/api/credentials/:id', {
|
|
81
|
+
schema: {
|
|
82
|
+
tags: ['credentials'],
|
|
83
|
+
params: {
|
|
84
|
+
type: 'object',
|
|
85
|
+
properties: { id: { type: 'string' } },
|
|
86
|
+
required: ['id'],
|
|
87
|
+
},
|
|
88
|
+
response: {
|
|
89
|
+
204: { type: 'null' },
|
|
90
|
+
404: { $ref: 'ApiError#' },
|
|
91
|
+
},
|
|
92
|
+
},
|
|
93
|
+
}, async (req, reply) => {
|
|
94
|
+
const cred = await getCredential(req.params.id);
|
|
95
|
+
if (!cred || cred.tenantId !== req.tenantId) {
|
|
96
|
+
return reply.status(404).send({ error: 'Credential not found', statusCode: 404 });
|
|
97
|
+
}
|
|
98
|
+
await deleteCredentialById(req.params.id);
|
|
99
|
+
return reply.status(204).send();
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
/**
|
|
103
|
+
* Decrypt a credential by ID. Returns the plaintext key or null.
|
|
104
|
+
* Used internally by session creation to inject credentials into sandbox env.
|
|
105
|
+
*/
|
|
106
|
+
export async function decryptCredential(credentialId, tenantId) {
|
|
107
|
+
if (!MASTER_KEY)
|
|
108
|
+
return null;
|
|
109
|
+
const cred = await getCredential(credentialId);
|
|
110
|
+
if (!cred || cred.tenantId !== tenantId || !cred.active)
|
|
111
|
+
return null;
|
|
112
|
+
try {
|
|
113
|
+
const key = decrypt(cred.encryptedKey, cred.iv, cred.authTag, MASTER_KEY, cred.salt);
|
|
114
|
+
return { type: cred.type, key };
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return null;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=credentials.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/routes/credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAmJlE,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAwItG"}
|
package/dist/routes/files.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { readdirSync, statSync, readFileSync, existsSync } from 'node:fs';
|
|
2
|
-
import { join, relative } from 'node:path';
|
|
1
|
+
import { readdirSync, statSync, readFileSync, existsSync, createReadStream } from 'node:fs';
|
|
2
|
+
import { join, relative, basename, extname } from 'node:path';
|
|
3
3
|
import { getSession } from '../db/index.js';
|
|
4
4
|
// Same skip list as state-persistence.ts — no value showing these to clients
|
|
5
5
|
const SKIP_NAMES = new Set([
|
|
@@ -7,8 +7,65 @@ const SKIP_NAMES = new Set([
|
|
|
7
7
|
'.pnpm-store', '.yarn', '.venv', 'venv', '.tmp', 'tmp',
|
|
8
8
|
]);
|
|
9
9
|
const SKIP_EXTENSIONS = new Set(['.sock', '.lock', '.pid']);
|
|
10
|
-
// Max file size
|
|
11
|
-
const
|
|
10
|
+
// Max file size for JSON mode (1 MB) — encoding huge files as JSON strings is wasteful
|
|
11
|
+
const MAX_JSON_FILE_SIZE = 1_048_576;
|
|
12
|
+
// Max file size for raw streaming (100 MB) — prevent abuse
|
|
13
|
+
const MAX_RAW_FILE_SIZE = 104_857_600;
|
|
14
|
+
/** Simple extension → MIME type map. No external dependency needed. */
|
|
15
|
+
const MIME_TYPES = {
|
|
16
|
+
'.html': 'text/html',
|
|
17
|
+
'.htm': 'text/html',
|
|
18
|
+
'.css': 'text/css',
|
|
19
|
+
'.js': 'application/javascript',
|
|
20
|
+
'.mjs': 'application/javascript',
|
|
21
|
+
'.json': 'application/json',
|
|
22
|
+
'.xml': 'application/xml',
|
|
23
|
+
'.csv': 'text/csv',
|
|
24
|
+
'.txt': 'text/plain',
|
|
25
|
+
'.md': 'text/markdown',
|
|
26
|
+
'.yaml': 'text/yaml',
|
|
27
|
+
'.yml': 'text/yaml',
|
|
28
|
+
'.toml': 'text/plain',
|
|
29
|
+
'.ts': 'text/typescript',
|
|
30
|
+
'.tsx': 'text/typescript',
|
|
31
|
+
'.jsx': 'text/javascript',
|
|
32
|
+
'.py': 'text/x-python',
|
|
33
|
+
'.rb': 'text/x-ruby',
|
|
34
|
+
'.rs': 'text/x-rust',
|
|
35
|
+
'.go': 'text/x-go',
|
|
36
|
+
'.java': 'text/x-java',
|
|
37
|
+
'.c': 'text/x-c',
|
|
38
|
+
'.cpp': 'text/x-c++',
|
|
39
|
+
'.h': 'text/x-c',
|
|
40
|
+
'.sh': 'text/x-shellscript',
|
|
41
|
+
'.bash': 'text/x-shellscript',
|
|
42
|
+
'.zsh': 'text/x-shellscript',
|
|
43
|
+
'.sql': 'text/x-sql',
|
|
44
|
+
'.svg': 'image/svg+xml',
|
|
45
|
+
'.png': 'image/png',
|
|
46
|
+
'.jpg': 'image/jpeg',
|
|
47
|
+
'.jpeg': 'image/jpeg',
|
|
48
|
+
'.gif': 'image/gif',
|
|
49
|
+
'.webp': 'image/webp',
|
|
50
|
+
'.ico': 'image/x-icon',
|
|
51
|
+
'.pdf': 'application/pdf',
|
|
52
|
+
'.zip': 'application/zip',
|
|
53
|
+
'.gz': 'application/gzip',
|
|
54
|
+
'.tar': 'application/x-tar',
|
|
55
|
+
'.wasm': 'application/wasm',
|
|
56
|
+
'.mp4': 'video/mp4',
|
|
57
|
+
'.webm': 'video/webm',
|
|
58
|
+
'.mp3': 'audio/mpeg',
|
|
59
|
+
'.wav': 'audio/wav',
|
|
60
|
+
'.woff': 'font/woff',
|
|
61
|
+
'.woff2': 'font/woff2',
|
|
62
|
+
'.ttf': 'font/ttf',
|
|
63
|
+
'.otf': 'font/otf',
|
|
64
|
+
};
|
|
65
|
+
function getMimeType(filePath) {
|
|
66
|
+
const ext = extname(filePath).toLowerCase();
|
|
67
|
+
return MIME_TYPES[ext] || 'application/octet-stream';
|
|
68
|
+
}
|
|
12
69
|
/**
|
|
13
70
|
* Recursively list files in a directory, returning flat paths relative to root.
|
|
14
71
|
*/
|
|
@@ -52,10 +109,10 @@ function listFiles(dir, root) {
|
|
|
52
109
|
* Prefers the live sandbox workspace; falls back to persisted snapshot.
|
|
53
110
|
* Returns { dir, source } or null if neither exists.
|
|
54
111
|
*/
|
|
55
|
-
function resolveWorkspace(coordinator, dataDir, session) {
|
|
112
|
+
async function resolveWorkspace(coordinator, dataDir, session) {
|
|
56
113
|
// Try live sandbox first
|
|
57
114
|
try {
|
|
58
|
-
const backend = coordinator.
|
|
115
|
+
const backend = await coordinator.getBackendForRunnerAsync(session.runnerId);
|
|
59
116
|
const sandbox = backend.getSandbox(session.sandboxId);
|
|
60
117
|
if (sandbox && existsSync(sandbox.workspaceDir)) {
|
|
61
118
|
return { dir: sandbox.workspaceDir, source: 'sandbox' };
|
|
@@ -63,7 +120,7 @@ function resolveWorkspace(coordinator, dataDir, session) {
|
|
|
63
120
|
}
|
|
64
121
|
catch { /* runner gone */ }
|
|
65
122
|
// Fall back to persisted snapshot
|
|
66
|
-
const snapshotDir = join(dataDir, 'sessions', session.
|
|
123
|
+
const snapshotDir = join(dataDir, 'sessions', session.id, 'workspace');
|
|
67
124
|
if (existsSync(snapshotDir)) {
|
|
68
125
|
return { dir: snapshotDir, source: 'snapshot' };
|
|
69
126
|
}
|
|
@@ -108,14 +165,14 @@ export function fileRoutes(app, coordinator, dataDir) {
|
|
|
108
165
|
if (!session || session.tenantId !== req.tenantId) {
|
|
109
166
|
return reply.status(404).send({ error: 'Session not found', statusCode: 404 });
|
|
110
167
|
}
|
|
111
|
-
const workspace = resolveWorkspace(coordinator, dataDir, session);
|
|
168
|
+
const workspace = await resolveWorkspace(coordinator, dataDir, session);
|
|
112
169
|
if (!workspace) {
|
|
113
170
|
return reply.status(404).send({ error: 'No workspace available for this session', statusCode: 404 });
|
|
114
171
|
}
|
|
115
172
|
const files = listFiles(workspace.dir, workspace.dir);
|
|
116
173
|
return reply.send({ files, source: workspace.source });
|
|
117
174
|
});
|
|
118
|
-
// Get single file content
|
|
175
|
+
// Get single file content (raw by default, JSON with ?format=json)
|
|
119
176
|
app.get('/api/sessions/:id/files/*', {
|
|
120
177
|
schema: {
|
|
121
178
|
tags: ['sessions'],
|
|
@@ -127,19 +184,11 @@ export function fileRoutes(app, coordinator, dataDir) {
|
|
|
127
184
|
},
|
|
128
185
|
required: ['id', '*'],
|
|
129
186
|
},
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
path: { type: 'string' },
|
|
135
|
-
content: { type: 'string' },
|
|
136
|
-
size: { type: 'integer' },
|
|
137
|
-
source: { type: 'string', enum: ['sandbox', 'snapshot'] },
|
|
138
|
-
},
|
|
139
|
-
required: ['path', 'content', 'size', 'source'],
|
|
187
|
+
querystring: {
|
|
188
|
+
type: 'object',
|
|
189
|
+
properties: {
|
|
190
|
+
format: { type: 'string', enum: ['json', 'raw'] },
|
|
140
191
|
},
|
|
141
|
-
400: { $ref: 'ApiError#' },
|
|
142
|
-
404: { $ref: 'ApiError#' },
|
|
143
192
|
},
|
|
144
193
|
},
|
|
145
194
|
}, async (req, reply) => {
|
|
@@ -155,7 +204,7 @@ export function fileRoutes(app, coordinator, dataDir) {
|
|
|
155
204
|
if (filePath.includes('..') || filePath.startsWith('/')) {
|
|
156
205
|
return reply.status(400).send({ error: 'Invalid file path', statusCode: 400 });
|
|
157
206
|
}
|
|
158
|
-
const workspace = resolveWorkspace(coordinator, dataDir, session);
|
|
207
|
+
const workspace = await resolveWorkspace(coordinator, dataDir, session);
|
|
159
208
|
if (!workspace) {
|
|
160
209
|
return reply.status(404).send({ error: 'No workspace available for this session', statusCode: 404 });
|
|
161
210
|
}
|
|
@@ -174,16 +223,33 @@ export function fileRoutes(app, coordinator, dataDir) {
|
|
|
174
223
|
if (!st.isFile()) {
|
|
175
224
|
return reply.status(400).send({ error: 'Path is not a file', statusCode: 400 });
|
|
176
225
|
}
|
|
177
|
-
|
|
178
|
-
|
|
226
|
+
const format = req.query.format;
|
|
227
|
+
// JSON mode: backwards-compatible JSON-wrapped response
|
|
228
|
+
if (format === 'json') {
|
|
229
|
+
if (st.size > MAX_JSON_FILE_SIZE) {
|
|
230
|
+
return reply.status(400).send({ error: `File too large (${st.size} bytes, max ${MAX_JSON_FILE_SIZE})`, statusCode: 400 });
|
|
231
|
+
}
|
|
232
|
+
const content = readFileSync(fullPath, 'utf-8');
|
|
233
|
+
return reply.send({
|
|
234
|
+
path: filePath,
|
|
235
|
+
content,
|
|
236
|
+
size: st.size,
|
|
237
|
+
source: workspace.source,
|
|
238
|
+
});
|
|
179
239
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
240
|
+
// Raw mode (default): stream file bytes with proper headers
|
|
241
|
+
if (st.size > MAX_RAW_FILE_SIZE) {
|
|
242
|
+
return reply.status(400).send({ error: `File too large (${st.size} bytes, max ${MAX_RAW_FILE_SIZE})`, statusCode: 400 });
|
|
243
|
+
}
|
|
244
|
+
const fileName = basename(filePath);
|
|
245
|
+
const mimeType = getMimeType(filePath);
|
|
246
|
+
void reply
|
|
247
|
+
.header('Content-Type', mimeType)
|
|
248
|
+
.header('Content-Disposition', `attachment; filename*=UTF-8''${encodeURIComponent(fileName)}`)
|
|
249
|
+
.header('Content-Length', st.size)
|
|
250
|
+
.header('X-Ash-Source', workspace.source);
|
|
251
|
+
const stream = createReadStream(fullPath);
|
|
252
|
+
return reply.send(stream);
|
|
187
253
|
});
|
|
188
254
|
}
|
|
189
255
|
//# sourceMappingURL=files.js.map
|
package/dist/routes/files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"files.js","sourceRoot":"","sources":["../../src/routes/files.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"health.d.ts","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAalE,wBAAgB,YAAY,CAAC,GAAG,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,SAAS,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAyEtH"}
|
package/dist/routes/health.js
CHANGED
|
@@ -1,10 +1,15 @@
|
|
|
1
|
+
import { hostname } from 'node:os';
|
|
1
2
|
import { listSessions } from '../db/index.js';
|
|
2
3
|
const startTime = Date.now();
|
|
4
|
+
/** Unique coordinator ID: hostname + PID. Useful for identifying which coordinator
|
|
5
|
+
* handles which requests in multi-coordinator deployments. */
|
|
6
|
+
const coordinatorId = `${hostname()}-${process.pid}`;
|
|
3
7
|
const EMPTY_POOL = {
|
|
4
8
|
total: 0, cold: 0, warming: 0, warm: 0, waiting: 0, running: 0,
|
|
5
9
|
maxCapacity: 0, resumeWarmHits: 0, resumeColdHits: 0,
|
|
6
10
|
};
|
|
7
11
|
export function healthRoutes(app, coordinator, localPool) {
|
|
12
|
+
console.log(`[coordinator] Starting with ID: ${coordinatorId}`);
|
|
8
13
|
app.get('/health', {
|
|
9
14
|
schema: {
|
|
10
15
|
tags: ['health'],
|
|
@@ -15,10 +20,13 @@ export function healthRoutes(app, coordinator, localPool) {
|
|
|
15
20
|
}, async (_req, reply) => {
|
|
16
21
|
const sessions = (await listSessions()).filter((s) => s.status === 'active');
|
|
17
22
|
const poolStats = localPool ? await localPool.statsAsync() : EMPTY_POOL;
|
|
23
|
+
const runners = await coordinator.getRunnerInfoFromDb();
|
|
18
24
|
return reply.send({
|
|
19
25
|
status: 'ok',
|
|
26
|
+
coordinatorId,
|
|
20
27
|
activeSessions: sessions.length,
|
|
21
28
|
activeSandboxes: localPool?.activeCount ?? 0,
|
|
29
|
+
remoteRunners: runners.length,
|
|
22
30
|
uptime: Math.floor((Date.now() - startTime) / 1000),
|
|
23
31
|
pool: poolStats,
|
|
24
32
|
});
|
|
@@ -33,7 +41,7 @@ export function healthRoutes(app, coordinator, localPool) {
|
|
|
33
41
|
const lines = [
|
|
34
42
|
'# HELP ash_up Whether the Ash server is up (always 1 if reachable).',
|
|
35
43
|
'# TYPE ash_up gauge',
|
|
36
|
-
|
|
44
|
+
`ash_up{coordinator="${coordinatorId}"} 1`,
|
|
37
45
|
'',
|
|
38
46
|
'# HELP ash_uptime_seconds Seconds since server start.',
|
|
39
47
|
'# TYPE ash_uptime_seconds gauge',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"health.js","sourceRoot":"","sources":["../../src/routes/health.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/routes/queue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAK/C,wBAAgB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,CAsJtD"}
|