homebridge-multiple-switch 1.2.0 → 1.3.0

package/.github/workflows/ci.yml

@@ -11,31 +11,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: 📥 Repo-nu klonla
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: ⚙️ Node.js qur
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
           cache: 'npm'
 
-      - name: 📦 Asılılıqları qur
+      - name: Install dependencies
         run: npm install
 
-      - name: ✅ Kod yoxlaması (lint varsa)
-        run: |
-          if [ -f .eslintrc.js ] || [ -f .eslintrc.json ]; then
-            npm run lint
-          else
-            echo "Lint skripti tapılmadı, keçilir..."
-          fi
-
-      - name: 🧪 Testləri icra et (əgər varsa)
-        run: |
-          if [ -f package.json ] && grep -q '\"test\"' package.json; then
-            npm test
-          else
-            echo "Test skripti yoxdur, keçilir..."
-          fi
+      - name: Lint
+        run: npm run lint
 
+      - name: Test
+        run: npm test

package/.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: 📦 Publish to npm
+name: Publish to npm
 
 on:
   push:
@@ -10,19 +10,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: 📥 Repo-nu klonla
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: ⚙️ Node.js qur
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
           node-version: '18'
           registry-url: 'https://registry.npmjs.org/'
 
-      - name: 📦 Asılılıqları qur
+      - name: Install dependencies
         run: npm install
 
-      - name: 🚀 NPM-ə yüklə
+      - name: Publish to npm
         run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/CHANGELOG.md

@@ -0,0 +1,32 @@
+# Changelog
+
+## [1.3.0] - 2026-03-21
+
+### Changed
+- Replaced global mutable variables with instance properties
+- Refactored accessory setup to reuse cached accessories instead of creating duplicates on restart
+- Extracted switch behavior logic into dedicated methods (`turnOffOthers`, `setAll`, `scheduleAutoOff`)
+- Used `Map` for service and accessory tracking instead of plain objects
+- Service type lookup uses a constant map instead of a switch statement
+- Auto-off now checks current state before turning off (prevents stale timeouts)
+- Updated minimum Node.js version from 14 to 18
+- Updated GitHub Actions from v3 to v4
+- Cleaned up CI workflow
+
+### Fixed
+- `delayOff` not working in `master` mode due to if/else logic bug
+- Cached accessories not being restored on Homebridge restart (caused duplicate accessories)
+- Services stored in `accessory.context` which is not serializable
+- README field names (`autoTurnOff`, `mode`) now match actual config schema (`delayOff`, `switchBehavior`)
+
+### Added
+- Automatic removal of stale cached accessories when config changes
+- Service reconciliation: adds new services and removes old ones on config update
+- Validation for empty or missing switches array
+
+## [1.2.0] - 2025-01-01
+
+- Initial published version with independent, master, and single switch modes
+- Support for switch, outlet, lightbulb, and fan accessory types
+- Per-switch config: type, defaultState, delayOff
+- Homebridge UI config schema

package/README.md

