claude-phone-local 2.0.6 → 2.0.7

package/cli/lib/commands/setup.js

@@ -938,6 +938,36 @@ async function setupAPIKeys(config) {
  * @returns {Promise<object>} Updated config
  */
 async function setupSIP(config) {
+  // Detect a native 3CX SBC service on this machine (checks the process and
+  // port 5060) so drachtio doesn't try to bind the same port and fail
+  // silently at startup - the exact bug this setup wizard used to leave
+  // standard ("both"/all-in-one) installs exposed to, since this detection
+  // previously only ran in the separate Pi-mode setup path.
+  const sbcSpinner = ora('Checking for a local 3CX SBC service...').start();
+  let sbcDetected = false;
+  try {
+    sbcDetected = await detect3cxSbc();
+    sbcSpinner.succeed(sbcDetected
+      ? '3CX SBC detected on this PC (port 5060 in use)'
+      : 'No local 3CX SBC detected');
+  } catch (err) {
+    sbcSpinner.warn('3CX SBC detection failed: ' + err.message);
+  }
+
+  const { sbcOnThisPc } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'sbcOnThisPc',
+      message: 'Is the 3CX SBC service running on this same PC?',
+      default: sbcDetected || config.sip.registrar === 'auto' || config.sip.registrar === config.server?.externalIp
+    }
+  ]);
+
+  config.sip.drachtioSipPort = sbcOnThisPc ? 5070 : 5060;
+  if (sbcOnThisPc) {
+    console.log(chalk.green('✓ Will use port 5070 for drachtio (avoid conflict with the SBC on port 5060)\n'));
+  }
+
   const answers = await inquirer.prompt([
     {
       type: 'input',
@@ -954,11 +984,11 @@ async function setupSIP(config) {
         return true;
       }
     },
-    {
+    ...(sbcOnThisPc ? [] : [{
       type: 'input',
       name: 'registrar',
       message: '3CX registrar IP (e.g., 192.168.1.100):',
-      default: config.sip.registrar,
+      default: config.sip.registrar === 'auto' ? '' : config.sip.registrar,
       validate: (input) => {
         if (!input || input.trim() === '') {
           return 'SIP registrar IP is required';
@@ -968,11 +998,14 @@ async function setupSIP(config) {
         }
         return true;
       }
-    }
+    }])
   ]);
 
   config.sip.domain = answers.domain;
-  config.sip.registrar = answers.registrar;
+  // 'auto' tracks this machine's current LAN IP on every `claude-phone
+  // start`, same as server.externalIp - the SBC and this app running on the
+  // same PC means both need to move together whenever the network changes.
+  config.sip.registrar = sbcOnThisPc ? 'auto' : answers.registrar;
 
   return config;
 }

package/cli/lib/docker.js

@@ -1,11 +1,13 @@
 import { spawn, execSync } from 'child_process';
 import crypto from 'crypto';
 import fs from 'fs';
+import path from 'path';
 import {
   getDockerComposePath,
   getEnvPath,
   getConfigDir
 } from './config.js';
