@amodalai/runtime 0.1.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/LICENSE +21 -0
- package/dist/.last_build +0 -0
- package/dist/src/agent/agent-runner.d.ts +13 -0
- package/dist/src/agent/agent-runner.js +827 -0
- package/dist/src/agent/agent-runner.js.map +1 -0
- package/dist/src/agent/agent-runner.test.d.ts +6 -0
- package/dist/src/agent/agent-runner.test.js +552 -0
- package/dist/src/agent/agent-runner.test.js.map +1 -0
- package/dist/src/agent/agent-types.d.ts +57 -0
- package/dist/src/agent/agent-types.js +17 -0
- package/dist/src/agent/agent-types.js.map +1 -0
- package/dist/src/agent/agent-types.test.d.ts +6 -0
- package/dist/src/agent/agent-types.test.js +44 -0
- package/dist/src/agent/agent-types.test.js.map +1 -0
- package/dist/src/agent/automation-bridge.d.ts +24 -0
- package/dist/src/agent/automation-bridge.js +24 -0
- package/dist/src/agent/automation-bridge.js.map +1 -0
- package/dist/src/agent/automation-bridge.test.d.ts +6 -0
- package/dist/src/agent/automation-bridge.test.js +67 -0
- package/dist/src/agent/automation-bridge.test.js.map +1 -0
- package/dist/src/agent/config-watcher.d.ts +20 -0
- package/dist/src/agent/config-watcher.js +68 -0
- package/dist/src/agent/config-watcher.js.map +1 -0
- package/dist/src/agent/config-watcher.test.d.ts +6 -0
- package/dist/src/agent/config-watcher.test.js +83 -0
- package/dist/src/agent/config-watcher.test.js.map +1 -0
- package/dist/src/agent/custom-tools-e2e.test.d.ts +6 -0
- package/dist/src/agent/custom-tools-e2e.test.js +566 -0
- package/dist/src/agent/custom-tools-e2e.test.js.map +1 -0
- package/dist/src/agent/local-server.d.ts +15 -0
- package/dist/src/agent/local-server.js +158 -0
- package/dist/src/agent/local-server.js.map +1 -0
- package/dist/src/agent/local-server.test.d.ts +6 -0
- package/dist/src/agent/local-server.test.js +126 -0
- package/dist/src/agent/local-server.test.js.map +1 -0
- package/dist/src/agent/proactive/delivery.d.ts +21 -0
- package/dist/src/agent/proactive/delivery.js +68 -0
- package/dist/src/agent/proactive/delivery.js.map +1 -0
- package/dist/src/agent/proactive/delivery.test.d.ts +6 -0
- package/dist/src/agent/proactive/delivery.test.js +65 -0
- package/dist/src/agent/proactive/delivery.test.js.map +1 -0
- package/dist/src/agent/proactive/proactive-runner.d.ts +76 -0
- package/dist/src/agent/proactive/proactive-runner.js +201 -0
- package/dist/src/agent/proactive/proactive-runner.js.map +1 -0
- package/dist/src/agent/proactive/proactive-runner.test.d.ts +6 -0
- package/dist/src/agent/proactive/proactive-runner.test.js +265 -0
- package/dist/src/agent/proactive/proactive-runner.test.js.map +1 -0
- package/dist/src/agent/request-helper.d.ts +16 -0
- package/dist/src/agent/request-helper.js +87 -0
- package/dist/src/agent/request-helper.js.map +1 -0
- package/dist/src/agent/routes/automations.d.ts +19 -0
- package/dist/src/agent/routes/automations.js +58 -0
- package/dist/src/agent/routes/automations.js.map +1 -0
- package/dist/src/agent/routes/automations.test.d.ts +6 -0
- package/dist/src/agent/routes/automations.test.js +117 -0
- package/dist/src/agent/routes/automations.test.js.map +1 -0
- package/dist/src/agent/routes/chat.d.ts +35 -0
- package/dist/src/agent/routes/chat.js +88 -0
- package/dist/src/agent/routes/chat.js.map +1 -0
- package/dist/src/agent/routes/chat.test.d.ts +6 -0
- package/dist/src/agent/routes/chat.test.js +115 -0
- package/dist/src/agent/routes/chat.test.js.map +1 -0
- package/dist/src/agent/routes/inspect.d.ts +12 -0
- package/dist/src/agent/routes/inspect.js +40 -0
- package/dist/src/agent/routes/inspect.js.map +1 -0
- package/dist/src/agent/routes/inspect.test.d.ts +6 -0
- package/dist/src/agent/routes/inspect.test.js +80 -0
- package/dist/src/agent/routes/inspect.test.js.map +1 -0
- package/dist/src/agent/routes/stores.d.ts +20 -0
- package/dist/src/agent/routes/stores.js +137 -0
- package/dist/src/agent/routes/stores.js.map +1 -0
- package/dist/src/agent/routes/stores.test.d.ts +6 -0
- package/dist/src/agent/routes/stores.test.js +191 -0
- package/dist/src/agent/routes/stores.test.js.map +1 -0
- package/dist/src/agent/routes/task.d.ts +11 -0
- package/dist/src/agent/routes/task.js +116 -0
- package/dist/src/agent/routes/task.js.map +1 -0
- package/dist/src/agent/routes/task.test.d.ts +6 -0
- package/dist/src/agent/routes/task.test.js +91 -0
- package/dist/src/agent/routes/task.test.js.map +1 -0
- package/dist/src/agent/routes/webhooks.d.ts +17 -0
- package/dist/src/agent/routes/webhooks.js +53 -0
- package/dist/src/agent/routes/webhooks.js.map +1 -0
- package/dist/src/agent/routes/webhooks.test.d.ts +6 -0
- package/dist/src/agent/routes/webhooks.test.js +100 -0
- package/dist/src/agent/routes/webhooks.test.js.map +1 -0
- package/dist/src/agent/session-manager.d.ts +72 -0
- package/dist/src/agent/session-manager.js +214 -0
- package/dist/src/agent/session-manager.js.map +1 -0
- package/dist/src/agent/session-manager.test.d.ts +6 -0
- package/dist/src/agent/session-manager.test.js +145 -0
- package/dist/src/agent/session-manager.test.js.map +1 -0
- package/dist/src/agent/shell-executor-local.d.ts +16 -0
- package/dist/src/agent/shell-executor-local.js +51 -0
- package/dist/src/agent/shell-executor-local.js.map +1 -0
- package/dist/src/agent/shell-executor-local.test.d.ts +6 -0
- package/dist/src/agent/shell-executor-local.test.js +46 -0
- package/dist/src/agent/shell-executor-local.test.js.map +1 -0
- package/dist/src/agent/snapshot-server.d.ts +38 -0
- package/dist/src/agent/snapshot-server.js +114 -0
- package/dist/src/agent/snapshot-server.js.map +1 -0
- package/dist/src/agent/stores-e2e.test.d.ts +6 -0
- package/dist/src/agent/stores-e2e.test.js +433 -0
- package/dist/src/agent/stores-e2e.test.js.map +1 -0
- package/dist/src/agent/tool-context-builder.d.ts +11 -0
- package/dist/src/agent/tool-context-builder.js +84 -0
- package/dist/src/agent/tool-context-builder.js.map +1 -0
- package/dist/src/agent/tool-context-builder.test.d.ts +6 -0
- package/dist/src/agent/tool-context-builder.test.js +152 -0
- package/dist/src/agent/tool-context-builder.test.js.map +1 -0
- package/dist/src/agent/tool-executor-local.d.ts +15 -0
- package/dist/src/agent/tool-executor-local.js +74 -0
- package/dist/src/agent/tool-executor-local.js.map +1 -0
- package/dist/src/agent/tool-executor-local.test.d.ts +6 -0
- package/dist/src/agent/tool-executor-local.test.js +116 -0
- package/dist/src/agent/tool-executor-local.test.js.map +1 -0
- package/dist/src/agent/tool-harness-template.d.ts +23 -0
- package/dist/src/agent/tool-harness-template.js +94 -0
- package/dist/src/agent/tool-harness-template.js.map +1 -0
- package/dist/src/agent/user-context-fetcher.d.ts +25 -0
- package/dist/src/agent/user-context-fetcher.js +79 -0
- package/dist/src/agent/user-context-fetcher.js.map +1 -0
- package/dist/src/agent/user-context-fetcher.test.d.ts +6 -0
- package/dist/src/agent/user-context-fetcher.test.js +121 -0
- package/dist/src/agent/user-context-fetcher.test.js.map +1 -0
- package/dist/src/audit/audit-client.d.ts +46 -0
- package/dist/src/audit/audit-client.js +83 -0
- package/dist/src/audit/audit-client.js.map +1 -0
- package/dist/src/cron/heartbeat-runner.d.ts +24 -0
- package/dist/src/cron/heartbeat-runner.js +87 -0
- package/dist/src/cron/heartbeat-runner.js.map +1 -0
- package/dist/src/cron/heartbeat-runner.test.d.ts +6 -0
- package/dist/src/cron/heartbeat-runner.test.js +120 -0
- package/dist/src/cron/heartbeat-runner.test.js.map +1 -0
- package/dist/src/cron/heartbeat-scheduler.d.ts +26 -0
- package/dist/src/cron/heartbeat-scheduler.js +54 -0
- package/dist/src/cron/heartbeat-scheduler.js.map +1 -0
- package/dist/src/cron/heartbeat-scheduler.test.d.ts +6 -0
- package/dist/src/cron/heartbeat-scheduler.test.js +61 -0
- package/dist/src/cron/heartbeat-scheduler.test.js.map +1 -0
- package/dist/src/index.d.ts +24 -0
- package/dist/src/index.js +118 -0
- package/dist/src/index.js.map +1 -0
- package/dist/src/middleware/auth.d.ts +40 -0
- package/dist/src/middleware/auth.js +135 -0
- package/dist/src/middleware/auth.js.map +1 -0
- package/dist/src/middleware/auth.test.d.ts +6 -0
- package/dist/src/middleware/auth.test.js +268 -0
- package/dist/src/middleware/auth.test.js.map +1 -0
- package/dist/src/middleware/error-handler.d.ts +20 -0
- package/dist/src/middleware/error-handler.js +48 -0
- package/dist/src/middleware/error-handler.js.map +1 -0
- package/dist/src/middleware/error-handler.test.d.ts +6 -0
- package/dist/src/middleware/error-handler.test.js +68 -0
- package/dist/src/middleware/error-handler.test.js.map +1 -0
- package/dist/src/middleware/request-validation.d.ts +13 -0
- package/dist/src/middleware/request-validation.js +26 -0
- package/dist/src/middleware/request-validation.js.map +1 -0
- package/dist/src/middleware/request-validation.test.d.ts +6 -0
- package/dist/src/middleware/request-validation.test.js +57 -0
- package/dist/src/middleware/request-validation.test.js.map +1 -0
- package/dist/src/output/email-output.d.ts +10 -0
- package/dist/src/output/email-output.js +12 -0
- package/dist/src/output/email-output.js.map +1 -0
- package/dist/src/output/output-router.d.ts +12 -0
- package/dist/src/output/output-router.js +36 -0
- package/dist/src/output/output-router.js.map +1 -0
- package/dist/src/output/output-router.test.d.ts +6 -0
- package/dist/src/output/output-router.test.js +132 -0
- package/dist/src/output/output-router.test.js.map +1 -0
- package/dist/src/output/slack-output.d.ts +10 -0
- package/dist/src/output/slack-output.js +54 -0
- package/dist/src/output/slack-output.js.map +1 -0
- package/dist/src/output/webhook-output.d.ts +10 -0
- package/dist/src/output/webhook-output.js +25 -0
- package/dist/src/output/webhook-output.js.map +1 -0
- package/dist/src/routes/ai-stream.d.ts +159 -0
- package/dist/src/routes/ai-stream.js +309 -0
- package/dist/src/routes/ai-stream.js.map +1 -0
- package/dist/src/routes/ai-stream.test.d.ts +6 -0
- package/dist/src/routes/ai-stream.test.js +586 -0
- package/dist/src/routes/ai-stream.test.js.map +1 -0
- package/dist/src/routes/ask-user-response.d.ts +30 -0
- package/dist/src/routes/ask-user-response.js +61 -0
- package/dist/src/routes/ask-user-response.js.map +1 -0
- package/dist/src/routes/ask-user-response.test.d.ts +6 -0
- package/dist/src/routes/ask-user-response.test.js +88 -0
- package/dist/src/routes/ask-user-response.test.js.map +1 -0
- package/dist/src/routes/chat-stream.d.ts +14 -0
- package/dist/src/routes/chat-stream.js +84 -0
- package/dist/src/routes/chat-stream.js.map +1 -0
- package/dist/src/routes/chat-stream.test.d.ts +6 -0
- package/dist/src/routes/chat-stream.test.js +155 -0
- package/dist/src/routes/chat-stream.test.js.map +1 -0
- package/dist/src/routes/chat.d.ts +13 -0
- package/dist/src/routes/chat.js +55 -0
- package/dist/src/routes/chat.js.map +1 -0
- package/dist/src/routes/chat.test.d.ts +6 -0
- package/dist/src/routes/chat.test.js +99 -0
- package/dist/src/routes/chat.test.js.map +1 -0
- package/dist/src/routes/health.d.ts +13 -0
- package/dist/src/routes/health.js +23 -0
- package/dist/src/routes/health.js.map +1 -0
- package/dist/src/routes/health.test.d.ts +6 -0
- package/dist/src/routes/health.test.js +45 -0
- package/dist/src/routes/health.test.js.map +1 -0
- package/dist/src/routes/sessions.d.ts +14 -0
- package/dist/src/routes/sessions.js +82 -0
- package/dist/src/routes/sessions.js.map +1 -0
- package/dist/src/routes/webhooks.d.ts +13 -0
- package/dist/src/routes/webhooks.js +43 -0
- package/dist/src/routes/webhooks.js.map +1 -0
- package/dist/src/routes/webhooks.test.d.ts +6 -0
- package/dist/src/routes/webhooks.test.js +80 -0
- package/dist/src/routes/webhooks.test.js.map +1 -0
- package/dist/src/routes/widget-actions.d.ts +49 -0
- package/dist/src/routes/widget-actions.js +78 -0
- package/dist/src/routes/widget-actions.js.map +1 -0
- package/dist/src/server.d.ts +31 -0
- package/dist/src/server.js +129 -0
- package/dist/src/server.js.map +1 -0
- package/dist/src/server.test.d.ts +6 -0
- package/dist/src/server.test.js +153 -0
- package/dist/src/server.test.js.map +1 -0
- package/dist/src/session/history-converter.d.ts +21 -0
- package/dist/src/session/history-converter.js +59 -0
- package/dist/src/session/history-converter.js.map +1 -0
- package/dist/src/session/history-converter.test.d.ts +6 -0
- package/dist/src/session/history-converter.test.js +130 -0
- package/dist/src/session/history-converter.test.js.map +1 -0
- package/dist/src/session/session-manager.d.ts +117 -0
- package/dist/src/session/session-manager.js +480 -0
- package/dist/src/session/session-manager.js.map +1 -0
- package/dist/src/session/session-manager.test.d.ts +6 -0
- package/dist/src/session/session-manager.test.js +586 -0
- package/dist/src/session/session-manager.test.js.map +1 -0
- package/dist/src/session/session-runner.d.ts +30 -0
- package/dist/src/session/session-runner.js +771 -0
- package/dist/src/session/session-runner.js.map +1 -0
- package/dist/src/session/session-runner.test.d.ts +6 -0
- package/dist/src/session/session-runner.test.js +842 -0
- package/dist/src/session/session-runner.test.js.map +1 -0
- package/dist/src/stores/index.d.ts +8 -0
- package/dist/src/stores/index.js +9 -0
- package/dist/src/stores/index.js.map +1 -0
- package/dist/src/stores/key-resolver.d.ts +21 -0
- package/dist/src/stores/key-resolver.js +30 -0
- package/dist/src/stores/key-resolver.js.map +1 -0
- package/dist/src/stores/key-resolver.test.d.ts +6 -0
- package/dist/src/stores/key-resolver.test.js +31 -0
- package/dist/src/stores/key-resolver.test.js.map +1 -0
- package/dist/src/stores/pglite-store-backend.d.ts +36 -0
- package/dist/src/stores/pglite-store-backend.js +227 -0
- package/dist/src/stores/pglite-store-backend.js.map +1 -0
- package/dist/src/stores/pglite-store-backend.test.d.ts +6 -0
- package/dist/src/stores/pglite-store-backend.test.js +150 -0
- package/dist/src/stores/pglite-store-backend.test.js.map +1 -0
- package/dist/src/stores/ttl-resolver.d.ts +24 -0
- package/dist/src/stores/ttl-resolver.js +64 -0
- package/dist/src/stores/ttl-resolver.js.map +1 -0
- package/dist/src/stores/ttl-resolver.test.d.ts +6 -0
- package/dist/src/stores/ttl-resolver.test.js +68 -0
- package/dist/src/stores/ttl-resolver.test.js.map +1 -0
- package/dist/src/types.d.ts +227 -0
- package/dist/src/types.js +50 -0
- package/dist/src/types.js.map +1 -0
- package/dist/src/types.test.d.ts +6 -0
- package/dist/src/types.test.js +68 -0
- package/dist/src/types.test.js.map +1 -0
- package/dist/src/utils/jwt-verify.d.ts +20 -0
- package/dist/src/utils/jwt-verify.js +34 -0
- package/dist/src/utils/jwt-verify.js.map +1 -0
- package/dist/src/utils/jwt-verify.test.d.ts +6 -0
- package/dist/src/utils/jwt-verify.test.js +156 -0
- package/dist/src/utils/jwt-verify.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +51 -0
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi, beforeEach, afterEach, beforeAll } from 'vitest';
|
|
7
|
+
import express from 'express';
|
|
8
|
+
import request from 'supertest';
|
|
9
|
+
import { generateKeyPair, SignJWT, exportJWK, calculateJwkThumbprint } from 'jose';
|
|
10
|
+
import { createAuthMiddleware, getAuthContext } from './auth.js';
|
|
11
|
+
import { errorHandler } from './error-handler.js';
|
|
12
|
+
// Mock fetch globally
|
|
13
|
+
const mockFetch = vi.fn();
|
|
14
|
+
vi.stubGlobal('fetch', mockFetch);
|
|
15
|
+
function meResponse(orgId = 'org-123', appId = 'app-456', tenantId = 'ten-789') {
|
|
16
|
+
return {
|
|
17
|
+
ok: true,
|
|
18
|
+
json: async () => ({
|
|
19
|
+
org: { id: orgId },
|
|
20
|
+
app: { id: appId },
|
|
21
|
+
tenant: { id: tenantId },
|
|
22
|
+
apps: [{ id: appId }],
|
|
23
|
+
tenants: [{ id: tenantId }],
|
|
24
|
+
user: null,
|
|
25
|
+
}),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
function createTestApp(platformApiUrl = 'http://localhost:4000', jwksUrl) {
|
|
29
|
+
const app = express();
|
|
30
|
+
app.use(express.json());
|
|
31
|
+
const authMiddleware = createAuthMiddleware({ platformApiUrl, jwksUrl });
|
|
32
|
+
app.get('/test', authMiddleware, (_req, res) => {
|
|
33
|
+
const ctx = getAuthContext(res);
|
|
34
|
+
res.json({
|
|
35
|
+
authenticated: true,
|
|
36
|
+
token: ctx?.token,
|
|
37
|
+
orgId: ctx?.orgId,
|
|
38
|
+
applicationId: ctx?.applicationId,
|
|
39
|
+
tenantId: ctx?.tenantId,
|
|
40
|
+
authMethod: ctx?.authMethod,
|
|
41
|
+
actor: ctx?.actor,
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
app.use(errorHandler);
|
|
45
|
+
return app;
|
|
46
|
+
}
|
|
47
|
+
describe('auth middleware', () => {
|
|
48
|
+
beforeEach(() => {
|
|
49
|
+
vi.clearAllMocks();
|
|
50
|
+
});
|
|
51
|
+
afterEach(() => {
|
|
52
|
+
vi.restoreAllMocks();
|
|
53
|
+
});
|
|
54
|
+
it('rejects requests without Authorization header', async () => {
|
|
55
|
+
const app = createTestApp();
|
|
56
|
+
const res = await request(app).get('/test');
|
|
57
|
+
expect(res.status).toBe(401);
|
|
58
|
+
expect(res.body.error.code).toBe('UNAUTHORIZED');
|
|
59
|
+
expect(res.body.error.message).toContain('Missing Authorization');
|
|
60
|
+
});
|
|
61
|
+
it('rejects non-Bearer auth schemes', async () => {
|
|
62
|
+
const app = createTestApp();
|
|
63
|
+
const res = await request(app)
|
|
64
|
+
.get('/test')
|
|
65
|
+
.set('Authorization', 'Basic abc123');
|
|
66
|
+
expect(res.status).toBe(401);
|
|
67
|
+
expect(res.body.error.message).toContain('Bearer scheme');
|
|
68
|
+
});
|
|
69
|
+
it('rejects tokens without ak_ prefix when no JWKS configured', async () => {
|
|
70
|
+
// Create app without JWKS URL — will fail createJWTVerifier
|
|
71
|
+
const app = express();
|
|
72
|
+
app.use(express.json());
|
|
73
|
+
const authMiddleware = createAuthMiddleware({
|
|
74
|
+
platformApiUrl: 'http://localhost:4000',
|
|
75
|
+
jwksUrl: 'not-a-valid-url',
|
|
76
|
+
});
|
|
77
|
+
app.get('/test', authMiddleware, (_req, res) => {
|
|
78
|
+
res.json({ authenticated: true });
|
|
79
|
+
});
|
|
80
|
+
app.use(errorHandler);
|
|
81
|
+
const res = await request(app)
|
|
82
|
+
.get('/test')
|
|
83
|
+
.set('Authorization', 'Bearer some-jwt-token');
|
|
84
|
+
expect(res.status).toBe(401);
|
|
85
|
+
});
|
|
86
|
+
it('validates ak_ keys against platform API and returns full context', async () => {
|
|
87
|
+
mockFetch.mockResolvedValueOnce(meResponse('org-123', 'app-456', 'ten-789'));
|
|
88
|
+
const app = createTestApp();
|
|
89
|
+
const res = await request(app)
|
|
90
|
+
.get('/test')
|
|
91
|
+
.set('Authorization', 'Bearer ak_test-key');
|
|
92
|
+
expect(res.status).toBe(200);
|
|
93
|
+
expect(res.body.authenticated).toBe(true);
|
|
94
|
+
expect(res.body.token).toBe('ak_test-key');
|
|
95
|
+
expect(res.body.orgId).toBe('org-123');
|
|
96
|
+
expect(res.body.applicationId).toBe('app-456');
|
|
97
|
+
expect(res.body.tenantId).toBe('ten-789');
|
|
98
|
+
expect(res.body.authMethod).toBe('api_key');
|
|
99
|
+
// Verify fetch was called with correct args
|
|
100
|
+
expect(mockFetch).toHaveBeenCalledWith('http://localhost:4000/api/me', expect.objectContaining({
|
|
101
|
+
headers: expect.objectContaining({
|
|
102
|
+
Authorization: 'Bearer ak_test-key',
|
|
103
|
+
}),
|
|
104
|
+
}));
|
|
105
|
+
});
|
|
106
|
+
it('rejects invalid ak_ keys (platform returns non-ok)', async () => {
|
|
107
|
+
mockFetch.mockResolvedValueOnce({
|
|
108
|
+
ok: false,
|
|
109
|
+
status: 401,
|
|
110
|
+
});
|
|
111
|
+
const app = createTestApp();
|
|
112
|
+
const res = await request(app)
|
|
113
|
+
.get('/test')
|
|
114
|
+
.set('Authorization', 'Bearer ak_bad-key');
|
|
115
|
+
expect(res.status).toBe(401);
|
|
116
|
+
expect(res.body.error.code).toBe('UNAUTHORIZED');
|
|
117
|
+
});
|
|
118
|
+
it('caches validated keys', async () => {
|
|
119
|
+
mockFetch.mockResolvedValue(meResponse());
|
|
120
|
+
const app = createTestApp();
|
|
121
|
+
// First request — validates against platform API
|
|
122
|
+
await request(app)
|
|
123
|
+
.get('/test')
|
|
124
|
+
.set('Authorization', 'Bearer ak_cached-key');
|
|
125
|
+
expect(mockFetch).toHaveBeenCalledTimes(1);
|
|
126
|
+
// Second request — should use cache
|
|
127
|
+
const res = await request(app)
|
|
128
|
+
.get('/test')
|
|
129
|
+
.set('Authorization', 'Bearer ak_cached-key');
|
|
130
|
+
expect(res.status).toBe(200);
|
|
131
|
+
expect(mockFetch).toHaveBeenCalledTimes(1); // No additional fetch
|
|
132
|
+
});
|
|
133
|
+
it('returns 502 when platform API is unreachable', async () => {
|
|
134
|
+
mockFetch.mockRejectedValueOnce(new Error('Connection refused'));
|
|
135
|
+
const app = createTestApp();
|
|
136
|
+
const res = await request(app)
|
|
137
|
+
.get('/test')
|
|
138
|
+
.set('Authorization', 'Bearer ak_test-key');
|
|
139
|
+
expect(res.status).toBe(502);
|
|
140
|
+
expect(res.body.error.code).toBe('AUTH_UPSTREAM_ERROR');
|
|
141
|
+
});
|
|
142
|
+
describe('JWT verification', () => {
|
|
143
|
+
let privateKey;
|
|
144
|
+
let kid;
|
|
145
|
+
let jwksJson;
|
|
146
|
+
const jwksUrl = 'http://127.0.0.1:9999/.well-known/jwks.json';
|
|
147
|
+
beforeAll(async () => {
|
|
148
|
+
const pair = await generateKeyPair('ES256', { extractable: true });
|
|
149
|
+
privateKey = pair.privateKey;
|
|
150
|
+
const publicJwk = await exportJWK(pair.publicKey);
|
|
151
|
+
kid = await calculateJwkThumbprint(publicJwk);
|
|
152
|
+
jwksJson = {
|
|
153
|
+
keys: [{ ...publicJwk, kid, alg: 'ES256', use: 'sig' }],
|
|
154
|
+
};
|
|
155
|
+
});
|
|
156
|
+
it('validates platform JWTs locally without /api/me calls', async () => {
|
|
157
|
+
// Mock fetch to serve JWKS
|
|
158
|
+
mockFetch.mockImplementation(async (url) => {
|
|
159
|
+
if (url.includes('.well-known/jwks.json')) {
|
|
160
|
+
return { ok: true, status: 200, json: async () => jwksJson };
|
|
161
|
+
}
|
|
162
|
+
throw new Error(`Unexpected fetch: ${url}`);
|
|
163
|
+
});
|
|
164
|
+
const token = await new SignJWT({
|
|
165
|
+
org_id: 'org-jwt',
|
|
166
|
+
app_id: 'app-jwt',
|
|
167
|
+
tenant_id: 'tenant-jwt',
|
|
168
|
+
})
|
|
169
|
+
.setProtectedHeader({ alg: 'ES256', kid })
|
|
170
|
+
.setIssuer('aitize-platform')
|
|
171
|
+
.setSubject('tenant-jwt')
|
|
172
|
+
.setIssuedAt()
|
|
173
|
+
.setExpirationTime('1h')
|
|
174
|
+
.sign(privateKey);
|
|
175
|
+
const app = createTestApp('http://localhost:4000', jwksUrl);
|
|
176
|
+
const res = await request(app)
|
|
177
|
+
.get('/test')
|
|
178
|
+
.set('Authorization', `Bearer ${token}`);
|
|
179
|
+
expect(res.status).toBe(200);
|
|
180
|
+
expect(res.body.token).toBe(token);
|
|
181
|
+
expect(res.body.orgId).toBe('org-jwt');
|
|
182
|
+
expect(res.body.applicationId).toBe('app-jwt');
|
|
183
|
+
expect(res.body.tenantId).toBe('tenant-jwt');
|
|
184
|
+
expect(res.body.authMethod).toBe('platform_jwt');
|
|
185
|
+
// Only JWKS fetch should have been made, not /api/me
|
|
186
|
+
for (const call of mockFetch.mock.calls) {
|
|
187
|
+
expect(String(call[0])).not.toContain('/api/me');
|
|
188
|
+
}
|
|
189
|
+
});
|
|
190
|
+
it('includes actor in AuthContext when JWT has actor claim', async () => {
|
|
191
|
+
mockFetch.mockImplementation(async (url) => {
|
|
192
|
+
if (url.includes('.well-known/jwks.json')) {
|
|
193
|
+
return { ok: true, status: 200, json: async () => jwksJson };
|
|
194
|
+
}
|
|
195
|
+
throw new Error(`Unexpected fetch: ${url}`);
|
|
196
|
+
});
|
|
197
|
+
const token = await new SignJWT({
|
|
198
|
+
org_id: 'org-jwt',
|
|
199
|
+
app_id: 'app-jwt',
|
|
200
|
+
tenant_id: 'tenant-jwt',
|
|
201
|
+
actor: 'bob@example.com',
|
|
202
|
+
})
|
|
203
|
+
.setProtectedHeader({ alg: 'ES256', kid })
|
|
204
|
+
.setIssuer('aitize-platform')
|
|
205
|
+
.setSubject('tenant-jwt')
|
|
206
|
+
.setIssuedAt()
|
|
207
|
+
.setExpirationTime('1h')
|
|
208
|
+
.sign(privateKey);
|
|
209
|
+
const app = createTestApp('http://localhost:4000', jwksUrl);
|
|
210
|
+
const res = await request(app)
|
|
211
|
+
.get('/test')
|
|
212
|
+
.set('Authorization', `Bearer ${token}`);
|
|
213
|
+
expect(res.status).toBe(200);
|
|
214
|
+
expect(res.body.actor).toBe('bob@example.com');
|
|
215
|
+
expect(res.body.authMethod).toBe('platform_jwt');
|
|
216
|
+
});
|
|
217
|
+
it('omits actor from AuthContext when JWT has no actor claim', async () => {
|
|
218
|
+
mockFetch.mockImplementation(async (url) => {
|
|
219
|
+
if (url.includes('.well-known/jwks.json')) {
|
|
220
|
+
return { ok: true, status: 200, json: async () => jwksJson };
|
|
221
|
+
}
|
|
222
|
+
throw new Error(`Unexpected fetch: ${url}`);
|
|
223
|
+
});
|
|
224
|
+
const token = await new SignJWT({
|
|
225
|
+
org_id: 'org-jwt',
|
|
226
|
+
app_id: 'app-jwt',
|
|
227
|
+
tenant_id: 'tenant-jwt',
|
|
228
|
+
})
|
|
229
|
+
.setProtectedHeader({ alg: 'ES256', kid })
|
|
230
|
+
.setIssuer('aitize-platform')
|
|
231
|
+
.setSubject('tenant-jwt')
|
|
232
|
+
.setIssuedAt()
|
|
233
|
+
.setExpirationTime('1h')
|
|
234
|
+
.sign(privateKey);
|
|
235
|
+
const app = createTestApp('http://localhost:4000', jwksUrl);
|
|
236
|
+
const res = await request(app)
|
|
237
|
+
.get('/test')
|
|
238
|
+
.set('Authorization', `Bearer ${token}`);
|
|
239
|
+
expect(res.status).toBe(200);
|
|
240
|
+
expect(res.body.actor).toBeUndefined();
|
|
241
|
+
});
|
|
242
|
+
it('rejects expired JWTs', async () => {
|
|
243
|
+
mockFetch.mockImplementation(async (url) => {
|
|
244
|
+
if (url.includes('.well-known/jwks.json')) {
|
|
245
|
+
return { ok: true, status: 200, json: async () => jwksJson };
|
|
246
|
+
}
|
|
247
|
+
throw new Error(`Unexpected fetch: ${url}`);
|
|
248
|
+
});
|
|
249
|
+
const token = await new SignJWT({
|
|
250
|
+
org_id: 'org-1',
|
|
251
|
+
app_id: 'app-1',
|
|
252
|
+
tenant_id: 'tenant-1',
|
|
253
|
+
})
|
|
254
|
+
.setProtectedHeader({ alg: 'ES256', kid })
|
|
255
|
+
.setIssuer('aitize-platform')
|
|
256
|
+
.setSubject('tenant-1')
|
|
257
|
+
.setIssuedAt(Math.floor(Date.now() / 1000) - 7200)
|
|
258
|
+
.setExpirationTime(Math.floor(Date.now() / 1000) - 3600)
|
|
259
|
+
.sign(privateKey);
|
|
260
|
+
const app = createTestApp('http://localhost:4000', jwksUrl);
|
|
261
|
+
const res = await request(app)
|
|
262
|
+
.get('/test')
|
|
263
|
+
.set('Authorization', `Bearer ${token}`);
|
|
264
|
+
expect(res.status).toBe(401);
|
|
265
|
+
});
|
|
266
|
+
});
|
|
267
|
+
});
|
|
268
|
+
//# sourceMappingURL=auth.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/middleware/auth.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACpF,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,MAAM,CAAC;AAEnF,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,sBAAsB;AACtB,MAAM,SAAS,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;AAC1B,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAElC,SAAS,UAAU,CAAC,KAAK,GAAG,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,QAAQ,GAAG,SAAS;IAC5E,OAAO;QACL,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACjB,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;YAClB,GAAG,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;YAClB,MAAM,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;YACxB,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;YAC3B,IAAI,EAAE,IAAI;SACX,CAAC;KACH,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,cAAc,GAAG,uBAAuB,EAAE,OAAgB;IAC/E,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IACtB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAExB,MAAM,cAAc,GAAG,oBAAoB,CAAC,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzE,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;QAC7C,MAAM,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC;YACP,aAAa,EAAE,IAAI;YACnB,KAAK,EAAE,GAAG,EAAE,KAAK;YACjB,KAAK,EAAE,GAAG,EAAE,KAAK;YACjB,aAAa,EAAE,GAAG,EAAE,aAAa;YACjC,QAAQ,EAAE,GAAG,EAAE,QAAQ;YACvB,UAAU,EAAE,GAAG,EAAE,UAAU;YAC3B,KAAK,EAAE,GAAG,EAAE,KAAK;SAClB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACtB,OAAO,GAAG,CAAC;AACb,CAAC;AAED,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,cAAc,CAAC,CAAC;QAExC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,4DAA4D;QAC5D,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QACtB,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACxB,MAAM,cAAc,GAAG,oBAAoB,CAAC;YAC1C,cAAc,EAAE,uBAAuB;YACvC,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC7C,GAAG,CAAC,IAAI,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEtB,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC;QAEjD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,SAAS,CAAC,qBAAqB,CAAC,UAAU,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;QAE7E,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAE9C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE5C,4CAA4C;QAC5C,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CACpC,8BAA8B,EAC9B,MAAM,CAAC,gBAAgB,CAAC;YACtB,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC;gBAC/B,aAAa,EAAE,oBAAoB;aACpC,CAAC;SACH,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,SAAS,CAAC,qBAAqB,CAAC;YAC9B,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;SACZ,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;QAE7C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,CAAC,CAAC;QAE1C,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAE5B,iDAAiD;QACjD,MAAM,OAAO,CAAC,GAAG,CAAC;aACf,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;QAEhD,MAAM,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAE3C,oCAAoC;QACpC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,sBAAsB,CAAC,CAAC;QAEhD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,sBAAsB;IACpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,SAAS,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAEjE,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;aAC3B,GAAG,CAAC,OAAO,CAAC;aACZ,GAAG,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;QAE9C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,IAAI,UAAqB,CAAC;QAC1B,IAAI,GAAW,CAAC;QAChB,IAAI,QAAkD,CAAC;QACvD,MAAM,OAAO,GAAG,6CAA6C,CAAC;QAE9D,SAAS,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YACnE,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;YAC7B,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClD,GAAG,GAAG,MAAM,sBAAsB,CAAC,SAAS,CAAC,CAAC;YAC9C,QAAQ,GAAG;gBACT,IAAI,EAAE,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;aACxD,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,2BAA2B;YAC3B,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;oBAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/D,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC;gBAC9B,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,YAAY;aACxB,CAAC;iBACC,kBAAkB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iBACzC,SAAS,CAAC,iBAAiB,CAAC;iBAC5B,UAAU,CAAC,YAAY,CAAC;iBACxB,WAAW,EAAE;iBACb,iBAAiB,CAAC,IAAI,CAAC;iBACvB,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpB,MAAM,GAAG,GAAG,aAAa,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,GAAG,CAAC,OAAO,CAAC;iBACZ,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YAE3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACvC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAEjD,qDAAqD;YACrD,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YACnD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;YACtE,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;oBAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/D,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC;gBAC9B,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,YAAY;gBACvB,KAAK,EAAE,iBAAiB;aACzB,CAAC;iBACC,kBAAkB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iBACzC,SAAS,CAAC,iBAAiB,CAAC;iBAC5B,UAAU,CAAC,YAAY,CAAC;iBACxB,WAAW,EAAE;iBACb,iBAAiB,CAAC,IAAI,CAAC;iBACvB,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpB,MAAM,GAAG,GAAG,aAAa,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,GAAG,CAAC,OAAO,CAAC;iBACZ,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YAE3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC/C,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;oBAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/D,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC;gBAC9B,MAAM,EAAE,SAAS;gBACjB,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,YAAY;aACxB,CAAC;iBACC,kBAAkB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iBACzC,SAAS,CAAC,iBAAiB,CAAC;iBAC5B,UAAU,CAAC,YAAY,CAAC;iBACxB,WAAW,EAAE;iBACb,iBAAiB,CAAC,IAAI,CAAC;iBACvB,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpB,MAAM,GAAG,GAAG,aAAa,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,GAAG,CAAC,OAAO,CAAC;iBACZ,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YAE3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACpC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBACjD,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;oBAC1C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC/D,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC;gBAC9B,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,OAAO;gBACf,SAAS,EAAE,UAAU;aACtB,CAAC;iBACC,kBAAkB,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;iBACzC,SAAS,CAAC,iBAAiB,CAAC;iBAC5B,UAAU,CAAC,UAAU,CAAC;iBACtB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;iBACjD,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;iBACvD,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpB,MAAM,GAAG,GAAG,aAAa,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC;YAC5D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;iBAC3B,GAAG,CAAC,OAAO,CAAC;iBACZ,GAAG,CAAC,eAAe,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;YAE3C,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import type { Request, Response, NextFunction } from 'express';
|
|
7
|
+
import type { ErrorResponse } from '../types.js';
|
|
8
|
+
/**
|
|
9
|
+
* Express error middleware that returns structured JSON errors.
|
|
10
|
+
* Must be registered with 4 parameters for Express to recognize it as error middleware.
|
|
11
|
+
*/
|
|
12
|
+
export declare function errorHandler(err: Error, _req: Request, res: Response<ErrorResponse>, _next: NextFunction): void;
|
|
13
|
+
/**
|
|
14
|
+
* Application-level error with status code and error code.
|
|
15
|
+
*/
|
|
16
|
+
export declare class AppError extends Error {
|
|
17
|
+
readonly statusCode: number;
|
|
18
|
+
readonly code: string;
|
|
19
|
+
constructor(statusCode: number, code: string, message: string);
|
|
20
|
+
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Express error middleware that returns structured JSON errors.
|
|
8
|
+
* Must be registered with 4 parameters for Express to recognize it as error middleware.
|
|
9
|
+
*/
|
|
10
|
+
export function errorHandler(err, _req, res, _next) {
|
|
11
|
+
const statusCode = getStatusCode(err);
|
|
12
|
+
const code = getErrorCode(err);
|
|
13
|
+
res.status(statusCode).json({
|
|
14
|
+
error: {
|
|
15
|
+
code,
|
|
16
|
+
message: err.message || 'Internal server error',
|
|
17
|
+
},
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
function getStatusCode(err) {
|
|
21
|
+
if ('statusCode' in err && typeof err.statusCode === 'number') {
|
|
22
|
+
return err.statusCode;
|
|
23
|
+
}
|
|
24
|
+
if ('status' in err && typeof err.status === 'number') {
|
|
25
|
+
return err.status;
|
|
26
|
+
}
|
|
27
|
+
return 500;
|
|
28
|
+
}
|
|
29
|
+
function getErrorCode(err) {
|
|
30
|
+
if ('code' in err && typeof err.code === 'string') {
|
|
31
|
+
return err.code;
|
|
32
|
+
}
|
|
33
|
+
return 'INTERNAL_ERROR';
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Application-level error with status code and error code.
|
|
37
|
+
*/
|
|
38
|
+
export class AppError extends Error {
|
|
39
|
+
statusCode;
|
|
40
|
+
code;
|
|
41
|
+
constructor(statusCode, code, message) {
|
|
42
|
+
super(message);
|
|
43
|
+
this.name = 'AppError';
|
|
44
|
+
this.statusCode = statusCode;
|
|
45
|
+
this.code = code;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=error-handler.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../../src/middleware/error-handler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,GAAU,EACV,IAAa,EACb,GAA4B,EAC5B,KAAmB;IAEnB,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC;IAE/B,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC;QAC1B,KAAK,EAAE;YACL,IAAI;YACJ,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,uBAAuB;SAChD;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,CAAC,GAAU;IAC/B,IAAI,YAAY,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC9D,OAAO,GAAG,CAAC,UAAU,CAAC;IACxB,CAAC;IACD,IAAI,QAAQ,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtD,OAAO,GAAG,CAAC,MAAM,CAAC;IACpB,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,YAAY,CAAC,GAAU;IAC9B,IAAI,MAAM,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,GAAG,CAAC,IAAI,CAAC;IAClB,CAAC;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,QAAS,SAAQ,KAAK;IACxB,UAAU,CAAS;IACnB,IAAI,CAAS;IAEtB,YAAY,UAAkB,EAAE,IAAY,EAAE,OAAe;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, vi } from 'vitest';
|
|
7
|
+
import { errorHandler, AppError } from './error-handler.js';
|
|
8
|
+
function createMockRes() {
|
|
9
|
+
const res = {
|
|
10
|
+
status: vi.fn().mockReturnThis(),
|
|
11
|
+
json: vi.fn().mockReturnThis(),
|
|
12
|
+
};
|
|
13
|
+
return res;
|
|
14
|
+
}
|
|
15
|
+
describe('errorHandler', () => {
|
|
16
|
+
const req = {};
|
|
17
|
+
const next = vi.fn();
|
|
18
|
+
it('returns 500 for generic errors', () => {
|
|
19
|
+
const res = createMockRes();
|
|
20
|
+
errorHandler(new Error('boom'), req, res, next);
|
|
21
|
+
expect(res.status).toHaveBeenCalledWith(500);
|
|
22
|
+
expect(res.json).toHaveBeenCalledWith({
|
|
23
|
+
error: {
|
|
24
|
+
code: 'INTERNAL_ERROR',
|
|
25
|
+
message: 'boom',
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
it('uses statusCode from AppError', () => {
|
|
30
|
+
const res = createMockRes();
|
|
31
|
+
const err = new AppError(404, 'NOT_FOUND', 'Session not found');
|
|
32
|
+
errorHandler(err, req, res, next);
|
|
33
|
+
expect(res.status).toHaveBeenCalledWith(404);
|
|
34
|
+
expect(res.json).toHaveBeenCalledWith({
|
|
35
|
+
error: {
|
|
36
|
+
code: 'NOT_FOUND',
|
|
37
|
+
message: 'Session not found',
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
it('uses status property if present', () => {
|
|
42
|
+
const res = createMockRes();
|
|
43
|
+
const err = Object.assign(new Error('bad'), { status: 400 });
|
|
44
|
+
errorHandler(err, req, res, next);
|
|
45
|
+
expect(res.status).toHaveBeenCalledWith(400);
|
|
46
|
+
});
|
|
47
|
+
it('defaults message for empty error', () => {
|
|
48
|
+
const res = createMockRes();
|
|
49
|
+
errorHandler(new Error(''), req, res, next);
|
|
50
|
+
expect(res.json).toHaveBeenCalledWith({
|
|
51
|
+
error: {
|
|
52
|
+
code: 'INTERNAL_ERROR',
|
|
53
|
+
message: 'Internal server error',
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
describe('AppError', () => {
|
|
59
|
+
it('sets properties correctly', () => {
|
|
60
|
+
const err = new AppError(422, 'VALIDATION_ERROR', 'bad input');
|
|
61
|
+
expect(err.statusCode).toBe(422);
|
|
62
|
+
expect(err.code).toBe('VALIDATION_ERROR');
|
|
63
|
+
expect(err.message).toBe('bad input');
|
|
64
|
+
expect(err.name).toBe('AppError');
|
|
65
|
+
expect(err).toBeInstanceOf(Error);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=error-handler.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"error-handler.test.js","sourceRoot":"","sources":["../../../src/middleware/error-handler.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import type { Request, Response, NextFunction } from 'express';
|
|
7
|
+
import type { z } from 'zod';
|
|
8
|
+
/**
|
|
9
|
+
* Express middleware factory that validates request body against a Zod schema.
|
|
10
|
+
* On success, replaces `req.body` with the parsed (and typed) result.
|
|
11
|
+
* On failure, passes an AppError to the next error handler.
|
|
12
|
+
*/
|
|
13
|
+
export declare function validate<T extends z.ZodType>(schema: T): (req: Request, res: Response, next: NextFunction) => void;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { AppError } from './error-handler.js';
|
|
7
|
+
/**
|
|
8
|
+
* Express middleware factory that validates request body against a Zod schema.
|
|
9
|
+
* On success, replaces `req.body` with the parsed (and typed) result.
|
|
10
|
+
* On failure, passes an AppError to the next error handler.
|
|
11
|
+
*/
|
|
12
|
+
export function validate(schema) {
|
|
13
|
+
return (req, _res, next) => {
|
|
14
|
+
const result = schema.safeParse(req.body);
|
|
15
|
+
if (!result.success) {
|
|
16
|
+
const messages = result.error.issues
|
|
17
|
+
.map((issue) => `${issue.path.join('.')}: ${issue.message}`)
|
|
18
|
+
.join('; ');
|
|
19
|
+
next(new AppError(400, 'VALIDATION_ERROR', messages));
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
req.body = result.data;
|
|
23
|
+
next();
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=request-validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-validation.js","sourceRoot":"","sources":["../../../src/middleware/request-validation.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;GAIG;AACH,MAAM,UAAU,QAAQ,CACtB,MAAS;IAET,OAAO,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAQ,EAAE;QAChE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM;iBACjC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;iBAC3D,IAAI,CAAC,IAAI,CAAC,CAAC;YACd,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,kBAAkB,EAAE,QAAQ,CAAC,CAAC,CAAC;YACtD,OAAO;QACT,CAAC;QACD,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACvB,IAAI,EAAE,CAAC;IACT,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { z } from 'zod';
|
|
8
|
+
import { validate } from './request-validation.js';
|
|
9
|
+
import { AppError } from './error-handler.js';
|
|
10
|
+
const TestSchema = z.object({
|
|
11
|
+
name: z.string().min(1),
|
|
12
|
+
count: z.number().int().positive().optional(),
|
|
13
|
+
});
|
|
14
|
+
function callValidate(body) {
|
|
15
|
+
const middleware = validate(TestSchema);
|
|
16
|
+
const req = { body };
|
|
17
|
+
const res = {};
|
|
18
|
+
let nextArg = undefined;
|
|
19
|
+
const next = (arg) => {
|
|
20
|
+
nextArg = arg;
|
|
21
|
+
};
|
|
22
|
+
middleware(req, res, next);
|
|
23
|
+
return { nextArg, req };
|
|
24
|
+
}
|
|
25
|
+
describe('validate middleware', () => {
|
|
26
|
+
it('passes valid body through and replaces req.body with parsed data', () => {
|
|
27
|
+
const { nextArg, req } = callValidate({ name: 'test', count: 5 });
|
|
28
|
+
expect(nextArg).toBeUndefined(); // next() called without error
|
|
29
|
+
expect(req.body).toEqual({ name: 'test', count: 5 });
|
|
30
|
+
});
|
|
31
|
+
it('strips unknown fields from body', () => {
|
|
32
|
+
const { nextArg, req } = callValidate({
|
|
33
|
+
name: 'test',
|
|
34
|
+
extra: 'dropped',
|
|
35
|
+
});
|
|
36
|
+
expect(nextArg).toBeUndefined();
|
|
37
|
+
expect(req.body).toEqual({ name: 'test' });
|
|
38
|
+
});
|
|
39
|
+
it('rejects invalid body with AppError', () => {
|
|
40
|
+
const { nextArg } = callValidate({ count: -1 });
|
|
41
|
+
expect(nextArg).toBeInstanceOf(AppError);
|
|
42
|
+
const err = nextArg;
|
|
43
|
+
expect(err.statusCode).toBe(400);
|
|
44
|
+
expect(err.code).toBe('VALIDATION_ERROR');
|
|
45
|
+
expect(err.message).toContain('name');
|
|
46
|
+
});
|
|
47
|
+
it('reports multiple validation errors', () => {
|
|
48
|
+
const { nextArg } = callValidate({});
|
|
49
|
+
const err = nextArg;
|
|
50
|
+
expect(err.message).toContain('name');
|
|
51
|
+
});
|
|
52
|
+
it('rejects wrong types', () => {
|
|
53
|
+
const { nextArg } = callValidate({ name: 123 });
|
|
54
|
+
expect(nextArg).toBeInstanceOf(AppError);
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
//# sourceMappingURL=request-validation.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request-validation.test.js","sourceRoot":"","sources":["../../../src/middleware/request-validation.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import type { AutomationResult } from '../types.js';
|
|
7
|
+
/**
|
|
8
|
+
* Stub email output — logs a warning that email is not yet implemented.
|
|
9
|
+
*/
|
|
10
|
+
export declare function sendEmailOutput(target: string, result: AutomationResult): Promise<void>;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Stub email output — logs a warning that email is not yet implemented.
|
|
8
|
+
*/
|
|
9
|
+
export async function sendEmailOutput(target, result) {
|
|
10
|
+
process.stderr.write(`[WARN] Email output not implemented. Would send automation "${result.automation}" result to ${target}\n`);
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=email-output.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"email-output.js","sourceRoot":"","sources":["../../../src/output/email-output.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,MAAc,EACd,MAAwB;IAExB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,+DAA+D,MAAM,CAAC,UAAU,eAAe,MAAM,IAAI,CAC1G,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import type { AutomationOutput } from '@amodalai/core';
|
|
7
|
+
import type { AutomationResult } from '../types.js';
|
|
8
|
+
/**
|
|
9
|
+
* Route automation output to the configured channel.
|
|
10
|
+
* Errors are caught and logged — output failures must never crash the server.
|
|
11
|
+
*/
|
|
12
|
+
export declare function routeOutput(output: AutomationOutput, result: AutomationResult): Promise<boolean>;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { sendSlackOutput } from './slack-output.js';
|
|
7
|
+
import { sendWebhookOutput } from './webhook-output.js';
|
|
8
|
+
import { sendEmailOutput } from './email-output.js';
|
|
9
|
+
/**
|
|
10
|
+
* Route automation output to the configured channel.
|
|
11
|
+
* Errors are caught and logged — output failures must never crash the server.
|
|
12
|
+
*/
|
|
13
|
+
export async function routeOutput(output, result) {
|
|
14
|
+
try {
|
|
15
|
+
switch (output.channel) {
|
|
16
|
+
case 'slack':
|
|
17
|
+
await sendSlackOutput(output.target, result);
|
|
18
|
+
return true;
|
|
19
|
+
case 'webhook':
|
|
20
|
+
await sendWebhookOutput(output.target, result);
|
|
21
|
+
return true;
|
|
22
|
+
case 'email':
|
|
23
|
+
await sendEmailOutput(output.target, result);
|
|
24
|
+
return true;
|
|
25
|
+
default:
|
|
26
|
+
process.stderr.write(`[WARN] Unknown output channel: ${output.channel}\n`);
|
|
27
|
+
return false;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
32
|
+
process.stderr.write(`[ERROR] Output routing failed for ${output.channel}:${output.target}: ${message}\n`);
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=output-router.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"output-router.js","sourceRoot":"","sources":["../../../src/output/output-router.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAwB,EACxB,MAAwB;IAExB,IAAI,CAAC;QACH,QAAQ,MAAM,CAAC,OAAO,EAAE,CAAC;YACvB,KAAK,OAAO;gBACV,MAAM,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd,KAAK,SAAS;gBACZ,MAAM,iBAAiB,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC/C,OAAO,IAAI,CAAC;YACd,KAAK,OAAO;gBACV,MAAM,eAAe,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC7C,OAAO,IAAI,CAAC;YACd;gBACE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kCAAkC,MAAM,CAAC,OAAiB,IAAI,CAC/D,CAAC;gBACF,OAAO,KAAK,CAAC;QACjB,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qCAAqC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,IAAI,CACrF,CAAC;QACF,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
|