@nocobase/app-cli-client 0.1.0-beta.1 → 0.1.0-beta.11
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/README.md +13 -1
- package/dist/acp-service.d.ts +39 -0
- package/dist/acp-service.d.ts.map +1 -0
- package/dist/acp-service.js +257 -0
- package/dist/acp-service.js.map +1 -0
- package/dist/acp.d.ts +28 -0
- package/dist/acp.d.ts.map +1 -0
- package/dist/acp.js +395 -0
- package/dist/acp.js.map +1 -0
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +10 -0
- package/dist/commands.js.map +1 -1
- package/dist/dynamic/index.d.ts +3 -1
- package/dist/dynamic/index.d.ts.map +1 -1
- package/dist/dynamic/index.js +48 -12
- package/dist/dynamic/index.js.map +1 -1
- package/dist/dynamic/manifest.d.ts.map +1 -1
- package/dist/dynamic/manifest.js +10 -0
- package/dist/dynamic/manifest.js.map +1 -1
- package/dist/dynamic/output.d.ts +2 -2
- package/dist/dynamic/output.d.ts.map +1 -1
- package/dist/dynamic/output.js +23 -8
- package/dist/dynamic/output.js.map +1 -1
- package/dist/dynamic/rest.d.ts.map +1 -1
- package/dist/dynamic/rest.js +24 -0
- package/dist/dynamic/rest.js.map +1 -1
- package/dist/dynamic/session.d.ts +1 -0
- package/dist/dynamic/session.d.ts.map +1 -1
- package/dist/dynamic/session.js +29 -1
- package/dist/dynamic/session.js.map +1 -1
- package/dist/install.d.ts +75 -5
- package/dist/install.d.ts.map +1 -1
- package/dist/install.js +256 -13
- package/dist/install.js.map +1 -1
- package/dist/lib/command.d.ts.map +1 -1
- package/dist/lib/command.js +14 -4
- package/dist/lib/command.js.map +1 -1
- package/dist/lib/credentials.d.ts +2 -0
- package/dist/lib/credentials.d.ts.map +1 -1
- package/dist/lib/credentials.js +7 -3
- package/dist/lib/credentials.js.map +1 -1
- package/dist/lib/envelope.d.ts +2 -0
- package/dist/lib/envelope.d.ts.map +1 -1
- package/dist/lib/envelope.js +16 -2
- package/dist/lib/envelope.js.map +1 -1
- package/dist/lib/http.d.ts.map +1 -1
- package/dist/lib/http.js +1 -0
- package/dist/lib/http.js.map +1 -1
- package/dist/parse/arguments.d.ts.map +1 -1
- package/dist/parse/arguments.js +9 -0
- package/dist/parse/arguments.js.map +1 -1
- package/dist/parse/distance.d.ts +22 -0
- package/dist/parse/distance.d.ts.map +1 -0
- package/dist/parse/distance.js +82 -0
- package/dist/parse/distance.js.map +1 -0
- package/dist/parse/manifest.d.ts +10 -0
- package/dist/parse/manifest.d.ts.map +1 -1
- package/dist/run.d.ts.map +1 -1
- package/dist/run.js +36 -5
- package/dist/run.js.map +1 -1
- package/dist/skills-lock.d.ts +2 -0
- package/dist/skills-lock.d.ts.map +1 -0
- package/dist/skills-lock.js +151 -0
- package/dist/skills-lock.js.map +1 -0
- package/dist/skills.d.ts +60 -0
- package/dist/skills.d.ts.map +1 -0
- package/dist/skills.js +579 -0
- package/dist/skills.js.map +1 -0
- package/dist/update.d.ts +6 -0
- package/dist/update.d.ts.map +1 -1
- package/dist/update.js +33 -14
- package/dist/update.js.map +1 -1
- package/dist/whoami.d.ts +2 -0
- package/dist/whoami.d.ts.map +1 -1
- package/dist/whoami.js +10 -3
- package/dist/whoami.js.map +1 -1
- package/package.json +5 -4
package/dist/install.js
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
// Where an application's CLI is installed when it came from the application's install script
|
|
2
2
|
// (`/api/agents/dist/installScript`), and how a newer version replaces it:
|
|
3
3
|
//
|
|
4
|
-
// <prefix>/versions/<version>/ one unpacked
|
|
4
|
+
// <prefix>/versions/<version>/ one unpacked tarball per version (bin/<bin>, dist/, …, and bin/node when it
|
|
5
|
+
// bundles its Node), or one npm install of the package the application names
|
|
6
|
+
// (node_modules/<package>, and bin/<bin>, a launcher of node_modules/.bin/<bin>
|
|
7
|
+
// that finds Node as a universal tarball's does: `npmLauncherScript`)
|
|
5
8
|
// <prefix>/current -> versions/<version>
|
|
9
|
+
// <prefix>/node the Node a universal tarball (one without bin/node) runs on: a link the install
|
|
10
|
+
// script makes to the node it checked, or what an update leaves (`pinNode`)
|
|
6
11
|
// <prefix>/install.json what the script set up: the command link (`binLink`), and `mode`, `cli` for the
|
|
7
12
|
// CLI alone or `runner` once the script ran with `--runner` (absent: `runner`)
|
|
8
13
|
// <bin-dir>/<bin> -> <prefix>/current/bin/<bin>
|
|
@@ -13,17 +18,18 @@
|
|
|
13
18
|
// This module reads no CLI configuration, so the CLI's `update` and a runner carried by the CLI share it.
|
|
14
19
|
import { execFile } from 'node:child_process';
|
|
15
20
|
import { createHash } from 'node:crypto';
|
|
16
|
-
import { existsSync, readFileSync } from 'node:fs';
|
|
17
|
-
import { mkdir, readdir, readlink, rename, rm, symlink, writeFile, } from 'node:fs/promises';
|
|
21
|
+
import { constants, existsSync, readFileSync } from 'node:fs';
|
|
22
|
+
import { access, copyFile, chmod, mkdir, readdir, readFile, readlink, realpath, rename, rm, symlink, writeFile, } from 'node:fs/promises';
|
|
18
23
|
import path from 'node:path';
|
|
19
24
|
import { promisify } from 'node:util';
|
|
20
|
-
import { compareVersions, currentTarget, DIST_ROUTES, DistArtifactSchema, routePath, } from '@nocobase/agent-protocol';
|
|
25
|
+
import { compareVersions, currentTarget, DIST_ACCEPT_NPM, DIST_ROUTES, DistArtifactSchema, DistResolutionSchema, EXACT_VERSION_PATTERN, isDistNpmPackage, NPM_PACKAGE_PATTERN, routePath, } from '@nocobase/agent-protocol';
|
|
21
26
|
const execFileAsync = promisify(execFile);
|
|
22
27
|
/** The installation whose version directory is `root`, the root of the installed package; undefined for any other. */
|
|
23
28
|
export function detectInstallation(root) {
|
|
24
|
-
const
|
|
25
|
-
if (
|
|
29
|
+
const versionDir = versionDirOf(root);
|
|
30
|
+
if (versionDir === undefined)
|
|
26
31
|
return undefined;
|
|
32
|
+
const versionsDir = path.dirname(versionDir);
|
|
27
33
|
const prefix = path.dirname(versionsDir);
|
|
28
34
|
const current = path.join(prefix, 'current');
|
|
29
35
|
if (!existsSync(current))
|
|
@@ -42,13 +48,23 @@ export function detectInstallation(root) {
|
|
|
42
48
|
}
|
|
43
49
|
return {
|
|
44
50
|
prefix,
|
|
45
|
-
versionDir
|
|
46
|
-
version: path.basename(
|
|
51
|
+
versionDir,
|
|
52
|
+
version: path.basename(versionDir),
|
|
47
53
|
current,
|
|
48
54
|
...(binLink === undefined ? {} : { binLink }),
|
|
49
55
|
mode,
|
|
50
56
|
};
|
|
51
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* The version directory `root` belongs to: `root` itself when it is `…/versions/<version>` (an unpacked tarball), or the
|
|
60
|
+
* one holding the `node_modules` it sits in (`…/versions/<version>/node_modules/<package>`, an npm install).
|
|
61
|
+
*/
|
|
62
|
+
function versionDirOf(root) {
|
|
63
|
+
const marker = `${path.sep}node_modules${path.sep}`;
|
|
64
|
+
const index = root.indexOf(marker);
|
|
65
|
+
const dir = index === -1 ? root : root.slice(0, index);
|
|
66
|
+
return path.basename(path.dirname(dir)) === 'versions' ? dir : undefined;
|
|
67
|
+
}
|
|
52
68
|
/** The command that starts whichever version is current. */
|
|
53
69
|
export function launcherOf(installation, bin) {
|
|
54
70
|
return path.join(installation.current, 'bin', bin);
|
|
@@ -115,16 +131,219 @@ export async function pruneVersions(installation, keep) {
|
|
|
115
131
|
}
|
|
116
132
|
return removed;
|
|
117
133
|
}
|
|
134
|
+
async function isExecutable(file) {
|
|
135
|
+
try {
|
|
136
|
+
await access(file, constants.X_OK);
|
|
137
|
+
return true;
|
|
138
|
+
}
|
|
139
|
+
catch {
|
|
140
|
+
return false;
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Makes sure `<prefix>/node` is a Node a universal version (one without `bin/node`) can start on, as its launcher looks
|
|
145
|
+
* there before PATH: a user service (launchd, systemd) usually runs without the PATH that finds the shell's `node`.
|
|
146
|
+
* Nothing changes when it is one already. Otherwise it becomes `node`, the Node this process runs on: copied when it is
|
|
147
|
+
* one an installed version bundles, since that version is removed by a later update, and linked when it is the
|
|
148
|
+
* machine's own. Returns what it did.
|
|
149
|
+
*/
|
|
150
|
+
export async function pinNode(installation, node = process.execPath) {
|
|
151
|
+
const pinned = path.join(installation.prefix, 'node');
|
|
152
|
+
if (await isExecutable(pinned))
|
|
153
|
+
return 'kept';
|
|
154
|
+
const temporary = path.join(installation.prefix, `.node-${process.pid}-${Date.now()}`);
|
|
155
|
+
const inside = path.relative(path.join(installation.prefix, 'versions'), node);
|
|
156
|
+
const bundled = !inside.startsWith('..') && !path.isAbsolute(inside);
|
|
157
|
+
try {
|
|
158
|
+
if (bundled) {
|
|
159
|
+
await copyFile(node, temporary);
|
|
160
|
+
await chmod(temporary, 0o755);
|
|
161
|
+
}
|
|
162
|
+
else
|
|
163
|
+
await symlink(node, temporary);
|
|
164
|
+
await rename(temporary, pinned);
|
|
165
|
+
}
|
|
166
|
+
finally {
|
|
167
|
+
await rm(temporary, { force: true });
|
|
168
|
+
}
|
|
169
|
+
return bundled ? 'copied' : 'linked';
|
|
170
|
+
}
|
|
171
|
+
/** The update a resolve answer names. */
|
|
172
|
+
export function updateTargetOf(resolution) {
|
|
173
|
+
if (isDistNpmPackage(resolution))
|
|
174
|
+
return {
|
|
175
|
+
kind: 'npm',
|
|
176
|
+
version: resolution.version,
|
|
177
|
+
package: resolution.package,
|
|
178
|
+
};
|
|
179
|
+
return {
|
|
180
|
+
version: resolution.version,
|
|
181
|
+
url: resolution.url,
|
|
182
|
+
sha256: resolution.sha256,
|
|
183
|
+
};
|
|
184
|
+
}
|
|
118
185
|
/** The newest version of `product` the application serves for `target`. */
|
|
119
186
|
export async function latestArtifact(client, product, target = currentTarget()) {
|
|
120
187
|
return client.get(routePath(DIST_ROUTES.resolve, { product, target }), DistArtifactSchema);
|
|
121
188
|
}
|
|
189
|
+
/**
|
|
190
|
+
* The newest version of `product` the application offers for `target`: its tarball, or, from an application that has
|
|
191
|
+
* none and names the package on npm, that package (`DIST_ACCEPT_NPM`). An application from before npm answers ignores
|
|
192
|
+
* the parameter and answers with the tarball, or 404.
|
|
193
|
+
*/
|
|
194
|
+
export async function latestResolution(client, product, target = currentTarget()) {
|
|
195
|
+
return client.get(`${routePath(DIST_ROUTES.resolve, { product, target })}?accept=${DIST_ACCEPT_NPM}`, DistResolutionSchema);
|
|
196
|
+
}
|
|
122
197
|
export function isNewer(candidate, running) {
|
|
123
198
|
return compareVersions(candidate, running) > 0;
|
|
124
199
|
}
|
|
200
|
+
/**
|
|
201
|
+
* The launcher an npm install puts at `<prefix>/versions/<version>/bin/<bin>`, so `current`, the command link and a
|
|
202
|
+
* runner's service start it as they start an unpacked tarball: `node_modules/.bin/<bin>` under the first Node.js 24
|
|
203
|
+
* or newer of `NOCOBASE_NODE`, `<prefix>/node`, `node` on PATH, and a Node an older version of the installation still
|
|
204
|
+
* bundles, the order the universal tarball's launcher follows. It takes `<bin>` from its own name, so one text serves
|
|
205
|
+
* every product; the install script writes the same one.
|
|
206
|
+
*/
|
|
207
|
+
export function npmLauncherScript() {
|
|
208
|
+
return [
|
|
209
|
+
'#!/bin/sh',
|
|
210
|
+
'# Starts the command of this name that npm installed, with a Node.js 24 or newer of this machine.',
|
|
211
|
+
'self="$0"',
|
|
212
|
+
'while [ -h "$self" ]; do',
|
|
213
|
+
' link="$(readlink "$self")"',
|
|
214
|
+
' case "$link" in',
|
|
215
|
+
' /*) self="$link" ;;',
|
|
216
|
+
' *) self="$(dirname "$self")/$link" ;;',
|
|
217
|
+
' esac',
|
|
218
|
+
'done',
|
|
219
|
+
'bin="$(basename "$self")"',
|
|
220
|
+
'root="$(cd "$(dirname "$self")/.." && pwd -P)"',
|
|
221
|
+
'entry="$root/node_modules/.bin/$bin"',
|
|
222
|
+
'prefix=""',
|
|
223
|
+
'case "$(dirname "$root")" in',
|
|
224
|
+
' */versions) prefix="$(dirname "$(dirname "$root")")" ;;',
|
|
225
|
+
'esac',
|
|
226
|
+
'usable() {',
|
|
227
|
+
` [ -n "$1" ] && [ -x "$1" ] && "$1" -e 'process.exit(Number(process.versions.node.split(".")[0]) >= 24 ? 0 : 1)' >/dev/null 2>&1`,
|
|
228
|
+
'}',
|
|
229
|
+
'for node in "${NOCOBASE_NODE:-}" "${prefix:+$prefix/node}" "$(command -v node 2>/dev/null || true)"; do',
|
|
230
|
+
' if usable "$node"; then exec "$node" "$entry" "$@"; fi',
|
|
231
|
+
'done',
|
|
232
|
+
'if [ -n "$prefix" ]; then',
|
|
233
|
+
' for node in "$prefix"/versions/*/bin/node; do',
|
|
234
|
+
' if usable "$node"; then exec "$node" "$entry" "$@"; fi',
|
|
235
|
+
' done',
|
|
236
|
+
'fi',
|
|
237
|
+
`echo "$bin needs Node.js 24 or newer, and found none. Install it (https://nodejs.org/en/download), make sure node is on PATH, or set NOCOBASE_NODE to its path." >&2`,
|
|
238
|
+
'exit 1',
|
|
239
|
+
'',
|
|
240
|
+
].join('\n');
|
|
241
|
+
}
|
|
242
|
+
export class NpmUnavailableError extends Error {
|
|
243
|
+
name = 'NpmUnavailableError';
|
|
244
|
+
}
|
|
245
|
+
/**
|
|
246
|
+
* The npm to install with: `NOCOBASE_NPM`, `npm` on `PATH`, or the npm beside one of `nodes` (the Node an
|
|
247
|
+
* installation runs on), where Node.js installs it.
|
|
248
|
+
*/
|
|
249
|
+
export async function findNpm(nodes, env = process.env) {
|
|
250
|
+
const candidates = [];
|
|
251
|
+
if (env.NOCOBASE_NPM)
|
|
252
|
+
candidates.push(env.NOCOBASE_NPM);
|
|
253
|
+
for (const dir of (env.PATH ?? '').split(path.delimiter))
|
|
254
|
+
if (dir !== '')
|
|
255
|
+
candidates.push(path.join(dir, 'npm'));
|
|
256
|
+
for (const node of nodes) {
|
|
257
|
+
candidates.push(path.join(path.dirname(node), 'npm'));
|
|
258
|
+
try {
|
|
259
|
+
candidates.push(path.join(path.dirname(await realpath(node)), 'npm'));
|
|
260
|
+
}
|
|
261
|
+
catch {
|
|
262
|
+
// A Node that is not there has no npm beside it.
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
for (const candidate of candidates)
|
|
266
|
+
if (await isExecutable(candidate))
|
|
267
|
+
return candidate;
|
|
268
|
+
return undefined;
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* Installs `<package>@<version>` from the registry the machine's npm is configured with into
|
|
272
|
+
* `<prefix>/versions/<version>`, through a sibling `.partial` directory so the version directory is either complete
|
|
273
|
+
* or absent: `npm install --prefix <dir> --no-save --no-audit --no-fund --omit=optional`, then the launcher
|
|
274
|
+
* (`npmLauncherScript`) at `bin/<bin>`. Optional dependencies are left out: the coding tools' SDKs list one package per
|
|
275
|
+
* platform, each carrying a binary the runner never starts.
|
|
276
|
+
*/
|
|
277
|
+
export async function installNpmVersion(options) {
|
|
278
|
+
const { installation, bin, version } = options;
|
|
279
|
+
if (!NPM_PACKAGE_PATTERN.test(options.package))
|
|
280
|
+
throw new Error(`Not an npm package name: ${options.package}`);
|
|
281
|
+
if (!EXACT_VERSION_PATTERN.test(version))
|
|
282
|
+
throw new Error(`Not an exact version: ${version}`);
|
|
283
|
+
const env = options.env ?? process.env;
|
|
284
|
+
const npm = options.npm ?? (await findNpm([options.node], env));
|
|
285
|
+
if (npm === undefined)
|
|
286
|
+
throw new NpmUnavailableError(`${bin} ${version} is installed with npm, and none was found on PATH or beside ${options.node}. npm comes ` +
|
|
287
|
+
'with Node.js (https://nodejs.org/en/download); put it on PATH, or set NOCOBASE_NPM to its path.');
|
|
288
|
+
const dest = path.join(installation.prefix, 'versions', version);
|
|
289
|
+
const partial = `${dest}.partial`;
|
|
290
|
+
await rm(partial, { recursive: true, force: true });
|
|
291
|
+
await mkdir(partial, { recursive: true, mode: 0o755 });
|
|
292
|
+
try {
|
|
293
|
+
options.log?.(`update: installing ${options.package}@${version} with npm`);
|
|
294
|
+
try {
|
|
295
|
+
await execFileAsync(npm, [
|
|
296
|
+
'install',
|
|
297
|
+
'--prefix',
|
|
298
|
+
partial,
|
|
299
|
+
'--no-save',
|
|
300
|
+
'--no-audit',
|
|
301
|
+
'--no-fund',
|
|
302
|
+
'--omit=optional',
|
|
303
|
+
`${options.package}@${version}`,
|
|
304
|
+
], {
|
|
305
|
+
cwd: partial,
|
|
306
|
+
env: {
|
|
307
|
+
...env,
|
|
308
|
+
PATH: [path.dirname(options.node), env.PATH ?? '']
|
|
309
|
+
.filter((entry) => entry !== '')
|
|
310
|
+
.join(path.delimiter),
|
|
311
|
+
},
|
|
312
|
+
maxBuffer: 16 * 1024 * 1024,
|
|
313
|
+
});
|
|
314
|
+
}
|
|
315
|
+
catch (error) {
|
|
316
|
+
const stderr = error.stderr;
|
|
317
|
+
const detail = typeof stderr === 'string' && stderr.trim() !== ''
|
|
318
|
+
? stderr.trim().split('\n').slice(-5).join('\n')
|
|
319
|
+
: error instanceof Error
|
|
320
|
+
? error.message
|
|
321
|
+
: String(error);
|
|
322
|
+
throw new Error(`npm could not install ${options.package}@${version}: ${detail}`, { cause: error });
|
|
323
|
+
}
|
|
324
|
+
const installed = JSON.parse(await readFile(path.join(partial, 'node_modules', options.package, 'package.json'), 'utf8'));
|
|
325
|
+
if (installed.version !== version)
|
|
326
|
+
throw new Error(`npm installed ${options.package}@${String(installed.version)}, not ${version}.`);
|
|
327
|
+
if (!existsSync(path.join(partial, 'node_modules', '.bin', bin)))
|
|
328
|
+
throw new Error(`${options.package}@${version} provides no ${bin} command.`);
|
|
329
|
+
await mkdir(path.join(partial, 'bin'), { recursive: true, mode: 0o755 });
|
|
330
|
+
await writeFile(path.join(partial, 'bin', bin), npmLauncherScript(), {
|
|
331
|
+
mode: 0o755,
|
|
332
|
+
});
|
|
333
|
+
await rm(dest, { recursive: true, force: true });
|
|
334
|
+
await rename(partial, dest);
|
|
335
|
+
}
|
|
336
|
+
finally {
|
|
337
|
+
await rm(partial, { recursive: true, force: true });
|
|
338
|
+
}
|
|
339
|
+
}
|
|
125
340
|
/**
|
|
126
341
|
* Installs `update` beside the running version and makes it current; the previous version stays until the next
|
|
127
|
-
* update, so a bad one can be switched back by hand. The process has to restart to run it.
|
|
342
|
+
* update, so a bad one can be switched back by hand. The process has to restart to run it. A tarball is downloaded,
|
|
343
|
+
* checked and unpacked; an npm package is installed with npm (`installNpmVersion`). A version without its own Node (a
|
|
344
|
+
* universal tarball, every npm install) gets a Node to run on first (`pinNode`): the one this process runs on, which
|
|
345
|
+
* keeps a runner whose service has no `node` on its PATH starting when it moves from a version that bundles Node to
|
|
346
|
+
* one that does not.
|
|
128
347
|
*/
|
|
129
348
|
export async function applyUpdate(options) {
|
|
130
349
|
const { installation, client, update, bin } = options;
|
|
@@ -132,10 +351,34 @@ export async function applyUpdate(options) {
|
|
|
132
351
|
throw new Error(`Not a version: ${update.version}`);
|
|
133
352
|
const previous = await currentVersion(installation);
|
|
134
353
|
const dest = path.join(installation.prefix, 'versions', update.version);
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
354
|
+
const pin = async () => {
|
|
355
|
+
const pinned = await pinNode(installation);
|
|
356
|
+
if (pinned !== 'kept')
|
|
357
|
+
options.log?.(`update: ${bin} ${update.version} runs on ${path.join(installation.prefix, 'node')} (${pinned} from ${process.execPath})`);
|
|
358
|
+
};
|
|
359
|
+
if (update.kind === 'npm') {
|
|
360
|
+
// npm runs on the Node the new version will run on, so that one is pinned first.
|
|
361
|
+
await pin();
|
|
362
|
+
if (!existsSync(path.join(dest, 'bin', bin)))
|
|
363
|
+
await installNpmVersion({
|
|
364
|
+
installation,
|
|
365
|
+
bin,
|
|
366
|
+
package: update.package,
|
|
367
|
+
version: update.version,
|
|
368
|
+
node: path.join(installation.prefix, 'node'),
|
|
369
|
+
...(options.npm === undefined ? {} : { npm: options.npm }),
|
|
370
|
+
...(options.env === undefined ? {} : { env: options.env }),
|
|
371
|
+
...(options.log === undefined ? {} : { log: options.log }),
|
|
372
|
+
});
|
|
373
|
+
}
|
|
374
|
+
else {
|
|
375
|
+
if (!existsSync(path.join(dest, 'bin', bin))) {
|
|
376
|
+
options.log?.(`update: downloading ${bin} ${update.version}`);
|
|
377
|
+
const bytes = await client.download(update.url);
|
|
378
|
+
await unpackTarball(bytes, update.sha256, dest);
|
|
379
|
+
}
|
|
380
|
+
if (!existsSync(path.join(dest, 'bin', 'node')))
|
|
381
|
+
await pin();
|
|
139
382
|
}
|
|
140
383
|
await activateVersion(installation, update.version);
|
|
141
384
|
options.log?.(`update: ${bin} ${update.version} is current (was ${previous ?? 'none'})`);
|
package/dist/install.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../src/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/lib/command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAU,MAAM,aAAa,CAAC;AAG9C,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAA6B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/lib/command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAU,MAAM,aAAa,CAAC;AAG9C,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAA6B,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAU3E,qBAAa,UAAW,SAAQ,KAAK;IACnC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAEZ,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,QAAgC;CAKpE;AAED,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,CA6BhD;AAED,8BAAsB,UAAW,SAAQ,OAAO;IAC9C,OAAgB,cAAc,UAAQ;IACtC,wFAAwF;IACxF,MAAM,CAAC,cAAc,EAAE,OAAO,CAAS;IAEvC,4EAA4E;IAC5E,OAAO,CAAC,OAAO,CAAU;IAEzB,8CAA8C;IAC9C,SAAS,KAAK,WAAW,IAAI,MAAM,CAElC;cAEkB,aAAa,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAS1D,iGAAiG;IACjG,SAAS,KAAK,MAAM,IAAI,OAAO,CAE9B;IAED,iCAAiC;IACjC,SAAS,KAAK,GAAG,IAAI,OAAO,CAE3B;IAEqB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAW3C,6EAA6E;IAC7D,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAK/C,IAAI,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK;cAKxC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO;IASvD,SAAS,KAAK,KAAK,IAAI,WAAW,CAEjC;IAED,4CAA4C;IAC5C,SAAS,KAAK,GAAG,IAAI,MAAM,CAE1B;cAEwB,KAAK,CAC5B,KAAK,EAAE,KAAK,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GACnC,OAAO,CAAC,OAAO,CAAC;CAoBpB"}
|
package/dist/lib/command.js
CHANGED
|
@@ -5,7 +5,7 @@ import { Command, Errors } from '@oclif/core';
|
|
|
5
5
|
import { ZodError } from 'zod';
|
|
6
6
|
import { EXIT_CODES } from '@nocobase/agent-protocol';
|
|
7
7
|
import { appCliConfig, appCliPaths } from "../config.js";
|
|
8
|
-
import { CliCommandError, failureEnvelope, successEnvelope, } from "./envelope.js";
|
|
8
|
+
import { apiSuggestionsOf, CliCommandError, failureEnvelope, successEnvelope, } from "./envelope.js";
|
|
9
9
|
import { globalFlags } from "./globals.js";
|
|
10
10
|
import { AppApiError } from "./http.js";
|
|
11
11
|
export class UsageError extends Error {
|
|
@@ -19,9 +19,10 @@ export class UsageError extends Error {
|
|
|
19
19
|
/** A failure as oclif reports it, with the CLI's exit code. */
|
|
20
20
|
export function asCliError(error) {
|
|
21
21
|
if (error instanceof AppApiError) {
|
|
22
|
-
return new
|
|
22
|
+
return asCliError(new CliCommandError(error.reason, `${error.reason}: ${error.message}`, {
|
|
23
23
|
exit: error.exitCode,
|
|
24
|
-
|
|
24
|
+
suggestions: apiSuggestionsOf(error.metadata),
|
|
25
|
+
}));
|
|
25
26
|
}
|
|
26
27
|
if (error instanceof UsageError)
|
|
27
28
|
return new Errors.CLIError(error.message, { exit: error.exit });
|
|
@@ -89,8 +90,17 @@ export class AppCommand extends Command {
|
|
|
89
90
|
if (error instanceof AppApiError ||
|
|
90
91
|
error instanceof UsageError ||
|
|
91
92
|
error instanceof CliCommandError ||
|
|
92
|
-
error instanceof ZodError)
|
|
93
|
+
error instanceof ZodError) {
|
|
94
|
+
// oclif's JSON catch reads exitCode, whereas CLIError stores the code in oclif.exit.
|
|
95
|
+
// Preserve the public CLI exit code before oclif renders the failure envelope.
|
|
96
|
+
process.exitCode =
|
|
97
|
+
error instanceof AppApiError
|
|
98
|
+
? error.exitCode
|
|
99
|
+
: error instanceof UsageError || error instanceof CliCommandError
|
|
100
|
+
? error.exit
|
|
101
|
+
: EXIT_CODES.general;
|
|
93
102
|
return super.catch(asCliError(error));
|
|
103
|
+
}
|
|
94
104
|
return super.catch(error);
|
|
95
105
|
}
|
|
96
106
|
}
|
package/dist/lib/command.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/lib/command.ts"],"names":[],"mappings":"AAAA,uHAAuH;AACvH,wIAAwI;AACxI,qCAAqC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAiB,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAoB,MAAM,cAAc,CAAC;AAC3E,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,OAAO,UAAW,SAAQ,KAAK;IAC1B,IAAI,CAAW;IAExB,YAAY,OAAe,EAAE,OAAiB,UAAU,CAAC,UAAU;QACjE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AAED,+DAA+D;AAC/D,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;QACjC,OAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/lib/command.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,8 @@ export interface ProfileSummary {
|
|
|
29
29
|
readonly current: boolean;
|
|
30
30
|
}
|
|
31
31
|
export interface UserConfigOptions {
|
|
32
|
+
/** Session agents must use the bridge-selected stored profile, ignoring run and environment credentials. */
|
|
33
|
+
profileOnly?: boolean;
|
|
32
34
|
paths?: AppCliPaths;
|
|
33
35
|
config?: AppCliConfig;
|
|
34
36
|
/** The keychain; the platform's own by default, undefined for none. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,WAAW,EACjB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAOL,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAE5B,yGAAyG;AACzG,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,QAAQ,CAAC;AAkClD,wDAAwD;AACxD,eAAO,MAAM,eAAe,YAAY,CAAC;AAIzC,sEAAsE;AACtE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wCAAwC;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,qFAAqF;IACrF,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,KAAK,CAAC;IACrC,gEAAgE;IAChE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,2DAA2D;AAC3D,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,uEAAuE;IACvE,KAAK,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,sFAAsF;IACtF,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B;AAoBD,gHAAgH;AAChH,wBAAgB,QAAQ,CACtB,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,GACrC,MAAM,GAAG,SAAS,CAIpB;AAED,mHAAmH;AACnH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGpE;AAuBD,qGAAqG;AACrG,wBAAgB,eAAe,CAC7B,MAAM,EAAE;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,EACjD,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAC3C,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,MAAM,CAOR;AAED,4CAA4C;AAC5C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMrD;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAClC,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"credentials.d.ts","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/credentials.js
CHANGED
|
@@ -107,12 +107,14 @@ export function checkProfileName(name) {
|
|
|
107
107
|
export async function readUserConfig(options = {}) {
|
|
108
108
|
const { config, env, paths, store } = resolveOptions(options);
|
|
109
109
|
const named = env[RUN_CREDENTIALS_ENV];
|
|
110
|
-
if (named !== undefined && named !== '')
|
|
110
|
+
if (!options.profileOnly && named !== undefined && named !== '')
|
|
111
111
|
throw new UsageError(`This is an agent run, and its credentials file (${named}) is gone: the run has ended.`, EXIT_CODES.auth);
|
|
112
112
|
const stored = await readStored(paths);
|
|
113
113
|
const profile = selectedProfile(stored, options, config, env);
|
|
114
114
|
const entry = stored.profiles[profile];
|
|
115
|
-
const envKey =
|
|
115
|
+
const envKey = options.profileOnly
|
|
116
|
+
? undefined
|
|
117
|
+
: envValue(config, env, 'API_KEY');
|
|
116
118
|
if (envKey !== undefined) {
|
|
117
119
|
const server = envValue(config, env, 'SERVER') ?? entry?.server;
|
|
118
120
|
if (server === undefined)
|
|
@@ -130,7 +132,9 @@ export async function readUserConfig(options = {}) {
|
|
|
130
132
|
throw new UsageError(`There is no profile ${profile}. \`${config.bin} profile list\` shows them.`, EXIT_CODES.auth);
|
|
131
133
|
return undefined;
|
|
132
134
|
}
|
|
133
|
-
const server =
|
|
135
|
+
const server = options.profileOnly
|
|
136
|
+
? entry.server
|
|
137
|
+
: (envValue(config, env, 'SERVER') ?? entry.server);
|
|
134
138
|
const known = {
|
|
135
139
|
profile,
|
|
136
140
|
kind: entry.auth.kind,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,EAAE;AACF,mHAAmH;AACnH,mHAAmH;AACnH,2CAA2C;AAC3C,gHAAgH;AAChH,oHAAoH;AACpH,wHAAwH;AACxH,oHAAoH;AACpH,iHAAiH;AACjH,uCAAuC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,UAAU,EACV,OAAO,EACP,mBAAmB,EACnB,sBAAsB,GAEvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EACL,YAAY,EACZ,WAAW,GAGZ,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,aAAa,EACb,eAAe,GAGhB,MAAM,oBAAoB,CAAC;AAK5B,MAAM,oBAAoB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;AAE3D,qFAAqF;AACrF,MAAM,gBAAgB,GAAG,CAAC,CAAC,kBAAkB,CAAC,SAAS,EAAE;IACvD,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;KACtE,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;QAC1B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;KACvB,CAAC;CACH,CAAC,CAAC;AAEH,8FAA8F;AAC9F,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC/B,CAAC,CAAC;AAEH,gEAAgE;AAChE,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC9B,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC;CACpD,CAAC,CAAC;AAKH,wDAAwD;AACxD,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC;AAEzC,MAAM,YAAY,GAAG,oCAAoC,CAAC;AA2C1D,SAAS,cAAc,CAAC,OAA0B;IAChD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,YAAY,EAAE,CAAC;IAChD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,OAAO;QACL,MAAM;QACN,GAAG;QACH,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,WAAW,EAAE;QACrC,KAAK,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC;KAC5E,CAAC;AACJ,CAAC;AAED,gHAAgH;AAChH,MAAM,UAAU,QAAQ,CACtB,MAAoB,EACpB,GAAsB,EACtB,IAAsC;IAEtC,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACrD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,MAAM,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC;IACjD,OAAO,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;AAC/E,CAAC;AAED,mHAAmH;AACnH,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,OAAe;IAC1D,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,OAAO,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,IAAI,OAAO,EAAE,CAAC;AACzE,CAAC;AAED,kFAAkF;AAClF,KAAK,UAAU,UAAU,CAAC,KAAkB;IAC1C,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAU,KAAK,CAAC,UAAU,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC;IACvC,MAAM,MAAM,GAAG,mBAAmB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAClD,IAAI,MAAM,CAAC,OAAO;QAChB,OAAO;YACL,OAAO,EAAE,eAAe;YACxB,QAAQ,EAAE,EAAE,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE;SAC7C,CAAC;IACJ,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC1B,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,KAAkB,EAClB,MAAoB;IAEpB,MAAM,eAAe,CAAC,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,qGAAqG;AACrG,MAAM,UAAU,eAAe,CAC7B,MAAiD,EACjD,OAA2C,EAC3C,MAAoB,EACpB,GAAsB;IAEtB,OAAO,CACL,OAAO,CAAC,OAAO;QACf,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC;QAChC,MAAM,CAAC,OAAO;QACd,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,4CAA4C;AAC5C,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,MAAM,IAAI,UAAU,CAClB,uBAAuB,IAAI,0CAA0C,CACtE,CAAC;IACJ,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAA6B,EAAE;IAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACvC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE;QACrC,MAAM,IAAI,UAAU,CAClB,mDAAmD,KAAK,+BAA+B,EACvF,UAAU,CAAC,IAAI,CAChB,CAAC;IACJ,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;IAChD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,KAAK,EAAE,MAAM,CAAC;QAChE,IAAI,MAAM,KAAK,SAAS;YACtB,MAAM,IAAI,UAAU,CAClB,GAAG,MAAM,CAAC,SAAS,yCAAyC,MAAM,CAAC,SAAS,cAAc,EAC1F,UAAU,CAAC,IAAI,CAChB,CAAC;QACJ,OAAO;YACL,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC;YAC/B,GAAG,EAAE,MAAM;YACX,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,IACE,OAAO,CAAC,OAAO,KAAK,SAAS;YAC7B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC;YAEvC,MAAM,IAAI,UAAU,CAClB,uBAAuB,OAAO,OAAO,MAAM,CAAC,GAAG,6BAA6B,EAC5E,UAAU,CAAC,IAAI,CAChB,CAAC;QACJ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC;IAC/D,MAAM,KAAK,GAAG;QACZ,OAAO;QACP,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI;QACrB,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;IACF,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,MAAM;QAC/B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC;IACpE,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,SAAS,MAAM,CAAC,GAAG,SAAS,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,OAAO,EAAE,WAAW,CAAC;IAChH,IAAI,KAAK,EAAE,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,OAAO;QACpC,MAAM,IAAI,UAAU,CAClB,wBAAwB,KAAK,kCAAkC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,WAAW,QAAQ,KAAK,KAAK,EAAE,EAClJ,UAAU,CAAC,IAAI,CAChB,CAAC;IACJ,IAAI,GAAuB,CAAC;IAC5B,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CACnB,eAAe,CAAC,MAAM,CAAC,EACvB,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CACpC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,UAAU,CAClB,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,KAAK,CAAC,WAAW,EAAE,EAAE,EACjG,UAAU,CAAC,IAAI,CAChB,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,KAAK,SAAS;QACnB,MAAM,IAAI,UAAU,CAClB,+BAA+B,KAAK,KAAK,KAAK,EAAE,EAChD,UAAU,CAAC,IAAI,CAChB,CAAC;IACJ,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE,CAAC;AAChE,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAA6B,EAAE;IAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAiB,EAAE,CAAC,CAAC;QAChE,QAAQ,EAAE,EAAE;KACb,CAAC,CAAC,CAAC;IACJ,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,KAAK,SAAS,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,KAAK,EAAE,MAAM,CAAC;QAChE,OAAO,MAAM,KAAK,SAAS;YACzB,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1C,CAAC;IACD,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;AAC9E,CAAC;AAiBD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAc,EACd,GAAW,EACX,UAA4C,EAAE;IAE9C,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,gBAAgB,CAC9B,OAAO,CAAC,OAAO;QACb,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC;QAChC,MAAM,CAAC,OAAO;QACd,eAAe,CAClB,CAAC;IACF,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,IAAI,GAAmB,OAAO,CAAC,IAAI,IAAI,QAAQ,CAAC;IACtD,MAAM,IAAI,GAAG;QACX,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,EAAE,KAAoB,EAAE,EAAE,CAC1C,WAAW,CAAC,KAAK,EAAE;QACjB,OAAO,EAAE,OAAO;QAChB,QAAQ,EAAE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE;KACnD,CAAC,CAAC;IACL,IAAI,MAAM,GACR,gBAAgB,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS;QAC/D,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,gCAAgC;QACvD,CAAC,CAAC,yCAAyC,CAAC;IAChD,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;YACtE,MAAM,IAAI,CAAC;gBACT,MAAM;gBACN,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE;gBACnC,GAAG,IAAI;aACR,CAAC,CAAC;YACH,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IACD,MAAM,IAAI,CAAC;QACT,MAAM;QACN,IAAI,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE;QACpC,GAAG,IAAI;KACR,CAAC,CAAC;IACH,8EAA8E;IAC9E,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9D,OAAO;QACL,OAAO,EAAE,MAAM;QACf,OAAO;QACP,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,iBAAiB,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,GAAG;KAC7J,CAAC;AACJ,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAA6B,EAAE;IAE/B,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,OAAO,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;SACnC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,IAAI;QACJ,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO;QAC3B,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI;QACrB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,OAAO,EAAE,IAAI,KAAK,OAAO;KAC1B,CAAC,CAAC;SACF,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACb,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO;QACrB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9B,CAAC,CAAC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC,CACR,CAAC;AACN,CAAC;AAED,wCAAwC;AACxC,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAY,EACZ,UAA6B,EAAE;IAE/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;QAC5B,MAAM,IAAI,UAAU,CAClB,uBAAuB,IAAI,OAAO,MAAM,CAAC,GAAG,6BAA6B,EACzE,UAAU,CAAC,QAAQ,CACpB,CAAC;IACJ,MAAM,WAAW,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACzD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAY,EACZ,UAA6B,EAAE;IAE/B,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,QAAQ,GAAG,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IACxC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,KAAK,KAAK,SAAS;QACrB,MAAM,KAAK;aACR,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACjE,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;IACnE,MAAM,WAAW,CAAC,KAAK,EAAE;QACvB,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;QAC7C,QAAQ;KACT,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;AAClC,CAAC;AAED,uHAAuH;AACvH,MAAM,UAAU,iBAAiB,CAC/B,UAAwE;IAExE,OAAO,UAAU,CAAC,IAAI,KAAK,SAAS;QAClC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,UAAU,CAAC,GAAG,EAAE,EAAE;QAC/C,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,MAEC;IAED,OAAO,IAAI,SAAS,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,iBAAiB,CAAC,MAAM,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,UAA4B;IACpD,OAAO,IAAI,SAAS,CAAC;QACnB,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE;KAClD,CAAC,CAAC;AACL,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,MAAM,EAAE,CAAC;IAC7E,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IAChC,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,SAAuB,YAAY,EAAE,EACrC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,KAAK,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;IACvC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,EAAE,IAAI,UAAU,CAAC,KAAK,CAAC;QAC1D,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,SAAS,CAAC;QACR,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAChE,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAM,KAAK,OAAO;YAAE,OAAO,SAAS,CAAC;QACzC,OAAO,GAAG,MAAM,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAY;IAEZ,OAAO,sBAAsB,CAAC,KAAK,CACjC,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY,CACpD,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/envelope.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { type CommandErrorJson, type CommandJson, type CommandSuggestion } from '@nocobase/cli-envelope';
|
|
2
2
|
import { type ExitCode } from '@nocobase/agent-protocol';
|
|
3
3
|
export type Envelope = CommandJson;
|
|
4
|
+
/** Validated next steps supplied by the application; absent or malformed metadata keeps the built-in hints. */
|
|
5
|
+
export declare function apiSuggestionsOf(metadata: unknown): CommandSuggestion[] | undefined;
|
|
4
6
|
/** A failure the CLI raises itself, with what the envelope says of it. */
|
|
5
7
|
export declare class CliCommandError extends Error {
|
|
6
8
|
readonly code: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envelope.d.ts","sourceRoot":"","sources":["../../src/lib/envelope.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAMrE,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"envelope.d.ts","sourceRoot":"","sources":["../../src/lib/envelope.ts"],"names":[],"mappings":"AAIA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAc,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAMrE,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAC;AAcnC,+GAA+G;AAC/G,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,GAChB,iBAAiB,EAAE,GAAG,SAAS,CAGjC;AAED,0EAA0E;AAC1E,qBAAa,eAAgB,SAAQ,KAAK;IACxC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACnD,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,uCAAuC;IACvC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;gBAGtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;QACP,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;QACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;QAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;KACrB;CAST;AAsBD,2CAA2C;AAC3C,wBAAgB,WAAW,CACzB,KAAK,EAAE,OAAO,EACd,GAAG,SAAiB,GACnB,gBAAgB,CAmClB;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,OAAO,EACf,QAAQ,GAAE,SAAS,MAAM,EAAO,EAChC,MAAM,GAAE,SAAS,GAAG,cAA0B,GAC7C,QAAQ,CAEV;AAED,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,OAAO,EACd,QAAQ,GAAE,SAAS,MAAM,EAAO,EAChC,GAAG,CAAC,EAAE,MAAM,GACX,QAAQ,CAEV"}
|
package/dist/lib/envelope.js
CHANGED
|
@@ -4,9 +4,23 @@
|
|
|
4
4
|
// `details` carries the HTTP status, the canonical status and the body's metadata.
|
|
5
5
|
import { commandFailureJson, commandSuccessJson, } from '@nocobase/cli-envelope';
|
|
6
6
|
import { EXIT_CODES } from '@nocobase/agent-protocol';
|
|
7
|
-
import { ZodError } from 'zod';
|
|
7
|
+
import { z, ZodError } from 'zod';
|
|
8
8
|
import { UsageError } from "./command.js";
|
|
9
9
|
import { AppApiError } from "./http.js";
|
|
10
|
+
// Applications can supply their next steps in the API error's existing metadata extension.
|
|
11
|
+
const apiSuggestions = z.object({
|
|
12
|
+
suggestions: z.array(z.object({
|
|
13
|
+
message: z.string().min(1),
|
|
14
|
+
run: z
|
|
15
|
+
.object({ command: z.string().min(1), args: z.array(z.string()) })
|
|
16
|
+
.optional(),
|
|
17
|
+
})),
|
|
18
|
+
});
|
|
19
|
+
/** Validated next steps supplied by the application; absent or malformed metadata keeps the built-in hints. */
|
|
20
|
+
export function apiSuggestionsOf(metadata) {
|
|
21
|
+
const supplied = apiSuggestions.safeParse(metadata);
|
|
22
|
+
return supplied.success ? supplied.data.suggestions : undefined;
|
|
23
|
+
}
|
|
10
24
|
/** A failure the CLI raises itself, with what the envelope says of it. */
|
|
11
25
|
export class CliCommandError extends Error {
|
|
12
26
|
code;
|
|
@@ -60,7 +74,7 @@ export function errorJsonOf(error, bin = 'nocobase-cli') {
|
|
|
60
74
|
return {
|
|
61
75
|
code: error.reason,
|
|
62
76
|
message: error.message,
|
|
63
|
-
suggestions: suggestionsFor(error.reason, bin),
|
|
77
|
+
suggestions: apiSuggestionsOf(error.metadata) ?? suggestionsFor(error.reason, bin),
|
|
64
78
|
...(Object.keys(details).length > 0 ? { details } : {}),
|
|
65
79
|
};
|
|
66
80
|
}
|