@observeone/cli 1.13.0 → 1.14.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 CHANGED
File without changes
package/dist/README.md CHANGED
File without changes
@@ -1 +1 @@
1
- {"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.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;AAqFnE,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CA0bT"}
1
+ {"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/commands/apply.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;AAyHnE,wBAAgB,kBAAkB,CAChC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAygBT"}
@@ -3,6 +3,35 @@ import { readFileSync, existsSync } from 'fs';
3
3
  import ora from 'ora';
4
4
  import { deepEqual, normalizeResource, diffObjects } from '../utils/deep-equal.js';
5
5
  import { normalizeApplyConfig } from '../utils/apply-config.js';
6
+ // Resources returned by the GET endpoints carry alert channels as a
7
+ // populated `channels` array; the create/update wire format expects
8
+ // `channel_ids` (array of numeric IDs). Normalize both sides to
9
+ // channel_ids for diff + update payloads.
10
+ const extractChannelIds = (r) => {
11
+ if (Array.isArray(r.channels) && r.channels.length > 0) {
12
+ return r.channels.map((c) => c.id).sort((a, b) => a - b);
13
+ }
14
+ if (Array.isArray(r.channel_ids)) {
15
+ return [...r.channel_ids].sort((a, b) => a - b);
16
+ }
17
+ return [];
18
+ };
19
+ // GET responses include DB-owned fields (id, created_at, api_check_id)
20
+ // on assertions; for diff purposes, compare only the authored shape.
21
+ const normalizeAssertions = (assertions) => {
22
+ if (!Array.isArray(assertions))
23
+ return [];
24
+ return assertions.map((a) => {
25
+ const out = {
26
+ type: a.type,
27
+ operator: a.operator,
28
+ value: a.value,
29
+ };
30
+ if (a.path !== null && a.path !== undefined)
31
+ out.path = a.path;
32
+ return out;
33
+ });
34
+ };
6
35
  const chunkArray = (arr, size) => {
7
36
  const result = [];
8
37
  for (let i = 0; i < arr.length; i += size) {
@@ -135,7 +164,12 @@ export function createApplyCommand(configService, apiClient, outputService) {
135
164
  if (config.monitors && Array.isArray(config.monitors)) {
136
165
  logProgress('Fetching existing monitors...');
137
166
  const existingMonitors = await apiClient.getUrlMonitors();
138
- const existingByName = new Map(existingMonitors.map((m) => [m.name, m]));
167
+ // Detail-hydrate so the existing map has channels populated for diff.
168
+ const hydratedMonitors = await Promise.all(existingMonitors.map((m) => apiClient
169
+ .getUrlMonitor(m.id)
170
+ .then((detail) => ({ ...m, ...detail }))
171
+ .catch(() => m)));
172
+ const existingByName = new Map(hydratedMonitors.map((m) => [m.name, m]));
139
173
  const chunks = chunkArray(config.monitors, 5);
140
174
  for (let i = 0; i < chunks.length; i++) {
141
175
  const chunk = chunks[i];
@@ -146,21 +180,27 @@ export function createApplyCommand(configService, apiClient, outputService) {
146
180
  }
147
181
  const existing = existingByName.get(monitorConfig.name);
148
182
  if (existing) {
183
+ const localChannelIds = extractChannelIds(monitorConfig);
184
+ const remoteChannelIds = extractChannelIds(existing);
149
185
  // Normalize both objects for comparison
150
186
  const normalizedLocal = normalizeResource({
151
187
  name: monitorConfig.name,
188
+ description: monitorConfig.description ?? '',
152
189
  url: monitorConfig.url,
153
190
  timeout_ms: monitorConfig.timeout_ms || 30000,
154
191
  interval: monitorConfig.interval,
155
192
  alert_on_failure: monitorConfig.alert_on_failure ?? true,
156
- }, { timeout_ms: 30000, alert_on_failure: true });
193
+ channel_ids: localChannelIds,
194
+ }, { timeout_ms: 30000, alert_on_failure: true, description: '' });
157
195
  const normalizedRemote = normalizeResource({
158
196
  name: existing.name,
197
+ description: existing.description ?? '',
159
198
  url: existing.url,
160
199
  timeout_ms: existing.timeout_ms || 30000,
161
200
  interval: existing.interval,
162
201
  alert_on_failure: existing.alert_on_failure ?? true,
163
- }, { timeout_ms: 30000, alert_on_failure: true });
202
+ channel_ids: remoteChannelIds,
203
+ }, { timeout_ms: 30000, alert_on_failure: true, description: '' });
164
204
  // Skip update if no changes
165
205
  if (deepEqual(normalizedLocal, normalizedRemote)) {
166
206
  logProgress(`Monitor unchanged: ${monitorConfig.name}`);
@@ -180,10 +220,12 @@ export function createApplyCommand(configService, apiClient, outputService) {
180
220
  logProgress(`Updating monitor: ${monitorConfig.name}`);
181
221
  await apiClient.updateUrlMonitor(existing.id, {
182
222
  name: monitorConfig.name || existing.name,
223
+ description: monitorConfig.description ?? existing.description,
183
224
  url: monitorConfig.url || existing.url,
184
225
  timeout_ms: monitorConfig.timeout_ms || existing.timeout_ms || 30000,
185
226
  interval: monitorConfig.interval || existing.interval,
186
227
  alert_on_failure: monitorConfig.alert_on_failure ?? existing.alert_on_failure ?? true,
228
+ channel_ids: localChannelIds,
187
229
  });
188
230
  }
189
231
  else {
@@ -220,7 +262,15 @@ export function createApplyCommand(configService, apiClient, outputService) {
220
262
  if (config.api_checks && Array.isArray(config.api_checks)) {
221
263
  logProgress('Fetching existing API checks...');
222
264
  const existingChecks = await apiClient.getApiChecks();
223
- const existingByName = new Map(existingChecks.map((c) => [c.name, c]));
265
+ // Detail-hydrate for channel_ids (list omits the channels join).
266
+ const hydratedChecks = await Promise.all(existingChecks.map((c) => apiClient
267
+ .getApiCheck(c.id)
268
+ .then((resp) => {
269
+ const nested = resp.apiCheck;
270
+ return nested ? { ...c, ...nested } : { ...c, ...resp };
271
+ })
272
+ .catch(() => c)));
273
+ const existingByName = new Map(hydratedChecks.map((c) => [c.name, c]));
224
274
  const chunks = chunkArray(config.api_checks, 5);
225
275
  for (let i = 0; i < chunks.length; i++) {
226
276
  const chunk = chunks[i];
@@ -231,21 +281,53 @@ export function createApplyCommand(configService, apiClient, outputService) {
231
281
  }
232
282
  const existing = existingByName.get(checkConfig.name);
233
283
  if (existing) {
284
+ const localChannelIds = extractChannelIds(checkConfig);
285
+ const remoteChannelIds = extractChannelIds(existing);
286
+ const localAssertions = normalizeAssertions(checkConfig.assertions);
287
+ const remoteAssertions = normalizeAssertions(existing.assertions);
234
288
  // Normalize both objects for comparison
235
289
  const normalizedLocal = normalizeResource({
236
290
  name: checkConfig.name,
291
+ description: checkConfig.description ?? '',
237
292
  url: checkConfig.url,
238
293
  method: checkConfig.method?.toUpperCase() || 'GET',
294
+ headers: checkConfig.headers ?? {},
295
+ body: checkConfig.body ?? '',
296
+ cron_expression: checkConfig.cron_expression ??
297
+ checkConfig.interval ??
298
+ null,
239
299
  timeout_ms: checkConfig.timeout_ms || 30000,
240
300
  alert_on_failure: checkConfig.alert_on_failure ?? true,
241
- }, { timeout_ms: 30000, alert_on_failure: true, method: 'GET' });
301
+ channel_ids: localChannelIds,
302
+ assertions: localAssertions,
303
+ }, {
304
+ timeout_ms: 30000,
305
+ alert_on_failure: true,
306
+ method: 'GET',
307
+ description: '',
308
+ body: '',
309
+ });
242
310
  const normalizedRemote = normalizeResource({
243
311
  name: existing.name,
312
+ description: existing.description ?? '',
244
313
  url: existing.url,
245
314
  method: existing.method?.toUpperCase() || 'GET',
315
+ headers: existing.headers ?? {},
316
+ body: existing.body ?? '',
317
+ cron_expression: existing.cron_expression ??
318
+ existing.interval ??
319
+ null,
246
320
  timeout_ms: existing.timeout_ms || 30000,
247
321
  alert_on_failure: existing.alert_on_failure ?? true,
248
- }, { timeout_ms: 30000, alert_on_failure: true, method: 'GET' });
322
+ channel_ids: remoteChannelIds,
323
+ assertions: remoteAssertions,
324
+ }, {
325
+ timeout_ms: 30000,
326
+ alert_on_failure: true,
327
+ method: 'GET',
328
+ description: '',
329
+ body: '',
330
+ });
249
331
  // Skip update if no changes
250
332
  if (deepEqual(normalizedLocal, normalizedRemote)) {
251
333
  logProgress(`API check unchanged: ${checkConfig.name}`);
@@ -263,12 +345,27 @@ export function createApplyCommand(configService, apiClient, outputService) {
263
345
  return;
264
346
  }
265
347
  logProgress(`Updating API check: ${checkConfig.name}`);
348
+ const effectiveBody = checkConfig.body ?? existing.body;
349
+ const effectiveCron = checkConfig.cron_expression ??
350
+ checkConfig.interval ??
351
+ existing.cron_expression;
266
352
  await apiClient.updateApiCheck(existing.id, {
267
353
  name: checkConfig.name || existing.name,
354
+ description: checkConfig.description ?? existing.description,
268
355
  url: checkConfig.url || existing.url,
269
356
  method: checkConfig.method?.toUpperCase() || existing.method || 'GET',
357
+ headers: checkConfig.headers ?? existing.headers,
358
+ // Backend zod rejects null for body/cron_expression;
359
+ // omit when the value would be null so the schema's
360
+ // optional/nullable rules accept the payload.
361
+ ...(effectiveBody !== null &&
362
+ effectiveBody !== undefined && { body: effectiveBody }),
363
+ ...(effectiveCron !== null &&
364
+ effectiveCron !== undefined && { cron_expression: effectiveCron }),
270
365
  timeout_ms: checkConfig.timeout_ms || existing.timeout_ms || 30000,
271
366
  alert_on_failure: checkConfig.alert_on_failure ?? existing.alert_on_failure ?? true,
367
+ channel_ids: localChannelIds,
368
+ assertions: checkConfig.assertions ?? existing.assertions,
272
369
  });
273
370
  }
274
371
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apply.js","sourceRoot":"","sources":["../../src/commands/apply.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;AAUnE,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAyFT"}
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,CA2KT"}
@@ -17,40 +17,97 @@ export function createExportCommand(configService, apiClient, outputService) {
17
17
  process.exit(1);
18
18
  }
19
19
  outputService.progress('Fetching existing resources from backend...');
20
- // Fetch all resources
21
- const [monitors, apiChecks, heartbeats] = await Promise.all([
20
+ // Fetch list endpoints first, then hydrate with per-resource detail calls
21
+ // so we capture fields the list omits (notably `channels` and `interval`
22
+ // on monitors). List-only export would silently drop those fields.
23
+ const [monitorList, apiCheckList, heartbeats] = await Promise.all([
22
24
  apiClient.getUrlMonitors().catch(() => []),
23
25
  apiClient.getApiChecks().catch(() => []),
24
26
  apiClient.getHeartbeats().catch(() => []),
25
27
  ]);
28
+ const [monitors, apiChecks] = await Promise.all([
29
+ Promise.all(monitorList.map((m) => apiClient
30
+ .getUrlMonitor(m.id)
31
+ .then((detail) => ({ ...m, ...detail }))
32
+ .catch(() => m))),
33
+ Promise.all(apiCheckList.map((c) => apiClient
34
+ .getApiCheck(c.id)
35
+ .then((resp) => {
36
+ // getApiCheck returns { apiCheck, ...stats }; merge the nested shape.
37
+ const nested = resp.apiCheck;
38
+ return nested ? { ...c, ...nested } : { ...c, ...resp };
39
+ })
40
+ .catch(() => c))),
41
+ ]);
26
42
  const config = {};
43
+ // Helper: GET responses populate `channels` as full objects;
44
+ // CREATE/UPDATE wire format expects `channel_ids` as numeric IDs.
45
+ const extractChannelIds = (r) => {
46
+ if (Array.isArray(r.channels) && r.channels.length > 0) {
47
+ return r.channels.map((c) => c.id);
48
+ }
49
+ return r.channel_ids;
50
+ };
51
+ // Helper: GET responses include DB-owned fields (id, created_at,
52
+ // api_check_id) on assertions; apply wire format takes only the
53
+ // authored fields.
54
+ const stripAssertionDbFields = (assertions) => {
55
+ if (!Array.isArray(assertions) || assertions.length === 0)
56
+ return undefined;
57
+ return assertions.map((a) => {
58
+ const { type, operator, path, value } = a;
59
+ const authored = { type, operator, value };
60
+ if (path !== null && path !== undefined)
61
+ authored.path = path;
62
+ return authored;
63
+ });
64
+ };
27
65
  // 1. Map Monitors
28
66
  if (monitors.length > 0) {
29
- config.monitors = monitors.map((m) => ({
30
- name: m.name,
31
- url: m.url,
32
- interval: m.interval,
33
- timeout_ms: m.timeout_ms,
34
- alert_on_failure: m.alert_on_failure,
35
- }));
67
+ config.monitors = monitors.map((m) => {
68
+ const extended = m;
69
+ const channel_ids = extractChannelIds(extended);
70
+ return {
71
+ name: m.name,
72
+ ...(m.description !== undefined && { description: m.description }),
73
+ url: m.url,
74
+ interval: m.interval || extended.cron_expression,
75
+ timeout_ms: m.timeout_ms,
76
+ alert_on_failure: m.alert_on_failure,
77
+ ...(channel_ids !== undefined && channel_ids.length > 0 && { channel_ids }),
78
+ };
79
+ });
36
80
  }
37
81
  // 2. Map API Checks
38
82
  if (apiChecks.length > 0) {
39
- config.api_checks = apiChecks.map((c) => ({
40
- name: c.name,
41
- url: c.url,
42
- method: c.method,
43
- timeout_ms: c.timeout_ms,
44
- alert_on_failure: c.alert_on_failure,
45
- }));
83
+ config.api_checks = apiChecks.map((c) => {
84
+ const extended = c;
85
+ const channel_ids = extractChannelIds(extended);
86
+ const assertions = stripAssertionDbFields(c.assertions);
87
+ return {
88
+ name: c.name,
89
+ ...(c.description !== undefined && { description: c.description }),
90
+ url: c.url,
91
+ method: c.method,
92
+ ...(c.headers !== undefined && { headers: c.headers }),
93
+ ...(c.body !== undefined && c.body !== null && { body: c.body }),
94
+ timeout_ms: c.timeout_ms,
95
+ ...(c.cron_expression !== undefined || extended.interval !== undefined
96
+ ? { cron_expression: c.cron_expression || extended.interval }
97
+ : {}),
98
+ alert_on_failure: c.alert_on_failure,
99
+ ...(channel_ids !== undefined && channel_ids.length > 0 && { channel_ids }),
100
+ ...(assertions !== undefined && { assertions }),
101
+ };
102
+ });
46
103
  }
47
104
  // 3. Map Heartbeats
48
105
  if (heartbeats.length > 0) {
49
106
  config.heartbeats = heartbeats.map((h) => ({
50
107
  name: h.name,
108
+ ...(h.description !== undefined && { description: h.description }),
51
109
  period: h.period,
52
110
  grace_period: h.grace_period,
53
- description: h.description,
54
111
  }));
55
112
  }
56
113
  // Write to file
@@ -1 +1 @@
1
- {"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/commands/export.ts"],"names":[],"mappings":"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"}
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;AAKnE;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,cAAc,EAC7B,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,cAAc,GAC5B,OAAO,CAkGT"}
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,CA8GT"}
@@ -24,16 +24,20 @@ export function createHeartbeatCommand(configService, apiClient, outputService)
24
24
  createCommandSetup: (cmd) => {
25
25
  cmd
26
26
  .option('-n, --name <name>', 'Heartbeat name')
27
+ .option('-d, --description <description>', 'Heartbeat description')
27
28
  .option('-p, --period <seconds>', 'Expected period in seconds')
28
29
  .option('-g, --grace <seconds>', 'Grace period in seconds');
29
30
  },
30
31
  updateCommandSetup: (cmd) => {
31
32
  cmd
32
33
  .option('-n, --name <name>', 'Heartbeat name')
33
- .option('-p, --period <seconds>', 'Expected period in seconds');
34
+ .option('-d, --description <description>', 'Heartbeat description')
35
+ .option('-p, --period <seconds>', 'Expected period in seconds')
36
+ .option('-g, --grace <seconds>', 'Grace period in seconds');
34
37
  },
35
38
  createPrompts: async (options) => {
36
39
  let name = options.name;
40
+ const description = options.description;
37
41
  let period = options.period;
38
42
  let grace = options.grace;
39
43
  if (!name) {
@@ -65,14 +69,16 @@ export function createHeartbeatCommand(configService, apiClient, outputService)
65
69
  name,
66
70
  period: typeof period === 'string' ? parseInt(period) : period || 300,
67
71
  grace_period: typeof grace === 'string' ? parseInt(grace) : grace || 60,
68
- description: 'Created via CLI',
72
+ description: description ?? '',
69
73
  };
70
74
  },
71
75
  updatePrompts: async (id, options, existing) => {
72
76
  const name = options.name;
77
+ const description = options.description;
73
78
  const period = options.period;
74
- if (!name && !period) {
75
- outputService.error('Please provide at least one field to update (--name or --period).');
79
+ const grace = options.grace;
80
+ if (!name && description === undefined && !period && !grace) {
81
+ outputService.error('Please provide at least one field to update (--name, --description, --period, or --grace).');
76
82
  process.exit(1);
77
83
  }
78
84
  return {
@@ -82,8 +88,12 @@ export function createHeartbeatCommand(configService, apiClient, outputService)
82
88
  ? parseInt(period)
83
89
  : period
84
90
  : existing.period,
85
- description: existing.description || 'Updated via CLI',
86
- grace_period: existing.grace_period || 60,
91
+ description: description ?? existing.description ?? '',
92
+ grace_period: grace
93
+ ? typeof grace === 'string'
94
+ ? parseInt(grace)
95
+ : grace
96
+ : (existing.grace_period ?? 60),
87
97
  };
88
98
  },
89
99
  });
@@ -1 +1 @@
1
- {"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/commands/heartbeat.ts"],"names":[],"mappings":"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"}
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@observeone/cli",
3
- "version": "1.13.0",
3
+ "version": "1.14.0",
4
4
  "type": "module",
5
5
  "description": "ObserveOne CLI - AI-powered website monitoring and testing from the command line",
6
6
  "main": "dist/index.js",
@@ -1 +1 @@
1
- {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAkFlD,CAAC;AAQF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAG1E;AAED,eAAO,MAAM,aAAa,UAAuB,CAAC;AA8BlD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAarF"}
1
+ {"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAoFlD,CAAC;AAQF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAG1E;AAED,eAAO,MAAM,aAAa,UAAuB,CAAC;AA8BlD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAarF"}
@@ -5,10 +5,11 @@ export const schemas = {
5
5
  template: {
6
6
  name: 'My Monitor',
7
7
  url: 'https://example.com',
8
- cron_expression: '*/5 * * * *',
8
+ interval: '*/5 * * * *',
9
9
  timeout_ms: 30000,
10
10
  alert_on_failure: true,
11
11
  description: '',
12
+ channel_ids: [],
12
13
  },
13
14
  },
14
15
  check: {
@@ -25,6 +26,7 @@ export const schemas = {
25
26
  body: '',
26
27
  assertions: [],
27
28
  description: '',
29
+ channel_ids: [],
28
30
  },
29
31
  },
30
32
  heartbeat: {
@@ -1 +1 @@
1
- {"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/utils/schemas.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,28 +1,12 @@
1
1
  {
2
2
  "name": "@observeone/cli",
3
- "version": "1.13.0",
3
+ "version": "1.14.0",
4
4
  "type": "module",
5
5
  "description": "ObserveOne CLI - AI-powered website monitoring and testing from the command line",
6
6
  "main": "dist/index.js",
7
7
  "bin": {
8
8
  "obs": "dist/index.js"
9
9
  },
10
- "scripts": {
11
- "start": "node server.js",
12
- "start:dev": "tsx src/index.ts",
13
- "build": "node scripts/build.js",
14
- "dev": "tsx src/index.ts",
15
- "check": "tsc --noEmit",
16
- "lint": "eslint \"src/**/*.ts\" \"e2e/**/*.ts\"",
17
- "format": "prettier --write \"src/**/*.ts\" \"e2e/**/*.ts\"",
18
- "format:check": "prettier --check \"src/**/*.ts\" \"e2e/**/*.ts\"",
19
- "test": "vitest run && tsx e2e/run-tests.ts",
20
- "test:unit": "vitest run",
21
- "test:e2e": "tsx e2e/run-tests.ts",
22
- "knip": "knip",
23
- "prepublishOnly": "npm run build",
24
- "prepare": "husky"
25
- },
26
10
  "keywords": [
27
11
  "observeone",
28
12
  "obs",
@@ -68,5 +52,19 @@
68
52
  ],
69
53
  "lint-staged": {
70
54
  "*.ts": "prettier --write"
55
+ },
56
+ "scripts": {
57
+ "start": "node server.js",
58
+ "start:dev": "tsx src/index.ts",
59
+ "build": "node scripts/build.js",
60
+ "dev": "tsx src/index.ts",
61
+ "check": "tsc --noEmit",
62
+ "lint": "eslint \"src/**/*.ts\" \"e2e/**/*.ts\"",
63
+ "format": "prettier --write \"src/**/*.ts\" \"e2e/**/*.ts\"",
64
+ "format:check": "prettier --check \"src/**/*.ts\" \"e2e/**/*.ts\"",
65
+ "test": "vitest run && tsx e2e/run-tests.ts",
66
+ "test:unit": "vitest run",
67
+ "test:e2e": "tsx e2e/run-tests.ts",
68
+ "knip": "knip"
71
69
  }
72
- }
70
+ }