@iobroker/js-controller-adapter 4.0.21 → 4.1.0-alpha.0-20220819-74ceeddc
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/build/lib/adapter/adapter.d.ts +582 -512
- package/build/lib/adapter/adapter.d.ts.map +1 -1
- package/build/lib/adapter/adapter.js +7164 -7186
- package/build/lib/adapter/adapter.js.map +1 -1
- package/build/lib/adapter/constants.d.ts.map +1 -1
- package/build/lib/adapter/constants.js +2 -1
- package/build/lib/adapter/constants.js.map +1 -1
- package/build/lib/adapter/utils.d.ts +7 -3
- package/build/lib/adapter/utils.d.ts.map +1 -1
- package/build/lib/adapter/utils.js +59 -6
- package/build/lib/adapter/utils.js.map +1 -1
- package/package.json +13 -13
- package/build/cert/cloudCert.crt +0 -9
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,cAAc,oBAAoB,CAAC;AAChD,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,+BAA+B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,KAAO,CAAC;AACzC,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAClD,eAAO,MAAM,iBAAiB,KAAO,CAAC;AACtC,eAAO,MAAM,kBAAkB,KAAO,CAAC;AACvC,eAAO,MAAM,kBAAkB,IAAM,CAAC;AACtC,eAAO,MAAM,iBAAiB,IAAM,CAAC;AACrC,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AACtC,eAAO,MAAM,iBAAiB,MAAQ,CAAC;AACvC,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/constants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,eAAO,MAAM,cAAc,oBAAoB,CAAC;AAChD,eAAO,MAAM,iBAAiB,WAAW,CAAC;AAC1C,eAAO,MAAM,iBAAiB,sBAAsB,CAAC;AACrD,eAAO,MAAM,kBAAkB,+BAA+B,CAAC;AAC/D,eAAO,MAAM,oBAAoB,KAAO,CAAC;AACzC,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAClD,eAAO,MAAM,iBAAiB,KAAO,CAAC;AACtC,eAAO,MAAM,kBAAkB,KAAO,CAAC;AACvC,eAAO,MAAM,kBAAkB,IAAM,CAAC;AACtC,eAAO,MAAM,iBAAiB,IAAM,CAAC;AACrC,eAAO,MAAM,gBAAgB,OAAQ,CAAC;AACtC,eAAO,MAAM,iBAAiB,MAAQ,CAAC;AACvC,eAAO,MAAM,kBAAkB,UAc9B,CAAC"}
|
|
@@ -28,6 +28,7 @@ exports.SUPPORTED_FEATURES = [
|
|
|
28
28
|
'CONTROLLER_READWRITE_BASE_SETTINGS',
|
|
29
29
|
'CONTROLLER_MULTI_REPO',
|
|
30
30
|
'CONTROLLER_LICENSE_MANAGER',
|
|
31
|
-
'DEL_INSTANCE_CUSTOM'
|
|
31
|
+
'DEL_INSTANCE_CUSTOM',
|
|
32
|
+
'BINARY_STATE_EVENT' // stateChange event could be received for binary states too
|
|
32
33
|
];
|
|
33
34
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/adapter/constants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,cAAc,GAAG,iBAAiB,CAAC;AACnC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AACxC,QAAA,kBAAkB,GAAG,4BAA4B,CAAC;AAClD,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,gBAAgB,GAAG,iBAAiB,CAAC;AACrC,QAAA,iBAAiB,GAAG,IAAI,CAAC;AACzB,QAAA,kBAAkB,GAAG,IAAI,CAAC;AAC1B,QAAA,kBAAkB,GAAG,GAAG,CAAC;AACzB,QAAA,iBAAiB,GAAG,GAAG,CAAC;AACxB,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACzB,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAC1B,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,8BAA8B;IAC9B,sBAAsB;IACtB,8BAA8B;IAC9B,uCAAuC;IACvC,6BAA6B;IAC7B,SAAS;IACT,6BAA6B;IAC7B,oCAAoC;IACpC,uBAAuB;IACvB,4BAA4B;IAC5B,qBAAqB,CAAC,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/adapter/constants.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,cAAc,GAAG,iBAAiB,CAAC;AACnC,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,iBAAiB,GAAG,mBAAmB,CAAC;AACxC,QAAA,kBAAkB,GAAG,4BAA4B,CAAC;AAClD,QAAA,oBAAoB,GAAG,IAAI,CAAC;AAC5B,QAAA,gBAAgB,GAAG,iBAAiB,CAAC;AACrC,QAAA,iBAAiB,GAAG,IAAI,CAAC;AACzB,QAAA,kBAAkB,GAAG,IAAI,CAAC;AAC1B,QAAA,kBAAkB,GAAG,GAAG,CAAC;AACzB,QAAA,iBAAiB,GAAG,GAAG,CAAC;AACxB,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACzB,QAAA,iBAAiB,GAAG,KAAK,CAAC;AAC1B,QAAA,kBAAkB,GAAG;IAC9B,OAAO;IACP,8BAA8B;IAC9B,sBAAsB;IACtB,8BAA8B;IAC9B,uCAAuC;IACvC,6BAA6B;IAC7B,SAAS;IACT,6BAA6B;IAC7B,oCAAoC;IACpC,uBAAuB;IACvB,4BAA4B;IAC5B,qBAAqB;IACrB,oBAAoB,CAAC,4DAA4D;CACpF,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="iobroker" />
|
|
2
|
-
interface
|
|
2
|
+
export interface IdObject {
|
|
3
3
|
device?: string;
|
|
4
4
|
channel?: string;
|
|
5
5
|
state?: string;
|
|
@@ -51,7 +51,11 @@ export declare class Utils {
|
|
|
51
51
|
* @param id id which will be fixed
|
|
52
52
|
* @param isPattern if the id is a pattern
|
|
53
53
|
*/
|
|
54
|
-
fixId(id: string |
|
|
54
|
+
fixId(id: string | IdObject, isPattern?: boolean): string;
|
|
55
|
+
/**
|
|
56
|
+
* Validates the object-type argument that is passed to setState
|
|
57
|
+
* @param obj object to validate
|
|
58
|
+
*/
|
|
59
|
+
validateSetStateObjectArgument(obj: Record<string, any>): void;
|
|
55
60
|
}
|
|
56
|
-
export {};
|
|
57
61
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/utils.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/utils.ts"],"names":[],"mappings":";AAGA,MAAM,WAAW,QAAQ;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,KAAK;IACd,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAM;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAM;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAS;IAEzC;;;;;;;;OAQG;gBAEC,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,GAAG,EACX,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM;IAU3B;;;;;;OAMG;IACG,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IA+FhF;;;;;;;OAOG;IACH,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI;IAkEtE;;;;;OAKG;IACH,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKzC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,EAAE,SAAS,UAAQ,GAAG,MAAM;IA2BvD;;;OAGG;IACH,8BAA8B,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;CAsDjE"}
|
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Utils = void 0;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
-
|
|
6
|
-
const { tools, EXIT_CODES } = require('@iobroker/js-controller-common');
|
|
5
|
+
const js_controller_common_1 = require("@iobroker/js-controller-common");
|
|
7
6
|
class Utils {
|
|
8
7
|
/**
|
|
9
8
|
* Utils for internal adapter.js usage
|
|
@@ -118,10 +117,10 @@ class Utils {
|
|
|
118
117
|
this.log.warn(`${this.namespaceLog} The id "${id}" has an invalid type! Expected "string" or "object", received "number".`);
|
|
119
118
|
this.log.warn(`${this.namespaceLog} This will be refused in future versions. Please report this to the developer.`);
|
|
120
119
|
}
|
|
121
|
-
else if (type !== 'string' && !tools.isObject(id)) {
|
|
120
|
+
else if (type !== 'string' && !js_controller_common_1.tools.isObject(id)) {
|
|
122
121
|
throw new Error(`The id "${id}" has an invalid type! Expected "string" or "object", received "${type}".`);
|
|
123
122
|
}
|
|
124
|
-
if (tools.isObject(id)) {
|
|
123
|
+
if (js_controller_common_1.tools.isObject(id)) {
|
|
125
124
|
// id can be an object, at least one of the following properties has to exist
|
|
126
125
|
const reqProperties = ['device', 'channel', 'state'];
|
|
127
126
|
let found = false;
|
|
@@ -157,7 +156,7 @@ class Utils {
|
|
|
157
156
|
*/
|
|
158
157
|
static getErrorText(code) {
|
|
159
158
|
code = code || 0;
|
|
160
|
-
return (EXIT_CODES[code] || code).toString();
|
|
159
|
+
return (js_controller_common_1.EXIT_CODES[code] || code).toString();
|
|
161
160
|
}
|
|
162
161
|
/**
|
|
163
162
|
* Adds the namespace to the id if it is missing, if an object is passed it will be converted to an id string
|
|
@@ -182,13 +181,67 @@ class Utils {
|
|
|
182
181
|
}
|
|
183
182
|
}
|
|
184
183
|
}
|
|
185
|
-
else if (tools.isObject(id)) {
|
|
184
|
+
else if (js_controller_common_1.tools.isObject(id)) {
|
|
186
185
|
// If id is an object
|
|
187
186
|
// Add namespace + device + channel
|
|
188
187
|
result = `${this.namespace}.${id.device ? id.device + '.' : ''}${id.channel ? id.channel + '.' : ''}${id.state ? id.state : ''}`;
|
|
189
188
|
}
|
|
190
189
|
return result;
|
|
191
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* Validates the object-type argument that is passed to setState
|
|
193
|
+
* @param obj object to validate
|
|
194
|
+
*/
|
|
195
|
+
validateSetStateObjectArgument(obj) {
|
|
196
|
+
// Check that we have at least one existing non-undefined property at all, else invalid
|
|
197
|
+
if (!Object.values(obj).some(prop => prop !== undefined)) {
|
|
198
|
+
throw new Error(`The state contains no properties! At least one property is expected!`);
|
|
199
|
+
}
|
|
200
|
+
/*
|
|
201
|
+
The following object parameters and types are allowed:
|
|
202
|
+
val: any, (optional)
|
|
203
|
+
ack: boolean, (optional)
|
|
204
|
+
ts: number, (optional)
|
|
205
|
+
q: number, (optional)
|
|
206
|
+
from: string, (optional)
|
|
207
|
+
c: string, (optional)
|
|
208
|
+
expire: number (optional)
|
|
209
|
+
lc: number (optional)
|
|
210
|
+
user: string (optional)
|
|
211
|
+
|
|
212
|
+
Everything else is forbidden
|
|
213
|
+
*/
|
|
214
|
+
const optionalProperties = {
|
|
215
|
+
val: 'any',
|
|
216
|
+
ack: 'boolean',
|
|
217
|
+
ts: 'number',
|
|
218
|
+
q: 'number',
|
|
219
|
+
from: 'string',
|
|
220
|
+
c: 'string',
|
|
221
|
+
expire: 'number',
|
|
222
|
+
lc: 'number',
|
|
223
|
+
user: 'string'
|
|
224
|
+
};
|
|
225
|
+
// Are there any forbidden properties?
|
|
226
|
+
const forbiddenProperties = Object.keys(obj).filter(k => !optionalProperties[k]);
|
|
227
|
+
if (forbiddenProperties.length) {
|
|
228
|
+
throw new Error(`The state contains the forbidden properties ${forbiddenProperties.join(', ')}!`);
|
|
229
|
+
}
|
|
230
|
+
// Do all properties have the correct type?
|
|
231
|
+
for (const [key, type] of Object.entries(optionalProperties)) {
|
|
232
|
+
// any permits all types
|
|
233
|
+
if (type === 'any') {
|
|
234
|
+
continue;
|
|
235
|
+
}
|
|
236
|
+
// don't flag optional properties when they don't exist or are undefined
|
|
237
|
+
if (!(key in obj) || obj[key] === undefined) {
|
|
238
|
+
continue;
|
|
239
|
+
}
|
|
240
|
+
if (type !== typeof obj[key]) {
|
|
241
|
+
throw new Error(`The state property "${key}" has the wrong type "${typeof obj[key]}" (should be "${type}")!`);
|
|
242
|
+
}
|
|
243
|
+
}
|
|
244
|
+
}
|
|
192
245
|
}
|
|
193
246
|
exports.Utils = Utils;
|
|
194
247
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/adapter/utils.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAChD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/lib/adapter/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,28 +1,28 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@iobroker/js-controller-adapter",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
4
4
|
"engines": {
|
|
5
5
|
"node": ">=12.0.0"
|
|
6
6
|
},
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@alcalzone/pak": "^0.7.0",
|
|
9
|
-
"@iobroker/db-objects-file": "4.0.
|
|
10
|
-
"@iobroker/db-objects-jsonl": "4.0.
|
|
11
|
-
"@iobroker/db-objects-redis": "4.0.
|
|
12
|
-
"@iobroker/db-states-file": "4.0.
|
|
13
|
-
"@iobroker/db-states-jsonl": "4.0.
|
|
14
|
-
"@iobroker/db-states-redis": "4.0.
|
|
15
|
-
"@iobroker/js-controller-common": "4.0.
|
|
9
|
+
"@iobroker/db-objects-file": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
10
|
+
"@iobroker/db-objects-jsonl": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
11
|
+
"@iobroker/db-objects-redis": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
12
|
+
"@iobroker/db-states-file": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
13
|
+
"@iobroker/db-states-jsonl": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
14
|
+
"@iobroker/db-states-redis": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
15
|
+
"@iobroker/js-controller-common": "4.1.0-alpha.0-20220819-74ceeddc",
|
|
16
16
|
"@iobroker/plugin-base": "~1.2.1",
|
|
17
17
|
"@iobroker/plugin-sentry": "~1.2.0",
|
|
18
18
|
"deep-clone": "^3.0.3",
|
|
19
|
-
"fs-extra": "^10.
|
|
19
|
+
"fs-extra": "^10.1.0",
|
|
20
20
|
"jsonwebtoken": "^8.5.1",
|
|
21
21
|
"node-schedule": "^2.1.0",
|
|
22
22
|
"node.extend": "^2.0.2",
|
|
23
23
|
"pidusage": "^3.0.0",
|
|
24
24
|
"readline": "^1.3.0",
|
|
25
|
-
"semver": "^7.3.
|
|
25
|
+
"semver": "^7.3.7"
|
|
26
26
|
},
|
|
27
27
|
"keywords": [
|
|
28
28
|
"ioBroker"
|
|
@@ -38,8 +38,8 @@
|
|
|
38
38
|
"url": "https://github.com/ioBroker/ioBroker.js-controller/packages/adapter"
|
|
39
39
|
},
|
|
40
40
|
"scripts": {
|
|
41
|
-
"build": "tsc -b tsconfig.build.json
|
|
42
|
-
"
|
|
41
|
+
"build": "tsc -b tsconfig.build.json",
|
|
42
|
+
"postbuild": "cpy ./src/cert/ ./build/"
|
|
43
43
|
},
|
|
44
44
|
"main": "build/index.js",
|
|
45
45
|
"types": "build/index.d.ts",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"build/index.js",
|
|
54
54
|
"build/index.d.ts"
|
|
55
55
|
],
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "febfe24ecb050ec02f848cc869d84aa30d69c615"
|
|
57
57
|
}
|
package/build/cert/cloudCert.crt
DELETED
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
-----BEGIN PUBLIC KEY-----
|
|
2
|
-
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp1C0AJ+H6KeRo77undcx
|
|
3
|
-
kyKDn3edWDaTNrxvg4DhlGgCEBAcStoROu+6TKMw5bc/V+U4s7vqfz9vxh4GXtUk
|
|
4
|
-
RwPsx2ggrhp08bUYeO9zA9EMFICD6Klva6FALqCLpwv4e8g1CzeKQqhxzAe7v/Ey
|
|
5
|
-
dMW4foMyugGHGEO6ZCbHyPMdrg0A4NmpSV/TsWduBbjkq03D63ovAzM+u2lAHHrt
|
|
6
|
-
84QShY1ZZoRCHD2F7bRQW906wiVZNfQYKSeTkfc9Ctatuz8JMIq57dlyAF/R6+jC
|
|
7
|
-
UodEZvqO9ZTDRGbX2MWDdedRMAt8hPQxjxugiUheMCCrTbdZ5bxeXqyaTLYuzNyV
|
|
8
|
-
bwIDAQAB
|
|
9
|
-
-----END PUBLIC KEY-----
|