matterbridge 3.1.0-dev-20250627-2b5adba → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -8
- package/dist/cli.d.ts +29 -0
- package/dist/cli.d.ts.map +1 -0
- package/dist/cli.js +91 -2
- package/dist/cli.js.map +1 -0
- package/dist/clusters/export.d.ts +2 -0
- package/dist/clusters/export.d.ts.map +1 -0
- package/dist/clusters/export.js +2 -0
- package/dist/clusters/export.js.map +1 -0
- package/dist/defaultConfigSchema.d.ts +28 -0
- package/dist/defaultConfigSchema.d.ts.map +1 -0
- package/dist/defaultConfigSchema.js +24 -0
- package/dist/defaultConfigSchema.js.map +1 -0
- package/dist/deviceManager.d.ts +112 -0
- package/dist/deviceManager.d.ts.map +1 -0
- package/dist/deviceManager.js +94 -1
- package/dist/deviceManager.js.map +1 -0
- package/dist/devices/export.d.ts +5 -0
- package/dist/devices/export.d.ts.map +1 -0
- package/dist/devices/export.js +2 -0
- package/dist/devices/export.js.map +1 -0
- package/dist/evse.d.ts +72 -0
- package/dist/evse.d.ts.map +1 -0
- package/dist/evse.js +70 -9
- package/dist/evse.js.map +1 -0
- package/dist/frontend.d.ts +285 -0
- package/dist/frontend.d.ts.map +1 -0
- package/dist/frontend.js +413 -16
- package/dist/frontend.js.map +1 -0
- package/dist/globalMatterbridge.d.ts +59 -0
- package/dist/globalMatterbridge.d.ts.map +1 -0
- package/dist/globalMatterbridge.js +47 -0
- package/dist/globalMatterbridge.js.map +1 -0
- package/dist/helpers.d.ts +48 -0
- package/dist/helpers.d.ts.map +1 -0
- package/dist/helpers.js +53 -0
- package/dist/helpers.js.map +1 -0
- package/dist/index.d.ts +38 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +32 -1
- package/dist/index.js.map +1 -0
- package/dist/laundryWasher.d.ts +243 -0
- package/dist/laundryWasher.d.ts.map +1 -0
- package/dist/laundryWasher.js +92 -7
- package/dist/laundryWasher.js.map +1 -0
- package/dist/logger/export.d.ts +2 -0
- package/dist/logger/export.d.ts.map +1 -0
- package/dist/logger/export.js +1 -0
- package/dist/logger/export.js.map +1 -0
- package/dist/matter/behaviors.d.ts +2 -0
- package/dist/matter/behaviors.d.ts.map +1 -0
- package/dist/matter/behaviors.js +2 -0
- package/dist/matter/behaviors.js.map +1 -0
- package/dist/matter/clusters.d.ts +2 -0
- package/dist/matter/clusters.d.ts.map +1 -0
- package/dist/matter/clusters.js +2 -0
- package/dist/matter/clusters.js.map +1 -0
- package/dist/matter/devices.d.ts +2 -0
- package/dist/matter/devices.d.ts.map +1 -0
- package/dist/matter/devices.js +2 -0
- package/dist/matter/devices.js.map +1 -0
- package/dist/matter/endpoints.d.ts +2 -0
- package/dist/matter/endpoints.d.ts.map +1 -0
- package/dist/matter/endpoints.js +2 -0
- package/dist/matter/endpoints.js.map +1 -0
- package/dist/matter/export.d.ts +5 -0
- package/dist/matter/export.d.ts.map +1 -0
- package/dist/matter/export.js +3 -0
- package/dist/matter/export.js.map +1 -0
- package/dist/matter/types.d.ts +3 -0
- package/dist/matter/types.d.ts.map +1 -0
- package/dist/matter/types.js +3 -0
- package/dist/matter/types.js.map +1 -0
- package/dist/matterbridge.d.ts +450 -0
- package/dist/matterbridge.d.ts.map +1 -0
- package/dist/matterbridge.js +810 -56
- package/dist/matterbridge.js.map +1 -0
- package/dist/matterbridgeAccessoryPlatform.d.ts +42 -0
- package/dist/matterbridgeAccessoryPlatform.d.ts.map +1 -0
- package/dist/matterbridgeAccessoryPlatform.js +36 -0
- package/dist/matterbridgeAccessoryPlatform.js.map +1 -0
- package/dist/matterbridgeBehaviors.d.ts +1334 -0
- package/dist/matterbridgeBehaviors.d.ts.map +1 -0
- package/dist/matterbridgeBehaviors.js +55 -1
- package/dist/matterbridgeBehaviors.js.map +1 -0
- package/dist/matterbridgeDeviceTypes.d.ts +709 -0
- package/dist/matterbridgeDeviceTypes.d.ts.map +1 -0
- package/dist/matterbridgeDeviceTypes.js +579 -15
- package/dist/matterbridgeDeviceTypes.js.map +1 -0
- package/dist/matterbridgeDynamicPlatform.d.ts +42 -0
- package/dist/matterbridgeDynamicPlatform.d.ts.map +1 -0
- package/dist/matterbridgeDynamicPlatform.js +36 -0
- package/dist/matterbridgeDynamicPlatform.js.map +1 -0
- package/dist/matterbridgeEndpoint.d.ts +1173 -0
- package/dist/matterbridgeEndpoint.d.ts.map +1 -0
- package/dist/matterbridgeEndpoint.js +1023 -41
- package/dist/matterbridgeEndpoint.js.map +1 -0
- package/dist/matterbridgeEndpointHelpers.d.ts +3198 -0
- package/dist/matterbridgeEndpointHelpers.d.ts.map +1 -0
- package/dist/matterbridgeEndpointHelpers.js +322 -12
- package/dist/matterbridgeEndpointHelpers.js.map +1 -0
- package/dist/matterbridgePlatform.d.ts +310 -0
- package/dist/matterbridgePlatform.d.ts.map +1 -0
- package/dist/matterbridgePlatform.js +233 -0
- package/dist/matterbridgePlatform.js.map +1 -0
- package/dist/matterbridgeTypes.d.ts +184 -0
- package/dist/matterbridgeTypes.d.ts.map +1 -0
- package/dist/matterbridgeTypes.js +25 -0
- package/dist/matterbridgeTypes.js.map +1 -0
- package/dist/pluginManager.d.ts +291 -0
- package/dist/pluginManager.d.ts.map +1 -0
- package/dist/pluginManager.js +269 -3
- package/dist/pluginManager.js.map +1 -0
- package/dist/roboticVacuumCleaner.d.ts +104 -0
- package/dist/roboticVacuumCleaner.d.ts.map +1 -0
- package/dist/roboticVacuumCleaner.js +83 -6
- package/dist/roboticVacuumCleaner.js.map +1 -0
- package/dist/shelly.d.ts +174 -0
- package/dist/shelly.d.ts.map +1 -0
- package/dist/shelly.js +168 -7
- package/dist/shelly.js.map +1 -0
- package/dist/storage/export.d.ts +2 -0
- package/dist/storage/export.d.ts.map +1 -0
- package/dist/storage/export.js +1 -0
- package/dist/storage/export.js.map +1 -0
- package/dist/update.d.ts +59 -0
- package/dist/update.d.ts.map +1 -0
- package/dist/update.js +54 -0
- package/dist/update.js.map +1 -0
- package/dist/utils/colorUtils.d.ts +117 -0
- package/dist/utils/colorUtils.d.ts.map +1 -0
- package/dist/utils/colorUtils.js +263 -2
- package/dist/utils/colorUtils.js.map +1 -0
- package/dist/utils/commandLine.d.ts +59 -0
- package/dist/utils/commandLine.d.ts.map +1 -0
- package/dist/utils/commandLine.js +54 -0
- package/dist/utils/commandLine.js.map +1 -0
- package/dist/utils/copyDirectory.d.ts +33 -0
- package/dist/utils/copyDirectory.d.ts.map +1 -0
- package/dist/utils/copyDirectory.js +38 -1
- package/dist/utils/copyDirectory.js.map +1 -0
- package/dist/utils/createDirectory.d.ts +34 -0
- package/dist/utils/createDirectory.d.ts.map +1 -0
- package/dist/utils/createDirectory.js +33 -0
- package/dist/utils/createDirectory.js.map +1 -0
- package/dist/utils/createZip.d.ts +39 -0
- package/dist/utils/createZip.d.ts.map +1 -0
- package/dist/utils/createZip.js +47 -2
- package/dist/utils/createZip.js.map +1 -0
- package/dist/utils/deepCopy.d.ts +32 -0
- package/dist/utils/deepCopy.d.ts.map +1 -0
- package/dist/utils/deepCopy.js +39 -0
- package/dist/utils/deepCopy.js.map +1 -0
- package/dist/utils/deepEqual.d.ts +54 -0
- package/dist/utils/deepEqual.d.ts.map +1 -0
- package/dist/utils/deepEqual.js +72 -1
- package/dist/utils/deepEqual.js.map +1 -0
- package/dist/utils/export.d.ts +12 -0
- package/dist/utils/export.d.ts.map +1 -0
- package/dist/utils/export.js +1 -0
- package/dist/utils/export.js.map +1 -0
- package/dist/utils/hex.d.ts +49 -0
- package/dist/utils/hex.d.ts.map +1 -0
- package/dist/utils/hex.js +58 -0
- package/dist/utils/hex.js.map +1 -0
- package/dist/utils/isvalid.d.ts +103 -0
- package/dist/utils/isvalid.d.ts.map +1 -0
- package/dist/utils/isvalid.js +101 -0
- package/dist/utils/isvalid.js.map +1 -0
- package/dist/utils/network.d.ts +76 -0
- package/dist/utils/network.d.ts.map +1 -0
- package/dist/utils/network.js +83 -5
- package/dist/utils/network.js.map +1 -0
- package/dist/utils/spawn.d.ts +14 -0
- package/dist/utils/spawn.d.ts.map +1 -0
- package/dist/utils/spawn.js +18 -0
- package/dist/utils/spawn.js.map +1 -0
- package/dist/utils/wait.d.ts +56 -0
- package/dist/utils/wait.d.ts.map +1 -0
- package/dist/utils/wait.js +62 -9
- package/dist/utils/wait.js.map +1 -0
- package/dist/waterHeater.d.ts +106 -0
- package/dist/waterHeater.d.ts.map +1 -0
- package/dist/waterHeater.js +77 -2
- package/dist/waterHeater.js.map +1 -0
- package/npm-shrinkwrap.json +2 -2
- package/package.json +2 -1
package/dist/deviceManager.js
CHANGED
|
@@ -1,26 +1,87 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the DeviceManager class.
|
|
3
|
+
*
|
|
4
|
+
* @file devices.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @created 2024-07-26
|
|
7
|
+
* @version 1.0.11
|
|
8
|
+
* @license Apache-2.0
|
|
9
|
+
*
|
|
10
|
+
* Copyright 2024, 2025, 2026 Luca Liguori.
|
|
11
|
+
*
|
|
12
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
13
|
+
* you may not use this file except in compliance with the License.
|
|
14
|
+
* You may obtain a copy of the License at
|
|
15
|
+
*
|
|
16
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
17
|
+
*
|
|
18
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
19
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
20
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
21
|
+
* See the License for the specific language governing permissions and
|
|
22
|
+
* limitations under the License.
|
|
23
|
+
*/
|
|
24
|
+
// AnsiLogger module
|
|
1
25
|
import { AnsiLogger, BLUE, er } from 'node-ansi-logger';
|
|
2
26
|
import { dev } from './matterbridgeTypes.js';
|
|
27
|
+
/**
|
|
28
|
+
* Manages Matterbridge devices.
|
|
29
|
+
*/
|
|
3
30
|
export class DeviceManager {
|
|
4
31
|
_devices = new Map();
|
|
5
32
|
matterbridge;
|
|
6
33
|
log;
|
|
34
|
+
/**
|
|
35
|
+
* Creates an instance of DeviceManager.
|
|
36
|
+
*
|
|
37
|
+
* @param {Matterbridge} matterbridge - The Matterbridge instance.
|
|
38
|
+
*/
|
|
7
39
|
constructor(matterbridge) {
|
|
8
40
|
this.matterbridge = matterbridge;
|
|
9
|
-
this.log = new AnsiLogger({ logName: 'DeviceManager', logTimestampFormat: 4
|
|
41
|
+
this.log = new AnsiLogger({ logName: 'DeviceManager', logTimestampFormat: 4 /* TimestampFormat.TIME_MILLIS */, logLevel: matterbridge.log.logLevel });
|
|
10
42
|
this.log.debug('Matterbridge device manager starting...');
|
|
11
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Gets the number of devices.
|
|
46
|
+
*
|
|
47
|
+
* @returns {number} The number of devices.
|
|
48
|
+
*/
|
|
12
49
|
get length() {
|
|
13
50
|
return this._devices.size;
|
|
14
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* Gets the number of devices.
|
|
54
|
+
*
|
|
55
|
+
* @returns {number} The number of devices.
|
|
56
|
+
*/
|
|
15
57
|
get size() {
|
|
16
58
|
return this._devices.size;
|
|
17
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* Checks if a device with the specified unique ID exists.
|
|
62
|
+
*
|
|
63
|
+
* @param {string} uniqueId - The unique ID of the device.
|
|
64
|
+
* @returns {boolean} True if the device exists, false otherwise.
|
|
65
|
+
*/
|
|
18
66
|
has(uniqueId) {
|
|
19
67
|
return this._devices.has(uniqueId);
|
|
20
68
|
}
|
|
69
|
+
/**
|
|
70
|
+
* Gets a device by its unique ID.
|
|
71
|
+
*
|
|
72
|
+
* @param {string} uniqueId - The unique ID of the device.
|
|
73
|
+
* @returns {MatterbridgeEndpoint | undefined} The device, or undefined if not found.
|
|
74
|
+
*/
|
|
21
75
|
get(uniqueId) {
|
|
22
76
|
return this._devices.get(uniqueId);
|
|
23
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* Adds a device to the manager.
|
|
80
|
+
*
|
|
81
|
+
* @param {MatterbridgeEndpoint} device - The device to add.
|
|
82
|
+
* @returns {MatterbridgeEndpoint} The added device.
|
|
83
|
+
* @throws {Error} If the device does not have a unique ID.
|
|
84
|
+
*/
|
|
24
85
|
set(device) {
|
|
25
86
|
if (!device.uniqueId)
|
|
26
87
|
throw new Error(`The device ${dev}${device.deviceName}${er} has not been initialized: uniqueId is required`);
|
|
@@ -29,6 +90,13 @@ export class DeviceManager {
|
|
|
29
90
|
this._devices.set(device.uniqueId, device);
|
|
30
91
|
return device;
|
|
31
92
|
}
|
|
93
|
+
/**
|
|
94
|
+
* Removes a device from the manager.
|
|
95
|
+
*
|
|
96
|
+
* @param {MatterbridgeEndpoint} device - The device to remove.
|
|
97
|
+
* @returns {boolean} True if the device was removed, false otherwise.
|
|
98
|
+
* @throws {Error} If the device does not have a unique ID.
|
|
99
|
+
*/
|
|
32
100
|
remove(device) {
|
|
33
101
|
if (!device.uniqueId)
|
|
34
102
|
throw new Error(`The device ${dev}${device.deviceName}${er} has not been initialized: uniqueId is required`);
|
|
@@ -36,15 +104,34 @@ export class DeviceManager {
|
|
|
36
104
|
this.log.error(`The device ${dev}${device.deviceName}${er} with uniqueId ${BLUE}${device.uniqueId}${er} serialNumber ${BLUE}${device.serialNumber}${er} is not registered in the device manager`);
|
|
37
105
|
return this._devices.delete(device.uniqueId);
|
|
38
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* Clears all devices from the manager.
|
|
109
|
+
*/
|
|
39
110
|
clear() {
|
|
40
111
|
this._devices.clear();
|
|
41
112
|
}
|
|
113
|
+
/**
|
|
114
|
+
* Gets an array of all devices.
|
|
115
|
+
*
|
|
116
|
+
* @returns {MatterbridgeEndpoint[]} An array of all devices.
|
|
117
|
+
*/
|
|
42
118
|
array() {
|
|
43
119
|
return Array.from(this._devices.values());
|
|
44
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Iterates over all devices.
|
|
123
|
+
*
|
|
124
|
+
* @returns {IterableIterator<MatterbridgeEndpoint>} An iterator for the devices.
|
|
125
|
+
*/
|
|
45
126
|
[Symbol.iterator]() {
|
|
46
127
|
return this._devices.values();
|
|
47
128
|
}
|
|
129
|
+
/**
|
|
130
|
+
* Asynchronously iterates over each device and calls the provided callback function.
|
|
131
|
+
*
|
|
132
|
+
* @param {(device: MatterbridgeEndpoint) => Promise<void>} callback - The callback function to call with each device.
|
|
133
|
+
* @returns {Promise<void>} A promise that resolves when all callbacks have been called.
|
|
134
|
+
*/
|
|
48
135
|
async forEach(callback) {
|
|
49
136
|
if (this.size === 0)
|
|
50
137
|
return;
|
|
@@ -58,7 +145,13 @@ export class DeviceManager {
|
|
|
58
145
|
});
|
|
59
146
|
await Promise.all(tasks);
|
|
60
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* Sets the log level.
|
|
150
|
+
*
|
|
151
|
+
* @param {LogLevel} logLevel - The log level to set.
|
|
152
|
+
*/
|
|
61
153
|
set logLevel(logLevel) {
|
|
62
154
|
this.log.logLevel = logLevel;
|
|
63
155
|
}
|
|
64
156
|
}
|
|
157
|
+
//# sourceMappingURL=deviceManager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deviceManager.js","sourceRoot":"","sources":["../src/deviceManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"export.d.ts","sourceRoot":"","sources":["../../src/devices/export.ts"],"names":[],"mappings":"AACA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC"}
|
package/dist/devices/export.js
CHANGED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"export.js","sourceRoot":"","sources":["../../src/devices/export.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC"}
|
package/dist/evse.d.ts
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the Evse class.
|
|
3
|
+
*
|
|
4
|
+
* @file energy-evse.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @contributor Ludovic BOUÉ
|
|
7
|
+
* @created 2025-05-27
|
|
8
|
+
* @version 1.1.0
|
|
9
|
+
* @license Apache-2.0
|
|
10
|
+
*
|
|
11
|
+
* Copyright 2025, 2026, 2027 Luca Liguori.
|
|
12
|
+
*
|
|
13
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
14
|
+
* you may not use this file except in compliance with the License.
|
|
15
|
+
* You may obtain a copy of the License at
|
|
16
|
+
*
|
|
17
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
18
|
+
*
|
|
19
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
20
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
21
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
22
|
+
* See the License for the specific language governing permissions and
|
|
23
|
+
* limitations under the License.
|
|
24
|
+
*/
|
|
25
|
+
import { MaybePromise } from '@matter/main';
|
|
26
|
+
import { EnergyEvseServer } from '@matter/main/behaviors/energy-evse';
|
|
27
|
+
import { EnergyEvseModeServer } from '@matter/main/behaviors/energy-evse-mode';
|
|
28
|
+
import { EnergyEvse, EnergyEvseMode } from '@matter/main/clusters';
|
|
29
|
+
import { ModeBase } from '@matter/main/clusters/mode-base';
|
|
30
|
+
import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
31
|
+
export declare class Evse extends MatterbridgeEndpoint {
|
|
32
|
+
/**
|
|
33
|
+
* Creates an instance of the EVSE class.
|
|
34
|
+
*
|
|
35
|
+
* @param {string} name - The name of the EVSE.
|
|
36
|
+
* @param {string} serial - The serial number of the EVSE.
|
|
37
|
+
* @param {number} [currentMode] - The current mode of the EnergyEvseMode cluster. Defaults to mode 1 (EnergyEvseMode.ModeTag.Manual).
|
|
38
|
+
* @param {EnergyEvseMode.ModeOption[]} [supportedModes] - The supported modes for the EnergyEvseMode cluster. This is a fixed attribute that defaults to a predefined set of EnergyEvseMode cluster modes.
|
|
39
|
+
* @param {EnergyEvse.State} [state] - The current state of the EVSE. Defaults to NotPluggedIn.
|
|
40
|
+
* @param {EnergyEvse.SupplyState} [supplyState] - The supply state of the EVSE. Defaults to Disabled.
|
|
41
|
+
* @param {EnergyEvse.FaultState} [faultState] - The fault state of the EVSE. Defaults to NoError.
|
|
42
|
+
* @param {number} [absMinPower] - Indicate the minimum electrical power that the ESA can consume when switched on. Defaults to `0` if not provided.
|
|
43
|
+
* @param {number} [absMaxPower] - Indicate the maximum electrical power that the ESA can consume when switched on. Defaults to `0` if not provided.
|
|
44
|
+
*/
|
|
45
|
+
constructor(name: string, serial: string, currentMode?: number, supportedModes?: EnergyEvseMode.ModeOption[], state?: EnergyEvse.State, supplyState?: EnergyEvse.SupplyState, faultState?: EnergyEvse.FaultState, absMinPower?: number, absMaxPower?: number);
|
|
46
|
+
/**
|
|
47
|
+
* Creates a default EnergyEvseServer Cluster Server.
|
|
48
|
+
*
|
|
49
|
+
* @param {EnergyEvse.State} [state] - The initial state of the EnergyEvse cluster. Defaults to EnergyEvse.State.NotPluggedIn.
|
|
50
|
+
* @param {EnergyEvse.SupplyState} [supplyState] - The initial supply state of the EnergyEvse cluster. Defaults to EnergyEvse.SupplyState.ChargingEnabled.
|
|
51
|
+
* @param {EnergyEvse.FaultState} [faultState] - The initial fault state of the EnergyEvse cluster. Defaults to EnergyEvse.FaultState.NoError.
|
|
52
|
+
* @returns {this} The current MatterbridgeEndpoint instance for chaining.
|
|
53
|
+
*/
|
|
54
|
+
createDefaultEnergyEvseClusterServer(state?: EnergyEvse.State, supplyState?: EnergyEvse.SupplyState, faultState?: EnergyEvse.FaultState): this;
|
|
55
|
+
/**
|
|
56
|
+
* Creates a default EnergyEvseMode Cluster Server.
|
|
57
|
+
*
|
|
58
|
+
* @param {number} [currentMode] - The current mode of the EnergyEvseMode cluster. Defaults to mode 1 (EnergyEvseMode.ModeTag.Manual).
|
|
59
|
+
* @param {EnergyEvseMode.ModeOption[]} [supportedModes] - The supported modes for the EnergyEvseMode cluster. Defaults all EnergyEvseMode cluster modes.
|
|
60
|
+
*
|
|
61
|
+
* @returns {this} The current MatterbridgeEndpoint instance for chaining.
|
|
62
|
+
*/
|
|
63
|
+
createDefaultEnergyEvseModeClusterServer(currentMode?: number, supportedModes?: EnergyEvseMode.ModeOption[]): this;
|
|
64
|
+
}
|
|
65
|
+
export declare class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
|
|
66
|
+
disable(): MaybePromise;
|
|
67
|
+
enableCharging(request: EnergyEvse.EnableChargingRequest): MaybePromise;
|
|
68
|
+
}
|
|
69
|
+
export declare class MatterbridgeEnergyEvseModeServer extends EnergyEvseModeServer {
|
|
70
|
+
changeToMode(request: ModeBase.ChangeToModeRequest): MaybePromise<ModeBase.ChangeToModeResponse>;
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=evse.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evse.d.ts","sourceRoot":"","sources":["../src/evse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE,qBAAa,IAAK,SAAQ,oBAAoB;IAC5C;;;;;;;;;;;;OAYG;gBAED,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,cAAc,CAAC,UAAU,EAAE,EAC5C,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,EACxB,WAAW,CAAC,EAAE,UAAU,CAAC,WAAW,EACpC,UAAU,CAAC,EAAE,UAAU,CAAC,UAAU,EAClC,WAAW,CAAC,EAAE,MAAM,EACpB,WAAW,CAAC,EAAE,MAAM;IAetB;;;;;;;OAOG;IACH,oCAAoC,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,UAAU,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,CAAC,UAAU,GAAG,IAAI;IAgB9I;;;;;;;OAOG;IACH,wCAAwC,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,cAAc,CAAC,UAAU,EAAE,GAAG,IAAI;CAYnH;AAED,qBAAa,4BAA6B,SAAQ,gBAAgB;IACvD,OAAO,IAAI,YAAY;IAavB,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC,qBAAqB,GAAG,YAAY;CAgBjF;AAED,qBAAa,gCAAiC,SAAQ,oBAAoB;IAC/D,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,mBAAmB,GAAG,YAAY,CAAC,QAAQ,CAAC,oBAAoB,CAAC;CAa1G"}
|
package/dist/evse.js
CHANGED
|
@@ -1,12 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This file contains the Evse class.
|
|
3
|
+
*
|
|
4
|
+
* @file energy-evse.ts
|
|
5
|
+
* @author Luca Liguori
|
|
6
|
+
* @contributor Ludovic BOUÉ
|
|
7
|
+
* @created 2025-05-27
|
|
8
|
+
* @version 1.1.0
|
|
9
|
+
* @license Apache-2.0
|
|
10
|
+
*
|
|
11
|
+
* Copyright 2025, 2026, 2027 Luca Liguori.
|
|
12
|
+
*
|
|
13
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
14
|
+
* you may not use this file except in compliance with the License.
|
|
15
|
+
* You may obtain a copy of the License at
|
|
16
|
+
*
|
|
17
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
18
|
+
*
|
|
19
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
20
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
21
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
22
|
+
* See the License for the specific language governing permissions and
|
|
23
|
+
* limitations under the License.
|
|
24
|
+
*/
|
|
1
25
|
import { EnergyEvseServer } from '@matter/main/behaviors/energy-evse';
|
|
2
26
|
import { EnergyEvseModeServer } from '@matter/main/behaviors/energy-evse-mode';
|
|
3
27
|
import { EnergyEvse, EnergyEvseMode } from '@matter/main/clusters';
|
|
4
28
|
import { DeviceEnergyManagement } from '@matter/main/clusters/device-energy-management';
|
|
5
29
|
import { ModeBase } from '@matter/main/clusters/mode-base';
|
|
30
|
+
// Matterbridge
|
|
6
31
|
import { MatterbridgeEndpoint } from './matterbridgeEndpoint.js';
|
|
7
32
|
import { MatterbridgeServer } from './matterbridgeBehaviors.js';
|
|
8
33
|
import { deviceEnergyManagement, electricalSensor, evse, powerSource } from './matterbridgeDeviceTypes.js';
|
|
9
34
|
export class Evse extends MatterbridgeEndpoint {
|
|
35
|
+
/**
|
|
36
|
+
* Creates an instance of the EVSE class.
|
|
37
|
+
*
|
|
38
|
+
* @param {string} name - The name of the EVSE.
|
|
39
|
+
* @param {string} serial - The serial number of the EVSE.
|
|
40
|
+
* @param {number} [currentMode] - The current mode of the EnergyEvseMode cluster. Defaults to mode 1 (EnergyEvseMode.ModeTag.Manual).
|
|
41
|
+
* @param {EnergyEvseMode.ModeOption[]} [supportedModes] - The supported modes for the EnergyEvseMode cluster. This is a fixed attribute that defaults to a predefined set of EnergyEvseMode cluster modes.
|
|
42
|
+
* @param {EnergyEvse.State} [state] - The current state of the EVSE. Defaults to NotPluggedIn.
|
|
43
|
+
* @param {EnergyEvse.SupplyState} [supplyState] - The supply state of the EVSE. Defaults to Disabled.
|
|
44
|
+
* @param {EnergyEvse.FaultState} [faultState] - The fault state of the EVSE. Defaults to NoError.
|
|
45
|
+
* @param {number} [absMinPower] - Indicate the minimum electrical power that the ESA can consume when switched on. Defaults to `0` if not provided.
|
|
46
|
+
* @param {number} [absMaxPower] - Indicate the maximum electrical power that the ESA can consume when switched on. Defaults to `0` if not provided.
|
|
47
|
+
*/
|
|
10
48
|
constructor(name, serial, currentMode, supportedModes, state, supplyState, faultState, absMinPower, absMaxPower) {
|
|
11
49
|
super([evse, powerSource, electricalSensor, deviceEnergyManagement], { uniqueStorageKey: `${name.replaceAll(' ', '')}-${serial.replaceAll(' ', '')}` }, true);
|
|
12
50
|
this.createDefaultIdentifyClusterServer()
|
|
@@ -20,29 +58,46 @@ export class Evse extends MatterbridgeEndpoint {
|
|
|
20
58
|
.createDefaultEnergyEvseModeClusterServer(currentMode, supportedModes)
|
|
21
59
|
.addRequiredClusterServers();
|
|
22
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Creates a default EnergyEvseServer Cluster Server.
|
|
63
|
+
*
|
|
64
|
+
* @param {EnergyEvse.State} [state] - The initial state of the EnergyEvse cluster. Defaults to EnergyEvse.State.NotPluggedIn.
|
|
65
|
+
* @param {EnergyEvse.SupplyState} [supplyState] - The initial supply state of the EnergyEvse cluster. Defaults to EnergyEvse.SupplyState.ChargingEnabled.
|
|
66
|
+
* @param {EnergyEvse.FaultState} [faultState] - The initial fault state of the EnergyEvse cluster. Defaults to EnergyEvse.FaultState.NoError.
|
|
67
|
+
* @returns {this} The current MatterbridgeEndpoint instance for chaining.
|
|
68
|
+
*/
|
|
23
69
|
createDefaultEnergyEvseClusterServer(state, supplyState, faultState) {
|
|
24
70
|
this.behaviors.require(MatterbridgeEnergyEvseServer, {
|
|
25
71
|
state: state ?? EnergyEvse.State.NotPluggedIn,
|
|
26
72
|
supplyState: supplyState ?? EnergyEvse.SupplyState.ChargingEnabled,
|
|
27
73
|
faultState: faultState ?? EnergyEvse.FaultState.NoError,
|
|
28
|
-
chargingEnabledUntil: 0,
|
|
29
|
-
circuitCapacity: 0,
|
|
30
|
-
minimumChargeCurrent: 6000,
|
|
31
|
-
maximumChargeCurrent: 0,
|
|
32
|
-
sessionId: null,
|
|
33
|
-
sessionDuration: 0,
|
|
34
|
-
sessionEnergyCharged: 0,
|
|
74
|
+
chargingEnabledUntil: 0, // Persistent attribute
|
|
75
|
+
circuitCapacity: 0, // Persistent attribute in mA
|
|
76
|
+
minimumChargeCurrent: 6000, // Persistent attribute in mA
|
|
77
|
+
maximumChargeCurrent: 0, // Persistent attribute in mA
|
|
78
|
+
sessionId: null, // Persistent attribute
|
|
79
|
+
sessionDuration: 0, // Persistent attribute
|
|
80
|
+
sessionEnergyCharged: 0, // Persistent attribute
|
|
35
81
|
});
|
|
36
82
|
return this;
|
|
37
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* Creates a default EnergyEvseMode Cluster Server.
|
|
86
|
+
*
|
|
87
|
+
* @param {number} [currentMode] - The current mode of the EnergyEvseMode cluster. Defaults to mode 1 (EnergyEvseMode.ModeTag.Manual).
|
|
88
|
+
* @param {EnergyEvseMode.ModeOption[]} [supportedModes] - The supported modes for the EnergyEvseMode cluster. Defaults all EnergyEvseMode cluster modes.
|
|
89
|
+
*
|
|
90
|
+
* @returns {this} The current MatterbridgeEndpoint instance for chaining.
|
|
91
|
+
*/
|
|
38
92
|
createDefaultEnergyEvseModeClusterServer(currentMode, supportedModes) {
|
|
39
93
|
this.behaviors.require(MatterbridgeEnergyEvseModeServer, {
|
|
40
94
|
supportedModes: supportedModes ?? [
|
|
41
95
|
{ label: 'On demand', mode: 1, modeTags: [{ value: EnergyEvseMode.ModeTag.Manual }] },
|
|
42
96
|
{ label: 'Scheduled', mode: 2, modeTags: [{ value: EnergyEvseMode.ModeTag.TimeOfUse }] },
|
|
43
97
|
{ label: 'Solar charging', mode: 3, modeTags: [{ value: EnergyEvseMode.ModeTag.SolarCharging }] },
|
|
44
|
-
|
|
45
|
-
|
|
98
|
+
// { label: 'Home to vehicle and Vehicle to home', mode: 4, modeTags: [{ value: EnergyEvseMode.ModeTag.V2X }] }, // This mode is not valid in charging only EVSEs
|
|
99
|
+
], // FixedAttribute
|
|
100
|
+
currentMode: currentMode ?? 1, // Persistent attribute
|
|
46
101
|
});
|
|
47
102
|
return this;
|
|
48
103
|
}
|
|
@@ -58,6 +113,8 @@ export class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
|
|
|
58
113
|
this.state.state = EnergyEvse.State.PluggedInDemand;
|
|
59
114
|
}
|
|
60
115
|
this.state.chargingEnabledUntil = 0;
|
|
116
|
+
// super.disable();
|
|
117
|
+
// disable is not implemented in matter.js
|
|
61
118
|
}
|
|
62
119
|
enableCharging(request) {
|
|
63
120
|
const device = this.endpoint.stateOf(MatterbridgeServer);
|
|
@@ -71,6 +128,9 @@ export class MatterbridgeEnergyEvseServer extends EnergyEvseServer {
|
|
|
71
128
|
this.state.chargingEnabledUntil = request.chargingEnabledUntil;
|
|
72
129
|
this.state.minimumChargeCurrent = request.minimumChargeCurrent;
|
|
73
130
|
this.state.maximumChargeCurrent = request.maximumChargeCurrent;
|
|
131
|
+
// The implementation should also stop the charging session at the required time and update the sessionId, sessionDuration, and sessionEnergyCharged attributes if needed.
|
|
132
|
+
// super.enableCharging();
|
|
133
|
+
// enableCharging is not implemented in matter.js
|
|
74
134
|
}
|
|
75
135
|
}
|
|
76
136
|
export class MatterbridgeEnergyEvseModeServer extends EnergyEvseModeServer {
|
|
@@ -88,3 +148,4 @@ export class MatterbridgeEnergyEvseModeServer extends EnergyEvseModeServer {
|
|
|
88
148
|
return { status: ModeBase.ModeChangeStatus.Success, statusText: 'Success' };
|
|
89
149
|
}
|
|
90
150
|
}
|
|
151
|
+
//# sourceMappingURL=evse.js.map
|
package/dist/evse.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evse.js","sourceRoot":"","sources":["../src/evse.ts"],"names":[],"mappings":"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"}
|