@@ -5,26 +5,26 @@
 [![GitHub issues](https://img.shields.io/github/issues/azadaydinli/homebridge-multiple-switch)](https://github.com/azadaydinli/homebridge-multiple-switch/issues)
 [![GitHub license](https://img.shields.io/github/license/azadaydinli/homebridge-multiple-switch)](https://github.com/azadaydinli/homebridge-multiple-switch/blob/master/LICENSE)
 
-A lightweight Homebridge plugin that lets you create multiple customizable dummy switches under a single accessory — configurable as `Switch`, `Outlet`, `Lightbulb`, or `Fan`.  
+A lightweight Homebridge plugin that lets you create multiple customizable dummy switches under a single accessory — configurable as `Switch`, `Outlet`, `Lightbulb`, or `Fan`.
 Supports `Independent`, `Master`, and `Single` switch modes.
 
 ---
 
-## ✨ Features
+## Features
 
 - Grouped multiple switches in one HomeKit tile
 - Accessory type: `switch`, `outlet`, `lightbulb`, or `fan`
 - **Independent Mode** – All switches operate separately
-- **Master Mode** – One master switch controls the rest
+- **Master Mode** – One switch controls all others
 - **Single Mode** – Only one switch can be active at a time
-- Per-switch config support (type, auto-off, default state)
-- Switch states are preserved after Homebridge restart
-- Fully dynamic config reload (no need to restart Homebridge)
+- Per-switch config support (type, auto-off delay, default state)
+- Switch states preserved across Homebridge restarts via cached accessories
+- Automatic cleanup of stale accessories on config change
 - Compatible with HomeKit and Siri
 
 ---
 
-## 📦 Installation
+## Installation
 
 Install via Homebridge UI:
 
@@ -40,20 +40,21 @@ npm install -g homebridge-multiple-switch
 
 ---
 
-## ⚙️ Configuration (Platform Mode)
+## Configuration
 
-Configure from Homebridge UI or manually edit `config.json` like below:
+Configure from Homebridge UI or manually edit `config.json`:
 
 ```json
 {
   "platform": "MultipleSwitchPlatform",
   "name": "Multiple Switches",
+  "switchBehavior": "single",
   "switches": [
     {
       "name": "Heater",
       "type": "outlet",
       "defaultState": true,
-      "autoTurnOff": 10000
+      "delayOff": 10000
     },
     {
       "name": "Fan",
@@ -62,35 +63,34 @@ Configure from Homebridge UI or manually edit `config.json` like below:
     {
       "name": "Light",
       "type": "lightbulb",
-      "autoTurnOff": 5000
+      "delayOff": 5000
     }
-  ],
-  "mode": "single"
+  ]
 }
 ```
 
 ---
 
-### 🔧 Configuration Options
+### Platform Options
 
-| Field           | Type    | Required | Description                                                             |
-|----------------|---------|----------|-------------------------------------------------------------------------|
-| `name`          | string  | ✅       | Name of the platform instance                                           |
-| `switches`      | array   | ✅       | List of switches to create                                              |
-| `mode`          | string  | ❌       | `independent`, `master`, or `single`                                    |
-| `type`          | string  | ❌       | Switch type: `switch`, `outlet`, `lightbulb`, `fan` (overridden per switch) |
-| `autoTurnOff`   | number  | ❌       | Global auto-off (ms) – can be overridden per switch                     |
-| `defaultState`  | boolean | ❌       | Default power state on restart – can be overridden per switch           |
+| Field            | Type   | Required | Description                          |
+|------------------|--------|----------|--------------------------------------|
+| `name`           | string | Yes      | Name of the platform instance        |
+| `switchBehavior` | string | No       | `independent`, `master`, or `single` |
+| `switches`       | array  | Yes      | List of switches to create           |
 
-Each object inside `switches[]` can include:  
-- `name`: Name of the switch  
-- `type`: Optional (`switch`, `outlet`, etc.)  
-- `autoTurnOff`: Optional (in ms)  
-- `defaultState`: Optional (true/false)
+### Per-Switch Options
+
+| Field          | Type    | Required | Description                                      |
+|----------------|---------|----------|--------------------------------------------------|
+| `name`         | string  | Yes      | Name of the switch                               |
+| `type`         | string  | No       | `switch`, `outlet`, `lightbulb`, or `fan`        |
+| `defaultState` | boolean | No       | Initial power state (default: `false`)           |
+| `delayOff`     | number  | No       | Auto turn off after N milliseconds (default: `0`) |
 
 ---
 
-## 📣 Example Use Cases
+## Example Use Cases
 
 - Simulate smart plugs for automation testing
 - Trigger HomeKit scenes manually
@@ -99,7 +99,7 @@ Each object inside `switches[]` can include:
 
 ---
 
-## 🔗 Links
+## Links
 
 - [NPM Package](https://www.npmjs.com/package/homebridge-multiple-switch)
 - [Homebridge](https://homebridge.io/)
@@ -107,6 +107,6 @@ Each object inside `switches[]` can include:
 
 ---
 
-## 📜 License
+## License
 
 MIT © [Azad Aydınlı](https://github.com/azadaydinli)

package/index.js

@@ -1,109 +1,160 @@
-// homebridge-multiple-switch: index.js (Platform plugin, bir Accessory, çox Service)
+'use strict';
 
-let Service, Characteristic, UUIDGen;
+const PLUGIN_NAME = 'homebridge-multiple-switch';
+const PLATFORM_NAME = 'MultipleSwitchPlatform';
 
-module.exports = (api) => {
-  Service = api.hap.Service;
-  Characteristic = api.hap.Characteristic;
-  UUIDGen = api.hap.uuid;
+const SERVICE_TYPES = {
+  switch: 'Switch',
+  lightbulb: 'Lightbulb',
+  fan: 'Fan',
+  outlet: 'Outlet',
+};
 
-  api.registerPlatform('MultipleSwitchPlatform', MultipleSwitchPlatform);
+module.exports = (api) => {
+  api.registerPlatform(PLATFORM_NAME, MultipleSwitchPlatform);
 };
 
 class MultipleSwitchPlatform {
   constructor(log, config, api) {
     this.log = log;
-    this.config = config;
+    this.config = config || {};
     this.api = api;
-    this.accessories = [];
+    this.Service = api.hap.Service;
+    this.Characteristic = api.hap.Characteristic;
+    this.cachedAccessories = new Map();
+    this.switchServices = new Map();
 
     this.api.on('didFinishLaunching', () => {
-      this.log('🔌 MultipleSwitchPlatform başladıldı.');
+      this.log.info('MultipleSwitchPlatform started.');
       this.setupAccessories();
     });
   }
 
+  configureAccessory(accessory) {
+    this.cachedAccessories.set(accessory.UUID, accessory);
+  }
+
   setupAccessories() {
-    const switches = this.config.switches || [];
-    const behavior = this.config.switchBehavior || 'independent';
+    const switches = this.config.switches;
+    if (!Array.isArray(switches) || switches.length === 0) {
+      this.log.warn('No switches configured. Removing stale accessories.');
+      this.removeStaleCachedAccessories();
+      return;
+    }
+
     const name = this.config.name || 'Multiple Switch Panel';
+    const behavior = this.config.switchBehavior || 'independent';
+    const uuid = this.api.hap.uuid.generate(name);
+
+    let accessory = this.cachedAccessories.get(uuid);
+    const isNew = !accessory;
 
-    const uuid = UUIDGen.generate(name);
-    const accessory = new this.api.platformAccessory(name, uuid);
+    if (isNew) {
+      accessory = new this.api.platformAccessory(name, uuid);
+    }
 
-    accessory.context.switchStates = {};
-    accessory.context.switchServices = {};
     accessory.context.switchBehavior = behavior;
+    accessory.context.switchStates = accessory.context.switchStates || {};
+
+    this.reconcileServices(accessory, switches);
+
+    if (isNew) {
+      this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
+    }
+
+    this.cachedAccessories.delete(uuid);
+    this.removeStaleCachedAccessories();
+  }
+
+  reconcileServices(accessory, switches) {
+    const activeSubtypes = new Set();
 
     switches.forEach((sw, index) => {
-      const id = `switch_${index}`;
-      const service = this.createSwitchService(accessory, sw, id);
+      const subtype = `switch_${index}`;
+      activeSubtypes.add(subtype);
 
-      accessory.addService(service);
-      accessory.context.switchStates[id] = sw.defaultState || false;
-      accessory.context.switchServices[id] = service;
+      const ServiceClass = this.getServiceClass(sw.type);
+      let service = accessory.getServiceById(ServiceClass, subtype);
+
+      if (!service) {
+        service = accessory.addService(ServiceClass, sw.name, subtype);
+      }
+
+      service.setCharacteristic(this.Characteristic.Name, sw.name);
+      this.configureSwitchHandlers(accessory, service, sw, subtype);
+
+      this.switchServices.set(subtype, service);
+
+      if (accessory.context.switchStates[subtype] === undefined) {
+        accessory.context.switchStates[subtype] = sw.defaultState || false;
+      }
     });
 
-    this.api.registerPlatformAccessories(
-      'homebridge-multiple-switch',
-      'MultipleSwitchPlatform',
-      [accessory]
-    );
-    this.accessories.push(accessory);
+    const servicesToRemove = accessory.services.filter((s) => {
+      return s.subtype && !activeSubtypes.has(s.subtype);
+    });
+    servicesToRemove.forEach((s) => accessory.removeService(s));
   }
 
-  createSwitchService(accessory, sw, id) {
-    const ServiceType = this.getServiceClass(sw.type);
-    const service = new ServiceType(sw.name, id);
-
-    service.getCharacteristic(Characteristic.On)
-      .onGet(() => {
-        return accessory.context.switchStates[id];
-      })
+  configureSwitchHandlers(accessory, service, sw, subtype) {
+    service.getCharacteristic(this.Characteristic.On)
+      .onGet(() => accessory.context.switchStates[subtype] ?? false)
       .onSet((value) => {
+        accessory.context.switchStates[subtype] = value;
+        this.log.info(`[${sw.name}] ${value ? 'ON' : 'OFF'}`);
+
         const behavior = accessory.context.switchBehavior;
-        accessory.context.switchStates[id] = value;
-        this.log(`[${sw.name}] → ${value ? 'ON' : 'OFF'}`);
 
         if (behavior === 'single' && value) {
-          Object.keys(accessory.context.switchStates).forEach(key => {
-            if (key !== id) {
-              accessory.context.switchStates[key] = false;
-              accessory.context.switchServices[key].updateCharacteristic(Characteristic.On, false);
-            }
-          });
+          this.turnOffOthers(accessory, subtype);
         }
 
         if (behavior === 'master') {
-          Object.keys(accessory.context.switchStates).forEach(key => {
-            accessory.context.switchStates[key] = value;
-            accessory.context.switchServices[key].updateCharacteristic(Characteristic.On, value);
-          });
-        } else {
-          if (value && sw.delayOff > 0) {
-            setTimeout(() => {
-              accessory.context.switchStates[id] = false;
-              service.updateCharacteristic(Characteristic.On, false);
-              this.log(`[${sw.name}] auto-off after ${sw.delayOff}ms`);
-            }, sw.delayOff);
-          }
+          this.setAll(accessory, value);
+        }
+
+        if (value && sw.delayOff > 0) {
+          this.scheduleAutoOff(accessory, service, sw, subtype);
         }
       });
+  }
 
-    return service;
+  turnOffOthers(accessory, excludeSubtype) {
+    for (const [key, svc] of this.switchServices) {
+      if (key !== excludeSubtype) {
+        accessory.context.switchStates[key] = false;
+        svc.updateCharacteristic(this.Characteristic.On, false);
+      }
+    }
   }
 
-  getServiceClass(type) {
-    switch ((type || '').toLowerCase()) {
-      case 'switch': return Service.Switch;
-      case 'lightbulb': return Service.Lightbulb;
-      case 'fan': return Service.Fan;
-      case 'outlet':
-      default: return Service.Outlet;
+  setAll(accessory, value) {
+    for (const [key, svc] of this.switchServices) {
+      accessory.context.switchStates[key] = value;
+      svc.updateCharacteristic(this.Characteristic.On, value);
     }
   }
 
-  configureAccessory(accessory) {
-    this.accessories.push(accessory);
+  scheduleAutoOff(accessory, service, sw, subtype) {
+    setTimeout(() => {
+      if (accessory.context.switchStates[subtype]) {
+        accessory.context.switchStates[subtype] = false;
+        service.updateCharacteristic(this.Characteristic.On, false);
+        this.log.info(`[${sw.name}] auto-off after ${sw.delayOff}ms`);
+      }
+    }, sw.delayOff);
+  }
+
+  getServiceClass(type) {
+    const key = (type || 'outlet').toLowerCase();
+    const name = SERVICE_TYPES[key] || SERVICE_TYPES.outlet;
+    return this.Service[name];
+  }
+
+  removeStaleCachedAccessories() {
+    if (this.cachedAccessories.size === 0) return;
+    const stale = [...this.cachedAccessories.values()];
+    this.api.unregisterPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, stale);
+    this.cachedAccessories.clear();
   }
 }

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "homebridge-multiple-switch",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Multiple switch platform for Homebridge",
   "homepage": "https://github.com/azadaydinli/homebridge-multiple-switch",
   "main": "index.js",
   "author": "Azad Aydınlı",
   "license": "ISC",
+  "scripts": {
+    "lint": "echo \"No linter configured\"",
+    "test": "echo \"No tests configured\""
+  },
   "bugs": {
     "url": "https://github.com/azadaydinli/homebridge-multiple-switch/issues"
   },
@@ -26,7 +30,7 @@
     "url": "https://github.com/azadaydinli/homebridge-multiple-switch.git"
   },
   "engines": {
-    "node": ">=14.17.0",
+    "node": ">=18.0.0",
     "homebridge": ">=1.3.0"
   }
 }

package/.github/workflows/release.yml.save

@@ -1,28 +0,0 @@
-name: 📦 Publish to npm
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📥 Repo-nu klonla
-        uses: actions/checkout@v3
-
-      - name: ⚙️ Node.js qur
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          registry-url: 'https://registry.npmjs.org/'
-
-      - name: 📦 Asılılıqları qur
-        run: npm install
-
-      - name: 🚀 NPM-ə yüklə
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/release.yml.save.1

@@ -1,28 +0,0 @@
-name: 📦 Publish to npm
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📥 Repo-nu klonla
-        uses: actions/checkout@v3
-
-      - name: ⚙️ Node.js qur
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          registry-url: 'https://registry.npmjs.org/'
-
-      - name: 📦 Asılılıqları qur
-        run: npm install
-
-      - name: 🚀 NPM-ə yüklə
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/release.yml.save.2

@@ -1,28 +0,0 @@
-name: 📦 Publish to npm
-
-on:
-  push:
-    tags:
-      - 'v*.*.*'
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: 📥 Repo-nu klonla
-        uses: actions/checkout@v3
-
-      - name: ⚙️ Node.js qur
-        uses: actions/setup-node@v3
-        with:
-          node-version: '18'
-          registry-url: 'https://registry.npmjs.org/'
-
-      - name: 📦 Asılılıqları qur
-        run: npm install
-
-      - name: 🚀 NPM-ə yüklə
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}