run402 1.8.2 → 1.9.0

package/lib/apps.mjs

@@ -1,5 +1,4 @@
-import { findProject, loadProjects, saveProjects, API, PROJECTS_FILE, walletAuthHeaders } from "./config.mjs";
-import { mkdirSync, writeFileSync } from "fs";
+import { findProject, API, walletAuthHeaders, saveProject } from "./config.mjs";
 
 const HELP = `run402 apps — Browse and manage the app marketplace
 
@@ -63,15 +62,12 @@ async function fork(versionId, name, args) {
 
   // Save project credentials locally
   if (data.project_id) {
-    const projects = loadProjects();
-    projects.push({
-      project_id: data.project_id, anon_key: data.anon_key, service_key: data.service_key,
+    saveProject(data.project_id, {
+      anon_key: data.anon_key, service_key: data.service_key,
       tier: data.tier, lease_expires_at: data.lease_expires_at,
-      site_url: data.site_url || data.subdomain_url, deployed_at: new Date().toISOString(),
+      site_url: data.site_url || data.subdomain_url,
+      deployed_at: new Date().toISOString(),
     });
-    const dir = PROJECTS_FILE.replace(/\/[^/]+$/, "");
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(PROJECTS_FILE, JSON.stringify(projects, null, 2), { mode: 0o600 });
   }
   console.log(JSON.stringify(data, null, 2));
 }

package/lib/config.mjs

@@ -1,53 +1,37 @@
 /**
- * Run402 config loader — reads local project and wallet state.
- * Kept in a separate module so credential reads stay isolated.
+ * Run402 config loader — thin wrapper over core/ shared modules.
+ * Adds CLI-specific behavior: process.exit() on errors.
  */
 
-import { readFileSync, writeFileSync, existsSync, mkdirSync, chmodSync, renameSync } from "fs";
-import { join, dirname } from "path";
-import { homedir } from "os";
-import { randomBytes } from "crypto";
+import { getApiBase, getConfigDir, getKeystorePath, getWalletPath } from "../../core/dist/config.js";
+import { readWallet as coreReadWallet, saveWallet as coreSaveWallet } from "../../core/dist/wallet.js";
+import { getWalletAuthHeaders } from "../../core/dist/wallet-auth.js";
+import { loadKeyStore, getProject, saveProject, removeProject, saveKeyStore } from "../../core/dist/keystore.js";
 
-export const CONFIG_DIR = join(homedir(), ".config", "run402");
-export const WALLET_FILE = join(CONFIG_DIR, "wallet.json");
-export const PROJECTS_FILE = join(CONFIG_DIR, "projects.json");
-export const API = "https://api.run402.com";
+export const CONFIG_DIR = getConfigDir();
+export const WALLET_FILE = getWalletPath();
+export const PROJECTS_FILE = getKeystorePath();
+export const API = getApiBase();
 
 export function readWallet() {
-  if (!existsSync(WALLET_FILE)) return null;
-  return JSON.parse(readFileSync(WALLET_FILE, "utf-8"));
+  return coreReadWallet();
 }
 
 export function saveWallet(data) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  const tmp = join(CONFIG_DIR, `.wallet.${randomBytes(4).toString("hex")}.tmp`);
-  writeFileSync(tmp, JSON.stringify(data, null, 2), { mode: 0o600 });
-  renameSync(tmp, WALLET_FILE);
-  chmodSync(WALLET_FILE, 0o600);
-}
-
-export function loadProjects() {
-  if (!existsSync(PROJECTS_FILE)) return [];
-  return JSON.parse(readFileSync(PROJECTS_FILE, "utf-8"));
-}
-
-export function saveProjects(projects) {
-  mkdirSync(CONFIG_DIR, { recursive: true });
-  writeFileSync(PROJECTS_FILE, JSON.stringify(projects, null, 2), { mode: 0o600 });
+  coreSaveWallet(data);
 }
 
 export async function walletAuthHeaders() {
-  const w = readWallet();
-  if (!w) { console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create" })); process.exit(1); }
-  const { privateKeyToAccount } = await import("viem/accounts");
-  const account = privateKeyToAccount(w.privateKey);
-  const timestamp = Math.floor(Date.now() / 1000).toString();
-  const signature = await account.signMessage({ message: `run402:${timestamp}` });
-  return { "X-Run402-Wallet": account.address, "X-Run402-Signature": signature, "X-Run402-Timestamp": timestamp };
+  const headers = getWalletAuthHeaders();
+  if (!headers) { console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create" })); process.exit(1); }
+  return headers;
 }
 
 export function findProject(id) {
-  const p = loadProjects().find(p => p.project_id === id);
+  const p = getProject(id);
   if (!p) { console.error(`Project ${id} not found in local registry.`); process.exit(1); }
   return p;
 }
+
+// Re-export core keystore functions for direct use
+export { loadKeyStore, saveProject, removeProject, saveKeyStore };

package/lib/deploy.mjs

@@ -1,5 +1,5 @@
-import { readFileSync, mkdirSync, writeFileSync } from "fs";
-import { loadProjects, API, PROJECTS_FILE, walletAuthHeaders } from "./config.mjs";
+import { readFileSync } from "fs";
+import { API, walletAuthHeaders, saveProject } from "./config.mjs";
 
 const HELP = `run402 deploy — Deploy a full-stack app or static site on Run402
 
