iobroker.tibberlink 0.1.1 → 0.1.3
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/README.md +14 -4
- package/admin/jsonConfig.json +24 -1
- package/build/lib/tibberAPICaller.js +3 -6
- package/build/lib/tibberAPICaller.js.map +1 -1
- package/build/lib/tibberHelper.js +4 -4
- package/build/lib/tibberHelper.js.map +1 -1
- package/build/lib/tibberPulse.js +9 -9
- package/build/lib/tibberPulse.js.map +1 -1
- package/build/lib/tools.js +2 -4
- package/build/lib/tools.js.map +1 -1
- package/build/main.js +9 -22
- package/build/main.js.map +1 -1
- package/io-package.json +28 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -5,16 +5,18 @@
|
|
|
5
5
|
|
|
6
6
|
[](https://www.npmjs.com/package/iobroker.tibberlink)
|
|
7
7
|
|
|
8
|
-
[](https://snyk.io/test/github/hombach/ioBroker.tibberlink)
|
|
8
|
+
[](https://snyk.io/test/github/hombach/ioBroker.tibberlink)
|
|
9
9
|
|
|
10
|
+
**CI-Tests:**
|
|
11
|
+
|
|
12
|
+
[](https://github.com/hombach/ioBroker.tibberlink/actions/workflows/codeql-analysis.yml)
|
|
13
|
+
[](https://ci.appveyor.com/project/hombach/iobroker-tibberlink)
|
|
10
14
|
|
|
11
15
|
[](https://nodei.co/npm/iobroker.tibberlink/)
|
|
12
16
|
|
|
13
|
-
**Tests:** 
|
|
14
|
-
|
|
15
17
|
|
|
16
18
|
## Adapter for using TIBBER energy data in iOBroker
|
|
17
|
-
Adapter for linking
|
|
19
|
+
Adapter for linking data from your Tibber account API to be used in ioBroker
|
|
18
20
|
|
|
19
21
|
If you're not a Tibber user right now, it's greatly appreciated when you're using my reveral link:
|
|
20
22
|
|
|
@@ -32,6 +34,14 @@ This adapter uses Sentry libraries to automatically report exceptions and code e
|
|
|
32
34
|
## Changelog
|
|
33
35
|
! Note that missing version entries are typically dependency updates for improved security.
|
|
34
36
|
|
|
37
|
+
### 0.1.3 (2023-07-17)
|
|
38
|
+
all log messages in English,
|
|
39
|
+
remove unused state change handler,
|
|
40
|
+
fixed state roles
|
|
41
|
+
### 0.1.2 (2023-07-17)
|
|
42
|
+
round grid consumption meter values to Wh accuracy,
|
|
43
|
+
hide unused checkboxes in config,
|
|
44
|
+
fix snyc and appveyor
|
|
35
45
|
### 0.1.1 (2023-07-16)
|
|
36
46
|
remove release script and dev-server
|
|
37
47
|
### 0.1.0 (2023-07-14)
|
package/admin/jsonConfig.json
CHANGED
|
@@ -27,123 +27,146 @@
|
|
|
27
27
|
"feedDataDetail": {
|
|
28
28
|
"type": "header",
|
|
29
29
|
"text": "SelectFieldsForFeed",
|
|
30
|
+
"hidden": "!data.FeedActive",
|
|
30
31
|
"size": 3
|
|
31
32
|
},
|
|
32
|
-
|
|
33
33
|
"FeedConfigLastMeterConsumption": {
|
|
34
34
|
"type": "checkbox",
|
|
35
35
|
"label": "LastMeterConsumption",
|
|
36
36
|
"sm": 3, "md": 3, "lg": 3,
|
|
37
|
+
"hidden": "!data.FeedActive",
|
|
37
38
|
"newLine": true
|
|
38
39
|
},
|
|
39
40
|
"FeedConfigAccumulatedConsumption": {
|
|
40
41
|
"type": "checkbox",
|
|
41
42
|
"label": "AccumulatedConsumption",
|
|
43
|
+
"hidden": "!data.FeedActive",
|
|
42
44
|
"sm": 3, "md": 3, "lg": 3
|
|
43
45
|
},
|
|
44
46
|
"FeedConfigAccumulatedProduction": {
|
|
45
47
|
"type": "checkbox",
|
|
46
48
|
"label": "AccumulatedProduction",
|
|
49
|
+
"hidden": "!data.FeedActive",
|
|
47
50
|
"sm": 3, "md": 3, "lg": 3
|
|
48
51
|
},
|
|
49
52
|
"FeedConfigAccumulatedConsumptionLastHour": {
|
|
50
53
|
"type": "checkbox",
|
|
51
54
|
"label": "AccumulatedConsumptionLastHour",
|
|
55
|
+
"hidden": "!data.FeedActive",
|
|
52
56
|
"sm": 3, "md": 3, "lg": 3
|
|
53
57
|
},
|
|
54
58
|
"FeedConfigAccumulatedProductionLastHour": {
|
|
55
59
|
"type": "checkbox",
|
|
56
60
|
"label": "AccumulatedProductionLastHour",
|
|
61
|
+
"hidden": "!data.FeedActive",
|
|
57
62
|
"sm": 3, "md": 3, "lg": 3
|
|
58
63
|
},
|
|
59
64
|
"FeedConfigAccumulatedCost": {
|
|
60
65
|
"type": "checkbox",
|
|
61
66
|
"label": "AccumulatedCost",
|
|
67
|
+
"hidden": "!data.FeedActive",
|
|
62
68
|
"sm": 3, "md": 3, "lg": 3
|
|
63
69
|
},
|
|
64
70
|
"FeedConfigAccumulatedReward": {
|
|
65
71
|
"type": "checkbox",
|
|
66
72
|
"label": "AccumulatedReward",
|
|
73
|
+
"hidden": "!data.FeedActive",
|
|
67
74
|
"sm": 3, "md": 3, "lg": 3
|
|
68
75
|
},
|
|
69
76
|
"FeedConfigCurrency": {
|
|
70
77
|
"type": "checkbox",
|
|
71
78
|
"label": "Currency",
|
|
79
|
+
"hidden": "!data.FeedActive",
|
|
72
80
|
"sm": 3, "md": 3, "lg": 3
|
|
73
81
|
},
|
|
74
82
|
"FeedConfigMinPower": {
|
|
75
83
|
"type": "checkbox",
|
|
76
84
|
"label": "MinPower",
|
|
85
|
+
"hidden": "!data.FeedActive",
|
|
77
86
|
"sm": 3, "md": 3, "lg": 3
|
|
78
87
|
},
|
|
79
88
|
"FeedConfigAveragePower": {
|
|
80
89
|
"type": "checkbox",
|
|
81
90
|
"label": "AveragePower",
|
|
91
|
+
"hidden": "!data.FeedActive",
|
|
82
92
|
"sm": 3, "md": 3, "lg": 3
|
|
83
93
|
},
|
|
84
94
|
"FeedConfigMaxPower": {
|
|
85
95
|
"type": "checkbox",
|
|
86
96
|
"label": "MaxPower",
|
|
97
|
+
"hidden": "!data.FeedActive",
|
|
87
98
|
"sm": 3, "md": 3, "lg": 3
|
|
88
99
|
},
|
|
89
100
|
"FeedConfigPowerProduction": {
|
|
90
101
|
"type": "checkbox",
|
|
91
102
|
"label": "PowerProduction",
|
|
103
|
+
"hidden": "!data.FeedActive",
|
|
92
104
|
"sm": 3, "md": 3, "lg": 3
|
|
93
105
|
},
|
|
94
106
|
"FeedConfigMinPowerProduction": {
|
|
95
107
|
"type": "checkbox",
|
|
96
108
|
"label": "MinPowerProduction",
|
|
109
|
+
"hidden": "!data.FeedActive",
|
|
97
110
|
"sm": 3, "md": 3, "lg": 3
|
|
98
111
|
},
|
|
99
112
|
"FeedConfigMaxPowerProduction": {
|
|
100
113
|
"type": "checkbox",
|
|
101
114
|
"label": "MaxPowerProduction",
|
|
115
|
+
"hidden": "!data.FeedActive",
|
|
102
116
|
"sm": 3, "md": 3, "lg": 3
|
|
103
117
|
},
|
|
104
118
|
"FeedConfigLastMeterProduction": {
|
|
105
119
|
"type": "checkbox",
|
|
106
120
|
"label": "LastMeterProduction",
|
|
121
|
+
"hidden": "!data.FeedActive",
|
|
107
122
|
"sm": 3, "md": 3, "lg": 3
|
|
108
123
|
},
|
|
109
124
|
"FeedConfigPowerFactor": {
|
|
110
125
|
"type": "checkbox",
|
|
111
126
|
"label": "PowerFactor",
|
|
127
|
+
"hidden": "!data.FeedActive",
|
|
112
128
|
"sm": 3, "md": 3, "lg": 3
|
|
113
129
|
},
|
|
114
130
|
"FeedConfigVoltagePhase1": {
|
|
115
131
|
"type": "checkbox",
|
|
116
132
|
"label": "VoltagePhase1",
|
|
133
|
+
"hidden": "!data.FeedActive",
|
|
117
134
|
"sm": 3, "md": 3, "lg": 3
|
|
118
135
|
},
|
|
119
136
|
"FeedConfigVoltagePhase2": {
|
|
120
137
|
"type": "checkbox",
|
|
121
138
|
"label": "VoltagePhase2",
|
|
139
|
+
"hidden": "!data.FeedActive",
|
|
122
140
|
"sm": 3, "md": 3, "lg": 3
|
|
123
141
|
},
|
|
124
142
|
"FeedConfigVoltagePhase3": {
|
|
125
143
|
"type": "checkbox",
|
|
126
144
|
"label": "VoltagePhase3",
|
|
145
|
+
"hidden": "!data.FeedActive",
|
|
127
146
|
"sm": 3, "md": 3, "lg": 3
|
|
128
147
|
},
|
|
129
148
|
"FeedConfigCurrentL1": {
|
|
130
149
|
"type": "checkbox",
|
|
131
150
|
"label": "CurrentL1",
|
|
151
|
+
"hidden": "!data.FeedActive",
|
|
132
152
|
"sm": 3, "md": 3, "lg": 3
|
|
133
153
|
},
|
|
134
154
|
"FeedConfigCurrentL2": {
|
|
135
155
|
"type": "checkbox",
|
|
136
156
|
"label": "CurrentL2",
|
|
157
|
+
"hidden": "!data.FeedActive",
|
|
137
158
|
"sm": 3, "md": 3, "lg": 3
|
|
138
159
|
},
|
|
139
160
|
"FeedConfigCurrentL3": {
|
|
140
161
|
"type": "checkbox",
|
|
141
162
|
"label": "CurrentL3",
|
|
163
|
+
"hidden": "!data.FeedActive",
|
|
142
164
|
"sm": 3, "md": 3, "lg": 3
|
|
143
165
|
},
|
|
144
166
|
"FeedConfigSignalStrength": {
|
|
145
167
|
"type": "checkbox",
|
|
146
168
|
"label": "SignalStrength",
|
|
169
|
+
"hidden": "!data.FeedActive",
|
|
147
170
|
"sm": 3, "md": 3, "lg": 3
|
|
148
171
|
}
|
|
149
172
|
}
|
|
@@ -28,17 +28,14 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
28
28
|
// Values: APARTMENT, ROWHOUSE, FLOORHOUSE1, FLOORHOUSE2, FLOORHOUSE3, COTTAGE, CASTLE
|
|
29
29
|
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "Type"), currentHome.type, "The type of home.");
|
|
30
30
|
// Values: APARTMENT, ROWHOUSE, HOUSE, COTTAGE
|
|
31
|
-
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "PrimaryHeatingSource"), currentHome.primaryHeatingSource, "The primary form of heating in the household");
|
|
31
|
+
this.checkAndSetValue(this.getStatePrefix(this.currentHomeId, "General", "PrimaryHeatingSource"), currentHome.primaryHeatingSource, "The primary form of heating in the household");
|
|
32
|
+
// Values: AIR2AIR_HEATPUMP, ELECTRICITY, GROUND, DISTRICT_HEATING, ELECTRIC_BOILER, AIR2WATER_HEATPUMP, OTHER
|
|
32
33
|
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "Size"), currentHome.size, "The size of the home in square meters");
|
|
33
34
|
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "NumberOfResidents"), currentHome.numberOfResidents, "The number of people living in the home");
|
|
34
35
|
this.checkAndSetValueNumber(this.getStatePrefix(this.currentHomeId, "General", "MainFuseSize"), currentHome.mainFuseSize, "The main fuse size");
|
|
35
36
|
this.checkAndSetValueBoolean(this.getStatePrefix(this.currentHomeId, "General", "HasVentilationSystem"), currentHome.hasVentilationSystem, "Whether the home has a ventilation system");
|
|
36
37
|
this.fetchAddress("Address", currentHome.address);
|
|
37
38
|
this.fetchLegalEntity("Owner", currentHome.owner);
|
|
38
|
-
// TO DO: currentHome.currentSubscription
|
|
39
|
-
// TO DO: currentHome.subscriptions
|
|
40
|
-
// TO DO: currentHome.consumption
|
|
41
|
-
// TO DO: currentHome.production
|
|
42
39
|
this.checkAndSetValueBoolean(this.getStatePrefix(this.currentHomeId, "Features", "RealTimeConsumptionEnabled"), currentHome.features.realTimeConsumptionEnabled);
|
|
43
40
|
}
|
|
44
41
|
return homeIdList;
|
|
@@ -51,7 +48,7 @@ class TibberAPICaller extends tibberHelper_1.TibberHelper {
|
|
|
51
48
|
}
|
|
52
49
|
errorMessages += error.errors[index].message;
|
|
53
50
|
}
|
|
54
|
-
return "
|
|
51
|
+
return "Error (" + error.statusMessage + ") during: " + context + ": " + errorMessages;
|
|
55
52
|
}
|
|
56
53
|
async updateCurrentPrice(homeId) {
|
|
57
54
|
if (homeId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":";;;AACA,2CAAkD;AAKlD,iDAA8C;AAE9C,MAAa,eAAgB,SAAQ,2BAAY;IAKhD,YAAY,YAAqB,EAAE,OAA8B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,WAAW,GAAG,IAAI,wBAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;QACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;QACrF,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,MAAM,SAAS,IAAI,YAAY,EAAE;YACrC,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;YAC5C,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,EAAE,CAAC;YACpC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACpC,mDAAmD;YACnD,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAC9C,eAAe;YACf,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,WAAW,CAAC,EAAE,EAAE,iBAAiB,CAAC,CAAC;YACnH,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,WAAW,CAAC,QAAQ,EAAE,mCAAmC,CAAC,CAAC;YACjJ,IAAI,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"tibberAPICaller.js","sourceRoot":"","sources":["../../src/lib/tibberAPICaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class TibberHelper {
|
|
|
20
20
|
common: {
|
|
21
21
|
name: stateName.key,
|
|
22
22
|
type: "string",
|
|
23
|
-
role: "
|
|
23
|
+
role: "text",
|
|
24
24
|
desc: description,
|
|
25
25
|
read: true,
|
|
26
26
|
write: false,
|
|
@@ -38,7 +38,7 @@ class TibberHelper {
|
|
|
38
38
|
common: {
|
|
39
39
|
name: stateName.key,
|
|
40
40
|
type: "number",
|
|
41
|
-
role: "
|
|
41
|
+
role: "value",
|
|
42
42
|
desc: description,
|
|
43
43
|
read: true,
|
|
44
44
|
write: false,
|
|
@@ -55,7 +55,7 @@ class TibberHelper {
|
|
|
55
55
|
common: {
|
|
56
56
|
name: stateName.key,
|
|
57
57
|
type: "number",
|
|
58
|
-
role: "
|
|
58
|
+
role: "value",
|
|
59
59
|
desc: description,
|
|
60
60
|
unit: unit,
|
|
61
61
|
read: true,
|
|
@@ -73,7 +73,7 @@ class TibberHelper {
|
|
|
73
73
|
common: {
|
|
74
74
|
name: stateName.key,
|
|
75
75
|
type: "boolean",
|
|
76
|
-
role: "
|
|
76
|
+
role: "indicator",
|
|
77
77
|
desc: description,
|
|
78
78
|
read: true,
|
|
79
79
|
write: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":";;;AAEA,MAAa,YAAY;IAGxB,YAAY,OAA8B;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAES,cAAc,CAAC,MAAc,EAAE,KAAa,EAAE,IAAY;QACnE,MAAM,WAAW,GAAG;YACnB,GAAG,EAAE,IAAI;YACT,KAAK,EAAE,QAAQ,GAAG,MAAM,GAAG,GAAG,GAAG,KAAK,GAAG,GAAG,GAAG,IAAI;SACnD,CAAC;QACF,OAAO,WAAW,CAAC;IACpB,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,SAAoC,EAAE,KAAa,EAAE,WAAoB;QACzG,IAAI,KAAK,IAAI,SAAS,EAAE;YACvB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,SAAS,CAAC,KAAK,EAAE;oBAC3D,IAAI,EAAE,OAAO;oBACb,MAAM,EAAE;wBACP,IAAI,EAAE,SAAS,CAAC,GAAG;wBACnB,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"tibberHelper.js","sourceRoot":"","sources":["../../src/lib/tibberHelper.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tibberPulse.js
CHANGED
|
@@ -66,11 +66,11 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
66
66
|
if (this.tibberConfig.homeId !== undefined) {
|
|
67
67
|
this.checkAndSetValue(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "timestamp"), liveMeasurement.timestamp, "Timestamp when usage occurred");
|
|
68
68
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "power"), power, "W", "Consumption at the moment");
|
|
69
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterConsumption"), liveMeasurement.lastMeterConsumption, "kWh", "
|
|
70
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumption"), liveMeasurement.accumulatedConsumption, "kWh", "Energy consumed since midnight");
|
|
71
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProduction"), liveMeasurement.accumulatedProduction, "kWh", "Energy produced since midnight");
|
|
72
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumptionLastHour"), liveMeasurement.accumulatedConsumptionLastHour, "kWh", "Energy consumed since since last hour shift");
|
|
73
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProductionLastHour"), liveMeasurement.accumulatedProductionLastHour, "kWh", "Energy produced since last hour shift");
|
|
69
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterConsumption"), (Math.round(1000 * liveMeasurement.lastMeterConsumption)) / 1000, "kWh", "Latest consumption meter state");
|
|
70
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumption"), (Math.round(1000 * liveMeasurement.accumulatedConsumption)) / 1000, "kWh", "Energy consumed since midnight");
|
|
71
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProduction"), (Math.round(1000 * liveMeasurement.accumulatedProduction)) / 1000, "kWh", "Energy produced since midnight");
|
|
72
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedConsumptionLastHour"), (Math.round(1000 * liveMeasurement.accumulatedConsumptionLastHour)) / 1000, "kWh", "Energy consumed since since last hour shift");
|
|
73
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedProductionLastHour"), (Math.round(1000 * liveMeasurement.accumulatedProductionLastHour)) / 1000, "kWh", "Energy produced since last hour shift");
|
|
74
74
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedCost"), liveMeasurement.accumulatedCost, "Accumulated cost since midnight; requires active Tibber power deal");
|
|
75
75
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "accumulatedReward"), liveMeasurement.accumulatedReward, "Accumulated reward since midnight; requires active Tibber power deal");
|
|
76
76
|
this.checkAndSetValue(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currency"), liveMeasurement.currency, "Currency of displayed cost; requires active Tibber power deal");
|
|
@@ -81,14 +81,14 @@ class TibberPulse extends tibberHelper_1.TibberHelper {
|
|
|
81
81
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "powerProduction"), liveMeasurement.powerProduction, "W", "Net production (A-) at the moment");
|
|
82
82
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "minPowerProduction"), liveMeasurement.minPowerProduction, "W", "Min net production since midnight");
|
|
83
83
|
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "maxPowerProduction"), liveMeasurement.maxPowerProduction, "W", "Max net production since midnight");
|
|
84
|
-
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterProduction"), liveMeasurement.lastMeterProduction, "kWh", "
|
|
84
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "lastMeterProduction"), (Math.round(1000 * liveMeasurement.lastMeterProduction)) / 1000, "kWh", "Latest production meter state");
|
|
85
85
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "powerFactor"), liveMeasurement.powerFactor, "Power factor (active power / apparent power)");
|
|
86
86
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase1"), liveMeasurement.voltagePhase1, "Voltage on phase 1; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
87
87
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase2"), liveMeasurement.voltagePhase2, "Voltage on phase 2; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
88
88
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "voltagePhase3"), liveMeasurement.voltagePhase3, "Voltage on phase 3; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
89
|
-
this.
|
|
90
|
-
this.
|
|
91
|
-
this.
|
|
89
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL1"), liveMeasurement.currentL1, "A", "Current on L1; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
90
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL2"), liveMeasurement.currentL2, "A", "Current on L2; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
91
|
+
this.checkAndSetValueNumberUnit(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "currentL3"), liveMeasurement.currentL3, "A", "Current on L3; on Kaifa and Aidon meters the value is not part of every HAN data frame therefore the value is null at timestamps with second value other than 0, 10, 20, 30, 40, 50. There can be other deviations based on concrete meter firmware.");
|
|
92
92
|
this.checkAndSetValueNumber(this.getStatePrefix(this.tibberConfig.homeId, objectDestination, "signalStrength"), liveMeasurement.signalStrength, "Device signal strength (Pulse - dB; Watty - percent)");
|
|
93
93
|
}
|
|
94
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tibberPulse.js","sourceRoot":"","sources":["../../src/lib/tibberPulse.ts"],"names":[],"mappings":"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"}
|
package/build/lib/tools.js
CHANGED
|
@@ -55,14 +55,13 @@ exports.translateText = translateText;
|
|
|
55
55
|
* @param apiKey The yandex API key. You can create one for free at https://translate.yandex.com/developers
|
|
56
56
|
*/
|
|
57
57
|
async function translateYandex(text, targetLang, apiKey) {
|
|
58
|
-
var _a;
|
|
59
58
|
if (targetLang === "zh-cn") {
|
|
60
59
|
targetLang = "zh";
|
|
61
60
|
}
|
|
62
61
|
try {
|
|
63
62
|
const url = `https://translate.yandex.net/api/v1.5/tr.json/translate?key=${apiKey}&text=${encodeURIComponent(text)}&lang=en-${targetLang}`;
|
|
64
63
|
const response = await axios_1.default.request({ url, timeout: 15000 });
|
|
65
|
-
if (isArray(
|
|
64
|
+
if (isArray(response.data?.text)) {
|
|
66
65
|
return response.data.text[0];
|
|
67
66
|
}
|
|
68
67
|
throw new Error("Invalid response for translate request");
|
|
@@ -77,7 +76,6 @@ async function translateYandex(text, targetLang, apiKey) {
|
|
|
77
76
|
* @param targetLang The target languate
|
|
78
77
|
*/
|
|
79
78
|
async function translateGoogle(text, targetLang) {
|
|
80
|
-
var _a;
|
|
81
79
|
try {
|
|
82
80
|
const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(text)}&ie=UTF-8&oe=UTF-8`;
|
|
83
81
|
const response = await axios_1.default.request({ url, timeout: 15000 });
|
|
@@ -88,7 +86,7 @@ async function translateGoogle(text, targetLang) {
|
|
|
88
86
|
throw new Error("Invalid response for translate request");
|
|
89
87
|
}
|
|
90
88
|
catch (e) {
|
|
91
|
-
if (
|
|
89
|
+
if (e.response?.status === 429) {
|
|
92
90
|
throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`);
|
|
93
91
|
}
|
|
94
92
|
else {
|
package/build/lib/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B;;;GAGG;AACH,SAAgB,QAAQ,CAAC,EAAW;IACnC,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAAC;AACjE,CAAC;AAND,4BAMC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,EAAW;IAClC,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC;AAChE,CAAC;AAHD,0BAGC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAqB;IAC1F,IAAI,UAAU,KAAK,IAAI,EAAE;QACxB,OAAO,IAAI,CAAC;KACZ;SAAM,IAAI,CAAC,IAAI,EAAE;QACjB,OAAO,EAAE,CAAC;KACV;IACD,IAAI,YAAY,EAAE;QACjB,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KACvD;SAAM;QACN,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KACzC;AACF,CAAC;AAXD,sCAWC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B;;;GAGG;AACH,SAAgB,QAAQ,CAAC,EAAW;IACnC,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAAC;AACjE,CAAC;AAND,4BAMC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,EAAW;IAClC,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC;AAChE,CAAC;AAHD,0BAGC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAqB;IAC1F,IAAI,UAAU,KAAK,IAAI,EAAE;QACxB,OAAO,IAAI,CAAC;KACZ;SAAM,IAAI,CAAC,IAAI,EAAE;QACjB,OAAO,EAAE,CAAC;KACV;IACD,IAAI,YAAY,EAAE;QACjB,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KACvD;SAAM;QACN,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KACzC;AACF,CAAC;AAXD,sCAWC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc;IAC9E,IAAI,UAAU,KAAK,OAAO,EAAE;QAC3B,UAAU,GAAG,IAAI,CAAC;KAClB;IACD,IAAI;QACH,MAAM,GAAG,GAAG,+DAA+D,MAAM,SAAS,kBAAkB,CAAC,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;QAC3I,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE;YACjC,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAC7B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;KAChE;AACF,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB;IAC9D,IAAI;QACH,MAAM,GAAG,GAAG,0EAA0E,UAAU,WAAW,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,CAAC;QACxJ,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,OAAO,CAAM,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACnE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC3B,0BAA0B;YAC1B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9B;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC1D;IAAC,OAAO,CAAM,EAAE;QAChB,IAAI,CAAC,CAAC,QAAQ,EAAE,MAAM,KAAK,GAAG,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,qCAAqC,CAAC,CAAC;SAC5F;aAAM;YACN,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;SAChE;KACD;AACF,CAAC"}
|
package/build/main.js
CHANGED
|
@@ -36,7 +36,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
36
36
|
});
|
|
37
37
|
this.queryUrl = "";
|
|
38
38
|
this.on("ready", this.onReady.bind(this));
|
|
39
|
-
this.on("stateChange", this.onStateChange.bind(this));
|
|
39
|
+
// this.on("stateChange", this.onStateChange.bind(this));
|
|
40
40
|
// this.on("objectChange", this.onObjectChange.bind(this));
|
|
41
41
|
// this.on("message", this.onMessage.bind(this));
|
|
42
42
|
this.on("unload", this.onUnload.bind(this));
|
|
@@ -76,7 +76,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
76
76
|
this.homeIdList = await tibberAPICaller.updateHomesFromAPI();
|
|
77
77
|
}
|
|
78
78
|
catch (error) {
|
|
79
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
79
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of homes"));
|
|
80
80
|
}
|
|
81
81
|
// if feed is not used - set info.connection if data received
|
|
82
82
|
if (!this.config.FeedActive) {
|
|
@@ -115,19 +115,19 @@ class Tibberlink extends utils.Adapter {
|
|
|
115
115
|
await tibberAPICaller.updateCurrentPrice(this.homeIdList[index]);
|
|
116
116
|
}
|
|
117
117
|
catch (error) {
|
|
118
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
118
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of current price"));
|
|
119
119
|
}
|
|
120
120
|
try {
|
|
121
121
|
await tibberAPICaller.updatePricesToday(this.homeIdList[index]);
|
|
122
122
|
}
|
|
123
123
|
catch (error) {
|
|
124
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
124
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of prices today"));
|
|
125
125
|
}
|
|
126
126
|
try {
|
|
127
127
|
await tibberAPICaller.updatePricesTomorrow(this.homeIdList[index]);
|
|
128
128
|
}
|
|
129
129
|
catch (error) {
|
|
130
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
130
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of prices tomorrow"));
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
133
|
}
|
|
@@ -138,7 +138,7 @@ class Tibberlink extends utils.Adapter {
|
|
|
138
138
|
tibberAPICaller.updateCurrentPrice(this.homeIdList[index]);
|
|
139
139
|
}
|
|
140
140
|
catch (error) {
|
|
141
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
141
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of current price"));
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
}
|
|
@@ -151,19 +151,19 @@ class Tibberlink extends utils.Adapter {
|
|
|
151
151
|
tibberAPICaller.updatePricesToday(this.homeIdList[index]);
|
|
152
152
|
}
|
|
153
153
|
catch (error) {
|
|
154
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
154
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of prices today"));
|
|
155
155
|
}
|
|
156
156
|
try {
|
|
157
157
|
tibberAPICaller.updatePricesTomorrow(this.homeIdList[index]);
|
|
158
158
|
}
|
|
159
159
|
catch (error) {
|
|
160
|
-
this.log.warn(tibberAPICaller.generateErrorMessage(error, "
|
|
160
|
+
this.log.warn(tibberAPICaller.generateErrorMessage(error, "pull of prices tomorrow"));
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
}
|
|
164
164
|
}, 1500000);
|
|
165
165
|
this.intervallList.push(energyPricesListUpdateInterval);
|
|
166
|
-
// If User uses
|
|
166
|
+
// If User uses live feed - start connection
|
|
167
167
|
if (this.config.FeedActive) {
|
|
168
168
|
for (const index in this.homeIdList) {
|
|
169
169
|
try {
|
|
@@ -268,19 +268,6 @@ class Tibberlink extends utils.Adapter {
|
|
|
268
268
|
callback();
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
|
-
/**
|
|
272
|
-
* Is called if a subscribed state changes
|
|
273
|
-
*/
|
|
274
|
-
onStateChange(id, state) {
|
|
275
|
-
if (state) {
|
|
276
|
-
// The state was changed
|
|
277
|
-
this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`);
|
|
278
|
-
}
|
|
279
|
-
else {
|
|
280
|
-
// The state was deleted
|
|
281
|
-
this.log.info(`state ${id} deleted`);
|
|
282
|
-
}
|
|
283
|
-
}
|
|
284
271
|
}
|
|
285
272
|
if (require.main !== module) {
|
|
286
273
|
// Export the constructor in compact mode
|
package/build/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAA0E;AAC1E,gCAAgC;AAChC,8DAAgD;AAEhD,2DAAwD;AACxD,mDAAgD;AAEhD,MAAM,UAAW,SAAQ,KAAK,CAAC,OAAO;IAKrC,YAAmB,UAAyC,EAAE;QAC7D,KAAK,CAAC;YACL,GAAG,OAAO;YACV,IAAI,EAAE,YAAY;SAClB,CAAC,CAAC;QANJ,aAAQ,GAAG,EAAE,CAAC;QAOb,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/io-package.json
CHANGED
|
@@ -1,8 +1,34 @@
|
|
|
1
1
|
{
|
|
2
2
|
"common": {
|
|
3
3
|
"name": "tibberlink",
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.3",
|
|
5
5
|
"news": {
|
|
6
|
+
"0.1.3": {
|
|
7
|
+
"en": "all log messages in English, remove unused state change handler, fixed state roles",
|
|
8
|
+
"de": "alle Log-Nachrichten in Englisch, entfernen Sie ungenutzte Zustandsänderungs-Handler, Zustandsrollen korrigiert",
|
|
9
|
+
"ru": "все лог-сообщения на английском языке, удалить неиспользуемый государственный обработчик, фиксированные государственные роли",
|
|
10
|
+
"pt": "todas as mensagens de log em Inglês, remover manipulador de mudança de estado não usado, funções de estado fixo",
|
|
11
|
+
"nl": "alle logberichten in het Engels, verwijder onbruikbare staatsveranderaar, gerepareerde staatsrollen",
|
|
12
|
+
"fr": "tous les messages journaux en anglais, supprimer le gestionnaire de changement d'état inutilisé, les rôles d'état fixes",
|
|
13
|
+
"it": "tutti i messaggi di registro in inglese, rimuovere il gestore di cambiamento di stato non utilizzato, ruoli di stato fissi",
|
|
14
|
+
"es": "todos los mensajes de registro en inglés, eliminar el manejador de cambio de estado no utilizado, papeles de estado fijo",
|
|
15
|
+
"pl": "wszystkie wiadomości w języku angielskim usuwają nieużywaną zmianę stanu",
|
|
16
|
+
"uk": "всі повідомлення в журналі англійською мовою, видалити невикористаний державний обробник, фіксовані ролі держави",
|
|
17
|
+
"zh-cn": "英文的所有文信,删除未用的州变化手字,固定国家作用"
|
|
18
|
+
},
|
|
19
|
+
"0.1.2": {
|
|
20
|
+
"en": "round grid consumption meter values to Wh accuracy",
|
|
21
|
+
"de": "rundgitter-Verbrauchsmesswerte zur Wh-Genauigkeit",
|
|
22
|
+
"ru": "круглые значения счетчика потребления сетки для точности Wh",
|
|
23
|
+
"pt": "valores do medidor de consumo de grade redonda para a precisão de Wh",
|
|
24
|
+
"nl": "rond de grid consumptiemeter waarden aan Wh accurateur",
|
|
25
|
+
"fr": "valeurs des compteurs de consommation de grille ronde à la précision Wh",
|
|
26
|
+
"it": "valori del contatore di consumo della griglia tonda alla precisione Wh",
|
|
27
|
+
"es": "valores del medidor de rejilla redonda a la precisión Wh",
|
|
28
|
+
"pl": "okrągłe zużycie liczników do dokładności Wh",
|
|
29
|
+
"uk": "значення лічильника потужності круглої сітки до точності wh",
|
|
30
|
+
"zh-cn": "圆电网消费参数值"
|
|
31
|
+
},
|
|
6
32
|
"0.1.1": {
|
|
7
33
|
"en": "remove release script and dev-server",
|
|
8
34
|
"de": "release-script und dev-server entfernen",
|
|
@@ -68,7 +94,7 @@
|
|
|
68
94
|
"loglevel": "info",
|
|
69
95
|
"mode": "daemon",
|
|
70
96
|
"allowInit": true,
|
|
71
|
-
"type": "
|
|
97
|
+
"type": "energy",
|
|
72
98
|
"compact": true,
|
|
73
99
|
"connectionType": "cloud",
|
|
74
100
|
"dataSource": "poll",
|