@ripeseed/rs-tunnel 0.3.0 → 0.4.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.
Files changed (83) hide show
  1. package/dist/commands/doctor.js +34 -4
  2. package/dist/commands/doctor.js.map +1 -1
  3. package/dist/commands/doctor.test.d.ts +1 -0
  4. package/dist/commands/doctor.test.js +80 -0
  5. package/dist/commands/doctor.test.js.map +1 -0
  6. package/dist/commands/list.js +45 -7
  7. package/dist/commands/list.js.map +1 -1
  8. package/dist/commands/list.test.d.ts +1 -0
  9. package/dist/commands/list.test.js +84 -0
  10. package/dist/commands/list.test.js.map +1 -0
  11. package/dist/commands/login.js +102 -18
  12. package/dist/commands/login.js.map +1 -1
  13. package/dist/commands/login.test.js +109 -3
  14. package/dist/commands/login.test.js.map +1 -1
  15. package/dist/commands/logout.js +18 -1
  16. package/dist/commands/logout.js.map +1 -1
  17. package/dist/commands/logout.test.d.ts +1 -0
  18. package/dist/commands/logout.test.js +78 -0
  19. package/dist/commands/logout.test.js.map +1 -0
  20. package/dist/commands/stop.js +18 -1
  21. package/dist/commands/stop.js.map +1 -1
  22. package/dist/commands/stop.test.d.ts +1 -0
  23. package/dist/commands/stop.test.js +46 -0
  24. package/dist/commands/stop.test.js.map +1 -0
  25. package/dist/commands/up.d.ts +12 -2
  26. package/dist/commands/up.js +349 -74
  27. package/dist/commands/up.js.map +1 -1
  28. package/dist/commands/up.test.js +589 -233
  29. package/dist/commands/up.test.js.map +1 -1
  30. package/dist/lib/clipboard.d.ts +1 -0
  31. package/dist/lib/clipboard.js +50 -0
  32. package/dist/lib/clipboard.js.map +1 -0
  33. package/dist/lib/local-target.d.ts +12 -0
  34. package/dist/lib/local-target.js +48 -0
  35. package/dist/lib/local-target.js.map +1 -0
  36. package/dist/lib/local-target.test.d.ts +1 -0
  37. package/dist/lib/local-target.test.js +23 -0
  38. package/dist/lib/local-target.test.js.map +1 -0
  39. package/dist/lib/up-dashboard.test.js +141 -51
  40. package/dist/lib/up-dashboard.test.js.map +1 -1
  41. package/dist/lib/up-runtime.d.ts +110 -0
  42. package/dist/lib/up-runtime.js +455 -0
  43. package/dist/lib/up-runtime.js.map +1 -0
  44. package/dist/ui/index.d.ts +2 -0
  45. package/dist/ui/index.js +3 -0
  46. package/dist/ui/index.js.map +1 -0
  47. package/dist/ui/output.d.ts +20 -0
  48. package/dist/ui/output.js +50 -0
  49. package/dist/ui/output.js.map +1 -0
  50. package/dist/ui/output.test.d.ts +1 -0
  51. package/dist/ui/output.test.js +84 -0
  52. package/dist/ui/output.test.js.map +1 -0
  53. package/dist/ui/primitives.d.ts +50 -0
  54. package/dist/ui/primitives.js +102 -0
  55. package/dist/ui/primitives.js.map +1 -0
  56. package/dist/ui/primitives.test.d.ts +1 -0
  57. package/dist/ui/primitives.test.js +46 -0
  58. package/dist/ui/primitives.test.js.map +1 -0
  59. package/dist/ui/test-utils.d.ts +10 -0
  60. package/dist/ui/test-utils.js +71 -0
  61. package/dist/ui/test-utils.js.map +1 -0
  62. package/dist/ui/up/UpApp.d.ts +5 -0
  63. package/dist/ui/up/UpApp.js +47 -0
  64. package/dist/ui/up/UpApp.js.map +1 -0
  65. package/dist/ui/up/index.d.ts +4 -0
  66. package/dist/ui/up/index.js +3 -0
  67. package/dist/ui/up/index.js.map +1 -0
  68. package/dist/ui/up/types.d.ts +1 -0
  69. package/dist/ui/up/types.js +2 -0
  70. package/dist/ui/up/types.js.map +1 -0
  71. package/dist/ui/up/up-app.d.ts +2 -0
  72. package/dist/ui/up/up-app.js +2 -0
  73. package/dist/ui/up/up-app.js.map +1 -0
  74. package/dist/ui/up/up-app.test.d.ts +1 -0
  75. package/dist/ui/up/up-app.test.js +266 -0
  76. package/dist/ui/up/up-app.test.js.map +1 -0
  77. package/dist/ui/up/utils.d.ts +19 -0
  78. package/dist/ui/up/utils.js +141 -0
  79. package/dist/ui/up/utils.js.map +1 -0
  80. package/dist/ui/up/views.d.ts +9 -0
  81. package/dist/ui/up/views.js +61 -0
  82. package/dist/ui/up/views.js.map +1 -0
  83. package/package.json +6 -2
