@optima-chat/dev-skills 0.7.32 → 0.7.33

package/bin/helpers/db-utils.ts

@@ -70,12 +70,48 @@ export function parseDatabaseUrl(url: string): { user: string; password: string;
 }
 
 // ─── SSH tunnel ─────────────────────────────────────────────────────────────
+// 端口被占不等于 tunnel 还能转发：AWS bastion idle 断连后，本地 ssh 进程还活着、
+// 端口还 LISTEN，但流量过不去，所有后续查询会 hang 到客户端 timeout。
+// 用 pg_isready 真去 ping postgres，超时就当 zombie，杀掉重建。
+function isTunnelHealthy(localPort: number): boolean {
+  try {
+    execSync(`pg_isready -h localhost -p ${localPort} -t 3 -q`, { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function killOrphanTunnel(localPort: number): void {
+  try {
+    const pids = execSync(`lsof -ti:${localPort}`, { encoding: 'utf-8' }).trim();
+    if (pids) execSync(`kill -9 ${pids.split(/\s+/).join(' ')}`, { stdio: 'ignore' });
+  } catch { /* nothing to kill */ }
+}
+
 export function setupSSHTunnel(dbHost: string, localPort: number): void {
-  try { execSync(`lsof -ti:${localPort}`, { stdio: 'ignore' }); return; } catch { /* need tunnel */ }
+  let portInUse = false;
+  try { execSync(`lsof -ti:${localPort}`, { stdio: 'ignore' }); portInUse = true; } catch { /* free */ }
+
+  if (portInUse) {
+    if (isTunnelHealthy(localPort)) return;
+    console.log(`! SSH tunnel on port ${localPort} not responding (zombie), replacing...`);
+    killOrphanTunnel(localPort);
+  }
+
   const sshKeyPath = `${process.env.HOME}/.ssh/optima-ec2-key`;
   if (!fs.existsSync(sshKeyPath)) throw new Error(`SSH key not found: ${sshKeyPath}. Please obtain optima-ec2-key from xbfool.`);
   console.log(`Creating SSH tunnel: localhost:${localPort} -> ${EC2_HOST} -> ${dbHost}:5432`);
-  execSync(`ssh -i ${sshKeyPath} -f -N -o StrictHostKeyChecking=no -L ${localPort}:${dbHost}:5432 ec2-user@${EC2_HOST}`, { stdio: 'inherit' });
+  // ServerAliveInterval/CountMax: 服务端 30s 没回应就让 ssh 自己退出（不留 zombie）
+  // ExitOnForwardFailure: 端口绑定失败立刻退出（不会黑悄悄继续跑）
+  // ConnectTimeout: 10s 不通就放弃（业界 ssh 默认 120s 太宽）
+  execSync(
+    `ssh -i ${sshKeyPath} -f -N -o StrictHostKeyChecking=no ` +
+    `-o ServerAliveInterval=30 -o ServerAliveCountMax=3 ` +
+    `-o ExitOnForwardFailure=yes -o ConnectTimeout=10 ` +
+    `-L ${localPort}:${dbHost}:5432 ec2-user@${EC2_HOST}`,
+    { stdio: 'inherit' }
+  );
 }
 
 // ─── psql ───────────────────────────────────────────────────────────────────

package/dist/bin/helpers/db-utils.js

@@ -92,17 +92,50 @@ function parseDatabaseUrl(url) {
     return { user: decodeURIComponent(match[1]), password: decodeURIComponent(match[2]), host: match[3], port: parseInt(match[4], 10), database: match[5] };
 }
 // ─── SSH tunnel ─────────────────────────────────────────────────────────────
+// 端口被占不等于 tunnel 还能转发：AWS bastion idle 断连后，本地 ssh 进程还活着、
+// 端口还 LISTEN，但流量过不去，所有后续查询会 hang 到客户端 timeout。
+// 用 pg_isready 真去 ping postgres，超时就当 zombie，杀掉重建。
+function isTunnelHealthy(localPort) {
+    try {
+        (0, child_process_1.execSync)(`pg_isready -h localhost -p ${localPort} -t 3 -q`, { stdio: 'ignore' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function killOrphanTunnel(localPort) {
+    try {
+        const pids = (0, child_process_1.execSync)(`lsof -ti:${localPort}`, { encoding: 'utf-8' }).trim();
+        if (pids)
+            (0, child_process_1.execSync)(`kill -9 ${pids.split(/\s+/).join(' ')}`, { stdio: 'ignore' });
+    }
+    catch { /* nothing to kill */ }
+}
 function setupSSHTunnel(dbHost, localPort) {
+    let portInUse = false;
     try {
         (0, child_process_1.execSync)(`lsof -ti:${localPort}`, { stdio: 'ignore' });
-        return;
+        portInUse = true;
+    }
+    catch { /* free */ }
+    if (portInUse) {
+        if (isTunnelHealthy(localPort))
+            return;
+        console.log(`! SSH tunnel on port ${localPort} not responding (zombie), replacing...`);
+        killOrphanTunnel(localPort);
     }
-    catch { /* need tunnel */ }
     const sshKeyPath = `${process.env.HOME}/.ssh/optima-ec2-key`;
     if (!fs.existsSync(sshKeyPath))
         throw new Error(`SSH key not found: ${sshKeyPath}. Please obtain optima-ec2-key from xbfool.`);
     console.log(`Creating SSH tunnel: localhost:${localPort} -> ${EC2_HOST} -> ${dbHost}:5432`);
-    (0, child_process_1.execSync)(`ssh -i ${sshKeyPath} -f -N -o StrictHostKeyChecking=no -L ${localPort}:${dbHost}:5432 ec2-user@${EC2_HOST}`, { stdio: 'inherit' });
+    // ServerAliveInterval/CountMax: 服务端 30s 没回应就让 ssh 自己退出（不留 zombie）
+    // ExitOnForwardFailure: 端口绑定失败立刻退出（不会黑悄悄继续跑）
+    // ConnectTimeout: 10s 不通就放弃（业界 ssh 默认 120s 太宽）
+    (0, child_process_1.execSync)(`ssh -i ${sshKeyPath} -f -N -o StrictHostKeyChecking=no ` +
+        `-o ServerAliveInterval=30 -o ServerAliveCountMax=3 ` +
+        `-o ExitOnForwardFailure=yes -o ConnectTimeout=10 ` +
+        `-L ${localPort}:${dbHost}:5432 ec2-user@${EC2_HOST}`, { stdio: 'inherit' });
 }
 // ─── psql ───────────────────────────────────────────────────────────────────
 function findPsqlPath() {

package/dist/bin/helpers/grant-credits.js

@@ -0,0 +1,71 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const db_utils_1 = require("./db-utils");
+function parseArgs(args) {
+    if (args.length === 0 || args[0] === '--help' || args[0] === '-h') {
+        console.log(`Usage: optima-grant-credits <email> --amount <n> [options]
+
+Options:
+  --amount <n>          Credits to grant (required)
+  --type <type>         Credit type: bonus, referral (default: bonus)
+  --description <text>  Description (optional)
+  --env <env>           Environment: stage, prod (default: stage)
+  -h, --help            Show this help`);
+        process.exit(0);
+    }
+    const email = args[0];
+    let amount = 0;
+    let type = 'bonus';
+    let description = null;
+    let env = 'stage';
+    for (let i = 1; i < args.length; i++) {
+        if (args[i] === '--amount' && args[i + 1]) {
+            amount = parseInt(args[++i], 10);
+        }
+        else if (args[i] === '--type' && args[i + 1]) {
+            type = args[++i];
+        }
+        else if (args[i] === '--description' && args[i + 1]) {
+            description = args[++i];
+        }
+        else if (args[i] === '--env' && args[i + 1]) {
+            env = args[++i];
+        }
+    }
+    if (amount < 1) {
+        console.error('--amount is required and must be >= 1');
+        process.exit(1);
+    }
+    if (!['bonus', 'referral'].includes(type)) {
+        console.error(`Unknown type: ${type}. Available: bonus, referral`);
+        process.exit(1);
+    }
+    if (!['stage', 'prod'].includes(env)) {
+        console.error('Env must be stage or prod (billing DB not available in CI)');
+        process.exit(1);
+    }
+    return { email, amount, type, description, env };
+}
+async function main() {
+    const { email, amount, type, description, env } = parseArgs(process.argv.slice(2));
+    const infisicalConfig = (0, db_utils_1.getInfisicalConfig)();
+    const token = (0, db_utils_1.getInfisicalToken)(infisicalConfig);
+    console.log(`\n🎁 Granting ${amount} ${type} credits to ${email} [${env.toUpperCase()}]\n`);
+    const userId = await (0, db_utils_1.resolveUserId)(email, env, infisicalConfig, token);
+    const billing = await (0, db_utils_1.connectBillingDB)(env, infisicalConfig, token);
+    const bq = billing.query;
+    const now = new Date().toISOString();
+    const safeUserId = (0, db_utils_1.escapeSQL)(userId);
+    const safeType = (0, db_utils_1.escapeSQL)(type);
+    const safeDesc = (0, db_utils_1.escapeSQL)(description || `Admin ${type} credit grant`);
+    console.log(`Inserting ${amount} ${type} credits...`);
+    const ledgerId = bq(`INSERT INTO credit_ledger (id, user_id, type, description, initial_amount, remaining, created_at) VALUES (concat('crd_${safeType}_', substr(md5(random()::text), 1, 16)), '${safeUserId}', '${safeType}', '${safeDesc}', ${amount}, ${amount}, '${now}') RETURNING id`);
+    console.log(`✓ Credits granted (ledger ID: ${ledgerId})`);
+    const balance = bq(`SELECT COALESCE(SUM(remaining), 0) FROM credit_ledger WHERE user_id='${safeUserId}' AND remaining > 0 AND (expires_at IS NULL OR expires_at > NOW())`);
+    console.log(`\n✅ Done! ${email} now has ${balance} total credits\n`);
+}
+main().catch(error => {
+    console.error('\n❌ Error:', error.message);
+    process.exit(1);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optima-chat/dev-skills",
-  "version": "0.7.32",
+  "version": "0.7.33",
   "description": "Claude Code Skills for Optima development team - cross-environment collaboration tools",
   "main": "index.js",
   "bin": {