@dcupl/cli 1.4.0-beta.16 → 1.4.0-beta.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +20 -36
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/commands/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/daemon/controllers/data.controller.d.ts +2 -3
- package/dist/functions/app/daemon/controllers/data.controller.js +2 -2
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +12 -1
- package/dist/functions/app/daemon/services/dcupl-host.service.js +68 -1
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.js +17 -7
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +6 -2
- package/dist/functions/generate/files/generate.helper.js +8 -6
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +1 -0
- package/dist/functions/helper/api-client.js +8 -2
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/workflow/commands/run.d.ts +2 -8
- package/dist/functions/workflow/commands/run.js +5 -14
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +2 -8
- package/dist/functions/workflow/commands/test.js +5 -12
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +28 -15
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-presets.js","sourceRoot":"","sources":["../../../../src/functions/generate/files/workflow-presets.ts"],"names":[],"mappings":";;;AAKa,QAAA,gBAAgB,GAAG,CAAC,sBAAsB,CAAU,CAAC;AAIrD,QAAA,uBAAuB,GAAmB,sBAAsB,CAAC;AAEvE,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAA2B,EAAE,CACxE,wBAAsC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAD7C,QAAA,gBAAgB,oBAC6B;AAI1D,MAAM,eAAe,GAAG;IACtB,kFAAkF;IAClF,yCAAyC;IACzC,qFAAqF;IACrF,yEAAyE;IACzE,0CAA0C;IAC1C,EAAE;IACF,gCAAgC;IAChC,EAAE;IACF,4CAA4C;IAC5C,sDAAsD;IACtD,EAAE;IACF,6EAA6E;CAC9E,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"workflow-presets.js","sourceRoot":"","sources":["../../../../src/functions/generate/files/workflow-presets.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export interface ApiClientRequestOptions {
|
|
|
13
13
|
headers?: Record<string, string>;
|
|
14
14
|
responseType?: string;
|
|
15
15
|
timeoutMs?: number;
|
|
16
|
+
relaysUpstreamAuth?: boolean;
|
|
16
17
|
}
|
|
17
18
|
export interface ApiClient {
|
|
18
19
|
request<T = any>(method: string, path: string, options?: ApiClientRequestOptions): Promise<T>;
|
|
@@ -35,6 +35,10 @@ function networkErrorMessage(code, baseURL) {
|
|
|
35
35
|
return `Could not reach the console API at ${baseURL} (${code}).`;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
+
function stripRouteQuery(message) {
|
|
39
|
+
return typeof message === 'string' ? message.replace(/^(Cannot [A-Z]+ [^?\s]*)\?\S*/, '$1') : message;
|
|
40
|
+
}
|
|
41
|
+
const GUARD_REJECTION_MESSAGES = new Set(['Forbidden resource', 'Unauthorized']);
|
|
38
42
|
function createApiClient(basePath) {
|
|
39
43
|
const currentBasePath = basePath || process.cwd();
|
|
40
44
|
const config = (0, config_helper_1.getConfigFileValue)(currentBasePath, undefined, { quiet: true });
|
|
@@ -72,8 +76,10 @@ function createApiClient(basePath) {
|
|
|
72
76
|
catch (err) {
|
|
73
77
|
if (err instanceof axios_1.AxiosError && err.response) {
|
|
74
78
|
const status = err.response.status;
|
|
75
|
-
const serverMessage = err.response.data?.message || err.message;
|
|
76
|
-
const
|
|
79
|
+
const serverMessage = stripRouteQuery(err.response.data?.message || err.message);
|
|
80
|
+
const cliKeyRejected = (status === 401 || status === 403) &&
|
|
81
|
+
!(options?.relaysUpstreamAuth && !GUARD_REJECTION_MESSAGES.has(String(serverMessage)));
|
|
82
|
+
const message = cliKeyRejected
|
|
77
83
|
? `API key rejected (${serverMessage}). Check your key with \`dcupl config set --api-key <key>\` and that it has access to this project.`
|
|
78
84
|
: serverMessage;
|
|
79
85
|
throw new ApiClientError(message, `HTTP_${status}`, status, err.response.data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/functions/helper/api-client.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../../src/functions/helper/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{ "script": "return {
|
|
1
|
+
{ "script": "return { ok: true, count: $items().length };" }
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
3
|
import type { DeployedWorkflowV3, RunnerInfo } from '../types.js';
|
|
4
|
+
import { type InvokeTriggerRequest } from '../workflow-api.js';
|
|
4
5
|
export interface RunOptions {
|
|
5
6
|
key: string;
|
|
6
7
|
runner: string;
|
|
@@ -14,13 +15,6 @@ export interface RunDeps {
|
|
|
14
15
|
listWorkflows?: (client: ApiClient) => Promise<DeployedWorkflowV3[]>;
|
|
15
16
|
getWorkflow?: (client: ApiClient, id: string) => Promise<DeployedWorkflowV3>;
|
|
16
17
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
17
|
-
|
|
18
|
-
runnerUrl: string;
|
|
19
|
-
key: string;
|
|
20
|
-
triggerPath: string;
|
|
21
|
-
method: string;
|
|
22
|
-
body?: unknown;
|
|
23
|
-
triggerKey?: string;
|
|
24
|
-
}) => Promise<unknown>;
|
|
18
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<unknown>;
|
|
25
19
|
}
|
|
26
20
|
export declare function runCommand(output: Output, client: ApiClient, opts: RunOptions, deps?: RunDeps): Promise<void>;
|
|
@@ -17,7 +17,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
17
17
|
const listWorkflows = deps.listWorkflows ?? workflow_api_js_1.listWorkflows;
|
|
18
18
|
const getWorkflow = deps.getWorkflow ?? workflow_api_js_1.getWorkflow;
|
|
19
19
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
20
|
-
const
|
|
20
|
+
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
21
21
|
if (opts.body !== undefined && opts.input !== undefined) {
|
|
22
22
|
output.error('--body and --input are mutually exclusive; pass the payload inline OR as a file.', 'WORKFLOW_RUN_INPUT_CONFLICT');
|
|
23
23
|
return;
|
|
@@ -44,7 +44,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
44
44
|
let runner;
|
|
45
45
|
let runnerLabel = opts.runner;
|
|
46
46
|
let deployed = findDeployed(workflows, opts.key, runnerUid, client.projectId);
|
|
47
|
-
if (!deployed
|
|
47
|
+
if (!deployed) {
|
|
48
48
|
const resolved = await (0, resolve_runner_js_1.resolveRunnerRef)(() => listRunners(client), opts.runner);
|
|
49
49
|
if (!resolved.ok) {
|
|
50
50
|
output.error(resolved.message, resolved.code);
|
|
@@ -67,25 +67,16 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
67
67
|
raw = await doTestNode(client, deployed.uid, opts.node, { inputData: payload ?? { main: [] } });
|
|
68
68
|
}
|
|
69
69
|
else {
|
|
70
|
-
if (!runner) {
|
|
71
|
-
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
72
|
-
return;
|
|
73
|
-
}
|
|
74
70
|
const trigger = (template?.config?.nodes ?? []).find((n) => n.type === 'trigger-request');
|
|
75
71
|
if (!trigger) {
|
|
76
72
|
output.error('The deployed workflow has no trigger-request node; cannot run it over HTTP.', 'NO_REQUEST_TRIGGER');
|
|
77
73
|
return;
|
|
78
74
|
}
|
|
79
75
|
const method = (trigger.config.methods?.[0] ?? 'POST');
|
|
76
|
+
if (opts.triggerKey)
|
|
77
|
+
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
80
78
|
reachedRun = true;
|
|
81
|
-
raw = await
|
|
82
|
-
runnerUrl: runner.url,
|
|
83
|
-
key: deployed.key,
|
|
84
|
-
triggerPath: trigger.config.path,
|
|
85
|
-
method,
|
|
86
|
-
body: payload,
|
|
87
|
-
triggerKey: opts.triggerKey,
|
|
88
|
-
});
|
|
79
|
+
raw = await doInvoke(client, deployed.uid, trigger.id, { method, path: trigger.config.path, body: payload });
|
|
89
80
|
}
|
|
90
81
|
const trace = (0, trace_js_1.toTrace)(raw);
|
|
91
82
|
trace.workflowKey ??= deployed.key;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":";;AAkEA,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { ApiClient } from '../../helper/api-client.js';
|
|
2
2
|
import type { Output } from '../../helper/output.js';
|
|
3
3
|
import type { DeployedWorkflow, RunnerInfo, TemplateV3, ValidationResult } from '../types.js';
|
|
4
|
+
import { type InvokeTriggerRequest } from '../workflow-api.js';
|
|
4
5
|
import { type SwapResult } from '../wait-for-swap.js';
|
|
5
6
|
import type { RunnerHealth } from '../runner-health.js';
|
|
6
7
|
export interface TestOptions {
|
|
@@ -22,14 +23,7 @@ export interface TestDeps {
|
|
|
22
23
|
template: TemplateV3;
|
|
23
24
|
}[]) => Promise<DeployedWorkflow[]>;
|
|
24
25
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
25
|
-
|
|
26
|
-
runnerUrl: string;
|
|
27
|
-
key: string;
|
|
28
|
-
triggerPath: string;
|
|
29
|
-
method: string;
|
|
30
|
-
body?: unknown;
|
|
31
|
-
triggerKey?: string;
|
|
32
|
-
}) => Promise<unknown>;
|
|
26
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<unknown>;
|
|
33
27
|
waitForSwap?: (client: ApiClient, id: string, deployedV: string, deps?: object, opts?: {
|
|
34
28
|
timeoutMs?: number;
|
|
35
29
|
}) => Promise<SwapResult>;
|
|
@@ -23,7 +23,7 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
23
23
|
const listRunners = deps.listRunners ?? workflow_api_js_1.listRunners;
|
|
24
24
|
const doDeploy = deps.deploy ?? workflow_api_js_1.deploy;
|
|
25
25
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
26
|
-
const
|
|
26
|
+
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
27
27
|
const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
|
|
28
28
|
const template = load(opts.file);
|
|
29
29
|
const local = validateLocal(template);
|
|
@@ -73,25 +73,18 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
73
73
|
raw = await doTestNode(client, deployed.uid, opts.node, body);
|
|
74
74
|
}
|
|
75
75
|
else {
|
|
76
|
-
const runners = await listRunners(client);
|
|
77
|
-
const runner = runners.find((r) => r.uid === runnerUid);
|
|
78
|
-
if (!runner) {
|
|
79
|
-
output.error(`Runner ${opts.runner} not found for this project.`, 'RUNNER_NOT_FOUND');
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
76
|
const trigger = template.config.nodes.find((n) => n.type === 'trigger-request');
|
|
83
77
|
if (!trigger) {
|
|
84
78
|
output.error('No trigger-request node found; cannot run the full workflow.', 'NO_REQUEST_TRIGGER');
|
|
85
79
|
return;
|
|
86
80
|
}
|
|
87
81
|
const method = (trigger.config.methods?.[0] ?? 'POST');
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
triggerPath: trigger.config.path,
|
|
82
|
+
if (opts.triggerKey)
|
|
83
|
+
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
84
|
+
raw = await doInvoke(client, deployed.uid, trigger.id, {
|
|
92
85
|
method,
|
|
86
|
+
path: trigger.config.path,
|
|
93
87
|
body: readJson(opts.input),
|
|
94
|
-
triggerKey: opts.triggerKey,
|
|
95
88
|
});
|
|
96
89
|
}
|
|
97
90
|
const trace = (0, trace_js_1.toTrace)(raw);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":";;AAkEA,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ApiClient } from '../helper/api-client.js';
|
|
2
2
|
import type { DeployItem, DeployedWorkflow, DeployedWorkflowV3, RunnerInfo, TemplateV3, TestNodeRequest, TestNodeResult, ValidationResult, WorkflowVariable, WorkflowStatusResponse, WorkflowHistoryResponse, GraphStateResponse } from './types.js';
|
|
3
3
|
export declare function listRunners(client: ApiClient): Promise<RunnerInfo[]>;
|
|
4
4
|
export interface ValidateBody {
|
|
@@ -17,11 +17,11 @@ export declare function getStatus(client: ApiClient, id: string): Promise<Workfl
|
|
|
17
17
|
export declare function getHistory(client: ApiClient, id: string): Promise<WorkflowHistoryResponse>;
|
|
18
18
|
export declare function getGraphState(client: ApiClient, id: string, runId: string): Promise<GraphStateResponse>;
|
|
19
19
|
export declare function getRunner(client: ApiClient, uid: string): Promise<RunnerInfo>;
|
|
20
|
-
export
|
|
21
|
-
runnerUrl: string;
|
|
22
|
-
key: string;
|
|
23
|
-
triggerPath: string;
|
|
20
|
+
export interface InvokeTriggerRequest {
|
|
24
21
|
method: string;
|
|
22
|
+
path: string;
|
|
25
23
|
body?: unknown;
|
|
26
|
-
|
|
27
|
-
|
|
24
|
+
}
|
|
25
|
+
export declare const INVOKE_ROUTE_MIN_CONSOLE_API = "1.5.15";
|
|
26
|
+
export declare function invokeTrigger(client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest): Promise<unknown>;
|
|
27
|
+
export declare const TRIGGER_KEY_IGNORED_WARNING = "--trigger-key is no longer needed and is ignored: console-api sends the trigger's api-key from the deployed template.";
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TRIGGER_KEY_IGNORED_WARNING = exports.INVOKE_ROUTE_MIN_CONSOLE_API = void 0;
|
|
3
4
|
exports.listRunners = listRunners;
|
|
4
5
|
exports.validateRemote = validateRemote;
|
|
5
6
|
exports.deploy = deploy;
|
|
@@ -12,9 +13,8 @@ exports.getStatus = getStatus;
|
|
|
12
13
|
exports.getHistory = getHistory;
|
|
13
14
|
exports.getGraphState = getGraphState;
|
|
14
15
|
exports.getRunner = getRunner;
|
|
15
|
-
exports.
|
|
16
|
-
const
|
|
17
|
-
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
16
|
+
exports.invokeTrigger = invokeTrigger;
|
|
17
|
+
const api_client_js_1 = require("../helper/api-client.js");
|
|
18
18
|
const base = (client) => `/projects/${client.projectId}`;
|
|
19
19
|
function listRunners(client) {
|
|
20
20
|
return client.request('GET', `${base(client)}/runners`);
|
|
@@ -54,17 +54,30 @@ function getGraphState(client, id, runId) {
|
|
|
54
54
|
function getRunner(client, uid) {
|
|
55
55
|
return client.request('GET', `${base(client)}/runners/${uid}`);
|
|
56
56
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
dataTrace: 'true',
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
57
|
+
exports.INVOKE_ROUTE_MIN_CONSOLE_API = '1.5.15';
|
|
58
|
+
function isMissingInvokeRoute(err) {
|
|
59
|
+
return err instanceof api_client_js_1.ApiClientError && err.statusCode === 404 && /^Cannot POST \//.test(err.message);
|
|
60
|
+
}
|
|
61
|
+
async function invokeTrigger(client, workflowId, nodeId, req) {
|
|
62
|
+
try {
|
|
63
|
+
return await client.request('POST', `${base(client)}/workflows-v3/${workflowId}/triggers/${encodeURIComponent(nodeId)}/invoke`, {
|
|
64
|
+
params: { dataTrace: 'true' },
|
|
65
|
+
data: {
|
|
66
|
+
method: req.method,
|
|
67
|
+
path: req.path,
|
|
68
|
+
...(req.body !== undefined ? { body: JSON.stringify(req.body) } : {}),
|
|
69
|
+
},
|
|
70
|
+
timeoutMs: api_client_js_1.TRANSFER_TIMEOUT_MS,
|
|
71
|
+
relaysUpstreamAuth: true,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
if (isMissingInvokeRoute(err)) {
|
|
76
|
+
const e = err;
|
|
77
|
+
throw new api_client_js_1.ApiClientError(`${e.message}. console-api ≥ ${exports.INVOKE_ROUTE_MIN_CONSOLE_API} is required for traced full runs (trigger invoke route).`, 'INVOKE_ROUTE_MISSING', e.statusCode);
|
|
78
|
+
}
|
|
79
|
+
throw err;
|
|
80
|
+
}
|
|
69
81
|
}
|
|
82
|
+
exports.TRIGGER_KEY_IGNORED_WARNING = "--trigger-key is no longer needed and is ignored: console-api sends the trigger's api-key from the deployed template.";
|
|
70
83
|
//# sourceMappingURL=workflow-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-api.js","sourceRoot":"","sources":["../../../src/functions/workflow/workflow-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workflow-api.js","sourceRoot":"","sources":["../../../src/functions/workflow/workflow-api.ts"],"names":[],"mappings":"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"}
|