@dcupl/cli 2.0.1 → 2.0.2
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 +221 -73
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/daemon/body-handling.d.ts +8 -0
- package/dist/functions/app/daemon/body-handling.js +29 -0
- package/dist/functions/app/daemon/body-handling.js.map +1 -0
- package/dist/functions/app/daemon/controllers/models.controller.js +7 -2
- package/dist/functions/app/daemon/controllers/models.controller.js.map +1 -1
- package/dist/functions/app/daemon/filters/envelope-exception.filter.d.ts +4 -0
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js +20 -2
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js.map +1 -1
- package/dist/functions/app/daemon/main.js +2 -4
- package/dist/functions/app/daemon/main.js.map +1 -1
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.js +11 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/files/commands/write.js +1 -1
- package/dist/functions/files/commands/write.js.map +1 -1
- package/dist/functions/files/helper/text-policy.d.ts +2 -0
- package/dist/functions/files/helper/text-policy.js +26 -0
- package/dist/functions/files/helper/text-policy.js.map +1 -1
- package/dist/functions/files/sync/transfer.js +1 -1
- package/dist/functions/files/sync/transfer.js.map +1 -1
- package/dist/functions/generate/files/generate-files.js +11 -4
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.js +17 -6
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +10 -1
- package/dist/functions/helper/api-client.js +98 -4
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.service.js +8 -0
- package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
- package/dist/functions/testing/tests/reporter.d.ts +1 -0
- package/dist/functions/testing/tests/reporter.js +26 -1
- package/dist/functions/testing/tests/reporter.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +4 -2
- package/dist/functions/workflow/commands/run.js +15 -5
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +4 -2
- package/dist/functions/workflow/commands/test.js +11 -5
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/full-run.d.ts +14 -0
- package/dist/functions/workflow/full-run.js +55 -0
- package/dist/functions/workflow/full-run.js.map +1 -0
- package/dist/functions/workflow/trace.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +5 -1
- package/dist/functions/workflow/workflow-api.js +6 -1
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ApiClientError = exports.TRANSFER_TIMEOUT_MS = exports.DEFAULT_TIMEOUT_MS = void 0;
|
|
3
|
+
exports.ApiClientError = exports.MAX_RETRY_AFTER_MS = exports.MAX_RATE_LIMIT_RETRIES = exports.TRANSFER_TIMEOUT_MS = exports.DEFAULT_TIMEOUT_MS = void 0;
|
|
4
|
+
exports.parseRetryAfter = parseRetryAfter;
|
|
4
5
|
exports.createApiClient = createApiClient;
|
|
5
6
|
const tslib_1 = require("tslib");
|
|
6
7
|
const axios_1 = tslib_1.__importStar(require("axios"));
|
|
@@ -8,6 +9,33 @@ const config_helper_1 = require("./config.helper");
|
|
|
8
9
|
const credentials_helper_1 = require("./credentials.helper");
|
|
9
10
|
exports.DEFAULT_TIMEOUT_MS = 30_000;
|
|
10
11
|
exports.TRANSFER_TIMEOUT_MS = 600_000;
|
|
12
|
+
exports.MAX_RATE_LIMIT_RETRIES = 3;
|
|
13
|
+
exports.MAX_RETRY_AFTER_MS = 60_000;
|
|
14
|
+
const FALLBACK_BACKOFF_MS = 1_000;
|
|
15
|
+
const READ_METHODS = new Set(['GET', 'HEAD', 'OPTIONS']);
|
|
16
|
+
const UNSAFE_RETRY_MESSAGE = 'The console API answered HTTP 429 Too Many Requests without Retry-After, so the request was not resent: ' +
|
|
17
|
+
'it may already have taken effect. Check, then retry in a moment.';
|
|
18
|
+
function parseRetryAfter(value, nowMs) {
|
|
19
|
+
if (typeof value !== 'string' && typeof value !== 'number')
|
|
20
|
+
return undefined;
|
|
21
|
+
const text = String(value).trim();
|
|
22
|
+
if (/^\d+$/.test(text))
|
|
23
|
+
return Number(text) * 1000;
|
|
24
|
+
const date = Date.parse(text);
|
|
25
|
+
return Number.isNaN(date) ? undefined : Math.max(0, date - nowMs);
|
|
26
|
+
}
|
|
27
|
+
function rateLimitMessage(waitMs, retried) {
|
|
28
|
+
const seconds = Math.max(1, Math.ceil(waitMs / 1000));
|
|
29
|
+
const tried = retried > 0 ? ` and still refused after ${retried} ${retried === 1 ? 'retry' : 'retries'}` : '';
|
|
30
|
+
return `The console API is rate-limiting this client (HTTP 429 Too Many Requests)${tried}. Retry in ${seconds} s.`;
|
|
31
|
+
}
|
|
32
|
+
function isFirewallBlock(status, headers) {
|
|
33
|
+
const contentType = String(headers?.['content-type'] ?? '');
|
|
34
|
+
return status === 403 && contentType.includes('text/html');
|
|
35
|
+
}
|
|
36
|
+
const FIREWALL_BLOCK_MESSAGE = 'Blocked by the firewall in front of the console API (HTTP 403), possibly rate limiting: more than 2000 requests ' +
|
|
37
|
+
'in 5 minutes from one IP address, e.g. a large `dcupl files push`. If so, the block lifts a few minutes after the ' +
|
|
38
|
+
'request rate drops: wait about 5 minutes, then retry, with a lower --concurrency for large transfers.';
|
|
11
39
|
class ApiClientError extends Error {
|
|
12
40
|
constructor(error, code, statusCode, responseData) {
|
|
13
41
|
super(error);
|
|
@@ -35,11 +63,26 @@ function networkErrorMessage(code, baseURL) {
|
|
|
35
63
|
return `Could not reach the console API at ${baseURL} (${code}).`;
|
|
36
64
|
}
|
|
37
65
|
}
|
|
66
|
+
function stringHeaders(headers) {
|
|
67
|
+
const out = {};
|
|
68
|
+
if (!headers || typeof headers !== 'object')
|
|
69
|
+
return out;
|
|
70
|
+
for (const [key, value] of Object.entries(headers)) {
|
|
71
|
+
if (typeof value === 'string')
|
|
72
|
+
out[key.toLowerCase()] = value;
|
|
73
|
+
}
|
|
74
|
+
return out;
|
|
75
|
+
}
|
|
38
76
|
function stripRouteQuery(message) {
|
|
39
77
|
return typeof message === 'string' ? message.replace(/^(Cannot [A-Z]+ [^?\s]*)\?\S*/, '$1') : message;
|
|
40
78
|
}
|
|
41
79
|
const GUARD_REJECTION_MESSAGES = new Set(['Forbidden resource', 'Unauthorized']);
|
|
42
|
-
|
|
80
|
+
const defaultSleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
|
|
81
|
+
function defaultRateLimitNotice(waitMs, attempt) {
|
|
82
|
+
const seconds = Math.ceil(waitMs / 1000);
|
|
83
|
+
process.stderr.write(`Rate-limited by the console API (HTTP 429); retrying in ${seconds} s (${attempt}/${exports.MAX_RATE_LIMIT_RETRIES}), one request at a time.\n`);
|
|
84
|
+
}
|
|
85
|
+
function createApiClient(basePath, deps = {}) {
|
|
43
86
|
const currentBasePath = basePath || process.cwd();
|
|
44
87
|
const config = (0, config_helper_1.getConfigFileValue)(currentBasePath, undefined, { quiet: true });
|
|
45
88
|
const projectId = (0, credentials_helper_1.resolveProjectId)(currentBasePath).value;
|
|
@@ -55,6 +98,32 @@ function createApiClient(basePath) {
|
|
|
55
98
|
baseURL,
|
|
56
99
|
timeout: exports.DEFAULT_TIMEOUT_MS,
|
|
57
100
|
});
|
|
101
|
+
const sleep = deps.sleep ?? defaultSleep;
|
|
102
|
+
const now = deps.now ?? Date.now;
|
|
103
|
+
const onRateLimited = deps.onRateLimited ?? defaultRateLimitNotice;
|
|
104
|
+
let pausedUntil = 0;
|
|
105
|
+
let throttled = false;
|
|
106
|
+
let turn = Promise.resolve();
|
|
107
|
+
async function send(requestConfig) {
|
|
108
|
+
const attempt = async () => {
|
|
109
|
+
const waitMs = pausedUntil - now();
|
|
110
|
+
if (waitMs > 0)
|
|
111
|
+
await sleep(waitMs);
|
|
112
|
+
return instance.request(requestConfig);
|
|
113
|
+
};
|
|
114
|
+
if (!throttled)
|
|
115
|
+
return attempt();
|
|
116
|
+
const previous = turn;
|
|
117
|
+
let release;
|
|
118
|
+
turn = new Promise((resolve) => (release = resolve));
|
|
119
|
+
await previous;
|
|
120
|
+
try {
|
|
121
|
+
return await attempt();
|
|
122
|
+
}
|
|
123
|
+
finally {
|
|
124
|
+
release();
|
|
125
|
+
}
|
|
126
|
+
}
|
|
58
127
|
return {
|
|
59
128
|
projectId,
|
|
60
129
|
async request(method, path, options) {
|
|
@@ -70,10 +139,35 @@ function createApiClient(basePath) {
|
|
|
70
139
|
if (options?.timeoutMs !== undefined) {
|
|
71
140
|
requestConfig.timeout = options.timeoutMs;
|
|
72
141
|
}
|
|
73
|
-
|
|
74
|
-
|
|
142
|
+
for (let retried = 0;; retried++) {
|
|
143
|
+
try {
|
|
144
|
+
const response = await send(requestConfig);
|
|
145
|
+
options?.onResponseHeaders?.(stringHeaders(response.headers));
|
|
146
|
+
return response.data;
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
if (!(err instanceof axios_1.AxiosError) || err.response?.status !== 429)
|
|
150
|
+
throw err;
|
|
151
|
+
const retryAfterMs = parseRetryAfter(err.response.headers?.['retry-after'], now());
|
|
152
|
+
if (retryAfterMs === undefined && !READ_METHODS.has(method.toUpperCase())) {
|
|
153
|
+
throw new ApiClientError(UNSAFE_RETRY_MESSAGE, 'HTTP_429', 429, err.response.data);
|
|
154
|
+
}
|
|
155
|
+
const waitMs = retryAfterMs ?? FALLBACK_BACKOFF_MS * 2 ** retried;
|
|
156
|
+
if (retried >= exports.MAX_RATE_LIMIT_RETRIES || waitMs > exports.MAX_RETRY_AFTER_MS) {
|
|
157
|
+
throw new ApiClientError(rateLimitMessage(waitMs, retried), 'HTTP_429', 429, err.response.data);
|
|
158
|
+
}
|
|
159
|
+
throttled = true;
|
|
160
|
+
pausedUntil = Math.max(pausedUntil, now() + waitMs);
|
|
161
|
+
onRateLimited(waitMs, retried + 1);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
75
164
|
}
|
|
76
165
|
catch (err) {
|
|
166
|
+
if (err instanceof ApiClientError)
|
|
167
|
+
throw err;
|
|
168
|
+
if (err instanceof axios_1.AxiosError && err.response && isFirewallBlock(err.response.status, err.response.headers)) {
|
|
169
|
+
throw new ApiClientError(FIREWALL_BLOCK_MESSAGE, 'HTTP_403', 403);
|
|
170
|
+
}
|
|
77
171
|
if (err instanceof axios_1.AxiosError && err.response) {
|
|
78
172
|
const status = err.response.status;
|
|
79
173
|
const serverMessage = stripRouteQuery(err.response.data?.message || err.message);
|
|
@@ -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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"}
|
|
@@ -164,6 +164,9 @@ let DevServerService = class DevServerService {
|
|
|
164
164
|
if (!(0, fs_extra_1.pathExistsSync)(pathToFromFile)) {
|
|
165
165
|
return null;
|
|
166
166
|
}
|
|
167
|
+
if ((0, fs_extra_1.pathExistsSync)(pathToToFile) && !isSameFile(pathToFromFile, pathToToFile)) {
|
|
168
|
+
throw new common_1.ConflictException(`A file or folder already exists at "${data.to}"`);
|
|
169
|
+
}
|
|
167
170
|
(0, fs_extra_1.moveSync)(pathToFromFile, pathToToFile);
|
|
168
171
|
return true;
|
|
169
172
|
}
|
|
@@ -207,4 +210,9 @@ exports.DevServerService = DevServerService = tslib_1.__decorate([
|
|
|
207
210
|
tslib_1.__param(0, (0, common_1.Inject)(dev_server_options_1.DEV_SERVER_OPTIONS)),
|
|
208
211
|
tslib_1.__metadata("design:paramtypes", [Object])
|
|
209
212
|
], DevServerService);
|
|
213
|
+
function isSameFile(a, b) {
|
|
214
|
+
const first = (0, fs_1.statSync)(a);
|
|
215
|
+
const second = (0, fs_1.statSync)(b);
|
|
216
|
+
return first.ino === second.ino && first.dev === second.dev;
|
|
217
|
+
}
|
|
210
218
|
//# sourceMappingURL=dev-server.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.service.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/dev-server.service.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"dev-server.service.js","sourceRoot":"","sources":["../../../../src/functions/serve/dev-server/dev-server.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DcuplMochaReporter = void 0;
|
|
4
|
+
exports.serializeError = serializeError;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const Mocha = tslib_1.__importStar(require("mocha"));
|
|
6
7
|
const kleur_1 = require("kleur");
|
|
7
8
|
const { EVENT_RUN_BEGIN, EVENT_RUN_END, EVENT_TEST_END, EVENT_SUITE_BEGIN, EVENT_SUITE_END, EVENT_TEST_PASS, EVENT_TEST_FAIL, } = Mocha.Runner.constants;
|
|
9
|
+
function serializeError(err) {
|
|
10
|
+
const candidate = err;
|
|
11
|
+
if (candidate && typeof candidate.toJSON === 'function') {
|
|
12
|
+
try {
|
|
13
|
+
return candidate.toJSON();
|
|
14
|
+
}
|
|
15
|
+
catch {
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
if (candidate && typeof candidate === 'object') {
|
|
19
|
+
return {
|
|
20
|
+
name: typeof candidate.name === 'string' ? candidate.name : 'Error',
|
|
21
|
+
message: String(candidate.message ?? ''),
|
|
22
|
+
stack: typeof candidate.stack === 'string' ? candidate.stack : undefined,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
return { name: 'Error', message: String(err) };
|
|
26
|
+
}
|
|
8
27
|
class DcuplMochaReporter {
|
|
9
28
|
constructor(runner, options) {
|
|
10
29
|
this.tests = [];
|
|
@@ -33,13 +52,19 @@ class DcuplMochaReporter {
|
|
|
33
52
|
.on(EVENT_TEST_FAIL, (test, err) => {
|
|
34
53
|
console.log(`${this.indent()}fail: ${test.fullTitle()}`);
|
|
35
54
|
console.log(`${this.indent()} ${(0, kleur_1.bold)((0, kleur_1.red)('- error'))}: ${(0, kleur_1.red)(err.message)}`);
|
|
55
|
+
if (!test.ctx) {
|
|
56
|
+
test.ctx = {};
|
|
57
|
+
}
|
|
36
58
|
if (!test.ctx.DCUPL_DATA) {
|
|
37
59
|
test.ctx.DCUPL_DATA = {};
|
|
38
60
|
}
|
|
39
61
|
if (!test.ctx.DCUPL_DATA[test.title]) {
|
|
40
62
|
test.ctx.DCUPL_DATA[test.title] = {};
|
|
41
63
|
}
|
|
42
|
-
test.ctx.DCUPL_DATA[test.title]['error'] = err
|
|
64
|
+
test.ctx.DCUPL_DATA[test.title]['error'] = serializeError(err);
|
|
65
|
+
if (test.type === 'hook') {
|
|
66
|
+
this.tests.push(test);
|
|
67
|
+
}
|
|
43
68
|
})
|
|
44
69
|
.on(EVENT_TEST_END, (test) => {
|
|
45
70
|
this.tests.push(test);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../src/functions/testing/tests/reporter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"reporter.js","sourceRoot":"","sources":["../../../../src/functions/testing/tests/reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
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
|
+
import { type InvokeTriggerRequest, type InvokeTriggerResult } from '../workflow-api.js';
|
|
5
|
+
import { type GetGraphState } from '../full-run.js';
|
|
5
6
|
export interface RunOptions {
|
|
6
7
|
key: string;
|
|
7
8
|
runner: string;
|
|
@@ -15,6 +16,7 @@ export interface RunDeps {
|
|
|
15
16
|
listWorkflows?: (client: ApiClient) => Promise<DeployedWorkflowV3[]>;
|
|
16
17
|
getWorkflow?: (client: ApiClient, id: string) => Promise<DeployedWorkflowV3>;
|
|
17
18
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
18
|
-
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<
|
|
19
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<InvokeTriggerResult>;
|
|
20
|
+
getGraphState?: GetGraphState;
|
|
19
21
|
}
|
|
20
22
|
export declare function runCommand(output: Output, client: ApiClient, opts: RunOptions, deps?: RunDeps): Promise<void>;
|
|
@@ -6,6 +6,7 @@ const fs = tslib_1.__importStar(require("fs"));
|
|
|
6
6
|
const comment_json_1 = require("comment-json");
|
|
7
7
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
8
8
|
const trace_js_1 = require("../trace.js");
|
|
9
|
+
const full_run_js_1 = require("../full-run.js");
|
|
9
10
|
const run_failure_js_1 = require("../run-failure.js");
|
|
10
11
|
const resolve_runner_js_1 = require("../resolve-runner.js");
|
|
11
12
|
function findDeployed(workflows, key, runnerUid, projectId) {
|
|
@@ -18,6 +19,7 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
18
19
|
const getWorkflow = deps.getWorkflow ?? workflow_api_js_1.getWorkflow;
|
|
19
20
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
20
21
|
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
22
|
+
const getGraphState = deps.getGraphState ?? workflow_api_js_1.getGraphState;
|
|
21
23
|
if (opts.body !== undefined && opts.input !== undefined) {
|
|
22
24
|
output.error('--body and --input are mutually exclusive; pass the payload inline OR as a file.', 'WORKFLOW_RUN_INPUT_CONFLICT');
|
|
23
25
|
return;
|
|
@@ -61,10 +63,10 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
61
63
|
return;
|
|
62
64
|
}
|
|
63
65
|
template = deployed.template ?? (await getWorkflow(client, deployed.uid)).template;
|
|
64
|
-
let
|
|
66
|
+
let trace;
|
|
65
67
|
if (opts.node) {
|
|
66
68
|
reachedRun = true;
|
|
67
|
-
|
|
69
|
+
trace = (0, trace_js_1.toTrace)(await doTestNode(client, deployed.uid, opts.node, { inputData: payload ?? { main: [] } }));
|
|
68
70
|
}
|
|
69
71
|
else {
|
|
70
72
|
const trigger = (template?.config?.nodes ?? []).find((n) => n.type === 'trigger-request');
|
|
@@ -76,11 +78,19 @@ async function runCommand(output, client, opts, deps = {}) {
|
|
|
76
78
|
if (opts.triggerKey)
|
|
77
79
|
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
78
80
|
reachedRun = true;
|
|
79
|
-
|
|
81
|
+
const invoked = await doInvoke(client, deployed.uid, trigger.id, {
|
|
82
|
+
method,
|
|
83
|
+
path: trigger.config.path,
|
|
84
|
+
body: payload,
|
|
85
|
+
});
|
|
86
|
+
const run = await (0, full_run_js_1.traceFullRun)(client, deployed.uid, invoked, getGraphState);
|
|
87
|
+
for (const warning of run.warnings)
|
|
88
|
+
output.warn(warning);
|
|
89
|
+
trace = run.result;
|
|
80
90
|
}
|
|
81
|
-
const trace = (0, trace_js_1.toTrace)(raw);
|
|
82
91
|
trace.workflowKey ??= deployed.key;
|
|
83
|
-
|
|
92
|
+
const result = trace;
|
|
93
|
+
output.success(result, () => (opts.node ? (0, trace_js_1.renderTrace)(result) : (0, full_run_js_1.renderFullRun)(result)));
|
|
84
94
|
if ((0, trace_js_1.hasErrors)(trace)) {
|
|
85
95
|
output.error('Workflow run reported node errors (see trace above).', 'WORKFLOW_RUN_ERROR');
|
|
86
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
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
|
+
import { type InvokeTriggerRequest, type InvokeTriggerResult } from '../workflow-api.js';
|
|
5
|
+
import { type GetGraphState } from '../full-run.js';
|
|
5
6
|
import { type SwapResult } from '../wait-for-swap.js';
|
|
6
7
|
import type { RunnerHealth } from '../runner-health.js';
|
|
7
8
|
export interface TestOptions {
|
|
@@ -23,7 +24,8 @@ export interface TestDeps {
|
|
|
23
24
|
template: TemplateV3;
|
|
24
25
|
}[]) => Promise<DeployedWorkflow[]>;
|
|
25
26
|
testNode?: (client: ApiClient, workflowId: string, nodeId: string, body: unknown) => Promise<unknown>;
|
|
26
|
-
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<
|
|
27
|
+
invokeTrigger?: (client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest) => Promise<InvokeTriggerResult>;
|
|
28
|
+
getGraphState?: GetGraphState;
|
|
27
29
|
waitForSwap?: (client: ApiClient, id: string, deployedV: string, deps?: object, opts?: {
|
|
28
30
|
timeoutMs?: number;
|
|
29
31
|
}) => Promise<SwapResult>;
|
|
@@ -8,6 +8,7 @@ const template_io_js_1 = require("../template-io.js");
|
|
|
8
8
|
const validate_js_1 = require("../validate.js");
|
|
9
9
|
const workflow_api_js_1 = require("../workflow-api.js");
|
|
10
10
|
const trace_js_1 = require("../trace.js");
|
|
11
|
+
const full_run_js_1 = require("../full-run.js");
|
|
11
12
|
const run_failure_js_1 = require("../run-failure.js");
|
|
12
13
|
const wait_for_swap_js_1 = require("../wait-for-swap.js");
|
|
13
14
|
const deploy_js_1 = require("./deploy.js");
|
|
@@ -24,6 +25,7 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
24
25
|
const doDeploy = deps.deploy ?? workflow_api_js_1.deploy;
|
|
25
26
|
const doTestNode = deps.testNode ?? workflow_api_js_1.testNode;
|
|
26
27
|
const doInvoke = deps.invokeTrigger ?? workflow_api_js_1.invokeTrigger;
|
|
28
|
+
const getGraphState = deps.getGraphState ?? workflow_api_js_1.getGraphState;
|
|
27
29
|
const wait = deps.waitForSwap ?? wait_for_swap_js_1.waitForSwap;
|
|
28
30
|
const template = load(opts.file);
|
|
29
31
|
const local = validateLocal(template);
|
|
@@ -64,13 +66,13 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
64
66
|
output.warn('runner does not report a live version — proceeding without swap confirmation');
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
|
-
let
|
|
69
|
+
let trace;
|
|
68
70
|
reachedRun = true;
|
|
69
71
|
if (opts.node) {
|
|
70
72
|
const inputData = readJson(opts.input) ?? { main: [] };
|
|
71
73
|
const state = readJson(opts.state);
|
|
72
74
|
const body = { inputData, ...(state ? { state } : {}) };
|
|
73
|
-
|
|
75
|
+
trace = (0, trace_js_1.toTrace)(await doTestNode(client, deployed.uid, opts.node, body));
|
|
74
76
|
}
|
|
75
77
|
else {
|
|
76
78
|
const trigger = template.config.nodes.find((n) => n.type === 'trigger-request');
|
|
@@ -81,14 +83,18 @@ async function testCommand(output, client, opts, deps = {}) {
|
|
|
81
83
|
const method = (trigger.config.methods?.[0] ?? 'POST');
|
|
82
84
|
if (opts.triggerKey)
|
|
83
85
|
output.warn(workflow_api_js_1.TRIGGER_KEY_IGNORED_WARNING);
|
|
84
|
-
|
|
86
|
+
const invoked = await doInvoke(client, deployed.uid, trigger.id, {
|
|
85
87
|
method,
|
|
86
88
|
path: trigger.config.path,
|
|
87
89
|
body: readJson(opts.input),
|
|
88
90
|
});
|
|
91
|
+
const run = await (0, full_run_js_1.traceFullRun)(client, deployed.uid, invoked, getGraphState);
|
|
92
|
+
for (const warning of run.warnings)
|
|
93
|
+
output.warn(warning);
|
|
94
|
+
trace = run.result;
|
|
89
95
|
}
|
|
90
|
-
const
|
|
91
|
-
output.success(
|
|
96
|
+
const result = trace;
|
|
97
|
+
output.success(result, () => (opts.node ? (0, trace_js_1.renderTrace)(result) : (0, full_run_js_1.renderFullRun)(result)));
|
|
92
98
|
if ((0, trace_js_1.hasErrors)(trace)) {
|
|
93
99
|
output.error('Workflow run reported node errors (see trace above).', 'WORKFLOW_RUN_ERROR');
|
|
94
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../../src/functions/workflow/commands/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { ApiClient } from '../helper/api-client.js';
|
|
2
|
+
import type { GraphStateResponse } from './types.js';
|
|
3
|
+
import type { InvokeTriggerResult } from './workflow-api.js';
|
|
4
|
+
import { type WorkflowTrace } from './trace.js';
|
|
5
|
+
export type FullRunResult = WorkflowTrace & {
|
|
6
|
+
response?: unknown;
|
|
7
|
+
};
|
|
8
|
+
export interface FullRunTrace {
|
|
9
|
+
result: FullRunResult;
|
|
10
|
+
warnings: string[];
|
|
11
|
+
}
|
|
12
|
+
export type GetGraphState = (client: ApiClient, id: string, runId: string) => Promise<GraphStateResponse>;
|
|
13
|
+
export declare function traceFullRun(client: ApiClient, workflowId: string, invoked: InvokeTriggerResult, getGraphState: GetGraphState): Promise<FullRunTrace>;
|
|
14
|
+
export declare function renderFullRun(result: FullRunResult): string;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.traceFullRun = traceFullRun;
|
|
4
|
+
exports.renderFullRun = renderFullRun;
|
|
5
|
+
const trace_js_1 = require("./trace.js");
|
|
6
|
+
const run_failure_js_1 = require("./run-failure.js");
|
|
7
|
+
const RESPONSE_PREVIEW_CHARS = 4000;
|
|
8
|
+
function isRecord(v) {
|
|
9
|
+
return typeof v === 'object' && v !== null;
|
|
10
|
+
}
|
|
11
|
+
function executionIdInBody(body) {
|
|
12
|
+
return isRecord(body) && typeof body.executionId === 'string' && body.executionId ? body.executionId : undefined;
|
|
13
|
+
}
|
|
14
|
+
function runStatus(status) {
|
|
15
|
+
if (status === 'completed')
|
|
16
|
+
return 'completed';
|
|
17
|
+
if (status === 'failed' || status === 'cancelled')
|
|
18
|
+
return 'failed';
|
|
19
|
+
return undefined;
|
|
20
|
+
}
|
|
21
|
+
async function traceFullRun(client, workflowId, invoked, getGraphState) {
|
|
22
|
+
const warnings = [];
|
|
23
|
+
let trace = {};
|
|
24
|
+
const executionId = invoked.executionId ?? executionIdInBody(invoked.body);
|
|
25
|
+
if (!executionId) {
|
|
26
|
+
warnings.push('The run answered without an execution id (no X-Dcupl-Execution-Id header), so its trace cannot be read. `dcupl workflow history` lists the run.');
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
try {
|
|
30
|
+
const state = await getGraphState(client, workflowId, executionId);
|
|
31
|
+
const dataTrace = state.metadata?.dataTrace;
|
|
32
|
+
trace = { ...(dataTrace ?? {}), status: runStatus(state.status) };
|
|
33
|
+
if (!dataTrace) {
|
|
34
|
+
warnings.push(`Run ${executionId} has no data trace: console-api passes the runner key a trace needs only to dcupl-workflow-runner ≥ 3.0.0-beta.21. Node states: \`dcupl workflow trace --id ${workflowId} --run ${executionId}\`.`);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
catch (err) {
|
|
38
|
+
warnings.push(`Could not read the trace of run ${executionId} (${(0, run_failure_js_1.errorMessage)(err)}). Retry with \`dcupl workflow trace --id ${workflowId} --run ${executionId}\`.`);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
trace.executionId ??= executionId;
|
|
42
|
+
return { result: { ...trace, response: invoked.body }, warnings };
|
|
43
|
+
}
|
|
44
|
+
function renderFullRun(result) {
|
|
45
|
+
const lines = [(0, trace_js_1.renderTrace)(result)];
|
|
46
|
+
if (result.response !== undefined) {
|
|
47
|
+
const json = JSON.stringify(result.response, null, 2) ?? String(result.response);
|
|
48
|
+
const preview = json.length > RESPONSE_PREVIEW_CHARS
|
|
49
|
+
? `${json.slice(0, RESPONSE_PREVIEW_CHARS)}\n… (${json.length} chars; --json prints all of it)`
|
|
50
|
+
: json;
|
|
51
|
+
lines.push('Response:', preview);
|
|
52
|
+
}
|
|
53
|
+
return lines.join('\n');
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=full-run.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"full-run.js","sourceRoot":"","sources":["../../../src/functions/workflow/full-run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/functions/workflow/trace.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"trace.js","sourceRoot":"","sources":["../../../src/functions/workflow/trace.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,10 @@ export interface InvokeTriggerRequest {
|
|
|
22
22
|
path: string;
|
|
23
23
|
body?: unknown;
|
|
24
24
|
}
|
|
25
|
+
export interface InvokeTriggerResult {
|
|
26
|
+
body: unknown;
|
|
27
|
+
executionId?: string;
|
|
28
|
+
}
|
|
25
29
|
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<
|
|
30
|
+
export declare function invokeTrigger(client: ApiClient, workflowId: string, nodeId: string, req: InvokeTriggerRequest): Promise<InvokeTriggerResult>;
|
|
27
31
|
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.";
|