@ecobridge.xyz/devicemanager 3.1.0 → 3.1.1

package/dist_ts/index.d.ts

@@ -12,4 +12,4 @@ export { HomeAssistantDiscovery, HA_SERVICE_TYPE } from './discovery/discovery.c
 export { withRetry, createRetryable, defaultRetryOptions } from './helpers/helpers.retry.js';
 export { isValidIp, ipToNumber, numberToIp, ipRangeToIps, cidrToIps, getLocalSubnet, countIpsInCidr, } from './helpers/helpers.iprange.js';
 export * from './interfaces/index.js';
-export type { ISsdpDevice, ISsdpDeviceDescription, ISsdpService, ISsdpIcon, } from './discovery/discovery.classes.ssdp.js';
+export type { ISsdpDevice, ISsdpDeviceDescription, ISsdpDiscoveryDependencies, ISsdpService, ISsdpIcon, } from './discovery/discovery.classes.ssdp.js';

package/dist_ts/interfaces/feature.interfaces.d.ts

@@ -113,7 +113,7 @@ export interface IPrintJob {
     name: string;
     state: 'pending' | 'processing' | 'completed' | 'canceled' | 'aborted';
     stateReason?: string;
-    createdAt: Date;
+    createdAt?: Date;
     completedAt?: Date;
     pagesPrinted?: number;
     pagesTotal?: number;

package/dist_ts/interfaces/index.d.ts

@@ -122,7 +122,7 @@ export interface IPrintJob {
     name: string;
     state: 'pending' | 'processing' | 'completed' | 'canceled' | 'aborted';
     stateReason?: string;
-    createdAt: Date;
+    createdAt?: Date;
     completedAt?: Date;
     pagesPrinted?: number;
     pagesTotal?: number;

package/dist_ts/plugins.d.ts

@@ -1,23 +1,13 @@
 import * as path from 'path';
 import * as net from 'net';
-import * as dgram from 'dgram';
+import * as dgram from 'node:dgram';
+import * as os from 'node:os';
 import * as events from 'events';
-export { path, net, dgram, events };
+export { path, net, dgram, os, events };
 import * as smartpath from '@push.rocks/smartpath';
-import * as smartpromise from '@push.rocks/smartpromise';
 import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartnetwork from '@push.rocks/smartnetwork';
-import { SmartRequest } from '@push.rocks/smartrequest';
-export { SmartRequest };
-export { smartpath, smartpromise, smartdelay, smartnetwork, };
+export { smartpath, smartdelay };
 import * as bonjourService from 'bonjour-service';
-import ipp from 'ipp';
 import * as netSnmp from 'net-snmp';
-import * as sonos from 'sonos';
-import * as castv2Client from 'castv2-client';
 import WebSocket from 'ws';
-declare const nodeSsdp: {
-    Client: any;
-    Server: any;
-};
-export { bonjourService, ipp, nodeSsdp, netSnmp, sonos, castv2Client, WebSocket };
+export { bonjourService, netSnmp, WebSocket };

package/dist_ts/plugins.js

@@ -1,30 +1,17 @@
 // native scope
 import * as path from 'path';
 import * as net from 'net';
-import * as dgram from 'dgram';
+import * as dgram from 'node:dgram';
+import * as os from 'node:os';
 import * as events from 'events';
-export { path, net, dgram, events };
+export { path, net, dgram, os, events };
 // @push.rocks scope
 import * as smartpath from '@push.rocks/smartpath';
-import * as smartpromise from '@push.rocks/smartpromise';
 import * as smartdelay from '@push.rocks/smartdelay';
-import * as smartnetwork from '@push.rocks/smartnetwork';
-// Re-export SmartRequest for HTTP
-import { SmartRequest } from '@push.rocks/smartrequest';
-export { SmartRequest };
-export { smartpath, smartpromise, smartdelay, smartnetwork, };
+export { smartpath, smartdelay };
 // third party
 import * as bonjourService from 'bonjour-service';
-import ipp from 'ipp';
-import nodeSsdpModule from 'node-ssdp';
 import * as netSnmp from 'net-snmp';
-import * as sonos from 'sonos';
-import * as castv2Client from 'castv2-client';
 import WebSocket from 'ws';
-// node-ssdp exports Client/Server under default in ESM
-const nodeSsdp = {
-    Client: nodeSsdpModule.Client,
-    Server: nodeSsdpModule.Server,
-};
-export { bonjourService, ipp, nodeSsdp, netSnmp, sonos, castv2Client, WebSocket };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBZTtBQUNmLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQy9CLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsQ0FBQztBQUVwQyxvQkFBb0I7QUFDcEIsT0FBTyxLQUFLLFNBQVMsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEtBQUssWUFBWSxNQUFNLDBCQUEwQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxVQUFVLE1BQU0sd0JBQXdCLENBQUM7QUFDckQsT0FBTyxLQUFLLFlBQVksTUFBTSwwQkFBMEIsQ0FBQztBQUV6RCxrQ0FBa0M7QUFDbEMsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ3hELE9BQU8sRUFBRSxZQUFZLEVBQUUsQ0FBQztBQUV4QixPQUFPLEVBQ0wsU0FBUyxFQUNULFlBQVksRUFDWixVQUFVLEVBQ1YsWUFBWSxHQUNiLENBQUM7QUFFRixjQUFjO0FBQ2QsT0FBTyxLQUFLLGNBQWMsTUFBTSxpQkFBaUIsQ0FBQztBQUNsRCxPQUFPLEdBQUcsTUFBTSxLQUFLLENBQUM7QUFDdEIsT0FBTyxjQUFjLE1BQU0sV0FBVyxDQUFDO0FBQ3ZDLE9BQU8sS0FBSyxPQUFPLE1BQU0sVUFBVSxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxLQUFLLE1BQU0sT0FBTyxDQUFDO0FBQy9CLE9BQU8sS0FBSyxZQUFZLE1BQU0sZUFBZSxDQUFDO0FBQzlDLE9BQU8sU0FBUyxNQUFNLElBQUksQ0FBQztBQUUzQix1REFBdUQ7QUFDdkQsTUFBTSxRQUFRLEdBQUc7SUFDZixNQUFNLEVBQUUsY0FBYyxDQUFDLE1BQU07SUFDN0IsTUFBTSxFQUFFLGNBQWMsQ0FBQyxNQUFNO0NBQzlCLENBQUM7QUFFRixPQUFPLEVBQUUsY0FBYyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLENBQUMifQ==
+export { bonjourService, netSnmp, WebSocket };
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBZTtBQUNmLE9BQU8sS0FBSyxJQUFJLE1BQU0sTUFBTSxDQUFDO0FBQzdCLE9BQU8sS0FBSyxHQUFHLE1BQU0sS0FBSyxDQUFDO0FBQzNCLE9BQU8sS0FBSyxLQUFLLE1BQU0sWUFBWSxDQUFDO0FBQ3BDLE9BQU8sS0FBSyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzlCLE9BQU8sS0FBSyxNQUFNLE1BQU0sUUFBUSxDQUFDO0FBRWpDLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLEtBQUssRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLENBQUM7QUFFeEMsb0JBQW9CO0FBQ3BCLE9BQU8sS0FBSyxTQUFTLE1BQU0sdUJBQXVCLENBQUM7QUFDbkQsT0FBTyxLQUFLLFVBQVUsTUFBTSx3QkFBd0IsQ0FBQztBQUVyRCxPQUFPLEVBQUUsU0FBUyxFQUFFLFVBQVUsRUFBRSxDQUFDO0FBRWpDLGNBQWM7QUFDZCxPQUFPLEtBQUssY0FBYyxNQUFNLGlCQUFpQixDQUFDO0FBQ2xELE9BQU8sS0FBSyxPQUFPLE1BQU0sVUFBVSxDQUFDO0FBQ3BDLE9BQU8sU0FBUyxNQUFNLElBQUksQ0FBQztBQUUzQixPQUFPLEVBQUUsY0FBYyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQyJ9

package/dist_ts/protocols/protocol.escl.js

@@ -81,7 +81,7 @@ export class EsclProtocol {
      */
     async submitScanJob(options) {
         const scanSettings = this.buildScanSettings(options);
-        // Use fetch for POST with body since SmartRequest API may not support raw body
+        // Use fetch for the raw XML request body.
         const response = await fetch(`${this.baseUrl}/ScanJobs`, {
             method: 'POST',
             headers: {
@@ -361,4 +361,4 @@ export class EsclProtocol {
         }
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"protocol.escl.js","sourceRoot":"","sources":["../../ts/protocols/protocol.escl.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"protocol.escl.js","sourceRoot":"","sources":["../../ts/protocols/protocol.escl.ts"],"names":[],"mappings":"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"}

package/license.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Task Venture Capital GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecobridge.xyz/devicemanager",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "private": false,
   "description": "a device manager for talking to devices on network and over usb",
   "main": "dist_ts/index.js",
@@ -8,32 +8,23 @@
   "type": "module",
   "author": "Task Venture Capital GmbH",
   "license": "MIT",
+  "devDependencies": {
+    "@git.zone/tsbuild": "4.4.2",
+    "@git.zone/tsrun": "2.0.6",
+    "@git.zone/tstest": "4.0.0",
+    "@types/node": "26.2.0",
+    "@types/ws": "8.18.1"
+  },
+  "dependencies": {
+    "@push.rocks/smartdelay": "3.1.0",
+    "@push.rocks/smartpath": "6.0.0",
+    "bonjour-service": "1.4.4",
+    "net-snmp": "3.26.3",
+    "ws": "8.21.1"
+  },
   "scripts": {
     "test": "(tstest test/ --verbose)",
     "build": "(tsbuild --web --allowimplicitany)",
     "buildDocs": "(tsdoc)"
-  },
-  "devDependencies": {
-    "@git.zone/tsbuild": "^4.1.0",
-    "@git.zone/tsrun": "^2.0.0",
-    "@git.zone/tstest": "^3.1.3",
-    "@types/node": "^25.0.3",
-    "@types/ws": "^8.18.1"
-  },
-  "dependencies": {
-    "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartevent": "^2.0.5",
-    "@push.rocks/smartnetwork": "^4.4.0",
-    "@push.rocks/smartpath": "^6.0.0",
-    "@push.rocks/smartpromise": "^4.2.3",
-    "@push.rocks/smartrequest": "^5.0.1",
-    "@push.rocks/smartxml": "^2.0.0",
-    "bonjour-service": "^1.3.0",
-    "castv2-client": "^1.2.0",
-    "ipp": "^2.0.1",
-    "net-snmp": "^3.26.0",
-    "node-ssdp": "^4.0.1",
-    "sonos": "^1.14.2",
-    "ws": "^8.19.0"
   }
-}
+}

package/pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+allowBuilds:
+  esbuild: true
+  mongodb-memory-server: false
+  puppeteer: false

package/readme.md

@@ -7,14 +7,14 @@ A comprehensive, TypeScript-first device manager for discovering and communicati
 
 ## 🎯 Overview
 
-`@ecobridge.xyz/devicemanager` provides a unified, object-oriented API for discovering and controlling network devices. Whether you're building a document scanning workflow, managing printers, controlling smart home devices, or monitoring UPS systems — this library has you covered.
+`@ecobridge.xyz/devicemanager` provides a unified, object-oriented API for discovering and modeling network devices, with live communication where protocol implementations are available. Whether you're building a document scanning workflow, managing printers, controlling smart home devices, or monitoring UPS systems — this library has you covered.
 
 **Supported Device Types:**
 - 🖨️ **Scanners** — eSCL (AirScan), SANE protocols
-- 📄 **Printers** — IPP, JetDirect protocols
-- 🔊 **Speakers** — Sonos, AirPlay, Chromecast, DLNA
+- 📄 **Printers** — IPP discovery and print execution; JetDirect/raw port detection
+- 🔊 **Speakers** — Sonos, AirPlay, Chromecast, and DLNA discovery with normalized feature/factory modeling
 - 🔋 **UPS Systems** — NUT, SNMP protocols
-- 📡 **SNMP Devices** — Generic SNMP v1/v2c/v3 support
+- 📡 **SNMP Devices** — Community-based SNMP v1 and v2c sessions; v3 is not implemented
 - 🏠 **Smart Home** — Home Assistant integration (lights, switches, sensors, climate, locks, fans, cameras, covers)
 
 ## Issue Reporting and Security
@@ -119,13 +119,14 @@ The central orchestrator for device discovery and management.
 
 ```typescript
 const manager = new DeviceManager({
-  autoDiscovery: true,      // Enable mDNS/SSDP auto-discovery
   discoveryTimeout: 10000,  // Discovery timeout in ms
   enableRetry: true,        // Enable retry with exponential backoff
   maxRetries: 5,            // Maximum retry attempts
 });
 ```
 
+Constructing `DeviceManager` does not initiate network discovery. Call `startDiscovery()` explicitly when continuous mDNS/SSDP discovery should begin; the `autoDiscovery` option does not currently trigger startup.
+
 #### Discovery Methods
 
 ```typescript
@@ -240,6 +241,8 @@ await fs.writeFile('scan.jpg', result.data);
 
 #### 📄 PrintFeature
 
+`PrintFeature.print()` submits jobs through IPP. Network discovery can identify an open JetDirect/raw port at TCP 9100, but JetDirect print execution is not implemented.
+
 ```typescript
 const printFeature = device.selectFeature<PrintFeature>('print');
 await printFeature.connect();
@@ -257,31 +260,33 @@ const job = await printFeature.print(pdfBuffer, {
   jobName: 'My Document',
 });
 
-// Check job status
-const status = await printFeature.getJobStatus(job.id);
+// Get current job information
+const jobInfo = await printFeature.getJobInfo(job.id);
 ```
 
 #### 🔊 PlaybackFeature & VolumeFeature
 
+`PlaybackFeature` and `VolumeFeature` provide normalized capability and state models. No external Sonos or Chromecast protocol client is bundled or wired into these features, so their methods update local feature state and emit events but do not provide live playback control for those devices.
+
 ```typescript
 const playback = device.selectFeature<PlaybackFeature>('playback');
 const volume = device.selectFeature<VolumeFeature>('volume');
 await playback.connect();
 
-// Control playback
+// Update normalized playback state
 await playback.play('http://example.com/audio.mp3');
 await playback.pause();
 await playback.stop();
 await playback.seek(120); // seconds
 
-// Get playback status
-const status = await playback.getStatus();
-// { state: 'playing', position: 45, duration: 180, track: { title: '...' } }
+// Get normalized playback status
+const status = await playback.getPlaybackStatus();
+// { state: 'stopped', position: 120, duration: 0, track: undefined }
 
-// Control volume
+// Update normalized volume state
 await volume.setVolume(50);    // 0-100
-await volume.mute();
-await volume.unmute();
+await volume.setMute(true);
+await volume.toggleMute();
 const level = await volume.getVolume();
 ```
 
@@ -293,14 +298,16 @@ await power.connect();
 
 // Get UPS status
 const status = await power.getStatus();
-// { status: 'online', battery: { charge: 100, runtime: 1800, voltage: 13.8 }, ... }
+// 'online' | 'onbattery' | 'lowbattery' | ... | 'unknown'
 
 // Get battery info
 const battery = await power.getBatteryInfo();
-// { charge: 95, runtime: 1500, health: 'good' }
+// { charge: 0, runtime: 0 } until a protocol-specific implementation updates it
 
-// Run self-test
-await power.runTest();
+// Run a battery test when supported
+if (power.supportsTest) {
+  await power.testBattery();
+}
 ```
 
 #### 🏠 Smart Home Features
@@ -309,9 +316,9 @@ await power.runTest();
 // Light control
 const light = device.selectFeature<LightFeature>('light');
 await light.turnOn();
-await light.setBrightness(80);
-await light.setColor({ r: 255, g: 100, b: 50 });
-await light.setColorTemperature(4000); // Kelvin
+await light.setBrightness(80); // 0-255
+await light.setRgbColor(255, 100, 50);
+await light.setColorTemp(4000); // Kelvin
 
 // Switch control
 const switch_ = device.selectFeature<SwitchFeature>('switch');
@@ -321,13 +328,16 @@ await switch_.toggle();
 
 // Climate control
 const climate = device.selectFeature<ClimateFeature>('climate');
-await climate.setTargetTemperature(22);
-await climate.setMode('heat'); // 'heat' | 'cool' | 'auto' | 'off'
+await climate.setTargetTemp(22);
+await climate.setHvacMode('heat'); // 'heat' | 'cool' | 'auto' | 'off'
 
 // Sensor reading
 const sensor = device.selectFeature<SensorFeature>('sensor');
-const reading = await sensor.getState();
-// { temperature: 22.5, humidity: 45, battery: 85 }
+const reading = await sensor.refreshState();
+// { value: 22.5, numericValue: 22.5, unit: '°C', lastUpdated: Date }
+
+// Cached accessors reflect the most recently fetched or externally updated state
+console.log(sensor.value, sensor.numericValue, sensor.unit, sensor.lastUpdated);
 ```
 
 ### Protocol Direct Access
@@ -343,7 +353,7 @@ const caps = await escl.getCapabilities();
 const result = await escl.scan({ source: 'flatbed', resolution: 300 });
 
 // Direct IPP access
-const ipp = new IppProtocol('ipp://192.168.1.100:631/ipp/print');
+const ipp = new IppProtocol('192.168.1.100', 631, '/ipp/print');
 const printerAttrs = await ipp.getPrinterAttributes();
 
 // Direct SNMP access
@@ -360,7 +370,7 @@ import { HomeAssistantProtocol, HomeAssistantDiscovery } from '@ecobridge.xyz/de
 const ha = new HomeAssistantProtocol({
   host: 'homeassistant.local',
   port: 8123,
-  accessToken: 'your_long_lived_access_token',
+  token: 'your_long_lived_access_token',
 });
 
 await ha.connect();
@@ -369,22 +379,25 @@ await ha.connect();
 const entities = await ha.getStates();
 
 // Control a light
-await ha.callService('light', 'turn_on', {
-  entity_id: 'light.living_room',
-  brightness: 200,
-});
+await ha.callService(
+  'light',
+  'turn_on',
+  { entity_id: 'light.living_room' },
+  { brightness: 200 }
+);
 
 // Subscribe to state changes
-ha.on('state_changed', (event) => {
-  console.log(`${event.entity_id}: ${event.new_state.state}`);
+await ha.subscribeToStateChanges();
+ha.on('state:changed', (event) => {
+  console.log(`${event.entity_id}: ${event.new_state?.state ?? 'removed'}`);
 });
 
 // Auto-discover Home Assistant instances via mDNS
 const discovery = new HomeAssistantDiscovery();
-discovery.on('found', (instance) => {
-  console.log(`Found HA at ${instance.address}:${instance.port}`);
+discovery.on('instance:found', (instance) => {
+  console.log(`Found HA at ${instance.host}:${instance.port}`);
 });
-await discovery.start();
+await discovery.startMdnsDiscovery();
 ```
 
 ### Helper Utilities
@@ -405,7 +418,7 @@ const result = await withRetry(
 
 // IP utilities
 isValidIp('192.168.1.1');           // true
-cidrToIps('192.168.1.0/30');        // ['192.168.1.0', '192.168.1.1', ...]
+cidrToIps('192.168.1.0/30');        // ['192.168.1.1', '192.168.1.2']
 getLocalSubnet();                    // '192.168.1.0/24'
 ```
 
@@ -425,8 +438,8 @@ The library supports multiple discovery mechanisms:
 ```typescript
 import { SERVICE_TYPES } from '@ecobridge.xyz/devicemanager';
 
-// Available: escl, ipp, ipp-tls, airplay, raop,
-// googlecast, sonos, sane, http, https, printer
+// Keys: ESCL, ESCL_SECURE, SANE, IPP, IPPS, PDL,
+// AIRPLAY, RAOP, SONOS, GOOGLECAST, SPOTIFY
 ```
 
 ### SSDP Service Types
@@ -434,11 +447,12 @@ import { SERVICE_TYPES } from '@ecobridge.xyz/devicemanager';
 ```typescript
 import { SSDP_SERVICE_TYPES } from '@ecobridge.xyz/devicemanager';
 
-// Available: all, rootdevice, mediaRenderer, mediaServer,
-// contentDirectory, avtransport, renderingControl,
-// connectionManager, zonePlayer
+// Root, DLNA media renderer/server, Sonos ZonePlayer,
+// UPnP basic device and internet gateway service types
 ```
 
+`SsdpDiscovery` uses native UDP sockets bound to every non-internal IPv4 interface. Searches are repeated every 30 seconds, and `search(serviceType)` can send an additional focused M-SEARCH while discovery is running. `start()` and `stop()` are idempotent and release all sockets, timers, and pending description requests.
+
 ## 🎯 Feature Types
 
 ```typescript
@@ -492,7 +506,7 @@ const printer = createPrinter({
   txtRecords: { rp: '/ipp/print' },
 });
 
-// Create a Sonos speaker
+// Create a normalized Sonos speaker model (no live protocol client is created)
 const speaker = createSpeaker({
   id: 'living-room-sonos',
   name: 'Living Room',
@@ -504,34 +518,7 @@ const speaker = createSpeaker({
 
 ### Smart Home Factory Functions
 
-```typescript
-import {
-  createSmartLight,
-  createSmartSwitch,
-  createSmartSensor,
-  createSmartClimate,
-  createSmartCover,
-  createSmartLock,
-  createSmartFan,
-  createSmartCamera,
-} from '@ecobridge.xyz/devicemanager';
-
-// Create devices with Home Assistant integration
-const light = createSmartLight({
-  id: 'living-room-light',
-  name: 'Living Room Light',
-  address: 'homeassistant.local',
-  port: 8123,
-  entityId: 'light.living_room',
-  protocol: 'home-assistant',
-  protocolClient: haClient,  // Your HomeAssistantProtocol instance
-  capabilities: {
-    supportsBrightness: true,
-    supportsColorTemp: true,
-    supportsRgb: true,
-  },
-});
-```
+The smart-home factories require a `protocolClient` that implements the corresponding feature interface, such as `ILightProtocolClient` for `createSmartLight()`. `HomeAssistantProtocol` exposes Home Assistant-specific service methods and entity state shapes, so it cannot be passed directly as that client; use a protocol adapter that implements the required interface.
 
 ### Event Handling
 
@@ -596,15 +583,13 @@ const maybePrint = device.getFeature<PrintFeature>('print'); // undefined
 
 Built with ❤️ using:
 - [bonjour-service](https://github.com/onlxltd/bonjour-service) - mDNS discovery
-- [node-ssdp](https://github.com/diversario/node-ssdp) - SSDP/UPnP discovery
+- [Node.js networking and fetch APIs](https://nodejs.org/api/) - SSDP, IPP, eSCL, UPnP, and active network discovery
 - [net-snmp](https://github.com/markabrahams/node-net-snmp) - SNMP protocol
-- [ipp](https://github.com/niclaslindstedt/ipp) - IPP printing protocol
-- [sonos](https://github.com/bencevans/node-sonos) - Sonos control
-- [castv2-client](https://github.com/thibauts/node-castv2-client) - Chromecast protocol
+- [ws](https://github.com/websockets/ws) - Home Assistant WebSocket transport
 
 ## License and Legal Information
 
-This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file.
+This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [license.md](./license.md) file.
 
 **Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
 

package/test/{test.ts → test.node.ts}

@@ -127,50 +127,6 @@ tap.test('withRetry should throw after max retries', async () => {
   expect(callCount).toEqual(3); // Initial + 2 retries
 });
 
-// Test discovery (non-blocking)
-tap.test('should start and stop discovery', async () => {
-  const dm = new devicemanager.DeviceManager();
-
-  // Track events
-  let discoveryStarted = false;
-  let discoveryStopped = false;
-
-  dm.on('discovery:started', () => {
-    discoveryStarted = true;
-  });
-
-  dm.on('discovery:stopped', () => {
-    discoveryStopped = true;
-  });
-
-  await dm.startDiscovery();
-  expect(dm.isDiscovering).toEqual(true);
-  expect(discoveryStarted).toEqual(true);
-
-  // Wait a bit for potential device discovery
-  await new Promise((resolve) => setTimeout(resolve, 2000));
-
-  // Log discovered devices using new API
-  const scanners = dm.getDevices({ hasFeature: 'scan' });
-  const printers = dm.getDevices({ hasFeature: 'print' });
-  console.log(`Discovered ${scanners.length} scanner(s) and ${printers.length} printer(s)`);
-
-  for (const scanner of scanners) {
-    const scanFeature = scanner.getFeature<devicemanager.ScanFeature>('scan');
-    console.log(`  Scanner: ${scanner.name} (${scanner.address}) - ${scanFeature?.protocol || 'unknown'}`);
-  }
-
-  for (const printer of printers) {
-    console.log(`  Printer: ${printer.name} (${printer.address})`);
-  }
-
-  await dm.stopDiscovery();
-  expect(dm.isDiscovering).toEqual(false);
-  expect(discoveryStopped).toEqual(true);
-
-  await dm.shutdown();
-});
-
 // Test Scanner creation using factory
 tap.test('should create Scanner device using factory', async () => {
   const scanner = devicemanager.createScanner({
@@ -204,8 +160,8 @@ tap.test('should create Printer device using factory', async () => {
     name: 'Test Printer',
     address: '192.168.1.101',
     port: 631,
-    ippPath: '/ipp/print',
     txtRecords: {
+      'rp': '/ipp/print',
       'ty': 'Brother HL-L2350DW',
       'Color': 'T',
       'Duplex': 'T',
@@ -221,6 +177,25 @@ tap.test('should create Printer device using factory', async () => {
   expect(printFeature).toBeInstanceOf(devicemanager.PrintFeature);
 });
 
+tap.test('should create a Sonos speaker without an external Sonos client', async () => {
+  const speaker = devicemanager.createSpeaker({
+    id: 'test:speaker:sonos',
+    name: 'Living Room',
+    address: '192.168.1.102',
+    port: 1400,
+    protocol: 'sonos',
+  });
+
+  const playback = speaker.selectFeature<devicemanager.PlaybackFeature>('playback');
+  const volume = speaker.selectFeature<devicemanager.VolumeFeature>('volume');
+
+  expect(speaker.id).toEqual('test:speaker:sonos');
+  expect(playback.protocol).toEqual('sonos');
+  expect(playback.supportsQueue).toEqual(true);
+  expect(playback.supportsSeek).toEqual(true);
+  expect(volume.protocol).toEqual('sonos');
+});
+
 // Test UniversalDevice feature management
 tap.test('should manage features on UniversalDevice', async () => {
   const device = new devicemanager.UniversalDevice('192.168.1.50', 80, {