matterbridge-eve-motion 1.1.0 → 1.2.0-dev.1

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.0-dev.1] - 2025-02-01
+
+### Changed
+
+- [package]: Require Matterbridge 2.1.0.
+- [package]: Update package.
+- [package]: Update dependencies.
+
+<a href="https://www.buymeacoffee.com/luligugithub">
+  <img src="./yellow-button.png" alt="Buy me a coffee" width="120">
+</a>
+
 ## [1.1.0] - 2024-12-14
 
 ### Added

package/dist/index.js

@@ -1,11 +1,4 @@
 import { EveMotionPlatform } from './platform.js';
-/**
- * This is the standard interface for MatterBridge plugins.
- * Each plugin should export a default function that follows this signature.
- *
- * @param matterbridge - An instance of MatterBridge
- */
 export default function initializePlugin(matterbridge, log, config) {
     return new EveMotionPlatform(matterbridge, log, config);
 }
-//# sourceMappingURL=index.js.map

package/dist/platform.js

@@ -1,44 +1,34 @@
-import { IlluminanceMeasurement, OccupancySensing, MatterbridgeDevice, MatterbridgeAccessoryPlatform, powerSource, MatterbridgeEndpoint, occupancySensor, lightSensor, } from 'matterbridge';
+import { IlluminanceMeasurement, OccupancySensing, MatterbridgeAccessoryPlatform, powerSource, MatterbridgeEndpoint, occupancySensor, lightSensor, } from 'matterbridge';
 import { MatterHistory } from 'matter-history';
 export class EveMotionPlatform extends MatterbridgeAccessoryPlatform {
     motion;
     history;
     interval;
-    createMutableDevice(definition, options = {}, debug = false) {
-        let device;
-        if (this.matterbridge.edge === true)
-            device = new MatterbridgeEndpoint(definition, options, debug);
-        else
-            device = new MatterbridgeDevice(definition, options, debug);
-        return device;
-    }
     constructor(matterbridge, log, config) {
         super(matterbridge, log, config);
-        // Verify that Matterbridge is the correct version
-        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('1.6.6')) {
-            throw new Error(`This plugin requires Matterbridge version >= "1.6.6". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
+        if (this.verifyMatterbridgeVersion === undefined || typeof this.verifyMatterbridgeVersion !== 'function' || !this.verifyMatterbridgeVersion('2.1.0')) {
+            throw new Error(`This plugin requires Matterbridge version >= "2.1.0". Please update Matterbridge from ${this.matterbridge.matterbridgeVersion} to the latest version in the frontend."`);
         }
         this.log.info('Initializing platform:', this.config.name);
     }
     async onStart(reason) {
         this.log.info('onStart called with reason:', reason ?? 'none');
-        this.history = new MatterHistory(this.log, 'Eve motion', { filePath: this.matterbridge.matterbridgeDirectory, edge: this.matterbridge.edge });
-        this.motion = this.createMutableDevice([occupancySensor, lightSensor, powerSource], { uniqueStorageKey: 'EveMotion' }, this.config.debug);
+        this.history = new MatterHistory(this.log, 'Eve motion', { filePath: this.matterbridge.matterbridgeDirectory });
+        this.motion = new MatterbridgeEndpoint([occupancySensor, lightSensor, powerSource], { uniqueStorageKey: 'Eve motion' }, this.config.debug);
         this.motion.createDefaultIdentifyClusterServer();
         this.motion.createDefaultBasicInformationClusterServer('Eve motion', '0x85483499', 4874, 'Eve Systems', 89, 'Eve Motion 20EBY9901', 6650, '3.2.1');
         this.motion.createDefaultOccupancySensingClusterServer();
         this.motion.createDefaultIlluminanceMeasurementClusterServer();
         this.motion.createDefaultPowerSourceReplaceableBatteryClusterServer();
-        // Add the EveHistory cluster to the device as last cluster!
         this.history.createMotionEveHistoryClusterServer(this.motion, this.log);
         this.history.autoPilot(this.motion);
         await this.registerDevice(this.motion);
         this.motion.addCommandHandler('identify', async ({ request: { identifyTime } }) => {
-            this.log.warn(`Command identify called identifyTime:${identifyTime}`);
+            this.log.info(`Command identify called identifyTime:${identifyTime}`);
             this.history?.logHistory(false);
         });
         this.motion.addCommandHandler('triggerEffect', async ({ request: { effectIdentifier, effectVariant } }) => {
-            this.log.warn(`Command triggerEffect called effect ${effectIdentifier} variant ${effectVariant}`);
+            this.log.info(`Command triggerEffect called effect ${effectIdentifier} variant ${effectVariant}`);
             this.history?.logHistory(false);
         });
     }
@@ -68,4 +58,3 @@ export class EveMotionPlatform extends MatterbridgeAccessoryPlatform {
             await this.unregisterAllDevices();
     }
 }
