@involvex/syncstuff-cli 0.0.7 → 0.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@involvex/syncstuff-cli",
-  "version": "0.0.7",
+  "version": "0.0.10",
   "type": "module",
   "homepage": "https://syncstuff-web.involvex.workers.dev/",
   "sponsor": {
@@ -29,7 +29,10 @@
     "inquirer": "13.1.0",
     "ora": "9.0.0",
     "boxen": "8.0.1",
-    "table": "6.9.0"
+    "table": "6.9.0",
+    "bonjour-service": "^1.1.1",
+    "@syncstuff/network-types": "workspace:*",
+    "uuid": "^9.0.1"
   },
   "devDependencies": {
     "@eslint/css": "0.14.1",

package/src/cli/commands/debug.ts

@@ -3,7 +3,6 @@ import { DebugMode } from "../../core";
 export const showDebug = () => {
   if (!DebugMode.enabled) {
     return;
-  } else {
-    console.log("Debug mode enabled");
   }
+  console.log("Debug mode enabled");
 };

package/src/cli/commands/device.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import inquirer from "inquirer";
 import { apiClient, type Device } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import {
   createSpinner,
   createTable,
@@ -77,7 +77,7 @@ async function listAvailableDevices(ctx: CommandContext): Promise<Device[]> {
       }
 
       const tableData = response.data.map(device => [
-        device.id.substring(0, 8) + "...",
+        `${device.id.substring(0, 8)}...`,
         device.name,
         device.type,
         device.platform,
@@ -100,19 +100,18 @@ async function listAvailableDevices(ctx: CommandContext): Promise<Device[]> {
       printSeparator();
 
       return response.data;
+    }
+    spinner.fail("Failed to fetch devices");
+    if (
+      response.error?.includes("404") ||
+      response.error?.includes("Not found")
+    ) {
+      info("Devices endpoint not yet implemented in API");
+      info("This feature will be available soon!");
     } else {
-      spinner.fail("Failed to fetch devices");
-      if (
-        response.error?.includes("404") ||
-        response.error?.includes("Not found")
-      ) {
-        info("Devices endpoint not yet implemented in API");
-        info("This feature will be available soon!");
-      } else {
-        error(response.error || "Unknown error");
-      }
-      return [];
+      error(response.error || "Unknown error");
     }
+    return [];
   } catch (err) {
     spinner.fail("Error fetching devices");
     error(`Error: ${err instanceof Error ? err.message : String(err)}`);

package/src/cli/commands/devices.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import { apiClient } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import {
   createSpinner,
   createTable,
@@ -60,7 +60,7 @@ async function fetchAndDisplayDevices(ctx: CommandContext): Promise<boolean> {
       }
 
       const tableData = response.data.map(device => [
-        device.id.substring(0, 8) + "...",
+        `${device.id.substring(0, 8)}...`,
         device.name,
         device.type,
         device.platform,
@@ -82,19 +82,18 @@ async function fetchAndDisplayDevices(ctx: CommandContext): Promise<boolean> {
       success(`Found ${response.data.length} device(s)`);
       printSeparator();
       return true;
+    }
+    spinner.fail("Failed to fetch devices");
+    if (
+      response.error?.includes("404") ||
+      response.error?.includes("Not found")
+    ) {
+      info("Devices endpoint not yet implemented in API");
+      info("This feature will be available soon!");
     } else {
-      spinner.fail("Failed to fetch devices");
-      if (
-        response.error?.includes("404") ||
-        response.error?.includes("Not found")
-      ) {
-        info("Devices endpoint not yet implemented in API");
-        info("This feature will be available soon!");
-      } else {
-        error(response.error || "Unknown error");
-      }
-      return false;
+      error(response.error || "Unknown error");
     }
+    return false;
   } catch (err) {
     spinner.fail("Error fetching devices");
     error(`Error: ${err instanceof Error ? err.message : String(err)}`);

package/src/cli/commands/login.ts

@@ -1,6 +1,6 @@
 import inquirer from "inquirer";
 import { apiClient } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import {
   createSpinner,
   error,

package/src/cli/commands/logout.ts

@@ -1,5 +1,5 @@
 import { apiClient } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import { error, printHeader, printSeparator, success } from "../../utils/ui.js";
 
 export async function logout(ctx: CommandContext): Promise<void> {

package/src/cli/commands/scan.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import { debugLog, type CommandContext } from "../../utils/context.js";
-import { networkScanner, type LocalDevice } from "../../utils/network.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
+import { type LocalDevice, networkScanner } from "../../utils/network.js";
 import {
   createSpinner,
   createTable,
@@ -21,7 +21,7 @@ export async function scanLocal(
   ctx: CommandContext,
 ): Promise<void> {
   const timeout = args.includes("--timeout")
-    ? parseInt(args[args.indexOf("--timeout") + 1] || "10", 10)
+    ? Number.parseInt(args[args.indexOf("--timeout") + 1] || "10", 10)
     : 10;
   const continuous = args.includes("--watch") || args.includes("-w");
 
@@ -135,7 +135,7 @@ async function continuousScan(
 
 function displayDevices(devices: LocalDevice[]): void {
   const tableData = devices.map(device => [
-    device.id.substring(0, 8) + "...",
+    `${device.id.substring(0, 8)}...`,
     device.name,
     device.platform,
     `${device.ip}:${device.port}`,

package/src/cli/commands/transfer.ts

@@ -3,7 +3,7 @@ import { existsSync, statSync } from "fs";
 import inquirer from "inquirer";
 import { basename, resolve } from "path";
 import { apiClient } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import {
   createSpinner,
   error,

package/src/cli/commands/version.ts

@@ -18,8 +18,8 @@ export function showversion() {
 
     if (DebugMode.enabled === true) {
       console.log(chalk.yellow("Debug mode enabled"));
-      console.log("Package path: " + packagePath);
-      console.log("Version: " + version);
+      console.log(`Package path: ${packagePath}`);
+      console.log(`Version: ${version}`);
     }
 
     const versionBox = createBox(
@@ -27,7 +27,7 @@ export function showversion() {
         chalk.bold("Version:") +
         ` ${chalk.green(version)}\n` +
         chalk.bold("Package:") +
-        ` @involvex/syncstuff-cli`,
+        " @involvex/syncstuff-cli",
       {
         title: "Version Information",
         titleAlignment: "center",
@@ -40,7 +40,7 @@ export function showversion() {
     if (DebugMode.enabled === true) {
       const packagePath = join(__dirname, "../../../package.json");
       console.log(chalk.yellow("Debug mode enabled"));
-      console.log("Packagepath: " + packagePath);
+      console.log(`Packagepath: ${packagePath}`);
       console.log(chalk.yellow("Version: 0.0.1 (unable to read package.json)"));
     }
   }

package/src/cli/commands/whoami.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
 import { apiClient } from "../../utils/api-client.js";
-import { debugLog, type CommandContext } from "../../utils/context.js";
+import { type CommandContext, debugLog } from "../../utils/context.js";
 import {
   createBox,
   createSpinner,

package/src/cli/index.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { debugLog, parseArgs, type CommandContext } from "../utils/context.js";
+import { type CommandContext, debugLog, parseArgs } from "../utils/context.js";
 import { printHeader } from "../utils/ui.js";
 import { checkForUpdates } from "../utils/update-checker.js";
 

package/src/utils/config.ts

@@ -12,6 +12,7 @@ export interface Config {
     role: string;
   } | null;
   apiUrl?: string;
+  deviceId?: string;
 }
 
 const CONFIG_DIR = join(homedir(), ".syncstuff");

package/src/utils/network.ts

@@ -1,146 +1,82 @@
-import { createSocket, type Socket } from "dgram";
-import { networkInterfaces } from "os";
-
-export interface LocalDevice {
-  id: string;
-  name: string;
-  platform: string;
-  ip: string;
-  port: number;
-  version: string;
-}
-
-const SYNCSTUFF_PORT = 5353; // mDNS port
-
+import {
+  SYNCSTUFF_PROTOCOL,
+  SYNCSTUFF_SERVICE_TYPE,
+  type LocalDevice,
+  type ServiceTxtRecord,
+} from "@syncstuff/network-types";
+import { Bonjour, Browser, Service } from "bonjour-service";
+import { createSocket } from "dgram";
+import { createRequire } from "module";
+import { v4 as uuidv4 } from "uuid";
+import { readConfig, writeConfig } from "./config.js";
+
+export type { LocalDevice };
+
+const require = createRequire(import.meta.url);
+const packageJson = require("../../package.json");
 /**
- * Network scanner for discovering SyncStuff devices on local network
- * Uses UDP multicast to find devices
+ * Network scanner for discovering SyncStuff devices on the local network using mDNS.
  */
 class NetworkScanner {
-  private socket: Socket | null = null;
-
-  /**
-   * Get local IP addresses
-   */
-  getLocalIPs(): string[] {
-    const interfaces = networkInterfaces();
-    const ips: string[] = [];
+  private bonjour: Bonjour;
+  private browser: Browser | null = null;
+  private ad: Service | null = null;
 
-    for (const name of Object.keys(interfaces)) {
-      const iface = interfaces[name];
-      if (!iface) continue;
-
-      for (const addr of iface) {
-        if (addr.family === "IPv4" && !addr.internal) {
-          ips.push(addr.address);
-        }
-      }
-    }
-
-    return ips;
+  constructor() {
+    this.bonjour = new Bonjour();
   }
 
   /**
-   * Scan the local network for SyncStuff devices
-   * Uses UDP broadcast to discover devices
+   * Scan the local network for SyncStuff devices using mDNS.
    */
-  async scan(timeout = 10000): Promise<LocalDevice[]> {
+  async scan(timeout = 5000): Promise<LocalDevice[]> {
     return new Promise(resolve => {
+      if (this.browser) {
+        this.browser.stop();
+      }
       const devices: LocalDevice[] = [];
       const seenIds = new Set<string>();
 
-      try {
-        this.socket = createSocket({ type: "udp4", reuseAddr: true });
-
-        this.socket.on("error", err => {
-          console.error("Scanner error:", err.message);
-          this.cleanup();
-          resolve(devices);
-        });
-
-        this.socket.on("message", (msg, rinfo) => {
-          try {
-            const data = JSON.parse(msg.toString());
-
-            if (data.service === "syncstuff" && data.deviceId) {
-              if (!seenIds.has(data.deviceId)) {
-                seenIds.add(data.deviceId);
-                devices.push({
-                  id: data.deviceId,
-                  name: data.deviceName || "Unknown Device",
-                  platform: data.platform || "unknown",
-                  ip: rinfo.address,
-                  port: data.port || 8080,
-                  version: data.version || "1.0.0",
-                });
-              }
-            }
-          } catch {
-            // Ignore non-JSON messages
-          }
-        });
-
-        this.socket.bind(0, () => {
-          this.socket?.setBroadcast(true);
-
-          // Send discovery broadcast
-          const discoveryMessage = JSON.stringify({
-            service: "syncstuff",
-            action: "discover",
-            timestamp: Date.now(),
-          });
-
-          // Broadcast on local network
-          const localIPs = this.getLocalIPs();
-          for (const ip of localIPs) {
-            const parts = ip.split(".");
-            parts[3] = "255";
-            const broadcastAddr = parts.join(".");
-
-            this.socket?.send(
-              discoveryMessage,
-              0,
-              discoveryMessage.length,
-              SYNCSTUFF_PORT,
-              broadcastAddr,
-            );
+      this.browser = this.bonjour.find({
+        type: SYNCSTUFF_SERVICE_TYPE,
+        protocol: SYNCSTUFF_PROTOCOL,
+      });
+
+      this.browser.on("up", (service: Service) => {
+        const txt = (service.txt || {}) as unknown as ServiceTxtRecord;
+        const deviceId = txt.deviceId;
+
+        if (deviceId && !seenIds.has(deviceId)) {
+          const addresses = service.addresses || [];
+          const ip = addresses.find(addr => addr.includes("."));
+          if (ip) {
+            seenIds.add(deviceId);
+            devices.push({
+              id: deviceId,
+              name: txt.deviceName || service.name,
+              platform: txt.platform || "unknown",
+              ip,
+              port: service.port,
+              version: txt.version || "1.0.0",
+            });
           }
+        }
+      });
 
-          // Also try mDNS multicast address
-          this.socket?.send(
-            discoveryMessage,
-            0,
-            discoveryMessage.length,
-            SYNCSTUFF_PORT,
-            "224.0.0.251",
-          );
-        });
-
-        // Cleanup after timeout
-        setTimeout(() => {
-          this.cleanup();
-          resolve(devices);
-        }, timeout);
-      } catch (error) {
-        console.error("Failed to start scanner:", error);
+      setTimeout(() => {
+        if (this.browser) {
+          this.browser.stop();
+          this.browser = null;
+        }
         resolve(devices);
-      }
+      }, timeout);
     });
   }
 
-  private cleanup(): void {
-    if (this.socket) {
-      try {
-        this.socket.close();
-      } catch {
-        // Ignore close errors
-      }
-      this.socket = null;
-    }
-  }
-
   /**
-   * Send a message to a specific device
+   * Send a message to a specific device.
+   * Note: This still uses a direct UDP socket, which is fine for direct communication
+   * once a device's IP and port are known.
    */
   async sendTo(ip: string, port: number, message: object): Promise<void> {
     return new Promise((resolve, reject) => {
@@ -159,49 +95,68 @@ class NetworkScanner {
   }
 
   /**
-   * Start advertising this device on the local network
+   * Start advertising this device on the local network using mDNS.
    */
-  startAdvertising(
-    deviceName: string,
-    port: number,
-    platform = "cli",
-  ): NodeJS.Timer {
-    const socket = createSocket({ type: "udp4", reuseAddr: true });
-
-    socket.bind(() => {
-      socket.setBroadcast(true);
-    });
-
-    const advertise = () => {
-      const message = JSON.stringify({
-        service: "syncstuff",
-        deviceId: "cli-device-" + Math.floor(Math.random() * 10000), // Simple random ID for CLI
-        deviceName,
-        platform,
-        port,
-        version: "0.0.6", // Should match package.json
-        timestamp: Date.now(),
+  startAdvertising(deviceName: string, port: number, platform = "cli") {
+    if (this.ad) {
+      this.ad.stop?.(() => {
+        this.ad = null;
+        this.publish(deviceName, port, platform);
       });
+    } else {
+      this.publish(deviceName, port, platform);
+    }
+  }
 
-      const localIPs = this.getLocalIPs();
-      for (const ip of localIPs) {
-        const parts = ip.split(".");
-        parts[3] = "255";
-        const broadcastAddr = parts.join(".");
-
-        socket.send(message, 0, message.length, SYNCSTUFF_PORT, broadcastAddr);
-      }
-
-      // Also send to multicast group
-      socket.send(message, 0, message.length, SYNCSTUFF_PORT, "224.0.0.251");
-    };
+  /**
+   * Stop advertising this device.
+   */
+  stopAdvertising() {
+    if (this.ad) {
+      this.ad.stop?.(() => {
+        this.ad = null;
+        console.log("Stopped advertising.");
+      });
+    }
+  }
 
-    // Advertise immediately
-    advertise();
+  /**
+   * Unpublish all services and destroy the bonjour instance.
+   */
+  destroy() {
+    this.bonjour.unpublishAll(() => {
+      this.bonjour.destroy();
+    });
+  }
 
-    // Then every 3 seconds
-    return setInterval(advertise, 3000);
+  private publish(deviceName: string, port: number, platform: string) {
+    const config = readConfig();
+    if (!config.deviceId) {
+      config.deviceId = uuidv4();
+      writeConfig(config);
+    }
+    const deviceId = config.deviceId;
+    const version = packageJson.version;
+
+    this.ad = this.bonjour.publish({
+      name: `${deviceName}-${deviceId.substring(0, 6)}`,
+      type: SYNCSTUFF_SERVICE_TYPE,
+      port,
+      protocol: SYNCSTUFF_PROTOCOL,
+      txt: {
+        deviceId,
+        deviceName,
+        platform,
+        version,
+      },
+    });
+    console.log(`Advertising '${deviceName}' on the network...`);
   }
 }
 
 export const networkScanner = new NetworkScanner();
+
+// Graceful shutdown
+process.on("exit", () => networkScanner.destroy());
+process.on("SIGINT", () => process.exit());
+process.on("SIGTERM", () => process.exit());

package/src/utils/ui.ts

@@ -55,7 +55,7 @@ export function createTable(data: string[][], headers?: string[]): string {
   });
 }
 
-export function animateText(text: string, delay: number = 50): Promise<void> {
+export function animateText(text: string, delay = 50): Promise<void> {
   return new Promise(resolve => {
     let index = 0;
     const interval = setInterval(() => {

package/.eslintignore

@@ -1 +0,0 @@
-eslint.config.ts