@willieee802/zigbee-herdsman 0.15.0 → 0.15.1

package/dist/controller/model/group.js

@@ -1,222 +1,222 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const entity_1 = __importDefault(require("./entity"));
-const zclTransactionSequenceNumber_1 = __importDefault(require("../helpers/zclTransactionSequenceNumber"));
-const Zcl = __importStar(require("../../zcl"));
-const device_1 = __importDefault(require("./device"));
-const assert_1 = __importDefault(require("assert"));
-const debug_1 = __importDefault(require("debug"));
-const debug = {
-    info: (0, debug_1.default)('zigbee-herdsman:controller:group'),
-    error: (0, debug_1.default)('zigbee-herdsman:controller:group'),
-};
-class Group extends entity_1.default {
-    get members() { return Array.from(this._members).filter((e) => e.getDevice()); }
-    constructor(databaseID, ID, groupID, members, meta) {
-        super();
-        this.databaseID = databaseID;
-        this.ID = ID;
-        this.groupID = groupID;
-        this._members = members;
-        this.meta = meta;
-    }
-    /*
-     * CRUD
-     */
-    static fromDatabaseEntry(entry, databaseID) {
-        const members = new Set();
-        for (const member of entry.members) {
-            const device = device_1.default.byIeeeAddr(databaseID, member.deviceIeeeAddr);
-            if (device) {
-                const endpoint = device.getEndpoint(member.endpointID);
-                members.add(endpoint);
-            }
-        }
-        return new Group(databaseID, entry.id, entry.groupID, members, entry.meta);
-    }
-    toDatabaseRecord() {
-        const members = Array.from(this.members).map((member) => {
-            return { deviceIeeeAddr: member.getDevice().ieeeAddr, endpointID: member.ID };
-        });
-        return { id: this.ID, type: 'Group', groupID: this.groupID, members, meta: this.meta };
-    }
-    static loadFromDatabaseIfNecessary() {
-        entity_1.default.databases.forEach(database => {
-            if (!Group.groups.get(database.id)) {
-                Group.groups.set(database.id, {});
-                const entries = database.getEntries(['Group']);
-                for (const entry of entries) {
-                    const group = Group.fromDatabaseEntry(entry, database.id);
-                    Group.groups.get(database.id)[group.groupID] = group;
-                }
-            }
-        });
-    }
-    static byGroupID(groupID, databaseID) {
-        Group.loadFromDatabaseIfNecessary();
-        return Group.groups.get(databaseID)[groupID];
-    }
-    // public static all(): Group[] {
-    //     Group.loadFromDatabaseIfNecessary();
-    //     const groups: Group[] = [];
-    //     Group.groups.forEach(groupDB => {
-    //         groups.push(...Object.values(groupDB));
-    //     });
-    //     return groups;
-    // }
-    static allByDatabaseID(databaseID) {
-        Group.loadFromDatabaseIfNecessary();
-        return Object.values(Group.groups.get(databaseID));
-    }
-    static create(groupID, databaseID) {
-        (0, assert_1.default)(typeof groupID === 'number', 'GroupID must be a number');
-        Group.loadFromDatabaseIfNecessary();
-        if (Group.groups.get(databaseID)[groupID]) {
-            throw new Error(`Group with groupID '${groupID}' already exists`);
-        }
-        const database = entity_1.default.getDatabaseByID(databaseID);
-        const ID = database.newID();
-        const group = new Group(databaseID, ID, groupID, new Set(), {});
-        database.insert(group.toDatabaseRecord());
-        Group.groups.get(database.id)[group.groupID] = group;
-        return group;
-    }
-    async removeFromNetwork() {
-        for (const endpoint of this._members) {
-            await endpoint.removeFromGroup(this);
-        }
-        this.removeFromDatabase();
-    }
-    removeFromDatabase() {
-        Group.loadFromDatabaseIfNecessary();
-        const database = entity_1.default.getDatabaseByID(this.databaseID);
-        if (database.has(this.databaseID)) {
-            database.remove(this.databaseID);
-        }
-        delete Group.groups.get(database.id)[this.groupID];
-    }
-    save(writeDatabase = true) {
-        entity_1.default.getDatabaseByID(this.databaseID).update(this.toDatabaseRecord(), writeDatabase);
-    }
-    addMember(endpoint) {
-        this._members.add(endpoint);
-        this.save();
-    }
-    removeMember(endpoint) {
-        this._members.delete(endpoint);
-        this.save();
-    }
-    hasMember(endpoint) {
-        return this._members.has(endpoint);
-    }
-    /*
-     * Zigbee functions
-     */
-    async write(clusterKey, attributes, adapter, options) {
-        var _a;
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const payload = [];
-        for (const [nameOrID, value] of Object.entries(attributes)) {
-            if (cluster.hasAttribute(nameOrID)) {
-                const attribute = cluster.getAttribute(nameOrID);
-                payload.push({ attrId: attribute.ID, attrData: value, dataType: attribute.type });
-            }
-            else if (!isNaN(Number(nameOrID))) {
-                payload.push({ attrId: Number(nameOrID), attrData: value.value, dataType: value.type });
-            }
-            else {
-                throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
-            }
-        }
-        const log = `Write ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, (_a = options.transactionSequenceNumber) !== null && _a !== void 0 ? _a : zclTransactionSequenceNumber_1.default.next(), 'write', cluster.ID, payload, options.reservedBits);
-            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
-    }
-    async read(clusterKey, attributes, adapter, options) {
-        var _a;
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const payload = [];
-        for (const attribute of attributes) {
-            payload.push({ attrId: typeof attribute === 'number' ? attribute : cluster.getAttribute(attribute).ID });
-        }
-        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, (_a = options.transactionSequenceNumber) !== null && _a !== void 0 ? _a : zclTransactionSequenceNumber_1.default.next(), 'read', cluster.ID, payload, options.reservedBits);
-        const log = `Read ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
-        debug.info(log);
-        try {
-            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
-    }
-    async command(clusterKey, commandKey, payload, adapter, options) {
-        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
-        const cluster = Zcl.Utils.getCluster(clusterKey);
-        const command = cluster.getCommand(commandKey);
-        const log = `Command ${this.groupID} ${cluster.name}.${command.name}(${JSON.stringify(payload)})`;
-        debug.info(log);
-        try {
-            const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next(), command.ID, cluster.ID, payload, options.reservedBits);
-            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
-        }
-        catch (error) {
-            error.message = `${log} failed (${error.message})`;
-            debug.error(error.message);
-            throw error;
-        }
-    }
-    getOptionsWithDefaults(options, direction) {
-        const providedOptions = options || {};
-        return {
-            direction,
-            srcEndpoint: null,
-            reservedBits: 0,
-            manufacturerCode: null,
-            transactionSequenceNumber: null,
-            ...providedOptions
-        };
-    }
-}
-// This lookup contains all groups that are queried from the database, this is to ensure that always
-// the same instance is returned.
-Group.groups = new Map();
-exports.default = Group;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const entity_1 = __importDefault(require("./entity"));
+const zclTransactionSequenceNumber_1 = __importDefault(require("../helpers/zclTransactionSequenceNumber"));
+const Zcl = __importStar(require("../../zcl"));
+const device_1 = __importDefault(require("./device"));
+const assert_1 = __importDefault(require("assert"));
+const debug_1 = __importDefault(require("debug"));
+const debug = {
+    info: (0, debug_1.default)('zigbee-herdsman:controller:group'),
+    error: (0, debug_1.default)('zigbee-herdsman:controller:group'),
+};
+class Group extends entity_1.default {
+    get members() { return Array.from(this._members).filter((e) => e.getDevice()); }
+    constructor(databaseID, ID, groupID, members, meta) {
+        super();
+        this.databaseID = databaseID;
+        this.ID = ID;
+        this.groupID = groupID;
+        this._members = members;
+        this.meta = meta;
+    }
+    /*
+     * CRUD
+     */
+    static fromDatabaseEntry(entry, databaseID) {
+        const members = new Set();
+        for (const member of entry.members) {
+            const device = device_1.default.byIeeeAddr(databaseID, member.deviceIeeeAddr);
+            if (device) {
+                const endpoint = device.getEndpoint(member.endpointID);
+                members.add(endpoint);
+            }
+        }
+        return new Group(databaseID, entry.id, entry.groupID, members, entry.meta);
+    }
+    toDatabaseRecord() {
+        const members = Array.from(this.members).map((member) => {
+            return { deviceIeeeAddr: member.getDevice().ieeeAddr, endpointID: member.ID };
+        });
+        return { id: this.ID, type: 'Group', groupID: this.groupID, members, meta: this.meta };
+    }
+    static loadFromDatabaseIfNecessary() {
+        entity_1.default.databases.forEach(database => {
+            if (!Group.groups.get(database.id)) {
+                Group.groups.set(database.id, {});
+                const entries = database.getEntries(['Group']);
+                for (const entry of entries) {
+                    const group = Group.fromDatabaseEntry(entry, database.id);
+                    Group.groups.get(database.id)[group.groupID] = group;
+                }
+            }
+        });
+    }
+    static byGroupID(groupID, databaseID) {
+        Group.loadFromDatabaseIfNecessary();
+        return Group.groups.get(databaseID)[groupID];
+    }
+    // public static all(): Group[] {
+    //     Group.loadFromDatabaseIfNecessary();
+    //     const groups: Group[] = [];
+    //     Group.groups.forEach(groupDB => {
+    //         groups.push(...Object.values(groupDB));
+    //     });
+    //     return groups;
+    // }
+    static allByDatabaseID(databaseID) {
+        Group.loadFromDatabaseIfNecessary();
+        return Object.values(Group.groups.get(databaseID));
+    }
+    static create(groupID, databaseID) {
+        (0, assert_1.default)(typeof groupID === 'number', 'GroupID must be a number');
+        Group.loadFromDatabaseIfNecessary();
+        if (Group.groups.get(databaseID)[groupID]) {
+            throw new Error(`Group with groupID '${groupID}' already exists`);
+        }
+        const database = entity_1.default.getDatabaseByID(databaseID);
+        const ID = database.newID();
+        const group = new Group(databaseID, ID, groupID, new Set(), {});
+        database.insert(group.toDatabaseRecord());
+        Group.groups.get(database.id)[group.groupID] = group;
+        return group;
+    }
+    async removeFromNetwork() {
+        for (const endpoint of this._members) {
+            await endpoint.removeFromGroup(this);
+        }
+        this.removeFromDatabase();
+    }
+    removeFromDatabase() {
+        Group.loadFromDatabaseIfNecessary();
+        const database = entity_1.default.getDatabaseByID(this.databaseID);
+        if (database.has(this.databaseID)) {
+            database.remove(this.databaseID);
+        }
+        delete Group.groups.get(database.id)[this.groupID];
+    }
+    save(writeDatabase = true) {
+        entity_1.default.getDatabaseByID(this.databaseID).update(this.toDatabaseRecord(), writeDatabase);
+    }
+    addMember(endpoint) {
+        this._members.add(endpoint);
+        this.save();
+    }
+    removeMember(endpoint) {
+        this._members.delete(endpoint);
+        this.save();
+    }
+    hasMember(endpoint) {
+        return this._members.has(endpoint);
+    }
+    /*
+     * Zigbee functions
+     */
+    async write(clusterKey, attributes, adapter, options) {
+        var _a;
+        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const payload = [];
+        for (const [nameOrID, value] of Object.entries(attributes)) {
+            if (cluster.hasAttribute(nameOrID)) {
+                const attribute = cluster.getAttribute(nameOrID);
+                payload.push({ attrId: attribute.ID, attrData: value, dataType: attribute.type });
+            }
+            else if (!isNaN(Number(nameOrID))) {
+                payload.push({ attrId: Number(nameOrID), attrData: value.value, dataType: value.type });
+            }
+            else {
+                throw new Error(`Unknown attribute '${nameOrID}', specify either an existing attribute or a number`);
+            }
+        }
+        const log = `Write ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
+        debug.info(log);
+        try {
+            const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, (_a = options.transactionSequenceNumber) !== null && _a !== void 0 ? _a : zclTransactionSequenceNumber_1.default.next(), 'write', cluster.ID, payload, options.reservedBits);
+            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+        }
+        catch (error) {
+            error.message = `${log} failed (${error.message})`;
+            debug.error(error.message);
+            throw error;
+        }
+    }
+    async read(clusterKey, attributes, adapter, options) {
+        var _a;
+        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const payload = [];
+        for (const attribute of attributes) {
+            payload.push({ attrId: typeof attribute === 'number' ? attribute : cluster.getAttribute(attribute).ID });
+        }
+        const frame = Zcl.ZclFrame.create(Zcl.FrameType.GLOBAL, options.direction, true, options.manufacturerCode, (_a = options.transactionSequenceNumber) !== null && _a !== void 0 ? _a : zclTransactionSequenceNumber_1.default.next(), 'read', cluster.ID, payload, options.reservedBits);
+        const log = `Read ${this.groupID} ${cluster.name}(${JSON.stringify(attributes)}, ${JSON.stringify(options)})`;
+        debug.info(log);
+        try {
+            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+        }
+        catch (error) {
+            error.message = `${log} failed (${error.message})`;
+            debug.error(error.message);
+            throw error;
+        }
+    }
+    async command(clusterKey, commandKey, payload, adapter, options) {
+        options = this.getOptionsWithDefaults(options, Zcl.Direction.CLIENT_TO_SERVER);
+        const cluster = Zcl.Utils.getCluster(clusterKey);
+        const command = cluster.getCommand(commandKey);
+        const log = `Command ${this.groupID} ${cluster.name}.${command.name}(${JSON.stringify(payload)})`;
+        debug.info(log);
+        try {
+            const frame = Zcl.ZclFrame.create(Zcl.FrameType.SPECIFIC, options.direction, true, options.manufacturerCode, options.transactionSequenceNumber || zclTransactionSequenceNumber_1.default.next(), command.ID, cluster.ID, payload, options.reservedBits);
+            await adapter.sendZclFrameToGroup(this.groupID, frame, options.srcEndpoint);
+        }
+        catch (error) {
+            error.message = `${log} failed (${error.message})`;
+            debug.error(error.message);
+            throw error;
+        }
+    }
+    getOptionsWithDefaults(options, direction) {
+        const providedOptions = options || {};
+        return {
+            direction,
+            srcEndpoint: null,
+            reservedBits: 0,
+            manufacturerCode: null,
+            transactionSequenceNumber: null,
+            ...providedOptions
+        };
+    }
+}
+// This lookup contains all groups that are queried from the database, this is to ensure that always
+// the same instance is returned.
+Group.groups = new Map();
+exports.default = Group;
 //# sourceMappingURL=group.js.map

package/dist/controller/model/index.d.ts

@@ -1,6 +1,6 @@
-import Device from './device';
-import Endpoint from './endpoint';
-import Entity from './entity';
-import Group from './group';
-export { Device, Endpoint, Entity, Group, };
+import Device from './device';
+import Endpoint from './endpoint';
+import Entity from './entity';
+import Group from './group';
+export { Device, Endpoint, Entity, Group, };
 //# sourceMappingURL=index.d.ts.map

package/dist/controller/model/index.js

@@ -1,15 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Group = exports.Entity = exports.Endpoint = exports.Device = void 0;
-const device_1 = __importDefault(require("./device"));
-exports.Device = device_1.default;
-const endpoint_1 = __importDefault(require("./endpoint"));
-exports.Endpoint = endpoint_1.default;
-const entity_1 = __importDefault(require("./entity"));
-exports.Entity = entity_1.default;
-const group_1 = __importDefault(require("./group"));
-exports.Group = group_1.default;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Group = exports.Entity = exports.Endpoint = exports.Device = void 0;
+const device_1 = __importDefault(require("./device"));
+exports.Device = device_1.default;
+const endpoint_1 = __importDefault(require("./endpoint"));
+exports.Endpoint = endpoint_1.default;
+const entity_1 = __importDefault(require("./entity"));
+exports.Entity = entity_1.default;
+const group_1 = __importDefault(require("./group"));
+exports.Group = group_1.default;
 //# sourceMappingURL=index.js.map

package/dist/controller/touchlink.d.ts

@@ -1,20 +1,20 @@
-import { Adapter } from '../adapter';
-declare class Touchlink {
-    private adapter;
-    private locked;
-    constructor(adapter: Adapter);
-    private lock;
-    private transactionNumber;
-    scan(): Promise<{
-        ieeeAddr: string;
-        channel: number;
-    }[]>;
-    identify(ieeeAddr: string, channel: number): Promise<void>;
-    factoryReset(ieeeAddr: string, channel: number): Promise<boolean>;
-    factoryResetFirst(): Promise<boolean>;
-    private createScanRequestFrame;
-    private createIdentifyRequestFrame;
-    private createResetFactoryNewRequestFrame;
-}
-export default Touchlink;
+import { Adapter } from '../adapter';
+declare class Touchlink {
+    private adapter;
+    private locked;
+    constructor(adapter: Adapter);
+    private lock;
+    private transactionNumber;
+    scan(): Promise<{
+        ieeeAddr: string;
+        channel: number;
+    }[]>;
+    identify(ieeeAddr: string, channel: number): Promise<void>;
+    factoryReset(ieeeAddr: string, channel: number): Promise<boolean>;
+    factoryResetFirst(): Promise<boolean>;
+    private createScanRequestFrame;
+    private createIdentifyRequestFrame;
+    private createResetFactoryNewRequestFrame;
+}
+export default Touchlink;
 //# sourceMappingURL=touchlink.d.ts.map