@@ -1,8 +1,11 @@
1
1
  import os from 'node:os';
2
+ import { createElement } from 'react';
2
3
  import { getCliConfig } from '../config.js';
3
4
  import { ApiClient } from '../lib/api-client.js';
4
5
  import { findCloudflaredBinary, getCloudflaredVersion } from '../lib/cloudflared.js';
5
6
  import { loadSession } from '../store/credentials.js';
7
+ import { renderCliApp, stopCliApp, withCliOutput, writePlainLines } from '../ui/output.js';
8
+ import { ResultCard, StatusList } from '../ui/primitives.js';
6
9
  export async function doctorCommand() {
7
10
  const config = getCliConfig();
8
11
  const apiClient = new ApiClient(config.apiBaseUrl);
@@ -12,9 +15,36 @@ export async function doctorCommand() {
12
15
  const session = await loadSession();
13
16
  const cloudflared = await findCloudflaredBinary();
14
17
  const cloudflaredVersion = cloudflared ? getCloudflaredVersion(cloudflared) : null;
15
- console.log(`OS: ${platform} (${osSupported ? 'supported' : 'unsupported'})`);
16
- console.log(`API (${config.apiBaseUrl}): ${apiHealthy ? 'reachable' : 'unreachable'}`);
17
- console.log(`Auth session: ${session ? `present (${session.profile.email})` : 'missing'}`);
18
- console.log(`cloudflared: ${cloudflared ? `found at ${cloudflared}${cloudflaredVersion ? ` (${cloudflaredVersion})` : ''}` : 'not found'}`);
18
+ await withCliOutput({
19
+ branch: {
20
+ interactive: async () => {
21
+ const inkApp = renderCliApp(createElement(ResultCard, {
22
+ title: 'RS Tunnel • Doctor',
23
+ tone: 'info',
24
+ }, createElement(StatusList, {
25
+ items: [
26
+ { label: 'OS', value: `${platform} (${osSupported ? 'supported' : 'unsupported'})` },
27
+ { label: 'API', value: `${config.apiBaseUrl} (${apiHealthy ? 'reachable' : 'unreachable'})` },
28
+ { label: 'Auth session', value: session ? `present (${session.profile.email})` : 'missing' },
29
+ {
30
+ label: 'cloudflared',
31
+ value: cloudflared
32
+ ? `found at ${cloudflared}${cloudflaredVersion ? ` (${cloudflaredVersion})` : ''}`
33
+ : 'not found',
34
+ },
35
+ ],
36
+ })), {}, { patchConsole: false, exitOnCtrlC: false });
37
+ await stopCliApp(inkApp);
38
+ },
39
+ plain: async ({ stdout }) => {
40
+ writePlainLines(stdout, [
41
+ `OS: ${platform} (${osSupported ? 'supported' : 'unsupported'})`,
42
+ `API (${config.apiBaseUrl}): ${apiHealthy ? 'reachable' : 'unreachable'}`,
43
+ `Auth session: ${session ? `present (${session.profile.email})` : 'missing'}`,
44
+ `cloudflared: ${cloudflared ? `found at ${cloudflared}${cloudflaredVersion ? ` (${cloudflaredVersion})` : ''}` : 'not found'}`,
45
+ ]);
46
+ },
47
+ },
48
+ });
19
49
  }
20
50
  //# sourceMappingURL=doctor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;IACjD,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEzE,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,MAAM,EAAE,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,WAAW,EAAE,CAAC;IACpC,MAAM,WAAW,GAAG,MAAM,qBAAqB,EAAE,CAAC;IAClD,MAAM,kBAAkB,GAAG,WAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEnF,OAAO,CAAC,GAAG,CAAC,OAAO,QAAQ,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC;IAC9E,OAAO,CAAC,GAAG,CAAC,QAAQ,MAAM,CAAC,UAAU,MAAM,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC,CAAC;IACvF,OAAO,CAAC,GAAG,CAAC,iBAAiB,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;IAC3F,OAAO,CAAC,GAAG,CACT,gBAAgB,WAAW,CAAC,CAAC,CAAC,YAAY,WAAW,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,kBAAkB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAC/H,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,80 @@
1
+ import os from 'node:os';
2
+ import { afterEach, describe, expect, it, vi } from 'vitest';
3
+ import { doctorCommand } from './doctor.js';
4
+ import { ApiClient } from '../lib/api-client.js';
5
+ import * as configModule from '../config.js';
6
+ import * as cloudflaredModule from '../lib/cloudflared.js';
7
+ import * as credentialsModule from '../store/credentials.js';
8
+ import { setTerminalTTY } from '../ui/test-utils.js';
9
+ describe('doctorCommand', () => {
10
+ afterEach(() => {
11
+ vi.restoreAllMocks();
12
+ });
13
+ it('prints diagnostics in non-interactive terminals', async () => {
14
+ const restoreTTY = setTerminalTTY(false);
15
+ const writes = [];
16
+ const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(((chunk) => {
17
+ writes.push(Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk));
18
+ return true;
19
+ }));
20
+ vi.spyOn(configModule, 'getCliConfig').mockReturnValue({
21
+ apiBaseUrl: 'https://api.example.com',
22
+ });
23
+ vi.spyOn(ApiClient.prototype, 'health').mockResolvedValue(true);
24
+ vi.spyOn(credentialsModule, 'loadSession').mockResolvedValue({
25
+ accessToken: 'access-token',
26
+ refreshToken: 'refresh-token',
27
+ expiresAtEpochSec: 1,
28
+ profile: {
29
+ email: 'test@example.com',
30
+ slackUserId: 'U1',
31
+ slackTeamId: 'T1',
32
+ },
33
+ });
34
+ vi.spyOn(cloudflaredModule, 'findCloudflaredBinary').mockResolvedValue('/usr/local/bin/cloudflared');
35
+ vi.spyOn(cloudflaredModule, 'getCloudflaredVersion').mockReturnValue('2026.3.0');
36
+ vi.spyOn(os, 'platform').mockReturnValue('linux');
37
+ vi.spyOn(os, 'arch').mockReturnValue('x64');
38
+ try {
39
+ await doctorCommand();
40
+ const output = writes.join('');
41
+ expect(output).toContain('OS: linux x64 (supported)');
42
+ expect(output).toContain('API (https://api.example.com): reachable');
43
+ expect(output).toContain('Auth session: present (test@example.com)');
44
+ expect(output).toContain('cloudflared: found at /usr/local/bin/cloudflared (2026.3.0)');
45
+ }
46
+ finally {
47
+ restoreTTY();
48
+ writeSpy.mockRestore();
49
+ }
50
+ });
51
+ it('reports missing auth and missing cloudflared binary', async () => {
52
+ const restoreTTY = setTerminalTTY(false);
53
+ const writes = [];
54
+ const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(((chunk) => {
55
+ writes.push(Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk));
56
+ return true;
57
+ }));
58
+ vi.spyOn(configModule, 'getCliConfig').mockReturnValue({
59
+ apiBaseUrl: 'https://api.example.com',
60
+ });
61
+ vi.spyOn(ApiClient.prototype, 'health').mockResolvedValue(false);
62
+ vi.spyOn(credentialsModule, 'loadSession').mockResolvedValue(null);
63
+ vi.spyOn(cloudflaredModule, 'findCloudflaredBinary').mockResolvedValue(null);
64
+ vi.spyOn(os, 'platform').mockReturnValue('linux');
65
+ vi.spyOn(os, 'arch').mockReturnValue('arm64');
66
+ try {
67
+ await doctorCommand();
68
+ const output = writes.join('');
69
+ expect(output).toContain('OS: linux arm64 (supported)');
70
+ expect(output).toContain('API (https://api.example.com): unreachable');
71
+ expect(output).toContain('Auth session: missing');
72
+ expect(output).toContain('cloudflared: not found');
73
+ }
74
+ finally {
75
+ restoreTTY();
76
+ writeSpy.mockRestore();
77
+ }
78
+ });
79
+ });
80
+ //# sourceMappingURL=doctor.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"doctor.test.js","sourceRoot":"","sources":["../../src/commands/doctor.test.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,56 @@
1
+ import { createElement } from 'react';
1
2
  import { getCliConfig } from '../config.js';
