@livedesk/client 0.1.4 → 0.1.5

package/README.md

@@ -16,6 +16,15 @@ On the manager computer, open the LiveDesk dashboard and sign in first. The
 dashboard keeps its local hub address and private pair token refreshed in the
 LiveDesk Supabase registry for the signed-in account.
 
+Supabase Auth must allow the CLI callback URL:
+
+```text
+http://127.0.0.1:5198/callback
+```
+
+If you use a custom port, run `npx @livedesk/client --auth-port 5200` and add
+the matching callback URL to Supabase Auth redirect URLs.
+
 For manual LAN fallback, start `@livedesk/hub` with an externally reachable
 RemoteHub host and pass the address/token explicitly:
 
@@ -43,5 +52,6 @@ npx @livedesk/client --no-thumbnail
 npx @livedesk/client --no-live
 npx @livedesk/client --engine node
 npx @livedesk/client --engine fast --trace-frames
+npx @livedesk/client --auth-port 5200
 npx @livedesk/client --logout
 ```

package/bin/livedesk-client.js

@@ -13,6 +13,8 @@ const packageRoot = resolve(__dirname, '..');
 const nodeAgentPath = join(__dirname, 'livedesk-client-node.js');
 const FAST_PREFLIGHT_TIMEOUT_MS = 5000;
 const DEFAULT_MANAGER = '127.0.0.1:5197';
+const DEFAULT_AUTH_CALLBACK_HOST = '127.0.0.1';
+const DEFAULT_AUTH_CALLBACK_PORT = 5198;
 const SUPABASE_URL = process.env.LIVEDESK_SUPABASE_URL || 'https://otbyfkjxrkngvjziawki.supabase.co';
 const SUPABASE_PUBLISHABLE_KEY = process.env.LIVEDESK_SUPABASE_PUBLISHABLE_KEY || 'sb_publishable_NpUs0RDJH2YnllsqTKO6TQ_1jTdSsNQ';
 const CLIENT_STATE_DIR = join(os.homedir(), '.livedesk-client');
@@ -47,6 +49,7 @@ Options:
   --no-tasks                      Disable remote task dispatch capability.
   --login                         Sign in with Google and auto-discover manager.
   --logout                        Forget saved Google session before connecting.
+  --auth-port <port>              Google sign-in callback port. Default: 5198.
   --version                       Show the agent version.
   --help                          Show this help.
 
@@ -80,6 +83,7 @@ function parseLauncherArgs(argv) {
     let manager = process.env.LIVEDESK_CLIENT_MANAGER || process.env.MINDEXEC_REMOTE_MANAGER || '';
     let pair = process.env.LIVEDESK_CLIENT_PAIR_TOKEN || process.env.MINDEXEC_REMOTE_PAIR_TOKEN || '';
     let slot = process.env.LIVEDESK_CLIENT_SLOT || process.env.MINDEXEC_REMOTE_SLOT || '';
+    let authPort = normalizePort(process.env.LIVEDESK_CLIENT_AUTH_PORT) || DEFAULT_AUTH_CALLBACK_PORT;
     let command = 'connect';
     let nodeOnlyFeature = false;
     let fakeThumbnail = false;
@@ -129,6 +133,11 @@ function parseLauncherArgs(argv) {
             logout = true;
             continue;
         }
+        if (arg === '--auth-port') {
+            authPort = normalizePort(argv[index + 1]) || authPort;
+            index += 1;
+            continue;
+        }
         if (arg === '--manager') {
             manager = argv[index + 1] || manager;
             forwarded.push(arg, argv[index + 1]);
@@ -178,11 +187,20 @@ function parseLauncherArgs(argv) {
         manager,
         pair,
         slot,
+        authPort,
         nodeOnlyFeature,
         fakeThumbnail
     };
 }
 
+function normalizePort(value) {
+    const port = Number(String(value || '').trim());
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        return 0;
+    }
+    return port;
+}
+
 function normalizeSlotNumber(value) {
     const number = Number(String(value || '').trim());
     if (!Number.isInteger(number) || number < 1 || number > 999) {
@@ -260,7 +278,9 @@ function openBrowser(url) {
     spawn(command, [url], { detached: true, stdio: 'ignore' }).unref();
 }
 
-async function startOAuthCallbackServer() {
+async function startOAuthCallbackServer(options = {}) {
+    const host = String(process.env.LIVEDESK_CLIENT_AUTH_HOST || DEFAULT_AUTH_CALLBACK_HOST).trim() || DEFAULT_AUTH_CALLBACK_HOST;
+    const port = normalizePort(options.authPort) || DEFAULT_AUTH_CALLBACK_PORT;
     let settleCode;
     let rejectCode;
     const waitForCode = new Promise((resolve, reject) => {
@@ -288,25 +308,32 @@ async function startOAuthCallbackServer() {
             settleCode(code);
             server.close();
     });
-    await new Promise((resolve, reject) => {
-        server.once('error', reject);
-        server.listen(0, '127.0.0.1', resolve);
-    });
+    try {
+        await new Promise((resolve, reject) => {
+            server.once('error', reject);
+            server.listen(port, host, resolve);
+        });
+    } catch (err) {
+        if (err?.code === 'EADDRINUSE') {
+            throw new Error(`LiveDesk Google sign-in callback port ${port} is already in use. Close the app using it or run with --auth-port <port> and add that callback URL in Supabase Auth redirect URLs.`);
+        }
+        throw err;
+    }
     return {
         get redirectTo() {
-            return `http://127.0.0.1:${server.address().port}/callback`;
+            return `http://${host}:${server.address().port}/callback`;
         },
         waitForCode
     };
 }
 
-async function signInWithGoogle(supabase) {
+async function signInWithGoogle(supabase, options = {}) {
     const { data: existing } = await supabase.auth.getSession();
     if (existing?.session?.access_token) {
         return existing.session;
     }
 
-    const callback = await startOAuthCallbackServer();
+    const callback = await startOAuthCallbackServer({ authPort: options.authPort });
     const { data, error } = await supabase.auth.signInWithOAuth({
         provider: 'google',
         options: {
@@ -428,7 +455,7 @@ async function prepareLoginConnection(parsed) {
 
     if (shouldLogin) {
         const supabase = await createSupabaseClient();
-        const session = await signInWithGoogle(supabase);
+        const session = await signInWithGoogle(supabase, { authPort: parsed.authPort });
         const email = session.user?.email ? ` as ${session.user.email}` : '';
         console.log(`Signed in to LiveDesk${email}.`);
         const resolved = await resolveManagerFromSupabase(supabase);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {