@ash-ai/server 0.0.4 → 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__/crypto.test.js +39 -12
- package/dist/__tests__/crypto.test.js.map +1 -1
- package/dist/__tests__/files.test.js +15 -2
- 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 +1 -1
- 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 +7 -1
- package/dist/crypto.d.ts.map +1 -1
- package/dist/crypto.js +22 -6
- package/dist/crypto.js.map +1 -1
- package/dist/db/drizzle-db.d.ts +2 -1
- package/dist/db/drizzle-db.d.ts.map +1 -1
- package/dist/db/drizzle-db.js +3 -3
- package/dist/db/drizzle-db.js.map +1 -1
- package/dist/db/index.d.ts +4 -2
- package/dist/db/index.d.ts.map +1 -1
- package/dist/db/index.js +2 -2
- package/dist/db/index.js.map +1 -1
- package/dist/db/schema.pg.d.ts +17 -0
- package/dist/db/schema.pg.d.ts.map +1 -1
- package/dist/db/schema.pg.js +1 -0
- package/dist/db/schema.pg.js.map +1 -1
- package/dist/db/schema.sqlite.d.ts +19 -0
- package/dist/db/schema.sqlite.d.ts.map +1 -1
- package/dist/db/schema.sqlite.js +1 -0
- package/dist/db/schema.sqlite.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +16 -112
- package/dist/index.js.map +1 -1
- package/dist/routes/credentials.js +3 -3
- package/dist/routes/credentials.js.map +1 -1
- package/dist/routes/files.d.ts.map +1 -1
- package/dist/routes/files.js +92 -26
- package/dist/routes/files.js.map +1 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +77 -1
- package/dist/routes/sessions.js.map +1 -1
- package/dist/runner/local-backend.d.ts.map +1 -1
- package/dist/runner/local-backend.js +1 -0
- package/dist/runner/local-backend.js.map +1 -1
- package/dist/runner/remote-backend.d.ts.map +1 -1
- package/dist/runner/remote-backend.js +2 -0
- package/dist/runner/remote-backend.js.map +1 -1
- package/dist/runner/runner-client.d.ts +2 -0
- package/dist/runner/runner-client.d.ts.map +1 -1
- package/dist/runner/runner-client.js +3 -0
- package/dist/runner/runner-client.js.map +1 -1
- package/dist/runner/types.d.ts +2 -0
- package/dist/runner/types.d.ts.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/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -1,27 +1,9 @@
|
|
|
1
|
-
import
|
|
2
|
-
import swagger from '@fastify/swagger';
|
|
3
|
-
import swaggerUi from '@fastify/swagger-ui';
|
|
4
|
-
import { join, resolve, dirname } from 'node:path';
|
|
1
|
+
import { resolve, join, dirname } from 'node:path';
|
|
5
2
|
import { fileURLToPath } from 'node:url';
|
|
6
3
|
import { DEFAULT_PORT, DEFAULT_HOST, DEFAULT_DATA_DIR, DEFAULT_MAX_SANDBOXES, DEFAULT_IDLE_TIMEOUT_MS } from '@ash-ai/shared';
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
import { RunnerCoordinator } from './runner/coordinator.js';
|
|
11
|
-
import { registerSchemas } from './schemas.js';
|
|
12
|
-
import { registerAuth } from './auth.js';
|
|
13
|
-
import { agentRoutes } from './routes/agents.js';
|
|
14
|
-
import { sessionRoutes } from './routes/sessions.js';
|
|
15
|
-
import { healthRoutes } from './routes/health.js';
|
|
16
|
-
import { runnerRoutes } from './routes/runners.js';
|
|
17
|
-
import { fileRoutes } from './routes/files.js';
|
|
18
|
-
import { credentialRoutes } from './routes/credentials.js';
|
|
19
|
-
import { queueRoutes } from './routes/queue.js';
|
|
20
|
-
import { attachmentRoutes } from './routes/attachments.js';
|
|
21
|
-
import { usageRoutes } from './routes/usage.js';
|
|
22
|
-
import { workspaceRoutes } from './routes/workspace.js';
|
|
23
|
-
import { createTelemetryExporter } from './telemetry/exporter.js';
|
|
24
|
-
// Config from env
|
|
4
|
+
import { createAshServer } from './server.js';
|
|
5
|
+
export { createAshServer } from './server.js';
|
|
6
|
+
// When run directly (not imported), start the server from env config
|
|
25
7
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
26
8
|
const monorepoRoot = resolve(__dirname, '..', '..', '..');
|
|
27
9
|
const port = parseInt(process.env.ASH_PORT || String(DEFAULT_PORT), 10);
|
|
@@ -30,99 +12,21 @@ const dataDir = resolve(process.env.ASH_DATA_DIR || DEFAULT_DATA_DIR);
|
|
|
30
12
|
const bridgeEntry = process.env.ASH_BRIDGE_ENTRY
|
|
31
13
|
? resolve(process.env.ASH_BRIDGE_ENTRY)
|
|
32
14
|
: join(monorepoRoot, 'packages', 'bridge', 'dist', 'index.js');
|
|
33
|
-
// Mode: 'standalone' (default) or 'coordinator'
|
|
34
15
|
const mode = (process.env.ASH_MODE || 'standalone');
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
bridgeEntry,
|
|
46
|
-
});
|
|
47
|
-
const maxCapacity = parseInt(process.env.ASH_MAX_SANDBOXES || String(DEFAULT_MAX_SANDBOXES), 10);
|
|
48
|
-
const idleTimeoutMs = parseInt(process.env.ASH_IDLE_TIMEOUT_MS || String(DEFAULT_IDLE_TIMEOUT_MS), 10);
|
|
49
|
-
pool = new SandboxPool({
|
|
50
|
-
manager: sandboxManager,
|
|
51
|
-
db,
|
|
52
|
-
dataDir,
|
|
53
|
-
maxCapacity,
|
|
54
|
-
idleTimeoutMs,
|
|
55
|
-
onBeforeEvict: async (entry) => {
|
|
56
|
-
if (entry.sessionId) {
|
|
57
|
-
persistSessionState(dataDir, entry.sessionId, entry.sandbox.workspaceDir, entry.agentName);
|
|
58
|
-
syncStateToCloud(dataDir, entry.sessionId).catch((err) => console.error(`[server] Cloud sync failed for ${entry.sessionId}:`, err));
|
|
59
|
-
await updateSessionStatus(entry.sessionId, 'paused');
|
|
60
|
-
}
|
|
61
|
-
},
|
|
62
|
-
});
|
|
63
|
-
await pool.init();
|
|
64
|
-
pool.startIdleSweep();
|
|
65
|
-
const localBackend = new LocalRunnerBackend(pool, dataDir);
|
|
66
|
-
coordinator = new RunnerCoordinator({ localBackend });
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
// Coordinator mode: pure control plane, no local sandbox pool
|
|
70
|
-
// Runners must register and provide sandbox capacity
|
|
71
|
-
coordinator = new RunnerCoordinator({});
|
|
72
|
-
}
|
|
73
|
-
const telemetry = createTelemetryExporter();
|
|
74
|
-
const app = Fastify({ logger: true });
|
|
75
|
-
// OpenAPI / Swagger
|
|
76
|
-
await app.register(swagger, {
|
|
77
|
-
openapi: {
|
|
78
|
-
info: {
|
|
79
|
-
title: 'Ash API',
|
|
80
|
-
description: 'REST API for deploying and orchestrating hosted AI agents',
|
|
81
|
-
version: '0.1.0',
|
|
82
|
-
},
|
|
83
|
-
servers: [{ url: `http://localhost:${port}` }],
|
|
84
|
-
tags: [
|
|
85
|
-
{ name: 'health', description: 'Server health' },
|
|
86
|
-
{ name: 'agents', description: 'Agent deployment and management' },
|
|
87
|
-
{ name: 'sessions', description: 'Session lifecycle and messaging' },
|
|
88
|
-
{ name: 'credentials', description: 'Credential storage and management' },
|
|
89
|
-
{ name: 'attachments', description: 'File attachments for sessions' },
|
|
90
|
-
{ name: 'queue', description: 'Async message queue' },
|
|
91
|
-
{ name: 'usage', description: 'Usage tracking and analytics' },
|
|
92
|
-
],
|
|
93
|
-
},
|
|
16
|
+
const { app, shutdown } = await createAshServer({
|
|
17
|
+
dataDir,
|
|
18
|
+
databaseUrl: process.env.ASH_DATABASE_URL,
|
|
19
|
+
mode,
|
|
20
|
+
bridgeEntry,
|
|
21
|
+
port,
|
|
22
|
+
host,
|
|
23
|
+
maxSandboxes: parseInt(process.env.ASH_MAX_SANDBOXES || String(DEFAULT_MAX_SANDBOXES), 10),
|
|
24
|
+
idleTimeoutMs: parseInt(process.env.ASH_IDLE_TIMEOUT_MS || String(DEFAULT_IDLE_TIMEOUT_MS), 10),
|
|
25
|
+
apiKey: process.env.ASH_API_KEY,
|
|
94
26
|
});
|
|
95
|
-
await app.register(swaggerUi, { routePrefix: '/docs' });
|
|
96
|
-
registerSchemas(app);
|
|
97
|
-
// Auth: multi-tenant API key resolution with ASH_API_KEY fallback
|
|
98
|
-
registerAuth(app, process.env.ASH_API_KEY, db);
|
|
99
|
-
// Routes
|
|
100
|
-
agentRoutes(app, dataDir);
|
|
101
|
-
sessionRoutes(app, coordinator, dataDir, telemetry);
|
|
102
|
-
fileRoutes(app, coordinator, dataDir);
|
|
103
|
-
credentialRoutes(app);
|
|
104
|
-
queueRoutes(app);
|
|
105
|
-
attachmentRoutes(app, dataDir);
|
|
106
|
-
usageRoutes(app);
|
|
107
|
-
workspaceRoutes(app, coordinator, dataDir);
|
|
108
|
-
healthRoutes(app, coordinator, pool);
|
|
109
|
-
runnerRoutes(app, coordinator);
|
|
110
|
-
coordinator.startLivenessSweep();
|
|
111
27
|
// Graceful shutdown
|
|
112
|
-
async
|
|
113
|
-
|
|
114
|
-
await telemetry.shutdown();
|
|
115
|
-
coordinator.stopLivenessSweep();
|
|
116
|
-
if (pool) {
|
|
117
|
-
pool.stopIdleSweep();
|
|
118
|
-
await pool.destroyAll();
|
|
119
|
-
}
|
|
120
|
-
await closeDb();
|
|
121
|
-
await app.close();
|
|
122
|
-
process.exit(0);
|
|
123
|
-
}
|
|
124
|
-
process.on('SIGTERM', shutdown);
|
|
125
|
-
process.on('SIGINT', shutdown);
|
|
28
|
+
process.on('SIGTERM', async () => { await shutdown(); process.exit(0); });
|
|
29
|
+
process.on('SIGINT', async () => { await shutdown(); process.exit(0); });
|
|
126
30
|
// Start
|
|
127
31
|
try {
|
|
128
32
|
await app.listen({ port, host });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,8 +42,8 @@ export function credentialRoutes(app) {
|
|
|
42
42
|
}
|
|
43
43
|
const { type, key, label } = req.body;
|
|
44
44
|
const id = randomUUID();
|
|
45
|
-
const { encrypted, iv, authTag } = encrypt(key, MASTER_KEY);
|
|
46
|
-
const credential = await insertCredential(id, req.tenantId, type, encrypted, iv, authTag, label ?? '');
|
|
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
47
|
return reply.status(201).send({ credential });
|
|
48
48
|
});
|
|
49
49
|
// List credentials (no plaintext returned)
|
|
@@ -110,7 +110,7 @@ export async function decryptCredential(credentialId, tenantId) {
|
|
|
110
110
|
if (!cred || cred.tenantId !== tenantId || !cred.active)
|
|
111
111
|
return null;
|
|
112
112
|
try {
|
|
113
|
-
const key = decrypt(cred.encryptedKey, cred.iv, cred.authTag, MASTER_KEY);
|
|
113
|
+
const key = decrypt(cred.encryptedKey, cred.iv, cred.authTag, MASTER_KEY, cred.salt);
|
|
114
114
|
return { type: cred.type, key };
|
|
115
115
|
}
|
|
116
116
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/routes/credentials.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACxG,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEhD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AAElD,MAAM,UAAU,gBAAgB,CAAC,GAAoB;IACnD,yBAAyB;IACzB,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE;QAC3B,MAAM,EAAE;YACN,IAAI,EAAE,CAAC,aAAa,CAAC;YACrB,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE;oBACjE,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE;oBACrC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;iBAC1B;gBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;aAC1B;YACD,QAAQ,EAAE;gBACR,GAAG,EAAE;oBACH,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,UAAU,EAAE;4BACV,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE;gCACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gCACtB,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gCACxB,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gCACzB,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gCAC3B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;6BAC9B;yBACF;qBACF;iBACF;gBACD,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;gBAC1B,GAAG,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;aAC3B;SACF;KACF,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACtB,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gEAAgE,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9H,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAqD,CAAC;QACvF,MAAM,EAAE,GAAG,UAAU,EAAE,CAAC;QACxB,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;
|
|
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
|
*/
|
|
@@ -115,7 +172,7 @@ export function fileRoutes(app, coordinator, dataDir) {
|
|
|
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) => {
|
|
@@ -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":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAOhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA6BlE;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../src/routes/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAOhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA6BlE;;;GAGG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuBhF;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI,CAyrBvI"}
|
package/dist/routes/sessions.js
CHANGED
|
@@ -65,6 +65,8 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
65
65
|
properties: {
|
|
66
66
|
agent: { type: 'string' },
|
|
67
67
|
credentialId: { type: 'string' },
|
|
68
|
+
extraEnv: { type: 'object', additionalProperties: { type: 'string' } },
|
|
69
|
+
startupScript: { type: 'string' },
|
|
68
70
|
},
|
|
69
71
|
required: ['agent'],
|
|
70
72
|
},
|
|
@@ -77,7 +79,7 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
77
79
|
},
|
|
78
80
|
},
|
|
79
81
|
}, async (req, reply) => {
|
|
80
|
-
const { agent, credentialId } = req.body;
|
|
82
|
+
const { agent, credentialId, extraEnv: bodyExtraEnv, startupScript } = req.body;
|
|
81
83
|
const agentRecord = await getAgent(agent, req.tenantId);
|
|
82
84
|
if (!agentRecord) {
|
|
83
85
|
return reply.status(404).send({ error: `Agent "${agent}" not found`, statusCode: 404 });
|
|
@@ -93,6 +95,10 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
93
95
|
extraEnv = { [envKey]: cred.key };
|
|
94
96
|
touchCredentialUsed(credentialId).catch(() => { });
|
|
95
97
|
}
|
|
98
|
+
// Merge body-level extraEnv (overrides credential env on conflict)
|
|
99
|
+
if (bodyExtraEnv) {
|
|
100
|
+
extraEnv = { ...extraEnv, ...bodyExtraEnv };
|
|
101
|
+
}
|
|
96
102
|
const sessionId = randomUUID();
|
|
97
103
|
try {
|
|
98
104
|
const { backend, runnerId } = await coordinator.selectBackend();
|
|
@@ -102,6 +108,7 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
102
108
|
agentName: agentRecord.name,
|
|
103
109
|
sandboxId: sessionId,
|
|
104
110
|
extraEnv,
|
|
111
|
+
startupScript,
|
|
105
112
|
onOomKill: () => {
|
|
106
113
|
updateSessionStatus(sessionId, 'paused').catch((err) => console.error(`Failed to update session status on OOM: ${err}`));
|
|
107
114
|
},
|
|
@@ -293,6 +300,8 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
293
300
|
'Cache-Control': 'no-cache',
|
|
294
301
|
'Connection': 'keep-alive',
|
|
295
302
|
});
|
|
303
|
+
// Emit session_start as first SSE event — clients know which session they're streaming
|
|
304
|
+
await writeSSE(reply.raw, `event: session_start\ndata: ${JSON.stringify({ sessionId: session.id })}\n\n`);
|
|
296
305
|
let eventCount = 0;
|
|
297
306
|
let firstEventMs = 0;
|
|
298
307
|
try {
|
|
@@ -356,6 +365,8 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
356
365
|
catch (err) {
|
|
357
366
|
const msg = err instanceof Error ? err.message : String(err);
|
|
358
367
|
reply.raw.write(`event: error\ndata: ${JSON.stringify({ error: msg })}\n\n`);
|
|
368
|
+
// Emit session_end when an error terminates the stream
|
|
369
|
+
reply.raw.write(`event: session_end\ndata: ${JSON.stringify({ sessionId: session.id })}\n\n`);
|
|
359
370
|
}
|
|
360
371
|
finally {
|
|
361
372
|
// Mark waiting after message processing completes
|
|
@@ -376,6 +387,71 @@ export function sessionRoutes(app, coordinator, dataDir, telemetry) {
|
|
|
376
387
|
}
|
|
377
388
|
reply.raw.end();
|
|
378
389
|
});
|
|
390
|
+
// Execute a command in the session's sandbox (synchronous — waits for result)
|
|
391
|
+
app.post('/api/sessions/:id/exec', {
|
|
392
|
+
schema: {
|
|
393
|
+
tags: ['sessions'],
|
|
394
|
+
params: idParam,
|
|
395
|
+
body: {
|
|
396
|
+
type: 'object',
|
|
397
|
+
properties: {
|
|
398
|
+
command: { type: 'string' },
|
|
399
|
+
timeout: { type: 'integer', minimum: 1, maximum: 300000 },
|
|
400
|
+
},
|
|
401
|
+
required: ['command'],
|
|
402
|
+
},
|
|
403
|
+
response: {
|
|
404
|
+
200: {
|
|
405
|
+
type: 'object',
|
|
406
|
+
properties: {
|
|
407
|
+
exitCode: { type: 'integer' },
|
|
408
|
+
stdout: { type: 'string' },
|
|
409
|
+
stderr: { type: 'string' },
|
|
410
|
+
},
|
|
411
|
+
required: ['exitCode', 'stdout', 'stderr'],
|
|
412
|
+
},
|
|
413
|
+
400: { $ref: 'ApiError#' },
|
|
414
|
+
404: { $ref: 'ApiError#' },
|
|
415
|
+
500: { $ref: 'ApiError#' },
|
|
416
|
+
},
|
|
417
|
+
},
|
|
418
|
+
}, async (req, reply) => {
|
|
419
|
+
const session = await getSession(req.params.id);
|
|
420
|
+
if (!session || session.tenantId !== req.tenantId) {
|
|
421
|
+
return reply.status(404).send({ error: 'Session not found', statusCode: 404 });
|
|
422
|
+
}
|
|
423
|
+
if (session.status !== 'active') {
|
|
424
|
+
return reply.status(400).send({ error: `Session is ${session.status}`, statusCode: 400 });
|
|
425
|
+
}
|
|
426
|
+
const { command, timeout } = req.body;
|
|
427
|
+
let backend;
|
|
428
|
+
try {
|
|
429
|
+
backend = await coordinator.getBackendForRunnerAsync(session.runnerId);
|
|
430
|
+
}
|
|
431
|
+
catch {
|
|
432
|
+
return reply.status(500).send({ error: 'Runner not available', statusCode: 500 });
|
|
433
|
+
}
|
|
434
|
+
const sandbox = backend.getSandbox(session.sandboxId);
|
|
435
|
+
if (!sandbox) {
|
|
436
|
+
return reply.status(500).send({ error: 'Sandbox not found', statusCode: 500 });
|
|
437
|
+
}
|
|
438
|
+
try {
|
|
439
|
+
const events = backend.sendCommand(session.sandboxId, { cmd: 'exec', command, timeout });
|
|
440
|
+
for await (const event of events) {
|
|
441
|
+
if (event.ev === 'exec_result') {
|
|
442
|
+
return reply.send({ exitCode: event.exitCode, stdout: event.stdout, stderr: event.stderr });
|
|
443
|
+
}
|
|
444
|
+
if (event.ev === 'error') {
|
|
445
|
+
return reply.status(500).send({ error: event.error, statusCode: 500 });
|
|
446
|
+
}
|
|
447
|
+
}
|
|
448
|
+
return reply.status(500).send({ error: 'No exec result received', statusCode: 500 });
|
|
449
|
+
}
|
|
450
|
+
catch (err) {
|
|
451
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
452
|
+
return reply.status(500).send({ error: `Exec failed: ${msg}`, statusCode: 500 });
|
|
453
|
+
}
|
|
454
|
+
});
|
|
379
455
|
// Pause session
|
|
380
456
|
app.post('/api/sessions/:id/pause', {
|
|
381
457
|
schema: {
|