@sitepong/cli 0.1.30 → 0.1.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/client/base.js +6 -2
- package/dist/client/base.js.map +1 -1
- package/dist/client/hosting.js +3 -2
- package/dist/client/hosting.js.map +1 -1
- package/dist/commands/alerts/alerts.test.js +55 -0
- package/dist/commands/alerts/alerts.test.js.map +1 -0
- package/dist/commands/analytics/analytics.test.js +29 -33
- package/dist/commands/analytics/analytics.test.js.map +1 -1
- package/dist/commands/analytics/index.js +33 -7
- package/dist/commands/analytics/index.js.map +1 -1
- package/dist/commands/billing/billing.test.js +49 -9
- package/dist/commands/billing/billing.test.js.map +1 -1
- package/dist/commands/billing/index.js +29 -8
- package/dist/commands/billing/index.js.map +1 -1
- package/dist/commands/builds/builds.test.js +111 -28
- package/dist/commands/builds/builds.test.js.map +1 -1
- package/dist/commands/builds/index.js +113 -47
- package/dist/commands/builds/index.js.map +1 -1
- package/dist/commands/errors/errors.test.js +88 -47
- package/dist/commands/errors/errors.test.js.map +1 -1
- package/dist/commands/errors/index.js +112 -60
- package/dist/commands/errors/index.js.map +1 -1
- package/dist/commands/experiments/experiments.test.js +67 -16
- package/dist/commands/experiments/experiments.test.js.map +1 -1
- package/dist/commands/experiments/index.js +127 -30
- package/dist/commands/experiments/index.js.map +1 -1
- package/dist/commands/flags/flags.test.js +47 -14
- package/dist/commands/flags/flags.test.js.map +1 -1
- package/dist/commands/flags/index.js +69 -18
- package/dist/commands/flags/index.js.map +1 -1
- package/dist/commands/hosting/auth-users.js +23 -6
- package/dist/commands/hosting/auth-users.js.map +1 -1
- package/dist/commands/hosting/backups.js +33 -10
- package/dist/commands/hosting/backups.js.map +1 -1
- package/dist/commands/hosting/config.js +22 -8
- package/dist/commands/hosting/config.js.map +1 -1
- package/dist/commands/hosting/db.js +23 -4
- package/dist/commands/hosting/db.js.map +1 -1
- package/dist/commands/hosting/db.test.js +14 -6
- package/dist/commands/hosting/db.test.js.map +1 -1
- package/dist/commands/hosting/functions.js +15 -5
- package/dist/commands/hosting/functions.js.map +1 -1
- package/dist/commands/hosting/functions.test.js +17 -4
- package/dist/commands/hosting/functions.test.js.map +1 -1
- package/dist/commands/hosting/hosting-extra.test.js +23 -2
- package/dist/commands/hosting/hosting-extra.test.js.map +1 -1
- package/dist/commands/hosting/instances.js +102 -15
- package/dist/commands/hosting/instances.js.map +1 -1
- package/dist/commands/hosting/instances.test.js +33 -8
- package/dist/commands/hosting/instances.test.js.map +1 -1
- package/dist/commands/hosting/keys.js +10 -3
- package/dist/commands/hosting/keys.js.map +1 -1
- package/dist/commands/hosting/logs.js +64 -27
- package/dist/commands/hosting/logs.js.map +1 -1
- package/dist/commands/hosting/migrate.js +47 -22
- package/dist/commands/hosting/migrate.js.map +1 -1
- package/dist/commands/hosting/migrate.test.js +58 -0
- package/dist/commands/hosting/migrate.test.js.map +1 -0
- package/dist/commands/hosting/remaining.test.js +41 -8
- package/dist/commands/hosting/remaining.test.js.map +1 -1
- package/dist/commands/hosting/storage.js +62 -15
- package/dist/commands/hosting/storage.js.map +1 -1
- package/dist/commands/hosting/storage.test.js +38 -8
- package/dist/commands/hosting/storage.test.js.map +1 -1
- package/dist/commands/monitoring/index.js +215 -71
- package/dist/commands/monitoring/index.js.map +1 -1
- package/dist/commands/monitoring/monitoring.test.js +140 -60
- package/dist/commands/monitoring/monitoring.test.js.map +1 -1
- package/dist/commands/ota/index.js +99 -41
- package/dist/commands/ota/index.js.map +1 -1
- package/dist/commands/ota/ota.test.js +58 -18
- package/dist/commands/ota/ota.test.js.map +1 -1
- package/dist/commands/patrol/index.js +70 -18
- package/dist/commands/patrol/index.js.map +1 -1
- package/dist/commands/patrol/patrol.test.js +68 -10
- package/dist/commands/patrol/patrol.test.js.map +1 -1
- package/dist/commands/push/index.js +54 -19
- package/dist/commands/push/index.js.map +1 -1
- package/dist/commands/push/push.test.js +55 -11
- package/dist/commands/push/push.test.js.map +1 -1
- package/dist/commands/replays/index.js +34 -18
- package/dist/commands/replays/index.js.map +1 -1
- package/dist/commands/replays/replays.test.js +43 -13
- package/dist/commands/replays/replays.test.js.map +1 -1
- package/dist/commands/serve/index.js +72 -31
- package/dist/commands/serve/index.js.map +1 -1
- package/dist/commands/serve/serve.test.js +135 -0
- package/dist/commands/serve/serve.test.js.map +1 -0
- package/dist/commands/team/index.js +15 -10
- package/dist/commands/team/index.js.map +1 -1
- package/dist/commands/team/team.test.js +16 -8
- package/dist/commands/team/team.test.js.map +1 -1
- package/dist/commands/workflows/index.js +190 -50
- package/dist/commands/workflows/index.js.map +1 -1
- package/dist/commands/workflows/workflows.test.js +149 -39
- package/dist/commands/workflows/workflows.test.js.map +1 -1
- package/package.json +1 -1
package/dist/client/base.js
CHANGED
|
@@ -35,7 +35,11 @@ export class SitePongClient {
|
|
|
35
35
|
// FormData bodies (multipart uploads) set their own boundary header;
|
|
36
36
|
// everything else is JSON unless the caller chose a Content-Type.
|
|
37
37
|
const isForm = typeof FormData !== 'undefined' && opts.body instanceof FormData;
|
|
38
|
-
|
|
38
|
+
// Raw bytes (a file upload) go as they are.
|
|
39
|
+
const isBinary = opts.body instanceof Uint8Array ||
|
|
40
|
+
opts.body instanceof ArrayBuffer ||
|
|
41
|
+
(typeof Blob !== 'undefined' && opts.body instanceof Blob);
|
|
42
|
+
if (opts.body && !isForm && !isBinary && !headers['Content-Type']) {
|
|
39
43
|
headers['Content-Type'] = 'application/json';
|
|
40
44
|
}
|
|
41
45
|
const verbose = process.argv.includes('--verbose');
|
|
@@ -46,7 +50,7 @@ export class SitePongClient {
|
|
|
46
50
|
method,
|
|
47
51
|
headers,
|
|
48
52
|
body: opts.body
|
|
49
|
-
? isForm
|
|
53
|
+
? isForm || isBinary
|
|
50
54
|
? opts.body
|
|
51
55
|
: typeof opts.body === 'string'
|
|
52
56
|
? opts.body
|
package/dist/client/base.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/client/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,OAAO,QAAS,SAAQ,KAAK;IACd;IAAwC;IAA3D,YAAmB,MAAc,EAAE,OAAe,EAAS,IAAc;QACvE,KAAK,CAAC,OAAO,CAAC,CAAC;QADE,WAAM,GAAN,MAAM,CAAQ;QAA0B,SAAI,GAAJ,IAAI,CAAU;QAEvE,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IACzB,CAAC;CACF;AAUD,MAAM,OAAO,cAAc;IAEf;IACA;IACA;IAHV,YACU,OAAe,EACf,WAAkC,cAAc,EAChD,iBAAyC,EAAE;QAF3C,YAAO,GAAP,OAAO,CAAQ;QACf,aAAQ,GAAR,QAAQ,CAAwC;QAChD,mBAAc,GAAd,cAAc,CAA6B;IAClD,CAAC;IAEJ,KAAK,CAAC,OAAO,CAAU,MAAc,EAAE,IAAY,EAAE,OAAoB,EAAE;QACzE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;gBAChD,IAAI,CAAC,KAAK,SAAS;oBAAE,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAClD,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAA2B,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAEpF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,KAAK,EAAE,CAAC;QAC/C,CAAC;QAED,qEAAqE;QACrE,kEAAkE;QAClE,MAAM,MAAM,GAAG,OAAO,QAAQ,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,YAAY,QAAQ,CAAC;QAChF,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/client/base.ts"],"names":[],"mappings":"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"}
|
package/dist/client/hosting.js
CHANGED
|
@@ -52,8 +52,9 @@ export async function getInstanceServiceKey(instanceId) {
|
|
|
52
52
|
console.error(`Instance ${id} has no management token — cannot call management API.`);
|
|
53
53
|
process.exit(1);
|
|
54
54
|
}
|
|
55
|
-
//
|
|
56
|
-
|
|
55
|
+
// Cache only when no instance is linked yet, so naming another instance
|
|
56
|
+
// never replaces the one `sitepong hosting link` saved.
|
|
57
|
+
if (orgCtx && (!cachedId || cachedId === id)) {
|
|
57
58
|
orgCtx.instance_id = id;
|
|
58
59
|
orgCtx.instance_service_key = key;
|
|
59
60
|
writeOrgContext(orgCtx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/client/hosting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErE,IAAI,OAAO,GAA0B,IAAI,CAAC;AAE1C,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wEAAwE;QACxE,iDAAiD;QACjD,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1D,OAAO,GAAG,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,UAAmB;IAC7D,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,EAAE,oBAAoB,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,EAAE,WAAW,CAAC;IAErC,+FAA+F;IAC/F,IAAI,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5E,+DAA+D;IAC/D,MAAM,EAAE,GAAG,UAAU,IAAI,QAAQ,CAAC;IAClC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,CAAC,KAAK,CAAC,wGAAwG,CAAC,CAAC;QACxH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAM,0BAA0B,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,QAAQ,EAAE,oBAAoB,IAAI,QAAQ,EAAE,oBAAoB,CAAC;IAC7E,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,wDAAwD,CAAC,CAAC;QACtF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"hosting.js","sourceRoot":"","sources":["../../src/client/hosting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErE,IAAI,OAAO,GAA0B,IAAI,CAAC;AAE1C,MAAM,UAAU,aAAa;IAC3B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,wEAAwE;QACxE,iDAAiD;QACjD,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,OAAO,GAA2B,EAAE,CAAC;QAC3C,IAAI,GAAG,CAAC,MAAM;YAAE,OAAO,CAAC,mBAAmB,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC;QAC1D,OAAO,GAAG,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAAkB;IACjD,OAAO,IAAI,cAAc,CAAC,aAAa,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,UAAU,CAAC,CAAC;AACrE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,UAAmB;IAC7D,MAAM,GAAG,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,EAAE,oBAAoB,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,EAAE,WAAW,CAAC;IAErC,+FAA+F;IAC/F,IAAI,SAAS,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,KAAK,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IAE5E,+DAA+D;IAC/D,MAAM,EAAE,GAAG,UAAU,IAAI,QAAQ,CAAC;IAClC,IAAI,CAAC,EAAE,EAAE,CAAC;QACR,OAAO,CAAC,KAAK,CAAC,wGAAwG,CAAC,CAAC;QACxH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAM,0BAA0B,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,CAAC;IACpC,MAAM,GAAG,GAAG,QAAQ,EAAE,oBAAoB,IAAI,QAAQ,EAAE,oBAAoB,CAAC;IAC7E,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,wDAAwD,CAAC,CAAC;QACtF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,wEAAwE;IACxE,wDAAwD;IACxD,IAAI,MAAM,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,KAAK,EAAE,CAAC,EAAE,CAAC;QAC7C,MAAM,CAAC,WAAW,GAAG,EAAE,CAAC;QACxB,MAAM,CAAC,oBAAoB,GAAG,GAAG,CAAC;QAClC,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { Command } from 'commander';
|
|
3
|
+
import { setupTestEnv, cleanupTestEnv, mockFetch, captureConsole } from '../../__tests__/helpers.js';
|
|
4
|
+
import { registerAlerts } from './index.js';
|
|
5
|
+
const origArgv = process.argv;
|
|
6
|
+
function createProgram() {
|
|
7
|
+
const program = new Command();
|
|
8
|
+
program.exitOverride();
|
|
9
|
+
registerAlerts(program);
|
|
10
|
+
return program;
|
|
11
|
+
}
|
|
12
|
+
// GET /api/dashboard/alerts → { data: alert_rules[] } (select *)
|
|
13
|
+
const RULE = {
|
|
14
|
+
id: 'r1', organization_id: 'org-123', project_id: 'proj-456', name: 'Error spike', trigger_type: 'error_rate',
|
|
15
|
+
threshold: 2, comparison: 'gte', time_window_minutes: 5, enabled: true, state: 'alarm', last_value: 3.5,
|
|
16
|
+
last_evaluated_at: '2026-10-30T12:00:00Z',
|
|
17
|
+
};
|
|
18
|
+
describe('alerts', () => {
|
|
19
|
+
beforeEach(() => { setupTestEnv(); });
|
|
20
|
+
afterEach(() => { process.argv = origArgv; cleanupTestEnv(); vi.restoreAllMocks(); });
|
|
21
|
+
it('lists rules for the project with state and last value', async () => {
|
|
22
|
+
process.argv = ['node', 'test', '--format', 'table'];
|
|
23
|
+
const fetchMock = mockFetch({ data: [RULE, { ...RULE, id: 'r2', name: 'Off', enabled: false, state: 'ok', last_value: null }] });
|
|
24
|
+
const con = captureConsole();
|
|
25
|
+
await createProgram().parseAsync(['node', 'test', 'alerts', 'list']);
|
|
26
|
+
con.restore();
|
|
27
|
+
const url = new URL(fetchMock.mock.calls[0][0]);
|
|
28
|
+
expect(url.pathname).toBe('/api/dashboard/alerts');
|
|
29
|
+
expect(url.searchParams.get('organization_id')).toBe('org-123');
|
|
30
|
+
expect(url.searchParams.get('project_id')).toBe('proj-456');
|
|
31
|
+
const out = con.logs.join('\n');
|
|
32
|
+
expect(out).toContain('3.5 errors/min');
|
|
33
|
+
expect(out).toContain('alarm');
|
|
34
|
+
expect(out).toContain('disabled');
|
|
35
|
+
expect(out).toContain('5m');
|
|
36
|
+
});
|
|
37
|
+
it('lists history with rule_id and limit, printing the flattened rule_name', async () => {
|
|
38
|
+
process.argv = ['node', 'test', '--format', 'table'];
|
|
39
|
+
// GET /api/dashboard/alerts/history → rows flattened with rule_name / trigger_type
|
|
40
|
+
const fetchMock = mockFetch({
|
|
41
|
+
data: [{ id: 'h1', alert_rule_id: 'r1', project_id: 'proj-456', triggered_at: '2026-10-30T12:00:00Z', trigger_value: 3.5, state: 'alarm', message: 'Error spike', acknowledged_at: null, rule_name: 'Error spike', trigger_type: 'error_rate' }],
|
|
42
|
+
});
|
|
43
|
+
const con = captureConsole();
|
|
44
|
+
await createProgram().parseAsync(['node', 'test', 'alerts', 'history', '--rule', 'r1', '--limit', '10']);
|
|
45
|
+
con.restore();
|
|
46
|
+
const url = new URL(fetchMock.mock.calls[0][0]);
|
|
47
|
+
expect(url.pathname).toBe('/api/dashboard/alerts/history');
|
|
48
|
+
expect(url.searchParams.get('rule_id')).toBe('r1');
|
|
49
|
+
expect(url.searchParams.get('limit')).toBe('10');
|
|
50
|
+
const out = con.logs.join('\n');
|
|
51
|
+
expect(out).toContain('rule_name');
|
|
52
|
+
expect(out).toContain('Error spike');
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
//# sourceMappingURL=alerts.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"alerts.test.js","sourceRoot":"","sources":["../../../src/commands/alerts/alerts.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,47 +11,43 @@ function createProgram() {
|
|
|
11
11
|
describe('analytics', () => {
|
|
12
12
|
beforeEach(() => { setupTestEnv(); });
|
|
13
13
|
afterEach(() => { cleanupTestEnv(); vi.restoreAllMocks(); });
|
|
14
|
-
it('
|
|
15
|
-
const fetchMock = mockFetch(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/api/dashboard/events');
|
|
19
|
-
con.restore();
|
|
20
|
-
});
|
|
21
|
-
it('views trends', async () => {
|
|
22
|
-
const fetchMock = mockFetch([{ date: '2024-01-01', count: 50 }]);
|
|
23
|
-
const con = captureConsole();
|
|
24
|
-
await createProgram().parseAsync(['node', 'test', 'analytics', 'trends', '--event', 'signup']);
|
|
25
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/events/trends');
|
|
26
|
-
con.restore();
|
|
27
|
-
});
|
|
28
|
-
it('views funnels', async () => {
|
|
29
|
-
const fetchMock = mockFetch([{ step: 1, event: 'signup', count: 100, conversion_rate: 1 }]);
|
|
30
|
-
const con = captureConsole();
|
|
31
|
-
await createProgram().parseAsync(['node', 'test', 'analytics', 'funnels', '--steps', 'signup,checkout,purchase']);
|
|
32
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/events/funnels');
|
|
33
|
-
con.restore();
|
|
14
|
+
it('refuses a week interval for trends: the route buckets by day or hour only', async () => {
|
|
15
|
+
const fetchMock = mockFetch({});
|
|
16
|
+
await expect(createProgram().parseAsync(['node', 'test', 'analytics', 'trends', '--interval', 'week'])).rejects.toThrow(/day or hour/);
|
|
17
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
34
18
|
});
|
|
35
|
-
it('
|
|
36
|
-
const fetchMock = mockFetch([{
|
|
19
|
+
it('stats: { data: { totalEvents, uniqueVisitors, eventsByName } } with a days window', async () => {
|
|
20
|
+
const fetchMock = mockFetch({ data: { totalEvents: 2900, uniqueVisitors: 41, uniqueSessions: 77, eventsByName: [{ name: 'page', count: 2000 }], eventsByDay: [] } });
|
|
37
21
|
const con = captureConsole();
|
|
38
|
-
await createProgram().parseAsync(['node', 'test', 'analytics', '
|
|
39
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/events/paths');
|
|
22
|
+
await createProgram().parseAsync(['node', 'test', 'analytics', 'stats']);
|
|
40
23
|
con.restore();
|
|
24
|
+
const url = String(fetchMock.mock.calls[0][0]);
|
|
25
|
+
expect(url).toContain('/api/dashboard/events/stats');
|
|
26
|
+
expect(url).toContain('days=7');
|
|
27
|
+
expect(con.logs.join('\n')).toContain('2900');
|
|
41
28
|
});
|
|
42
|
-
it('
|
|
43
|
-
|
|
29
|
+
it('stats in a table names the top events', async () => {
|
|
30
|
+
mockFetch({ data: { totalEvents: 2900, uniqueVisitors: 41, uniqueSessions: 77, eventsByName: [{ name: 'page', count: 2000 }], eventsByDay: [] } });
|
|
31
|
+
const argv = process.argv;
|
|
32
|
+
process.argv = ['node', 'test', '--format', 'table'];
|
|
44
33
|
const con = captureConsole();
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
34
|
+
try {
|
|
35
|
+
await createProgram().parseAsync(['node', 'test', 'analytics', 'stats']);
|
|
36
|
+
}
|
|
37
|
+
finally {
|
|
38
|
+
con.restore();
|
|
39
|
+
process.argv = argv;
|
|
40
|
+
}
|
|
41
|
+
expect(con.logs.join('\n')).toContain('page 2000');
|
|
48
42
|
});
|
|
49
|
-
it('
|
|
50
|
-
const fetchMock = mockFetch({
|
|
43
|
+
it('retention passes --event through', async () => {
|
|
44
|
+
const fetchMock = mockFetch({ data: { cohorts: [], periods: [] } });
|
|
51
45
|
const con = captureConsole();
|
|
52
|
-
await createProgram().parseAsync(['node', 'test', 'analytics', '
|
|
53
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/events/stats');
|
|
46
|
+
await createProgram().parseAsync(['node', 'test', 'analytics', 'retention', '--event', 'purchase', '--period', 'day']);
|
|
54
47
|
con.restore();
|
|
48
|
+
const url = String(fetchMock.mock.calls[0][0]);
|
|
49
|
+
expect(url).toContain('event=purchase');
|
|
50
|
+
expect(url).toContain('period=day');
|
|
55
51
|
});
|
|
56
52
|
// The API's real envelopes. The tests above mock bare arrays, which no
|
|
57
53
|
// dashboard route returns, and that is how `analytics events` and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics.test.js","sourceRoot":"","sources":["../../../src/commands/analytics/analytics.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,SAAS,aAAa;IACpB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,YAAY,EAAE,CAAC;IACvB,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC3B,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,UAAU,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7D,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"analytics.test.js","sourceRoot":"","sources":["../../../src/commands/analytics/analytics.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,10 +32,14 @@ export function registerAnalytics(parent) {
|
|
|
32
32
|
.command('trends')
|
|
33
33
|
.description('View event trends')
|
|
34
34
|
.option('--project <id>', 'Project ID')
|
|
35
|
-
.option('--event <
|
|
35
|
+
.option('--event <names>', 'Event name, or comma-separated names to compare (default: the top 10)')
|
|
36
36
|
.option('--from <date>', 'Start date (YYYY-MM-DD); the window runs to now', undefined)
|
|
37
|
-
.option('--interval <interval>', 'Bucket interval (hour|day
|
|
37
|
+
.option('--interval <interval>', 'Bucket interval (hour|day)', 'day')
|
|
38
|
+
.option('--breakdown <property>', 'Split each event by this property')
|
|
38
39
|
.action(async (opts) => {
|
|
40
|
+
if (opts.interval !== 'day' && opts.interval !== 'hour') {
|
|
41
|
+
throw new Error(`--interval must be day or hour (the trends route has no ${opts.interval} buckets)`);
|
|
42
|
+
}
|
|
39
43
|
const { apiClient } = await import('../../client/api.js');
|
|
40
44
|
const { requireContext } = await import('../../config/context.js');
|
|
41
45
|
const { output } = await import('../../output/format.js');
|
|
@@ -48,6 +52,7 @@ export function registerAnalytics(parent) {
|
|
|
48
52
|
events: opts.event,
|
|
49
53
|
days: daysSince(opts.from, 7),
|
|
50
54
|
interval: opts.interval,
|
|
55
|
+
breakdown: opts.breakdown,
|
|
51
56
|
},
|
|
52
57
|
});
|
|
53
58
|
// { data: { labels: [...], series: [{ name, data: [count per label] }] } }
|
|
@@ -108,6 +113,7 @@ export function registerAnalytics(parent) {
|
|
|
108
113
|
.option('--project <id>', 'Project ID')
|
|
109
114
|
.option('--from <date>', 'Start date (YYYY-MM-DD); the window runs to now')
|
|
110
115
|
.option('--period <period>', 'Cohort period (day|week)', 'week')
|
|
116
|
+
.option('--event <name>', 'Count a return only on this event (default: any event)')
|
|
111
117
|
.action(async (opts) => {
|
|
112
118
|
const { apiClient } = await import('../../client/api.js');
|
|
113
119
|
const { requireContext } = await import('../../config/context.js');
|
|
@@ -115,7 +121,13 @@ export function registerAnalytics(parent) {
|
|
|
115
121
|
const { listFrom, daysSince } = await import('../../client/envelope.js');
|
|
116
122
|
const ctx = requireContext(opts);
|
|
117
123
|
const data = await apiClient().get('/api/dashboard/events/retention', {
|
|
118
|
-
query: {
|
|
124
|
+
query: {
|
|
125
|
+
organization_id: ctx.org_id,
|
|
126
|
+
project_id: ctx.project_id,
|
|
127
|
+
days: daysSince(opts.from, 30),
|
|
128
|
+
period: opts.period,
|
|
129
|
+
event: opts.event,
|
|
130
|
+
},
|
|
119
131
|
});
|
|
120
132
|
output(listFrom(data, 'cohorts'), ['cohortDate', 'cohortSize', 'retention']);
|
|
121
133
|
});
|
|
@@ -123,15 +135,29 @@ export function registerAnalytics(parent) {
|
|
|
123
135
|
.command('stats')
|
|
124
136
|
.description('View summary statistics')
|
|
125
137
|
.option('--project <id>', 'Project ID')
|
|
138
|
+
.option('--from <date>', 'Start date (YYYY-MM-DD); the window runs to now (default: 7 days)')
|
|
126
139
|
.action(async (opts) => {
|
|
127
140
|
const { apiClient } = await import('../../client/api.js');
|
|
128
141
|
const { requireContext } = await import('../../config/context.js');
|
|
129
|
-
const { outputDetail } = await import('../../output/format.js');
|
|
142
|
+
const { outputDetail, getFormat } = await import('../../output/format.js');
|
|
143
|
+
const { daysSince } = await import('../../client/envelope.js');
|
|
130
144
|
const ctx = requireContext(opts);
|
|
131
|
-
|
|
132
|
-
|
|
145
|
+
// { data: { totalEvents, uniqueVisitors, uniqueSessions, eventsByName: [{ name, count }], eventsByDay: [{ date, count }] } }
|
|
146
|
+
const res = await apiClient().get('/api/dashboard/events/stats', {
|
|
147
|
+
query: { organization_id: ctx.org_id, project_id: ctx.project_id, days: daysSince(opts.from, 7) },
|
|
148
|
+
});
|
|
149
|
+
const stats = res?.data ?? {};
|
|
150
|
+
if (getFormat() === 'json') {
|
|
151
|
+
outputDetail(stats);
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
const top = stats.eventsByName ?? [];
|
|
155
|
+
outputDetail({
|
|
156
|
+
totalEvents: stats.totalEvents,
|
|
157
|
+
uniqueVisitors: stats.uniqueVisitors,
|
|
158
|
+
uniqueSessions: stats.uniqueSessions,
|
|
159
|
+
topEvents: top.slice(0, 10).map((e) => `${e.name} ${e.count}`).join(', '),
|
|
133
160
|
});
|
|
134
|
-
outputDetail(data);
|
|
135
161
|
});
|
|
136
162
|
}
|
|
137
163
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/analytics/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB,CAAC,MAAe;IAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAEjF,SAAS;SACN,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,oBAAoB,CAAC;SACjC,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC;SACtC,MAAM,CAAC,eAAe,EAAE,yBAAyB,CAAC;SAClD,MAAM,CAAC,aAAa,EAAE,uBAAuB,CAAC;SAC9C,MAAM,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC;SAC5C,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;SAChD,MAAM,CAAC,kBAAkB,EAAE,8DAA8D,CAAC;SAC1F,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC1D,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;QACnE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC1D,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;QACxE,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,SAAS,EAAE,CAAC,GAAG,CAAC,uBAAuB,EAAE;YAC1D,KAAK,EAAE;gBACL,eAAe,EAAE,GAAG,CAAC,MAAM;gBAC3B,UAAU,EAAE,GAAG,CAAC,UAAU;gBAC1B,UAAU,EAAE,IAAI,CAAC,IAAI;gBACrB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;IAC1E,CAAC,CAAC,CAAC;IAEL,SAAS;SACN,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,mBAAmB,CAAC;SAChC,MAAM,CAAC,gBAAgB,EAAE,YAAY,CAAC;SACtC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/analytics/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,29 +8,69 @@ function createProgram() {
|
|
|
8
8
|
registerBilling(program);
|
|
9
9
|
return program;
|
|
10
10
|
}
|
|
11
|
+
const origArgv = process.argv;
|
|
12
|
+
// GET /api/dashboard/usage, trimmed to the fields the command reads.
|
|
13
|
+
const USAGE = {
|
|
14
|
+
data: {
|
|
15
|
+
billing_model: 'metered',
|
|
16
|
+
has_payment_method: true,
|
|
17
|
+
period: '2026-10',
|
|
18
|
+
meters: [
|
|
19
|
+
{ meter_id: 'analytics_events', name: 'Analytics events', raw_usage: 120000, free_units: 100000, billable_units: 1, projected_cost_cents: 50, projected_cost: '$0.50', percent_of_free: 100, unit_label: 'events' },
|
|
20
|
+
],
|
|
21
|
+
current_total_cents: 50,
|
|
22
|
+
current_total: '$0.50',
|
|
23
|
+
projected_total_cents: 75,
|
|
24
|
+
projected_total: '$0.75',
|
|
25
|
+
plan: 'free',
|
|
26
|
+
},
|
|
27
|
+
};
|
|
11
28
|
describe('billing', () => {
|
|
12
29
|
beforeEach(() => { setupTestEnv(); });
|
|
13
|
-
afterEach(() => { cleanupTestEnv(); vi.restoreAllMocks(); });
|
|
14
|
-
it('shows usage', async () => {
|
|
15
|
-
|
|
30
|
+
afterEach(() => { process.argv = origArgv; cleanupTestEnv(); vi.restoreAllMocks(); });
|
|
31
|
+
it('shows usage: totals and a row per meter', async () => {
|
|
32
|
+
process.argv = ['node', 'test', '--format', 'table'];
|
|
33
|
+
const fetchMock = mockFetch(USAGE);
|
|
16
34
|
const con = captureConsole();
|
|
17
35
|
await createProgram().parseAsync(['node', 'test', 'billing', 'usage']);
|
|
18
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/usage');
|
|
19
36
|
con.restore();
|
|
37
|
+
const url = new URL(fetchMock.mock.calls[0][0]);
|
|
38
|
+
expect(url.pathname).toBe('/api/dashboard/usage');
|
|
39
|
+
expect(url.searchParams.get('organization_id')).toBe('org-123');
|
|
40
|
+
const out = con.logs.join('\n');
|
|
41
|
+
expect(out).toContain('$0.75');
|
|
42
|
+
expect(out).toContain('Analytics events');
|
|
43
|
+
expect(out).toContain('120000');
|
|
44
|
+
});
|
|
45
|
+
it('shows usage as the unwrapped data in json', async () => {
|
|
46
|
+
process.argv = ['node', 'test', '--format', 'json'];
|
|
47
|
+
mockFetch(USAGE);
|
|
48
|
+
const con = captureConsole();
|
|
49
|
+
await createProgram().parseAsync(['node', 'test', 'billing', 'usage']);
|
|
50
|
+
con.restore();
|
|
51
|
+
expect(JSON.parse(con.logs.join('\n')).meters[0].meter_id).toBe('analytics_events');
|
|
20
52
|
});
|
|
21
53
|
it('shows subscription', async () => {
|
|
22
|
-
|
|
54
|
+
process.argv = ['node', 'test', '--format', 'json'];
|
|
55
|
+
const fetchMock = mockFetch({ data: { plan: 'pro', effective_plan: 'pro', is_paid: true, subscription_status: 'active' } });
|
|
23
56
|
const con = captureConsole();
|
|
24
57
|
await createProgram().parseAsync(['node', 'test', 'billing', 'subscription']);
|
|
25
|
-
expect(fetchMock.mock.calls[0][0]).toContain('/subscription');
|
|
26
58
|
con.restore();
|
|
59
|
+
const url = new URL(fetchMock.mock.calls[0][0]);
|
|
60
|
+
expect(url.pathname).toBe('/api/billing/subscription');
|
|
61
|
+
expect(url.searchParams.get('organization_id')).toBe('org-123');
|
|
62
|
+
expect(JSON.parse(con.logs.join('\n')).subscription_status).toBe('active');
|
|
27
63
|
});
|
|
28
|
-
it('
|
|
29
|
-
const fetchMock = mockFetch({
|
|
64
|
+
it('creates a portal session with POST and prints data.portal_url', async () => {
|
|
65
|
+
const fetchMock = mockFetch({ data: { portal_url: 'https://billing.stripe.com/session/xxx' } });
|
|
30
66
|
const con = captureConsole();
|
|
31
67
|
await createProgram().parseAsync(['node', 'test', 'billing', 'portal']);
|
|
32
|
-
expect(con.logs.some(l => l.includes('billing.stripe.com'))).toBe(true);
|
|
33
68
|
con.restore();
|
|
69
|
+
const [url, init] = fetchMock.mock.calls[0];
|
|
70
|
+
expect(new URL(url).pathname).toBe('/api/billing/portal');
|
|
71
|
+
expect(init.method).toBe('POST');
|
|
72
|
+
expect(JSON.parse(init.body)).toEqual({ organization_id: 'org-123' });
|
|
73
|
+
expect(con.logs).toEqual(['https://billing.stripe.com/session/xxx']);
|
|
34
74
|
});
|
|
35
75
|
});
|
|
36
76
|
//# sourceMappingURL=billing.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"billing.test.js","sourceRoot":"","sources":["../../../src/commands/billing/billing.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE7C,SAAS,aAAa;IACpB,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;IAC9B,OAAO,CAAC,YAAY,EAAE,CAAC;IACvB,eAAe,CAAC,OAAO,CAAC,CAAC;IACzB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,UAAU,CAAC,GAAG,EAAE,GAAG,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE,GAAG,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"billing.test.js","sourceRoot":"","sources":["../../../src/commands/billing/billing.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,17 +2,35 @@ export function registerBilling(parent) {
|
|
|
2
2
|
const billing = parent.command('billing').description('Billing and usage');
|
|
3
3
|
billing
|
|
4
4
|
.command('usage')
|
|
5
|
-
.description('
|
|
5
|
+
.description('This month\'s metered usage and projected invoice')
|
|
6
6
|
.option('--org <id>', 'Organization ID')
|
|
7
7
|
.action(async (opts) => {
|
|
8
8
|
const { apiClient } = await import('../../client/api.js');
|
|
9
9
|
const { requireOrg } = await import('../../config/context.js');
|
|
10
|
-
const { outputDetail } = await import('../../output/format.js');
|
|
10
|
+
const { getFormat, formatJson, formatTable, outputDetail } = await import('../../output/format.js');
|
|
11
11
|
const ctx = requireOrg(opts);
|
|
12
|
-
|
|
12
|
+
// GET /api/dashboard/usage → { data: { period, meters: [...], current_total, projected_total, ... } }
|
|
13
|
+
const res = await apiClient().get('/api/dashboard/usage', {
|
|
13
14
|
query: { organization_id: ctx.org_id },
|
|
14
15
|
});
|
|
15
|
-
|
|
16
|
+
const data = res.data ?? {};
|
|
17
|
+
if (getFormat() === 'json') {
|
|
18
|
+
console.log(formatJson(data));
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
outputDetail({
|
|
22
|
+
period: data.period,
|
|
23
|
+
plan: data.plan,
|
|
24
|
+
billing_model: data.billing_model,
|
|
25
|
+
has_payment_method: data.has_payment_method,
|
|
26
|
+
current_total: data.current_total,
|
|
27
|
+
projected_total: data.projected_total,
|
|
28
|
+
});
|
|
29
|
+
const meters = (Array.isArray(data.meters) ? data.meters : []);
|
|
30
|
+
if (meters.length) {
|
|
31
|
+
console.log('');
|
|
32
|
+
console.log(formatTable(meters, ['name', 'raw_usage', 'free_units', 'billable_units', 'unit_label', 'percent_of_free', 'projected_cost']));
|
|
33
|
+
}
|
|
16
34
|
});
|
|
17
35
|
billing
|
|
18
36
|
.command('subscription')
|
|
@@ -30,16 +48,19 @@ export function registerBilling(parent) {
|
|
|
30
48
|
});
|
|
31
49
|
billing
|
|
32
50
|
.command('portal')
|
|
33
|
-
.description('
|
|
51
|
+
.description('Print a Stripe billing portal link (org owners and admins)')
|
|
34
52
|
.option('--org <id>', 'Organization ID')
|
|
35
53
|
.action(async (opts) => {
|
|
36
54
|
const { apiClient } = await import('../../client/api.js');
|
|
37
55
|
const { requireOrg } = await import('../../config/context.js');
|
|
38
56
|
const ctx = requireOrg(opts);
|
|
39
|
-
|
|
40
|
-
|
|
57
|
+
// POST /api/billing/portal { organization_id } → { data: { portal_url } }
|
|
58
|
+
const res = await apiClient().post('/api/billing/portal', {
|
|
59
|
+
body: { organization_id: ctx.org_id },
|
|
41
60
|
});
|
|
42
|
-
const url = data
|
|
61
|
+
const url = res?.data?.portal_url;
|
|
62
|
+
if (!url)
|
|
63
|
+
throw new Error('The billing portal did not return a link');
|
|
43
64
|
console.log(url);
|
|
44
65
|
});
|
|
45
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/billing/index.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,eAAe,CAAC,MAAe;IAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAE3E,OAAO;SACJ,OAAO,CAAC,OAAO,CAAC;SAChB,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/billing/index.ts"],"names":[],"mappings":"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"}
|