@pikku/core 0.11.2 → 0.12.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/CHANGELOG.md +33 -2
- package/dist/crypto-utils.d.ts +2 -0
- package/dist/crypto-utils.js +78 -0
- package/dist/errors/errors.d.ts +8 -0
- package/dist/errors/errors.js +16 -0
- package/dist/errors/index.d.ts +0 -1
- package/dist/errors/index.js +0 -1
- package/dist/function/function-runner.d.ts +7 -1
- package/dist/function/function-runner.js +82 -23
- package/dist/function/functions.types.d.ts +31 -87
- package/dist/function/functions.types.js +16 -46
- package/dist/function/index.d.ts +2 -2
- package/dist/function/index.js +1 -2
- package/dist/handle-error.js +1 -10
- package/dist/index.d.ts +28 -26
- package/dist/index.js +18 -29
- package/dist/middleware/auth-apikey.d.ts +2 -2
- package/dist/middleware/auth-apikey.js +3 -3
- package/dist/middleware/auth-bearer.d.ts +2 -2
- package/dist/middleware/auth-bearer.js +3 -6
- package/dist/middleware/auth-cookie.d.ts +2 -2
- package/dist/middleware/auth-cookie.js +6 -8
- package/dist/middleware/cors.d.ts +46 -0
- package/dist/middleware/cors.js +73 -0
- package/dist/middleware/index.d.ts +5 -3
- package/dist/middleware/index.js +5 -3
- package/dist/middleware/remote-auth.d.ts +5 -0
- package/dist/middleware/remote-auth.js +55 -0
- package/dist/middleware/timeout.d.ts +2 -2
- package/dist/middleware-runner.js +8 -10
- package/dist/permissions.js +11 -15
- package/dist/pikku-state.d.ts +1 -0
- package/dist/pikku-state.js +18 -8
- package/dist/schema.js +12 -11
- package/dist/services/ai-agent-runner-service.d.ts +24 -0
- package/dist/services/ai-agent-runner-service.js +1 -0
- package/dist/services/ai-run-state-service.d.ts +13 -0
- package/dist/services/ai-run-state-service.js +1 -0
- package/dist/services/ai-storage-service.d.ts +18 -0
- package/dist/services/ai-storage-service.js +1 -0
- package/dist/services/deployment-service.d.ts +19 -0
- package/dist/services/deployment-service.js +1 -0
- package/dist/services/gopass-secrets.d.ts +47 -0
- package/dist/services/gopass-secrets.js +94 -0
- package/dist/services/in-memory-trigger-service.d.ts +23 -0
- package/dist/services/in-memory-trigger-service.js +50 -0
- package/dist/services/in-memory-workflow-service.d.ts +59 -0
- package/dist/services/in-memory-workflow-service.js +287 -0
- package/dist/services/index.d.ts +25 -11
- package/dist/services/index.js +10 -13
- package/dist/services/local-secrets.d.ts +23 -0
- package/dist/services/local-secrets.js +45 -0
- package/dist/services/local-variables.d.ts +5 -0
- package/dist/services/local-variables.js +18 -0
- package/dist/services/scheduler-service.d.ts +21 -1
- package/dist/services/scheduler-service.js +14 -0
- package/dist/services/schema-service.d.ts +6 -0
- package/dist/services/scoped-secret-service.d.ts +16 -0
- package/dist/services/scoped-secret-service.js +35 -0
- package/dist/services/secret-service.d.ts +25 -4
- package/dist/services/trigger-service.d.ts +23 -0
- package/dist/services/trigger-service.js +1 -0
- package/dist/services/typed-secret-service.d.ts +30 -0
- package/dist/services/typed-secret-service.js +40 -0
- package/dist/services/typed-variables-service.d.ts +27 -0
- package/dist/services/typed-variables-service.js +46 -0
- package/dist/services/user-session-service.d.ts +13 -0
- package/dist/services/user-session-service.js +17 -0
- package/dist/services/variables-service.d.ts +5 -0
- package/dist/services/workflow-service.d.ts +9 -4
- package/dist/types/core.types.d.ts +48 -12
- package/dist/types/core.types.js +8 -1
- package/dist/types/state.types.d.ts +43 -51
- package/dist/utils.d.ts +3 -2
- package/dist/utils.js +15 -3
- package/dist/version.d.ts +6 -0
- package/dist/version.js +19 -0
- package/dist/wirings/ai-agent/ai-agent-memory.d.ts +29 -0
- package/dist/wirings/ai-agent/ai-agent-memory.js +199 -0
- package/dist/wirings/ai-agent/ai-agent-model-config.d.ts +9 -0
- package/dist/wirings/ai-agent/ai-agent-model-config.js +36 -0
- package/dist/wirings/ai-agent/ai-agent-prepare.d.ts +60 -0
- package/dist/wirings/ai-agent/ai-agent-prepare.js +312 -0
- package/dist/wirings/ai-agent/ai-agent-registry.d.ts +15 -0
- package/dist/wirings/ai-agent/ai-agent-registry.js +47 -0
- package/dist/wirings/ai-agent/ai-agent-runner.d.ts +3 -0
- package/dist/wirings/ai-agent/ai-agent-runner.js +96 -0
- package/dist/wirings/ai-agent/ai-agent-stream.d.ts +11 -0
- package/dist/wirings/ai-agent/ai-agent-stream.js +503 -0
- package/dist/wirings/ai-agent/ai-agent.types.d.ts +254 -0
- package/dist/wirings/ai-agent/ai-agent.types.js +1 -0
- package/dist/wirings/ai-agent/index.d.ts +5 -0
- package/dist/wirings/ai-agent/index.js +4 -0
- package/dist/wirings/channel/channel-common.d.ts +7 -4
- package/dist/wirings/channel/channel-common.js +15 -8
- package/dist/wirings/channel/channel-handler.js +12 -3
- package/dist/wirings/channel/channel-middleware-runner.d.ts +9 -0
- package/dist/wirings/channel/channel-middleware-runner.js +73 -0
- package/dist/wirings/channel/channel-runner.js +7 -7
- package/dist/wirings/channel/channel.types.d.ts +5 -1
- package/dist/wirings/channel/define-channel-routes.d.ts +21 -0
- package/dist/wirings/channel/define-channel-routes.js +23 -0
- package/dist/wirings/channel/index.d.ts +10 -8
- package/dist/wirings/channel/index.js +7 -8
- package/dist/wirings/channel/local/index.d.ts +3 -3
- package/dist/wirings/channel/local/index.js +3 -3
- package/dist/wirings/channel/local/local-channel-runner.js +18 -6
- package/dist/wirings/channel/serverless/index.d.ts +1 -1
- package/dist/wirings/channel/serverless/index.js +1 -1
- package/dist/wirings/channel/serverless/serverless-channel-runner.js +15 -4
- package/dist/wirings/cli/channel/index.d.ts +1 -1
- package/dist/wirings/cli/channel/index.js +1 -1
- package/dist/wirings/cli/cli-runner.d.ts +1 -1
- package/dist/wirings/cli/cli-runner.js +12 -8
- package/dist/wirings/cli/cli.types.d.ts +6 -6
- package/dist/wirings/cli/define-cli-commands.d.ts +19 -0
- package/dist/wirings/cli/define-cli-commands.js +20 -0
- package/dist/wirings/cli/index.d.ts +2 -3
- package/dist/wirings/cli/index.js +1 -3
- package/dist/wirings/http/http-routes.d.ts +69 -0
- package/dist/wirings/http/http-routes.js +139 -0
- package/dist/wirings/http/http-runner.js +49 -23
- package/dist/wirings/http/http.types.d.ts +78 -38
- package/dist/wirings/http/index.d.ts +5 -4
- package/dist/wirings/http/index.js +4 -3
- package/dist/wirings/mcp/index.d.ts +4 -3
- package/dist/wirings/mcp/index.js +3 -3
- package/dist/wirings/mcp/mcp-runner.d.ts +1 -3
- package/dist/wirings/mcp/mcp-runner.js +25 -39
- package/dist/wirings/mcp/mcp.types.d.ts +3 -3
- package/dist/wirings/node/index.d.ts +2 -0
- package/dist/wirings/node/index.js +1 -0
- package/dist/wirings/node/node.types.d.ts +20 -0
- package/dist/wirings/node/node.types.js +1 -0
- package/dist/wirings/oauth2/index.d.ts +3 -0
- package/dist/wirings/oauth2/index.js +2 -0
- package/dist/wirings/oauth2/oauth2-client.d.ts +47 -0
- package/dist/wirings/oauth2/oauth2-client.js +267 -0
- package/dist/wirings/oauth2/oauth2.types.d.ts +65 -0
- package/dist/wirings/oauth2/oauth2.types.js +4 -0
- package/dist/wirings/oauth2/wire-oauth2-credential.d.ts +20 -0
- package/dist/wirings/oauth2/wire-oauth2-credential.js +21 -0
- package/dist/wirings/queue/index.d.ts +2 -2
- package/dist/wirings/queue/index.js +1 -1
- package/dist/wirings/queue/queue-runner.d.ts +7 -0
- package/dist/wirings/queue/queue-runner.js +17 -6
- package/dist/wirings/queue/queue.types.d.ts +8 -2
- package/dist/wirings/rpc/index.d.ts +1 -1
- package/dist/wirings/rpc/index.js +1 -1
- package/dist/wirings/rpc/rpc-runner.d.ts +33 -5
- package/dist/wirings/rpc/rpc-runner.js +134 -16
- package/dist/wirings/rpc/rpc-types.d.ts +8 -4
- package/dist/wirings/scheduler/index.d.ts +3 -3
- package/dist/wirings/scheduler/index.js +2 -3
- package/dist/wirings/scheduler/scheduler-runner.d.ts +5 -0
- package/dist/wirings/scheduler/scheduler-runner.js +23 -5
- package/dist/wirings/secret/index.d.ts +3 -0
- package/dist/wirings/secret/index.js +2 -0
- package/dist/wirings/secret/secret.types.d.ts +27 -0
- package/dist/wirings/secret/secret.types.js +1 -0
- package/dist/wirings/secret/validate-secret-definitions.d.ts +6 -0
- package/dist/wirings/secret/validate-secret-definitions.js +55 -0
- package/dist/wirings/trigger/index.d.ts +3 -2
- package/dist/wirings/trigger/index.js +2 -2
- package/dist/wirings/trigger/pikku-trigger-service.d.ts +26 -0
- package/dist/wirings/trigger/pikku-trigger-service.js +75 -0
- package/dist/wirings/trigger/trigger-runner.d.ts +21 -8
- package/dist/wirings/trigger/trigger-runner.js +46 -18
- package/dist/wirings/trigger/trigger.types.d.ts +99 -11
- package/dist/wirings/trigger/trigger.types.js +40 -1
- package/dist/wirings/variable/index.d.ts +3 -0
- package/dist/wirings/variable/index.js +2 -0
- package/dist/wirings/variable/validate-variable-definitions.d.ts +6 -0
- package/dist/wirings/variable/validate-variable-definitions.js +45 -0
- package/dist/wirings/variable/variable.types.d.ts +18 -0
- package/dist/wirings/variable/variable.types.js +1 -0
- package/dist/wirings/workflow/dsl/index.d.ts +1 -1
- package/dist/wirings/workflow/dsl/workflow-dsl.types.d.ts +7 -1
- package/dist/wirings/workflow/dsl/workflow-runner.js +3 -2
- package/dist/wirings/workflow/graph/graph-node.d.ts +1 -6
- package/dist/wirings/workflow/graph/graph-runner.d.ts +5 -31
- package/dist/wirings/workflow/graph/graph-runner.js +384 -296
- package/dist/wirings/workflow/graph/index.d.ts +4 -3
- package/dist/wirings/workflow/graph/index.js +3 -3
- package/dist/wirings/workflow/graph/template.d.ts +15 -0
- package/dist/wirings/workflow/graph/template.js +27 -0
- package/dist/wirings/workflow/graph/wire-workflow-graph.d.ts +15 -0
- package/dist/wirings/workflow/graph/wire-workflow-graph.js +8 -0
- package/dist/wirings/workflow/graph/workflow-graph.types.d.ts +0 -13
- package/dist/wirings/workflow/index.d.ts +6 -6
- package/dist/wirings/workflow/index.js +6 -4
- package/dist/wirings/workflow/pikku-workflow-service.d.ts +28 -14
- package/dist/wirings/workflow/pikku-workflow-service.js +200 -56
- package/dist/wirings/workflow/workflow-helpers.d.ts +36 -0
- package/dist/wirings/workflow/workflow-helpers.js +38 -0
- package/dist/wirings/workflow/workflow-utils.d.ts +1 -23
- package/dist/wirings/workflow/workflow-utils.js +1 -66
- package/dist/wirings/workflow/workflow.types.d.ts +40 -93
- package/package.json +13 -15
- package/run-tests.sh +4 -1
- package/src/crypto-utils.ts +99 -0
- package/src/errors/errors.ts +17 -0
- package/src/errors/index.ts +0 -1
- package/src/factory-functions.test.ts +42 -2
- package/src/function/function-runner.test.ts +4 -11
- package/src/function/function-runner.ts +114 -29
- package/src/function/functions.types.ts +62 -132
- package/src/function/index.ts +5 -2
- package/src/handle-error.ts +2 -10
- package/src/index.ts +99 -25
- package/src/middleware/auth-apikey.test.ts +15 -12
- package/src/middleware/auth-apikey.ts +3 -3
- package/src/middleware/auth-bearer.test.ts +17 -14
- package/src/middleware/auth-bearer.ts +25 -27
- package/src/middleware/auth-cookie.test.ts +16 -13
- package/src/middleware/auth-cookie.ts +6 -8
- package/src/middleware/cors.ts +96 -0
- package/src/middleware/index.ts +5 -3
- package/src/middleware/remote-auth.ts +68 -0
- package/src/middleware-runner.test.ts +122 -0
- package/src/middleware-runner.ts +12 -12
- package/src/permissions.test.ts +81 -7
- package/src/permissions.ts +15 -17
- package/src/pikku-state.ts +20 -8
- package/src/run-tests-script.test.ts +49 -0
- package/src/schema.ts +18 -15
- package/src/services/ai-agent-runner-service.ts +29 -0
- package/src/services/ai-run-state-service.ts +20 -0
- package/src/services/ai-storage-service.ts +39 -0
- package/src/services/deployment-service.ts +22 -0
- package/src/services/gopass-secrets.ts +95 -0
- package/src/services/in-memory-trigger-service.ts +68 -0
- package/src/services/in-memory-workflow-service.ts +395 -0
- package/src/services/index.ts +49 -14
- package/src/services/local-secrets.ts +51 -0
- package/src/services/local-variables.ts +22 -0
- package/src/services/scheduler-service.ts +29 -1
- package/src/services/schema-service.ts +7 -0
- package/src/services/scoped-secret-service.ts +41 -0
- package/src/services/secret-service.ts +25 -4
- package/src/services/trigger-service.ts +38 -0
- package/src/services/typed-secret-service.ts +70 -0
- package/src/services/typed-variables-service.ts +81 -0
- package/src/services/user-session-service.ts +23 -0
- package/src/services/variables-service.ts +5 -0
- package/src/services/workflow-service.ts +22 -2
- package/src/types/core.types.ts +76 -11
- package/src/types/state.types.ts +37 -63
- package/src/utils.ts +20 -6
- package/src/version.test.ts +80 -0
- package/src/version.ts +25 -0
- package/src/wirings/ai-agent/ai-agent-memory.ts +300 -0
- package/src/wirings/ai-agent/ai-agent-model-config.ts +43 -0
- package/src/wirings/ai-agent/ai-agent-prepare.ts +470 -0
- package/src/wirings/ai-agent/ai-agent-registry.test.ts +37 -0
- package/src/wirings/ai-agent/ai-agent-registry.ts +82 -0
- package/src/wirings/ai-agent/ai-agent-runner.test.ts +75 -0
- package/src/wirings/ai-agent/ai-agent-runner.ts +137 -0
- package/src/wirings/ai-agent/ai-agent-stream.test.ts +246 -0
- package/src/wirings/ai-agent/ai-agent-stream.ts +774 -0
- package/src/wirings/ai-agent/ai-agent.types.ts +273 -0
- package/src/wirings/ai-agent/index.ts +28 -0
- package/src/wirings/channel/channel-common.ts +32 -19
- package/src/wirings/channel/channel-handler.ts +17 -4
- package/src/wirings/channel/channel-middleware-runner.ts +119 -0
- package/src/wirings/channel/channel-runner.ts +9 -10
- package/src/wirings/channel/channel.types.ts +17 -1
- package/src/wirings/channel/define-channel-routes.ts +25 -0
- package/src/wirings/channel/index.ts +23 -8
- package/src/wirings/channel/local/index.ts +3 -3
- package/src/wirings/channel/local/local-channel-runner.test.ts +44 -1
- package/src/wirings/channel/local/local-channel-runner.ts +22 -6
- package/src/wirings/channel/serverless/index.ts +5 -1
- package/src/wirings/channel/serverless/serverless-channel-runner.ts +20 -4
- package/src/wirings/cli/channel/index.ts +1 -1
- package/src/wirings/cli/cli-runner.test.ts +9 -9
- package/src/wirings/cli/cli-runner.ts +17 -10
- package/src/wirings/cli/cli.types.ts +11 -11
- package/src/wirings/cli/command-parser.test.ts +8 -8
- package/src/wirings/cli/define-cli-commands.ts +24 -0
- package/src/wirings/cli/index.ts +10 -4
- package/src/wirings/http/http-routes.test.ts +322 -0
- package/src/wirings/http/http-routes.ts +198 -0
- package/src/wirings/http/http-runner.test.ts +3 -3
- package/src/wirings/http/http-runner.ts +63 -29
- package/src/wirings/http/http.types.ts +121 -37
- package/src/wirings/http/index.ts +16 -4
- package/src/wirings/mcp/index.ts +27 -3
- package/src/wirings/mcp/mcp-endpoint-registry.test.ts +3 -3
- package/src/wirings/mcp/mcp-runner.ts +39 -50
- package/src/wirings/mcp/mcp.types.ts +3 -3
- package/src/wirings/node/index.ts +2 -0
- package/src/wirings/node/node.types.ts +23 -0
- package/src/wirings/oauth2/index.ts +3 -0
- package/src/wirings/oauth2/oauth2-client.test.ts +929 -0
- package/src/wirings/oauth2/oauth2-client.ts +335 -0
- package/src/wirings/oauth2/oauth2.types.ts +69 -0
- package/src/wirings/oauth2/wire-oauth2-credential.ts +23 -0
- package/src/wirings/queue/index.ts +14 -2
- package/src/wirings/queue/queue-runner.test.ts +97 -55
- package/src/wirings/queue/queue-runner.ts +33 -7
- package/src/wirings/queue/queue.types.ts +12 -2
- package/src/wirings/rpc/index.ts +1 -1
- package/src/wirings/rpc/rpc-runner.ts +187 -17
- package/src/wirings/rpc/rpc-types.ts +13 -4
- package/src/wirings/scheduler/index.ts +7 -4
- package/src/wirings/scheduler/scheduler-runner.test.ts +70 -26
- package/src/wirings/scheduler/scheduler-runner.ts +45 -5
- package/src/wirings/secret/index.ts +9 -0
- package/src/wirings/secret/secret.types.ts +32 -0
- package/src/wirings/secret/validate-secret-definitions.ts +82 -0
- package/src/wirings/trigger/index.ts +10 -2
- package/src/wirings/trigger/pikku-trigger-service.ts +134 -0
- package/src/wirings/trigger/trigger-runner.ts +80 -38
- package/src/wirings/trigger/trigger.types.ts +144 -22
- package/src/wirings/variable/index.ts +8 -0
- package/src/wirings/variable/validate-variable-definitions.ts +69 -0
- package/src/wirings/variable/variable.types.ts +22 -0
- package/src/wirings/workflow/dsl/index.ts +1 -0
- package/src/wirings/workflow/dsl/workflow-dsl.types.ts +9 -1
- package/src/wirings/workflow/dsl/workflow-runner.ts +4 -3
- package/src/wirings/workflow/graph/graph-node.ts +1 -6
- package/src/wirings/workflow/graph/graph-runner.test.ts +495 -0
- package/src/wirings/workflow/graph/graph-runner.ts +496 -374
- package/src/wirings/workflow/graph/index.ts +14 -3
- package/src/wirings/workflow/graph/template.ts +42 -0
- package/src/wirings/workflow/graph/wire-workflow-graph.ts +29 -0
- package/src/wirings/workflow/graph/workflow-graph.types.ts +0 -22
- package/src/wirings/workflow/index.ts +21 -10
- package/src/wirings/workflow/pikku-workflow-service.test.ts +212 -0
- package/src/wirings/workflow/pikku-workflow-service.ts +285 -66
- package/src/wirings/workflow/workflow-helpers.ts +79 -0
- package/src/wirings/workflow/workflow-utils.ts +0 -120
- package/src/wirings/workflow/workflow.types.ts +45 -90
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/wirings/forge-node/forge-node.types.d.ts +0 -120
- package/dist/wirings/forge-node/forge-node.types.js +0 -38
- package/dist/wirings/forge-node/index.d.ts +0 -1
- package/dist/wirings/forge-node/index.js +0 -1
- package/dist/wirings/workflow/wire-workflow.d.ts +0 -42
- package/dist/wirings/workflow/wire-workflow.js +0 -53
- package/src/wirings/forge-node/forge-node.types.ts +0 -135
- package/src/wirings/forge-node/index.ts +0 -1
- package/src/wirings/workflow/wire-workflow.ts +0 -94
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { OAuth2Token } from './oauth2.types.js';
|
|
2
|
+
import { OAuth2CredentialConfig } from '../secret/secret.types.js';
|
|
3
|
+
import { SecretService } from '../../services/secret-service.js';
|
|
4
|
+
export declare class OAuth2Client {
|
|
5
|
+
private oauth2Config;
|
|
6
|
+
private appCredentialSecretId;
|
|
7
|
+
private secrets;
|
|
8
|
+
private cachedToken;
|
|
9
|
+
private cachedAppCredential;
|
|
10
|
+
private refreshPromise;
|
|
11
|
+
constructor(oauth2Config: OAuth2CredentialConfig, appCredentialSecretId: string, secrets: SecretService);
|
|
12
|
+
/**
|
|
13
|
+
* Make an authenticated request. Handles token caching and 401 refresh.
|
|
14
|
+
*/
|
|
15
|
+
request(url: string, options?: RequestInit, timeoutMs?: number): Promise<Response>;
|
|
16
|
+
/**
|
|
17
|
+
* Get cached token or load from secrets.
|
|
18
|
+
*/
|
|
19
|
+
getAccessToken(): Promise<string>;
|
|
20
|
+
/**
|
|
21
|
+
* Refresh token and update cache.
|
|
22
|
+
* Uses a promise lock to prevent concurrent refresh attempts.
|
|
23
|
+
*/
|
|
24
|
+
private refreshAndGetToken;
|
|
25
|
+
/**
|
|
26
|
+
* Perform the actual token refresh.
|
|
27
|
+
*/
|
|
28
|
+
private doRefreshToken;
|
|
29
|
+
/**
|
|
30
|
+
* Check if token is valid (not expired).
|
|
31
|
+
*/
|
|
32
|
+
private isTokenValid;
|
|
33
|
+
/**
|
|
34
|
+
* Get app credentials (cached).
|
|
35
|
+
*/
|
|
36
|
+
private getAppCredential;
|
|
37
|
+
/**
|
|
38
|
+
* Generate OAuth2 authorization URL.
|
|
39
|
+
* Used by CLI during `pikku oauth connect`.
|
|
40
|
+
*/
|
|
41
|
+
getAuthorizationUrl(state: string, redirectUri: string): Promise<string>;
|
|
42
|
+
/**
|
|
43
|
+
* Exchange authorization code for tokens.
|
|
44
|
+
* Used by CLI during `pikku oauth connect`.
|
|
45
|
+
*/
|
|
46
|
+
exchangeCode(code: string, redirectUri: string): Promise<OAuth2Token>;
|
|
47
|
+
}
|
|
@@ -0,0 +1,267 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OAuth2 client that acts as a service.
|
|
3
|
+
* Created once in createSingletonServices, handles token caching and refresh internally.
|
|
4
|
+
* Functions use it directly via oauth.request().
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* ```typescript
|
|
8
|
+
* // In services.ts
|
|
9
|
+
* export const createSingletonServices = async (config, { secrets }) => {
|
|
10
|
+
* return {
|
|
11
|
+
* slackOAuth: new OAuth2Client(
|
|
12
|
+
* { tokenSecretId: 'SLACK_TOKENS', authorizationUrl: '...', tokenUrl: '...', scopes: [] },
|
|
13
|
+
* 'SLACK_APP_CREDS',
|
|
14
|
+
* secrets
|
|
15
|
+
* ),
|
|
16
|
+
* }
|
|
17
|
+
* }
|
|
18
|
+
*
|
|
19
|
+
* // In function
|
|
20
|
+
* export const postMessage = pikkuFunc(async ({ slackOAuth }, { channel, text }) => {
|
|
21
|
+
* const response = await slackOAuth.request('https://slack.com/api/chat.postMessage', {
|
|
22
|
+
* method: 'POST',
|
|
23
|
+
* body: JSON.stringify({ channel, text }),
|
|
24
|
+
* })
|
|
25
|
+
* return response.json()
|
|
26
|
+
* })
|
|
27
|
+
* ```
|
|
28
|
+
*/
|
|
29
|
+
const DEFAULT_TIMEOUT_MS = 30000;
|
|
30
|
+
/**
|
|
31
|
+
* Helper to fetch with a timeout using AbortController.
|
|
32
|
+
*/
|
|
33
|
+
async function fetchWithTimeout(url, options, timeoutMs = DEFAULT_TIMEOUT_MS) {
|
|
34
|
+
const controller = new AbortController();
|
|
35
|
+
const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
|
|
36
|
+
try {
|
|
37
|
+
return await fetch(url, {
|
|
38
|
+
...options,
|
|
39
|
+
signal: controller.signal,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
finally {
|
|
43
|
+
clearTimeout(timeoutId);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
export class OAuth2Client {
|
|
47
|
+
oauth2Config;
|
|
48
|
+
appCredentialSecretId;
|
|
49
|
+
secrets;
|
|
50
|
+
cachedToken = null;
|
|
51
|
+
cachedAppCredential = null;
|
|
52
|
+
refreshPromise = null;
|
|
53
|
+
constructor(oauth2Config, appCredentialSecretId, secrets) {
|
|
54
|
+
this.oauth2Config = oauth2Config;
|
|
55
|
+
this.appCredentialSecretId = appCredentialSecretId;
|
|
56
|
+
this.secrets = secrets;
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Make an authenticated request. Handles token caching and 401 refresh.
|
|
60
|
+
*/
|
|
61
|
+
async request(url, options, timeoutMs = DEFAULT_TIMEOUT_MS) {
|
|
62
|
+
const token = await this.getAccessToken();
|
|
63
|
+
const response = await fetchWithTimeout(url, {
|
|
64
|
+
...options,
|
|
65
|
+
headers: {
|
|
66
|
+
...options?.headers,
|
|
67
|
+
Authorization: `Bearer ${token}`,
|
|
68
|
+
},
|
|
69
|
+
}, timeoutMs);
|
|
70
|
+
// Auto-retry on 401 after refresh
|
|
71
|
+
if (response.status === 401) {
|
|
72
|
+
const newToken = await this.refreshAndGetToken();
|
|
73
|
+
return fetchWithTimeout(url, {
|
|
74
|
+
...options,
|
|
75
|
+
headers: {
|
|
76
|
+
...options?.headers,
|
|
77
|
+
Authorization: `Bearer ${newToken}`,
|
|
78
|
+
},
|
|
79
|
+
}, timeoutMs);
|
|
80
|
+
}
|
|
81
|
+
return response;
|
|
82
|
+
}
|
|
83
|
+
/**
|
|
84
|
+
* Get cached token or load from secrets.
|
|
85
|
+
*/
|
|
86
|
+
async getAccessToken() {
|
|
87
|
+
// Return cached token if valid
|
|
88
|
+
if (this.cachedToken) {
|
|
89
|
+
if (this.isTokenValid(this.cachedToken)) {
|
|
90
|
+
return this.cachedToken.accessToken;
|
|
91
|
+
}
|
|
92
|
+
// Token expired, try to refresh
|
|
93
|
+
if (this.cachedToken.refreshToken) {
|
|
94
|
+
return this.refreshAndGetToken();
|
|
95
|
+
}
|
|
96
|
+
// Token expired and no refresh token available
|
|
97
|
+
throw new Error('OAuth2 token expired and no refresh token available');
|
|
98
|
+
}
|
|
99
|
+
// Load from secrets
|
|
100
|
+
const token = await this.secrets.getSecretJSON(this.oauth2Config.tokenSecretId);
|
|
101
|
+
this.cachedToken = token;
|
|
102
|
+
// Check if loaded token is expired and needs refresh
|
|
103
|
+
if (!this.isTokenValid(token)) {
|
|
104
|
+
if (token.refreshToken) {
|
|
105
|
+
return this.refreshAndGetToken();
|
|
106
|
+
}
|
|
107
|
+
// Token expired and no refresh token available
|
|
108
|
+
throw new Error('OAuth2 token expired and no refresh token available');
|
|
109
|
+
}
|
|
110
|
+
return token.accessToken;
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* Refresh token and update cache.
|
|
114
|
+
* Uses a promise lock to prevent concurrent refresh attempts.
|
|
115
|
+
*/
|
|
116
|
+
async refreshAndGetToken() {
|
|
117
|
+
// If already refreshing, wait for that to complete
|
|
118
|
+
if (this.refreshPromise) {
|
|
119
|
+
const token = await this.refreshPromise;
|
|
120
|
+
return token.accessToken;
|
|
121
|
+
}
|
|
122
|
+
// Start refresh
|
|
123
|
+
this.refreshPromise = this.doRefreshToken();
|
|
124
|
+
try {
|
|
125
|
+
const token = await this.refreshPromise;
|
|
126
|
+
this.cachedToken = token;
|
|
127
|
+
return token.accessToken;
|
|
128
|
+
}
|
|
129
|
+
finally {
|
|
130
|
+
this.refreshPromise = null;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
/**
|
|
134
|
+
* Perform the actual token refresh.
|
|
135
|
+
*/
|
|
136
|
+
async doRefreshToken() {
|
|
137
|
+
if (!this.cachedToken?.refreshToken) {
|
|
138
|
+
throw new Error('No refresh token available');
|
|
139
|
+
}
|
|
140
|
+
const appCredential = await this.getAppCredential();
|
|
141
|
+
const params = new URLSearchParams({
|
|
142
|
+
grant_type: 'refresh_token',
|
|
143
|
+
refresh_token: this.cachedToken.refreshToken,
|
|
144
|
+
client_id: appCredential.clientId,
|
|
145
|
+
});
|
|
146
|
+
if (appCredential.clientSecret) {
|
|
147
|
+
params.set('client_secret', appCredential.clientSecret);
|
|
148
|
+
}
|
|
149
|
+
const response = await fetchWithTimeout(this.oauth2Config.tokenUrl, {
|
|
150
|
+
method: 'POST',
|
|
151
|
+
headers: {
|
|
152
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
153
|
+
},
|
|
154
|
+
body: params.toString(),
|
|
155
|
+
});
|
|
156
|
+
if (!response.ok) {
|
|
157
|
+
throw new Error(`Token refresh failed: ${response.status}`);
|
|
158
|
+
}
|
|
159
|
+
const data = await response.json();
|
|
160
|
+
if (!data.access_token || typeof data.access_token !== 'string') {
|
|
161
|
+
throw new Error('Invalid token response: missing access_token');
|
|
162
|
+
}
|
|
163
|
+
const token = {
|
|
164
|
+
accessToken: data.access_token,
|
|
165
|
+
refreshToken: data.refresh_token || this.cachedToken.refreshToken,
|
|
166
|
+
expiresAt: data.expires_in
|
|
167
|
+
? Date.now() + data.expires_in * 1000
|
|
168
|
+
: undefined,
|
|
169
|
+
tokenType: data.token_type || 'Bearer',
|
|
170
|
+
scope: data.scope,
|
|
171
|
+
};
|
|
172
|
+
// Cache and persist the refreshed token
|
|
173
|
+
this.cachedToken = token;
|
|
174
|
+
await this.secrets.setSecretJSON(this.oauth2Config.tokenSecretId, token);
|
|
175
|
+
return token;
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* Check if token is valid (not expired).
|
|
179
|
+
*/
|
|
180
|
+
isTokenValid(token) {
|
|
181
|
+
if (!token.expiresAt) {
|
|
182
|
+
return true; // No expiry info, assume valid
|
|
183
|
+
}
|
|
184
|
+
// Add 60 second buffer to account for clock skew
|
|
185
|
+
return token.expiresAt > Date.now() + 60000;
|
|
186
|
+
}
|
|
187
|
+
/**
|
|
188
|
+
* Get app credentials (cached).
|
|
189
|
+
*/
|
|
190
|
+
async getAppCredential() {
|
|
191
|
+
if (this.cachedAppCredential) {
|
|
192
|
+
return this.cachedAppCredential;
|
|
193
|
+
}
|
|
194
|
+
this.cachedAppCredential =
|
|
195
|
+
await this.secrets.getSecretJSON(this.appCredentialSecretId);
|
|
196
|
+
return this.cachedAppCredential;
|
|
197
|
+
}
|
|
198
|
+
// ========================================
|
|
199
|
+
// CLI-only methods (for pikku oauth connect)
|
|
200
|
+
// ========================================
|
|
201
|
+
/**
|
|
202
|
+
* Generate OAuth2 authorization URL.
|
|
203
|
+
* Used by CLI during `pikku oauth connect`.
|
|
204
|
+
*/
|
|
205
|
+
async getAuthorizationUrl(state, redirectUri) {
|
|
206
|
+
const appCredential = await this.getAppCredential();
|
|
207
|
+
const params = new URLSearchParams({
|
|
208
|
+
response_type: 'code',
|
|
209
|
+
client_id: appCredential.clientId,
|
|
210
|
+
redirect_uri: redirectUri,
|
|
211
|
+
scope: this.oauth2Config.scopes.join(' '),
|
|
212
|
+
state,
|
|
213
|
+
});
|
|
214
|
+
// Add PKCE if enabled
|
|
215
|
+
// Note: code_verifier should be stored and passed to exchangeCode
|
|
216
|
+
// For now, PKCE implementation is simplified
|
|
217
|
+
// Add any additional params
|
|
218
|
+
if (this.oauth2Config.additionalParams) {
|
|
219
|
+
for (const [key, value] of Object.entries(this.oauth2Config.additionalParams)) {
|
|
220
|
+
params.set(key, value);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
return `${this.oauth2Config.authorizationUrl}?${params.toString()}`;
|
|
224
|
+
}
|
|
225
|
+
/**
|
|
226
|
+
* Exchange authorization code for tokens.
|
|
227
|
+
* Used by CLI during `pikku oauth connect`.
|
|
228
|
+
*/
|
|
229
|
+
async exchangeCode(code, redirectUri) {
|
|
230
|
+
const appCredential = await this.getAppCredential();
|
|
231
|
+
const params = new URLSearchParams({
|
|
232
|
+
grant_type: 'authorization_code',
|
|
233
|
+
code,
|
|
234
|
+
redirect_uri: redirectUri,
|
|
235
|
+
client_id: appCredential.clientId,
|
|
236
|
+
});
|
|
237
|
+
if (appCredential.clientSecret) {
|
|
238
|
+
params.set('client_secret', appCredential.clientSecret);
|
|
239
|
+
}
|
|
240
|
+
const response = await fetchWithTimeout(this.oauth2Config.tokenUrl, {
|
|
241
|
+
method: 'POST',
|
|
242
|
+
headers: {
|
|
243
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
244
|
+
},
|
|
245
|
+
body: params.toString(),
|
|
246
|
+
});
|
|
247
|
+
if (!response.ok) {
|
|
248
|
+
throw new Error(`Token exchange failed: ${response.status}`);
|
|
249
|
+
}
|
|
250
|
+
const data = await response.json();
|
|
251
|
+
if (!data.access_token || typeof data.access_token !== 'string') {
|
|
252
|
+
throw new Error('Invalid token response: missing access_token');
|
|
253
|
+
}
|
|
254
|
+
const token = {
|
|
255
|
+
accessToken: data.access_token,
|
|
256
|
+
refreshToken: data.refresh_token,
|
|
257
|
+
expiresAt: data.expires_in
|
|
258
|
+
? Date.now() + data.expires_in * 1000
|
|
259
|
+
: undefined,
|
|
260
|
+
tokenType: data.token_type || 'Bearer',
|
|
261
|
+
scope: data.scope,
|
|
262
|
+
};
|
|
263
|
+
// Cache the token
|
|
264
|
+
this.cachedToken = token;
|
|
265
|
+
return token;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OAuth2 credential and token types.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* App credentials for OAuth2 (client ID and secret).
|
|
6
|
+
* These are typically set once and stored in the secret service.
|
|
7
|
+
*/
|
|
8
|
+
export type OAuth2AppCredential = {
|
|
9
|
+
clientId: string;
|
|
10
|
+
clientSecret?: string;
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* OAuth2 token data returned from token endpoint.
|
|
14
|
+
*/
|
|
15
|
+
export type OAuth2Token = {
|
|
16
|
+
accessToken: string;
|
|
17
|
+
refreshToken?: string;
|
|
18
|
+
expiresAt?: number;
|
|
19
|
+
tokenType: string;
|
|
20
|
+
scope?: string;
|
|
21
|
+
};
|
|
22
|
+
/**
|
|
23
|
+
* OAuth2-specific configuration that extends a credential.
|
|
24
|
+
* This is stored in SecretDefinitionMeta.oauth2 field.
|
|
25
|
+
*/
|
|
26
|
+
export type OAuth2Config = {
|
|
27
|
+
/** Where access/refresh tokens are stored */
|
|
28
|
+
tokenSecretId: string;
|
|
29
|
+
/** OAuth2 authorization URL */
|
|
30
|
+
authorizationUrl: string;
|
|
31
|
+
/** OAuth2 token exchange URL */
|
|
32
|
+
tokenUrl: string;
|
|
33
|
+
/** Required scopes */
|
|
34
|
+
scopes: string[];
|
|
35
|
+
/** Use PKCE flow */
|
|
36
|
+
pkce?: boolean;
|
|
37
|
+
/** Additional query parameters for authorization URL */
|
|
38
|
+
additionalParams?: Record<string, string>;
|
|
39
|
+
};
|
|
40
|
+
/**
|
|
41
|
+
* Configuration for wireOAuth2Credential.
|
|
42
|
+
* Combines standard credential fields with OAuth2-specific config.
|
|
43
|
+
*/
|
|
44
|
+
export type CoreOAuth2Credential = {
|
|
45
|
+
/** Unique identifier for this credential */
|
|
46
|
+
name: string;
|
|
47
|
+
/** Human-readable name for UI display */
|
|
48
|
+
displayName: string;
|
|
49
|
+
/** Optional description for UI */
|
|
50
|
+
description?: string;
|
|
51
|
+
/** Key used with SecretService to retrieve app credentials (clientId/clientSecret) */
|
|
52
|
+
secretId: string;
|
|
53
|
+
/** Where access/refresh tokens are stored */
|
|
54
|
+
tokenSecretId: string;
|
|
55
|
+
/** OAuth2 authorization URL */
|
|
56
|
+
authorizationUrl: string;
|
|
57
|
+
/** OAuth2 token exchange URL */
|
|
58
|
+
tokenUrl: string;
|
|
59
|
+
/** Required scopes */
|
|
60
|
+
scopes: string[];
|
|
61
|
+
/** Use PKCE flow */
|
|
62
|
+
pkce?: boolean;
|
|
63
|
+
/** Additional query parameters for authorization URL */
|
|
64
|
+
additionalParams?: Record<string, string>;
|
|
65
|
+
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { CoreOAuth2Credential } from './oauth2.types.js';
|
|
2
|
+
/**
|
|
3
|
+
* No-op function for declaring OAuth2 credentials.
|
|
4
|
+
* This exists purely for TypeScript type checking and will be tree-shaken.
|
|
5
|
+
* The CLI extracts metadata via AST parsing.
|
|
6
|
+
*
|
|
7
|
+
* @example
|
|
8
|
+
* ```typescript
|
|
9
|
+
* wireOAuth2Credential({
|
|
10
|
+
* name: 'slackOAuth',
|
|
11
|
+
* displayName: 'Slack OAuth',
|
|
12
|
+
* secretId: 'SLACK_OAUTH_APP',
|
|
13
|
+
* tokenSecretId: 'SLACK_OAUTH_TOKENS',
|
|
14
|
+
* authorizationUrl: 'https://slack.com/oauth/v2/authorize',
|
|
15
|
+
* tokenUrl: 'https://slack.com/api/oauth.v2.access',
|
|
16
|
+
* scopes: ['chat:write', 'channels:read'],
|
|
17
|
+
* })
|
|
18
|
+
* ```
|
|
19
|
+
*/
|
|
20
|
+
export declare const wireOAuth2Credential: (_config: CoreOAuth2Credential) => void;
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* No-op function for declaring OAuth2 credentials.
|
|
3
|
+
* This exists purely for TypeScript type checking and will be tree-shaken.
|
|
4
|
+
* The CLI extracts metadata via AST parsing.
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* ```typescript
|
|
8
|
+
* wireOAuth2Credential({
|
|
9
|
+
* name: 'slackOAuth',
|
|
10
|
+
* displayName: 'Slack OAuth',
|
|
11
|
+
* secretId: 'SLACK_OAUTH_APP',
|
|
12
|
+
* tokenSecretId: 'SLACK_OAUTH_TOKENS',
|
|
13
|
+
* authorizationUrl: 'https://slack.com/oauth/v2/authorize',
|
|
14
|
+
* tokenUrl: 'https://slack.com/api/oauth.v2.access',
|
|
15
|
+
* scopes: ['chat:write', 'channels:read'],
|
|
16
|
+
* })
|
|
17
|
+
* ```
|
|
18
|
+
*/
|
|
19
|
+
export const wireOAuth2Credential = (_config) => {
|
|
20
|
+
// No-op - metadata only, extracted by CLI via AST
|
|
21
|
+
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export type
|
|
2
|
-
export { wireQueueWorker, runQueueJob, getQueueWorkers, removeQueueWorker, QueueJobDiscardedError, QueueJobFailedError, } from './queue-runner.js';
|
|
1
|
+
export type { ConfigValidationResult, CoreQueueWorker, JobOptions, PikkuJobConfig, PikkuWorkerConfig, PikkuQueue, QueueJob, QueueJobStatus, QueueService, QueueWorkers, QueueWorkersMeta, } from './queue.types.js';
|
|
2
|
+
export { wireQueueWorker, runQueueJob, createQueueJobRunner, getQueueWorkers, removeQueueWorker, QueueJobDiscardedError, QueueJobFailedError, } from './queue-runner.js';
|
|
3
3
|
export { validateWorkerConfig } from './validate-worker-config.js';
|
|
4
4
|
export type { QueueConfigMapping } from './validate-worker-config.js';
|
|
5
5
|
export { registerQueueWorkers } from './register-queue-helper.js';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Queue processor management
|
|
2
|
-
export { wireQueueWorker, runQueueJob, getQueueWorkers, removeQueueWorker, QueueJobDiscardedError, QueueJobFailedError, } from './queue-runner.js';
|
|
2
|
+
export { wireQueueWorker, runQueueJob, createQueueJobRunner, getQueueWorkers, removeQueueWorker, QueueJobDiscardedError, QueueJobFailedError, } from './queue-runner.js';
|
|
3
3
|
// Configuration validation
|
|
4
4
|
export { validateWorkerConfig } from './validate-worker-config.js';
|
|
5
5
|
// Queue registration helper
|
|
@@ -36,3 +36,10 @@ export declare function runQueueJob({ singletonServices, createWireServices, job
|
|
|
36
36
|
job: QueueJob;
|
|
37
37
|
updateProgress?: (progress: number | string | object) => Promise<void>;
|
|
38
38
|
}): Promise<void>;
|
|
39
|
+
export declare const createQueueJobRunner: ({ singletonServices, createWireServices, }: {
|
|
40
|
+
singletonServices: CoreServices;
|
|
41
|
+
createWireServices?: CreateWireServices;
|
|
42
|
+
}) => ({ job, updateProgress, }: {
|
|
43
|
+
job: QueueJob;
|
|
44
|
+
updateProgress?: (progress: number | string | object) => Promise<void>;
|
|
45
|
+
}) => Promise<void>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { getErrorResponse, PikkuError } from '../../errors/error-handler.js';
|
|
2
|
+
import { PikkuMissingMetaError } from '../../errors/errors.js';
|
|
2
3
|
import { pikkuState } from '../../pikku-state.js';
|
|
3
4
|
import { addFunction, runPikkuFunc } from '../../function/function-runner.js';
|
|
4
5
|
/**
|
|
@@ -33,12 +34,12 @@ export class QueueJobDiscardedError extends PikkuError {
|
|
|
33
34
|
export const wireQueueWorker = (queueWorker) => {
|
|
34
35
|
// Get processor metadata
|
|
35
36
|
const meta = pikkuState(null, 'queue', 'meta');
|
|
36
|
-
const processorMeta = meta[queueWorker.
|
|
37
|
+
const processorMeta = meta[queueWorker.name];
|
|
37
38
|
if (!processorMeta) {
|
|
38
|
-
throw new
|
|
39
|
+
throw new PikkuMissingMetaError(`Missing generated metadata for queue worker '${queueWorker.name}'`);
|
|
39
40
|
}
|
|
40
41
|
// Register the function with pikku
|
|
41
|
-
addFunction(processorMeta.
|
|
42
|
+
addFunction(processorMeta.pikkuFuncId, {
|
|
42
43
|
func: queueWorker.func.func,
|
|
43
44
|
auth: queueWorker.func.auth,
|
|
44
45
|
permissions: queueWorker.func.permissions,
|
|
@@ -47,7 +48,7 @@ export const wireQueueWorker = (queueWorker) => {
|
|
|
47
48
|
});
|
|
48
49
|
// Store processor definition in state - runtime adapters will pick this up
|
|
49
50
|
const registrations = pikkuState(null, 'queue', 'registrations');
|
|
50
|
-
registrations.set(queueWorker.
|
|
51
|
+
registrations.set(queueWorker.name, queueWorker);
|
|
51
52
|
};
|
|
52
53
|
/**
|
|
53
54
|
* Get all registered queue processors
|
|
@@ -74,7 +75,7 @@ export async function runQueueJob({ singletonServices, createWireServices, job,
|
|
|
74
75
|
const meta = pikkuState(null, 'queue', 'meta');
|
|
75
76
|
const processorMeta = meta[job.queueName];
|
|
76
77
|
if (!processorMeta) {
|
|
77
|
-
throw new
|
|
78
|
+
throw new PikkuMissingMetaError(`Missing generated metadata for queue worker '${job.queueName}'`);
|
|
78
79
|
}
|
|
79
80
|
// Get the queue worker registration to access middleware
|
|
80
81
|
const registrations = pikkuState(null, 'queue', 'registrations');
|
|
@@ -104,7 +105,7 @@ export async function runQueueJob({ singletonServices, createWireServices, job,
|
|
|
104
105
|
queue,
|
|
105
106
|
};
|
|
106
107
|
// Execute the pikku function with the job data
|
|
107
|
-
const result = await runPikkuFunc('queue', job.queueName, processorMeta.
|
|
108
|
+
const result = await runPikkuFunc('queue', job.queueName, processorMeta.pikkuFuncId, {
|
|
108
109
|
singletonServices,
|
|
109
110
|
createWireServices,
|
|
110
111
|
auth: false,
|
|
@@ -127,3 +128,13 @@ export async function runQueueJob({ singletonServices, createWireServices, job,
|
|
|
127
128
|
throw error;
|
|
128
129
|
}
|
|
129
130
|
}
|
|
131
|
+
export const createQueueJobRunner = ({ singletonServices, createWireServices, }) => {
|
|
132
|
+
return async ({ job, updateProgress, }) => {
|
|
133
|
+
await runQueueJob({
|
|
134
|
+
singletonServices,
|
|
135
|
+
createWireServices,
|
|
136
|
+
job,
|
|
137
|
+
updateProgress,
|
|
138
|
+
});
|
|
139
|
+
};
|
|
140
|
+
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CommonWireMeta } from '../../types/core.types.js';
|
|
2
2
|
import { CorePikkuFunctionConfig } from '../../function/functions.types.js';
|
|
3
3
|
import { QueueConfigMapping } from './validate-worker-config.js';
|
|
4
|
+
import { Logger } from '../../services/logger.js';
|
|
4
5
|
/**
|
|
5
6
|
* Configuration for queue workers - how jobs are processed
|
|
6
7
|
*/
|
|
@@ -124,6 +125,11 @@ export interface QueueWorkers {
|
|
|
124
125
|
supportsResults: boolean;
|
|
125
126
|
/** Configuration mapping for validation */
|
|
126
127
|
configMappings: QueueConfigMapping;
|
|
128
|
+
/** Set runtime queue job runner callback and logger */
|
|
129
|
+
setJobRunner(runJob: (params: {
|
|
130
|
+
job: QueueJob;
|
|
131
|
+
updateProgress?: (progress: number | string | object) => Promise<void>;
|
|
132
|
+
}) => Promise<void>, logger: Logger): void;
|
|
127
133
|
/** Scan state and register all compatible processors */
|
|
128
134
|
registerQueues(): Promise<Record<string, ConfigValidationResult[]>>;
|
|
129
135
|
}
|
|
@@ -131,14 +137,14 @@ export interface QueueWorkers {
|
|
|
131
137
|
* Queue processor metadata
|
|
132
138
|
*/
|
|
133
139
|
export type QueueWorkersMeta = Record<string, CommonWireMeta & {
|
|
134
|
-
|
|
140
|
+
name: string;
|
|
135
141
|
config?: PikkuWorkerConfig;
|
|
136
142
|
}>;
|
|
137
143
|
/**
|
|
138
144
|
* Core queue processor definition
|
|
139
145
|
*/
|
|
140
146
|
export type CoreQueueWorker<PikkuFunctionConfig extends CorePikkuFunctionConfig<any, any, any> = CorePikkuFunctionConfig<any, any, any>> = {
|
|
141
|
-
|
|
147
|
+
name: string;
|
|
142
148
|
func: PikkuFunctionConfig;
|
|
143
149
|
config?: PikkuWorkerConfig;
|
|
144
150
|
errors?: string[];
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { PikkuRPCService, rpcService } from './rpc-runner.js';
|
|
1
|
+
export { PikkuRPCService, rpcService, RPCNotFoundError } from './rpc-runner.js';
|
|
2
2
|
export type { PikkuRPC, RPCMeta } from './rpc-types.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { PikkuRPCService, rpcService } from './rpc-runner.js';
|
|
1
|
+
export { PikkuRPCService, rpcService, RPCNotFoundError } from './rpc-runner.js';
|
|
@@ -1,11 +1,20 @@
|
|
|
1
|
-
import { CoreServices, PikkuWire } from '../../types/core.types.js';
|
|
1
|
+
import { CoreServices, CoreSingletonServices, PikkuWire } from '../../types/core.types.js';
|
|
2
|
+
import type { SessionService } from '../../services/user-session-service.js';
|
|
3
|
+
import type { CoreUserSession } from '../../types/core.types.js';
|
|
4
|
+
import { PikkuError } from '../../errors/error-handler.js';
|
|
2
5
|
import { PikkuRPC } from './rpc-types.js';
|
|
6
|
+
export declare class RPCNotFoundError extends PikkuError {
|
|
7
|
+
readonly rpcName: string;
|
|
8
|
+
constructor(rpcName: string);
|
|
9
|
+
}
|
|
10
|
+
import type { AIAgentInput } from '../ai-agent/ai-agent.types.js';
|
|
3
11
|
export declare class ContextAwareRPCService {
|
|
4
12
|
private services;
|
|
5
13
|
private wire;
|
|
6
14
|
private options;
|
|
7
15
|
constructor(services: CoreServices, wire: PikkuWire, options: {
|
|
8
16
|
requiresAuth?: boolean;
|
|
17
|
+
sessionService?: SessionService<CoreUserSession>;
|
|
9
18
|
});
|
|
10
19
|
rpcExposed(funcName: string, data: any): Promise<any>;
|
|
11
20
|
rpc<In = any, Out = any>(funcName: string, data: In): Promise<Out>;
|
|
@@ -17,15 +26,34 @@ export declare class ContextAwareRPCService {
|
|
|
17
26
|
*/
|
|
18
27
|
private invokeExternalPackageFunction;
|
|
19
28
|
rpcWithWire<In = any, Out = any>(rpcName: string, data: In, wire: PikkuWire): Promise<Out>;
|
|
20
|
-
startWorkflow<In = any>(workflowName: string, input: In
|
|
29
|
+
startWorkflow<In = any>(workflowName: string, input: In, options?: {
|
|
30
|
+
startNode?: string;
|
|
31
|
+
wire?: {
|
|
32
|
+
type: string;
|
|
33
|
+
id?: string;
|
|
34
|
+
parentRunId?: string;
|
|
35
|
+
};
|
|
36
|
+
}): Promise<{
|
|
37
|
+
runId: string;
|
|
38
|
+
}>;
|
|
39
|
+
agent(agentName: string, input: AIAgentInput): Promise<{
|
|
21
40
|
runId: string;
|
|
41
|
+
result: unknown;
|
|
42
|
+
usage: {
|
|
43
|
+
inputTokens: number;
|
|
44
|
+
outputTokens: number;
|
|
45
|
+
};
|
|
22
46
|
}>;
|
|
47
|
+
remote<In = any, Out = any>(funcName: string, data: In): Promise<Out>;
|
|
23
48
|
}
|
|
24
49
|
export declare class PikkuRPCService<Services extends CoreServices, TypedRPC = PikkuRPC> {
|
|
25
|
-
getContextRPCService(services: Services, wire: PikkuWire,
|
|
50
|
+
getContextRPCService(services: Services, wire: PikkuWire, requiresAuthOrOptions?: boolean | {
|
|
51
|
+
requiresAuth?: boolean;
|
|
52
|
+
sessionService?: SessionService<CoreUserSession>;
|
|
53
|
+
} | undefined, depth?: number): TypedRPC;
|
|
26
54
|
}
|
|
27
|
-
export declare const rpcService: PikkuRPCService<
|
|
28
|
-
logLevel?: import("../../
|
|
55
|
+
export declare const rpcService: PikkuRPCService<CoreSingletonServices<{
|
|
56
|
+
logLevel?: import("../../services/logger.js").LogLevel;
|
|
29
57
|
secrets?: {};
|
|
30
58
|
workflow?: import("../workflow/workflow.types.js").WorkflowServiceConfig;
|
|
31
59
|
}>, PikkuRPC>;
|