@occam-scaly/scaly-cli 0.2.11 → 0.2.12

package/bin/scaly.js

@@ -83,10 +83,10 @@ Usage:
   scaly secrets sync --app <appId> [--config-app <name>] [--env dev|prod] [--dry-run] [--apply] [--json]
 
   scaly login --token <api-bearer> [--endpoint https://api.<stage>.scalyapps.io/graphql] | --clear
-  scaly db connect --addon <addOnId> [--ttl-minutes 60] [--local-port 5432] [--host 127.0.0.1] [--copy] [--show] [--json]
-  scaly db shell  --addon <addOnId> [--ttl-minutes 60] [--local-port 5432] [--host 127.0.0.1]
-  scaly db schema dump --addon <addOnId> [--out .scaly/schema.sql] [--ttl-minutes 60]
-  scaly db migrate <sql-file> --addon <addOnId> [--ttl-minutes 60] [--yes]
+  scaly db connect --addon <addOnId> [--ttl-minutes 60] [--local-port 55432] [--host 127.0.0.1] [--copy] [--show] [--json]
+  scaly db shell  --addon <addOnId> [--ttl-minutes 60] [--local-port 55432] [--host 127.0.0.1]
+  scaly db schema dump --addon <addOnId> [--out .scaly/schema.sql] [--ttl-minutes 60] [--local-port 55432] [--host 127.0.0.1]
+  scaly db migrate <sql-file> --addon <addOnId> [--ttl-minutes 60] [--local-port 55432] [--host 127.0.0.1] [--yes]
   scaly deploy --app <appId> [--watch] [--strategy auto|git|restart|upload] [--json]
     - upload flags: [--path <dir>] [--preview] [--yes] [--allow-unsafe] [--max-bytes N] [--max-files N]
   scaly logs --follow --app <appId> [--since 10m] [--level error|warn|info|debug|all] [--q <str>] [--duration-seconds N] [--max-lines N] [--json]
@@ -104,6 +104,7 @@ Notes:
   - Wraps existing npm QA helpers and auto-loads .env.dev.scaly-deployer.local
   - If no AWS creds in env, runs under 'aws-vault exec scaly-dev'
   - DB tunnel requires a short-lived Scaly session token. Run: scaly auth login
+  - Default local port is 55432 to avoid conflicts with local Postgres (often 5432).
 `);
 }
 
@@ -2892,6 +2893,19 @@ async function startDbTunnelServer({ bearer, tunnelUrl, host, localPort }) {
   const { WebSocket, createWebSocketStream } = require('ws');
   const { pipeline } = require('stream');
 
+  const listenErrorHint = (err) => {
+    const code = err && err.code ? String(err.code) : '';
+    if (code !== 'EADDRINUSE') return null;
+    const port = localPort;
+    const alt = port === 5432 ? 55432 : port + 1;
+    return [
+      `[db connect] Port ${host}:${port} is already in use.`,
+      `  Try a different local port: scaly db connect --addon <id> --local-port ${alt}`,
+      `  Or find the process using the port: lsof -nP -iTCP:${port} -sTCP:LISTEN`,
+      `  Note: If your app runs in Docker, use DB_HOST=host.docker.internal (macOS/Windows).`
+    ].join('\n');
+  };
+
   const server = net.createServer((socket) => {
     socket.setNoDelay(true);
 
@@ -2925,7 +2939,15 @@ async function startDbTunnelServer({ bearer, tunnelUrl, host, localPort }) {
   });
 
   await new Promise((resolve, reject) => {
-    server.once('error', reject);
+    server.once('error', (err) => {
+      const hint = listenErrorHint(err);
+      if (hint) {
+        const e = new Error(hint);
+        e.code = 'SCALY_DB_LOCAL_PORT_IN_USE';
+        return reject(e);
+      }
+      return reject(err);
+    });
     server.listen(localPort, host, resolve);
   });
 
@@ -2951,14 +2973,23 @@ async function runDbConnect(rest) {
   const { addOnId, bearer, info, tunnelUrl } = minted;
 
   const host = f.host || '127.0.0.1';
-  const localPort = Number(f['local-port'] || info.port || 5432);
+  const localPort = Number(f['local-port'] || 55432);
 
-  const server = await startDbTunnelServer({
-    bearer,
-    tunnelUrl,
-    host,
-    localPort
-  });
+  let server;
+  try {
+    server = await startDbTunnelServer({
+      bearer,
+      tunnelUrl,
+      host,
+      localPort
+    });
+  } catch (e) {
+    const msg = String(e && e.message ? e.message : e);
+    if (json)
+      console.log(JSON.stringify({ ok: false, error: { message: msg } }));
+    else console.error(msg);
+    return 2;
+  }
 
   const psqlCmd = `PGSSLMODE=require PGPASSWORD='${info.token}' psql -h ${host} -p ${localPort} -U ${info.username} -d ${info.database}`;
   let copied = false;
@@ -3030,13 +3061,19 @@ async function runDbShell(rest) {
   }
   const { addOnId, bearer, info, tunnelUrl } = minted;
   const host = f.host || '127.0.0.1';
-  const localPort = Number(f['local-port'] || info.port || 5432);
-  const server = await startDbTunnelServer({
-    bearer,
-    tunnelUrl,
-    host,
-    localPort
-  });
+  const localPort = Number(f['local-port'] || 55432);
+  let server;
+  try {
+    server = await startDbTunnelServer({
+      bearer,
+      tunnelUrl,
+      host,
+      localPort
+    });
+  } catch (e) {
+    console.error(String(e && e.message ? e.message : e));
+    return 2;
+  }
 
   const env = {
     ...process.env,
@@ -3086,13 +3123,19 @@ async function runDbSchemaDump(rest) {
   }
   const { addOnId, bearer, info, tunnelUrl } = minted;
   const host = f.host || '127.0.0.1';
-  const localPort = Number(f['local-port'] || info.port || 5432);
-  const server = await startDbTunnelServer({
-    bearer,
-    tunnelUrl,
-    host,
-    localPort
-  });
+  const localPort = Number(f['local-port'] || 55432);
+  let server;
+  try {
+    server = await startDbTunnelServer({
+      bearer,
+      tunnelUrl,
+      host,
+      localPort
+    });
+  } catch (e) {
+    console.error(String(e && e.message ? e.message : e));
+    return 2;
+  }
 
   const env = {
     ...process.env,
@@ -3171,13 +3214,19 @@ async function runDbMigrate(rest) {
   }
   const { addOnId, bearer, info, tunnelUrl } = minted;
   const host = f.host || '127.0.0.1';
-  const localPort = Number(f['local-port'] || info.port || 5432);
-  const server = await startDbTunnelServer({
-    bearer,
-    tunnelUrl,
-    host,
-    localPort
-  });
+  const localPort = Number(f['local-port'] || 55432);
+  let server;
+  try {
+    server = await startDbTunnelServer({
+      bearer,
+      tunnelUrl,
+      host,
+      localPort
+    });
+  } catch (e) {
+    console.error(String(e && e.message ? e.message : e));
+    return 2;
+  }
 
   const env = {
     ...process.env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occam-scaly/scaly-cli",
-  "version": "0.2.11",
+  "version": "0.2.12",
   "description": "Scaly CLI (auth + project config helpers)",
   "bin": {
     "scaly": "./bin/scaly.js"