-//# sourceMappingURL=platform.js.map

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
   "name": "matterbridge-eve-motion",
-  "version": "1.1.0",
+  "version": "1.2.0-dev.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "matterbridge-eve-motion",
-      "version": "1.1.0",
+      "version": "1.2.0-dev.1",
       "license": "MIT",
       "dependencies": {
-        "matter-history": "1.1.17-dev.6",
+        "matter-history": "1.1.17-dev.8",
         "node-ansi-logger": "3.0.0",
         "node-persist-manager": "1.0.8"
       },
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/matter-history": {
-      "version": "1.1.17-dev.6",
-      "resolved": "https://registry.npmjs.org/matter-history/-/matter-history-1.1.17-dev.6.tgz",
-      "integrity": "sha512-HcRofndO9PtE7wZ8K1Q0FXWPVucXS3tJBuYG6yk6+PkorWPdLlKYVBplKXzdY1zGY9zDiSB8CKAiPfst33vO2g==",
+      "version": "1.1.17-dev.8",
+      "resolved": "https://registry.npmjs.org/matter-history/-/matter-history-1.1.17-dev.8.tgz",
+      "integrity": "sha512-r/qr30WlJkLbmFVhF6fbeTPZFaLaznYBZVhZuPPAeCY0Y1FN+YdqKzUd59jAeSMQQZNGmPqOuHnOlrkzczKA1g==",
       "hasShrinkwrap": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -71,10 +71,13 @@
       }
     },
     "node_modules/node-persist": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.3.tgz",
-      "integrity": "sha512-0gDy86TNShzfbpUKFbH8KJFjoovuUgVh/FqL4jrJWYz0cET76Uohl118utG/Ft6wl4sHOPXdRSY7eXH5kVY06w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-4.0.4.tgz",
+      "integrity": "sha512-8sPAz/7tw1mCCc8xBG4f0wi+flHkSSgQeX998iQ75Pu27evA6UUWCjSE7xnrYTg2q33oU5leJ061EKPDv6BocQ==",
       "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.1.0"
+      },
       "engines": {
         "node": ">=10.12.0"
       }
@@ -94,6 +97,33 @@
         "type": "buymeacoffee",
         "url": "https://www.buymeacoffee.com/luligugithub"
       }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/yocto-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     }
   }
 }

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "matterbridge-eve-motion",
-  "version": "1.1.0",
+  "version": "1.2.0-dev.1",
   "description": "Matterbridge eve motion with history",
   "author": "https://github.com/Luligu",
   "license": "MIT",
   "type": "module",
   "main": "dist/index.js",
-  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Luligu/matterbridge-eve-motion.git"
@@ -27,44 +26,8 @@
   "engines": {
     "node": ">=18.0.0 <19.0.0 || >=20.0.0 <21.0.0 || >=22.0.0 <23.0.0"
   },
