Merge remote-tracking branch 'original/master' into bewee/patch-4

Author: bewee

manifest.json

@@ -17,13 +17,15 @@
   "options": {
     "default": {
       "persistPropertyValues": false,
-      "randomizePropertyValues": false
+      "randomizePropertyValues": false,
+      "excludeDefaultThings": false
     },
     "schema": {
       "type": "object",
       "required": [
         "persistPropertyValues",
-        "randomizePropertyValues"
+        "randomizePropertyValues",
+        "excludeDefaultThings"
       ],
       "properties": {
         "persistPropertyValues": {
@@ -34,6 +36,10 @@
           "description": "Whether or not to periodically generate new property values",
           "type": "boolean"
         },
+        "excludeDefaultThings": {
+          "description": "Whether or not to exclude the default virtual things",
+          "type": "boolean"
+        },
         "customThings": {
           "description": "Custom virtual things to create",
           "type": "array",

package.json

@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.14.0"
+    "eslint": "^7.25.0"
   },
   "files": [
     "LICENSE",

virtual-things-adapter.js

@@ -1515,10 +1515,12 @@ class VirtualThingsAdapter extends Adapter {
   }
 
   addAllThings() {
-    for (let i = 0; i < VIRTUAL_THINGS.length; i++) {
-      const id = `virtual-things-${i}`;
-      if (!this.devices[id]) {
-        new VirtualThingsDevice(this, id, VIRTUAL_THINGS[i]);
+    if (!this.config.excludeDefaultThings) {
+      for (let i = 0; i < VIRTUAL_THINGS.length; i++) {
+        const id = `virtual-things-${i}`;
+        if (!this.devices[id]) {
+          new VirtualThingsDevice(this, id, VIRTUAL_THINGS[i]);
+        }
       }
     }
 
@@ -1533,8 +1535,10 @@ class VirtualThingsAdapter extends Adapter {
           continue;
         }
 
-        descr.properties = descr.properties || [];
-        for (const property of descr.properties) {
+        const properties = (descr.properties || []).map((property) => {
+          return Object.assign({}, property);
+        });
+        for (const property of properties) {
           // Clean up properties
           if (!['number', 'integer'].includes(property.type)) {
             delete property.unit;
@@ -1576,7 +1580,7 @@ class VirtualThingsAdapter extends Adapter {
               break;
             case 'string':
               // just in case
-              property.default = `${property.default}`;
+              property.default = `${property.default || ''}`;
               break;
           }
         }
@@ -1602,7 +1606,7 @@ class VirtualThingsAdapter extends Adapter {
           events: [],
         };
 
-        for (const property of descr.properties) {
+        for (const property of properties) {
           const prop = {
             name: property.name,
             value: property.default,