2
3
  import { ApiClient } from '../lib/api-client.js';
3
4
  import { withAuthenticatedSession } from '../lib/session.js';
5
+ import { renderCliApp, stopCliApp, withCliOutput, writePlainBlock } from '../ui/output.js';
6
+ import { DataTable, ResultCard } from '../ui/primitives.js';
4
7
  export async function listCommand() {
5
8
  const config = getCliConfig();
6
9
  const apiClient = new ApiClient(config.apiBaseUrl);
7
10
  await withAuthenticatedSession(apiClient, async (session) => {
8
11
  const tunnels = await apiClient.listTunnels(session.accessToken);
9
- if (tunnels.length === 0) {
10
- console.log('No active tunnels.');
11
- return;
12
- }
13
- for (const tunnel of tunnels) {
14
- console.log(`${tunnel.id} | ${tunnel.hostname} | status=${tunnel.status} | port=${tunnel.requestedPort} | created=${tunnel.createdAt}`);
15
- }
12
+ await withCliOutput({
13
+ branch: {
14
+ interactive: async () => {
15
+ const inkApp = renderCliApp(tunnels.length === 0
16
+ ? createElement(ResultCard, {
17
+ title: 'RS Tunnel • Tunnels',
18
+ subtitle: 'No active tunnels.',
19
+ tone: 'neutral',
20
+ })
21
+ : createElement(ResultCard, {
22
+ title: 'RS Tunnel • Tunnels',
23
+ tone: 'info',
24
+ }, createElement(DataTable, {
25
+ columns: [
26
+ { key: 'id', label: 'ID', minWidth: 18, maxWidth: 36 },
27
+ { key: 'hostname', label: 'HOSTNAME', minWidth: 20, maxWidth: 30 },
28
+ { key: 'status', label: 'STATUS', minWidth: 8, maxWidth: 10 },
29
+ { key: 'requestedPort', label: 'PORT', minWidth: 5, maxWidth: 5 },
30
+ { key: 'createdAt', label: 'CREATED', minWidth: 19, maxWidth: 19 },
31
+ ],
32
+ rows: tunnels.map((tunnel) => ({
33
+ id: tunnel.id,
34
+ hostname: tunnel.hostname,
35
+ status: tunnel.status,
36
+ requestedPort: tunnel.requestedPort,
37
+ createdAt: tunnel.createdAt,
38
+ })),
39
+ emptyMessage: 'No active tunnels.',
40
+ })), {}, { patchConsole: false, exitOnCtrlC: false });
41
+ await stopCliApp(inkApp);
42
+ },
43
+ plain: async ({ stdout }) => {
44
+ if (tunnels.length === 0) {
45
+ writePlainBlock(stdout, 'No active tunnels.');
46
+ return;
47
+ }
48
+ for (const tunnel of tunnels) {
49
+ writePlainBlock(stdout, `${tunnel.id} | ${tunnel.hostname} | status=${tunnel.status} | port=${tunnel.requestedPort} | created=${tunnel.createdAt}`);
50
+ }
51
+ },
52
+ },
53
+ });
16
54
  });
17
55
  }