@@ -39,14 +39,6 @@ async function readStdin() {
   return Buffer.concat(chunks).toString("utf-8");
 }
 
-function saveProject(project) {
-  const projects = loadProjects();
-  projects.push({ project_id: project.project_id, anon_key: project.anon_key, service_key: project.service_key, tier: project.tier, lease_expires_at: project.lease_expires_at, site_url: project.site_url || project.subdomain_url, deployed_at: new Date().toISOString() });
-  const dir = PROJECTS_FILE.replace(/\/[^/]+$/, "");
-  mkdirSync(dir, { recursive: true });
-  writeFileSync(PROJECTS_FILE, JSON.stringify(projects, null, 2), { mode: 0o600 });
-}
-
 export async function run(args) {
   const opts = { manifest: null };
   for (let i = 0; i < args.length; i++) {
@@ -60,6 +52,13 @@ export async function run(args) {
   const res = await fetch(`${API}/deploy/v1`, { method: "POST", headers: { "Content-Type": "application/json", ...authHeaders }, body: JSON.stringify(manifest) });
   const result = await res.json();
   if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...result })); process.exit(1); }
-  saveProject(result);
+  if (result.project_id) {
+    saveProject(result.project_id, {
+      anon_key: result.anon_key, service_key: result.service_key,
+      tier: result.tier, lease_expires_at: result.lease_expires_at,
+      site_url: result.site_url || result.subdomain_url,
+      deployed_at: new Date().toISOString(),
+    });
+  }
   console.log(JSON.stringify(result, null, 2));
 }

package/lib/image.mjs

