add comapct mode compatibility

-bump gulp version + fix for new gulp version
-rm unnecessary escape char in regex

Author: foxriver76

README.md

@@ -55,6 +55,8 @@ A value smaller than 250 probably will send the command only once.
 After sending the state will be set to 0 again.
 
 ## Changelog
+### 1.2.0 (2018-01-06)
+* (foxriver76) compact mode compatibility added
 
 ### 1.1.5 (2018-12-28)
 * (Pmant) fix hold key (for values > 250ms)

gulpfile.js

@@ -485,4 +485,4 @@ gulp.task('updateReadme', function (done) {
     done();
 });
 
-gulp.task('default', ['updatePackages', 'updateReadme']);
+gulp.task('default', gulp.series('updatePackages', 'updateReadme'));

harmony.js

@@ -11,40 +11,72 @@
 
 const HarmonyHubDiscover = require('@harmonyhub/discover').Explorer;
 const utils = require('@iobroker/adapter-core');
-const adapter = new utils.Adapter('harmony');
 const HarmonyWS = require('harmonyhubws');
 const hubs = {};
+let adapter;
 let discover;
-const FORBIDDEN_CHARS = /[\]\[*,;'"`<>\\? ]/g;
+const FORBIDDEN_CHARS = /[\][*,;'"`<>\\? ]/g;
 const fixId = (id) => id.replace(FORBIDDEN_CHARS, '_');
 let manualDiscoverHubs;
 let subnet;
 let discoverInterval;
 
-adapter.on('stateChange', (id, state) => {
-    if (!id || !state || state.ack) {
-        return;
-    }
-    const hub = id.split('.')[2];
-    if (!hubs[hub]) return;
-    const semaphore = hubs[hub].semaphore;
-    if (semaphore === undefined) {
-        adapter.log.warn('state changed in offline hub');
-        return;
-    }
-    if (semaphore.current > 0) {
-        adapter.log.info('hub busy, stateChange delayed: ' + id + '=' + state.val);
-    }
-    semaphore.take(() => {
-        setBlocked(hub, true);
-        processStateChange(hub, id, state, () => {
-            if (semaphore.current === 1) {
-                setBlocked(hub, false);
-            }
-            semaphore.leave();
+
+function startAdapter(options) {
+    options = options || {};
+    Object.assign(options, {
+        name: 'harmony'
+    });
+    adapter = new utils.Adapter(options);
+
+    adapter.on('stateChange', (id, state) => {
+        if (!id || !state || state.ack) {
+            return;
+        }
+        const hub = id.split('.')[2];
+        if (!hubs[hub]) return;
+        const semaphore = hubs[hub].semaphore;
+        if (semaphore === undefined) {
+            adapter.log.warn('state changed in offline hub');
+            return;
+        }
+        if (semaphore.current > 0) {
+            adapter.log.info('hub busy, stateChange delayed: ' + id + '=' + state.val);
+        }
+        semaphore.take(() => {
+            setBlocked(hub, true);
+            processStateChange(hub, id, state, () => {
+                if (semaphore.current === 1) {
+                    setBlocked(hub, false);
+                }
+                semaphore.leave();
+            });
         });
     });
-});
+
+    // callback has to be called under any circumstances
+    adapter.on('unload', callback => {
+        try {
+            adapter.log.info('[END] Terminating');
+            if (discover) {
+                discover.stop();
+            } // endIf
+            discover = null;
+            for (const hub in Object.keys(hubs)) {
+                clientStop(hub);
+            } // endFor
+            callback();
+        } catch (e) {
+            callback();
+        } // endTryCatch
+    });
+
+    adapter.on('ready', () => {
+        main();
+    });
+
+    return adapter;
+} // endStartAdapter
 
 function processStateChange(hub, id, state, callback) {
     const tmp = id.split('.');
@@ -139,27 +171,6 @@ function switchActivity(hub, activityLabel, value, callback) {
     }
 }
 
-// callback has to be called under any circumstances
-adapter.on('unload', callback => {
-    try {
-        adapter.log.info('[END] Terminating');
-        if (discover) {
-            discover.stop();
-        } // endIf
-        discover = null;
-        for (const hub in Object.keys(hubs)) {
-            clientStop(hub);
-        } // endFor
-        callback();
-    } catch (e) {
-        callback();
-    } // endTryCatch
-});
-
-adapter.on('ready', () => {
-    main();
-});
-
 function main() {
     manualDiscoverHubs = adapter.config.devices || [];
     subnet = adapter.config.subnet || '255.255.255.255';
@@ -574,3 +585,11 @@ function setConnected(hub, bool) {
         adapter.setState(hub + '.hubConnected', {val: bool, ack: true});
     }
 }
+
+// If started as allInOne/compact mode => return function to create instance
+if (module && module.parent) {
+    module.exports = startAdapter;
+} else {
+    // or start the instance directly
+    startAdapter();
+}

io-package.json

@@ -1,7 +1,7 @@
 {
     "common": {
         "name": "harmony",
-        "version": "1.1.5",
+        "version": "1.2.0",
         "title": "Logitech Harmony",
         "desc": {
             "en": "Control your harmony activities from ioBroker",
@@ -12,6 +12,17 @@
             "Pmant <patrickmo@gmx.de>"
         ],
         "news": {
+            "1.2.0": {
+                "en": "compact mode compatibility added",
+                "de": "Kompaktmodus-Kompatibilität hinzugefügt",
+                "ru": "добавлена ​​совместимость с компактным режимом",
+                "pt": "compatibilidade de modo compacto adicionada",
+                "nl": "compatibiliteit met compacte modus toegevoegd",
+                "fr": "Compatibilité en mode compact ajoutée",
+                "it": "aggiunta la compatibilità in modalità compatta",
+                "es": "compatibilidad de modo compacto agregado",
+                "pl": "Dodano kompatybilność w trybie kompaktowym"
+            },
             "1.1.5": {
                 "en": "fix hold key (for values > 250ms)",
                 "de": "fix Taste gedrückt halten (für Werte > 250ms)"
@@ -93,6 +104,7 @@
         "icon": "harmony.png",
         "extIcon": "https://raw.githubusercontent.com/pmant/ioBroker.harmony/master/admin/harmony.png"
     },
+    "compact": true,
     "native": {
         "user": "guest",
         "password": "default",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.harmony",
-    "version": "1.1.5",
+    "version": "1.2.0",
     "engines": {
         "node": ">=6.0.0"
     },
@@ -22,12 +22,12 @@
     },
     "dependencies": {
         "@harmonyhub/discover": "^1.0.5",
-        "@iobroker/adapter-core": "^1.0.1",
+        "@iobroker/adapter-core": "^1.0.3",
         "harmonyhubws": "^1.0.4",
         "semaphore": "~1.0.3"
     },
     "devDependencies": {
-        "gulp": "^3.9.1",
+        "gulp": "^4.0.0",
         "mocha": "^4.1.0",
         "chai": "^4.1.2",
         "eslint": "^5.9.0"