uloop-cli 0.62.1 → 0.62.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uloop-cli",
-  "version": "0.62.1",
+  "version": "0.62.2",
   "//version": "x-release-please-version",
   "description": "CLI tool for Unity Editor communication via uLoopMCP",
   "main": "dist/cli.bundle.cjs",

package/src/__tests__/port-resolver.test.ts

@@ -0,0 +1,63 @@
+import { resolvePortFromUnitySettings } from '../port-resolver.js';
+
+describe('resolvePortFromUnitySettings', () => {
+  it('returns serverPort when server is running and serverPort is valid', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: true,
+      serverPort: 8711,
+      customPort: 8700,
+    });
+
+    expect(port).toBe(8711);
+  });
+
+  it('returns customPort when server is not running', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: false,
+      serverPort: 8711,
+      customPort: 8700,
+    });
+
+    expect(port).toBe(8700);
+  });
+
+  it('returns customPort when serverPort is invalid', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: false,
+      serverPort: 0,
+      customPort: 8711,
+    });
+
+    expect(port).toBe(8711);
+  });
+
+  it('falls back to serverPort when customPort is invalid', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: false,
+      serverPort: 8711,
+      customPort: 0,
+    });
+
+    expect(port).toBe(8711);
+  });
+
+  it('returns null when both ports are invalid', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: false,
+      serverPort: 0,
+      customPort: 0,
+    });
+
+    expect(port).toBeNull();
+  });
+
+  it('returns null when port is not an integer', () => {
+    const port = resolvePortFromUnitySettings({
+      isServerRunning: true,
+      serverPort: 8711.5,
+      customPort: 8700.1,
+    });
+
+    expect(port).toBeNull();
+  });
+});

package/src/default-tools.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.62.1",
+  "version": "0.62.2",
   "tools": [
     {
       "name": "compile",

package/src/port-resolver.ts

@@ -14,10 +14,46 @@ import { findUnityProjectRoot } from './project-root.js';
 const DEFAULT_PORT = 8700;
 
 interface UnityMcpSettings {
+  isServerRunning?: boolean;
   serverPort?: number;
   customPort?: number;
 }
 
+function normalizePort(port: unknown): number | null {
+  if (typeof port !== 'number') {
+    return null;
+  }
+
+  if (!Number.isInteger(port)) {
+    return null;
+  }
+
+  if (port < 1 || port > 65535) {
+    return null;
+  }
+
+  return port;
+}
+
+export function resolvePortFromUnitySettings(settings: UnityMcpSettings): number | null {
+  const serverPort = normalizePort(settings.serverPort);
+  const customPort = normalizePort(settings.customPort);
+
+  if (settings.isServerRunning === true && serverPort !== null) {
+    return serverPort;
+  }
+
+  if (customPort !== null) {
+    return customPort;
+  }
+
+  if (serverPort !== null) {
+    return serverPort;
+  }
+
+  return null;
+}
+
 export async function resolveUnityPort(explicitPort?: number): Promise<number> {
   if (explicitPort !== undefined) {
     return explicitPort;
@@ -57,13 +93,5 @@ async function readPortFromSettings(projectRoot: string): Promise<number | null>
     return null;
   }
 
-  if (typeof settings.serverPort === 'number') {
-    return settings.serverPort;
-  }
-
-  if (typeof settings.customPort === 'number') {
-    return settings.customPort;
-  }
-
-  return null;
+  return resolvePortFromUnitySettings(settings);
 }

package/src/version.ts

@@ -4,4 +4,4 @@
  * This file exists to avoid bundling the entire package.json into the CLI bundle.
  * This version is automatically updated by release-please.
  */
-export const VERSION = '0.62.1'; // x-release-please-version
+export const VERSION = '0.62.2'; // x-release-please-version