18
56
  //# sourceMappingURL=list.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,wBAAwB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC1D,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEjE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YAClC,OAAO;QACT,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,OAAO,CAAC,GAAG,CACT,GAAG,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC,QAAQ,aAAa,MAAM,CAAC,MAAM,WAAW,MAAM,CAAC,aAAa,cAAc,MAAM,CAAC,SAAS,EAAE,CAC3H,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC3F,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,WAAW;IAC/B,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAEnD,MAAM,wBAAwB,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC1D,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,aAAa,CAAC;YAClB,MAAM,EAAE;gBACN,WAAW,EAAE,KAAK,IAAI,EAAE;oBACtB,MAAM,MAAM,GAAG,YAAY,CACzB,OAAO,CAAC,MAAM,KAAK,CAAC;wBAClB,CAAC,CAAC,aAAa,CAAC,UAAU,EAAE;4BACxB,KAAK,EAAE,uBAAuB;4BAC9B,QAAQ,EAAE,oBAAoB;4BAC9B,IAAI,EAAE,SAAS;yBAChB,CAAC;wBACJ,CAAC,CAAC,aAAa,CACX,UAAU,EACV;4BACE,KAAK,EAAE,uBAAuB;4BAC9B,IAAI,EAAE,MAAM;yBACb,EACD,aAAa,CAAC,SAAS,EAAE;4BACvB,OAAO,EAAE;gCACP,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gCACtD,EAAE,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;gCAClE,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;gCAC7D,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;gCACjE,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;6BACnE;4BACD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gCAC7B,EAAE,EAAE,MAAM,CAAC,EAAE;gCACb,QAAQ,EAAE,MAAM,CAAC,QAAQ;gCACzB,MAAM,EAAE,MAAM,CAAC,MAAM;gCACrB,aAAa,EAAE,MAAM,CAAC,aAAa;gCACnC,SAAS,EAAE,MAAM,CAAC,SAAS;6BAC5B,CAAC,CAAC;4BACH,YAAY,EAAE,oBAAoB;yBACnC,CAAC,CACH,EACL,EAAE,EACF,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,CAC5C,CAAC;oBAEF,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC3B,CAAC;gBACD,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE;oBAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACzB,eAAe,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;wBAC9C,OAAO;oBACT,CAAC;oBAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;wBAC7B,eAAe,CACb,MAAM,EACN,GAAG,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC,QAAQ,aAAa,MAAM,CAAC,MAAM,WAAW,MAAM,CAAC,aAAa,cAAc,MAAM,CAAC,SAAS,EAAE,CAC3H,CAAC;oBACJ,CAAC;gBACH,CAAC;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,84 @@
