Merge branch 'master' into separate_serial_and_wifi

Former-commit-id: 5efb41e15100cc4d7d4d19d63610790ad236d94c [formerly 287027b6de848d101f1976daa07a8dd5f00ef0cd]
Former-commit-id: d4140d0085f4bab35a3b2ef27672380203c3dea6

Author: matteosuppo

compile_webidebridge.sh

@@ -19,6 +19,7 @@ extractVersionFromMain()
 
 createZipEmbeddableFileArduino()
 {
+    echo 'In createZipEmbeddableFileArduino'
 	GOOS=$1
 	GOARCH=$2
 
@@ -28,9 +29,10 @@ createZipEmbeddableFileArduino()
 	mkdir arduino/arduino
 	cp -r arduino/hardware arduino/tools\_$GOOS\_$GOARCH arduino/boards.json arduino/arduino
 	cp config.ini arduino
+    cp fakecerts/*.pem arduino/
 	mv arduino/arduino/tools* arduino/arduino/tools
 	cd arduino
-	zip -r arduino.zip arduino/* config.ini > /dev/null
+	zip -r arduino.zip arduino/* config.ini *.pem > /dev/null
 	cd ..
 	cat arduino/arduino.zip >> $3
 	zip  --adjust-sfx $3
@@ -41,17 +43,20 @@ createZipEmbeddableFileArduino()
 
 bootstrapPlatforms()
 {
+    echo 'In bootstrapPlatforms'
 	#export PATH=$PATH:/home/martino/osxcross/target/bin
 	cd $GOROOT/src
-	env CC_FOR_TARGET=o64-clang CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./make.bash --no-clean
+	env CC_FOR_TARGET=clang CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./make.bash --no-clean
 	env CC_FOR_TARGET=gcc CGO_ENABLED=1 GOOS=linux GOARCH=amd64 ./make.bash --no-clean
 	env CC_FOR_TARGET=gcc CGO_ENABLED=1 GOOS=linux GOARCH=386 ./make.bash --no-clean
 	env CGO_ENABLED=0 GOOS=linux GOARCH=arm ./make.bash --no-clean
 	env CC_FOR_TARGET=i686-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=386 ./make.bash --no-clean
 }
 
+set -x
 compilePlatform()
 {
+    echo 'In compilePlatform'
 	GOOS=$1
 	GOARCH=$2
 	CC=$3
@@ -61,20 +66,20 @@ compilePlatform()
 	then
 	NAME=$NAME".exe"
 	fi
-	echo -e "${green}=== Compiling for $GOOS, $GOARCH ===${NC}"
-	env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME
+	env GOOS=$GOOS GOARCH=$GOARCH CC=$CC CXX=$CC CGO_ENABLED=$CGO_ENABLED go build -o=$NAME
 	if [ $? != 0 ]
 	then
 	echo -e "${red}Target $GOOS, $GOARCH failed${NC}"
 	exit 1
 	fi
+	echo createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
 	createZipEmbeddableFileArduino $GOOS $GOARCH $NAME
 	GOOS=$GOOS GOARCH=$GOARCH go-selfupdate $NAME $VERSION
 	rm -rf $NAME*
 }
 
 extractVersionFromMain
-compilePlatform darwin amd64 o64-clang 1
+compilePlatform darwin amd64 clang 1
 #compilePlatformLinux linux 386 gcc
 compilePlatform linux amd64 gcc 1
 compilePlatform linux arm 0

fakecerts/cert.pem

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBDCCAewCCQD9LvUUyrKRXzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJV
+UzEUMBIGA1UEChMLQXJkdWlubyBMTEMxCzAJBgNVBAsTAklUMRIwEAYDVQQDEwls
+b2NhbGhvc3QwHhcNMTUwNjExMDcyNTM2WhcNMTYwNjEwMDcyNTM2WjBEMQswCQYD
+VQQGEwJVUzEUMBIGA1UEChMLQXJkdWlubyBMTEMxCzAJBgNVBAsTAklUMRIwEAYD
+VQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
+3UTunwOvcw1hgFDN6bdHxssg/H33faLILjUJIBZwyRCVLc8zcExk7D0YLxnMBaxs
+t4DoPfMlAXiJ+GT3fiOaYTKHmGT3Qz85WC6Yngz9A/usDQSSYe9rI4k3oLNA4F+b
+6VU5FBj1V3nj79gs3IMEkTMnit+9HZ8PNlJEZSzEuxbrQdIV530H8MvHpUoCkinP
+uPur9zGFysIS1euoVybNKmVXcxmy0QHDNfOddH2SBaFD6QriucOIMW6AVHjseL9E
+A4IKKum88LLDiKPeu3gr12vNnjydLFGnNg+wlTnXUeeuXgMfNVaTDaIC8NEA+mSQ
+M6Ag6CymhWqpe/cqa45hAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBABCXfQZLhYI4
+B0VjgwDDRohTAhsSyaQvFEhGOx2Oo28RhKgY2xRtfjDlm7IzTLga4ApsHqIMf85F
+z4bpDDciwPhQDJ6a0ueXJv+xb6RGBnGAbnOiHPfgdd/P2vGfsR7mRaTdXJC4r9PI
+C3kzjwTlplaulLbHs5XIXImGvAvRX5sPmkqlBAQs8PVG4I71pKXo1M4kl7uzr96+
++DKnVz2oACAPCW6zTlT/MlBH4nSeCQfGiE8iWAqODviONOQjFnaTKLw6d1YnbnLp
+1gokB8sk1TAM3qjb6giZpe945xISSNUDAVRW+3NIKag+qOURnN+QGi9ac3cPepXb
+4Kr4QM+kV+g=
+-----END CERTIFICATE-----

fakecerts/key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAu91E7p8Dr3MNYYBQzem3R8bLIPx9932iyC41CSAWcMkQlS3P
+M3BMZOw9GC8ZzAWsbLeA6D3zJQF4ifhk934jmmEyh5hk90M/OVgumJ4M/QP7rA0E
+kmHvayOJN6CzQOBfm+lVORQY9Vd54+/YLNyDBJEzJ4rfvR2fDzZSRGUsxLsW60HS
+Fed9B/DLx6VKApIpz7j7q/cxhcrCEtXrqFcmzSplV3MZstEBwzXznXR9kgWhQ+kK
+4rnDiDFugFR47Hi/RAOCCirpvPCyw4ij3rt4K9drzZ48nSxRpzYPsJU511Hnrl4D
+HzVWkw2iAvDRAPpkkDOgIOgspoVqqXv3KmuOYQIDAQABAoIBADzL4df7W/z2ldj8
+5qmMvkSbP/d/3uAuJ3TzBzTZzolXeGdeuNRjvkVW8nqWG5ocJ+3TAQOnsL1EGZdE
+7J/vkWQPmoOpPNuMRrSvJf08AOYM2PCYEeexjAK3MFvxRLF1K1vQikT7jQww8ABl
+CSeTgU8EEnL0jW2tXWFV6g+6Ul+jwfq5IvbUpMsMOPuUEQy85rm04bCw/vUnhZXk
+gFSpAp5mKPI6J/v2fkJTjgxi0wURxHKFdH/dFr69k9G7Vv9L8meiZYwA0QsYcmeJ
+EAGpZHQXpTCmmmzWM85vz9vg4qUBwF8ypXcWjuqfjAopXvuenyIkfa9paDriRnNM
+A3JmUQECgYEA66fdY8cU1cJw5jmhc10mi6lDz0Xswba4kaYnb2fwr7tlkBFzYYVn
+GY6f2fNxdx8ZpOCYzembJ67qCXODw4LLle1slgHzOWHQ4RJd2EDw/i9woPHGsT3a
+TIk0tX3wOjtJJEXNzQEiqcDqGqrpY3pnm4lFGR4RSE6vIYfPwyO9y7ECgYEAzBUv
+hKy19GSFK8tkYa/WcmNMCGwLJB0pEMuT3heDjSEKYNaTh8YcIpeEY3aCWbMKxWdu
+O5TIouyNJHtm4Q0umG08ZGekLTZy22it2UJabROvHVHeSnPki9a12Uc3KgB6mBzb
+nnHXQ8hR60o0GTPMudVW12aZh9gy+EcGWQEwibECgYAIdQ3M9ugYg9HpcUgKC93G
+RVzZo3jLuvMExyHDLcfFhsQuV3H8nf0FPcke2U3JKKSS9jyFp0yaL/zWOf8QlTEZ
+QFwVRhykgo4shaw4hpwfgzRXklW/Jqke9g2eNdbZQCdv1dF8+f10eifsrRWTLGFr
+g5GnRRz5q1k9qtIZ/r5hAQKBgCegMXLMaiQC5IylWF9TWgsp1piICf3AH7ogHRzx
+adycPrygzVJ+l/Xrf4wkdZjfF8dOluvArthbn+gmgcpO2e5Ev4YrTYht2w1ZHPBj
+XtVxDf5eaBACwqyYSwTePArOvv8ME2SHbCnAGo/Z/5WpJiYrE0qNpF/pDbSBbe0Y
+OwlxAoGAdPEjpeeCpyUcoJMVnIxM7AtsOqomd0lBrRgRq05FYvGMAygoKzz+OBp+
+VgptcGJp+6t5MY9R3asRaFp3rOcXvX5R4wBMfijlzoezMEFZN/+xpm7LN2E0domO
+xyku5Kcn9G/KTxCduepOtjqoNYkKYAcrdkmRfZ9C9xvuB2lKjk8=
+-----END RSA PRIVATE KEY-----

main.go

@@ -27,6 +27,7 @@ var (
 	version      = "1.83"
 	versionFloat = float32(1.83)
 	addr         = flag.String("addr", ":8989", "http service address")
+	addrSSL      = flag.String("addrSSL", ":8990", "https service address")
 	//assets       = flag.String("assets", defaultAssetPath(), "path to assets")
 	verbose = flag.Bool("v", true, "show debug logging")
 	//verbose = flag.Bool("v", false, "show debug logging")
@@ -165,19 +166,6 @@ func main() {
 
 		log.Println("The Serial Port JSON Server is now running.")
 		log.Println("If you are using ChiliPeppr, you may go back to it and connect to this server.")
-	// launch the hub routine which is the singleton for the websocket server
-	go h.run()
-	// launch our serial port routine
-	go sh.run()
-	// launch our dummy data routine
-	//go d.run()
-
-	http.HandleFunc("/", homeHandler)
-	http.HandleFunc("/ws", wsHandler)
-	if err := http.ListenAndServe(*addr, nil); err != nil {
-		fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
-		log.Fatal("Error ListenAndServe:", err)
-	}
 
 		// see if they provided a regex filter
 		if len(*regExpFilter) > 0 {
@@ -215,11 +203,17 @@ func main() {
 			http.HandleFunc("/", homeHandler)
 			http.HandleFunc("/ws", wsHandler)
 			http.HandleFunc("/upload", uploadHandler)
-			if err := http.ListenAndServe(*addr, nil); err != nil {
+
+			if err := http.ListenAndServeTLS(*addrSSL, filepath.Join(dest, "cert.pem"), filepath.Join(dest, "key.pem"), nil); err != nil {
 				fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
 				log.Fatal("Error ListenAndServe:", err)
 			}
 		}()
+
+		if err := http.ListenAndServe(*addr, nil); err != nil {
+			fmt.Printf("Error trying to bind to port: %v, so exiting...", err)
+			log.Fatal("Error ListenAndServe:", err)
+		}
 	}()
 	setupSysTray()
 }
@@ -307,7 +301,11 @@ const homeTemplateHtml = `<!DOCTYPE html>
     });
 
     if (window["WebSocket"]) {
-        conn = new WebSocket("ws://{{$}}/ws");
+    	if (window.location.protocol === 'https:') {
+    		conn = new WebSocket("wss://{{$}}/ws");
+    	} else {
+    		conn = new WebSocket("ws://{{$}}/ws");
+    	}
         conn.onclose = function(evt) {
             appendLog($("<div><b>Connection closed.</b></div>"))
         }