+import { getLocalIP } from './utils.js';
 
 /**
  * Detect which docker compose command to use
@@ -86,18 +88,32 @@ export async function checkDocker() {
  * @returns {string} Docker compose YAML content
  */
 export function generateDockerCompose(config) {
-  const externalIp = config.server.externalIp === 'auto' ? '${EXTERNAL_IP}' : config.server.externalIp;
-  const drachtioPort = config.deployment?.pi?.drachtioPort || 5070;
+  const drachtioPort = config.deployment?.pi?.drachtioPort || config.sip?.drachtioSipPort || 5070;
   const rtpStart = config.server.rtpStart || 30000;
   const rtpEnd = config.server.rtpEnd || 30100;
 
+  // This file is written to ~/.claude-phone/ (getDockerComposePath()), which
+  // has no Dockerfile or source of its own - those live in the installed npm
+  // package directory (config.paths.voiceApp's parent). `build: .` would try
+  // to build from ~/.claude-phone and fail (or silently reuse a stale cached
+  // image tag from an unrelated build, masking the failure) on any machine
+  // without that image already present.
+  const projectRoot = config.paths?.voiceApp
+    ? path.dirname(config.paths.voiceApp)
+    : '.';
+
   // Single image: drachtio + FreeSWITCH + voice-app + STT + TTS under supervisord.
   // They talk over 127.0.0.1, so there is no container DNS to misconfigure.
   // Everything that must outlive a restart is on the ./data bind mount.
+  //
+  // EXTERNAL_IP is intentionally NOT set under `environment:` here - it comes
+  // from `.env` via env_file below. An explicit `environment:` entry would
+  // override env_file, so editing .env after a network change (a new LAN IP,
+  // a different office) would silently do nothing.
   return `# Generated by \`claude-phone setup\` - edit .env, not this file.
 services:
   claude-phone:
-    build: .
+    build: "${projectRoot.replace(/\\/g, '/')}"
     image: claude-phone-local:latest
     container_name: claude-phone
     restart: unless-stopped
@@ -109,7 +125,6 @@ services:
       - STT_LOCAL_URL=http://127.0.0.1:9001
       - TTS_LOCAL_URL=http://127.0.0.1:9002
       - AUDIO_BASE_URL=http://127.0.0.1:3000
-      - EXTERNAL_IP=${externalIp}
       - RTP_START=${rtpStart}
       - RTP_END=${rtpEnd}
     ports:
@@ -136,6 +151,15 @@ export function generateEnvFile(config) {
     };
   }
 
+  // 'auto' means re-detect the current LAN IP every time this is written
+  // (i.e. every `claude-phone start`), instead of using whatever IP was
+  // current the last time setup ran. A saved concrete IP goes stale the
+  // moment the machine moves networks (home <-> office, DHCP renewal) and
+  // nothing here writes to it again until setup is manually re-run.
+  const resolvedExternalIp = config.server.externalIp === 'auto'
+    ? getLocalIP()
+    : config.server.externalIp;
+
   // Determine Claude API URL based on deployment mode
   let claudeApiUrl;
   if (config.deployment && config.deployment.mode === 'pi-split' && config.deployment.pi && config.deployment.pi.macIp) {
@@ -162,14 +186,14 @@ export function generateEnvFile(config) {
     '# ====================================',
     '',
     '# Network Configuration',
-    `EXTERNAL_IP=${config.server.externalIp === 'auto' ? 'auto' : config.server.externalIp}`,
+    `EXTERNAL_IP=${resolvedExternalIp}`,
     '',
     '# Drachtio Configuration',
     'DRACHTIO_HOST=drachtio',
     'DRACHTIO_PORT=9022',
     `DRACHTIO_SECRET=${config.secrets.drachtio}`,
     // SIP port for Contact header (5070 when 3CX SBC is present, 5060 otherwise)
-    `DRACHTIO_SIP_PORT=${config.deployment?.pi?.drachtioPort || 5060}`,
+    `DRACHTIO_SIP_PORT=${config.sip?.drachtioSipPort || config.deployment?.pi?.drachtioPort || 5070}`,
     '',
     '# FreeSWITCH Configuration',
     'FREESWITCH_HOST=freeswitch',
@@ -179,7 +203,10 @@ export function generateEnvFile(config) {
     '',
     '# 3CX / SIP Configuration',
     `SIP_DOMAIN=${config.sip.domain}`,
-    `SIP_REGISTRAR=${config.sip.registrar}`,
+    // 'auto' means the 3CX SBC runs on this same PC, so its address is
+    // whatever this machine's current LAN IP is - re-resolved every start,
+    // same reasoning as EXTERNAL_IP above.
+    `SIP_REGISTRAR=${config.sip.registrar === 'auto' ? resolvedExternalIp : config.sip.registrar}`,
     '',
     '# Default extension (primary device)',
     `SIP_EXTENSION=${config.devices[0].extension}`,
@@ -196,7 +223,7 @@ export function generateEnvFile(config) {
       `STT_LOCAL_URL=${config.api.local?.sttUrl || 'http://stt-local:9001'}`,
       `TTS_LOCAL_URL=${config.api.local?.ttsUrl || 'http://tts-local:9002'}`,
       `AUDIO_BASE_URL=${config.api.local?.audioBaseUrl || 'http://voice-app:3000'}`,
-      `PIPER_VOICE=${config.devices[0].voiceId || config.api.local?.voice || 'en_US-lessac-medium'}`,
+      `PIPER_VOICE=${config.devices[0].voice || config.api.local?.voice || 'en_US-lessac-medium'}`,
       `WHISPER_MODEL=${config.api.local?.whisperModel || 'small'}`,
       ''
     ] : [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-phone-local",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Local/offline fork of NetworkChuck's claude-phone: talk to Claude Code over 3CX/SIP with faster-whisper STT + Piper TTS in one Docker container.",
   "type": "module",
   "bin": {