@vainplex/shieldapi-cli 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vainplex/shieldapi-cli",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Security intelligence from your terminal. Pay-per-request with USDC.",
   "type": "module",
   "bin": {
@@ -33,6 +33,7 @@
   },
   "homepage": "https://shield.vainplex.dev",
   "dependencies": {
+    "@x402/core": "^2.5.0",
     "@x402/evm": "^2.5.0",
     "@x402/fetch": "^2.5.0",
     "chalk": "^5.3.0",

package/src/commands/password.js

@@ -17,7 +17,6 @@ function readStdin() {
     rl.on('line', (line) => { data = line; rl.close(); });
     rl.on('close', () => resolve(data.trim()));
     rl.on('error', reject);
-    // Timeout after 10s
     setTimeout(() => { rl.close(); reject(new Error('Stdin timeout — no input received')); }, 10000);
   });
 }
@@ -27,6 +26,8 @@ function readStdin() {
  * Hashes locally with SHA-1, sends hash to API.
  */
 export async function passwordCommand(password, opts) {
+  let spinner = null;
+
   try {
     let hash;
 
@@ -62,7 +63,7 @@ export async function passwordCommand(password, opts) {
       }
     }
 
-    const spinner = opts.quiet ? null : ora({ text: 'Checking password...', stream: process.stderr }).start();
+    spinner = opts.quiet ? null : ora({ text: 'Checking password...', stream: process.stderr }).start();
     const wallet = opts.demo ? null : resolveWallet(opts);
 
     const data = await apiRequest('check-password', { hash }, {
@@ -80,7 +81,7 @@ export async function passwordCommand(password, opts) {
 
     process.exitCode = exitCodeFromResult(data);
   } catch (err) {
-    if (!opts.quiet) process.stderr.write(chalk.red(`✖ ${err.message}\n`));
+    spinner?.fail(err.message);
     process.exitCode = exitCodeFromError(err);
   }
 }

package/src/index.js

@@ -14,7 +14,7 @@ export function run(argv) {
   program
     .name('shieldapi')
     .description('🛡️  ShieldAPI CLI — Security intelligence from your terminal. Pay-per-request with USDC.')
-    .version('1.1.0')
+    .version('1.2.0')
     .option('--wallet <key>', 'Private key for x402 payments (or set SHIELDAPI_WALLET_KEY)')
     .option('--json', 'Output raw JSON instead of formatted output')
     .option('--no-color', 'Disable colors')

package/src/lib/api.js

@@ -7,7 +7,7 @@ const BASE_URL = 'https://shield.vainplex.dev/api';
  * @param {Record<string, string>} params - Query parameters
  * @param {object} options
  * @param {boolean} options.demo - Use demo mode
- * @param {{ signer: object }|null} options.wallet - Wallet with x402 signer
+ * @param {{ client: object }|null} options.wallet - Wallet with viem client
  * @returns {Promise<object>} Parsed JSON response
  */
 export async function apiRequest(endpoint, params = {}, { demo = false, wallet = null } = {}) {
@@ -28,16 +28,24 @@ export async function apiRequest(endpoint, params = {}, { demo = false, wallet =
     return res.json();
   }
 
-  // Paid endpoint — need wallet with signer
-  if (!wallet?.signer) {
+  // Paid endpoint — need wallet
+  if (!wallet?.client) {
     throw new Error(
       'No wallet configured. Use --wallet <key> or set SHIELDAPI_WALLET_KEY environment variable.'
     );
   }
 
-  // Dynamic import to keep startup fast when not needed
+  // Dynamic imports to keep startup fast (PR-2: lazy loading)
+  const { x402Client } = await import('@x402/core/client');
+  const { registerExactEvmScheme } = await import('@x402/evm/exact/client');
   const { wrapFetchWithPayment } = await import('@x402/fetch');
-  const paidFetch = wrapFetchWithPayment(fetch, wallet.signer);
+
+  // Create x402 client with EVM scheme registered
+  const client = new x402Client();
+  registerExactEvmScheme(client, { signer: wallet.client });
+
+  // Wrap fetch with x402 payment handling
+  const paidFetch = wrapFetchWithPayment(fetch, client);
 
   const res = await paidFetch(url);
 

package/src/lib/wallet.js

@@ -1,13 +1,13 @@
 import { createWalletClient, http, publicActions } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { base } from 'viem/chains';
-import { toClientEvmSigner } from '@x402/evm';
 
 /**
- * Create a viem wallet client + x402 signer from a private key.
+ * Create a viem wallet client from a private key.
+ * Returns a wallet client with publicActions (needed for readContract in x402).
  * 
  * @param {string} privateKey - Hex private key (with or without 0x prefix)
- * @returns {{ client: import('viem').WalletClient, signer: object }}
+ * @returns {{ client: import('viem').WalletClient, address: string }}
  */
 export function createWallet(privateKey) {
   if (!privateKey) return null;
@@ -22,19 +22,17 @@ export function createWallet(privateKey) {
       transport: http(),
     }).extend(publicActions);
 
-    const signer = toClientEvmSigner(client);
-
-    return { client, signer, address: account.address };
+    return { client, address: account.address };
   } catch (err) {
     throw new Error(`Invalid private key: ${err.message}`);
   }
 }
 
 /**
- * Resolve wallet/signer from CLI option or environment variable.
+ * Resolve wallet client from CLI option or environment variable.
  * 
  * @param {object} opts - Commander options
- * @returns {{ signer: object, address: string }|null}
+ * @returns {{ client: object, address: string }|null}
  */
 export function resolveWallet(opts) {
   const key = opts?.wallet || process.env.SHIELDAPI_WALLET_KEY;