opencode-studio-server 1.28.2 → 2.0.0

package/cli.js

@@ -4,9 +4,27 @@ const path = require('path');
 const { exec } = require('child_process');
 const os = require('os');
 const fs = require('fs');
+const net = require('net');
 
 const args = process.argv.slice(2);
 
+async function findAvailablePort(startPort, maxTries = 10) {
+    return new Promise((resolve) => {
+        const server = net.createServer();
+        server.listen(startPort, () => {
+            server.once('close', () => resolve(startPort));
+            server.close();
+        });
+        server.on('error', () => {
+            if (maxTries > 1) {
+                findAvailablePort(startPort + 1, maxTries - 1).then(resolve);
+            } else {
+                resolve(startPort);
+            }
+        });
+    });
+}
+
 // Handle --register flag
 if (args.includes('--register')) {
     require('./register-protocol');
@@ -103,27 +121,29 @@ if (pendingAction) {
 
 // Open browser if requested (only for fully local mode)
 if (shouldOpenBrowser) {
-    const openUrl = 'http://localhost:3000';
-    const platform = os.platform();
-    
-    setTimeout(() => {
-        let cmd;
-        if (platform === 'win32') {
-            cmd = `start "" "${openUrl}"`;
-        } else if (platform === 'darwin') {
-            cmd = `open "${openUrl}"`;
-        } else {
-            cmd = `xdg-open "${openUrl}"`;
-        }
-        
-        exec(cmd, (err) => {
-            if (err) {
-                console.log(`Open ${openUrl} in your browser`);
+    findAvailablePort(1080).then(port => {
+        const openUrl = `http://localhost:${port}`;
+        const platform = os.platform();
+
+        setTimeout(() => {
+            let cmd;
+            if (platform === 'win32') {
+                cmd = `start "" "${openUrl}"`;
+            } else if (platform === 'darwin') {
+                cmd = `open "${openUrl}"`;
             } else {
-                console.log(`Opened ${openUrl}`);
+                cmd = `xdg-open "${openUrl}"`;
             }
-        });
-    }, 1500); // Give server time to start
+
+            exec(cmd, (err) => {
+                if (err) {
+                    console.log(`Open ${openUrl} in your browser`);
+                } else {
+                    console.log(`Opened ${openUrl}`);
+                }
+            });
+        }, 2000);
+    });
 }
 
 // Start the server

package/index.js

@@ -40,9 +40,23 @@ const atomicWriteFileSync = (filePath, data, options = 'utf8') => {
     }
 };
 
-const app = express();
-const PORT = 3001;
-const IDLE_TIMEOUT_MS = 30 * 60 * 1000; 
+const app = express();
+const DEFAULT_PORT = 1920;
+const IDLE_TIMEOUT_MS = 30 * 60 * 1000;
+
+function findAvailablePort(startPort) {
+    const net = require('net');
+    return new Promise((resolve) => {
+        const server = net.createServer();
+        server.listen(startPort, () => {
+            server.once('close', () => resolve(startPort));
+            server.close();
+        });
+        server.on('error', () => {
+            findAvailablePort(startPort + 1).then(resolve);
+        });
+    });
+}
 
 let idleTimer = null;
 
@@ -61,15 +75,17 @@ app.use((req, res, next) => {
     next();
 });
 
-const ALLOWED_ORIGINS = [
-    'http://localhost:3000',
-    'http://127.0.0.1:3000',
-    'https://opencode-studio.vercel.app',
-    'https://opencode.micr.dev',
-    'https://opencode-studio.micr.dev',
-    /\.vercel\.app$/,
-    /\.micr\.dev$/,
-];
+const ALLOWED_ORIGINS = [
+    'http://localhost:1080',
+    'http://127.0.0.1:1080',
+    /^http:\/\/localhost:108\d$/,
+    /^http:\/\/127\.0\.0\.1:108\d$/,
+    'https://opencode-studio.vercel.app',
+    'https://opencode.micr.dev',
+    'https://opencode-studio.micr.dev',
+    /\.vercel\.app$/,
+    /\.micr\.dev$/,
+];
 
 app.use(cors({
     origin: (origin, callback) => {
@@ -3488,11 +3504,13 @@ app.post('/api/presets/:id/apply', (req, res) => {
     res.json({ success: true });
 });
 
-// Start watcher on server start
-function startServer() {
-    ['google', 'anthropic', 'openai', 'xai', 'openrouter', 'together', 'mistral', 'deepseek', 'amazon-bedrock', 'azure', 'github-copilot'].forEach(p => importCurrentAuthToPool(p));
-    app.listen(PORT, () => {
-        console.log(`Server running at http://localhost:${PORT}`);
+// Start watcher on server start
+async function startServer() {
+    ['google', 'anthropic', 'openai', 'xai', 'openrouter', 'together', 'mistral', 'deepseek', 'amazon-bedrock', 'azure', 'github-copilot'].forEach(p => importCurrentAuthToPool(p));
+
+    const port = await findAvailablePort(DEFAULT_PORT);
+    app.listen(port, () => {
+        console.log(`Server running at http://localhost:${port}`);
         // Initial sync on startup if enabled
         setTimeout(() => {
             const studio = loadStudioConfig();
@@ -3501,8 +3519,8 @@ function startServer() {
                 triggerGitHubAutoSync();
             }
         }, 5000);
-    });
-}
+    });
+}
 
 if (require.main === module) {
     startServer();

package/package.json

@@ -1,7 +1,7 @@
-{
-  "name": "opencode-studio-server",
-  "version": "1.28.2",
-  "description": "Backend server for OpenCode Studio - manages opencode configurations",
+{
+  "name": "opencode-studio-server",
+  "version": "2.0.0",
+  "description": "Backend server for OpenCode Studio - manages opencode configurations",
   "main": "index.js",
   "bin": {
     "opencode-studio-server": "cli.js"