1
+ import { afterEach, describe, expect, it, vi } from 'vitest';
2
+ import { listCommand } from './list.js';
3
+ import { ApiClient } from '../lib/api-client.js';
4
+ import * as configModule from '../config.js';
5
+ import * as sessionModule from '../lib/session.js';
6
+ import { setTerminalTTY } from '../ui/test-utils.js';
7
+ describe('listCommand', () => {
8
+ afterEach(() => {
9
+ vi.restoreAllMocks();
10
+ });
11
+ it('prints an empty-state message when no tunnels exist', async () => {
12
+ const restoreTTY = setTerminalTTY(false);
13
+ const writes = [];
14
+ const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(((chunk) => {
15
+ writes.push(Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk));
16
+ return true;
17
+ }));
18
+ vi.spyOn(configModule, 'getCliConfig').mockReturnValue({
19
+ apiBaseUrl: 'https://api.example.com',
20
+ });
21
+ vi.spyOn(sessionModule, 'withAuthenticatedSession').mockImplementation(async (_apiClient, run) => run({
22
+ accessToken: 'access-token',
23
+ refreshToken: 'refresh-token',
24
+ expiresAtEpochSec: 1,
25
+ profile: {
26
+ email: 'test@example.com',
27
+ slackUserId: 'U1',
28
+ slackTeamId: 'T1',
29
+ },
30
+ }));
31
+ vi.spyOn(ApiClient.prototype, 'listTunnels').mockResolvedValue([]);
32
+ try {
33
+ await listCommand();
34
+ expect(writes.join('')).toContain('No active tunnels.');
35
+ }
36
+ finally {
37
+ restoreTTY();
38
+ writeSpy.mockRestore();
39
+ }
40
+ });
41
+ it('prints one stable line per tunnel', async () => {
42
+ const restoreTTY = setTerminalTTY(false);
43
+ const writes = [];
44
+ const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(((chunk) => {
45
+ writes.push(Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk));
46
+ return true;
47
+ }));
48
+ vi.spyOn(configModule, 'getCliConfig').mockReturnValue({
49
+ apiBaseUrl: 'https://api.example.com',
50
+ });
51
+ vi.spyOn(sessionModule, 'withAuthenticatedSession').mockImplementation(async (_apiClient, run) => run({
52
+ accessToken: 'access-token',
53
+ refreshToken: 'refresh-token',
54
+ expiresAtEpochSec: 1,
55
+ profile: {
56
+ email: 'test@example.com',
57
+ slackUserId: 'U1',
58
+ slackTeamId: 'T1',
59
+ },
60
+ }));
61
+ vi.spyOn(ApiClient.prototype, 'listTunnels').mockResolvedValue([
62
+ {
63
+ id: 'tunnel-1',
64
+ hostname: 'orders-api.dev.ripeseed.app',
65
+ slug: 'orders-api',
66
+ status: 'active',
67
+ requestedPort: 3000,
68
+ createdAt: '2026-03-23T19:42:31.000Z',
69
+ lease: null,
70
+ stoppedAt: null,
71
+ lastError: null,
72
+ },
73
+ ]);
74
+ try {
75
+ await listCommand();
76
+ expect(writes.join('')).toContain('tunnel-1 | orders-api.dev.ripeseed.app | status=active | port=3000 | created=2026-03-23T19:42:31.000Z');
77
+ }
78
+ finally {
79
+ restoreTTY();
80
+ writeSpy.mockRestore();
81
+ }
82
+ });
83
+ });
84
+ //# sourceMappingURL=list.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"list.test.js","sourceRoot":"","sources":["../../src/commands/list.test.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,12 @@
1
1
  import open from 'open';
