@wenrwa/marketplace-cli 0.6.4 → 0.6.5

package/dist/__tests__/agent.test.js

@@ -54,6 +54,21 @@ describe('agent list', () => {
         spy.mockRestore();
     });
 });
+describe('agent logs', () => {
+    // sio-07: `agent logs` streams via the SAME connectWebSocket() helper
+    // dashboard.ts uses, which is what carries the authenticated handshake
+    // (auth: { token }, path '/marketplace') — exercised directly in
+    // websocket.test.ts. This just pins that `agent logs` still wires through
+    // that one shared call site rather than opening its own socket.
+    it('streams via the shared authenticated websocket helper', async () => {
+        const { connectWebSocket } = require('../utils/websocket');
+        const logSpy = jest.spyOn(console, 'log').mockImplementation();
+        await runCommand('logs', 'wallet-abc-12345678');
+        expect(connectWebSocket).toHaveBeenCalledTimes(1);
+        expect(connectWebSocket).toHaveBeenCalledWith(expect.any(Function), { channel: 'agent', filters: { agentWallet: 'wallet-abc-12345678' } });
+        logSpy.mockRestore();
+    });
+});
 describe('agent status', () => {
     it('displays agent details', async () => {
         mockClient.get.mockImplementation((path) => {

package/dist/__tests__/websocket.test.js

@@ -4,10 +4,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
+const events_1 = require("events");
+// sio-07 (docs/prd/authenticated-sockets.md): the CLI is a headless client —
+// it must authenticate the Socket.IO handshake with `auth: { token }`
+// (never the retired `walletPubkey` field) against the server's
+// `/marketplace` path (backend/src/server.ts), and surface a clear message
+// on refusal. connectWebSocket() is the single call site both
+// `dashboard.ts` and `agent.ts` (`agent logs`) share, so exercising it here
+// covers the handshake contract for both commands.
+const TEST_API_KEY = 'wm_sk_' + 'a'.repeat(64);
+const mockIo = jest.fn();
+jest.mock('socket.io-client', () => ({
+    io: (...args) => mockIo(...args),
+}));
+jest.mock('../utils/config', () => ({
+    requireConfig: jest.fn().mockReturnValue({
+        apiUrl: 'https://api.wenrwa.com/api/v1/api/marketplace',
+        apiKey: 'wm_sk_' + 'a'.repeat(64),
+    }),
+}));
 const websocket_1 = require("../utils/websocket");
+class FakeSocket extends events_1.EventEmitter {
+    disconnect = jest.fn();
+}
 beforeAll(() => {
     chalk_1.default.level = 0;
 });
+beforeEach(() => {
+    mockIo.mockReset();
+});
 function makeEvent(event, data, timestamp) {
     return { event, data, timestamp: timestamp || '2024-06-15T14:30:00.000Z' };
 }
@@ -59,3 +84,71 @@ describe('formatEventJson()', () => {
         expect(result.event).toBe('test');
     });
 });
+describe('connectWebSocket() handshake (sio-07)', () => {
+    it('authenticates with auth.token = the API key', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        (0, websocket_1.connectWebSocket)(() => { });
+        expect(mockIo).toHaveBeenCalledTimes(1);
+        const [, opts] = mockIo.mock.calls[0];
+        expect(opts.auth).toEqual({ token: TEST_API_KEY });
+    });
+    it('never sends the retired walletPubkey field', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        (0, websocket_1.connectWebSocket)(() => { });
+        const [, opts] = mockIo.mock.calls[0];
+        expect(opts.auth).not.toHaveProperty('walletPubkey');
+        expect(JSON.stringify(opts)).not.toContain('walletPubkey');
+    });
+    it('connects on the server\'s /marketplace Socket.IO path', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        (0, websocket_1.connectWebSocket)(() => { });
+        const [, opts] = mockIo.mock.calls[0];
+        expect(opts.path).toBe('/marketplace');
+    });
+    it('shows a clear message and tells the user to log in again on CREDENTIAL_INVALID', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
+        (0, websocket_1.connectWebSocket)(() => { });
+        const err = new Error('invalid credential');
+        err.data = { code: 'CREDENTIAL_INVALID' };
+        fake.emit('connect_error', err);
+        const printed = errorSpy.mock.calls.map((c) => c.join(' ')).join('\n');
+        expect(printed).toMatch(/wen-market auth login/);
+        errorSpy.mockRestore();
+    });
+    it('shows a clear message and tells the user to log in again on SESSION_REVOKED', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
+        (0, websocket_1.connectWebSocket)(() => { });
+        const err = new Error('session revoked');
+        err.data = { code: 'SESSION_REVOKED' };
+        fake.emit('connect_error', err);
+        const printed = errorSpy.mock.calls.map((c) => c.join(' ')).join('\n');
+        expect(printed).toMatch(/wen-market auth login/);
+        errorSpy.mockRestore();
+    });
+    it('falls back to a generic message for other connect errors', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
+        (0, websocket_1.connectWebSocket)(() => { });
+        fake.emit('connect_error', new Error('ECONNREFUSED'));
+        const printed = errorSpy.mock.calls.map((c) => c.join(' ')).join('\n');
+        expect(printed).toContain('ECONNREFUSED');
+        expect(printed).not.toMatch(/wen-market auth login/);
+        errorSpy.mockRestore();
+    });
+    it('subscribes to the requested channel on connect, unaffected by the auth change', () => {
+        const fake = new FakeSocket();
+        mockIo.mockReturnValue(fake);
+        const emitSpy = jest.spyOn(fake, 'emit');
+        (0, websocket_1.connectWebSocket)(() => { }, { channel: 'workspace', filters: { workspaceId: 'ws1' } });
+        fake.emit('connect');
+        expect(emitSpy).toHaveBeenCalledWith('subscribe', { channel: 'workspace', workspaceId: 'ws1' });
+    });
+});

