@apocaliss92/nodelink-js 0.2.5 → 0.3.4

package/dist/index.js

@@ -22,7 +22,11 @@ import {
   createTaggedLogger,
   decodeHeader,
   discoverReolinkDevices,
+  discoverViaArpTable,
+  discoverViaDhcpListener,
   discoverViaHttpScan,
+  discoverViaOnvif,
+  discoverViaTcpPortScan,
   discoverViaUdpBroadcast,
   discoverViaUdpDirect,
   encodeHeader,
@@ -38,7 +42,7 @@ import {
   normalizeUid,
   parseSupportXml,
   setGlobalLogger
-} from "./chunk-EG5IY3CM.js";
+} from "./chunk-YSEFEQYV.js";
 import {
   AesStreamDecryptor,
   BC_AES_IV,
@@ -586,51 +590,18 @@ var AutodiscoveryClient = class {
   scanTimer = null;
   isRunning = false;
   currentScanPromise = null;
-  /**
-   * Costruttore del client di autodiscovery.
-   * 
-   * @param options - Opzioni di configurazione per il discovery
-   */
   constructor(options = {}) {
     this.options = {
-      scanIntervalMs: options.scanIntervalMs ?? 6e4,
-      // Default: 60 secondi
+      ...options,
+      scanIntervalMs: options.scanIntervalMs ?? 12e4,
       autoStart: options.autoStart ?? false
     };
-    if (options.networkCidr !== void 0) {
-      this.options.networkCidr = options.networkCidr;
-    }
-    if (options.username !== void 0) {
-      this.options.username = options.username;
-    }
-    if (options.password !== void 0) {
-      this.options.password = options.password;
-    }
-    if (options.httpProbeTimeoutMs !== void 0) {
-      this.options.httpProbeTimeoutMs = options.httpProbeTimeoutMs;
-    }
-    if (options.maxConcurrentProbes !== void 0) {
-      this.options.maxConcurrentProbes = options.maxConcurrentProbes;
-    }
-    if (options.logger !== void 0) {
-      this.options.logger = options.logger;
-    }
-    if (options.httpPorts !== void 0) {
-      this.options.httpPorts = options.httpPorts;
-    }
-    if (options.discoveryMethod !== void 0) {
-      this.options.discoveryMethod = options.discoveryMethod;
-    }
-    if (options.udpBroadcastTimeoutMs !== void 0) {
-      this.options.udpBroadcastTimeoutMs = options.udpBroadcastTimeoutMs;
-    }
     if (this.options.autoStart) {
       this.start();
     }
   }
   /**
-   * Avvia il discovery continuato.
-   * Se già in esecuzione, non fa nulla.
+   * Start continuous discovery. If already running, does nothing.
    */
   start() {
     if (this.isRunning) {
@@ -645,8 +616,7 @@ var AutodiscoveryClient = class {
     this.scheduleNextScan();
   }
   /**
-   * Ferma il discovery continuato.
-   * Se non è in esecuzione, non fa nulla.
+   * Stop continuous discovery. If not running, does nothing.
    */
   stop() {
     if (!this.isRunning) {
@@ -661,50 +631,41 @@ var AutodiscoveryClient = class {
     this.options.logger?.log?.("[Autodiscovery] Discovery stopped");
   }
   /**
-   * Restituisce la lista corrente delle telecamere discoverate.
-   * 
-   * @returns Array di dispositivi discoverati, ordinati per host
+   * Returns the current list of discovered devices, sorted by host IP.
    */
   getDiscoveredDevices() {
-    return Array.from(this.discoveredDevices.values()).sort((a, b) => {
-      return a.host.localeCompare(b.host);
-    });
+    return Array.from(this.discoveredDevices.values()).sort(
+      (a, b) => a.host.localeCompare(b.host)
+    );
   }
   /**
-   * Restituisce il numero di telecamere attualmente discoverate.
-   * 
-   * @returns Numero di dispositivi discoverati
+   * Returns the number of currently discovered devices.
    */
   getDeviceCount() {
     return this.discoveredDevices.size;
   }
   /**
-   * Verifica se il discovery è attualmente in esecuzione.
-   * 
-   * @returns `true` se il discovery è in esecuzione, `false` altrimenti
+   * Returns whether continuous discovery is currently running.
    */
   isActive() {
     return this.isRunning;
   }
   /**
-   * Forza un scan immediato (non aspetta l'intervallo programmato).
-   * Se uno scan è già in corso, attende il completamento prima di avviarne uno nuovo.
-   * 
-   * @returns Promise che si risolve quando lo scan è completato
+   * Force an immediate scan (doesn't wait for the scheduled interval).
+   * If a scan is already in progress, waits for it to complete.
    */
   async scanNow() {
     if (this.currentScanPromise) {
-      this.options.logger?.log?.("[Autodiscovery] Scan already in progress, waiting for completion...");
+      this.options.logger?.log?.(
+        "[Autodiscovery] Scan already in progress, waiting for completion..."
+      );
       await this.currentScanPromise;
       return;
     }
     await this.performScan();
   }
   /**
-   * Rimuove un dispositivo dalla lista (utile se si sa che non è più disponibile).
-   * 
-   * @param host - Indirizzo IP del dispositivo da rimuovere
-   * @returns `true` se il dispositivo è stato rimosso, `false` se non era presente
+   * Remove a device from the discovered list.
    */
   removeDevice(host) {
     const removed = this.discoveredDevices.delete(host);
@@ -714,59 +675,20 @@ var AutodiscoveryClient = class {
     return removed;
   }
   /**
-   * Pulisce tutte le telecamere discoverate dalla lista.
+   * Clear all discovered devices.
    */
   clearDevices() {
     const count = this.discoveredDevices.size;
     this.discoveredDevices.clear();
-    this.options.logger?.log?.(`[Autodiscovery] Removed ${count} device(s) from list`);
+    this.options.logger?.log?.(
+      `[Autodiscovery] Removed ${count} device(s) from list`
+    );
   }
-  /**
-   * Esegue un singolo scan della rete.
-   */
   async performScan() {
     const scanPromise = (async () => {
       try {
         this.options.logger?.log?.("[Autodiscovery] Starting scan...");
-        const discoveryMethod = this.options.discoveryMethod ?? "http";
-        const discoveryOptions = {
-          enableHttpScanning: discoveryMethod === "http" || discoveryMethod === "both",
-          enableUdpDiscovery: discoveryMethod === "udp" || discoveryMethod === "both"
-        };
-        if (this.options.networkCidr !== void 0) {
-          discoveryOptions.networkCidr = this.options.networkCidr;
-        }
-        if (this.options.username !== void 0) {
-          discoveryOptions.username = this.options.username;
-        }
-        if (this.options.password !== void 0) {
-          discoveryOptions.password = this.options.password;
-        }
-        if (this.options.httpProbeTimeoutMs !== void 0) {
-          discoveryOptions.httpProbeTimeoutMs = this.options.httpProbeTimeoutMs;
-        }
-        if (this.options.maxConcurrentProbes !== void 0) {
-          discoveryOptions.maxConcurrentProbes = this.options.maxConcurrentProbes;
-        }
-        if (this.options.logger !== void 0) {
-          discoveryOptions.logger = this.options.logger;
-        }
-        if (this.options.httpPorts !== void 0) {
-          discoveryOptions.httpPorts = this.options.httpPorts;
-        }
-        if (this.options.udpBroadcastTimeoutMs !== void 0) {
-          discoveryOptions.udpBroadcastTimeoutMs = this.options.udpBroadcastTimeoutMs;
-        }
-        let discovered = [];
-        if (discoveryMethod === "http" || discoveryMethod === "both") {
-          const httpDevices = await discoverViaHttpScan(discoveryOptions);
-          discovered.push(...httpDevices);
-        }
-        if (discoveryMethod === "udp" || discoveryMethod === "both") {
-          const udpDevices = await discoverViaUdpBroadcast(discoveryOptions);
-          discovered.push(...udpDevices);
-        }
-        const beforeCount = this.discoveredDevices.size;
+        const discovered = await discoverReolinkDevices(this.options);
         const newDevices = [];
         const updatedDevices = [];
         for (const device of discovered) {
@@ -781,38 +703,35 @@ var AutodiscoveryClient = class {
             newDevices.push(device);
           }
         }
-        const afterCount = this.discoveredDevices.size;
         this.options.logger?.log?.(
-          `[Autodiscovery] Scan completed: ${newDevices.length} new, ${updatedDevices.length} updated, total: ${afterCount}`
+          `[Autodiscovery] Scan completed: ${newDevices.length} new, ${updatedDevices.length} updated, total: ${this.discoveredDevices.size}`
         );
         for (const device of newDevices) {
-          const details = [];
-          if (device.model) details.push(`Model: ${device.model}`);
-          if (device.name) details.push(`Name: ${device.name}`);
-          if (device.uid) details.push(`UID: ${device.uid}`);
-          if (device.firmwareVersion) details.push(`Firmware: ${device.firmwareVersion}`);
-          if (device.httpPort) details.push(`HTTP Port: ${device.httpPort}`);
-          if (device.httpsPort) details.push(`HTTPS Port: ${device.httpsPort}`);
-          details.push(`Discovery Method: ${device.discoveryMethod}`);
-          if (device.supportsHttps !== void 0) details.push(`HTTPS: ${device.supportsHttps}`);
-          if (device.httpAccessible !== void 0) details.push(`HTTP Accessible: ${device.httpAccessible}`);
           this.options.logger?.log?.(
-            `[Autodiscovery] \u{1F195} NEW DEVICE DISCOVERED - Host: ${device.host}${details.length > 0 ? ` | ${details.join(" | ")}` : ""}`
+            `[Autodiscovery] NEW DEVICE - ${device.host} | ${device.model ?? "unknown"} | ${device.name ?? ""} | via ${device.discoveryMethod}`
           );
+          try {
+            this.options.onDeviceDiscovered?.(device);
+          } catch {
+          }
+        }
+        for (const device of updatedDevices) {
+          try {
+            this.options.onDeviceUpdated?.(device);
+          } catch {
+          }
         }
       } catch (error) {
         const msg = error instanceof Error ? error.message : String(error);
-        this.options.logger?.error?.(`[Autodiscovery] Error during scan: ${msg}`);
+        this.options.logger?.error?.(
+          `[Autodiscovery] Error during scan: ${msg}`
+        );
       }
     })();
     this.currentScanPromise = scanPromise;
     await scanPromise;
     this.currentScanPromise = null;
   }
-  /**
-   * Unisce le informazioni di un dispositivo esistente con quelle di un nuovo scan.
-   * Restituisce il dispositivo aggiornato se ci sono state modifiche, altrimenti `null`.
-   */
   mergeDeviceInfo(existing, updated) {
     let hasChanges = false;
     if (!existing.model && updated.model) {
@@ -849,13 +768,8 @@ var AutodiscoveryClient = class {
     }
     return hasChanges ? existing : null;
   }
-  /**
-   * Programma il prossimo scan.
-   */
   scheduleNextScan() {
-    if (!this.isRunning) {
-      return;
-    }
+    if (!this.isRunning) return;
     this.scanTimer = setTimeout(() => {
       this.scanTimer = null;
       if (this.isRunning) {
@@ -7315,7 +7229,11 @@ export {
   detectIosClient,
   detectVideoCodecFromNal,
   discoverReolinkDevices,
+  discoverViaArpTable,
+  discoverViaDhcpListener,
   discoverViaHttpScan,
+  discoverViaOnvif,
+  discoverViaTcpPortScan,
   discoverViaUdpBroadcast,
   discoverViaUdpDirect,
   encodeHeader,