2
+ import { createElement } from 'react';
3
+ import { Box, Text } from 'ink';
2
4
  import { getCliConfig } from '../config.js';
3
5
  import { ApiClient } from '../lib/api-client.js';
4
6
  import { createPkcePair } from '../lib/pkce.js';
5
7
  import { saveSession } from '../store/credentials.js';
8
+ import { isInteractiveTerminal, renderCliApp, stopCliApp } from '../ui/output.js';
9
+ import { NoticeBanner, ResultCard, StatusList } from '../ui/primitives.js';
6
10
  const AUTH_POLL_INTERVAL_MS = 2_000;
7
11
  const AUTH_POLL_TIMEOUT_MS = 120_000;
8
12
  const defaultDependencies = {
@@ -19,6 +23,38 @@ const defaultDependencies = {
19
23
  });
20
24
  },
21
25
  };
26
+ function loginView(props) {
27
+ const browserText = props.browserState === 'opened'
28
+ ? 'Browser opened'
29
+ : props.browserState === 'skipped'
30
+ ? 'Browser open skipped'
31
+ : props.browserState === 'failed'
32
+ ? 'Browser open failed'
33
+ : 'Opening browser...';
34
+ const browserColor = props.browserState === 'failed' ? 'red' : props.browserState === 'skipped' ? 'yellow' : 'cyan';
35
+ return createElement(ResultCard, {
36
+ title: 'RS Tunnel • Login',
37
+ tone: props.successEmail ? 'success' : 'info',
38
+ }, createElement(StatusList, {
39
+ items: [
40
+ { label: 'Email', value: props.email },
41
+ { label: 'API', value: props.apiBaseUrl },
42
+ {
43
+ label: 'Browser',
44
+ value: createElement(Text, { color: browserColor }, browserText),
45
+ },
46
+ { label: 'Status', value: props.status, tone: 'warning' },
47
+ ],
48
+ }), props.authorizeUrl
49
+ ? createElement(Box, { marginTop: 1, flexDirection: 'column' }, createElement(NoticeBanner, {
50
+ tone: props.browserState === 'failed' ? 'warning' : 'info',
51
+ title: 'Auth URL',
52
+ message: props.authorizeUrl,
53
+ }))
54
+ : null, props.successEmail
55
+ ? createElement(Box, { marginTop: 1 }, createElement(Text, { color: 'green', bold: true }, `Logged in as ${props.successEmail}`))
56
+ : null);
57
+ }
22
58
  export async function loginCommand(email, options = {}, dependencies = defaultDependencies) {
23
59
  const config = dependencies.getCliConfig();
24
60
  const apiClient = dependencies.createApiClient(config.apiBaseUrl);
@@ -27,30 +63,78 @@ export async function loginCommand(email, options = {}, dependencies = defaultDe
27
63
  email,
28
64
  codeChallenge: pkce.challenge,
29
65
  });
66
+ const interactive = isInteractiveTerminal();
67
+ let browserState = options.skipBrowserOpen ? 'skipped' : 'opening';
68
+ let authorizeUrlForView = options.skipBrowserOpen ? auth.authorizeUrl : null;
69
+ let status = 'Waiting for Slack OAuth confirmation...';
30
70
  if (options.skipBrowserOpen) {
31
71
  console.log(`Slack Auth URL: ${auth.authorizeUrl}`);
32
72
  }
