@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,144 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { insertQueueItem, getQueueItem, listQueueItems, updateQueueItemStatus, getQueueStats } from '../db/index.js';
|
|
3
|
+
export function queueRoutes(app) {
|
|
4
|
+
// Enqueue a new item
|
|
5
|
+
app.post('/api/queue', {
|
|
6
|
+
schema: {
|
|
7
|
+
tags: ['queue'],
|
|
8
|
+
body: {
|
|
9
|
+
type: 'object',
|
|
10
|
+
properties: {
|
|
11
|
+
agentName: { type: 'string' },
|
|
12
|
+
prompt: { type: 'string', minLength: 1 },
|
|
13
|
+
sessionId: { type: 'string', format: 'uuid' },
|
|
14
|
+
priority: { type: 'integer', minimum: 0, default: 0 },
|
|
15
|
+
maxRetries: { type: 'integer', minimum: 0, default: 3 },
|
|
16
|
+
},
|
|
17
|
+
required: ['agentName', 'prompt'],
|
|
18
|
+
},
|
|
19
|
+
response: {
|
|
20
|
+
201: {
|
|
21
|
+
type: 'object',
|
|
22
|
+
properties: { item: { $ref: 'QueueItem#' } },
|
|
23
|
+
required: ['item'],
|
|
24
|
+
},
|
|
25
|
+
400: { $ref: 'ApiError#' },
|
|
26
|
+
},
|
|
27
|
+
},
|
|
28
|
+
}, async (req, reply) => {
|
|
29
|
+
const { agentName, prompt, sessionId, priority, maxRetries } = req.body;
|
|
30
|
+
const id = randomUUID();
|
|
31
|
+
const item = await insertQueueItem(id, req.tenantId, agentName, prompt, sessionId, priority, maxRetries);
|
|
32
|
+
return reply.status(201).send({ item });
|
|
33
|
+
});
|
|
34
|
+
// List queue items (optional ?status= filter, ?limit=)
|
|
35
|
+
app.get('/api/queue', {
|
|
36
|
+
schema: {
|
|
37
|
+
tags: ['queue'],
|
|
38
|
+
querystring: {
|
|
39
|
+
type: 'object',
|
|
40
|
+
properties: {
|
|
41
|
+
status: { type: 'string', enum: ['pending', 'processing', 'completed', 'failed', 'cancelled'] },
|
|
42
|
+
limit: { type: 'integer', minimum: 1, maximum: 500, default: 50 },
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
response: {
|
|
46
|
+
200: {
|
|
47
|
+
type: 'object',
|
|
48
|
+
properties: {
|
|
49
|
+
items: { type: 'array', items: { $ref: 'QueueItem#' } },
|
|
50
|
+
},
|
|
51
|
+
required: ['items'],
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
},
|
|
55
|
+
}, async (req, reply) => {
|
|
56
|
+
const { status, limit } = req.query;
|
|
57
|
+
const items = await listQueueItems(req.tenantId, status, limit);
|
|
58
|
+
return reply.send({ items });
|
|
59
|
+
});
|
|
60
|
+
// Queue statistics
|
|
61
|
+
app.get('/api/queue/stats', {
|
|
62
|
+
schema: {
|
|
63
|
+
tags: ['queue'],
|
|
64
|
+
response: {
|
|
65
|
+
200: {
|
|
66
|
+
type: 'object',
|
|
67
|
+
properties: {
|
|
68
|
+
stats: {
|
|
69
|
+
type: 'object',
|
|
70
|
+
properties: {
|
|
71
|
+
pending: { type: 'integer' },
|
|
72
|
+
processing: { type: 'integer' },
|
|
73
|
+
completed: { type: 'integer' },
|
|
74
|
+
failed: { type: 'integer' },
|
|
75
|
+
cancelled: { type: 'integer' },
|
|
76
|
+
},
|
|
77
|
+
required: ['pending', 'processing', 'completed', 'failed', 'cancelled'],
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
|
+
required: ['stats'],
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
}, async (req, reply) => {
|
|
85
|
+
const stats = await getQueueStats(req.tenantId);
|
|
86
|
+
return reply.send({ stats });
|
|
87
|
+
});
|
|
88
|
+
// Get single queue item
|
|
89
|
+
app.get('/api/queue/:id', {
|
|
90
|
+
schema: {
|
|
91
|
+
tags: ['queue'],
|
|
92
|
+
params: {
|
|
93
|
+
type: 'object',
|
|
94
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
95
|
+
required: ['id'],
|
|
96
|
+
},
|
|
97
|
+
response: {
|
|
98
|
+
200: {
|
|
99
|
+
type: 'object',
|
|
100
|
+
properties: { item: { $ref: 'QueueItem#' } },
|
|
101
|
+
required: ['item'],
|
|
102
|
+
},
|
|
103
|
+
404: { $ref: 'ApiError#' },
|
|
104
|
+
},
|
|
105
|
+
},
|
|
106
|
+
}, async (req, reply) => {
|
|
107
|
+
const item = await getQueueItem(req.params.id);
|
|
108
|
+
if (!item || item.tenantId !== req.tenantId) {
|
|
109
|
+
return reply.status(404).send({ error: 'Queue item not found', statusCode: 404 });
|
|
110
|
+
}
|
|
111
|
+
return reply.send({ item });
|
|
112
|
+
});
|
|
113
|
+
// Cancel a queue item (only pending items can be cancelled)
|
|
114
|
+
app.delete('/api/queue/:id', {
|
|
115
|
+
schema: {
|
|
116
|
+
tags: ['queue'],
|
|
117
|
+
params: {
|
|
118
|
+
type: 'object',
|
|
119
|
+
properties: { id: { type: 'string', format: 'uuid' } },
|
|
120
|
+
required: ['id'],
|
|
121
|
+
},
|
|
122
|
+
response: {
|
|
123
|
+
200: {
|
|
124
|
+
type: 'object',
|
|
125
|
+
properties: { item: { $ref: 'QueueItem#' } },
|
|
126
|
+
required: ['item'],
|
|
127
|
+
},
|
|
128
|
+
400: { $ref: 'ApiError#' },
|
|
129
|
+
404: { $ref: 'ApiError#' },
|
|
130
|
+
},
|
|
131
|
+
},
|
|
132
|
+
}, async (req, reply) => {
|
|
133
|
+
const item = await getQueueItem(req.params.id);
|
|
134
|
+
if (!item || item.tenantId !== req.tenantId) {
|
|
135
|
+
return reply.status(404).send({ error: 'Queue item not found', statusCode: 404 });
|
|
136
|
+
}
|
|
137
|
+
if (item.status !== 'pending') {
|
|
138
|
+
return reply.status(400).send({ error: `Cannot cancel item with status "${item.status}"`, statusCode: 400 });
|
|
139
|
+
}
|
|
140
|
+
await updateQueueItemStatus(req.params.id, 'cancelled');
|
|
141
|
+
return reply.send({ item: { ...item, status: 'cancelled' } });
|
|
142
|
+
});
|
|
143
|
+
}
|
|
144
|
+
//# sourceMappingURL=queue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../../src/routes/queue.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/runners.d.ts
CHANGED
|
@@ -3,6 +3,11 @@ import type { RunnerCoordinator } from '../runner/coordinator.js';
|
|
|
3
3
|
/**
|
|
4
4
|
* Internal endpoints for runner registration and heartbeat.
|
|
5
5
|
* These are called by runner processes, not by clients.
|
|
6
|
+
* Protected by ASH_INTERNAL_SECRET when set (required in multi-machine mode).
|
|
7
|
+
*
|
|
8
|
+
* In multi-coordinator mode, all coordinators accept registration/heartbeat
|
|
9
|
+
* calls because they all write to the same shared database. The load balancer
|
|
10
|
+
* can route any runner's traffic to any coordinator — it doesn't matter.
|
|
6
11
|
*/
|
|
7
12
|
export declare function runnerRoutes(app: FastifyInstance, coordinator: RunnerCoordinator): void;
|
|
8
13
|
//# sourceMappingURL=runners.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runners.d.ts","sourceRoot":"","sources":["../../src/routes/runners.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"runners.d.ts","sourceRoot":"","sources":["../../src/routes/runners.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAgC,MAAM,SAAS,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAmBlE;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAyDvF"}
|
package/dist/routes/runners.js
CHANGED
|
@@ -1,31 +1,68 @@
|
|
|
1
|
+
const internalSecret = process.env.ASH_INTERNAL_SECRET;
|
|
2
|
+
/**
|
|
3
|
+
* Validate internal endpoint auth. If ASH_INTERNAL_SECRET is set,
|
|
4
|
+
* requires matching Authorization: Bearer <secret> header.
|
|
5
|
+
* No-op when secret is not configured (dev/single-machine mode).
|
|
6
|
+
*/
|
|
7
|
+
function validateInternalAuth(req, reply) {
|
|
8
|
+
if (!internalSecret)
|
|
9
|
+
return true;
|
|
10
|
+
const auth = req.headers.authorization;
|
|
11
|
+
if (!auth || auth !== `Bearer ${internalSecret}`) {
|
|
12
|
+
reply.status(401).send({ error: 'Unauthorized — invalid or missing internal secret' });
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
return true;
|
|
16
|
+
}
|
|
1
17
|
/**
|
|
2
18
|
* Internal endpoints for runner registration and heartbeat.
|
|
3
19
|
* These are called by runner processes, not by clients.
|
|
20
|
+
* Protected by ASH_INTERNAL_SECRET when set (required in multi-machine mode).
|
|
21
|
+
*
|
|
22
|
+
* In multi-coordinator mode, all coordinators accept registration/heartbeat
|
|
23
|
+
* calls because they all write to the same shared database. The load balancer
|
|
24
|
+
* can route any runner's traffic to any coordinator — it doesn't matter.
|
|
4
25
|
*/
|
|
5
26
|
export function runnerRoutes(app, coordinator) {
|
|
6
27
|
// Register a runner
|
|
7
28
|
app.post('/api/internal/runners/register', async (req, reply) => {
|
|
29
|
+
if (!validateInternalAuth(req, reply))
|
|
30
|
+
return;
|
|
8
31
|
const { runnerId, host, port, maxSandboxes } = req.body;
|
|
9
32
|
if (!runnerId || !host || !port) {
|
|
10
33
|
return reply.status(400).send({ error: 'Missing required fields: runnerId, host, port' });
|
|
11
34
|
}
|
|
12
|
-
coordinator.registerRunner({ runnerId, host, port, maxSandboxes: maxSandboxes ?? 100 });
|
|
35
|
+
await coordinator.registerRunner({ runnerId, host, port, maxSandboxes: maxSandboxes ?? 100 });
|
|
13
36
|
return reply.send({ ok: true });
|
|
14
37
|
});
|
|
15
38
|
// Runner heartbeat
|
|
16
39
|
app.post('/api/internal/runners/heartbeat', async (req, reply) => {
|
|
40
|
+
if (!validateInternalAuth(req, reply))
|
|
41
|
+
return;
|
|
17
42
|
const { runnerId, stats } = req.body;
|
|
18
43
|
if (!runnerId) {
|
|
19
44
|
return reply.status(400).send({ error: 'Missing runnerId' });
|
|
20
45
|
}
|
|
21
|
-
coordinator.heartbeat(runnerId, stats);
|
|
46
|
+
await coordinator.heartbeat(runnerId, stats);
|
|
47
|
+
return reply.send({ ok: true });
|
|
48
|
+
});
|
|
49
|
+
// Graceful deregistration — runner calls this during shutdown
|
|
50
|
+
app.post('/api/internal/runners/deregister', async (req, reply) => {
|
|
51
|
+
if (!validateInternalAuth(req, reply))
|
|
52
|
+
return;
|
|
53
|
+
const { runnerId } = req.body;
|
|
54
|
+
if (!runnerId) {
|
|
55
|
+
return reply.status(400).send({ error: 'Missing runnerId' });
|
|
56
|
+
}
|
|
57
|
+
await coordinator.deregisterRunner(runnerId);
|
|
22
58
|
return reply.send({ ok: true });
|
|
23
59
|
});
|
|
24
|
-
// List runners (for monitoring)
|
|
60
|
+
// List runners (for monitoring) — reads from DB, not just local cache
|
|
25
61
|
app.get('/api/internal/runners', async (_req, reply) => {
|
|
62
|
+
const runners = await coordinator.getRunnerInfoFromDb();
|
|
26
63
|
return reply.send({
|
|
27
|
-
runners
|
|
28
|
-
count:
|
|
64
|
+
runners,
|
|
65
|
+
count: runners.length,
|
|
29
66
|
hasLocal: coordinator.hasLocalBackend,
|
|
30
67
|
});
|
|
31
68
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runners.js","sourceRoot":"","sources":["../../src/routes/runners.ts"],"names":[],"mappings":"AAGA
|
|
1
|
+
{"version":3,"file":"runners.js","sourceRoot":"","sources":["../../src/routes/runners.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { FastifyInstance } from 'fastify';
|
|
2
2
|
import type { ServerResponse } from 'node:http';
|
|
3
3
|
import type { RunnerCoordinator } from '../runner/coordinator.js';
|
|
4
|
+
import type { TelemetryExporter } from '../telemetry/exporter.js';
|
|
4
5
|
/**
|
|
5
6
|
* Write an SSE frame with backpressure. If the kernel TCP send buffer is full,
|
|
6
7
|
* waits for `drain` up to SSE_WRITE_TIMEOUT_MS before giving up.
|
|
7
8
|
*/
|
|
8
9
|
export declare function writeSSE(raw: ServerResponse, frame: string): Promise<void>;
|
|
9
|
-
export declare function sessionRoutes(app: FastifyInstance, coordinator: RunnerCoordinator, dataDir: string): void;
|
|
10
|
+
export declare function sessionRoutes(app: FastifyInstance, coordinator: RunnerCoordinator, dataDir: string, telemetry: TelemetryExporter): void;
|
|
10
11
|
//# sourceMappingURL=sessions.d.ts.map
|
|
@@ -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;
|
|
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"}
|