clawmoney 0.3.0 → 0.5.0

package/dist/commands/tweet.d.ts

@@ -3,8 +3,7 @@ interface TweetOptions {
     draft?: boolean;
 }
 /**
- * Post a tweet via BNBot Chrome Extension through the Bridge server.
- * Requires `clawmoney serve` to be running.
+ * Post a tweet by delegating to bnbot-cli.
  */
 export declare function tweetCommand(text: string, options: TweetOptions): Promise<void>;
 export {};

package/dist/commands/tweet.js

@@ -1,50 +1,29 @@
 import chalk from 'chalk';
-import ora from 'ora';
-import { sendAction } from '../utils/bridge.js';
+import { spawn } from 'node:child_process';
 /**
- * Post a tweet via BNBot Chrome Extension through the Bridge server.
- * Requires `clawmoney serve` to be running.
+ * Post a tweet by delegating to bnbot-cli.
  */
 export async function tweetCommand(text, options) {
-    const isDraft = options.draft || false;
-    console.log('');
-    console.log(chalk.dim(`  ${isDraft ? 'Drafting' : 'Posting'} tweet: "${text.slice(0, 80)}${text.length > 80 ? '...' : ''}"`));
-    if (options.media) {
-        console.log(chalk.dim(`  Media: ${options.media}`));
-    }
-    console.log('');
-    const spinner = ora(isDraft ? 'Filling tweet draft...' : 'Posting tweet...').start();
+    const args = ['bnbot', 'tweet', text];
+    if (options.draft)
+        args.push('--draft');
+    if (options.media)
+        args.push('--media', options.media);
     try {
-        const params = {
-            text,
-            draftOnly: isDraft,
-        };
-        if (options.media) {
-            params.media = [{ type: 'image', url: options.media }];
-        }
-        const result = await sendAction('post_tweet', params);
-        if (!result.success) {
-            spinner.fail(result.error || 'Failed');
-            return;
-        }
-        if (isDraft) {
-            spinner.succeed('Tweet draft ready — review and post manually');
-        }
-        else {
-            spinner.succeed('Tweet posted');
-            const data = result.data;
-            if (data?.url || data?.tweet_url) {
-                console.log(`  ${chalk.dim('URL:')} ${chalk.cyan(data.url || data.tweet_url)}`);
-            }
-        }
+        const code = await new Promise((resolve, reject) => {
+            const child = spawn('npx', args, {
+                stdio: 'inherit',
+                shell: true,
+            });
+            child.on('close', (code) => resolve(code || 0));
+            child.on('error', reject);
+        });
+        if (code !== 0)
+            process.exit(code);
     }
     catch (err) {
-        spinner.fail('Failed');
         console.error(chalk.red(err.message));
-        console.log('');
-        console.log(chalk.dim('  Make sure:'));
-        console.log(chalk.dim('  1. clawmoney serve is running'));
-        console.log(chalk.dim('  2. BNBot Chrome Extension is open on a Twitter tab'));
+        console.log(chalk.dim('  Make sure bnbot-cli is installed: npm install -g bnbot-cli'));
+        process.exit(1);
     }
-    console.log('');
 }

package/dist/index.js

@@ -5,7 +5,6 @@ import { browseCommand } from './commands/browse.js';
 import { hireSubmitCommand, hireVerifyCommand } from './commands/hire.js';
 import { walletStatusCommand, walletBalanceCommand, walletAddressCommand, walletSendCommand, } from './commands/wallet.js';
 import { tweetCommand } from './commands/tweet.js';
-import { serveCommand } from './commands/serve.js';
 const program = new Command();
 program
     .name('clawmoney')
@@ -119,20 +118,6 @@ wallet
         process.exit(1);
     }
 });