33
- else {
34
- try {
35
- await dependencies.openUrl(auth.authorizeUrl);
73
+ const inkApp = interactive
74
+ ? renderCliApp(loginView({
75
+ email,
76
+ apiBaseUrl: config.apiBaseUrl,
77
+ authorizeUrl: authorizeUrlForView,
78
+ browserState,
79
+ status,
80
+ }), {}, { patchConsole: false, exitOnCtrlC: false })
81
+ : null;
82
+ try {
83
+ if (!options.skipBrowserOpen) {
84
+ try {
85
+ await dependencies.openUrl(auth.authorizeUrl);
86
+ browserState = 'opened';
87
+ authorizeUrlForView = null;
88
+ }
89
+ catch {
90
+ browserState = 'failed';
91
+ authorizeUrlForView = auth.authorizeUrl;
92
+ status = 'Open this URL in your browser.';
93
+ if (!interactive) {
94
+ console.log(`Open this URL in your browser:\n${auth.authorizeUrl}`);
95
+ }
96
+ }
97
+ }
98
+ if (!interactive) {
99
+ console.log('Waiting for Slack OAuth confirmation...');
100
+ }
101
+ if (interactive) {
102
+ inkApp?.rerender(loginView({
103
+ email,
104
+ apiBaseUrl: config.apiBaseUrl,
105
+ authorizeUrl: authorizeUrlForView,
106
+ browserState,
107
+ status,
108
+ }));
36
109
  }
37
- catch {
38
- console.log(`Open this URL in your browser:\n${auth.authorizeUrl}`);
110
+ const loginCode = await waitForLoginCode(auth.state, apiClient, dependencies.sleep);
111
+ const tokenPair = await apiClient.exchangeLoginCode({
112
+ loginCode,
113
+ codeVerifier: pkce.verifier,
114
+ });
115
+ await dependencies.saveSession({
116
+ accessToken: tokenPair.accessToken,
117
+ refreshToken: tokenPair.refreshToken,
118
+ expiresAtEpochSec: Math.floor(Date.now() / 1000) + tokenPair.expiresInSec,
119
+ profile: tokenPair.profile,
120
+ });
121
+ if (interactive) {
122
+ inkApp?.rerender(loginView({
123
+ email,
124
+ apiBaseUrl: config.apiBaseUrl,
125
+ authorizeUrl: null,
126
+ browserState: 'opened',
127
+ status: 'Login complete.',
128
+ successEmail: tokenPair.profile.email,
129
+ }));
130
+ }
131
+ else {
132
+ console.log(`Logged in as ${tokenPair.profile.email}`);
39
133
  }
40
134
  }
41
- console.log('Waiting for Slack OAuth confirmation...');
42
- const loginCode = await waitForLoginCode(auth.state, apiClient, dependencies.sleep);
43
- const tokenPair = await apiClient.exchangeLoginCode({
44
- loginCode,
45
- codeVerifier: pkce.verifier,
46
- });
47
- await dependencies.saveSession({
48
- accessToken: tokenPair.accessToken,
49
- refreshToken: tokenPair.refreshToken,
50
- expiresAtEpochSec: Math.floor(Date.now() / 1000) + tokenPair.expiresInSec,
51
- profile: tokenPair.profile,
52
- });
53
- console.log(`Logged in as ${tokenPair.profile.email}`);
135
+ finally {
136
+ await stopCliApp(inkApp);
137
+ }
54
138
  }
55
139
  async function waitForLoginCode(state, apiClient, sleep) {
56
140
  const startedAt = Date.now();
@@ -1 +1 @@
1
- {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,13 @@
1
- import { describe, expect, it, vi } from 'vitest';
1
+ import { afterEach, describe, expect, it, vi } from 'vitest';
2
2
  import { loginCommand } from './login.js';
3
+ import * as outputModule from '../ui/output.js';
4
+ import { setTerminalTTY } from '../ui/test-utils.js';
3
5
  describe('loginCommand', () => {
6
+ afterEach(() => {
7
+ vi.restoreAllMocks();
8
+ });
4
9
  it('prints the auth URL when browser auto-open is skipped', async () => {
10
+ const restoreTTY = setTerminalTTY(false);
5
11
  const startSlackAuth = vi.fn(async () => ({
6
12
  authorizeUrl: 'https://slack.example.com/auth',
7
13
  state: 'expected-state',
@@ -64,10 +70,11 @@ describe('loginCommand', () => {
64
70
  expect(logSpy).toHaveBeenCalledWith('Logged in as test@example.com');
65
71
  }
66
72
  finally {
67
- logSpy.mockRestore();
73
+ restoreTTY();
68
74
  }
69
75
  });
70
76
  it('opens the browser by default', async () => {
77
+ const restoreTTY = setTerminalTTY(false);
71
78
  const openUrl = vi.fn(async () => { });
72
79
  const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
73
80
  const dependencies = {
@@ -106,7 +113,106 @@ describe('loginCommand', () => {
106
113
  expect(logSpy).not.toHaveBeenCalledWith('Slack Auth URL: https://slack.example.com/auth');
107
114
  }
108
115
  finally {
109
- logSpy.mockRestore();
116
+ restoreTTY();
117
+ }
118
+ });
119
+ it('falls back to printing the URL when browser opening fails', async () => {
120
+ const restoreTTY = setTerminalTTY(false);
121
+ const openUrl = vi.fn(async () => {
122
+ throw new Error('browser unavailable');
123
+ });
124
+ const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
125
+ const dependencies = {
126
+ getCliConfig: () => ({ apiBaseUrl: 'https://api.example.com' }),
127
+ createApiClient: () => ({
128
+ startSlackAuth: vi.fn(async () => ({
129
+ authorizeUrl: 'https://slack.example.com/auth',
130
+ state: 'expected-state',
131
+ })),
132
+ getSlackAuthStatus: vi.fn(async () => ({
133
+ status: 'authorized',
134
+ loginCode: 'login-code',
135
+ })),
136
+ exchangeLoginCode: vi.fn(async () => ({
137
+ accessToken: 'access-token',
138
+ refreshToken: 'refresh-token',
139
+ expiresInSec: 900,
140
+ profile: {
141
+ email: 'test@example.com',
142
+ slackUserId: 'U1',
143
+ slackTeamId: 'T1',
144
+ },
145
+ })),
146
+ }),
147
+ createPkcePair: () => ({
148
+ verifier: 'verifier-value',
149
+ challenge: 'challenge-value',
150
+ }),
151
+ openUrl,
152
+ saveSession: vi.fn(async () => { }),
153
+ sleep: vi.fn(async () => { }),
154
+ };
155
+ try {
156
+ await loginCommand('test@example.com', {}, dependencies);
157
+ expect(openUrl).toHaveBeenCalledWith('https://slack.example.com/auth');
158
+ expect(logSpy).toHaveBeenCalledWith('Open this URL in your browser:\nhttps://slack.example.com/auth');
159
+ expect(logSpy).toHaveBeenCalledWith('Waiting for Slack OAuth confirmation...');
160
+ expect(logSpy).toHaveBeenCalledWith('Logged in as test@example.com');
161
+ }
162
+ finally {
163
+ restoreTTY();
164
+ }
165
+ });
166
+ it('prints the auth URL and tears down Ink in interactive skip-browser mode', async () => {
167
+ const restoreTTY = setTerminalTTY(true);
168
+ const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { });
169
+ const inkApp = {
170
+ rerender: vi.fn(),
171
+ unmount: vi.fn(),
172
+ waitUntilExit: vi.fn(async () => { }),
173
+ };
174
+ const renderCliAppSpy = vi.spyOn(outputModule, 'renderCliApp').mockReturnValue(inkApp);
175
+ const stopCliAppSpy = vi.spyOn(outputModule, 'stopCliApp');
176
+ const dependencies = {
177
+ getCliConfig: () => ({ apiBaseUrl: 'https://api.example.com' }),
178
+ createApiClient: () => ({
179
+ startSlackAuth: vi.fn(async () => ({
180
+ authorizeUrl: 'https://slack.example.com/auth',
181
+ state: 'expected-state',
182
+ })),
183
+ getSlackAuthStatus: vi.fn(async () => ({
184
+ status: 'authorized',
185
+ loginCode: 'login-code',
186
+ })),
187
+ exchangeLoginCode: vi.fn(async () => ({
188
+ accessToken: 'access-token',
189
+ refreshToken: 'refresh-token',
190
+ expiresInSec: 900,
191
+ profile: {
192
+ email: 'test@example.com',
193
+ slackUserId: 'U1',
194
+ slackTeamId: 'T1',
195
+ },
196
+ })),
197
+ }),
198
+ createPkcePair: () => ({
199
+ verifier: 'verifier-value',
200
+ challenge: 'challenge-value',
201
+ }),
202
+ openUrl: vi.fn(async () => { }),
203
+ saveSession: vi.fn(async () => { }),
204
+ sleep: vi.fn(async () => { }),
205
+ };
206
+ try {
207
+ await loginCommand('test@example.com', { skipBrowserOpen: true }, dependencies);
208
+ expect(renderCliAppSpy).toHaveBeenCalledTimes(1);
209
+ expect(logSpy).toHaveBeenCalledWith('Slack Auth URL: https://slack.example.com/auth');
210
+ expect(stopCliAppSpy).toHaveBeenCalledWith(inkApp);
211
+ expect(inkApp.unmount).toHaveBeenCalledTimes(1);
212
+ expect(inkApp.waitUntilExit).toHaveBeenCalledTimes(1);
213
+ }
214
+ finally {
215
+ restoreTTY();
110
216
  }
111
217
  });
112
218
  });