@observeone/cli 1.11.0 → 1.13.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 +78 -4
- package/dist/README.md +78 -4
- package/dist/commands/ai-check/index.d.ts.map +1 -1
- package/dist/commands/ai-check/index.js +1 -0
- package/dist/commands/ai-check/index.js.map +1 -1
- package/dist/commands/alert-channel.d.ts.map +1 -1
- package/dist/commands/alert-channel.js +30 -1
- package/dist/commands/alert-channel.js.map +1 -1
- package/dist/commands/apply.d.ts.map +1 -1
- package/dist/commands/apply.js +25 -92
- package/dist/commands/apply.js.map +1 -1
- package/dist/commands/check.d.ts.map +1 -1
- package/dist/commands/check.js +101 -6
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/export.d.ts.map +1 -1
- package/dist/commands/export.js +2 -14
- package/dist/commands/export.js.map +1 -1
- package/dist/commands/heartbeat.d.ts.map +1 -1
- package/dist/commands/heartbeat.js +12 -1
- package/dist/commands/heartbeat.js.map +1 -1
- package/dist/commands/monitor.d.ts.map +1 -1
- package/dist/commands/monitor.js +68 -6
- package/dist/commands/monitor.js.map +1 -1
- package/dist/commands/resource-command.factory.d.ts +2 -0
- package/dist/commands/resource-command.factory.d.ts.map +1 -1
- package/dist/commands/resource-command.factory.js +15 -5
- package/dist/commands/resource-command.factory.js.map +1 -1
- package/dist/commands/runs-command.d.ts +16 -0
- package/dist/commands/runs-command.d.ts.map +1 -0
- package/dist/commands/runs-command.js +95 -0
- package/dist/commands/runs-command.js.map +1 -0
- package/dist/commands/suite/formatters.js +2 -2
- package/dist/commands/suite/formatters.js.map +1 -1
- package/dist/commands/suite/index.d.ts.map +1 -1
- package/dist/commands/suite/index.js +6 -0
- package/dist/commands/suite/index.js.map +1 -1
- package/dist/commands/suite/pull.d.ts +6 -0
- package/dist/commands/suite/pull.d.ts.map +1 -0
- package/dist/commands/suite/pull.js +61 -0
- package/dist/commands/suite/pull.js.map +1 -0
- package/dist/commands/suite/push.d.ts +6 -0
- package/dist/commands/suite/push.d.ts.map +1 -0
- package/dist/commands/suite/push.js +92 -0
- package/dist/commands/suite/push.js.map +1 -0
- package/dist/commands/suite/update.d.ts +6 -0
- package/dist/commands/suite/update.d.ts.map +1 -0
- package/dist/commands/suite/update.js +48 -0
- package/dist/commands/suite/update.js.map +1 -0
- package/dist/interfaces/api-client.interface.d.ts +7 -1
- package/dist/interfaces/api-client.interface.d.ts.map +1 -1
- package/dist/package.json +1 -1
- package/dist/services/api-client.service.d.ts +43 -1
- package/dist/services/api-client.service.d.ts.map +1 -1
- package/dist/services/api-client.service.js +119 -16
- package/dist/services/api-client.service.js.map +1 -1
- package/dist/services/output.service.d.ts.map +1 -1
- package/dist/services/output.service.js +23 -8
- package/dist/services/output.service.js.map +1 -1
- package/dist/types/index.d.ts +40 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/utils/apply-config.d.ts +9 -0
- package/dist/utils/apply-config.d.ts.map +1 -0
- package/dist/utils/apply-config.js +87 -0
- package/dist/utils/apply-config.js.map +1 -0
- package/dist/utils/cli-input.d.ts +5 -0
- package/dist/utils/cli-input.d.ts.map +1 -0
- package/dist/utils/cli-input.js +55 -0
- package/dist/utils/cli-input.js.map +1 -0
- package/dist/utils/list-query.d.ts +6 -0
- package/dist/utils/list-query.d.ts.map +1 -0
- package/dist/utils/list-query.js +32 -0
- package/dist/utils/list-query.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAYnE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAgOT"}
|
package/dist/commands/check.js
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
1
2
|
import inquirer from 'inquirer';
|
|
2
3
|
import { createResourceCommand } from './resource-command.factory.js';
|
|
4
|
+
import { attachRunsCommand, printExecutionRuns } from './runs-command.js';
|
|
5
|
+
import { collectOptionValues, parseJsonArrayOption, parseKeyValuePairs, parseNumericIds, } from '../utils/cli-input.js';
|
|
3
6
|
/**
|
|
4
7
|
* Factory function to create check command (API Checks)
|
|
5
8
|
*/
|
|
6
9
|
export function createCheckCommand(configService, apiClient, outputService) {
|
|
7
|
-
|
|
10
|
+
const cmd = createResourceCommand(configService, apiClient, outputService, {
|
|
8
11
|
resourceName: 'check',
|
|
9
12
|
pluralName: 'API checks',
|
|
10
13
|
description: 'Manage API checks',
|
|
11
14
|
apiMethods: {
|
|
12
15
|
list: () => apiClient.getApiChecks(),
|
|
16
|
+
listWithFilters: (query) => apiClient.listApiChecks(query),
|
|
13
17
|
get: (id) => apiClient.getApiCheck(id),
|
|
14
18
|
create: (data) => apiClient.createApiCheck(data),
|
|
15
19
|
update: (id, data) => apiClient.updateApiCheck(id, data),
|
|
@@ -22,19 +26,36 @@ export function createCheckCommand(configService, apiClient, outputService) {
|
|
|
22
26
|
createCommandSetup: (cmd) => {
|
|
23
27
|
cmd
|
|
24
28
|
.option('-n, --name <name>', 'Check name')
|
|
29
|
+
.option('-d, --description <description>', 'Check description')
|
|
25
30
|
.option('-u, --url <url>', 'API URL')
|
|
26
|
-
.option('-m, --method <method>', 'HTTP Method')
|
|
31
|
+
.option('-m, --method <method>', 'HTTP Method')
|
|
32
|
+
.option('-i, --interval <interval>', 'Cron expression interval')
|
|
33
|
+
.option('--header <KEY=VALUE>', 'HTTP header to send with the request (repeatable)', collectOptionValues, [])
|
|
34
|
+
.option('--assertion <json>', 'Assertion JSON object (repeatable)', collectOptionValues, [])
|
|
35
|
+
.option('--alert-channel-id <id>', 'Attach an alert channel to this check (repeatable)', collectOptionValues, [])
|
|
36
|
+
.option('--no-alerts', 'Disable alerts');
|
|
27
37
|
},
|
|
28
38
|
updateCommandSetup: (cmd) => {
|
|
29
39
|
cmd
|
|
30
40
|
.option('-n, --name <name>', 'Check name')
|
|
41
|
+
.option('-d, --description <description>', 'Check description')
|
|
31
42
|
.option('-u, --url <url>', 'API URL')
|
|
32
|
-
.option('-m, --method <method>', 'HTTP Method')
|
|
43
|
+
.option('-m, --method <method>', 'HTTP Method')
|
|
44
|
+
.option('-i, --interval <interval>', 'Cron expression interval')
|
|
45
|
+
.option('--header <KEY=VALUE>', 'HTTP header to send with the request (repeatable)', collectOptionValues, [])
|
|
46
|
+
.option('--assertion <json>', 'Assertion JSON object (repeatable)', collectOptionValues, [])
|
|
47
|
+
.option('--alert-channel-id <id>', 'Attach an alert channel to this check (repeatable)', collectOptionValues, []);
|
|
33
48
|
},
|
|
34
49
|
createPrompts: async (options) => {
|
|
35
50
|
let name = options.name;
|
|
51
|
+
const description = options.description;
|
|
36
52
|
let url = options.url;
|
|
37
53
|
let method = options.method;
|
|
54
|
+
const interval = options.interval;
|
|
55
|
+
const alerts = options.alerts;
|
|
56
|
+
const headers = parseKeyValuePairs(options.header, 'header');
|
|
57
|
+
const assertions = parseJsonArrayOption(options.assertion, 'assertion');
|
|
58
|
+
const channelIds = parseNumericIds(options.alertChannelId, 'alert-channel-id');
|
|
38
59
|
if (!name || !url) {
|
|
39
60
|
const answers = await inquirer.prompt([
|
|
40
61
|
{
|
|
@@ -66,28 +87,102 @@ export function createCheckCommand(configService, apiClient, outputService) {
|
|
|
66
87
|
}
|
|
67
88
|
return {
|
|
68
89
|
name,
|
|
90
|
+
description,
|
|
69
91
|
url,
|
|
70
92
|
method: (method || 'GET').toUpperCase(),
|
|
93
|
+
headers,
|
|
94
|
+
assertions,
|
|
95
|
+
cron_expression: interval,
|
|
96
|
+
channel_ids: channelIds,
|
|
71
97
|
timeout_ms: 30000,
|
|
72
|
-
alert_on_failure:
|
|
98
|
+
alert_on_failure: alerts !== false,
|
|
73
99
|
};
|
|
74
100
|
},
|
|
75
101
|
updatePrompts: async (id, options, existing) => {
|
|
76
102
|
const name = options.name;
|
|
103
|
+
const description = options.description;
|
|
77
104
|
const url = options.url;
|
|
78
105
|
const method = options.method;
|
|
79
|
-
|
|
80
|
-
|
|
106
|
+
const interval = options.interval;
|
|
107
|
+
const headerInput = options.header;
|
|
108
|
+
const headers = (Array.isArray(headerInput) ? headerInput.length > 0 : Boolean(headerInput))
|
|
109
|
+
? parseKeyValuePairs(headerInput, 'header')
|
|
110
|
+
: undefined;
|
|
111
|
+
const assertionInput = options.assertion;
|
|
112
|
+
const assertions = (Array.isArray(assertionInput) ? assertionInput.length > 0 : Boolean(assertionInput))
|
|
113
|
+
? parseJsonArrayOption(assertionInput, 'assertion')
|
|
114
|
+
: undefined;
|
|
115
|
+
const alertChannelInput = options.alertChannelId;
|
|
116
|
+
const channelIds = (Array.isArray(alertChannelInput) ? alertChannelInput.length > 0 : Boolean(alertChannelInput))
|
|
117
|
+
? parseNumericIds(alertChannelInput, 'alert-channel-id')
|
|
118
|
+
: undefined;
|
|
119
|
+
if (!name &&
|
|
120
|
+
description === undefined &&
|
|
121
|
+
!url &&
|
|
122
|
+
!method &&
|
|
123
|
+
!interval &&
|
|
124
|
+
headers === undefined &&
|
|
125
|
+
assertions === undefined &&
|
|
126
|
+
channelIds === undefined) {
|
|
127
|
+
outputService.error('Please provide at least one field to update (--name, --description, --url, --method, --interval, --header, --assertion, or --alert-channel-id).');
|
|
81
128
|
process.exit(1);
|
|
82
129
|
}
|
|
83
130
|
return {
|
|
84
131
|
name: name || existing.name,
|
|
132
|
+
description: description ?? existing.description,
|
|
85
133
|
url: url || existing.url,
|
|
86
134
|
method: method ? method.toUpperCase() : existing.method || 'GET',
|
|
135
|
+
cron_expression: interval || existing.cron_expression,
|
|
136
|
+
headers: headers ?? existing.headers,
|
|
137
|
+
assertions: assertions ?? existing.assertions,
|
|
87
138
|
timeout_ms: existing.timeout_ms || 30000,
|
|
88
139
|
alert_on_failure: existing.alert_on_failure ?? true,
|
|
140
|
+
...(channelIds !== undefined && { channel_ids: channelIds }),
|
|
89
141
|
};
|
|
90
142
|
},
|
|
91
143
|
});
|
|
144
|
+
cmd
|
|
145
|
+
.command('run <id>')
|
|
146
|
+
.description('Trigger a manual run for an API check')
|
|
147
|
+
.action(async (id) => {
|
|
148
|
+
const isJson = process.env.OBS_JSON_OUTPUT === 'true';
|
|
149
|
+
try {
|
|
150
|
+
const checkId = parseInt(id);
|
|
151
|
+
if (isNaN(checkId))
|
|
152
|
+
throw new Error('Invalid check ID');
|
|
153
|
+
const result = await apiClient.runApiCheck(checkId);
|
|
154
|
+
if (isJson) {
|
|
155
|
+
outputService.formatJsonOutput({
|
|
156
|
+
executions: result.executions,
|
|
157
|
+
message: result.message,
|
|
158
|
+
});
|
|
159
|
+
return;
|
|
160
|
+
}
|
|
161
|
+
console.log(chalk.bold(`\n ${result.message}`));
|
|
162
|
+
for (const ex of result.executions) {
|
|
163
|
+
console.log(chalk.gray(` Region: ${ex.region} execution: ${ex.execution_id} status: ${ex.status}`));
|
|
164
|
+
}
|
|
165
|
+
console.log('');
|
|
166
|
+
}
|
|
167
|
+
catch (err) {
|
|
168
|
+
const msg = err.message || 'Failed to run check';
|
|
169
|
+
if (isJson) {
|
|
170
|
+
outputService.formatJsonOutput({ status: 'ERROR', error: { message: msg } });
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
console.error(chalk.red(`\n ${msg}\n`));
|
|
174
|
+
}
|
|
175
|
+
process.exit(1);
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
attachRunsCommand(cmd, {
|
|
179
|
+
title: 'API Check Runs',
|
|
180
|
+
emptyMessage: 'No API check runs found.',
|
|
181
|
+
description: 'List recent API check executions',
|
|
182
|
+
fetchRuns: (id, limit) => apiClient.getApiCheckRuns(id, limit),
|
|
183
|
+
formatRuns: printExecutionRuns,
|
|
184
|
+
outputService,
|
|
185
|
+
});
|
|
186
|
+
return cmd;
|
|
92
187
|
}
|
|
93
188
|
//# sourceMappingURL=check.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../src/commands/export.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../src/commands/export.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAUnE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAyFT"}
|
package/dist/commands/export.js
CHANGED
|
@@ -18,11 +18,10 @@ export function createExportCommand(configService, apiClient, outputService) {
|
|
|
18
18
|
}
|
|
19
19
|
outputService.progress('Fetching existing resources from backend...');
|
|
20
20
|
// Fetch all resources
|
|
21
|
-
const [monitors, apiChecks, heartbeats
|
|
21
|
+
const [monitors, apiChecks, heartbeats] = await Promise.all([
|
|
22
22
|
apiClient.getUrlMonitors().catch(() => []),
|
|
23
23
|
apiClient.getApiChecks().catch(() => []),
|
|
24
24
|
apiClient.getHeartbeats().catch(() => []),
|
|
25
|
-
apiClient.getTests().catch(() => []),
|
|
26
25
|
]);
|
|
27
26
|
const config = {};
|
|
28
27
|
// 1. Map Monitors
|
|
@@ -30,7 +29,7 @@ export function createExportCommand(configService, apiClient, outputService) {
|
|
|
30
29
|
config.monitors = monitors.map((m) => ({
|
|
31
30
|
name: m.name,
|
|
32
31
|
url: m.url,
|
|
33
|
-
|
|
32
|
+
interval: m.interval,
|
|
34
33
|
timeout_ms: m.timeout_ms,
|
|
35
34
|
alert_on_failure: m.alert_on_failure,
|
|
36
35
|
}));
|
|
@@ -54,15 +53,6 @@ export function createExportCommand(configService, apiClient, outputService) {
|
|
|
54
53
|
description: h.description,
|
|
55
54
|
}));
|
|
56
55
|
}
|
|
57
|
-
// 4. Map AI Checks
|
|
58
|
-
if (aiChecks.length > 0) {
|
|
59
|
-
config.ai_checks = aiChecks.map((t) => ({
|
|
60
|
-
name: t.name,
|
|
61
|
-
url: t.url,
|
|
62
|
-
prompt: t.prompt,
|
|
63
|
-
description: t.description || '',
|
|
64
|
-
}));
|
|
65
|
-
}
|
|
66
56
|
// Write to file
|
|
67
57
|
const targetFile = options.file;
|
|
68
58
|
writeFileSync(targetFile, JSON.stringify(config, null, 2));
|
|
@@ -74,7 +64,6 @@ export function createExportCommand(configService, apiClient, outputService) {
|
|
|
74
64
|
monitors: monitors.length,
|
|
75
65
|
apiChecks: apiChecks.length,
|
|
76
66
|
heartbeats: heartbeats.length,
|
|
77
|
-
aiChecks: aiChecks.length,
|
|
78
67
|
},
|
|
79
68
|
});
|
|
80
69
|
}
|
|
@@ -84,7 +73,6 @@ export function createExportCommand(configService, apiClient, outputService) {
|
|
|
84
73
|
console.log(` Monitors: ${monitors.length}`);
|
|
85
74
|
console.log(` API Checks: ${apiChecks.length}`);
|
|
86
75
|
console.log(` Heartbeats: ${heartbeats.length}`);
|
|
87
|
-
console.log(` AI Checks: ${aiChecks.length}`);
|
|
88
76
|
}
|
|
89
77
|
}
|
|
90
78
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/commands/export.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIpC,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/commands/export.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAKnE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAkGT"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import inquirer from 'inquirer';
|
|
2
2
|
import { createResourceCommand } from './resource-command.factory.js';
|
|
3
|
+
import { attachRunsCommand, printHeartbeatRuns } from './runs-command.js';
|
|
3
4
|
/**
|
|
4
5
|
* Factory function to create heartbeat command using the generic resource factory
|
|
5
6
|
*/
|
|
6
7
|
export function createHeartbeatCommand(configService, apiClient, outputService) {
|
|
7
|
-
|
|
8
|
+
const cmd = createResourceCommand(configService, apiClient, outputService, {
|
|
8
9
|
resourceName: 'heartbeat',
|
|
9
10
|
pluralName: 'heartbeats',
|
|
10
11
|
description: 'Manage heartbeats',
|
|
11
12
|
apiMethods: {
|
|
12
13
|
list: () => apiClient.getHeartbeats(),
|
|
14
|
+
listWithFilters: (query) => apiClient.listHeartbeats(query),
|
|
13
15
|
get: (id) => apiClient.getHeartbeat(id),
|
|
14
16
|
create: (data) => apiClient.createHeartbeat(data),
|
|
15
17
|
update: (id, data) => apiClient.updateHeartbeat(id, data),
|
|
@@ -85,5 +87,14 @@ export function createHeartbeatCommand(configService, apiClient, outputService)
|
|
|
85
87
|
};
|
|
86
88
|
},
|
|
87
89
|
});
|
|
90
|
+
attachRunsCommand(cmd, {
|
|
91
|
+
title: 'Heartbeat Runs',
|
|
92
|
+
emptyMessage: 'No heartbeat runs found.',
|
|
93
|
+
description: 'List recent heartbeat pings',
|
|
94
|
+
fetchRuns: (id, limit) => apiClient.getHeartbeatRuns(id, limit),
|
|
95
|
+
formatRuns: printHeartbeatRuns,
|
|
96
|
+
outputService,
|
|
97
|
+
});
|
|
98
|
+
return cmd;
|
|
88
99
|
}
|
|
89
100
|
//# sourceMappingURL=heartbeat.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAIhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAG1E;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,aAA6B,EAC7B,SAAqB,EACrB,aAA6B;IAE7B,MAAM,GAAG,GAAG,qBAAqB,CAAY,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE;QACpF,YAAY,EAAE,WAAW;QACzB,UAAU,EAAE,YAAY;QACxB,WAAW,EAAE,mBAAmB;QAChC,UAAU,EAAE;YACV,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE;YACrC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,KAAK,CAAC;YAC3D,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC;YACjD,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,EAAE,IAAI,CAAC;YACzD,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7C,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,EAAE,CAAC;SAC9C;QACD,UAAU,EAAE;YACV,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC;SAC5E;QACD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,GAAG;iBACA,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;iBAC7C,MAAM,CAAC,wBAAwB,EAAE,4BAA4B,CAAC;iBAC9D,MAAM,CAAC,uBAAuB,EAAE,yBAAyB,CAAC,CAAC;QAChE,CAAC;QACD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,GAAG;iBACA,MAAM,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;iBAC7C,MAAM,CAAC,wBAAwB,EAAE,4BAA4B,CAAC,CAAC;QACpE,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC/B,IAAI,IAAI,GAAG,OAAO,CAAC,IAA0B,CAAC;YAC9C,IAAI,MAAM,GAAG,OAAO,CAAC,MAAqC,CAAC;YAC3D,IAAI,KAAK,GAAG,OAAO,CAAC,KAAoC,CAAC;YAEzD,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBACpC;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,iBAAiB;wBAC1B,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;qBACpE;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,QAAQ;wBACd,OAAO,EAAE,4BAA4B;wBACrC,OAAO,EAAE,GAAG;qBACb;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,OAAO;wBACb,OAAO,EAAE,yBAAyB;wBAClC,OAAO,EAAE,EAAE;qBACZ;iBACF,CAAC,CAAC;gBACH,IAAI,GAAG,IAAI,IAAK,OAAO,CAAC,IAAe,CAAC;gBACxC,MAAM,GAAG,MAAM,IAAK,OAAO,CAAC,MAAiB,CAAC;gBAC9C,KAAK,GAAG,KAAK,IAAK,OAAO,CAAC,KAAgB,CAAC;YAC7C,CAAC;YAED,OAAO;gBACL,IAAI;gBACJ,MAAM,EAAE,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,MAAiB,IAAI,GAAG;gBACjF,YAAY,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAgB,IAAI,EAAE;gBACnF,WAAW,EAAE,iBAAiB;aAC/B,CAAC;QACJ,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAA0B,CAAC;YAChD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAqC,CAAC;YAE7D,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACrB,aAAa,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;gBACzF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,IAAI;gBAC3B,MAAM,EAAE,MAAM;oBACZ,CAAC,CAAC,OAAO,MAAM,KAAK,QAAQ;wBAC1B,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;wBAClB,CAAC,CAAE,MAAiB;oBACtB,CAAC,CAAC,QAAQ,CAAC,MAAM;gBACnB,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,iBAAiB;gBACtD,YAAY,EAAE,QAAQ,CAAC,YAAY,IAAI,EAAE;aAC1C,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,iBAAiB,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,gBAAgB;QACvB,YAAY,EAAE,0BAA0B;QACxC,WAAW,EAAE,6BAA6B;QAC1C,SAAS,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,KAAK,CAAC;QAC/D,UAAU,EAAE,kBAAkB;QAC9B,aAAa;KACd,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAOnE;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAmLT"}
|
package/dist/commands/monitor.js
CHANGED
|
@@ -1,15 +1,19 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
1
2
|
import inquirer from 'inquirer';
|
|
2
3
|
import { createResourceCommand } from './resource-command.factory.js';
|
|
4
|
+
import { attachRunsCommand, printExecutionRuns } from './runs-command.js';
|
|
5
|
+
import { collectOptionValues, parseNumericIds } from '../utils/cli-input.js';
|
|
3
6
|
/**
|
|
4
7
|
* Factory function to create monitor command using the generic resource factory
|
|
5
8
|
*/
|
|
6
9
|
export function createMonitorCommand(configService, apiClient, outputService) {
|
|
7
|
-
|
|
10
|
+
const cmd = createResourceCommand(configService, apiClient, outputService, {
|
|
8
11
|
resourceName: 'monitor',
|
|
9
12
|
pluralName: 'URL monitors',
|
|
10
13
|
description: 'Manage URL monitors',
|
|
11
14
|
apiMethods: {
|
|
12
15
|
list: () => apiClient.getUrlMonitors(),
|
|
16
|
+
listWithFilters: (query) => apiClient.listUrlMonitors(query),
|
|
13
17
|
get: (id) => apiClient.getUrlMonitor(id),
|
|
14
18
|
create: (data) => apiClient.createUrlMonitor(data),
|
|
15
19
|
update: (id, data) => apiClient.updateUrlMonitor(id, data),
|
|
@@ -22,21 +26,27 @@ export function createMonitorCommand(configService, apiClient, outputService) {
|
|
|
22
26
|
createCommandSetup: (cmd) => {
|
|
23
27
|
cmd
|
|
24
28
|
.option('-n, --name <name>', 'Monitor name')
|
|
29
|
+
.option('-d, --description <description>', 'Monitor description')
|
|
25
30
|
.option('-u, --url <url>', 'URL to monitor')
|
|
26
31
|
.option('-i, --interval <interval>', 'Cron expression interval')
|
|
32
|
+
.option('--alert-channel-id <id>', 'Attach an alert channel to this monitor (repeatable)', collectOptionValues, [])
|
|
27
33
|
.option('--no-alerts', 'Disable alerts');
|
|
28
34
|
},
|
|
29
35
|
updateCommandSetup: (cmd) => {
|
|
30
36
|
cmd
|
|
31
37
|
.option('-n, --name <name>', 'Monitor name')
|
|
38
|
+
.option('-d, --description <description>', 'Monitor description')
|
|
32
39
|
.option('-u, --url <url>', 'URL to monitor')
|
|
33
|
-
.option('-i, --interval <interval>', 'Cron expression interval')
|
|
40
|
+
.option('-i, --interval <interval>', 'Cron expression interval')
|
|
41
|
+
.option('--alert-channel-id <id>', 'Attach an alert channel to this monitor (repeatable)', collectOptionValues, []);
|
|
34
42
|
},
|
|
35
43
|
createPrompts: async (options) => {
|
|
36
44
|
let name = options.name;
|
|
45
|
+
const description = options.description;
|
|
37
46
|
let url = options.url;
|
|
38
47
|
let interval = options.interval;
|
|
39
48
|
const alerts = options.alerts;
|
|
49
|
+
const channelIds = parseNumericIds(options.alertChannelId, 'alert-channel-id');
|
|
40
50
|
if (!name || !url) {
|
|
41
51
|
const answers = await inquirer.prompt([
|
|
42
52
|
{
|
|
@@ -75,28 +85,80 @@ export function createMonitorCommand(configService, apiClient, outputService) {
|
|
|
75
85
|
}
|
|
76
86
|
return {
|
|
77
87
|
name,
|
|
88
|
+
description,
|
|
78
89
|
url,
|
|
79
|
-
|
|
90
|
+
interval: interval || '*/5 * * * *',
|
|
80
91
|
alert_on_failure: alerts !== false,
|
|
92
|
+
channel_ids: channelIds,
|
|
81
93
|
timeout_ms: 30000,
|
|
82
94
|
};
|
|
83
95
|
},
|
|
84
96
|
updatePrompts: async (id, options, existing) => {
|
|
85
97
|
const name = options.name;
|
|
98
|
+
const description = options.description;
|
|
86
99
|
const url = options.url;
|
|
87
100
|
const interval = options.interval;
|
|
88
|
-
|
|
89
|
-
|
|
101
|
+
const alertChannelInput = options.alertChannelId;
|
|
102
|
+
const channelIds = (Array.isArray(alertChannelInput) ? alertChannelInput.length > 0 : Boolean(alertChannelInput))
|
|
103
|
+
? parseNumericIds(alertChannelInput, 'alert-channel-id')
|
|
104
|
+
: undefined;
|
|
105
|
+
if (!name && description === undefined && !url && !interval && channelIds === undefined) {
|
|
106
|
+
outputService.error('Please provide at least one field to update (--name, --description, --url, --interval, or --alert-channel-id).');
|
|
90
107
|
process.exit(1);
|
|
91
108
|
}
|
|
92
109
|
return {
|
|
93
110
|
name: name || existing.name,
|
|
111
|
+
description: description ?? existing.description,
|
|
94
112
|
url: url || existing.url,
|
|
95
113
|
timeout_ms: existing.timeout_ms || 30000,
|
|
96
|
-
|
|
114
|
+
interval: interval || existing.interval,
|
|
97
115
|
alert_on_failure: existing.alert_on_failure ?? true,
|
|
116
|
+
...(channelIds !== undefined && { channel_ids: channelIds }),
|
|
98
117
|
};
|
|
99
118
|
},
|
|
100
119
|
});
|
|
120
|
+
cmd
|
|
121
|
+
.command('run <id>')
|
|
122
|
+
.description('Trigger a manual check for a monitor')
|
|
123
|
+
.action(async (id) => {
|
|
124
|
+
const isJson = process.env.OBS_JSON_OUTPUT === 'true';
|
|
125
|
+
try {
|
|
126
|
+
const monitorId = parseInt(id);
|
|
127
|
+
if (isNaN(monitorId))
|
|
128
|
+
throw new Error('Invalid monitor ID');
|
|
129
|
+
const result = await apiClient.runUrlMonitor(monitorId);
|
|
130
|
+
if (isJson) {
|
|
131
|
+
outputService.formatJsonOutput({
|
|
132
|
+
executions: result.executions,
|
|
133
|
+
message: result.message,
|
|
134
|
+
});
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
console.log(chalk.bold(`\n ${result.message}`));
|
|
138
|
+
for (const ex of result.executions) {
|
|
139
|
+
console.log(chalk.gray(` Region: ${ex.region} execution: ${ex.execution_id} status: ${ex.status}`));
|
|
140
|
+
}
|
|
141
|
+
console.log('');
|
|
142
|
+
}
|
|
143
|
+
catch (err) {
|
|
144
|
+
const msg = err.message || 'Failed to run monitor';
|
|
145
|
+
if (isJson) {
|
|
146
|
+
outputService.formatJsonOutput({ status: 'ERROR', error: { message: msg } });
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
console.error(chalk.red(`\n ${msg}\n`));
|
|
150
|
+
}
|
|
151
|
+
process.exit(1);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
attachRunsCommand(cmd, {
|
|
155
|
+
title: 'Monitor Runs',
|
|
156
|
+
emptyMessage: 'No monitor runs found.',
|
|
157
|
+
description: 'List recent monitor executions',
|
|
158
|
+
fetchRuns: (id, limit) => apiClient.getUrlMonitorRuns(id, limit),
|
|
159
|
+
formatRuns: printExecutionRuns,
|
|
160
|
+
outputService,
|
|
161
|
+
});
|
|
162
|
+
return cmd;
|
|
101
163
|
}
|
|
102
164
|
//# sourceMappingURL=monitor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/commands/monitor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7E;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,aAA6B,EAC7B,SAAqB,EACrB,aAA6B;IAE7B,MAAM,GAAG,GAAG,qBAAqB,CAAa,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE;QACrF,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,cAAc;QAC1B,WAAW,EAAE,qBAAqB;QAClC,UAAU,EAAE;YACV,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,cAAc,EAAE;YACtC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,CAAC;YAC5D,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;YACxC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAClD,MAAM,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC;YAC1D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;YAC9C,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,EAAE,CAAC;SAC/C;QACD,UAAU,EAAE;YACV,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC;SAC1E;QACD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,GAAG;iBACA,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC;iBAC3C,MAAM,CAAC,iCAAiC,EAAE,qBAAqB,CAAC;iBAChE,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;iBAC3C,MAAM,CAAC,2BAA2B,EAAE,0BAA0B,CAAC;iBAC/D,MAAM,CACL,yBAAyB,EACzB,sDAAsD,EACtD,mBAAmB,EACnB,EAAE,CACH;iBACA,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAC7C,CAAC;QACD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE;YAC1B,GAAG;iBACA,MAAM,CAAC,mBAAmB,EAAE,cAAc,CAAC;iBAC3C,MAAM,CAAC,iCAAiC,EAAE,qBAAqB,CAAC;iBAChE,MAAM,CAAC,iBAAiB,EAAE,gBAAgB,CAAC;iBAC3C,MAAM,CAAC,2BAA2B,EAAE,0BAA0B,CAAC;iBAC/D,MAAM,CACL,yBAAyB,EACzB,sDAAsD,EACtD,mBAAmB,EACnB,EAAE,CACH,CAAC;QACN,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;YAC/B,IAAI,IAAI,GAAG,OAAO,CAAC,IAA0B,CAAC;YAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,WAAiC,CAAC;YAC9D,IAAI,GAAG,GAAG,OAAO,CAAC,GAAyB,CAAC;YAC5C,IAAI,QAAQ,GAAG,OAAO,CAAC,QAA8B,CAAC;YACtD,MAAM,MAAM,GAAG,OAAO,CAAC,MAA6B,CAAC;YACrD,MAAM,UAAU,GAAG,eAAe,CAChC,OAAO,CAAC,cAA+C,EACvD,kBAAkB,CACnB,CAAC;YAEF,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC;oBACpC;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,eAAe;wBACxB,IAAI,EAAE,CAAC,IAAI;wBACX,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC;qBACpE;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,KAAK;wBACX,OAAO,EAAE,iBAAiB;wBAC1B,IAAI,EAAE,CAAC,GAAG;wBACV,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE;4BACxB,IAAI,CAAC;gCACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;gCACb,OAAO,IAAI,CAAC;4BACd,CAAC;4BAAC,MAAM,CAAC;gCACP,OAAO,qDAAqD,CAAC;4BAC/D,CAAC;wBACH,CAAC;qBACF;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,UAAU;wBAChB,OAAO,EAAE,wCAAwC;wBACjD,IAAI,EAAE,CAAC,QAAQ;wBACf,OAAO,EAAE,aAAa;qBACvB;iBACF,CAAC,CAAC;gBACH,IAAI,GAAG,IAAI,IAAK,OAAO,CAAC,IAAe,CAAC;gBACxC,GAAG,GAAG,GAAG,IAAK,OAAO,CAAC,GAAc,CAAC;gBACrC,QAAQ,GAAG,QAAQ,IAAK,OAAO,CAAC,QAAmB,CAAC;YACtD,CAAC;YAED,OAAO;gBACL,IAAI;gBACJ,WAAW;gBACX,GAAG;gBACH,QAAQ,EAAE,QAAQ,IAAI,aAAa;gBACnC,gBAAgB,EAAE,MAAM,KAAK,KAAK;gBAClC,WAAW,EAAE,UAAU;gBACvB,UAAU,EAAE,KAAK;aAClB,CAAC;QACJ,CAAC;QACD,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAA0B,CAAC;YAChD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAiC,CAAC;YAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,GAAyB,CAAC;YAC9C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAA8B,CAAC;YACxD,MAAM,iBAAiB,GAAG,OAAO,CAAC,cAA+C,CAAC;YAClF,MAAM,UAAU,GAAG,CACjB,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAC7F;gBACC,CAAC,CAAC,eAAe,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;gBACxD,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,CAAC,IAAI,IAAI,WAAW,KAAK,SAAS,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBACxF,aAAa,CAAC,KAAK,CACjB,gHAAgH,CACjH,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,IAAI,IAAI,QAAQ,CAAC,IAAI;gBAC3B,WAAW,EAAE,WAAW,IAAI,QAAQ,CAAC,WAAW;gBAChD,GAAG,EAAE,GAAG,IAAI,QAAQ,CAAC,GAAG;gBACxB,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,KAAK;gBACxC,QAAQ,EAAE,QAAQ,IAAI,QAAQ,CAAC,QAAQ;gBACvC,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,IAAI,IAAI;gBACnD,GAAG,CAAC,UAAU,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;aAC7D,CAAC;QACJ,CAAC;KACF,CAAC,CAAC;IAEH,GAAG;SACA,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,sCAAsC,CAAC;SACnD,MAAM,CAAC,KAAK,EAAE,EAAU,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/B,IAAI,KAAK,CAAC,SAAS,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YAE5D,MAAM,MAAM,GAAG,MAAO,SAAuB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEvE,IAAI,MAAM,EAAE,CAAC;gBACX,aAAa,CAAC,gBAAgB,CAAC;oBAC7B,UAAU,EAAE,MAAM,CAAC,UAAU;oBAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAChD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;gBACnC,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,gBAAgB,EAAE,CAAC,YAAY,aAAa,EAAE,CAAC,MAAM,EAAE,CAAC,CACzF,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,MAAM,GAAG,GAAI,GAAa,CAAC,OAAO,IAAI,uBAAuB,CAAC;YAC9D,IAAI,MAAM,EAAE,CAAC;gBACX,aAAa,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC/E,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,iBAAiB,CAAC,GAAG,EAAE;QACrB,KAAK,EAAE,cAAc;QACrB,YAAY,EAAE,wBAAwB;QACtC,WAAW,EAAE,gCAAgC;QAC7C,SAAS,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC;QAChE,UAAU,EAAE,kBAAkB;QAC9B,aAAa;KACd,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -2,12 +2,14 @@ import { Command } from 'commander';
|
|
|
2
2
|
import { IConfigService } from '../interfaces/config.interface.js';
|
|
3
3
|
import { IApiClient } from '../interfaces/api-client.interface.js';
|
|
4
4
|
import { IOutputService } from '../interfaces/output.interface.js';
|
|
5
|
+
import { ListQueryOptions, PaginatedListResult } from '../types/index.js';
|
|
5
6
|
export interface ResourceFactoryOptions<T> {
|
|
6
7
|
resourceName: string;
|
|
7
8
|
pluralName: string;
|
|
8
9
|
description: string;
|
|
9
10
|
apiMethods: {
|
|
10
11
|
list: () => Promise<T[]>;
|
|
12
|
+
listWithFilters?: (query: ListQueryOptions) => Promise<PaginatedListResult<T>>;
|
|
11
13
|
get: (id: number) => Promise<T>;
|
|
12
14
|
create: (data: Partial<T>) => Promise<T>;
|
|
13
15
|
update: (id: number, data: Partial<T>) => Promise<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-command.factory.d.ts","sourceRoot":"","sources":["../../src/commands/resource-command.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"resource-command.factory.d.ts","sourceRoot":"","sources":["../../src/commands/resource-command.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAO1E,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QACzB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,GAAG,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QACrD,MAAM,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACtC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;KAC3C,CAAC;IACF,UAAU,EAAE;QACV,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;KAC9C,CAAC;IACF,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5C,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1E,aAAa,CAAC,EAAE,CACd,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAChC,QAAQ,EAAE,CAAC,KACR,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;CAC1B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,EAC3E,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,sBAAsB,CAAC,CAAC,CAAC,GACjC,OAAO,CAkRT"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import { readFileSync, existsSync } from 'fs';
|
|
3
3
|
import inquirer from 'inquirer';
|
|
4
|
+
import { addListQueryOptions, formatPaginationSummary, resolveListQueryOptions, } from '../utils/list-query.js';
|
|
4
5
|
/**
|
|
5
6
|
* Factory to generate standardized CRUD subcommands for any resource.
|
|
6
7
|
* This ensures consistent JSON mode detection, error handling, and auth checks.
|
|
@@ -30,23 +31,32 @@ export function createResourceCommand(configService, apiClient, outputService, o
|
|
|
30
31
|
return { isJson, apiKey };
|
|
31
32
|
};
|
|
32
33
|
// LIST
|
|
33
|
-
cmd
|
|
34
|
+
const listCmd = cmd
|
|
34
35
|
.command('list')
|
|
35
36
|
.description(`List all ${pluralName}`)
|
|
36
37
|
.option('-f, --format <format>', 'Output format (table, json)', 'table')
|
|
37
|
-
.option('-j, --json', 'Output in JSON format')
|
|
38
|
-
|
|
38
|
+
.option('-j, --json', 'Output in JSON format');
|
|
39
|
+
if (apiMethods.listWithFilters) {
|
|
40
|
+
addListQueryOptions(listCmd);
|
|
41
|
+
}
|
|
42
|
+
listCmd.action(async (cmdOptions) => {
|
|
39
43
|
const resolvedOptions = resolveOptions(cmdOptions);
|
|
40
44
|
setupContext(resolvedOptions);
|
|
41
45
|
try {
|
|
42
46
|
outputService.progress(`Fetching ${pluralName}...`);
|
|
43
|
-
const
|
|
47
|
+
const paginated = apiMethods.listWithFilters
|
|
48
|
+
? await apiMethods.listWithFilters(resolveListQueryOptions(resolvedOptions))
|
|
49
|
+
: null;
|
|
50
|
+
const items = paginated?.items ?? (await apiMethods.list());
|
|
44
51
|
if (process.env.OBS_JSON_OUTPUT === 'true' ||
|
|
45
52
|
resolvedOptions.format === 'json' ||
|
|
46
53
|
resolvedOptions.json === true) {
|
|
47
|
-
outputService.formatJsonOutput(items);
|
|
54
|
+
outputService.formatJsonOutput(paginated ? { items: paginated.items, pagination: paginated.pagination } : items);
|
|
48
55
|
}
|
|
49
56
|
else {
|
|
57
|
+
if (paginated) {
|
|
58
|
+
outputService.info(formatPaginationSummary(paginated.pagination, paginated.items.length));
|
|
59
|
+
}
|
|
50
60
|
formatters.list(items, process.env.OBS_VERBOSE === 'true');
|
|
51
61
|
}
|
|
52
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-command.factory.js","sourceRoot":"","sources":["../../src/commands/resource-command.factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC9C,OAAO,QAAQ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"resource-command.factory.js","sourceRoot":"","sources":["../../src/commands/resource-command.factory.ts"],"names":[],"mappings":"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"}
|