@@ -1,5 +1,6 @@
-import { writeFileSync, existsSync } from "fs";
-import { readWallet, API, WALLET_FILE } from "./config.mjs";
+import { writeFileSync } from "fs";
+import { API, WALLET_FILE } from "./config.mjs";
+import { setupPaidFetch } from "./paid-fetch.mjs";
 
 const HELP = `run402 image — Generate AI images via x402 micropayments
 
@@ -49,22 +50,8 @@ export async function run(sub, args) {
   }
 
   if (!opts.prompt) { console.error(JSON.stringify({ status: "error", message: "Prompt required. Usage: run402 image generate \"your prompt\"" })); process.exit(1); }
-  if (!existsSync(WALLET_FILE)) { console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create && run402 wallet fund" })); process.exit(1); }
 
-  const wallet = readWallet();
-  const { privateKeyToAccount } = await import("viem/accounts");
-  const { createPublicClient, http } = await import("viem");
-  const { baseSepolia } = await import("viem/chains");
-  const { x402Client, wrapFetchWithPayment } = await import("@x402/fetch");
-  const { ExactEvmScheme } = await import("@x402/evm/exact/client");
-  const { toClientEvmSigner } = await import("@x402/evm");
-
-  const account = privateKeyToAccount(wallet.privateKey);
-  const publicClient = createPublicClient({ chain: baseSepolia, transport: http() });
-  const signer = toClientEvmSigner(account, publicClient);
-  const client = new x402Client();
-  client.register("eip155:84532", new ExactEvmScheme(signer));
-  const fetchPaid = wrapFetchWithPayment(fetch, client);
+  const fetchPaid = await setupPaidFetch();
 
   const res = await fetchPaid(`${API}/generate-image/v1`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ prompt: opts.prompt, aspect: opts.aspect }) });
   const data = await res.json();

package/lib/init.mjs

@@ -1,4 +1,4 @@
-import { readWallet, saveWallet, loadProjects, CONFIG_DIR, WALLET_FILE, API } from "./config.mjs";
+import { readWallet, saveWallet, loadKeyStore, CONFIG_DIR, WALLET_FILE, API } from "./config.mjs";
 import { mkdirSync } from "fs";
 
 const USDC_ABI = [{ name: "balanceOf", type: "function", stateMutability: "view", inputs: [{ name: "account", type: "address" }], outputs: [{ name: "", type: "uint256" }] }];
@@ -91,8 +91,8 @@ export async function run() {
   }
 
   // 5. Projects
-  const projects = loadProjects();
-  line("Projects", `${projects.length} active`);
+  const store = loadKeyStore();
+  line("Projects", `${Object.keys(store.projects).length} active`);
 
   // 6. Next step
   console.log();

package/lib/paid-fetch.mjs

@@ -0,0 +1,27 @@
+/**
+ * Shared x402 payment wrapper for CLI commands that need paid fetch.
+ * Uses viem for wallet signing + @x402/fetch for payment wrapping.
+ */
+
+import { readWallet, WALLET_FILE } from "./config.mjs";
+import { existsSync } from "fs";
+
+export async function setupPaidFetch() {
+  if (!existsSync(WALLET_FILE)) {
+    console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create && run402 wallet fund" }));
+    process.exit(1);
+  }
+  const wallet = readWallet();
+  const { privateKeyToAccount } = await import("viem/accounts");
+  const { createPublicClient, http } = await import("viem");
+  const { baseSepolia } = await import("viem/chains");
+  const { x402Client, wrapFetchWithPayment } = await import("@x402/fetch");
+  const { ExactEvmScheme } = await import("@x402/evm/exact/client");
+  const { toClientEvmSigner } = await import("@x402/evm");
+  const account = privateKeyToAccount(wallet.privateKey);
+  const publicClient = createPublicClient({ chain: baseSepolia, transport: http() });
+  const signer = toClientEvmSigner(account, publicClient);
+  const client = new x402Client();
+  client.register("eip155:84532", new ExactEvmScheme(signer));
+  return wrapFetchWithPayment(fetch, client);
+}

package/lib/projects.mjs

@@ -1,5 +1,4 @@
-import { findProject, loadProjects, saveProjects, API, PROJECTS_FILE, walletAuthHeaders } from "./config.mjs";
-import { mkdirSync, writeFileSync } from "fs";
+import { findProject, loadKeyStore, saveProject, removeProject, API, walletAuthHeaders } from "./config.mjs";
 
 const HELP = `run402 projects — Manage your deployed Run402 projects
 
