Added support for devices since 2016 (experimental)

soef · soef · commit e48490188e40 · 2017-05-09T13:21:28.000+02:00
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@
 [![Build status](https://ci.appveyor.com/api/projects/status/7ggeh5c3b1mcgoe9?svg=true)](https://ci.appveyor.com/project/soef/iobroker-samsung-3vcui)
 [![License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/soef/iobroker.samsung/blob/master/LICENSE)
 
+<!--[![Node](https://img.shields.io/badge/node-%3E=4.4-red.svg?style=flat-square)](https://www.npmjs.com/packages/soef)-->
+
 #### Description
 
 Adapter for Samsung TVs
@@ -26,7 +28,8 @@ npm install iobroker.samsung
 ```
 
 #### Requirements
-Samsung TV before 2014/15
+Samsung TV before 2014<br>
+Support for devices since 2016 (version 0.2.0, experimental)
 
 After installation, you have to confirm the new connection on your TV
 
diff --git a/io-package.json b/io-package.json
@@ -1,7 +1,17 @@
 {
   "common": {
     "name": "samsung",
-    "version": "0.1.1",
+    "version": "0.2.1",
+    "news": {
+      "0.2.1": {
+        "en": "Added isOnOff state",
+        "de": "isOnOff state hinzugefügt."
+      },
+      "0.2.0": {
+        "en": "Added support for devices since 2016 (experimental)",
+        "de": "Unterstützung für Geräte ab 2016 (nicht getestet)"
+      }
+    },
     "title": "Samsung TV Adapter",
     "desc": {
       "en": "Control Samsung TV devices",
diff --git a/keys.js b/keys.js
@@ -22,7 +22,7 @@ var Keys = {
     'KEY_CH_LIST': 'Channel List',
     'KEY_PRECH': 'Previous Channel',
     'KEY_PICTURE_SIZE': 'Picture Size',
-
+    
     'Input': null,
     'KEY_TV': 'TV',
     'KEY_HDMI': 'HDMI',
diff --git a/lib/ping.js b/lib/ping.js
@@ -0,0 +1,143 @@
+"use strict";
+
+//taken from iobroker.discovery
+
+var cp  = require('child_process');
+var p   = require('os').platform().toLowerCase();
+
+var isWin = false;
+var init;
+var xfamily = ['linux', 'sunos', 'unix'];
+//var regex = /=.*[<|=]([0-9]*).*TTL|ttl..*=([0-9\.]*)/;
+var regex = /=.*[<|=]([0-9]*).*?ttl.*?=([0-9\.]*)/im;
+
+
+exports.reset = function () {
+    // if config changed
+    init = null;
+};
+
+function probe (addr, config, callback) {
+    config = config || {};
+    
+    var ls  = null;
+    var log = config.log || console.log;
+    var outstring = '';
+    
+    if (!init) init = function (ip) {
+        
+        var args = [];
+        config = {
+            numeric: config.numeric === undefined ? true : config.numeric,
+            timeout: parseInt (config.timeout === undefined ? 2 : config.timeout, 10),
+            minReply: parseInt (config.minReply === undefined ? 1 : config.minReply, 10),
+            extra: config.extra || []
+        };
+        
+        //var args    = [];
+        
+        if (xfamily.indexOf (p) !== -1) {
+            //linux
+            //args = [];
+            if (config.numeric !== false) args.push ('-n');
+            
+            if (config.timeout !== false) args.push ('-w ' + config.timeout);
+            
+            if (config.minReply !== false) args.push ('-c ' + config.minReply);
+            
+            if (config.extra !== false) args = args.concat (config.extra);
+            
+            args.push (addr);
+            //log('System command: /bin/ping ' + args.join(' '));
+            init = function (ip) {
+                args[args.length-1] = ip;
+                return cp.spawn ('/bin/ping', args);
+            }
+        } else if (p.match (/^win/)) {
+            //windows
+            isWin = true;
+            var _args = [];
+            if (config.minReply !== false) _args.push ('-n ' + config.minReply);
+            
+            if (config.timeout !== false) _args.push ('-w ' + config.timeout * 1/*000*/);
+            
+            if (config.extra !== false) _args = _args.concat (config.extra);
+            
+            _args.push (addr);
+            
+            args = [
+                '/s', // leave quotes as they are
+                '/c', // run and exit
+                // !!! order of c and s is important - c must come last!!!
+                '"', // enforce starting quote
+                process.env.SystemRoot + '\\system32\\ping.exe' // command itself. Notice that you'll have to pass it quoted if it contains spaces
+            ].concat (_args)
+                .concat ('"'); // enforce closing quote
+            
+            //log('System command: ' + (process.env.comspec || 'cmd.exe') + ' ' + allArgs.join(' '));
+            // switch the command to cmd shell instead of the original command
+            init = function (ip) {
+                args[args.length-2] = ip;
+                return cp.spawn (process.env.comspec || 'cmd.exe', args, {windowsVerbatimArguments: true});
+            }
+        } else if (p === 'darwin' || p === 'freebsd') {
+            //mac osx or freebsd
+            //args = [];
+            if (config.numeric !== false) args.push ('-n');
+            
+            if (config.timeout !== false) args.push ('-t ' + config.timeout);
+            
+            if (config.minReply !== false) args.push ('-c ' + config.minReply);
+            
+            if (config.extra !== false) args = args.concat (config.extra);
+            
+            args.push (addr);
+            //log('System command: /sbin/ping ' + args.join(' '));
+            init = function (ip) {
+                args[args.length-1] = ip;
+                return cp.spawn ('/sbin/ping', args);
+            };
+        } else {
+            return callback && callback ('Your platform "' + p + '" is not supported');
+        }
+        return init(addr);
+    };
+    
+    ls = init(addr);
+    
+    ls.on('error', function (e) {
+        callback && callback(new Error('ping.probe: there was an error while executing the ping program. check the path or permissions...'));
+        callback = null;
+    });
+    
+    ls.stdout.on('data', function (data) {
+        outstring += String(data);
+    });
+    
+    ls.on('exit', function (code) {
+        var ms, m; //, result = 1;
+        if ((m = regex.exec(outstring)) && m.length >= 2) {
+            ms = ~~m[1];
+            //result = 0;
+        }
+        
+        // var lines  = outstring.split('\n');
+        // for (var t = 0; t < lines.length; t++) {
+        //     var m = regex.exec(lines[t]) || '';
+        //     if (m !== '') {
+        //         ms = m[1];
+        //         result = 0;
+        //         break;
+        //     }
+        // }
+        
+        if (callback) callback (null, {
+            host:  addr,
+            alive: isWin ? (ms !== undefined) : !code,
+            ms:    ms
+        });
+        callback = null;
+    });
+}
+
+exports.probe = probe;
diff --git a/lib/samsung-2016.js b/lib/samsung-2016.js
@@ -0,0 +1,63 @@
+"use strict";
+
+//***
+// Based on https://github.com/Badisi/samsung-tv-remote
+//
+
+const WebSocket = require('ws');
+const base64Encode = function(string) {
+    return new Buffer(string).toString('base64');
+};
+
+
+function SamsungTvRemote(config) {
+    if( !config.ip ) {
+        throw new Error('TV IP address is required');
+    }
+    config.name = config.name || 'SamsungTvRemote';
+    config.mac = config.mac || '00:00:00:00';
+    config.port = config.port || 8001;
+    config.timeout = config.timeout || 5000;
+    
+    var self = this;
+    this.onError = function (error) {
+        console.log('Eroro Samsung Remote Client: ' + error.code);
+    };
+    
+    this.sendKey = this.send = function(key, callback) {
+        //if(!key) return;
+        
+        const url = 'http://' + config.ip + ':' + config.port + '/api/v2/channels/samsung.remote.control?name=' + base64Encode(config.name);
+        var ws = new WebSocket(url, function (error) {
+            error = error;
+        });
+        ws.on('error', function (error) {
+            self.onError(error);
+        });
+        
+        ws.on('message', function (data, flags) {
+            data = JSON.parse(data);
+            if( data.event === 'ms.channel.connect' ) {
+                
+                if (key) { ws.send(
+                    JSON.stringify({
+                        'method': 'ms.remote.control',
+                        'params': {
+                            'Cmd': 'Click',
+                            'DataOfCmd': key,
+                            'Option': 'false',
+                            'TypeOfRemote': 'SendRemoteKey'
+                        }
+                    }),
+                    callback
+                )} else callback && callback('success');
+                
+                setTimeout( function () {
+                    ws.close();
+                }, 1000);
+            }
+        });
+    }
+}
+    
+module.exports = SamsungTvRemote;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iobroker.samsung",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Samsung Adapter",
   "author": {
     "name": "soef",
@@ -27,7 +27,8 @@
     "url": "https://github.com/soef/iobroker.samsung"
   },
   "dependencies": {
-    "samsung-remote": "^1.2.5"
+    "samsung-remote": "^1.2.5",
+    "ws": "^2.3.1"     
   },
   "devDependencies": {
     "grunt": "^0.4.5",
@@ -46,4 +47,4 @@
   "scripts": {
     "test": "node node_modules/mocha/bin/mocha"
   }
-}
+}
diff --git a/samsung.js b/samsung.js