-  "scripts": {
-    "build": "tsc",
-    "watch": "tsc --watch",
-    "start": "matterbridge",
-    "start:bridge": "matterbridge -bridge",
-    "start:childbridge": "matterbridge -childbridge",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "test:verbose": "node --experimental-vm-modules node_modules/jest/bin/jest.js --verbose",
-    "test:watch": "node --experimental-vm-modules node_modules/jest/bin/jest.js --watch",
-    "test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
-    "lint": "eslint --max-warnings=0 .",
-    "lint:fix": "eslint --fix --max-warnings=0 .",
-    "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
-    "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json,css,md}\"",
-    "clean": "npx rimraf tsconfig.tsbuildinfo ./dist",
-    "cleanBuild": "npm run clean && tsc",
-    "deepClean": "npx rimraf tsconfig.tsbuildinfo package-lock.json npm-shrinkwrap.json ./dist ./node_modules",
-    "deepCleanBuild": "npm run deepClean && npm install && npm link matterbridge && npm run build",
-    "checkDependencies": "npx npm-check-updates",
-    "updateDependencies": "npx npm-check-updates -u && npm install && npm link matterbridge && npm run build",
-    "prepublishOnly": "npm pkg delete devDependencies && npm install --omit=dev && npm shrinkwrap",
-    "buildProduction": "npm run clean && tsc --project tsconfig.production.json",
-    "npmPack": "copy package.json package.log && npm run buildProduction && npm pkg delete devDependencies && npm pkg delete scripts && npx rimraf ./node_modules && npm install --omit=dev && npm shrinkwrap && npm pack && copy package.log package.json && npm run deepCleanBuild && npm run deepCleanBuild",
-    "npmPublishTagDev": "copy package.json package.log && npm run buildProduction && npm pkg delete devDependencies && npm pkg delete scripts && npx rimraf ./node_modules && npm install --omit=dev && npm shrinkwrap && npm publish --tag dev && copy package.log package.json && npm run deepCleanBuild",
-    "npmPublishTagLatest": "copy package.json package.log && npm run buildProduction && npm pkg delete devDependencies && npm pkg delete scripts && npx rimraf ./node_modules && npm install --omit=dev && npm shrinkwrap && npm publish --tag latest && copy package.log package.json && npm run deepCleanBuild",
-    "matterbridge:add": "matterbridge -add .\\",
-    "matterbridge:remove": "matterbridge -remove .\\",
-    "matterbridge:enable": "matterbridge -enable .\\",
-    "matterbridge:disable": "matterbridge -disable .\\",
-    "matterbridge:list": "matterbridge -list",
-    "history:local": "npm install ../matter-history && npm run deepCleanBuild",
-    "history:dev": "npm install matter-history@dev && npm run deepCleanBuild",
-    "history": "npm install matter-history && npm run deepCleanBuild",
-    "dev:link": "npm link matterbridge",
-    "dev:unlink": "npm unlink matterbridge"
-  },
   "dependencies": {
-    "matter-history": "1.1.17-dev.6",
+    "matter-history": "1.1.17-dev.8",
     "node-ansi-logger": "3.0.0",
     "node-persist-manager": "1.0.8"
   }

package/dist/index.d.ts

@@ -1,11 +0,0 @@
-import { Matterbridge, PlatformConfig } from 'matterbridge';
-import { AnsiLogger } from 'matterbridge/logger';
-import { EveMotionPlatform } from './platform.js';
-/**
- * This is the standard interface for MatterBridge plugins.
- * Each plugin should export a default function that follows this signature.
- *
- * @param matterbridge - An instance of MatterBridge
- */
-export default function initializePlugin(matterbridge: Matterbridge, log: AnsiLogger, config: PlatformConfig): EveMotionPlatform;
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,qBAE3G"}

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,YAA0B,EAAE,GAAe,EAAE,MAAsB;IAC1G,OAAO,IAAI,iBAAiB,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC1D,CAAC"}

package/dist/platform.d.ts

@@ -1,14 +0,0 @@
-import { PlatformConfig, Matterbridge, MatterbridgeDevice, MatterbridgeAccessoryPlatform, DeviceTypeDefinition, EndpointOptions, AtLeastOne } from 'matterbridge';
-import { MatterHistory } from 'matter-history';
-import { AnsiLogger } from 'matterbridge/logger';
-export declare class EveMotionPlatform extends MatterbridgeAccessoryPlatform {
-    motion: MatterbridgeDevice | undefined;
-    history: MatterHistory | undefined;
-    interval: NodeJS.Timeout | undefined;
-    createMutableDevice(definition: DeviceTypeDefinition | AtLeastOne<DeviceTypeDefinition>, options?: EndpointOptions, debug?: boolean): MatterbridgeDevice;
-    constructor(matterbridge: Matterbridge, log: AnsiLogger, config: PlatformConfig);
-    onStart(reason?: string): Promise<void>;
-    onConfigure(): Promise<void>;
-    onShutdown(reason?: string): Promise<void>;
-}
-//# sourceMappingURL=platform.d.ts.map

package/dist/platform.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EACd,YAAY,EACZ,kBAAkB,EAClB,6BAA6B,EAE7B,oBAAoB,EACpB,eAAe,EACf,UAAU,EAIX,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,iBAAkB,SAAQ,6BAA6B;IAClE,MAAM,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACvC,OAAO,EAAE,aAAa,GAAG,SAAS,CAAC;IACnC,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;IAErC,mBAAmB,CAAC,UAAU,EAAE,oBAAoB,GAAG,UAAU,CAAC,oBAAoB,CAAC,EAAE,OAAO,GAAE,eAAoB,EAAE,KAAK,UAAQ,GAAG,kBAAkB;gBAO9I,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;IAahE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM;IA6BvB,WAAW;IAsBX,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;CAM1C"}

package/dist/platform.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}