@matter/examples 0.16.0-alpha.0-20250816-d22ad240d → 0.16.0-alpha.0-20250819-0a388db8b
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/dist/esm/controller/ControllerNode.js +1 -1
- package/dist/esm/controller/ControllerNode.js.map +1 -1
- package/dist/esm/device-bridge-onoff/BridgedDevicesNode.js +1 -1
- package/dist/esm/device-bridge-onoff/BridgedDevicesNode.js.map +1 -1
- package/dist/esm/device-composed-onoff/ComposedDeviceNode.js +1 -1
- package/dist/esm/device-composed-onoff/ComposedDeviceNode.js.map +1 -1
- package/dist/esm/device-composed-wc-light/IlluminatedRollerShade.js +2 -2
- package/dist/esm/device-composed-wc-light/IlluminatedRollerShade.js.map +1 -1
- package/dist/esm/device-measuring-socket/MeasuredSocketDevice.js +2 -2
- package/dist/esm/device-measuring-socket/MeasuredSocketDevice.js.map +1 -1
- package/dist/esm/device-multiple-onoff/MultiDeviceNode.js +1 -1
- package/dist/esm/device-multiple-onoff/MultiDeviceNode.js.map +1 -1
- package/dist/esm/device-onoff/DeviceNode.js +1 -1
- package/dist/esm/device-onoff/DeviceNode.js.map +1 -1
- package/dist/esm/device-onoff-advanced/DeviceNodeFull.js +1 -1
- package/dist/esm/device-onoff-advanced/DeviceNodeFull.js.map +1 -1
- package/dist/esm/device-robotic-vacuum-cleaner/RvcDeviceLogic.js +10 -6
- package/dist/esm/device-robotic-vacuum-cleaner/RvcDeviceLogic.js.map +1 -1
- package/dist/esm/device-sensor/SensorDeviceNode.js +1 -1
- package/dist/esm/device-sensor/SensorDeviceNode.js.map +1 -1
- package/package.json +7 -7
- package/src/controller/ControllerNode.ts +1 -1
- package/src/device-bridge-onoff/BridgedDevicesNode.ts +1 -1
- package/src/device-composed-onoff/ComposedDeviceNode.ts +1 -1
- package/src/device-composed-wc-light/IlluminatedRollerShade.ts +2 -2
- package/src/device-measuring-socket/MeasuredSocketDevice.ts +2 -2
- package/src/device-multiple-onoff/MultiDeviceNode.ts +1 -2
- package/src/device-onoff/DeviceNode.ts +1 -1
- package/src/device-onoff-advanced/DeviceNodeFull.ts +1 -1
- package/src/device-robotic-vacuum-cleaner/RvcDeviceLogic.ts +8 -6
- package/src/device-sensor/SensorDeviceNode.ts +1 -1
|
@@ -32,7 +32,7 @@ class ControllerNode {
|
|
|
32
32
|
const controllerStorage = (await storageService.open("controller")).createContext("data");
|
|
33
33
|
const ip = await controllerStorage.has("ip") ? await controllerStorage.get("ip") : environment.vars.string("ip");
|
|
34
34
|
const port = await controllerStorage.has("port") ? await controllerStorage.get("port") : environment.vars.number("port");
|
|
35
|
-
const uniqueId = await controllerStorage.has("uniqueid") ? await controllerStorage.get("uniqueid") : environment.vars.string("uniqueid") ?? Time.nowMs
|
|
35
|
+
const uniqueId = await controllerStorage.has("uniqueid") ? await controllerStorage.get("uniqueid") : environment.vars.string("uniqueid") ?? Time.nowMs.toString();
|
|
36
36
|
await controllerStorage.set("uniqueid", uniqueId);
|
|
37
37
|
const adminFabricLabel = await controllerStorage.has("fabriclabel") ? await controllerStorage.get("fabriclabel") : environment.vars.string("fabriclabel") ?? "matter.js Controller";
|
|
38
38
|
await controllerStorage.set("fabriclabel", adminFabricLabel);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/controller/ControllerNode.ts"],
|
|
4
|
-
"mappings": ";AACA;AAAA;AAAA;AAAA;AAAA;AAYA,SAAS,YAAY,aAAa,QAAQ,WAAW,gBAAgB,YAAY;AACjF,SAAS,yBAAyB,mBAAmB,sBAAsB,aAAa;AACxF,SAAS,WAA6B;AACtC,SAAS,wBAAwB,cAAc;AAC/C,SAAS,iBAAiB;AAC1B,SAAS,+BAAyD;AAClE,SAAS,kBAAkB;AAE3B,MAAM,SAAS,OAAO,IAAI,YAAY;AAEtC,MAAM,cAAc,YAAY;AAEhC,IAAI,YAAY,KAAK,IAAI,KAAK,GAAG;AAE7B,MAAI,MAAM;AAAA,IACN,MACI,IAAI,UAAU;AAAA,MACV;AAAA,MACA,OAAO,YAAY,KAAK,OAAO,YAAY;AAAA,IAC/C,CAAC;AAAA,EACT;AACJ;AAEA,MAAM,iBAAiB,YAAY,IAAI,cAAc;AAErD,QAAQ,IAAI,qBAAqB,eAAe,QAAQ,cAAc;AACtE,OAAO;AAAA,EACH;AACJ;AAEA,MAAM,eAAe;AAAA,EACjB,MAAM,QAAQ;AACV,WAAO,KAAK,gCAAgC;AAa5C,UAAM,qBAAqB,MAAM,eAAe,KAAK,YAAY,GAAG,cAAc,MAAM;AACxF,UAAM,KAAM,MAAM,kBAAkB,IAAI,IAAI,IACtC,MAAM,kBAAkB,IAAY,IAAI,IACxC,YAAY,KAAK,OAAO,IAAI;AAClC,UAAM,OAAQ,MAAM,kBAAkB,IAAI,MAAM,IAC1C,MAAM,kBAAkB,IAAY,MAAM,IAC1C,YAAY,KAAK,OAAO,MAAM;AACpC,UAAM,WAAY,MAAM,kBAAkB,IAAI,UAAU,IAClD,MAAM,kBAAkB,IAAY,UAAU,IAC7C,YAAY,KAAK,OAAO,UAAU,KAAK,KAAK,MAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["node", "nodeId", "info"]
|
|
6
6
|
}
|
|
@@ -111,7 +111,7 @@ async function getConfiguration() {
|
|
|
111
111
|
const productName2 = `node-matter OnOff ${isSocket2 ? "Socket" : "Light"}`;
|
|
112
112
|
const productId2 = environment.vars.number("productid") ?? await deviceStorage.get("productid", 32768);
|
|
113
113
|
const port2 = environment.vars.number("port") ?? 5540;
|
|
114
|
-
const uniqueId2 = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs
|
|
114
|
+
const uniqueId2 = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs.toString());
|
|
115
115
|
await deviceStorage.set({
|
|
116
116
|
passcode: passcode2,
|
|
117
117
|
discriminator: discriminator2,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-bridge-onoff/BridgedDevicesNode.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["isSocket", "deviceName", "vendorName", "passcode", "discriminator", "vendorId", "productName", "productId", "port", "uniqueId"]
|
|
6
6
|
}
|
|
@@ -93,7 +93,7 @@ async function getConfiguration() {
|
|
|
93
93
|
const productName2 = `node-matter OnOff ${isSocket2 ? "Socket" : "Light"}`;
|
|
94
94
|
const productId2 = environment.vars.number("productid") ?? await deviceStorage.get("productid", 32768);
|
|
95
95
|
const port2 = environment.vars.number("port") ?? 5540;
|
|
96
|
-
const uniqueId2 = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs
|
|
96
|
+
const uniqueId2 = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs.toString());
|
|
97
97
|
await deviceStorage.set({
|
|
98
98
|
passcode: passcode2,
|
|
99
99
|
discriminator: discriminator2,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-composed-onoff/ComposedDeviceNode.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["isSocket", "deviceName", "vendorName", "passcode", "discriminator", "vendorId", "productName", "productId", "port", "uniqueId"]
|
|
6
6
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Copyright 2022-2025 Matter.js Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import { ServerNode } from "@matter/main";
|
|
7
|
+
import { ServerNode, VendorId } from "@matter/main";
|
|
8
8
|
import { MovementDirection, WindowCoveringServer } from "@matter/main/behaviors/window-covering";
|
|
9
9
|
import { OnOffLightDevice, OnOffLightRequirements } from "@matter/main/devices/on-off-light";
|
|
10
10
|
import { WindowCoveringDevice } from "@matter/main/devices/window-covering";
|
|
@@ -37,7 +37,7 @@ const node = new ServerNode({
|
|
|
37
37
|
basicInformation: {
|
|
38
38
|
vendorName: "Acme Corporation",
|
|
39
39
|
productName: "Excelsior 1000 EZ-Nite\u2122",
|
|
40
|
-
vendorId: 65521,
|
|
40
|
+
vendorId: VendorId(65521),
|
|
41
41
|
productId: 32768,
|
|
42
42
|
serialNumber: "1234-12345-123"
|
|
43
43
|
},
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-composed-wc-light/IlluminatedRollerShade.ts"],
|
|
4
|
-
"mappings": ";AACA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,
|
|
4
|
+
"mappings": ";AACA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY,gBAAgB;AACrC,SAAS,mBAAiC,4BAA4B;AACtE,SAAS,kBAAkB,8BAA8B;AACzD,SAAS,4BAA4B;AAQrC,MAAM,8BAA8B,qBAAqB,KAAK,QAAQ,mBAAmB;AAKzF,MAAM,oBAAoB,4BAA4B;AAAA,EAClD,MAAe,eACX,MACA,UACA,WACA,qBACF;AACE,YAAQ;AAAA,MACJ;AAAA,MACA,cAAc,kBAAkB,OAAO,SAAS;AAAA,MAChD,wBAAwB,SAAY,GAAG,sBAAsB,GAAG,MAAM;AAAA,IAC1E;AAGA,UAAM,MAAM,eAAe,MAAM,UAAU,WAAW,mBAAmB;AAAA,EAC7E;AACJ;AAKA,MAAM,qBAAqB,uBAAuB,YAAY;AAAA,EACjD,aAAa;AAClB,SAAK,QAAQ,KAAK,OAAO,eAAe,KAAK,aAAa;AAAA,EAC9D;AAAA,EAEA,cAAc,OAAgB;AAC1B,YAAQ,IAAI,kBAAkB,QAAQ,gBAAgB,MAAM,EAAE;AAAA,EAClE;AACJ;AAKA,MAAM,OAAO,IAAI,WAAW;AAAA,EACxB,IAAI;AAAA,EAEJ,oBAAoB,CAAC;AAAA,EAErB,eAAe;AAAA,IACX,UAAU;AAAA,IACV,eAAe;AAAA,EACnB;AAAA,EAEA,kBAAkB;AAAA,IACd,YAAY;AAAA,IACZ,aAAa;AAAA,IACb,UAAU,SAAS,KAAM;AAAA,IACzB,WAAW;AAAA,IACX,cAAc;AAAA,EAClB;AAAA,EAEA,OAAO;AAAA,IACH;AAAA,MACI,MAAM,qBAAqB,KAAK,WAAW;AAAA,MAC3C,IAAI;AAAA,IACR;AAAA,IAEA;AAAA,MACI,MAAM,iBAAiB,KAAK,YAAY;AAAA,MACxC,IAAI;AAAA,IACR;AAAA,EACJ;AACJ,CAAC;AAED,MAAM,KAAK,IAAI;",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Copyright 2022-2025 Matter.js Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import { Endpoint, ServerNode, Time } from "@matter/main";
|
|
7
|
+
import { Endpoint, Seconds, ServerNode, Time } from "@matter/main";
|
|
8
8
|
import { ElectricalEnergyMeasurementServer, ElectricalPowerMeasurementServer } from "@matter/main/behaviors";
|
|
9
9
|
import { ElectricalEnergyMeasurement, ElectricalPowerMeasurement } from "@matter/main/clusters";
|
|
10
10
|
import { OnOffPlugInUnitDevice } from "@matter/main/devices";
|
|
@@ -74,7 +74,7 @@ await node.add(measuredSocketEndpoint);
|
|
|
74
74
|
measuredSocketEndpoint.events.onOff.onOff$Changed.on((value) => {
|
|
75
75
|
console.log(`Light is now ${value ? "ON" : "OFF"}`);
|
|
76
76
|
});
|
|
77
|
-
const fakeMeasurementTimer = Time.getPeriodicTimer("fakeMeasurement",
|
|
77
|
+
const fakeMeasurementTimer = Time.getPeriodicTimer("fakeMeasurement", Seconds(10), async () => {
|
|
78
78
|
const turnedOn = measuredSocketEndpoint.state.onOff.onOff;
|
|
79
79
|
const power = turnedOn ? Math.round(Math.random() * 1e3) : 0;
|
|
80
80
|
const current = turnedOn ? Math.round(Math.random() * 32) : 0;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-measuring-socket/MeasuredSocketDevice.ts"],
|
|
4
|
-
"mappings": ";AACA;AAAA;AAAA;AAAA;AAAA;AAQA,SAAS,UAAU,YAAY,YAAY;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -109,7 +109,7 @@ async function getConfiguration() {
|
|
|
109
109
|
const productName = `node-matter OnOff-Device ${i}`;
|
|
110
110
|
const productId = environment.vars.number(`productid${i}`) ?? await deviceStorage.get(`productid${i}`, 32768);
|
|
111
111
|
const port = environment.vars.number(`port${i}`) ?? defaultPort++;
|
|
112
|
-
const uniqueId = environment.vars.string(`uniqueid${i}`) ?? await deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs
|
|
112
|
+
const uniqueId = environment.vars.string(`uniqueid${i}`) ?? await deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs}`);
|
|
113
113
|
await deviceStorage.set(`passcode${i}`, passcode);
|
|
114
114
|
await deviceStorage.set(`discriminator${i}`, discriminator);
|
|
115
115
|
await deviceStorage.set(`vendorid${i}`, vendorId);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-multiple-onoff/MultiDeviceNode.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["devices"]
|
|
6
6
|
}
|
|
@@ -95,7 +95,7 @@ async function getConfiguration() {
|
|
|
95
95
|
const productName = `node-matter OnOff ${isSocket ? "Socket" : "Light"}`;
|
|
96
96
|
const productId = environment.vars.number("productid") ?? await deviceStorage.get("productid", 32768);
|
|
97
97
|
const port = environment.vars.number("port") ?? 5540;
|
|
98
|
-
const uniqueId = environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
98
|
+
const uniqueId = environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs)).toString();
|
|
99
99
|
await deviceStorage.set({
|
|
100
100
|
passcode,
|
|
101
101
|
discriminator,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-onoff/DeviceNode.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -72,7 +72,7 @@ const vendorId = environment.vars.number("vendorid") ?? await deviceStorage.get(
|
|
|
72
72
|
const productName = `node-matter OnOff ${isSocket ? "Socket" : "Light"}`;
|
|
73
73
|
const productId = environment.vars.number("productid") ?? await deviceStorage.get("productid", 32768);
|
|
74
74
|
const port = environment.vars.number("port") ?? 5540;
|
|
75
|
-
const uniqueId = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs
|
|
75
|
+
const uniqueId = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs.toString());
|
|
76
76
|
await deviceStorage.set({
|
|
77
77
|
passcode,
|
|
78
78
|
discriminator,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-onoff-advanced/DeviceNodeFull.ts"],
|
|
4
|
-
"mappings": ";AACA;AAAA;AAAA;AAAA;AAAA;AAqBA;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AACP,SAAS,mBAAmB;AAC5B,SAA6B,sBAAsB,aAAa;AAChE,SAAS,kBAAkB,6BAA6B;AACxD,SAAS,wBAAwB;AACjC,SAAS,KAAK,oBAAoB;AAClC,SAAS,cAAc;AACvB,SAAS,wBAAwB;AACjC,SAAS,iBAAiB;AAC1B,SAAS,gBAAgB;AACzB,SAAS,6CAA6C;AACtD,SAAS,2CAA2C;AACpD;AAAA,EAGI;AAAA,OACG;AAEP,MAAM,SAAS,OAAO,IAAI,gBAAgB;AAe1C,MAAM,cAAc,YAAY;AAIhC,IAAI,YAAY,KAAK,IAAI,YAAY,GAAG;AAEpC,MAAI,MAAM;AAAA,IACN,MACI,IAAI,UAAU;AAAA,MACV;AAAA,MACA,OAAO,YAAY,KAAK,OAAO,WAAW;AAAA,IAC9C,CAAC;AAAA,EACT;AACJ;AAEA,SAAS,eAAe,iBAAyB;AAC7C,QAAM,SAAS,YAAY,KAAK,OAAO,eAAe;AACtD,MAAI,WAAW,OAAW,QAAO;AACjC,UAAQ,IAAI,GAAG,eAAe,KAAK,SAAS,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,EAAE,CAAC,EAAE;AACjF;AAYA,MAAM,UAAU,YAAY,KAAK,OAAO,kBAAkB;AAC1D,IAAI,YAAY,QAAW;AACvB,SAAO,aAAa,aAAa,eAAe;AAAA,IAC5C,OAAO,MAAM,iBAAiB,OAAO;AAAA,IACrC,OAAO,SAAS,YAAY,KAAK,IAAI,oBAAoB,OAAO,CAAC;AAAA,EACrE,CAAC;AACL;AAEA,MAAM,iBAAiB,YAAY,IAAI,cAAc;AACrD,QAAQ,IAAI,qBAAqB,eAAe,QAAQ,cAAc;AACtE,QAAQ;AAAA,EACJ;AACJ;AAEA,MAAM,iBAAiB,MAAM,eAAe,KAAK,QAAQ,GAAG,cAAc,MAAM;AAEhF,IAAI,MAAM,cAAc,IAAI,UAAU,GAAG;AACrC,UAAQ,IAAI,4DAA4D;AAC5E;AACA,MAAM,WAAW,MAAM,cAAc,IAAI,YAAY,YAAY,KAAK,OAAO,MAAM,MAAM,QAAQ;AACjG,MAAM,aAAa;AACnB,MAAM,aAAa;AACnB,MAAM,WAAW,YAAY,KAAK,OAAO,UAAU,KAAM,MAAM,cAAc,IAAI,YAAY,QAAQ;AACrG,MAAM,gBAAgB,YAAY,KAAK,OAAO,eAAe,KAAM,MAAM,cAAc,IAAI,iBAAiB,IAAI;AAEhH,MAAM,WAAW,YAAY,KAAK,OAAO,UAAU,KAAM,MAAM,cAAc,IAAI,YAAY,KAAM;AACnG,MAAM,cAAc,qBAAqB,WAAW,WAAW,OAAO;AACtE,MAAM,YAAY,YAAY,KAAK,OAAO,WAAW,KAAM,MAAM,cAAc,IAAI,aAAa,KAAM;AAEtG,MAAM,OAAO,YAAY,KAAK,OAAO,MAAM,KAAK;AAEhD,MAAM,WAAW,YAAY,KAAK,OAAO,UAAU,KAAM,MAAM,cAAc,IAAI,YAAY,KAAK,MAAM,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Behavior, Logger, Time } from "@matter/main";
|
|
6
|
+
import { Behavior, Hours, Logger, Millis, Minutes, Seconds, Time } from "@matter/main";
|
|
7
7
|
import { ServiceAreaServer } from "@matter/main/behaviors/service-area";
|
|
8
8
|
import { RvcOperationalState } from "@matter/main/clusters/rvc-operational-state";
|
|
9
9
|
import { CustomRvcCleanModeServer } from "./behaviors/CustomRvcCleanModeServer.js";
|
|
@@ -43,7 +43,7 @@ var DetailOperationalDeviceState = /* @__PURE__ */ ((DetailOperationalDeviceStat
|
|
|
43
43
|
DetailOperationalDeviceState2[DetailOperationalDeviceState2["Mapping"] = 4] = "Mapping";
|
|
44
44
|
return DetailOperationalDeviceState2;
|
|
45
45
|
})(DetailOperationalDeviceState || {});
|
|
46
|
-
const CLEANING_MAPPING_ROUND_TIME = 10
|
|
46
|
+
const CLEANING_MAPPING_ROUND_TIME = Minutes(10);
|
|
47
47
|
class RvcDeviceLogic extends Behavior {
|
|
48
48
|
static id = "rvcDeviceLogic";
|
|
49
49
|
static early = true;
|
|
@@ -59,9 +59,13 @@ class RvcDeviceLogic extends Behavior {
|
|
|
59
59
|
CLEANING_MAPPING_ROUND_TIME,
|
|
60
60
|
() => this.#handleMappingDone()
|
|
61
61
|
);
|
|
62
|
-
this.internal.rechargingTimer = Time.getTimer("RechargingTimer", 2
|
|
63
|
-
this.internal.autoWaitTimer = Time.getTimer("AutoWaitTimer",
|
|
64
|
-
this.internal.seekingChargerTimer = Time.getTimer(
|
|
62
|
+
this.internal.rechargingTimer = Time.getTimer("RechargingTimer", Minutes(2), () => this.#handleRechargeDone());
|
|
63
|
+
this.internal.autoWaitTimer = Time.getTimer("AutoWaitTimer", Hours(3), () => this.#handleAutoWaitDone());
|
|
64
|
+
this.internal.seekingChargerTimer = Time.getTimer(
|
|
65
|
+
"SeekingChargerTimer",
|
|
66
|
+
Seconds(30),
|
|
67
|
+
() => this.#handleDocking()
|
|
68
|
+
);
|
|
65
69
|
}
|
|
66
70
|
async #initializeNode() {
|
|
67
71
|
const runMode = await this.agent.load(CustomRvcRunModeServer);
|
|
@@ -313,7 +317,7 @@ class RvcDeviceLogic extends Behavior {
|
|
|
313
317
|
const numberOfAreas = selectedAreas.length || this.endpoint.stateOf(ServiceAreaServer).supportedAreas.length;
|
|
314
318
|
this.internal.serviceAreaChangeTimer = Time.getPeriodicTimer(
|
|
315
319
|
"ServiceAreaChangeTimer",
|
|
316
|
-
CLEANING_MAPPING_ROUND_TIME / numberOfAreas +
|
|
320
|
+
Millis(CLEANING_MAPPING_ROUND_TIME / numberOfAreas + Seconds(1)),
|
|
317
321
|
// Two Areas by default
|
|
318
322
|
() => this.#changeCurrentServiceArea()
|
|
319
323
|
).start();
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-robotic-vacuum-cleaner/RvcDeviceLogic.ts"],
|
|
4
|
-
"mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAKA,SAAS,UAAU,
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["RvcDeviceRunModes", "RvcDeviceCleanMode", "CleaningAreas", "DesiredOperationalDeviceState", "DetailOperationalDeviceState", "RvcDeviceLogic"]
|
|
6
6
|
}
|
|
@@ -143,7 +143,7 @@ async function getConfiguration() {
|
|
|
143
143
|
const productName = `node-matter OnOff ${isTemperature ? "Temperature" : "Humidity"}`;
|
|
144
144
|
const productId = environment.vars.number("productid") ?? await deviceStorage.get("productid", 32768);
|
|
145
145
|
const port = environment.vars.number("port") ?? 5540;
|
|
146
|
-
const uniqueId = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs
|
|
146
|
+
const uniqueId = environment.vars.string("uniqueid") ?? await deviceStorage.get("uniqueid", Time.nowMs.toString());
|
|
147
147
|
await deviceStorage.set({
|
|
148
148
|
passcode,
|
|
149
149
|
discriminator,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/device-sensor/SensorDeviceNode.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@matter/examples",
|
|
3
|
-
"version": "0.16.0-alpha.0-
|
|
3
|
+
"version": "0.16.0-alpha.0-20250819-0a388db8b",
|
|
4
4
|
"description": "Matter.js examples and reference implementations",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"iot",
|
|
@@ -55,14 +55,14 @@
|
|
|
55
55
|
"matter-controller": "dist/esm/controller/ControllerNode.js"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@matter/main": "0.16.0-alpha.0-
|
|
59
|
-
"@matter/nodejs": "0.16.0-alpha.0-
|
|
60
|
-
"@matter/tools": "0.16.0-alpha.0-
|
|
61
|
-
"@project-chip/matter.js": "0.16.0-alpha.0-
|
|
62
|
-
"esbuild": "^0.25.
|
|
58
|
+
"@matter/main": "0.16.0-alpha.0-20250819-0a388db8b",
|
|
59
|
+
"@matter/nodejs": "0.16.0-alpha.0-20250819-0a388db8b",
|
|
60
|
+
"@matter/tools": "0.16.0-alpha.0-20250819-0a388db8b",
|
|
61
|
+
"@project-chip/matter.js": "0.16.0-alpha.0-20250819-0a388db8b",
|
|
62
|
+
"esbuild": "^0.25.9"
|
|
63
63
|
},
|
|
64
64
|
"optionalDependencies": {
|
|
65
|
-
"@matter/nodejs-ble": "0.16.0-alpha.0-
|
|
65
|
+
"@matter/nodejs-ble": "0.16.0-alpha.0-20250819-0a388db8b"
|
|
66
66
|
},
|
|
67
67
|
"engines": {
|
|
68
68
|
"node": ">=20.0.0"
|
|
@@ -65,7 +65,7 @@ class ControllerNode {
|
|
|
65
65
|
: environment.vars.number("port");
|
|
66
66
|
const uniqueId = (await controllerStorage.has("uniqueid"))
|
|
67
67
|
? await controllerStorage.get<string>("uniqueid")
|
|
68
|
-
: (environment.vars.string("uniqueid") ?? Time.nowMs
|
|
68
|
+
: (environment.vars.string("uniqueid") ?? Time.nowMs.toString());
|
|
69
69
|
await controllerStorage.set("uniqueid", uniqueId);
|
|
70
70
|
const adminFabricLabel = (await controllerStorage.has("fabriclabel"))
|
|
71
71
|
? await controllerStorage.get<string>("fabriclabel")
|
|
@@ -219,7 +219,7 @@ async function getConfiguration() {
|
|
|
219
219
|
const port = environment.vars.number("port") ?? 5540;
|
|
220
220
|
|
|
221
221
|
const uniqueId =
|
|
222
|
-
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
222
|
+
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs.toString()));
|
|
223
223
|
|
|
224
224
|
// Persist basic data to keep them also on restart
|
|
225
225
|
await deviceStorage.set({
|
|
@@ -159,7 +159,7 @@ async function getConfiguration() {
|
|
|
159
159
|
const port = environment.vars.number("port") ?? 5540;
|
|
160
160
|
|
|
161
161
|
const uniqueId =
|
|
162
|
-
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
162
|
+
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs.toString()));
|
|
163
163
|
|
|
164
164
|
// Persist basic data to keep them also on restart
|
|
165
165
|
await deviceStorage.set({
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
|
-
import { ServerNode } from "@matter/main";
|
|
8
|
+
import { ServerNode, VendorId } from "@matter/main";
|
|
9
9
|
import { MovementDirection, MovementType, WindowCoveringServer } from "@matter/main/behaviors/window-covering";
|
|
10
10
|
import { OnOffLightDevice, OnOffLightRequirements } from "@matter/main/devices/on-off-light";
|
|
11
11
|
import { WindowCoveringDevice } from "@matter/main/devices/window-covering";
|
|
@@ -68,7 +68,7 @@ const node = new ServerNode({
|
|
|
68
68
|
basicInformation: {
|
|
69
69
|
vendorName: "Acme Corporation",
|
|
70
70
|
productName: "Excelsior 1000 EZ-Nite™",
|
|
71
|
-
vendorId: 0xfff1,
|
|
71
|
+
vendorId: VendorId(0xfff1),
|
|
72
72
|
productId: 0x8000,
|
|
73
73
|
serialNumber: "1234-12345-123",
|
|
74
74
|
},
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
|
|
8
8
|
// This demonstrates bringing a "socket" device with electrical power and energy measurement online with matter.js.
|
|
9
9
|
|
|
10
|
-
import { Endpoint, ServerNode, Time } from "@matter/main";
|
|
10
|
+
import { Endpoint, Seconds, ServerNode, Time } from "@matter/main";
|
|
11
11
|
import { ElectricalEnergyMeasurementServer, ElectricalPowerMeasurementServer } from "@matter/main/behaviors";
|
|
12
12
|
import { ElectricalEnergyMeasurement, ElectricalPowerMeasurement } from "@matter/main/clusters";
|
|
13
13
|
import { OnOffPlugInUnitDevice } from "@matter/main/devices";
|
|
@@ -97,7 +97,7 @@ measuredSocketEndpoint.events.onOff.onOff$Changed.on(value => {
|
|
|
97
97
|
// We will simulate the device sending measurements every 10 seconds.
|
|
98
98
|
// When the device is turned off, the measurements will be zero, otherwise they will be random values.
|
|
99
99
|
// Note: This is just example code. In a real device, you would set the data to 0 once the device is turned off.
|
|
100
|
-
const fakeMeasurementTimer = Time.getPeriodicTimer("fakeMeasurement",
|
|
100
|
+
const fakeMeasurementTimer = Time.getPeriodicTimer("fakeMeasurement", Seconds(10), async () => {
|
|
101
101
|
const turnedOn = measuredSocketEndpoint.state.onOff.onOff;
|
|
102
102
|
const power = turnedOn ? Math.round(Math.random() * 1000) : 0; // W
|
|
103
103
|
const current = turnedOn ? Math.round(Math.random() * 32) : 0; // A
|
|
@@ -168,8 +168,7 @@ async function getConfiguration() {
|
|
|
168
168
|
const port = environment.vars.number(`port${i}`) ?? defaultPort++;
|
|
169
169
|
|
|
170
170
|
const uniqueId =
|
|
171
|
-
environment.vars.string(`uniqueid${i}`) ??
|
|
172
|
-
(await deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs()}`));
|
|
171
|
+
environment.vars.string(`uniqueid${i}`) ?? (await deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs}`));
|
|
173
172
|
|
|
174
173
|
// Persist basic data to keep them also on restart
|
|
175
174
|
await deviceStorage.set(`passcode${i}`, passcode);
|
|
@@ -162,7 +162,7 @@ async function getConfiguration() {
|
|
|
162
162
|
const port = environment.vars.number("port") ?? 5540;
|
|
163
163
|
|
|
164
164
|
const uniqueId =
|
|
165
|
-
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
165
|
+
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs)).toString();
|
|
166
166
|
|
|
167
167
|
// Persist basic data to keep them also on restart
|
|
168
168
|
await deviceStorage.set({
|
|
@@ -128,7 +128,7 @@ const productId = environment.vars.number("productid") ?? (await deviceStorage.g
|
|
|
128
128
|
|
|
129
129
|
const port = environment.vars.number("port") ?? 5540;
|
|
130
130
|
|
|
131
|
-
const uniqueId = environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
131
|
+
const uniqueId = environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs.toString()));
|
|
132
132
|
|
|
133
133
|
await deviceStorage.set({
|
|
134
134
|
passcode,
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2022-2025 Matter.js Authors
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { Behavior, Logger, Node, Time, Timer } from "@matter/main";
|
|
6
|
+
import { Behavior, Hours, Logger, Millis, Minutes, Node, Seconds, Time, Timer } from "@matter/main";
|
|
7
7
|
import { ServiceAreaServer } from "@matter/main/behaviors/service-area";
|
|
8
8
|
import { RvcOperationalState } from "@matter/main/clusters/rvc-operational-state";
|
|
9
9
|
import { CustomRvcCleanModeServer } from "./behaviors/CustomRvcCleanModeServer.js";
|
|
@@ -57,7 +57,7 @@ enum DetailOperationalDeviceState {
|
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
// We simulate cleaning rounds of 10 minutes
|
|
60
|
-
const CLEANING_MAPPING_ROUND_TIME = 10
|
|
60
|
+
const CLEANING_MAPPING_ROUND_TIME = Minutes(10);
|
|
61
61
|
|
|
62
62
|
/**
|
|
63
63
|
* This class implements the Logic of our fictional robotic vacuum cleaner device and should demonstrate how the
|
|
@@ -81,9 +81,11 @@ export class RvcDeviceLogic extends Behavior {
|
|
|
81
81
|
this.internal.mappingTimer = Time.getTimer("MappingTimer", CLEANING_MAPPING_ROUND_TIME, () =>
|
|
82
82
|
this.#handleMappingDone(),
|
|
83
83
|
);
|
|
84
|
-
this.internal.rechargingTimer = Time.getTimer("RechargingTimer", 2
|
|
85
|
-
this.internal.autoWaitTimer = Time.getTimer("AutoWaitTimer",
|
|
86
|
-
this.internal.seekingChargerTimer = Time.getTimer("SeekingChargerTimer",
|
|
84
|
+
this.internal.rechargingTimer = Time.getTimer("RechargingTimer", Minutes(2), () => this.#handleRechargeDone());
|
|
85
|
+
this.internal.autoWaitTimer = Time.getTimer("AutoWaitTimer", Hours(3), () => this.#handleAutoWaitDone());
|
|
86
|
+
this.internal.seekingChargerTimer = Time.getTimer("SeekingChargerTimer", Seconds(30), () =>
|
|
87
|
+
this.#handleDocking(),
|
|
88
|
+
);
|
|
87
89
|
}
|
|
88
90
|
|
|
89
91
|
async #initializeNode() {
|
|
@@ -368,7 +370,7 @@ export class RvcDeviceLogic extends Behavior {
|
|
|
368
370
|
|
|
369
371
|
this.internal.serviceAreaChangeTimer = Time.getPeriodicTimer(
|
|
370
372
|
"ServiceAreaChangeTimer",
|
|
371
|
-
CLEANING_MAPPING_ROUND_TIME / numberOfAreas +
|
|
373
|
+
Millis(CLEANING_MAPPING_ROUND_TIME / numberOfAreas + Seconds(1)), // Two Areas by default
|
|
372
374
|
() => this.#changeCurrentServiceArea(),
|
|
373
375
|
).start();
|
|
374
376
|
await this.#changeCurrentServiceArea();
|
|
@@ -208,7 +208,7 @@ async function getConfiguration() {
|
|
|
208
208
|
const port = environment.vars.number("port") ?? 5540;
|
|
209
209
|
|
|
210
210
|
const uniqueId =
|
|
211
|
-
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs
|
|
211
|
+
environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs.toString()));
|
|
212
212
|
|
|
213
213
|
// Persist basic data to keep them also on restart
|
|
214
214
|
await deviceStorage.set({
|