@taskcast/server 0.1.2 → 0.3.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/dist/auth.d.ts +2 -0
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +4 -0
- package/dist/auth.js.map +1 -1
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/routes/sse.js +2 -2
- package/dist/routes/sse.js.map +1 -1
- package/dist/routes/tasks.d.ts.map +1 -1
- package/dist/routes/tasks.js +22 -1
- package/dist/routes/tasks.js.map +1 -1
- package/dist/routes/worker-ws.d.ts +39 -0
- package/dist/routes/worker-ws.d.ts.map +1 -0
- package/dist/routes/worker-ws.js +191 -0
- package/dist/routes/worker-ws.js.map +1 -0
- package/dist/routes/workers.d.ts +6 -0
- package/dist/routes/workers.d.ts.map +1 -0
- package/dist/routes/workers.js +93 -0
- package/dist/routes/workers.js.map +1 -0
- package/package.json +3 -3
package/dist/auth.d.ts
CHANGED
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAA;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAA;AAEhD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,CAAC,EAAE,SAAS,CAAA;IACf,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;CAC3D;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,eAAe,EAAE,CAAA;CACzB;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,kBAAkB;QAC1B,IAAI,EAAE,WAAW,CAAA;KAClB;CACF;AAID,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU;;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,CAAA;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,CAAA;AAEhD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,QAAQ,CAAA;IACd,GAAG,CAAC,EAAE,SAAS,CAAA;IACf,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;CAC3D;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,EAAE,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,eAAe,EAAE,CAAA;CACzB;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,kBAAkB;QAC1B,IAAI,EAAE,WAAW,CAAA;KAClB;CACF;AAID,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU;;iBA0CtD;AAiBD,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,EACzB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAKT"}
|
package/dist/auth.js
CHANGED
|
@@ -34,6 +34,10 @@ export function createAuthMiddleware(config) {
|
|
|
34
34
|
};
|
|
35
35
|
if (payload.sub !== undefined)
|
|
36
36
|
ctx.sub = payload.sub;
|
|
37
|
+
if (payload.jti !== undefined)
|
|
38
|
+
ctx.jti = payload.jti;
|
|
39
|
+
if (payload['workerId'] !== undefined)
|
|
40
|
+
ctx.workerId = payload['workerId'];
|
|
37
41
|
c.set('auth', ctx);
|
|
38
42
|
return next();
|
|
39
43
|
}
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAgB,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -2,12 +2,15 @@ export { createAuthMiddleware, checkScope } from './auth.js';
|
|
|
2
2
|
export type { AuthConfig, AuthContext, JWTConfig } from './auth.js';
|
|
3
3
|
export { createTasksRouter } from './routes/tasks.js';
|
|
4
4
|
export { createSSERouter } from './routes/sse.js';
|
|
5
|
+
export { createWorkersRouter, WorkerWSHandler } from './routes/workers.js';
|
|
6
|
+
export type { WSLike, TaskSummary } from './routes/workers.js';
|
|
5
7
|
export { WebhookDelivery } from './webhook.js';
|
|
6
8
|
import { Hono } from 'hono';
|
|
7
9
|
import type { AuthConfig } from './auth.js';
|
|
8
|
-
import type { TaskEngine } from '@taskcast/core';
|
|
10
|
+
import type { TaskEngine, WorkerManager } from '@taskcast/core';
|
|
9
11
|
export interface TaskcastServerOptions {
|
|
10
12
|
engine: TaskEngine;
|
|
13
|
+
workerManager?: WorkerManager;
|
|
11
14
|
auth?: AuthConfig;
|
|
12
15
|
}
|
|
13
16
|
/**
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC5D,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC5D,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1E,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAK3B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAE/D,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,UAAU,CAAA;IAClB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,IAAI,CAUnE"}
|
package/dist/index.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
export { createAuthMiddleware, checkScope } from './auth.js';
|
|
2
2
|
export { createTasksRouter } from './routes/tasks.js';
|
|
3
3
|
export { createSSERouter } from './routes/sse.js';
|
|
4
|
+
export { createWorkersRouter, WorkerWSHandler } from './routes/workers.js';
|
|
4
5
|
export { WebhookDelivery } from './webhook.js';
|
|
5
6
|
import { Hono } from 'hono';
|
|
6
7
|
import { createAuthMiddleware } from './auth.js';
|
|
7
8
|
import { createTasksRouter } from './routes/tasks.js';
|
|
8
9
|
import { createSSERouter } from './routes/sse.js';
|
|
10
|
+
import { createWorkersRouter } from './routes/workers.js';
|
|
9
11
|
/**
|
|
10
12
|
* Creates a Hono app with all taskcast routes mounted.
|
|
11
13
|
* Can be used standalone or mounted into an existing Hono app.
|
|
@@ -16,6 +18,9 @@ export function createTaskcastApp(opts) {
|
|
|
16
18
|
app.use('*', createAuthMiddleware(opts.auth ?? { mode: 'none' }));
|
|
17
19
|
app.route('/tasks', createTasksRouter(opts.engine));
|
|
18
20
|
app.route('/tasks', createSSERouter(opts.engine));
|
|
21
|
+
if (opts.workerManager) {
|
|
22
|
+
app.route('/workers', createWorkersRouter(opts.workerManager, opts.engine));
|
|
23
|
+
}
|
|
19
24
|
return app;
|
|
20
25
|
}
|
|
21
26
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAUzD;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAA2B;IAC3D,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAA;IACtB,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAC/C,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAA;IACjE,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;IACnD,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;IACjD,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;IAC7E,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
package/dist/routes/sse.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Hono } from 'hono';
|
|
2
2
|
import { streamSSE } from 'hono/streaming';
|
|
3
|
-
import { applyFilteredIndex, matchesFilter } from '@taskcast/core';
|
|
3
|
+
import { applyFilteredIndex, matchesFilter, TERMINAL_STATUSES } from '@taskcast/core';
|
|
4
4
|
import { checkScope } from '../auth.js';
|
|
5
5
|
function parseFilter(query) {
|
|
6
6
|
const get = (k) => query[k];
|
|
@@ -49,7 +49,7 @@ function toEnvelope(event, filteredIndex) {
|
|
|
49
49
|
env.seriesMode = event.seriesMode;
|
|
50
50
|
return env;
|
|
51
51
|
}
|
|
52
|
-
const TERMINAL = new Set(
|
|
52
|
+
const TERMINAL = new Set(TERMINAL_STATUSES);
|
|
53
53
|
export function createSSERouter(engine) {
|
|
54
54
|
const router = new Hono();
|
|
55
55
|
router.get('/:taskId/events', async (c) => {
|
package/dist/routes/sse.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/routes/sse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"sse.js","sourceRoot":"","sources":["../../src/routes/sse.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/routes/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,KAAK,EAAE,UAAU,EAA8D,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../src/routes/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,KAAK,EAAE,UAAU,EAA8D,MAAM,gBAAgB,CAAA;AAwB5G,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,8EA6InD"}
|
package/dist/routes/tasks.js
CHANGED
|
@@ -9,6 +9,10 @@ const CreateTaskSchema = z.object({
|
|
|
9
9
|
ttl: z.number().int().positive().optional(),
|
|
10
10
|
webhooks: z.array(z.unknown()).optional(),
|
|
11
11
|
cleanup: z.object({ rules: z.array(z.unknown()) }).optional(),
|
|
12
|
+
tags: z.array(z.string()).optional(),
|
|
13
|
+
assignMode: z.enum(['external', 'pull', 'ws-offer', 'ws-race']).optional(),
|
|
14
|
+
cost: z.number().int().positive().optional(),
|
|
15
|
+
disconnectPolicy: z.enum(['reassign', 'mark', 'fail']).optional(),
|
|
12
16
|
});
|
|
13
17
|
const PublishEventSchema = z.object({
|
|
14
18
|
type: z.string(),
|
|
@@ -39,6 +43,14 @@ export function createTasksRouter(engine) {
|
|
|
39
43
|
input.metadata = d.metadata;
|
|
40
44
|
if (d.ttl !== undefined)
|
|
41
45
|
input.ttl = d.ttl;
|
|
46
|
+
if (d.tags !== undefined)
|
|
47
|
+
input.tags = d.tags;
|
|
48
|
+
if (d.assignMode !== undefined)
|
|
49
|
+
input.assignMode = d.assignMode;
|
|
50
|
+
if (d.cost !== undefined)
|
|
51
|
+
input.cost = d.cost;
|
|
52
|
+
if (d.disconnectPolicy !== undefined)
|
|
53
|
+
input.disconnectPolicy = d.disconnectPolicy;
|
|
42
54
|
const task = await engine.createTask(input);
|
|
43
55
|
return c.json(task, 201);
|
|
44
56
|
});
|
|
@@ -59,13 +71,16 @@ export function createTasksRouter(engine) {
|
|
|
59
71
|
return c.json({ error: 'Forbidden' }, 403);
|
|
60
72
|
const body = await c.req.json();
|
|
61
73
|
const schema = z.object({
|
|
62
|
-
status: z.enum(['running', 'completed', 'failed', 'timeout', 'cancelled']),
|
|
74
|
+
status: z.enum(['pending', 'assigned', 'running', 'paused', 'blocked', 'completed', 'failed', 'timeout', 'cancelled']),
|
|
63
75
|
result: z.record(z.unknown()).optional(),
|
|
64
76
|
error: z.object({
|
|
65
77
|
code: z.string().optional(),
|
|
66
78
|
message: z.string(),
|
|
67
79
|
details: z.record(z.unknown()).optional(),
|
|
68
80
|
}).optional(),
|
|
81
|
+
reason: z.string().optional(),
|
|
82
|
+
ttl: z.number().int().positive().optional(),
|
|
83
|
+
resumeAfterMs: z.number().int().positive().optional(),
|
|
69
84
|
});
|
|
70
85
|
const parsed = schema.safeParse(body);
|
|
71
86
|
if (!parsed.success)
|
|
@@ -83,6 +98,12 @@ export function createTasksRouter(engine) {
|
|
|
83
98
|
taskError.details = e.details;
|
|
84
99
|
payload.error = taskError;
|
|
85
100
|
}
|
|
101
|
+
if (parsed.data.reason !== undefined)
|
|
102
|
+
payload.reason = parsed.data.reason;
|
|
103
|
+
if (parsed.data.ttl !== undefined)
|
|
104
|
+
payload.ttl = parsed.data.ttl;
|
|
105
|
+
if (parsed.data.resumeAfterMs !== undefined)
|
|
106
|
+
payload.resumeAfterMs = parsed.data.resumeAfterMs;
|
|
86
107
|
const task = await engine.transitionTask(taskId, parsed.data.status, payload);
|
|
87
108
|
return c.json(task);
|
|
88
109
|
}
|
package/dist/routes/tasks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../src/routes/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAC3B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAGvC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACzB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC3B,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACxC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IAC1C,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC3C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;IACzC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../src/routes/tasks.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import type { Task, WorkerManager } from '@taskcast/core';
|
|
2
|
+
import type { AuthContext } from '../auth.js';
|
|
3
|
+
export interface WSLike {
|
|
4
|
+
send(data: string): void;
|
|
5
|
+
close(): void;
|
|
6
|
+
}
|
|
7
|
+
export type TaskSummary = {
|
|
8
|
+
id: string;
|
|
9
|
+
type?: string;
|
|
10
|
+
tags?: string[];
|
|
11
|
+
cost?: number;
|
|
12
|
+
params?: Record<string, unknown>;
|
|
13
|
+
};
|
|
14
|
+
export declare class WorkerWSHandler {
|
|
15
|
+
private manager;
|
|
16
|
+
private ws;
|
|
17
|
+
private auth?;
|
|
18
|
+
private workerId;
|
|
19
|
+
private pendingOffers;
|
|
20
|
+
private pingTimer;
|
|
21
|
+
constructor(manager: WorkerManager, ws: WSLike, auth?: AuthContext | undefined);
|
|
22
|
+
get registeredWorkerId(): string | null;
|
|
23
|
+
handleMessage(raw: string): Promise<void>;
|
|
24
|
+
offerTask(task: Task): void;
|
|
25
|
+
broadcastAvailable(task: Task): void;
|
|
26
|
+
handleDisconnect(): Promise<void>;
|
|
27
|
+
stopPingTimer(): void;
|
|
28
|
+
private handleRegister;
|
|
29
|
+
private handleUpdate;
|
|
30
|
+
private handleAccept;
|
|
31
|
+
private handleDecline;
|
|
32
|
+
private handleClaim;
|
|
33
|
+
private handleDrain;
|
|
34
|
+
private handlePong;
|
|
35
|
+
private startPingTimer;
|
|
36
|
+
private requireRegistered;
|
|
37
|
+
private send;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=worker-ws.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-ws.d.ts","sourceRoot":"","sources":["../../src/routes/worker-ws.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,aAAa,EAAqE,MAAM,gBAAgB,CAAA;AAC5H,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAI7C,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,KAAK,IAAI,IAAI,CAAA;CACd;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CACjC,CAAA;AAeD,qBAAa,eAAe;IAMxB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,IAAI,CAAC;IAPf,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAA0B;IAC/C,OAAO,CAAC,SAAS,CAA8C;gBAGrD,OAAO,EAAE,aAAa,EACtB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,WAAW,YAAA;IAK5B,IAAI,kBAAkB,IAAI,MAAM,GAAG,IAAI,CAEtC;IAEK,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC/C,SAAS,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAK3B,kBAAkB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAI9B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOvC,aAAa,IAAI,IAAI;YASP,cAAc;YAkBd,YAAY;YASZ,YAAY;YAgBZ,aAAa;YAcb,WAAW;YAWX,WAAW;YAKX,UAAU;IAOxB,OAAO,CAAC,cAAc;IAQtB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,IAAI;CAGb"}
|
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
// ─── Helper ─────────────────────────────────────────────────────────────────
|
|
2
|
+
function toSummary(task) {
|
|
3
|
+
const summary = { id: task.id };
|
|
4
|
+
if (task.type !== undefined)
|
|
5
|
+
summary.type = task.type;
|
|
6
|
+
if (task.tags !== undefined)
|
|
7
|
+
summary.tags = task.tags;
|
|
8
|
+
if (task.cost !== undefined)
|
|
9
|
+
summary.cost = task.cost;
|
|
10
|
+
if (task.params !== undefined)
|
|
11
|
+
summary.params = task.params;
|
|
12
|
+
return summary;
|
|
13
|
+
}
|
|
14
|
+
// ─── WorkerWSHandler ────────────────────────────────────────────────────────
|
|
15
|
+
export class WorkerWSHandler {
|
|
16
|
+
manager;
|
|
17
|
+
ws;
|
|
18
|
+
auth;
|
|
19
|
+
workerId = null;
|
|
20
|
+
pendingOffers = new Map();
|
|
21
|
+
pingTimer = null;
|
|
22
|
+
constructor(manager, ws, auth) {
|
|
23
|
+
this.manager = manager;
|
|
24
|
+
this.ws = ws;
|
|
25
|
+
this.auth = auth;
|
|
26
|
+
}
|
|
27
|
+
// ─── Public API ─────────────────────────────────────────────────────────
|
|
28
|
+
get registeredWorkerId() {
|
|
29
|
+
return this.workerId;
|
|
30
|
+
}
|
|
31
|
+
async handleMessage(raw) {
|
|
32
|
+
let msg;
|
|
33
|
+
try {
|
|
34
|
+
msg = JSON.parse(raw);
|
|
35
|
+
}
|
|
36
|
+
catch {
|
|
37
|
+
this.send({ type: 'error', message: 'Invalid JSON' });
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
40
|
+
const type = msg.type;
|
|
41
|
+
switch (type) {
|
|
42
|
+
case 'register':
|
|
43
|
+
await this.handleRegister(msg);
|
|
44
|
+
break;
|
|
45
|
+
case 'update':
|
|
46
|
+
await this.handleUpdate(msg);
|
|
47
|
+
break;
|
|
48
|
+
case 'accept':
|
|
49
|
+
await this.handleAccept(msg);
|
|
50
|
+
break;
|
|
51
|
+
case 'decline':
|
|
52
|
+
await this.handleDecline(msg);
|
|
53
|
+
break;
|
|
54
|
+
case 'claim':
|
|
55
|
+
await this.handleClaim(msg);
|
|
56
|
+
break;
|
|
57
|
+
case 'drain':
|
|
58
|
+
await this.handleDrain();
|
|
59
|
+
break;
|
|
60
|
+
case 'pong':
|
|
61
|
+
await this.handlePong();
|
|
62
|
+
break;
|
|
63
|
+
default:
|
|
64
|
+
this.send({ type: 'error', message: `Unknown message type: ${String(type)}` });
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
offerTask(task) {
|
|
69
|
+
this.pendingOffers.set(task.id, task);
|
|
70
|
+
this.send({ type: 'offer', taskId: task.id, task: toSummary(task) });
|
|
71
|
+
}
|
|
72
|
+
broadcastAvailable(task) {
|
|
73
|
+
this.send({ type: 'available', taskId: task.id, task: toSummary(task) });
|
|
74
|
+
}
|
|
75
|
+
async handleDisconnect() {
|
|
76
|
+
this.stopPingTimer();
|
|
77
|
+
if (this.workerId) {
|
|
78
|
+
await this.manager.unregisterWorker(this.workerId);
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
stopPingTimer() {
|
|
82
|
+
if (this.pingTimer) {
|
|
83
|
+
clearInterval(this.pingTimer);
|
|
84
|
+
this.pingTimer = null;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// ─── Message Handlers ──────────────────────────────────────────────────
|
|
88
|
+
async handleRegister(msg) {
|
|
89
|
+
if (typeof msg.workerId === 'string' && this.auth?.workerId && this.auth.workerId !== msg.workerId) {
|
|
90
|
+
this.send({ type: 'error', message: 'Forbidden: worker ID mismatch', code: 'FORBIDDEN' });
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
const reg = {
|
|
94
|
+
matchRule: msg.matchRule ?? {},
|
|
95
|
+
capacity: msg.capacity ?? 10,
|
|
96
|
+
connectionMode: 'websocket',
|
|
97
|
+
};
|
|
98
|
+
if (typeof msg.workerId === 'string')
|
|
99
|
+
reg.id = msg.workerId;
|
|
100
|
+
if (typeof msg.weight === 'number')
|
|
101
|
+
reg.weight = msg.weight;
|
|
102
|
+
const worker = await this.manager.registerWorker(reg);
|
|
103
|
+
this.workerId = worker.id;
|
|
104
|
+
this.send({ type: 'registered', workerId: worker.id });
|
|
105
|
+
this.startPingTimer();
|
|
106
|
+
}
|
|
107
|
+
async handleUpdate(msg) {
|
|
108
|
+
if (!this.requireRegistered())
|
|
109
|
+
return;
|
|
110
|
+
const update = {};
|
|
111
|
+
if (typeof msg.weight === 'number')
|
|
112
|
+
update.weight = msg.weight;
|
|
113
|
+
if (typeof msg.capacity === 'number')
|
|
114
|
+
update.capacity = msg.capacity;
|
|
115
|
+
if (msg.matchRule !== undefined)
|
|
116
|
+
update.matchRule = msg.matchRule;
|
|
117
|
+
await this.manager.updateWorker(this.workerId, update);
|
|
118
|
+
}
|
|
119
|
+
async handleAccept(msg) {
|
|
120
|
+
if (!this.requireRegistered())
|
|
121
|
+
return;
|
|
122
|
+
if (typeof msg.taskId !== 'string') {
|
|
123
|
+
this.send({ type: 'error', message: 'taskId is required and must be a string', code: 'INVALID_MESSAGE' });
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const taskId = msg.taskId;
|
|
127
|
+
const result = await this.manager.claimTask(taskId, this.workerId);
|
|
128
|
+
if (result.success) {
|
|
129
|
+
this.pendingOffers.delete(taskId);
|
|
130
|
+
this.send({ type: 'assigned', taskId });
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
this.send({ type: 'error', message: result.reason, taskId });
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
async handleDecline(msg) {
|
|
137
|
+
if (!this.requireRegistered())
|
|
138
|
+
return;
|
|
139
|
+
if (typeof msg.taskId !== 'string') {
|
|
140
|
+
this.send({ type: 'error', message: 'taskId is required and must be a string', code: 'INVALID_MESSAGE' });
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
const taskId = msg.taskId;
|
|
144
|
+
this.pendingOffers.delete(taskId);
|
|
145
|
+
const opts = {};
|
|
146
|
+
if (typeof msg.blacklist === 'boolean')
|
|
147
|
+
opts.blacklist = msg.blacklist;
|
|
148
|
+
await this.manager.declineTask(taskId, this.workerId, opts);
|
|
149
|
+
this.send({ type: 'declined', taskId });
|
|
150
|
+
}
|
|
151
|
+
async handleClaim(msg) {
|
|
152
|
+
if (!this.requireRegistered())
|
|
153
|
+
return;
|
|
154
|
+
if (typeof msg.taskId !== 'string') {
|
|
155
|
+
this.send({ type: 'error', message: 'taskId is required and must be a string', code: 'INVALID_MESSAGE' });
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
158
|
+
const taskId = msg.taskId;
|
|
159
|
+
const result = await this.manager.claimTask(taskId, this.workerId);
|
|
160
|
+
this.send({ type: 'claimed', taskId, success: result.success });
|
|
161
|
+
}
|
|
162
|
+
async handleDrain() {
|
|
163
|
+
if (!this.requireRegistered())
|
|
164
|
+
return;
|
|
165
|
+
await this.manager.updateWorker(this.workerId, { status: 'draining' });
|
|
166
|
+
}
|
|
167
|
+
async handlePong() {
|
|
168
|
+
if (!this.requireRegistered())
|
|
169
|
+
return;
|
|
170
|
+
await this.manager.heartbeat(this.workerId);
|
|
171
|
+
}
|
|
172
|
+
// ─── Helpers ──────────────────────────────────────────────────────────
|
|
173
|
+
startPingTimer() {
|
|
174
|
+
this.stopPingTimer();
|
|
175
|
+
const intervalMs = this.manager.heartbeatIntervalMs;
|
|
176
|
+
this.pingTimer = setInterval(() => {
|
|
177
|
+
this.send({ type: 'ping' });
|
|
178
|
+
}, intervalMs);
|
|
179
|
+
}
|
|
180
|
+
requireRegistered() {
|
|
181
|
+
if (!this.workerId) {
|
|
182
|
+
this.send({ type: 'error', message: 'Not registered' });
|
|
183
|
+
return false;
|
|
184
|
+
}
|
|
185
|
+
return true;
|
|
186
|
+
}
|
|
187
|
+
send(data) {
|
|
188
|
+
this.ws.send(JSON.stringify(data));
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
//# sourceMappingURL=worker-ws.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-ws.js","sourceRoot":"","sources":["../../src/routes/worker-ws.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Hono } from 'hono';
|
|
2
|
+
import type { WorkerManager, TaskEngine } from '@taskcast/core';
|
|
3
|
+
export { WorkerWSHandler } from './worker-ws.js';
|
|
4
|
+
export type { WSLike, TaskSummary } from './worker-ws.js';
|
|
5
|
+
export declare function createWorkersRouter(manager: WorkerManager, engine: TaskEngine): Hono<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/">;
|
|
6
|
+
//# sourceMappingURL=workers.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workers.d.ts","sourceRoot":"","sources":["../../src/routes/workers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAG3B,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAOzD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,UAAU,8EA8E7E"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { Hono } from 'hono';
|
|
2
|
+
import { z } from 'zod';
|
|
3
|
+
import { checkScope } from '../auth.js';
|
|
4
|
+
export { WorkerWSHandler } from './worker-ws.js';
|
|
5
|
+
const DeclineSchema = z.object({
|
|
6
|
+
workerId: z.string(),
|
|
7
|
+
blacklist: z.boolean().optional(),
|
|
8
|
+
});
|
|
9
|
+
export function createWorkersRouter(manager, engine) {
|
|
10
|
+
const router = new Hono();
|
|
11
|
+
// GET / — list all workers
|
|
12
|
+
router.get('/', async (c) => {
|
|
13
|
+
const auth = c.get('auth');
|
|
14
|
+
if (!checkScope(auth, 'worker:manage'))
|
|
15
|
+
return c.json({ error: 'Forbidden' }, 403);
|
|
16
|
+
const workers = await manager.listWorkers();
|
|
17
|
+
return c.json(workers);
|
|
18
|
+
});
|
|
19
|
+
// GET /pull — long-poll for task (worker:connect scope)
|
|
20
|
+
// Must be registered before /:workerId to avoid being matched as a param
|
|
21
|
+
router.get('/pull', async (c) => {
|
|
22
|
+
const auth = c.get('auth');
|
|
23
|
+
if (!checkScope(auth, 'worker:connect'))
|
|
24
|
+
return c.json({ error: 'Forbidden' }, 403);
|
|
25
|
+
const workerId = c.req.query('workerId');
|
|
26
|
+
if (!workerId)
|
|
27
|
+
return c.json({ error: 'workerId query param required' }, 400);
|
|
28
|
+
if (auth.workerId && auth.workerId !== workerId) {
|
|
29
|
+
return c.json({ error: 'Forbidden: worker ID mismatch' }, 403);
|
|
30
|
+
}
|
|
31
|
+
const weight = c.req.query('weight');
|
|
32
|
+
if (weight)
|
|
33
|
+
await manager.updateWorker(workerId, { weight: Number(weight) });
|
|
34
|
+
await manager.heartbeat(workerId);
|
|
35
|
+
try {
|
|
36
|
+
const controller = new AbortController();
|
|
37
|
+
const timeoutMs = Number(c.req.query('timeout') ?? 30000);
|
|
38
|
+
const timeout = setTimeout(() => controller.abort(), timeoutMs);
|
|
39
|
+
c.req.raw.signal.addEventListener('abort', () => {
|
|
40
|
+
clearTimeout(timeout);
|
|
41
|
+
controller.abort();
|
|
42
|
+
});
|
|
43
|
+
const task = await manager.waitForTask(workerId, controller.signal);
|
|
44
|
+
clearTimeout(timeout);
|
|
45
|
+
return c.json(task);
|
|
46
|
+
}
|
|
47
|
+
catch {
|
|
48
|
+
return c.body(null, 204);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
// GET /:workerId — get single worker
|
|
52
|
+
router.get('/:workerId', async (c) => {
|
|
53
|
+
const { workerId } = c.req.param();
|
|
54
|
+
const auth = c.get('auth');
|
|
55
|
+
if (!checkScope(auth, 'worker:manage'))
|
|
56
|
+
return c.json({ error: 'Forbidden' }, 403);
|
|
57
|
+
const worker = await manager.getWorker(workerId);
|
|
58
|
+
if (!worker)
|
|
59
|
+
return c.json({ error: 'Worker not found' }, 404);
|
|
60
|
+
return c.json(worker);
|
|
61
|
+
});
|
|
62
|
+
// DELETE /:workerId — force disconnect
|
|
63
|
+
router.delete('/:workerId', async (c) => {
|
|
64
|
+
const { workerId } = c.req.param();
|
|
65
|
+
const auth = c.get('auth');
|
|
66
|
+
if (!checkScope(auth, 'worker:manage'))
|
|
67
|
+
return c.json({ error: 'Forbidden' }, 403);
|
|
68
|
+
const worker = await manager.getWorker(workerId);
|
|
69
|
+
if (!worker)
|
|
70
|
+
return c.json({ error: 'Worker not found' }, 404);
|
|
71
|
+
await manager.unregisterWorker(workerId);
|
|
72
|
+
return c.body(null, 204);
|
|
73
|
+
});
|
|
74
|
+
// POST /tasks/:taskId/decline — worker declines a task
|
|
75
|
+
router.post('/tasks/:taskId/decline', async (c) => {
|
|
76
|
+
const { taskId } = c.req.param();
|
|
77
|
+
const auth = c.get('auth');
|
|
78
|
+
if (!checkScope(auth, 'worker:connect'))
|
|
79
|
+
return c.json({ error: 'Forbidden' }, 403);
|
|
80
|
+
const body = await c.req.json();
|
|
81
|
+
const parsed = DeclineSchema.safeParse(body);
|
|
82
|
+
if (!parsed.success)
|
|
83
|
+
return c.json({ error: parsed.error.flatten() }, 400);
|
|
84
|
+
if (auth.workerId && auth.workerId !== parsed.data.workerId) {
|
|
85
|
+
return c.json({ error: 'Forbidden: worker ID mismatch' }, 403);
|
|
86
|
+
}
|
|
87
|
+
const declineOpts = parsed.data.blacklist !== undefined ? { blacklist: parsed.data.blacklist } : {};
|
|
88
|
+
await manager.declineTask(taskId, parsed.data.workerId, declineOpts);
|
|
89
|
+
return c.json({ ok: true });
|
|
90
|
+
});
|
|
91
|
+
return router;
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=workers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workers.js","sourceRoot":"","sources":["../../src/routes/workers.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@taskcast/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Hono HTTP server — REST + SSE + auth + webhooks for Taskcast.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"hono": "^4.6.0",
|
|
32
32
|
"jose": "^5.9.0",
|
|
33
33
|
"zod": "^3.23.0",
|
|
34
|
-
"@taskcast/core": "0.
|
|
34
|
+
"@taskcast/core": "0.3.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
37
|
"@hono/node-server": "^1.19.9",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"testcontainers": "^10.13.0",
|
|
41
41
|
"typescript": "^5.7.0",
|
|
42
42
|
"vitest": "^2.1.0",
|
|
43
|
-
"@taskcast/redis": "0.
|
|
43
|
+
"@taskcast/redis": "0.3.0"
|
|
44
44
|
},
|
|
45
45
|
"scripts": {
|
|
46
46
|
"build": "tsc",
|