@iobroker/js-controller-adapter 4.0.0-alpha.48-20220120-5fd8ef9c → 4.0.0-alpha.49-20220121-e7aa4308
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/index.d.ts +2 -2
- package/build/index.js +9 -1
- package/build/lib/adapter/adapter.d.ts +0 -9
- package/build/lib/adapter/adapter.d.ts.map +1 -1
- package/build/lib/adapter/adapter.js +19 -52
- package/build/lib/adapter/adapter.js.map +1 -1
- package/build/lib/adapter/utils.d.ts +55 -0
- package/build/lib/adapter/utils.d.ts.map +1 -1
- package/build/lib/adapter/utils.js +37 -2
- package/build/lib/adapter/utils.js.map +1 -1
- package/package.json +9 -9
package/build/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
1
|
+
export { default as Adapter } from './lib/adapter/adapter';
|
|
2
|
+
export { Utils } from './lib/adapter/utils';
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
package/build/index.js
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.Utils = exports.Adapter = void 0;
|
|
7
|
+
var adapter_1 = require("./lib/adapter/adapter");
|
|
8
|
+
Object.defineProperty(exports, "Adapter", { enumerable: true, get: function () { return __importDefault(adapter_1).default; } });
|
|
9
|
+
var utils_1 = require("./lib/adapter/utils");
|
|
10
|
+
Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return utils_1.Utils; } });
|
|
3
11
|
//# sourceMappingURL=index.js.map
|
|
@@ -392,15 +392,6 @@ declare class Adapter {
|
|
|
392
392
|
language: any;
|
|
393
393
|
longitude: any;
|
|
394
394
|
latitude: any;
|
|
395
|
-
/**
|
|
396
|
-
* @param {string | {device?: string, channel?: string, state?: string}} id
|
|
397
|
-
* @param {boolean} [isPattern=false]
|
|
398
|
-
*/
|
|
399
|
-
_fixId: (id: string | {
|
|
400
|
-
device?: string | undefined;
|
|
401
|
-
channel?: string | undefined;
|
|
402
|
-
state?: string | undefined;
|
|
403
|
-
}, isPattern?: boolean | undefined) => string;
|
|
404
395
|
/**
|
|
405
396
|
* Creates or overwrites object in objectDB.
|
|
406
397
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/adapter.js"],"names":[],"mappings":";AAuDA;;;;;;;;;GASG;AACH,kCAHW,MAAM,GAAC,MAAM,GACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../src/lib/adapter/adapter.js"],"names":[],"mappings":";AAuDA;;;;;;;;;GASG;AACH,kCAHW,MAAM,GAAC,MAAM,GACZ,MAAM,CAymSjB;;IAjnSD;;;;;;;;;OASG;IACH,qBAHW,MAAM,GAAC,MAAM,EA0mSvB;IAjkSG,0BAA2C;IAM3C,2BAAiB;IACjB,wBAAiB;IACjB,iCAAuB;IACvB,sBAAe;IAEf,iCAAuB;IACvB,uCAA8B;IAC9B,kCAAyB;IAIzB;;;kBAGC;IAiED,+CAAqE;IAY7D,4BAAkB;IAKV,0CAAoB;IAUpC,mIAqBC;IAED;;;;;;;;;OASG;IACH,uGAiEC;IA5DG,gCAAsB;IAgEtB,gBAAqD;IAWrD,UAA8D;IAO1D,YAAmE;IAWvE,8CAA0B;IAgD9B,UAAwB;IACxB,8BAA8C;IAC9C,iCAA0G;IAC1G,qCAAsF;IAEtF,yBAAyB;IACzB,sBAAe;IACf,6BAA6B;IAC7B,0BAAmB;IACnB,+BAA+B;IAC/B,uBAAgB;IAChB,oBAA0B;IAC1B,yDAAyD;IACzD,4BAAyB;IACzB,+BAAmB;IACnB,gCAAoB;IACpB,yDAAyD;IACzD,qBAAsC;IAKtC;;;yBAgBkB,MAAM,KAAK,IAAI;aAhBP;IAE1B;;;;;;;;;;;;;;;;OAgBG;IACH,iBALW,MAAM,8CAEC,MAAM,KAAK,IAAI,uBAkChC;IAED;;OAEG;IACH,kBAA8D;IAE9D;;;;;;;;;;;;;;OAcG;IACH,gCAHW,MAAM,KACJ,OAAO,cAInB;IAED;;;;;;;;;;;;;;;OAeG;IACH,uBAVW,MAAM,MACN,MAAM,oDAEI,OAAO,QAAQ,MAAM,KAAK,IAAI,gCAmDlD;IACD;;OAEG;IACH,wBAA0E;IAE1E;;;;;OAKG;IACH,uBAHW,MAAM,KACL,QAAQ,SAAS,GAAC,MAAM,CAAC,cAkBpC;IAED;;;;;;;;;;;;;;OAcG;IACH,qBAVW,MAAM,MACN,MAAM,6GA+EhB;IAED;;OAEG;IACH,sBAA+D;IAE/D;;;;;;;;;;;;;;;;OAgBG;IACH,oBAVW,MAAM,SACN,MAAM,mDAEG,OAAO,KAAK,IAAI,gCA2DnC;IAED;;OAEG;IACH,qBAAoE;IAEpE,mIAAmI;IAEnI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4FG;IACH,8BArFW,MAAM;;kBAV2B,QAAQ,GAAG,OAAO,GAAG,EAAE,GAAG,OAAO,GAAG,MAAM;uBAAa,MAAM;;0DAoDrF,SAAS,aAAa,KAAK,IAAI,4CA2KlD;IACD;;OAEG;IACH,+BAAwF;IAsBxF;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,wIATiB,MAAM,GAAG,IAAI,0FAAkE,IAAI,uBA0EnG;IACD;;OAEG;IACH,0BAAuE;IAEvE;;;;OAIG;IACH,kCAGC;IAED;;;;;;;;;;OAUG;IACH,2BAHW,OAAO,MAAM,EAAE,GAAG,CAAC,+BAqB7B;IAED;;;;OAIG;IACH,0CAgBC;IAED;;;;;;;;OAQG;IACH,iCALW,MAAM,sBACE,KAAK,GAAG,IAAI,GAAG,SAAS,kCAAsB,IAAI,kBACxD,QAAQ,GAAG,CAAC,cA8BxB;IAED;;;;;;;;;OASG;IACH,qCAJW,MAAM,WACN,GAAG,EAAE,KACH,MAAM,GAAC,IAAI,cAmBvB;IAED;;;;;;OAMG;IACH,oBAFW,MAAM,uBAShB;IAED;;;;;;;;;OASG;IACH,sCAJW,MAAM,WACN,GAAG,EAAE,KACH,MAAM,GAAC,IAAI,cAWvB;IAED;;;;;;OAMG;IACH,qBAFW,MAAM,uBAShB;IAgQW,mBAAqB;IAiBT,gBAAwC;IACxC,kBAA4C;IAC5C,cAAoC;IACpC,eAAsC;IACtC,cAAoC;IAgRxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IACH,gBAZW,MAAM,OACN,MAAM,gHAmHhB;IACD;;OAEG;IACH,oBAA2D;IAE3D;;;;;;;;;;;;;OAaG;IACH,wCATqB,OAAO,MAAM,EAAE,eAAe,CAAC,KAAK,IAAI,kBAqD5D;IACD;;OAEG;IACH,4BAAkF;IAElF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2DG;IACH,mBAXW,MAAM,OACN,MAAM,sGAqMhB;IACD;;OAEG;IACH,uBAAiE;IAEjE;;;;;;;;;;;;;;;;;OAiBG;IACH,uBAXW,MAAM,OACN,MAAM,0FAyEhB;IACD;;OAEG;IACH,2BAAyE;IAEzE;;;;;;;;;;;;;;;;;OAiBG;IACH,0BAXW,MAAM,OACN,MAAM,mGAwKhB;IACD;;OAEG;IACH,8BAA+E;IAE/E;;;;;;;;;;;;;;;OAeG;IACH,gBATW,MAAM,0CAEN,SAAS,iBAAiB,SAwBpC;IACD;;OAEG;IACH,oBAA2D;IAE3D;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACH,wBApBW,MAAM,UACN,MAAM,UACN,MAAM,WACN,MAAM,YACN,SAAS,qBAAqB,SAkExC;IACD;;OAEG;IACH,wBAAmE;IAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IACH,wBAlBW,MAAM,WACN,MAAM,YACN,SAAS,qBAAqB,SA4BxC;IACD;;OAEG;IACH,wBAAmE;IAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6BG;IACH,iBAbW,MAAM,0CAEN,SAAS,eAAe,SAmDlC;IACD;;OAEG;IACH,kBAAkF;IAElF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;IACH,sBArCW,MAAM,QAAM,0CAEZ,SAAS,gBAAgB,kBA8GnC;IACD;;OAEG;IACH,mBAAyD;IAEzD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2CG;IACH,6BAXW,MAAM,QACN,MAAM,SACN,MAAM,GAAC,MAAM,EAAE,0CAEf,SAAS,kBAAkB,SAyGrC;IACD;;OAEG;IACH,4BAA2E;IAE3E;;;;;;;;;;;;;;;;;OAiBG;IACH,wBAXW,MAAM,QACN,MAAM,WACN,MAAM,YACN,SAAS,kBAAkB,SA6BrC;IACD;;OAEG;IACH,4BAA2F;IAE3F;;;;;;;;;;;;;;;OAeG;IACH,uBATW,MAAM,0CAEN,SAAS,iBAAiB,SA0CpC;IACD;;OAEG;IACH,2BAAyE;IAEzE;;;;;;;;;;;;;;;;;;OAkBG;IACH,gBATW,MAAM,uFAahB;IACD;;OAEG;IACH,oBAA2D;IA0B3D;;;;;;;;;;;;;;;OAeG;IACH,uBATW,MAAM,sFAiFhB;IACD;;OAEG;IACH,2BAAyE;IAEzE;;;;;;;;;;;;;OAaG;IACH,4BATW,MAAM,sFAyBhB;IACD;;OAEG;IACH,2BAAyE;IAEzE;;;;;;;;;;;;;OAaG;IACH,8BATW,MAAM,sFAyBhB;IACD;;OAEG;IACH,6BAA6E;IAE7E;;;;;;;;;;;;;OAaG;IACH,mCATW,MAAM,sFAoBhB;IACD;;OAEG;IACH,kCAAuF;IAEvF;;;;;;;;;;;;;OAaG;IACH,qCATW,MAAM,sFAuBhB;IACD;;OAEG;IACH,oCAA2F;IAE3F;;;;;;;;;;;;;;;;;;;OAmBG;IACH,yBAZW,MAAM,OACN,MAAM;YASS,MAAM;OAkD/B;IACD;;OAEG;IACH,6BAA6E;IAE7E;;;;;;;;;;;;;;;;;;;OAmBG;IACH,gCAZW,MAAM,OACN,MAAM;YASS,MAAM;OA4C/B;IACD;;OAEG;IACH,oCAA2F;IAE3F,kEAiBC;IAED,gGAiCC;IACD;;OAEG;IACH,uBAAiE;IAGjE,2HA6CC;IACD;;OAEG;IACH,wBAAmE;IAEnE,0IAuJC;IACD;;OAEG;IACH,sBAA+D;IAE/D;;;;;;;;;;;;;OAaG;IACH,2BATW,MAAM,+FA8ChB;IACD;;OAEG;IACH,uBAAiE;IAEjE,uHAqFC;IACD;;OAEG;IACH,2BAAyE;IAEzE,gHAuEC;IACD;;OAEG;IACH,gCAAmF;IAEnF;;;;;;;;;;;;;OAaG;IACH,8BAVW,MAAM,eACN,MAAM,+FA6EhB;IACD;;OAEG;IACH,wBAAmE;IAEnE,0GAoEC;IACD;;OAEG;IACH,sBAA+D;IAE/D,iDAmCC;IACD;;OAEG;IACH,qBAA6D;IAE7D,uEA4CC;IACD;;OAEG;IACH,wBAAmE;IAEnE,qEAAqC;IACrC,sBAA+C;IAE/C,yFA2EC;IACD;;OAEG;IACH,sBAA+D;IAE/D,uIAgGC;IACD;;OAEG;IACH,yBAAqE;IAErE,gIAyFC;IACD;;OAEG;IACH,8BAA+E;IAE/E;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,sBAVW,MAAM,QACN,MAAM,WACN,MAAM,6BAuBhB;IAED;;OAEG;IACH,oBAA2D;IAE3D;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,sBAVW,MAAM,QACN,MAAM,WACN,MAAM,6BAuBhB;IAED;;OAEG;IACH,oBAA2D;IAE3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAoCG;IACH,oBAlBW,MAAM,QACN,MAAM,WACN,MAAM,YACN,SAAS,eAAe,SA8BlC;IACD;;OAEG;IACH,kBAAuD;IAEvD,uEAeC;IACD;;OAEG;IACH,iBAAqD;IAErD,wEAA0B;IAC1B,kBAAoC;IAEpC,wFAcC;IACD;;OAEG;IACH,iBAAqD;IAErD,yEAcC;IACD;;OAEG;IACH,gBAAmD;IAEnD;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,qBAVW,MAAM,YACN,MAAM,WACN,MAAM,YACN,SAAS,gBAAgB,SAsBnC;IACD;;OAEG;IACH,mBAA+E;IAE/E;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACH,sBAXW,MAAM,YACN,MAAM,QACN,MAAM,sFAwBhB;IACD;;OAEG;IACH,oBAA2D;IAE3D;;;;;;;;;;OAUG;IACH,gBA6BC;IACD;;OAEG;IACH,qBAA6D;IAE7D,8DAwBC;IAED,oEAsIC;IAifO,4BAAqC;IA0B7B,cAAkB;IAsQlC;;;;;;;;;;;;;;;;;;OAkBG;IACH,uBAXW,MAAM,WACN,MAAM,WACN,MAAM,qBACG,GAAG,KAAE,GAAG,+BAgH3B;IArCmB,wBAA0B;IAc1B,eAAmB;IAwBvC;;OAEG;IACH,iBAA4D;IAE5D;;;;;;;;;;;;;;;;;;OAkBG;IACH,uBAXW,GAAG,WACH,MAAM,WACN,MAAM,qBACG,GAAG,KAAE,GAAG,+BA8F3B;IACD;;OAEG;IACH,qBAAoE;IAEpE;;;;;;;OAOG;IACH,8BALW,MAAM,YACN,MAAM,GAAC,IAAI,WACX,MAAM,mBAWhB;IAED,+BAAgE;IA4DhE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,eAxBW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO,6HAqOtC;IACD;;OAEG;IACH,mBAAyD;IAEzD;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,sBAZW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO,2HA8EtC;IACD;;OAEG;IACH,0BAA6F;IAE7F;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH,sBAxBW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO,6HAmQtC;IACD;;OAEG;IACH,0BAAuE;IAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA+BG;IACH,6BAxBW,MAAM,SACN,MAAM,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO,2HAiGtC;IACD;;OAEG;IACH,iCAAqF;IAErF;;;;;;;;;;;;;;;;;;OAkBG;IACH,eAXW,MAAM,WACN,MAAM,YACN,SAAS,gBAAgB,SAanC;IACD;;OAEG;IACH,mBAAyD;IAEzD;;;;;;;;;;;;;;;;;OAiBG;IACH,sBAXW,MAAM,WACN,MAAM,YACN,SAAS,gBAAgB,SA0LnC;IACD;;OAEG;IACH,0BAAuE;IAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAyCG;IACH,gBAyBC;IACD;;OAEG;IACH,qBAA8F;IAE9F;;;;;;;;;;OAUG;IACH,cAHW,MAAM,KACL,MAAM,CAYjB;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eATW,MAAM,sFAmBhB;IACD;;OAEG;IACH,mBAAyD;IAEzD;;;;;;;;;;;OAWG;IACH,sBAJW,MAAM,sFAiChB;IACD;;OAEG;IACH,0BAAuE;IAEvE;;;;;;;;;;;;;;;;;OAiBG;IACH,qBAJW,MAAM,WACN,MAAM,YACN,SAAS,iBAAiB,UASpC;IACD;;OAEG;IACH,oBAA2D;IAE3D,2FAyCC;IAED,oEAyCC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACH,sBA8GC;IACD;;OAEG;IACH,2BAAyE;IAEzE,wEA4EC;IAED,mGAuBC;IAED;;;;;;;;;;;;;OAaG;IACH,kCAJW,MAAM,GAAG,MAAM,EAAE,+FAqN3B;IA/Ge,iCAAmC;IAgHnD;;OAEG;IACH,iCAAqF;IAErF;;;;;;;;;;;;;;;;OAgBG;IACH,oCAJW,MAAM,GAAG,MAAM,EAAE,+FAwH3B;IACD;;OAEG;IACH,mCAAyF;IAEzF;;;;;;;;;;;;;OAaG;IACH,2BAJW,MAAM,sFAwBhB;IACD;;OAEG;IACH,0BAAuE;IAEvE;;;;;;;;;;;;;;;;OAgBG;IACH,6BAJW,MAAM,sFAuBhB;IACD;;OAEG;IACH,4BAA2E;IAE3E;;;;;OAKG;IACH,qBAJW,MAAM,iCAEJ,MAAM,CAQlB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,iCAEJ,MAAM,CAQlB;IAED,4CAQC;IAED,iEAQC;IAED,gDAQC;IAED;;;;;;;;;;;OAWG;IACH,qBANW,MAAM,UACN,MAAM,+FAyGhB;IACD;;;;;;;;;;OAUG;IACH,yBAAqE;IAGrE;;;;;;OAMG;IACH,qBAJW,MAAM,WACN,MAAM,YACN,SAAS,sBAAsB,SAmDzC;IAED;;;;;;OAMG;IACH,yBAAqE;IAErE;;;;;;;;;;OAUG;IACH,qBALW,MAAM,sFAkChB;IAED;;;;;;;;;OASG;IACH,yBAAqE;IAErE;;;;;OAKG;IACH,0BAHgB,MAAM,KACT,MAAM,CAOlB;IAED;;;;;OAKG;IACH,wBAHgB,MAAM,KACT,MAAM,CAOlB;IAoID,8CAgBC;IAiCG,oCAmCC;IAhCW,iBAA2B;IAMvB,iBASS;IAmBzB,+BAEC;IAsGO,cAAwB;IAQxB,YAAkC;IAClC,UAAqC;IACrC,YAAkC;IAO9B,0BAA4B;IAG5B,0BAAqB;IA6B7B,mBAAkC;IA0ClC,SAA+D;IAgB3D,aAKmB;IA2Df,oDAAsB;IAkS1C,6EAAsD;IAGtD;;;;OAIG;IACH,4BAHW,OAAO,KACL,QAAQ,MAAM,EAAE,CAAC,cA4F7B"}
|
|
@@ -31,7 +31,7 @@ const path = require('path');
|
|
|
31
31
|
const controllerVersion = require('@iobroker/js-controller-adapter/package.json').version;
|
|
32
32
|
const { password } = require('@iobroker/js-controller-common');
|
|
33
33
|
const Log = require('./log');
|
|
34
|
-
const Utils = require('./utils');
|
|
34
|
+
const { Utils } = require('./utils');
|
|
35
35
|
const { FORBIDDEN_CHARS } = tools;
|
|
36
36
|
const { DEFAULT_SECRET, ALIAS_STARTS_WITH, SYSTEM_ADMIN_USER, SYSTEM_ADMIN_GROUP, QUALITY_SUBS_INITIAL, SUPPORTED_FEATURES, ERROR_PERMISSION, ACCESS_EVERY_READ, ACCESS_EVERY_WRITE, ACCESS_GROUP_WRITE, ACCESS_GROUP_READ, ACCESS_USER_WRITE, ACCESS_USER_READ } = require('./constants');
|
|
37
37
|
/**
|
|
@@ -1279,7 +1279,7 @@ function Adapter(options) {
|
|
|
1279
1279
|
* Called if states and objects successfully initalized
|
|
1280
1280
|
*/
|
|
1281
1281
|
const prepareInitAdapter = () => {
|
|
1282
|
-
utils = new Utils(adapterObjects, adapterStates, this.namespaceLog, logger);
|
|
1282
|
+
utils = new Utils(adapterObjects, adapterStates, this.namespaceLog, logger, this.namespace, this._namespaceRegExp);
|
|
1283
1283
|
if (options.instance !== undefined) {
|
|
1284
1284
|
initAdapter(options);
|
|
1285
1285
|
}
|
|
@@ -1601,39 +1601,6 @@ function Adapter(options) {
|
|
|
1601
1601
|
}
|
|
1602
1602
|
}
|
|
1603
1603
|
});
|
|
1604
|
-
/**
|
|
1605
|
-
* @param {string | {device?: string, channel?: string, state?: string}} id
|
|
1606
|
-
* @param {boolean} [isPattern=false]
|
|
1607
|
-
*/
|
|
1608
|
-
this._fixId = (id, isPattern /* , type */) => {
|
|
1609
|
-
if (!id) {
|
|
1610
|
-
id = '';
|
|
1611
|
-
}
|
|
1612
|
-
let result = '';
|
|
1613
|
-
// If id is an object
|
|
1614
|
-
if (tools.isObject(id)) {
|
|
1615
|
-
// Add namespace + device + channel
|
|
1616
|
-
result =
|
|
1617
|
-
this.namespace +
|
|
1618
|
-
'.' +
|
|
1619
|
-
(id.device ? id.device + '.' : '') +
|
|
1620
|
-
(id.channel ? id.channel + '.' : '') +
|
|
1621
|
-
(id.state ? id.state : '');
|
|
1622
|
-
}
|
|
1623
|
-
else if (typeof id === 'string') {
|
|
1624
|
-
result = id;
|
|
1625
|
-
// if not instance name itself and also not starts with namespace and "."
|
|
1626
|
-
if (id !== this.namespace && !this._namespaceRegExp.test(id)) {
|
|
1627
|
-
if (!isPattern) {
|
|
1628
|
-
result = this.namespace + (id ? '.' + id : '');
|
|
1629
|
-
}
|
|
1630
|
-
else {
|
|
1631
|
-
result = this.namespace + '.' + (id ? id : '');
|
|
1632
|
-
}
|
|
1633
|
-
}
|
|
1634
|
-
}
|
|
1635
|
-
return result;
|
|
1636
|
-
};
|
|
1637
1604
|
/**
|
|
1638
1605
|
* Helper method for `set[Foreign]Object[NotExists]` that also sets the default value if one is configured
|
|
1639
1606
|
* @param {string} id of the object
|
|
@@ -1779,7 +1746,7 @@ function Adapter(options) {
|
|
|
1779
1746
|
// it is more an unimportant warning as debug
|
|
1780
1747
|
logger.debug(`${this.namespaceLog} setObject ${id} (type=${obj.type}) property common.name missing, using id as name`);
|
|
1781
1748
|
}
|
|
1782
|
-
id =
|
|
1749
|
+
id = utils.fixId(id, false);
|
|
1783
1750
|
if (obj.children || obj.parent) {
|
|
1784
1751
|
logger.warn(`${this.namespaceLog} Do not use parent or children for ${id}`);
|
|
1785
1752
|
}
|
|
@@ -1951,7 +1918,7 @@ function Adapter(options) {
|
|
|
1951
1918
|
catch (err) {
|
|
1952
1919
|
return tools.maybeCallbackWithError(callback, err);
|
|
1953
1920
|
}
|
|
1954
|
-
id =
|
|
1921
|
+
id = utils.fixId(id, false);
|
|
1955
1922
|
const mId = id.replace(FORBIDDEN_CHARS, '_');
|
|
1956
1923
|
if (mId !== id) {
|
|
1957
1924
|
logger.warn(`${this.namespaceLog} Used invalid characters: ${id} changed to ${mId}`);
|
|
@@ -2352,7 +2319,7 @@ function Adapter(options) {
|
|
|
2352
2319
|
catch (err) {
|
|
2353
2320
|
return tools.maybeCallbackWithError(callback, err);
|
|
2354
2321
|
}
|
|
2355
|
-
adapterObjects.getObject(
|
|
2322
|
+
adapterObjects.getObject(utils.fixId(id), options, callback);
|
|
2356
2323
|
};
|
|
2357
2324
|
/**
|
|
2358
2325
|
* Promise-version of Adapter.getObject
|
|
@@ -2908,7 +2875,7 @@ function Adapter(options) {
|
|
|
2908
2875
|
*/
|
|
2909
2876
|
this.delObject = (id, options, callback) => {
|
|
2910
2877
|
// delObject does the same as delForeignObject, but fixes the ID first
|
|
2911
|
-
id =
|
|
2878
|
+
id = utils.fixId(id);
|
|
2912
2879
|
this.delForeignObject(id, options, callback);
|
|
2913
2880
|
};
|
|
2914
2881
|
/**
|
|
@@ -3062,7 +3029,7 @@ function Adapter(options) {
|
|
|
3062
3029
|
adapterObjects.subscribeUser(this.namespace + '.*', options, callback);
|
|
3063
3030
|
}
|
|
3064
3031
|
else {
|
|
3065
|
-
pattern =
|
|
3032
|
+
pattern = utils.fixId(pattern, true);
|
|
3066
3033
|
adapterObjects.subscribeUser(pattern, options, callback);
|
|
3067
3034
|
}
|
|
3068
3035
|
};
|
|
@@ -3097,7 +3064,7 @@ function Adapter(options) {
|
|
|
3097
3064
|
adapterObjects.unsubscribeUser(this.namespace + '.*', options, callback);
|
|
3098
3065
|
}
|
|
3099
3066
|
else {
|
|
3100
|
-
pattern =
|
|
3067
|
+
pattern = utils.fixId(pattern, true);
|
|
3101
3068
|
adapterObjects.unsubscribeUser(pattern, options, callback);
|
|
3102
3069
|
}
|
|
3103
3070
|
};
|
|
@@ -3201,7 +3168,7 @@ function Adapter(options) {
|
|
|
3201
3168
|
catch (err) {
|
|
3202
3169
|
return tools.maybeCallbackWithError(callback, err);
|
|
3203
3170
|
}
|
|
3204
|
-
id =
|
|
3171
|
+
id = utils.fixId(id);
|
|
3205
3172
|
if (obj.children || obj.parent) {
|
|
3206
3173
|
logger.warn(`${this.namespaceLog} Do not use parent or children for ${id}`);
|
|
3207
3174
|
}
|
|
@@ -3440,7 +3407,7 @@ function Adapter(options) {
|
|
|
3440
3407
|
parentChannel = parentChannel.replace(FORBIDDEN_CHARS, '_').replace(/\./g, '_');
|
|
3441
3408
|
}
|
|
3442
3409
|
stateName = stateName.replace(FORBIDDEN_CHARS, '_').replace(/\./g, '_');
|
|
3443
|
-
const id =
|
|
3410
|
+
const id = utils.fixId({ device: parentDevice, channel: parentChannel, state: stateName });
|
|
3444
3411
|
// Check min, max and def values for number
|
|
3445
3412
|
if (common.type !== undefined && common.type === 'number') {
|
|
3446
3413
|
let min = 0;
|
|
@@ -4061,7 +4028,7 @@ function Adapter(options) {
|
|
|
4061
4028
|
stateName = stateName.substring(parentChannel.length + 1);
|
|
4062
4029
|
}
|
|
4063
4030
|
stateName = stateName.replace(FORBIDDEN_CHARS, '_').replace(/\./g, '_');
|
|
4064
|
-
const objId =
|
|
4031
|
+
const objId = utils.fixId({ device: parentDevice, channel: parentChannel, state: stateName });
|
|
4065
4032
|
if (addTo.startsWith('enum.')) {
|
|
4066
4033
|
adapterObjects.getObject(addTo, options, (err, obj) => {
|
|
4067
4034
|
if (err || !obj) {
|
|
@@ -4152,7 +4119,7 @@ function Adapter(options) {
|
|
|
4152
4119
|
stateName = stateName.substring(parentChannel.length + 1);
|
|
4153
4120
|
}
|
|
4154
4121
|
stateName = stateName.replace(FORBIDDEN_CHARS, '_').replace(/\./g, '_');
|
|
4155
|
-
const objId =
|
|
4122
|
+
const objId = utils.fixId({
|
|
4156
4123
|
device: parentDevice,
|
|
4157
4124
|
channel: parentChannel,
|
|
4158
4125
|
state: stateName
|
|
@@ -5763,7 +5730,7 @@ function Adapter(options) {
|
|
|
5763
5730
|
catch (err) {
|
|
5764
5731
|
return tools.maybeCallbackWithError(callback, err);
|
|
5765
5732
|
}
|
|
5766
|
-
id =
|
|
5733
|
+
id = utils.fixId(id, false);
|
|
5767
5734
|
if (tools.isObject(state)) {
|
|
5768
5735
|
// Verify that the passed state object is valid
|
|
5769
5736
|
try {
|
|
@@ -5949,7 +5916,7 @@ function Adapter(options) {
|
|
|
5949
5916
|
catch (err) {
|
|
5950
5917
|
return tools.maybeCallbackWithError(callback, err);
|
|
5951
5918
|
}
|
|
5952
|
-
id =
|
|
5919
|
+
id = utils.fixId(id, false);
|
|
5953
5920
|
if (tools.isObject(state)) {
|
|
5954
5921
|
// Verify that the passed state object is valid
|
|
5955
5922
|
try {
|
|
@@ -6344,7 +6311,7 @@ function Adapter(options) {
|
|
|
6344
6311
|
*/
|
|
6345
6312
|
this.getState = (id, options, callback) => {
|
|
6346
6313
|
// get state does the same as getForeignState but fixes the id first
|
|
6347
|
-
id =
|
|
6314
|
+
id = utils.fixId(id, false);
|
|
6348
6315
|
return this.getForeignState(id, options, callback);
|
|
6349
6316
|
};
|
|
6350
6317
|
/**
|
|
@@ -6622,7 +6589,7 @@ function Adapter(options) {
|
|
|
6622
6589
|
return tools.maybeCallbackWithError(callback, err);
|
|
6623
6590
|
}
|
|
6624
6591
|
// delState does the same as delForeignState, but fixes the ID first
|
|
6625
|
-
id =
|
|
6592
|
+
id = utils.fixId(id);
|
|
6626
6593
|
this.delForeignState(id, options, callback);
|
|
6627
6594
|
};
|
|
6628
6595
|
/**
|
|
@@ -6698,7 +6665,7 @@ function Adapter(options) {
|
|
|
6698
6665
|
callback = options;
|
|
6699
6666
|
options = {};
|
|
6700
6667
|
}
|
|
6701
|
-
pattern =
|
|
6668
|
+
pattern = utils.fixId(pattern, true);
|
|
6702
6669
|
this.getForeignStates(pattern, options, callback);
|
|
6703
6670
|
};
|
|
6704
6671
|
/**
|
|
@@ -7341,7 +7308,7 @@ function Adapter(options) {
|
|
|
7341
7308
|
adapterStates.subscribeUser(this.namespace + '.*', callback);
|
|
7342
7309
|
}
|
|
7343
7310
|
else {
|
|
7344
|
-
pattern =
|
|
7311
|
+
pattern = utils.fixId(pattern, true);
|
|
7345
7312
|
adapterStates.subscribeUser(pattern, callback);
|
|
7346
7313
|
}
|
|
7347
7314
|
};
|
|
@@ -7381,7 +7348,7 @@ function Adapter(options) {
|
|
|
7381
7348
|
adapterStates.unsubscribeUser(this.namespace + '.*', callback);
|
|
7382
7349
|
}
|
|
7383
7350
|
else {
|
|
7384
|
-
pattern =
|
|
7351
|
+
pattern = utils.fixId(pattern, true);
|
|
7385
7352
|
adapterStates.unsubscribeUser(pattern, callback);
|
|
7386
7353
|
}
|
|
7387
7354
|
};
|