adapt ws scheme

Author: skadefro

OpenFlow/src/WebServer.ts

@@ -87,10 +87,6 @@ export class WebServer {
             }
             server = https.createServer(options, this.app);
 
-
-            var _http = http.createServer(this.app);
-            _http.listen(80);
-
             // var redirapp = express();
             // var _http = http.createServer(redirapp);
             // redirapp.get('*', function (req, res) {

OpenFlow/src/public/WebSocketClient.ts

@@ -168,6 +168,12 @@ module openflow {
         }
         init() {
             this.getJSON("/config", async (error: any, data: any) => {
+                if (location.protocol == 'https:' && data.wshost.startsWith("ws://")) {
+                    data.wshost = data.wshost.replace("ws://", "wss://");
+                }
+                if (location.protocol == 'http:' && data.wshost.startsWith("wss://")) {
+                    data.wshost = data.wshost.replace("wss://", "ws://");
+                }
                 console.debug("WebSocketClient::onopen: connecting to " + data.wshost);
                 this._socketObject = new ReconnectingWebSocket(data.wshost);
                 this._socketObject.onopen = (this.onopen).bind(this);

VERSION

@@ -1 +1 @@
-0.0.163
+0.0.164