@darksol/terminal 0.6.0 → 0.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darksol/terminal",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "DARKSOL Terminal — unified CLI for all DARKSOL services. Market intel, trading, oracle, casino, and more.",
   "type": "module",
   "bin": {

package/src/config/store.js

@@ -29,7 +29,7 @@ const config = new Conf({
     services: {
       type: 'object',
       default: {
-        oracle: 'https://acp.darksol.net/oracle',
+        oracle: 'https://acp.darksol.net/api/oracle',
         casino: 'https://casino.darksol.net',
         cards: 'https://acp.darksol.net',
         facilitator: 'https://facilitator.darksol.net',

package/src/services/oracle.js

@@ -1,16 +1,97 @@
 import { fetchJSON } from '../utils/fetch.js';
 import fetch from 'node-fetch';
-import { getServiceURL } from '../config/store.js';
+import { getServiceURL, getConfig } from '../config/store.js';
 import { theme } from '../ui/theme.js';
-import { spinner, kvDisplay, success, error } from '../ui/components.js';
+import { spinner, kvDisplay, success, error, warn, info } from '../ui/components.js';
 import { showSection } from '../ui/banner.js';
 
-const getURL = () => getServiceURL('oracle') || 'https://acp.darksol.net/oracle';
+// Oracle lives under acp.darksol.net/api/oracle/
+// Endpoints: health (free), coin/dice/number/shuffle (x402 — $0.05 USDC on Base)
+const getURL = () => {
+  const custom = getServiceURL('oracle');
+  if (custom) return custom;
+  return 'https://acp.darksol.net/api/oracle';
+};
+
+function handleX402(response) {
+  if (response === 402 || (response && response.status === 402)) {
+    warn('Oracle requires x402 payment ($0.05 USDC on Base)');
+    info('Use with agent signer: darksol signer start → requests auto-pay');
+    info('Or pay manually via facilitator: darksol facilitator');
+    return true;
+  }
+  return false;
+}
+
+async function oracleRequest(path, opts = {}) {
+  const url = `${getURL()}${path}`;
+  const resp = await fetch(url, opts);
+
+  if (resp.status === 402) {
+    // Return x402 info so caller can handle
+    const paymentHeader = resp.headers.get('payment-required');
+    let paymentInfo = null;
+    if (paymentHeader) {
+      try {
+        paymentInfo = JSON.parse(Buffer.from(paymentHeader, 'base64').toString());
+      } catch {}
+    }
+    return { x402: true, paymentInfo, status: 402 };
+  }
+
+  const ct = resp.headers.get('content-type') || '';
+  if (!ct.includes('json')) {
+    throw new Error(`Oracle returned non-JSON response (${resp.status})`);
+  }
+  return await resp.json();
+}
+
+export async function oracleHealth() {
+  const spin = spinner('Checking oracle...').start();
+  try {
+    const data = await oracleRequest('/health');
+    if (data.x402) {
+      spin.succeed('Oracle online (health should be free)');
+      return;
+    }
+    spin.succeed('Oracle online');
+
+    showSection('ORACLE STATUS');
+    kvDisplay([
+      ['Status', data.status === 'ok' ? theme.success('● Online') : theme.error('○ ' + data.status)],
+      ['Contract', data.contract || '-'],
+      ['Chain', data.chain || 'base'],
+      ['Block', String(data.blockNumber || '-')],
+    ]);
+    console.log('');
+    info('Endpoints require x402 payment ($0.05 USDC on Base)');
+    info('Games: coin flip, dice, random number, shuffle');
+    info('Docs: https://acp.darksol.net/oracle');
+  } catch (err) {
+    spin.fail('Oracle unreachable');
+    error(err.message);
+  }
+}
 
 export async function oracleFlip() {
   const spin = spinner('Flipping coin...').start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/coin`);
+    const data = await oracleRequest('/coin');
+    if (data.x402) {
+      spin.info('Payment required');
+      handleX402(data);
+      if (data.paymentInfo) {
+        const accepts = data.paymentInfo.accepts?.[0];
+        if (accepts) {
+          kvDisplay([
+            ['Amount', `$${(parseInt(accepts.amount) / 1e6).toFixed(2)} USDC`],
+            ['Network', 'Base'],
+            ['Pay To', accepts.payTo || '-'],
+          ]);
+        }
+      }
+      return;
+    }
     spin.succeed('Coin flipped');
     showSection('ORACLE — COIN FLIP');
     kvDisplay([
@@ -26,7 +107,12 @@ export async function oracleFlip() {
 export async function oracleDice(sides = 6) {
   const spin = spinner(`Rolling d${sides}...`).start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/dice?sides=${sides}`);
+    const data = await oracleRequest(`/dice?sides=${sides}`);
+    if (data.x402) {
+      spin.info('Payment required');
+      handleX402(data);
+      return;
+    }
     spin.succeed('Dice rolled');
     showSection(`ORACLE — D${sides}`);
     kvDisplay([
@@ -43,7 +129,12 @@ export async function oracleDice(sides = 6) {
 export async function oracleNumber(min = 1, max = 100) {
   const spin = spinner(`Generating number ${min}-${max}...`).start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/number?min=${min}&max=${max}`);
+    const data = await oracleRequest(`/number?min=${min}&max=${max}`);
+    if (data.x402) {
+      spin.info('Payment required');
+      handleX402(data);
+      return;
+    }
     spin.succeed('Number generated');
     showSection('ORACLE — RANDOM NUMBER');
     kvDisplay([
@@ -60,11 +151,16 @@ export async function oracleNumber(min = 1, max = 100) {
 export async function oracleShuffle(items) {
   const spin = spinner('Shuffling...').start();
   try {
-    const data = await fetchJSON(`${getURL()}/api/shuffle`, {
+    const data = await oracleRequest('/shuffle', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ items }),
     });
+    if (data.x402) {
+      spin.info('Payment required');
+      handleX402(data);
+      return;
+    }
     spin.succeed('Shuffled');
     showSection('ORACLE — SHUFFLE');
     console.log(theme.gold('  Result: ') + (data.result || data.value || []).join(', '));
@@ -73,16 +169,3 @@ export async function oracleShuffle(items) {
     error(err.message);
   }
 }
-
-export async function oracleHealth() {
-  const spin = spinner('Checking oracle...').start();
-  try {
-    const data = await fetchJSON(`${getURL()}/api/health`);
-    spin.succeed('Oracle online');
-    showSection('ORACLE STATUS');
-    kvDisplay(Object.entries(data).map(([k, v]) => [k, String(v)]));
-  } catch (err) {
-    spin.fail('Oracle unreachable');
-    error(err.message);
-  }
-}

package/src/web/commands.js

@@ -1121,17 +1121,31 @@ async function executeCardOrder(orderMeta, ws) {
 // ORACLE
 // ══════════════════════════════════════════════════
 async function cmdOracle(args, ws) {
+  ws.sendLine(`${ANSI.gold}  ◆ RANDOM ORACLE 🎲${ANSI.reset}`);
+  ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
   try {
-    const resp = await fetch('https://acp.darksol.net/oracle');
+    const resp = await fetch('https://acp.darksol.net/api/oracle/health');
+    const ct = resp.headers.get('content-type') || '';
+    if (!ct.includes('json')) throw new Error('not json');
     const data = await resp.json();
 
-    ws.sendLine(`${ANSI.gold}  ◆ ORACLE${ANSI.reset}`);
-    ws.sendLine(`${ANSI.dim}  ${'─'.repeat(50)}${ANSI.reset}`);
-    ws.sendLine(`  ${ANSI.darkGold}Status${ANSI.reset}     ${data.status || 'unknown'}`);
-    ws.sendLine(`  ${ANSI.darkGold}Endpoint${ANSI.reset}   ${ANSI.blue}acp.darksol.net/oracle${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Status${ANSI.reset}       ${data.status === 'ok' ? `${ANSI.green}● Online${ANSI.reset}` : `${ANSI.red}○ ${data.status}${ANSI.reset}`}`);
+    ws.sendLine(`  ${ANSI.darkGold}Contract${ANSI.reset}     ${ANSI.dim}${data.contract || '-'}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Chain${ANSI.reset}        ${ANSI.white}${data.chain || 'base'}${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.darkGold}Block${ANSI.reset}        ${ANSI.white}${data.blockNumber || '-'}${ANSI.reset}`);
+    ws.sendLine('');
+    ws.sendLine(`  ${ANSI.gold}ENDPOINTS${ANSI.reset}  ${ANSI.dim}x402-gated ($0.05 USDC on Base)${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.white}🪙 /coin${ANSI.reset}      ${ANSI.dim}Fair coin flip${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.white}🎲 /dice${ANSI.reset}      ${ANSI.dim}Roll with N sides${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.white}🔢 /number${ANSI.reset}    ${ANSI.dim}Random in range${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.white}🔀 /shuffle${ANSI.reset}   ${ANSI.dim}Shuffle a list${ANSI.reset}`);
+    ws.sendLine('');
+    ws.sendLine(`  ${ANSI.dim}CLI: darksol oracle flip / dice / number / shuffle${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.dim}Docs: https://acp.darksol.net/oracle${ANSI.reset}`);
     ws.sendLine('');
   } catch {
-    ws.sendLine(`  ${ANSI.dim}Oracle unreachable${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.red}○ Oracle unreachable${ANSI.reset}`);
+    ws.sendLine(`  ${ANSI.dim}Check: https://acp.darksol.net/oracle${ANSI.reset}`);
     ws.sendLine('');
   }
   return {};