-// serve
-program
-    .command('serve')
-    .description('Start the bridge server for Chrome Extension communication')
-    .option('-p, --port <port>', 'WebSocket port', '18900')
-    .action(async (options) => {
-    try {
-        await serveCommand(options);
-    }
-    catch (err) {
-        console.error(err.message);
-        process.exit(1);
-    }
-});
 // tweet
 program
     .command('tweet <text>')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawmoney",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "ClawMoney CLI -- Earn crypto with your AI agent",
   "type": "module",
   "bin": {
@@ -16,12 +16,11 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@types/ws": "^8.18.1",
     "awal": "^2.2.0",
+    "bnbot-cli": "^2.0.0",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "ora": "^8.0.0",
-    "ws": "^8.20.0",
     "yaml": "^2.4.0"
   },
   "devDependencies": {

package/dist/commands/serve.d.ts

@@ -1,5 +0,0 @@
-interface ServeOptions {
-    port?: string;
-}
-export declare function serveCommand(options: ServeOptions): Promise<void>;
-export {};

package/dist/commands/serve.js

@@ -1,38 +0,0 @@
-import chalk from 'chalk';
-import { BridgeServer } from '../utils/bridge.js';
-export async function serveCommand(options) {
-    const port = parseInt(options.port || '18900', 10);
-    const server = new BridgeServer(port);
-    try {
-        await server.start();
-    }
-    catch (err) {
-        console.error(chalk.red(err.message));
-        process.exit(1);
-    }
-    console.log('');
-    console.log(chalk.green('  ClawMoney Bridge Server running'));
-    console.log(chalk.dim(`  WebSocket listening on ws://127.0.0.1:${port}`));
-    console.log('');
-    console.log(chalk.dim('  Waiting for BNBot Chrome Extension to connect...'));
-    console.log(chalk.dim('  Press Ctrl+C to stop'));
-    console.log('');
-    // Check extension connection periodically
-    const statusInterval = setInterval(() => {
-        if (server.isExtensionConnected()) {
-            const ver = server.getExtensionVersion();
-            console.log(chalk.green(`  Extension connected${ver ? ` (v${ver})` : ''}`));
-            clearInterval(statusInterval);
-        }
-    }, 2000);
-    // Graceful shutdown
-    const shutdown = () => {
-        console.log('');
-        console.log(chalk.dim('  Shutting down...'));
-        clearInterval(statusInterval);
-        server.stop();
-        process.exit(0);
-    };
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
-}

package/dist/utils/bridge.d.ts

@@ -1,37 +0,0 @@
-/**
- * Bridge — WebSocket server that sits between CLI commands and the Chrome Extension.
- *
- * Architecture:
- *   clawmoney serve  →  starts WS server (port 18900)
- *   Chrome Extension  →  connects as client (localRelayManager)
- *   clawmoney tweet   →  connects as client, sends action, gets result via server
- *
- * The server keeps a persistent connection to the extension.
- * CLI commands connect briefly, send an action, and disconnect after getting a result.
- */
-/**
- * The Bridge server — start with `clawmoney serve`
- */
-export declare class BridgeServer {
-    private wss;
-    private extensionClient;
-    private pendingRequests;
-    private extensionVersion;
-    private port;
-    constructor(port?: number);
-    start(): Promise<void>;
-    private handleMessage;
-    stop(): void;
-    isExtensionConnected(): boolean;
-    getExtensionVersion(): string | null;
-    getPort(): number;
-}
-/**
- * Send an action to the extension via the running Bridge server.
- * Connects as a CLI client, sends action, waits for result, disconnects.
- */
-export declare function sendAction(actionType: string, params: Record<string, unknown>, port?: number): Promise<{
-    success: boolean;
-    data?: unknown;
-    error?: string;
-}>;

package/dist/utils/bridge.js

@@ -1,218 +0,0 @@
-/**
- * Bridge — WebSocket server that sits between CLI commands and the Chrome Extension.
- *
- * Architecture:
- *   clawmoney serve  →  starts WS server (port 18900)
- *   Chrome Extension  →  connects as client (localRelayManager)
- *   clawmoney tweet   →  connects as client, sends action, gets result via server
- *
- * The server keeps a persistent connection to the extension.
- * CLI commands connect briefly, send an action, and disconnect after getting a result.
- */
-import { WebSocketServer, WebSocket } from 'ws';
-import { randomUUID } from 'node:crypto';
-const DEFAULT_PORT = 18900;
-const ACTION_TIMEOUT = 60000;
-/**
- * The Bridge server — start with `clawmoney serve`
- */
-export class BridgeServer {
-    wss = null;
-    extensionClient = null;
-    pendingRequests = new Map();
-    extensionVersion = null;
-    port;
-    constructor(port) {
-        this.port = port || DEFAULT_PORT;
-    }
-    start() {
-        return new Promise((resolve, reject) => {
-            this.wss = new WebSocketServer({ port: this.port, host: '127.0.0.1' });
-            this.wss.on('listening', () => {
-                resolve();
-            });
-            this.wss.on('error', (error) => {
-                if (error.code === 'EADDRINUSE') {
-                    reject(new Error(`Port ${this.port} already in use. Another serve instance may be running.`));
-                }
-                else {
-                    reject(error);
-                }
-            });
-            this.wss.on('connection', (ws) => {
-                // Determine if this is the extension or a CLI client
-                // Extension sends a 'status' message on connect
-                // CLI clients send an 'action' message
-                ws.on('message', (data) => {
-                    try {
-                        const message = JSON.parse(data.toString());
-                        this.handleMessage(ws, message);
-                    }
-                    catch {
-                        // ignore
-                    }
-                });
-                ws.on('close', () => {
-                    if (this.extensionClient === ws) {
-                        this.extensionClient = null;
-                        this.extensionVersion = null;
-                        // Reject all pending requests
-                        for (const [id, pending] of this.pendingRequests) {
-                            clearTimeout(pending.timer);
-                            pending.reject(new Error('Extension disconnected'));
-                            this.pendingRequests.delete(id);
-                        }
-                    }
-                });
-            });
-        });
-    }
-    handleMessage(ws, message) {
-        switch (message.type) {
-            case 'status':
-                // Extension connected
-                if (this.extensionClient && this.extensionClient !== ws && this.extensionClient.readyState === WebSocket.OPEN) {
-                    this.extensionClient.close(1000, 'Replaced by new connection');
-                }
-                this.extensionClient = ws;
-                this.extensionVersion = message.version;
-                break;
-            case 'action':
-                // CLI client sending an action — forward to extension
-                if (!this.extensionClient || this.extensionClient.readyState !== WebSocket.OPEN) {
-                    ws.send(JSON.stringify({
-                        type: 'action_result',
-                        requestId: message.requestId,
-                        success: false,
-                        error: 'Extension not connected. Make sure BNBot Chrome Extension is running on a Twitter tab.',
-                    }));
-                    return;
-                }
-                // Store pending request keyed to the CLI client WebSocket
-                const requestId = message.requestId;
-                const timer = setTimeout(() => {
-                    this.pendingRequests.delete(requestId);
-                    if (ws.readyState === WebSocket.OPEN) {
-                        ws.send(JSON.stringify({
-                            type: 'action_result',
-                            requestId,
-                            success: false,
-                            error: `Action '${message.actionType}' timed out`,
-                        }));
-                    }
-                }, ACTION_TIMEOUT);
-                this.pendingRequests.set(requestId, {
-                    resolve: (result) => {
-                        if (ws.readyState === WebSocket.OPEN) {
-                            ws.send(JSON.stringify(result));
-                        }
-                    },
-                    reject: (error) => {
-                        if (ws.readyState === WebSocket.OPEN) {
-                            ws.send(JSON.stringify({
-                                type: 'action_result',
-                                requestId,
-                                success: false,
-                                error: error.message,
-                            }));
-                        }
-                    },
-                    timer,
-                });
-                // Forward to extension
-                this.extensionClient.send(JSON.stringify(message));
-                break;
-            case 'action_result':
-                // Extension sending back a result — forward to CLI client
-                const pending = this.pendingRequests.get(message.requestId);
-                if (pending) {
-                    clearTimeout(pending.timer);
-                    this.pendingRequests.delete(message.requestId);
-                    pending.resolve(message);
-                }
-                break;
-            case 'heartbeat':
-                // Respond to heartbeat from extension
-                break;
-        }
-    }
-    stop() {
-        if (this.extensionClient) {
-            this.extensionClient.close(1000, 'Server shutting down');
-            this.extensionClient = null;
-        }
-        if (this.wss) {
-            this.wss.close();
-            this.wss = null;
-        }
-        for (const [id, pending] of this.pendingRequests) {
-            clearTimeout(pending.timer);
-            pending.reject(new Error('Server shutting down'));
-        }
-        this.pendingRequests.clear();
-    }
-    isExtensionConnected() {
-        return this.extensionClient !== null && this.extensionClient.readyState === WebSocket.OPEN;
-    }
-    getExtensionVersion() {
-        return this.extensionVersion;
-    }
-    getPort() {
-        return this.port;
-    }
-}
-/**
- * Send an action to the extension via the running Bridge server.
- * Connects as a CLI client, sends action, waits for result, disconnects.
- */
-export async function sendAction(actionType, params, port) {
-    const wsPort = port || DEFAULT_PORT;
-    return new Promise((resolve, reject) => {
-        const ws = new WebSocket(`ws://127.0.0.1:${wsPort}`);
-        const requestId = randomUUID();
-        let settled = false;
-        const timer = setTimeout(() => {
-            if (!settled) {
-                settled = true;
-                ws.close();
-                reject(new Error(`Action '${actionType}' timed out after ${ACTION_TIMEOUT / 1000}s`));
-            }
-        }, ACTION_TIMEOUT);
-        ws.on('open', () => {
-            ws.send(JSON.stringify({
-                type: 'action',
-                requestId,
-                actionType,
-                actionPayload: params,
-            }));
-        });
-        ws.on('message', (data) => {
-            try {
-                const msg = JSON.parse(data.toString());
-                if (msg.type === 'action_result' && msg.requestId === requestId) {
-                    settled = true;
-                    clearTimeout(timer);
-                    ws.close();
-                    resolve({ success: msg.success, data: msg.data, error: msg.error });
-                }
-            }
-            catch {
-                // ignore
-            }
-        });
-        ws.on('error', (err) => {
-            if (!settled) {
-                settled = true;
-                clearTimeout(timer);
-                reject(new Error(`Cannot connect to bridge server on port ${wsPort}. Run 'clawmoney serve' first.`));
-            }
-        });
-        ws.on('close', () => {
-            if (!settled) {
-                settled = true;
-                clearTimeout(timer);
-                reject(new Error('Connection closed before response'));
-            }
-        });
-    });
-}