package/dist/utils/websocket.js

@@ -10,12 +10,32 @@ const socket_io_client_1 = require("socket.io-client");
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("./config");
 const format_1 = require("./format");
+// sio-07 (docs/prd/authenticated-sockets.md): headless clients (the CLI)
+// authenticate the Socket.IO handshake with `auth: { token }` — the API key
+// (`wm_sk_…`) — against the server's dedicated `/marketplace` path
+// (backend/src/server.ts). The legacy `auth: { walletPubkey }` field proved
+// nothing (public keys are public) and is retired; the server's
+// socket-auth middleware (backend/src/middleware/socket-auth.middleware.ts)
+// refuses bad/revoked credentials with a `connect_error` carrying
+// `err.data.code` of CREDENTIAL_INVALID or SESSION_REVOKED.
+const AUTH_LOGIN_HINT = 'Run `wen-market auth login` to sign in again.';
+function connectRefusalMessage(err) {
+    const code = err?.data?.code;
+    if (code === 'CREDENTIAL_INVALID') {
+        return `Your API key is invalid or expired. ${AUTH_LOGIN_HINT}`;
+    }
+    if (code === 'SESSION_REVOKED') {
+        return `Your session was revoked. ${AUTH_LOGIN_HINT}`;
+    }
+    return `WebSocket error: ${err?.message}`;
+}
 function connectWebSocket(onEvent, options = {}) {
     const config = (0, config_1.requireConfig)();
     const wsUrl = config.apiUrl.replace('/api/marketplace', '');
     const socket = (0, socket_io_client_1.io)(wsUrl, {
+        path: '/marketplace',
         transports: ['websocket'],
-        auth: { walletPubkey: config.apiKey },
+        auth: { token: config.apiKey },
     });
     socket.on('connect', () => {
         if (options.channel) {
@@ -29,7 +49,7 @@ function connectWebSocket(onEvent, options = {}) {
         onEvent(event);
     });
     socket.on('connect_error', (err) => {
-        console.error(chalk_1.default.red(`WebSocket error: ${err.message}`));
+        console.error(chalk_1.default.red(connectRefusalMessage(err)));
     });
     return socket;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenrwa/marketplace-cli",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "description": "CLI tool for the Wenrwa Agent Marketplace — monitor bounties, agents, workspaces, and treasury from your terminal",
   "author": "Wenrwa <dev@wenrwa.com>",
   "license": "MIT",