@@ -61,14 +60,11 @@ async function provision(args) {
   if (!res.ok) { console.error(JSON.stringify({ status: "error", http: res.status, ...data })); process.exit(1); }
   // Save project credentials locally
   if (data.project_id) {
-    const projects = loadProjects();
-    projects.push({
-      project_id: data.project_id, anon_key: data.anon_key, service_key: data.service_key,
-      tier: data.tier, lease_expires_at: data.lease_expires_at, deployed_at: new Date().toISOString(),
+    saveProject(data.project_id, {
+      anon_key: data.anon_key, service_key: data.service_key,
+      tier: data.tier, lease_expires_at: data.lease_expires_at,
+      deployed_at: new Date().toISOString(),
     });
-    const dir = PROJECTS_FILE.replace(/\/[^/]+$/, "");
-    mkdirSync(dir, { recursive: true });
-    writeFileSync(PROJECTS_FILE, JSON.stringify(projects, null, 2), { mode: 0o600 });
   }
   console.log(JSON.stringify(data, null, 2));
 }
@@ -87,9 +83,10 @@ async function rls(projectId, template, tablesJson) {
 }
 
 async function list() {
-  const projects = loadProjects();
-  if (projects.length === 0) { console.log(JSON.stringify({ status: "ok", projects: [], message: "No projects yet." })); return; }
-  console.log(JSON.stringify(projects.map(p => ({ project_id: p.project_id, tier: p.tier, site_url: p.site_url, lease_expires_at: p.lease_expires_at, deployed_at: p.deployed_at })), null, 2));
+  const store = loadKeyStore();
+  const entries = Object.entries(store.projects);
+  if (entries.length === 0) { console.log(JSON.stringify({ status: "ok", projects: [], message: "No projects yet." })); return; }
+  console.log(JSON.stringify(entries.map(([id, p]) => ({ project_id: id, tier: p.tier, site_url: p.site_url, lease_expires_at: p.lease_expires_at, deployed_at: p.deployed_at })), null, 2));
 }
 
 async function sqlCmd(projectId, query) {
@@ -124,7 +121,7 @@ async function deleteProject(projectId) {
   const p = findProject(projectId);
   const res = await fetch(`${API}/projects/v1/${projectId}`, { method: "DELETE", headers: { "Authorization": `Bearer ${p.service_key}` } });
   if (res.status === 204 || res.ok) {
-    saveProjects(loadProjects().filter(pr => pr.project_id !== projectId));
+    removeProject(projectId);
     console.log(JSON.stringify({ status: "ok", message: `Project ${projectId} deleted.` }));
   } else {
     const data = await res.json().catch(() => ({}));

package/lib/tier.mjs

@@ -1,5 +1,5 @@
 import { readWallet, WALLET_FILE, API } from "./config.mjs";
-import { existsSync } from "fs";
+import { setupPaidFetch } from "./paid-fetch.mjs";
 
 const HELP = `run402 tier — Manage your Run402 tier subscription
 
@@ -24,26 +24,6 @@ Examples:
   run402 tier set hobby
 `;
 
-async function setupPaidFetch() {
-  if (!existsSync(WALLET_FILE)) {
-    console.error(JSON.stringify({ status: "error", message: "No wallet found. Run: run402 wallet create && run402 wallet fund" }));
-    process.exit(1);
-  }
-  const wallet = readWallet();
-  const { privateKeyToAccount } = await import("viem/accounts");
-  const { createPublicClient, http } = await import("viem");
-  const { baseSepolia } = await import("viem/chains");
-  const { x402Client, wrapFetchWithPayment } = await import("@x402/fetch");
-  const { ExactEvmScheme } = await import("@x402/evm/exact/client");
-  const { toClientEvmSigner } = await import("@x402/evm");
-  const account = privateKeyToAccount(wallet.privateKey);
-  const publicClient = createPublicClient({ chain: baseSepolia, transport: http() });
-  const signer = toClientEvmSigner(account, publicClient);
-  const client = new x402Client();
-  client.register("eip155:84532", new ExactEvmScheme(signer));
-  return wrapFetchWithPayment(fetch, client);
-}
-
 async function status() {
   const w = readWallet();
   if (!w) { console.log(JSON.stringify({ status: "error", message: "No wallet. Run: run402 wallet create" })); process.exit(1); }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "run402",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "CLI for Run402 — provision Postgres databases, deploy static sites, generate images, and manage wallets via x402 micropayments.",
   "type": "module",
   "bin": {