@true-and-useful/janee 0.14.0 → 0.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +82 -0
- package/dist/cli/cli-utils.d.ts +7 -0
- package/dist/cli/cli-utils.d.ts.map +1 -0
- package/dist/cli/cli-utils.js +55 -0
- package/dist/cli/cli-utils.js.map +1 -0
- package/dist/cli/commands/add.d.ts +4 -0
- package/dist/cli/commands/add.d.ts.map +1 -1
- package/dist/cli/commands/add.js +65 -147
- package/dist/cli/commands/add.js.map +1 -1
- package/dist/cli/commands/capability.d.ts +2 -3
- package/dist/cli/commands/capability.d.ts.map +1 -1
- package/dist/cli/commands/capability.js +30 -155
- package/dist/cli/commands/capability.js.map +1 -1
- package/dist/cli/commands/config.d.ts.map +1 -1
- package/dist/cli/commands/config.js +10 -34
- package/dist/cli/commands/config.js.map +1 -1
- package/dist/cli/commands/diagnose.d.ts.map +1 -1
- package/dist/cli/commands/diagnose.js +9 -21
- package/dist/cli/commands/diagnose.js.map +1 -1
- package/dist/cli/commands/list.d.ts.map +1 -1
- package/dist/cli/commands/list.js +3 -26
- package/dist/cli/commands/list.js.map +1 -1
- package/dist/cli/commands/logs.d.ts.map +1 -1
- package/dist/cli/commands/logs.js +2 -17
- package/dist/cli/commands/logs.js.map +1 -1
- package/dist/cli/commands/overview.d.ts +4 -0
- package/dist/cli/commands/overview.d.ts.map +1 -0
- package/dist/cli/commands/overview.js +115 -0
- package/dist/cli/commands/overview.js.map +1 -0
- package/dist/cli/commands/remove.d.ts.map +1 -1
- package/dist/cli/commands/remove.js +4 -35
- package/dist/cli/commands/remove.js.map +1 -1
- package/dist/cli/commands/revoke.d.ts.map +1 -1
- package/dist/cli/commands/revoke.js +3 -8
- package/dist/cli/commands/revoke.js.map +1 -1
- package/dist/cli/commands/serve-mcp.d.ts.map +1 -1
- package/dist/cli/commands/serve-mcp.js +24 -34
- package/dist/cli/commands/serve-mcp.js.map +1 -1
- package/dist/cli/commands/service-edit.d.ts +2 -0
- package/dist/cli/commands/service-edit.d.ts.map +1 -1
- package/dist/cli/commands/service-edit.js +36 -48
- package/dist/cli/commands/service-edit.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +3 -18
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/status.d.ts.map +1 -1
- package/dist/cli/commands/status.js +3 -18
- package/dist/cli/commands/status.js.map +1 -1
- package/dist/cli/commands/test.d.ts.map +1 -1
- package/dist/cli/commands/test.js +5 -41
- package/dist/cli/commands/test.js.map +1 -1
- package/dist/cli/commands/whoami.d.ts.map +1 -1
- package/dist/cli/commands/whoami.js +3 -17
- package/dist/cli/commands/whoami.js.map +1 -1
- package/dist/cli/config-yaml.d.ts +7 -1
- package/dist/cli/config-yaml.d.ts.map +1 -1
- package/dist/cli/config-yaml.js +19 -0
- package/dist/cli/config-yaml.js.map +1 -1
- package/dist/cli/index.js +16 -1
- package/dist/cli/index.js.map +1 -1
- package/dist/core/audit.d.ts +2 -12
- package/dist/core/audit.d.ts.map +1 -1
- package/dist/core/audit.js +1 -1
- package/dist/core/audit.js.map +1 -1
- package/dist/core/auth.d.ts.map +1 -1
- package/dist/core/auth.js +14 -0
- package/dist/core/auth.js.map +1 -1
- package/dist/core/authority.d.ts +6 -0
- package/dist/core/authority.d.ts.map +1 -1
- package/dist/core/authority.js +19 -13
- package/dist/core/authority.js.map +1 -1
- package/dist/core/directory.d.ts +1 -1
- package/dist/core/directory.d.ts.map +1 -1
- package/dist/core/directory.js +19 -0
- package/dist/core/directory.js.map +1 -1
- package/dist/core/exec.d.ts.map +1 -1
- package/dist/core/exec.js +12 -11
- package/dist/core/exec.js.map +1 -1
- package/dist/core/mcp-server.d.ts +10 -25
- package/dist/core/mcp-server.d.ts.map +1 -1
- package/dist/core/mcp-server.js +47 -578
- package/dist/core/mcp-server.js.map +1 -1
- package/dist/core/runner-proxy.d.ts.map +1 -1
- package/dist/core/runner-proxy.js +2 -1
- package/dist/core/runner-proxy.js.map +1 -1
- package/dist/core/sessions.d.ts +10 -0
- package/dist/core/sessions.d.ts.map +1 -1
- package/dist/core/sessions.js.map +1 -1
- package/dist/core/signing.d.ts +24 -0
- package/dist/core/signing.d.ts.map +1 -1
- package/dist/core/signing.js +85 -0
- package/dist/core/signing.js.map +1 -1
- package/dist/core/tool-handlers.d.ts +39 -0
- package/dist/core/tool-handlers.d.ts.map +1 -0
- package/dist/core/tool-handlers.js +378 -0
- package/dist/core/tool-handlers.js.map +1 -0
- package/dist/core/types.d.ts +28 -0
- package/dist/core/types.d.ts.map +1 -0
- package/dist/core/types.js +16 -0
- package/dist/core/types.js.map +1 -0
- package/package.json +1 -1
|
@@ -37,24 +37,8 @@ exports.serviceEditCommand = serviceEditCommand;
|
|
|
37
37
|
const fs = __importStar(require("fs"));
|
|
38
38
|
const os = __importStar(require("os"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
|
+
const cli_utils_1 = require("../cli-utils");
|
|
40
41
|
const config_yaml_1 = require("../config-yaml");
|
|
41
|
-
function cliError(msg, json) {
|
|
42
|
-
if (json) {
|
|
43
|
-
console.log(JSON.stringify({ ok: false, error: msg }));
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
console.error(`❌ ${msg}`);
|
|
47
|
-
}
|
|
48
|
-
process.exit(1);
|
|
49
|
-
}
|
|
50
|
-
function resolveEnvVar(varName, label) {
|
|
51
|
-
const value = process.env[varName];
|
|
52
|
-
if (!value) {
|
|
53
|
-
console.error(`❌ Environment variable ${varName} is not set (needed for ${label})`);
|
|
54
|
-
process.exit(1);
|
|
55
|
-
}
|
|
56
|
-
return value.trim();
|
|
57
|
-
}
|
|
58
42
|
function expandHome(p) {
|
|
59
43
|
if (p.startsWith('~/'))
|
|
60
44
|
return path.join(os.homedir(), p.slice(2));
|
|
@@ -64,26 +48,25 @@ function expandHome(p) {
|
|
|
64
48
|
}
|
|
65
49
|
async function serviceEditCommand(name, options) {
|
|
66
50
|
try {
|
|
67
|
-
|
|
68
|
-
return cliError('No config found. Run `janee init` first.', options.json);
|
|
51
|
+
(0, cli_utils_1.requireConfig)(options.json);
|
|
69
52
|
const config = (0, config_yaml_1.loadYAMLConfig)();
|
|
70
53
|
const service = config.services[name];
|
|
71
54
|
if (!service)
|
|
72
|
-
return cliError(`Service "${name}" not found`, options.json);
|
|
55
|
+
return (0, cli_utils_1.cliError)(`Service "${name}" not found`, options.json);
|
|
73
56
|
if (options.keyFromEnv) {
|
|
74
57
|
if (options.key)
|
|
75
|
-
return cliError('Cannot use both --key and --key-from-env', options.json);
|
|
76
|
-
options.key = resolveEnvVar(options.keyFromEnv, 'API key');
|
|
58
|
+
return (0, cli_utils_1.cliError)('Cannot use both --key and --key-from-env', options.json);
|
|
59
|
+
options.key = (0, cli_utils_1.resolveEnvVar)(options.keyFromEnv, 'API key');
|
|
77
60
|
}
|
|
78
61
|
if (options.secretFromEnv) {
|
|
79
62
|
if (options.apiSecret)
|
|
80
|
-
return cliError('Cannot use both --api-secret and --secret-from-env', options.json);
|
|
81
|
-
options.apiSecret = resolveEnvVar(options.secretFromEnv, 'API secret');
|
|
63
|
+
return (0, cli_utils_1.cliError)('Cannot use both --api-secret and --secret-from-env', options.json);
|
|
64
|
+
options.apiSecret = (0, cli_utils_1.resolveEnvVar)(options.secretFromEnv, 'API secret');
|
|
82
65
|
}
|
|
83
66
|
if (options.passphraseFromEnv) {
|
|
84
67
|
if (options.passphrase)
|
|
85
|
-
return cliError('Cannot use both --passphrase and --passphrase-from-env', options.json);
|
|
86
|
-
options.passphrase = resolveEnvVar(options.passphraseFromEnv, 'passphrase');
|
|
68
|
+
return (0, cli_utils_1.cliError)('Cannot use both --passphrase and --passphrase-from-env', options.json);
|
|
69
|
+
options.passphrase = (0, cli_utils_1.resolveEnvVar)(options.passphraseFromEnv, 'passphrase');
|
|
87
70
|
}
|
|
88
71
|
const changes = [];
|
|
89
72
|
if (options.url) {
|
|
@@ -106,36 +89,36 @@ async function serviceEditCommand(name, options) {
|
|
|
106
89
|
changes.push('HMAC apiKey rotated');
|
|
107
90
|
}
|
|
108
91
|
else {
|
|
109
|
-
return cliError(`--key is not applicable to auth type "${auth.type}"`, options.json);
|
|
92
|
+
return (0, cli_utils_1.cliError)(`--key is not applicable to auth type "${auth.type}"`, options.json);
|
|
110
93
|
}
|
|
111
94
|
}
|
|
112
95
|
if (options.apiSecret) {
|
|
113
96
|
if (!auth.type.startsWith('hmac'))
|
|
114
|
-
return cliError(`--api-secret is not applicable to auth type "${auth.type}"`, options.json);
|
|
97
|
+
return (0, cli_utils_1.cliError)(`--api-secret is not applicable to auth type "${auth.type}"`, options.json);
|
|
115
98
|
auth.apiSecret = options.apiSecret;
|
|
116
99
|
changes.push('HMAC apiSecret rotated');
|
|
117
100
|
}
|
|
118
101
|
if (options.passphrase) {
|
|
119
102
|
if (auth.type !== 'hmac-okx')
|
|
120
|
-
return cliError(`--passphrase is only applicable to hmac-okx auth`, options.json);
|
|
103
|
+
return (0, cli_utils_1.cliError)(`--passphrase is only applicable to hmac-okx auth`, options.json);
|
|
121
104
|
auth.passphrase = options.passphrase;
|
|
122
105
|
changes.push('passphrase rotated');
|
|
123
106
|
}
|
|
124
107
|
if (options.pemFile) {
|
|
125
108
|
if (auth.type !== 'github-app')
|
|
126
|
-
return cliError(`--pem-file is only applicable to github-app auth`, options.json);
|
|
109
|
+
return (0, cli_utils_1.cliError)(`--pem-file is only applicable to github-app auth`, options.json);
|
|
127
110
|
const pemPath = expandHome(options.pemFile);
|
|
128
111
|
try {
|
|
129
112
|
auth.privateKey = fs.readFileSync(pemPath, 'utf-8');
|
|
130
113
|
}
|
|
131
114
|
catch {
|
|
132
|
-
return cliError(`Could not read PEM file: ${pemPath}`, options.json);
|
|
115
|
+
return (0, cli_utils_1.cliError)(`Could not read PEM file: ${pemPath}`, options.json);
|
|
133
116
|
}
|
|
134
117
|
changes.push('private key rotated');
|
|
135
118
|
}
|
|
136
119
|
if (options.credentialsFile) {
|
|
137
120
|
if (auth.type !== 'service-account')
|
|
138
|
-
return cliError(`--credentials-file is only applicable to service-account auth`, options.json);
|
|
121
|
+
return (0, cli_utils_1.cliError)(`--credentials-file is only applicable to service-account auth`, options.json);
|
|
139
122
|
const credPath = expandHome(options.credentialsFile);
|
|
140
123
|
try {
|
|
141
124
|
const raw = fs.readFileSync(credPath, 'utf-8');
|
|
@@ -143,49 +126,61 @@ async function serviceEditCommand(name, options) {
|
|
|
143
126
|
auth.credentials = raw;
|
|
144
127
|
}
|
|
145
128
|
catch {
|
|
146
|
-
return cliError(`Could not read/parse credentials file: ${credPath}`, options.json);
|
|
129
|
+
return (0, cli_utils_1.cliError)(`Could not read/parse credentials file: ${credPath}`, options.json);
|
|
147
130
|
}
|
|
148
131
|
changes.push('service account credentials rotated');
|
|
149
132
|
}
|
|
150
133
|
if (options.header?.length) {
|
|
151
134
|
if (auth.type !== 'headers')
|
|
152
|
-
return cliError(`--header is only applicable to headers auth`, options.json);
|
|
135
|
+
return (0, cli_utils_1.cliError)(`--header is only applicable to headers auth`, options.json);
|
|
153
136
|
if (!auth.headers)
|
|
154
137
|
auth.headers = {};
|
|
155
138
|
for (const pair of options.header) {
|
|
156
139
|
const eq = pair.indexOf('=');
|
|
157
140
|
if (eq <= 0)
|
|
158
|
-
return cliError(`Invalid --header format: "${pair}" (expected name=value)`, options.json);
|
|
141
|
+
return (0, cli_utils_1.cliError)(`Invalid --header format: "${pair}" (expected name=value)`, options.json);
|
|
159
142
|
auth.headers[pair.slice(0, eq).trim()] = pair.slice(eq + 1).trim();
|
|
160
143
|
}
|
|
161
144
|
changes.push('custom headers updated');
|
|
162
145
|
}
|
|
163
146
|
if (options.consumerKey) {
|
|
164
147
|
if (auth.type !== 'oauth1a-twitter')
|
|
165
|
-
return cliError(`--consumer-key is only applicable to oauth1a-twitter auth`, options.json);
|
|
148
|
+
return (0, cli_utils_1.cliError)(`--consumer-key is only applicable to oauth1a-twitter auth`, options.json);
|
|
166
149
|
auth.consumerKey = options.consumerKey;
|
|
167
150
|
changes.push('consumer key rotated');
|
|
168
151
|
}
|
|
169
152
|
if (options.consumerSecret) {
|
|
170
153
|
if (auth.type !== 'oauth1a-twitter')
|
|
171
|
-
return cliError(`--consumer-secret is only applicable to oauth1a-twitter auth`, options.json);
|
|
154
|
+
return (0, cli_utils_1.cliError)(`--consumer-secret is only applicable to oauth1a-twitter auth`, options.json);
|
|
172
155
|
auth.consumerSecret = options.consumerSecret;
|
|
173
156
|
changes.push('consumer secret rotated');
|
|
174
157
|
}
|
|
175
158
|
if (options.accessToken) {
|
|
176
159
|
if (auth.type !== 'oauth1a-twitter')
|
|
177
|
-
return cliError(`--access-token is only applicable to oauth1a-twitter auth`, options.json);
|
|
160
|
+
return (0, cli_utils_1.cliError)(`--access-token is only applicable to oauth1a-twitter auth`, options.json);
|
|
178
161
|
auth.accessToken = options.accessToken;
|
|
179
162
|
changes.push('access token rotated');
|
|
180
163
|
}
|
|
181
164
|
if (options.accessTokenSecret) {
|
|
182
165
|
if (auth.type !== 'oauth1a-twitter')
|
|
183
|
-
return cliError(`--access-token-secret is only applicable to oauth1a-twitter auth`, options.json);
|
|
166
|
+
return (0, cli_utils_1.cliError)(`--access-token-secret is only applicable to oauth1a-twitter auth`, options.json);
|
|
184
167
|
auth.accessTokenSecret = options.accessTokenSecret;
|
|
185
168
|
changes.push('access token secret rotated');
|
|
186
169
|
}
|
|
170
|
+
if (options.accessKeyId) {
|
|
171
|
+
if (auth.type !== 'aws-sigv4')
|
|
172
|
+
return (0, cli_utils_1.cliError)(`--access-key-id is only applicable to aws-sigv4 auth`, options.json);
|
|
173
|
+
auth.accessKeyId = options.accessKeyId;
|
|
174
|
+
changes.push('AWS access key ID rotated');
|
|
175
|
+
}
|
|
176
|
+
if (options.secretAccessKey) {
|
|
177
|
+
if (auth.type !== 'aws-sigv4')
|
|
178
|
+
return (0, cli_utils_1.cliError)(`--secret-access-key is only applicable to aws-sigv4 auth`, options.json);
|
|
179
|
+
auth.secretAccessKey = options.secretAccessKey;
|
|
180
|
+
changes.push('AWS secret access key rotated');
|
|
181
|
+
}
|
|
187
182
|
if (changes.length === 0) {
|
|
188
|
-
return cliError('No changes specified. Use --url, --test-path, --key, etc.', options.json);
|
|
183
|
+
return (0, cli_utils_1.cliError)('No changes specified. Use --url, --test-path, --key, etc.', options.json);
|
|
189
184
|
}
|
|
190
185
|
(0, config_yaml_1.saveYAMLConfig)(config);
|
|
191
186
|
if (options.json) {
|
|
@@ -198,14 +193,7 @@ async function serviceEditCommand(name, options) {
|
|
|
198
193
|
}
|
|
199
194
|
}
|
|
200
195
|
catch (error) {
|
|
201
|
-
|
|
202
|
-
if (options.json) {
|
|
203
|
-
console.log(JSON.stringify({ ok: false, error: msg }));
|
|
204
|
-
}
|
|
205
|
-
else {
|
|
206
|
-
console.error('❌ Error:', msg);
|
|
207
|
-
}
|
|
208
|
-
process.exit(1);
|
|
196
|
+
(0, cli_utils_1.handleCommandError)(error, options.json);
|
|
209
197
|
}
|
|
210
198
|
}
|
|
211
199
|
//# sourceMappingURL=service-edit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service-edit.js","sourceRoot":"","sources":["../../../src/cli/commands/service-edit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"service-edit.js","sourceRoot":"","sources":["../../../src/cli/commands/service-edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAMA,wBAAsB,eAAe,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAgFrF"}
|
|
@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.sessionsCommand = sessionsCommand;
|
|
7
|
-
const config_yaml_1 = require("../config-yaml");
|
|
8
7
|
const fs_1 = __importDefault(require("fs"));
|
|
9
8
|
const path_1 = __importDefault(require("path"));
|
|
9
|
+
const cli_utils_1 = require("../cli-utils");
|
|
10
|
+
const config_yaml_1 = require("../config-yaml");
|
|
10
11
|
async function sessionsCommand(options = {}) {
|
|
11
12
|
try {
|
|
12
13
|
const sessionsFile = path_1.default.join((0, config_yaml_1.getConfigDir)(), 'sessions.json');
|
|
@@ -75,23 +76,7 @@ async function sessionsCommand(options = {}) {
|
|
|
75
76
|
console.log('');
|
|
76
77
|
}
|
|
77
78
|
catch (error) {
|
|
78
|
-
|
|
79
|
-
if (options.json) {
|
|
80
|
-
console.log(JSON.stringify({ error: error.message }, null, 2));
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
83
|
-
console.error('❌ Error:', error.message);
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
if (options.json) {
|
|
88
|
-
console.log(JSON.stringify({ error: 'Unknown error occurred' }, null, 2));
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
console.error('❌ Unknown error occurred');
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
process.exit(1);
|
|
79
|
+
(0, cli_utils_1.handleCommandError)(error, options.json);
|
|
95
80
|
}
|
|
96
81
|
}
|
|
97
82
|
function formatTTL(seconds) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"AAmBA,wBAAsB,aAAa,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CA8GnF"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.statusCommand = statusCommand;
|
|
4
|
-
const config_yaml_1 = require("../config-yaml");
|
|
5
4
|
const fs_1 = require("fs");
|
|
6
5
|
const path_1 = require("path");
|
|
6
|
+
const cli_utils_1 = require("../cli-utils");
|
|
7
|
+
const config_yaml_1 = require("../config-yaml");
|
|
7
8
|
async function statusCommand(options = {}) {
|
|
8
9
|
try {
|
|
9
10
|
const configDir = (0, config_yaml_1.getConfigDir)();
|
|
@@ -97,23 +98,7 @@ async function statusCommand(options = {}) {
|
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
100
|
catch (error) {
|
|
100
|
-
|
|
101
|
-
if (options.json) {
|
|
102
|
-
console.log(JSON.stringify({ error: error.message }, null, 2));
|
|
103
|
-
}
|
|
104
|
-
else {
|
|
105
|
-
console.error('❌ Error:', error.message);
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
109
|
-
if (options.json) {
|
|
110
|
-
console.log(JSON.stringify({ error: 'Unknown error occurred' }, null, 2));
|
|
111
|
-
}
|
|
112
|
-
else {
|
|
113
|
-
console.error('❌ Unknown error occurred');
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
process.exit(1);
|
|
101
|
+
(0, cli_utils_1.handleCommandError)(error, options.json);
|
|
117
102
|
}
|
|
118
103
|
}
|
|
119
104
|
function formatBytes(bytes) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cli/commands/status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE9G"}
|
|
@@ -2,42 +2,22 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.testCommand = testCommand;
|
|
4
4
|
const health_1 = require("../../core/health");
|
|
5
|
+
const cli_utils_1 = require("../cli-utils");
|
|
5
6
|
const config_yaml_1 = require("../config-yaml");
|
|
6
7
|
async function testCommand(service, options = {}) {
|
|
7
8
|
try {
|
|
8
|
-
|
|
9
|
-
if (options.json) {
|
|
10
|
-
console.log(JSON.stringify({ error: 'No config found' }, null, 2));
|
|
11
|
-
}
|
|
12
|
-
else {
|
|
13
|
-
console.log('No config found. Run `janee init` first.');
|
|
14
|
-
}
|
|
15
|
-
process.exit(1);
|
|
16
|
-
}
|
|
9
|
+
(0, cli_utils_1.requireConfig)(options.json);
|
|
17
10
|
const config = (0, config_yaml_1.loadYAMLConfig)();
|
|
18
11
|
const serviceNames = Object.keys(config.services);
|
|
19
12
|
if (serviceNames.length === 0) {
|
|
20
|
-
|
|
21
|
-
console.log(JSON.stringify({ error: 'No services configured' }, null, 2));
|
|
22
|
-
}
|
|
23
|
-
else {
|
|
24
|
-
console.log('No services configured. Run `janee add` first.');
|
|
25
|
-
}
|
|
26
|
-
process.exit(1);
|
|
13
|
+
(0, cli_utils_1.cliError)('No services configured. Run `janee add` first.', options.json);
|
|
27
14
|
}
|
|
28
15
|
const timeout = options.timeout ? parseInt(options.timeout) : undefined;
|
|
29
16
|
const testOptions = timeout ? { timeout } : {};
|
|
30
17
|
let targets;
|
|
31
18
|
if (service) {
|
|
32
19
|
if (!config.services[service]) {
|
|
33
|
-
|
|
34
|
-
console.log(JSON.stringify({ error: `Unknown service: ${service}` }, null, 2));
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
console.error(`❌ Unknown service: ${service}`);
|
|
38
|
-
console.error(`Available: ${serviceNames.join(', ')}`);
|
|
39
|
-
}
|
|
40
|
-
process.exit(1);
|
|
20
|
+
(0, cli_utils_1.cliError)(`Unknown service: ${service}. Available: ${serviceNames.join(', ')}`, options.json);
|
|
41
21
|
}
|
|
42
22
|
targets = [service];
|
|
43
23
|
}
|
|
@@ -79,23 +59,7 @@ async function testCommand(service, options = {}) {
|
|
|
79
59
|
}
|
|
80
60
|
}
|
|
81
61
|
catch (error) {
|
|
82
|
-
|
|
83
|
-
if (options.json) {
|
|
84
|
-
console.log(JSON.stringify({ error: error.message }, null, 2));
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
console.error('❌ Error:', error.message);
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
else {
|
|
91
|
-
if (options.json) {
|
|
92
|
-
console.log(JSON.stringify({ error: 'Unknown error occurred' }, null, 2));
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
console.error('❌ Unknown error occurred');
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
process.exit(1);
|
|
62
|
+
(0, cli_utils_1.handleCommandError)(error, options.json);
|
|
99
63
|
}
|
|
100
64
|
}
|
|
101
65
|
//# sourceMappingURL=test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../../src/cli/commands/test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"AAkBA,wBAAsB,aAAa,CACjC,OAAO,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAC/C,OAAO,CAAC,IAAI,CAAC,CA8Df"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.whoamiCommand = whoamiCommand;
|
|
4
4
|
const agent_scope_1 = require("../../core/agent-scope");
|
|
5
|
+
const cli_utils_1 = require("../cli-utils");
|
|
5
6
|
const config_yaml_1 = require("../config-yaml");
|
|
6
7
|
function canAccessCapability(agentId, cap, services, defaultAccess) {
|
|
7
8
|
if (!agentId)
|
|
@@ -15,15 +16,7 @@ function canAccessCapability(agentId, cap, services, defaultAccess) {
|
|
|
15
16
|
}
|
|
16
17
|
async function whoamiCommand(options = {}) {
|
|
17
18
|
try {
|
|
18
|
-
|
|
19
|
-
if (options.json) {
|
|
20
|
-
console.log(JSON.stringify({ ok: false, error: 'No config found. Run `janee init` first.' }));
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
console.error('❌ No config found. Run `janee init` first.');
|
|
24
|
-
}
|
|
25
|
-
process.exit(1);
|
|
26
|
-
}
|
|
19
|
+
(0, cli_utils_1.requireConfig)(options.json);
|
|
27
20
|
const config = (0, config_yaml_1.loadYAMLConfig)();
|
|
28
21
|
const agentId = options.agent || undefined;
|
|
29
22
|
const defaultAccess = config.server?.defaultAccess;
|
|
@@ -78,14 +71,7 @@ async function whoamiCommand(options = {}) {
|
|
|
78
71
|
console.log('');
|
|
79
72
|
}
|
|
80
73
|
catch (error) {
|
|
81
|
-
|
|
82
|
-
if (options.json) {
|
|
83
|
-
console.log(JSON.stringify({ ok: false, error: msg }));
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
console.error('❌ Error:', msg);
|
|
87
|
-
}
|
|
88
|
-
process.exit(1);
|
|
74
|
+
(0, cli_utils_1.handleCommandError)(error, options.json);
|
|
89
75
|
}
|
|
90
76
|
}
|
|
91
77
|
//# sourceMappingURL=whoami.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/cli/commands/whoami.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import { CredentialOwnership } from '../core/agent-scope';
|
|
11
11
|
export interface AuthConfig {
|
|
12
|
-
type: 'bearer' | 'hmac-mexc' | 'hmac-bybit' | 'hmac-okx' | 'headers' | 'service-account' | 'github-app' | 'oauth1a-twitter';
|
|
12
|
+
type: 'bearer' | 'hmac-mexc' | 'hmac-bybit' | 'hmac-okx' | 'headers' | 'service-account' | 'github-app' | 'oauth1a-twitter' | 'aws-sigv4';
|
|
13
13
|
key?: string;
|
|
14
14
|
apiKey?: string;
|
|
15
15
|
apiSecret?: string;
|
|
@@ -24,6 +24,11 @@ export interface AuthConfig {
|
|
|
24
24
|
consumerSecret?: string;
|
|
25
25
|
accessToken?: string;
|
|
26
26
|
accessTokenSecret?: string;
|
|
27
|
+
accessKeyId?: string;
|
|
28
|
+
secretAccessKey?: string;
|
|
29
|
+
region?: string;
|
|
30
|
+
awsService?: string;
|
|
31
|
+
sessionToken?: string;
|
|
27
32
|
}
|
|
28
33
|
export interface ServiceConfig {
|
|
29
34
|
baseUrl: string;
|
|
@@ -43,6 +48,7 @@ export interface CapabilityConfig {
|
|
|
43
48
|
deny?: string[];
|
|
44
49
|
};
|
|
45
50
|
allowedAgents?: string[];
|
|
51
|
+
access?: 'open' | 'restricted';
|
|
46
52
|
mode?: 'proxy' | 'exec';
|
|
47
53
|
allowCommands?: string[];
|
|
48
54
|
env?: Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-yaml.d.ts","sourceRoot":"","sources":["../../src/cli/config-yaml.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,OAAO,EAGL,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAO7B,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,QAAQ,GAAG,WAAW,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,GAAG,iBAAiB,GAAG,YAAY,GAAG,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"config-yaml.d.ts","sourceRoot":"","sources":["../../src/cli/config-yaml.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/config-yaml.js
CHANGED
|
@@ -105,6 +105,14 @@ function extractSecrets(auth) {
|
|
|
105
105
|
if (auth.accessTokenSecret)
|
|
106
106
|
secrets.accessTokenSecret = auth.accessTokenSecret;
|
|
107
107
|
}
|
|
108
|
+
else if (auth.type === 'aws-sigv4') {
|
|
109
|
+
if (auth.accessKeyId)
|
|
110
|
+
secrets.accessKeyId = auth.accessKeyId;
|
|
111
|
+
if (auth.secretAccessKey)
|
|
112
|
+
secrets.secretAccessKey = auth.secretAccessKey;
|
|
113
|
+
if (auth.sessionToken)
|
|
114
|
+
secrets.sessionToken = auth.sessionToken;
|
|
115
|
+
}
|
|
108
116
|
return secrets;
|
|
109
117
|
}
|
|
110
118
|
/** Remove secret fields from an auth config (for writing clean YAML). */
|
|
@@ -121,6 +129,9 @@ function stripSecrets(auth) {
|
|
|
121
129
|
delete clean.consumerSecret;
|
|
122
130
|
delete clean.accessToken;
|
|
123
131
|
delete clean.accessTokenSecret;
|
|
132
|
+
delete clean.accessKeyId;
|
|
133
|
+
delete clean.secretAccessKey;
|
|
134
|
+
delete clean.sessionToken;
|
|
124
135
|
return clean;
|
|
125
136
|
}
|
|
126
137
|
/** Merge secrets back into a service's auth config. */
|
|
@@ -155,6 +166,14 @@ function injectSecrets(auth, secrets) {
|
|
|
155
166
|
if (typeof secrets.accessTokenSecret === 'string')
|
|
156
167
|
auth.accessTokenSecret = secrets.accessTokenSecret;
|
|
157
168
|
}
|
|
169
|
+
else if (auth.type === 'aws-sigv4') {
|
|
170
|
+
if (typeof secrets.accessKeyId === 'string')
|
|
171
|
+
auth.accessKeyId = secrets.accessKeyId;
|
|
172
|
+
if (typeof secrets.secretAccessKey === 'string')
|
|
173
|
+
auth.secretAccessKey = secrets.secretAccessKey;
|
|
174
|
+
if (typeof secrets.sessionToken === 'string')
|
|
175
|
+
auth.sessionToken = secrets.sessionToken;
|
|
176
|
+
}
|
|
158
177
|
}
|
|
159
178
|
// ---------------------------------------------------------------------------
|
|
160
179
|
// Encrypt / decrypt helpers
|