From 10e6241c9a61c8665ea1e00a156b452eded89553 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:47:17 -0700
Subject: [PATCH 01/16] [playready] bump to latest

---
 package/playready/playready.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/playready/playready.mk b/package/playready/playready.mk
index ad7d3c947192..0c46794b5067 100644
--- a/package/playready/playready.mk
+++ b/package/playready/playready.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PLAYREADY_VERSION = 5af745dd2a8312a34081150c8b374684799fc1c9
+PLAYREADY_VERSION = 8af363b8b58bfdcbb00e23c858ba95735dbcce52
 PLAYREADY_SITE = git@github.com:Metrological/playready.git
 PLAYREADY_SITE_METHOD = git
 PLAYREADY_LICENSE = PROPRIETARY

From e7386a9fcd1dc1594a2d8ed3f6990628665014e9 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:48:08 -0700
Subject: [PATCH 02/16] [wpebackend-rdk] bump to latest

---
 package/wpe/wpebackend-rdk/wpebackend-rdk.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
index 59af4cdd7435..a24f3248f8a1 100644
--- a/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
+++ b/package/wpe/wpebackend-rdk/wpebackend-rdk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEBACKEND_RDK_VERSION = f5dc977a367ea90bf4871b20ab7fa2db97c7154c
+WPEBACKEND_RDK_VERSION = e3f442523072444c0202b508f3688d9026f9c41f
 WPEBACKEND_RDK_SITE = $(call github,WebPlatformForEmbedded,WPEBackend-rdk,$(WPEBACKEND_RDK_VERSION))
 WPEBACKEND_RDK_INSTALL_STAGING = YES
 WPEBACKEND_RDK_DEPENDENCIES = wpebackend libglib2

From 143757f1e1484d04b759d5465755bdee0865c50c Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:51:08 -0700
Subject: [PATCH 03/16] [OCDM-Clearkey] bump to latest

---
 .../wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk
index 77070b079270..191607cda4b3 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-clearkey/wpeframework-cdmi-clearkey.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = f22037701714e0b6d7f56028f243e2afb1c3fcc6
+WPEFRAMEWORK_CDMI_CLEARKEY_VERSION = 19b428487ada158c32d8e0a99c6cbabc52270a5b
 WPEFRAMEWORK_CDMI_CLEARKEY_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_CLEARKEY_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Clearkey.git
 WPEFRAMEWORK_CDMI_CLEARKEY_INSTALL_STAGING = YES

From 6ccefc22daf6ce8a4ead93b445cbc1dd19e015d1 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:52:16 -0700
Subject: [PATCH 04/16] [OCDM-Playready-Nexus-SVP] bump to latest

---
 .../wpeframework-cdmi-playready-nexus-svp.mk                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus-svp/wpeframework-cdmi-playready-nexus-svp.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus-svp/wpeframework-cdmi-playready-nexus-svp.mk
index 6242929fc504..6ff3471b7ee8 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus-svp/wpeframework-cdmi-playready-nexus-svp.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus-svp/wpeframework-cdmi-playready-nexus-svp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP_VERSION = 60d0c85d403efdca3ea3c163e52469859334c454
+WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP_VERSION = c1527dc17fde659567f9f6cb2bbe77528803826c
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Playready-Nexus-SVP.git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SVP_INSTALL_STAGING = YES

From 1af84de88b891db3286f7641af00e3502ea46dea Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:52:48 -0700
Subject: [PATCH 05/16] [OCDM-Playready-Nexus] bump to latest

---
 .../wpeframework-cdmi-playready-nexus.mk                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus/wpeframework-cdmi-playready-nexus.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus/wpeframework-cdmi-playready-nexus.mk
index aba0bc1a8154..ca0bf1698409 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus/wpeframework-cdmi-playready-nexus.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready-nexus/wpeframework-cdmi-playready-nexus.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 237d0d2a0c1d285e23c1c05a6edfa3ceb9110b84
+WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_VERSION = 1411a2c7630dd9da5d8e8215f5bc6b2874ae4451
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Playready-Nexus.git
 WPEFRAMEWORK_CDMI_PLAYREADY_NEXUS_INSTALL_STAGING = YES

From ec8258b726c2d2a108a7a470646a21d33456734f Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:54:32 -0700
Subject: [PATCH 06/16] [OCDM-Playready] bump to latest

---
 .../wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk
index 29d8a7fe5310..aa8709f29d91 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-playready/wpeframework-cdmi-playready.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 6913d142ce04c77e54fb5f522721af5d3d29eb51 
+WPEFRAMEWORK_CDMI_PLAYREADY_VERSION = 53fad1c3567a2e03c539565a0f40aee93768cf62
 WPEFRAMEWORK_CDMI_PLAYREADY_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_PLAYREADY_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Playready.git
 WPEFRAMEWORK_CDMI_PLAYREADY_INSTALL_STAGING = YES

From edaf00ec87f4b1dee4f0e188e4fc338aa60bf15b Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:56:57 -0700
Subject: [PATCH 07/16] [OCDM-Widevine-Nexus-SVP] bump to latest

---
 .../wpeframework-cdmi-widevine-nexus-svp.mk                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine-nexus-svp/wpeframework-cdmi-widevine-nexus-svp.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine-nexus-svp/wpeframework-cdmi-widevine-nexus-svp.mk
index fc13d252ffbd..b7b03372f099 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine-nexus-svp/wpeframework-cdmi-widevine-nexus-svp.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine-nexus-svp/wpeframework-cdmi-widevine-nexus-svp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_VERSION = 488a0dc406a7a2333c54b3bb59e56ce2b35552a2
+WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_VERSION = b192ac9a9084572584f74f4ac292192bbc6a1b96
 WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Widevine-Nexus-SVP.git
 WPEFRAMEWORK_CDMI_WIDEVINE_NEXUS_SVP_INSTALL_STAGING = NO

From 0a336488407de8881d85c03ca8296ebc24c127a7 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:58:11 -0700
Subject: [PATCH 08/16] [OCDM-Widevine] bump to latest

---
 .../wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk
index 2a9bc383adf9..c97fd009a27b 100644
--- a/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk
+++ b/package/wpe/wpeframework-cdmi/wpeframework-cdmi-widevine/wpeframework-cdmi-widevine.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 18d4e0f203c727b4fc20301f3370a24d0cf8e463
+WPEFRAMEWORK_CDMI_WIDEVINE_VERSION = 864f2b60b6c76826b920ab9c5a00320e6cf11bc5
 WPEFRAMEWORK_CDMI_WIDEVINE_SITE_METHOD = git
 WPEFRAMEWORK_CDMI_WIDEVINE_SITE = git@github.com:WebPlatformForEmbedded/OCDM-Widevine.git
 WPEFRAMEWORK_CDMI_WIDEVINE_INSTALL_STAGING = NO

From 8593e2d1522343e90901a6a907bc7632ab011f26 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 15:59:01 -0700
Subject: [PATCH 09/16] [Launcher] bump to latest

---
 package/wpe/wpeframework-launcher/wpeframework-launcher.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-launcher/wpeframework-launcher.mk b/package/wpe/wpeframework-launcher/wpeframework-launcher.mk
index 8c5bfa6d7906..3848f0e08d89 100644
--- a/package/wpe/wpeframework-launcher/wpeframework-launcher.mk
+++ b/package/wpe/wpeframework-launcher/wpeframework-launcher.mk
@@ -1,4 +1,4 @@
-WPEFRAMEWORK_LAUNCHER_VERSION = 4484c9f5b4be13e0afe0cf7f80a2ba0013be671b
+WPEFRAMEWORK_LAUNCHER_VERSION = 2f425ac9d08aa84927f88ee8f3576e9006b8783b
 WPEFRAMEWORK_LAUNCHER_SITE_METHOD = git
 WPEFRAMEWORK_LAUNCHER_SITE = git@github.com:WebPlatformForEmbedded/WPEPluginLauncher.git
 WPEFRAMEWORK_LAUNCHER_INSTALL_STAGING = YES

From 0985a4cf19b5c8ace5e851d269e23fc8b774e9e6 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:01:05 -0700
Subject: [PATCH 10/16] [wpeframework-netflix] bump to latest

---
 package/wpe/wpeframework-netflix/wpeframework-netflix.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-netflix/wpeframework-netflix.mk b/package/wpe/wpeframework-netflix/wpeframework-netflix.mk
index 0977d816cb70..b57136cc13c6 100644
--- a/package/wpe/wpeframework-netflix/wpeframework-netflix.mk
+++ b/package/wpe/wpeframework-netflix/wpeframework-netflix.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_NETFLIX_VERSION = 1ccd5043b76efb8ddc349411cb66d5c17f7fd54a
+WPEFRAMEWORK_NETFLIX_VERSION = ccdb3fb23961b39c885f3bf0081c2c772abef0a8
 ifeq ($(BR2_PACKAGE_NETFLIX5),y)
 # Netflix 5 has a little different API, use "netflix5" branch for now.
 WPEFRAMEWORK_NETFLIX_CONF_OPTS += -DNETFLIX_VERSION_5=true

From 239e7e34c7591c542eb3671759cbd35d320411ba Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:01:47 -0700
Subject: [PATCH 11/16] [wpeframework-provisioning] bump to latest

---
 .../wpe/wpeframework-provisioning/wpeframework-provisioning.mk  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk b/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk
index 7c01e8aee048..9860ab741a3a 100644
--- a/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk
+++ b/package/wpe/wpeframework-provisioning/wpeframework-provisioning.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PROVISIONING_VERSION = 179700be5fc2bfc21da7d3f720d7a6286677b8ae
+WPEFRAMEWORK_PROVISIONING_VERSION = 37d353979188299a4f99a93a97dbfa8deb1caea0
 WPEFRAMEWORK_PROVISIONING_SITE_METHOD = git
 WPEFRAMEWORK_PROVISIONING_SITE = git@github.com:WebPlatformForEmbedded/WPEPluginProvisioning.git
 WPEFRAMEWORK_PROVISIONING_INSTALL_STAGING = YES

From 9f6be56a689b531d0f1b39922ed23861c2154dce Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:02:14 -0700
Subject: [PATCH 12/16] [wpeframework] bump to latest

---
 package/wpe/wpeframework/wpeframework.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework/wpeframework.mk b/package/wpe/wpeframework/wpeframework.mk
index 3e4c5af6f3ac..831bdf81fd57 100644
--- a/package/wpe/wpeframework/wpeframework.mk
+++ b/package/wpe/wpeframework/wpeframework.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_VERSION = aed13867c93fe76dc29d32abe4237559cc19b62c
+WPEFRAMEWORK_VERSION = 0279d80414469aec973511c1c299a49c3e4a2050
 WPEFRAMEWORK_SITE = $(call github,WebPlatformForEmbedded,WPEFramework,$(WPEFRAMEWORK_VERSION))
 WPEFRAMEWORK_INSTALL_STAGING = YES
 WPEFRAMEWORK_DEPENDENCIES = zlib $(call qstrip,$(BR2_PACKAGE_SDK_INSTALL)) host-python host-python-jsonref

From 0732affcae4746017a57a606b3047f48d151f030 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:02:29 -0700
Subject: [PATCH 13/16] [wpeframework-plugins] bump to latest

---
 package/wpe/wpeframework-plugins/wpeframework-plugins.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpeframework-plugins/wpeframework-plugins.mk b/package/wpe/wpeframework-plugins/wpeframework-plugins.mk
index a5d95d61b300..51d76ac6c0ec 100644
--- a/package/wpe/wpeframework-plugins/wpeframework-plugins.mk
+++ b/package/wpe/wpeframework-plugins/wpeframework-plugins.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_PLUGINS_VERSION = 8b70bd116e65f8824f060e0e26a4b1cfe65e27cd
+WPEFRAMEWORK_PLUGINS_VERSION = 62c8ab52bc657d72fb409f8af5d3647c96b2db17
 WPEFRAMEWORK_PLUGINS_SITE = $(call github,WebPlatformForEmbedded,WPEFrameworkPlugins,$(WPEFRAMEWORK_PLUGINS_VERSION))
 WPEFRAMEWORK_PLUGINS_INSTALL_STAGING = YES
 WPEFRAMEWORK_PLUGINS_DEPENDENCIES = wpeframework libpng

From 758b6424712b9f7f9458f9f23c86dc94465b48c3 Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:03:50 -0700
Subject: [PATCH 14/16] [wpeframework-ui] bump to latest and fix install

---
 package/wpe/wpeframework-ui/wpeframework-ui.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/wpe/wpeframework-ui/wpeframework-ui.mk b/package/wpe/wpeframework-ui/wpeframework-ui.mk
index 3de68a9ab539..114fdb8968b9 100644
--- a/package/wpe/wpeframework-ui/wpeframework-ui.mk
+++ b/package/wpe/wpeframework-ui/wpeframework-ui.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WPEFRAMEWORK_UI_VERSION = ef53dcfa8d9dd4bf0894caf1367ab6fe2c2a48ee 
+WPEFRAMEWORK_UI_VERSION = 77dcf3983257de8931c9f6e24b7d287d82cac282
 WPEFRAMEWORK_UI_SITE = $(call github,WebPlatformForEmbedded,WPEFrameworkUI,$(WPEFRAMEWORK_UI_VERSION))
 WPEFRAMEWORK_UI_DEPENDENCIES = wpeframework wpeframework-plugins
 
@@ -17,7 +17,7 @@ WPEFRAMEWORK_UI_BUILD_CMDS = true
 define WPEFRAMEWORK_UI_INSTALL_TARGET_CMDS
 	rm -rf $(TARGET_DIR)/usr/share/WPEFramework/Controller/UI
 	mkdir -p $(TARGET_DIR)/usr/share/WPEFramework/Controller/UI
-	cp -r $(@D)/build/* $(TARGET_DIR)/usr/share/WPEFramework/Controller/UI
+	cp -r $(@D)/dist/* $(TARGET_DIR)/usr/share/WPEFramework/Controller/UI
 endef
 
 $(eval $(generic-package))

From 732c14107c9710bff28c23dd07e1b77ddf734a3a Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:05:10 -0700
Subject: [PATCH 15/16] [wpewebkit] bump to latest 2.22

---
 package/wpe/wpewebkit/wpewebkit.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpe/wpewebkit/wpewebkit.mk b/package/wpe/wpewebkit/wpewebkit.mk
index aa62a495912d..fb4db965eda1 100644
--- a/package/wpe/wpewebkit/wpewebkit.mk
+++ b/package/wpe/wpewebkit/wpewebkit.mk
@@ -8,7 +8,7 @@
 ifeq ($(BR2_PACKAGE_WPEWEBKIT_BUILD_DEVELOPMENT_VERSION),y)
 WPEWEBKIT_VERSION_VALUE = 349ee3d5b58d3a8b15b15e92259c3383cbaa38c4 # wpe-2.22
 else
-WPEWEBKIT_VERSION_VALUE = 349ee3d5b58d3a8b15b15e92259c3383cbaa38c4 # wpe-2.22
+WPEWEBKIT_VERSION_VALUE = 43baf562c54c68545ce33d90e161c336583271e3 # wpe-2.22
 endif
 
 WPEWEBKIT_VERSION = $(WPEWEBKIT_VERSION_VALUE)

From d25a8ba283b09b32519b454964f247dfa7a7901d Mon Sep 17 00:00:00 2001
From: wouterlucas <wouter@wouterlucas.com>
Date: Mon, 23 Sep 2019 16:06:05 -0700
Subject: [PATCH 16/16] [index] switch index.html to jsonrpc

---
 board/raspberrypi/index.html | 206 +++++++++++++++++------------------
 1 file changed, 97 insertions(+), 109 deletions(-)

diff --git a/board/raspberrypi/index.html b/board/raspberrypi/index.html
index 1846c4810140..24ede98a8a38 100644
--- a/board/raspberrypi/index.html
+++ b/board/raspberrypi/index.html
@@ -113,25 +113,44 @@
 <div id="logo" class="animate"><div></div><div></div><div></div><div></div><div></div><div></div></div>
 <div id="status">Hello</div>
 <div id="interfaces"></div>
+<script>
+var ThunderJS=function(){"use strict";function l(e){return(l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function n(n,e){var t=Object.keys(n);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(n);e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(n,e).enumerable})),t.push.apply(t,o)}return t}var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},t=null;"undefined"!=typeof WebSocket?t=WebSocket:"undefined"!=typeof MozWebSocket?t=MozWebSocket:void 0!==e?t=e.WebSocket||e.MozWebSocket:"undefined"!=typeof window?t=window.WebSocket||window.MozWebSocket:"undefined"!=typeof self&&(t=self.WebSocket||self.MozWebSocket);function f(t){return new Promise(function(e,n){if(i)e(i);else try{c||((c=new r(function(e){return[e&&e.protocol||"ws://",e&&e.host||"localhost",":"+(e&&e.port||80),e&&e.endpoint||"/jsonrpc"].join("")}(t),"notification")).addEventListener("message",function(e){!function(e){if("string"==typeof e&&(e=JSON.parse(e.normalize().replace(/\\x([0-9A-Fa-f]{2})/g,""))),e.id){var n=a[e.id];n?("result"in e?n.resolve(e.result):n.reject(e.error),delete a[e.id]):console.log("no pending request found with id "+e.id)}}(e.data)}),c.addEventListener("message",function(e){!function(n){if("string"==typeof n&&(n=JSON.parse(n.normalize().replace(/\\x([0-9A-Fa-f]{2})/g,""))),!n.id&&n.method){var e=u[n.method];e&&Array.isArray(e)&&e.length?e.forEach(function(e){e(n.params)}):console.log("no callbacks for "+n.method)}}(e.data)})),c.addEventListener("open",function(){e(i=c)})}catch(e){n(e)}})}function o(s){return{request:function(i,c,u){return new Promise(function(e,n){var t=p+=1,o=function(e,n,t){var o;return(o=t&&t.version)?o:e&&(e[n]||e.default)||1}(s.versions,i,u),r=function(e,n,t,o,r){o&&delete o.version;var i={jsonrpc:"2.0",id:e,method:[n,r,t].join(".")};return!o&&!1!==o||"object"===l(o)&&0===Object.keys(o).length||(i.params=o),i}(t,i,c,u,o);s.debug&&(console.log(" "),console.log("API REQUEST:"),console.log(JSON.stringify(r,null,2)),console.log(" ")),a[t]={body:r,resolve:e,reject:n},function(e,n){f(e).then(function(e){e.send(JSON.stringify(n))}).catch(console.error)}(s,r)})}}}var r=t,a={},u={},i=null,c=null,p=0,s={DeviceInfo:{freeRam:function(e){return this.call("systeminfo",e).then(function(e){return e.freeram})},version:function(e){return this.call("systeminfo",e).then(function(e){return e.version})}}};function d(n,t,e){var o=this,r=function(e,n,t){var o=y(e,n);if(!u[o]){u[o]=[];var r="register";var i=o.split(".").slice(0,-1).join(".");var c={event:n,id:i};this.api.request(e,r,c).then().catch()}return u[o].push(t),u[o].length-1}.call(this,n,t,e);return{dispose:function(){var e=y(n,t);u[e].splice(r,1),0===u[e].length&&function(e,n){var t=y(e,n);delete u[t];var o="unregister",r=t.split(".").slice(0,-1).join("."),i={event:n,id:r};this.api.request(e,o,i)}.call(o,n,t)}}}function y(e,n){return["client",e,"events",n].join(".")}var h,g=function t(e){return{options:e,plugin:!1,call:function(){var e=Array.prototype.slice.call(arguments);this.plugin&&e[0]!==this.plugin&&e.unshift(this.plugin);var n=e[0],t=e[1];return"function"==typeof this[n][t]?this[n][t](e[2]):this.api.request.apply(this,e)},registerPlugin:function(e,n){this[e]=b(Object.assign(Object.create(t),n,{plugin:e}))},subscribe:function(){},on:function(){var e=Array.prototype.slice.call(arguments);return this.plugin&&e[0]!==this.plugin&&e.unshift(this.plugin),d.apply(this,e)},once:function(){console.log("todo ...")}}},b=function e(n){return new Proxy(n,{get:function(o,r){var i=o[r];return"api"===r?h:void 0!==i?"function"==typeof i?-1<["on","once","subscribe"].indexOf(r)?function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];return i.apply(this,n)}:function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];return function(t,e){"object"===l(t)&&("object"!==l(t)||t.then&&"function"==typeof t.then)||(t=new Promise(function(e,n){t instanceof Error==!1?e(t):n(t)}));var n="function"==typeof e[e.length-1]?e[e.length-1]:null;if(!n)return t;t.then(function(e){return n(null,e)}).catch(function(e){return n(e)})}(i.apply(this,n),n)}:"object"===l(i)?e(Object.assign(Object.create(g(o.options)),i,{plugin:r})):i:!1===o.plugin?e(Object.assign(Object.create(g(o.options)),{},{plugin:r})):function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];return n.unshift(r),o.call.apply(this,n)}}})};return function(e){return h=o(e),b(function(r){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?n(i,!0).forEach(function(e){var n,t,o;n=r,o=i[t=e],t in n?Object.defineProperty(n,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):n[t]=o}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(i)):n(i).forEach(function(e){Object.defineProperty(r,e,Object.getOwnPropertyDescriptor(i,e))})}return r}({},g(e),{},s))}}();
+</script>
 <script type="text/javascript">
-    (function (host, lan, wlan) {
-        var logoEl = document.getElementById('logo'),
+    (function (host) {
+        const logoEl = document.getElementById('logo'),
             statusEl = document.getElementById('status'),
             interfacesEl = document.getElementById('interfaces'),
-            deviceId;
+            thunderJS = ThunderJS({host: host})
+        let deviceid
         function delay(t, v) {
            return new Promise((resolve) => {
                setTimeout(resolve.bind(null, v), t)
-           });
+           })
         }
         function log(interfaces) {
             return new Promise((resolve, reject) => {
-                var ip = '';
+                var ip = ''
                 for (var i = 0; i < interfaces.length; i++)
-                    ip += `${interfaces[i].name}: ${interfaces[i].ip}<br/>`;
-                if (ip !== '') interfacesEl.innerHTML = ip;
-                resolve(interfaces);
-            });
+                    ip += `${interfaces[i].name}: ${interfaces[i].ip}<br/>`
+                if (ip !== '') interfacesEl.innerHTML = ip
+                resolve(interfaces)
+            })
+        }
+        function interfaces() {
+            return new Promise((resolve, reject) => {
+                thunderJS.call('DeviceInfo', 'systeminfo').then((systeminfo) => {
+                    deviceId = systeminfo.deviceid ? systeminfo.deviceid : ''
+
+                    thunderJS.call('DeviceInfo', 'addresses').then( (addresses) => {
+                        let result = addresses.filter( a => {
+                            if (a.ip && a.ip.length && a.ip[0] !== '127.0.0.1')
+                                return true
+                        })
+                        resolve(result)
+                    })
+                })
+            })
         }
         function xhr(method, url, body) {
             return new Promise((resolve, reject) => {
@@ -155,122 +174,91 @@
                 http.send(body);
             });
         }
-        function wpe(arr) {
-            return xhr(arr[0], `http://${host}/Service${arr[1]}`, arr[2]);
-        }
-        function interfaces() {
-            return new Promise((resolve, reject) => {
-                wpe(['GET', '/DeviceInfo'])
-                    .then((deviceInfo) => {
-                        var result = [];
-                        if (deviceInfo.systeminfo.deviceid)
-                            deviceId = deviceInfo.systeminfo.deviceid;
-                        if (!deviceInfo.addresses) return resolve(result);
-                        for (var i = 0; i < deviceInfo.addresses.length; i++) {
-                            if (Array.isArray(deviceInfo.addresses[i].ip) && deviceInfo.addresses[i].ip[0] !== '127.0.0.1')
-                                result.push({name: deviceInfo.addresses[i].name, ip: deviceInfo.addresses[i].ip});
-                        }
-                        resolve(result);
-                    });
-            });
-        }
         function configUX() {
             return xhr('GET', '/config.json');
         }
         function loadUX(config) {
             return new Promise((resolve, reject) => {
-                var id = encodeURIComponent(deviceId);
+                var id = encodeURIComponent(deviceId)
                 xhr('GET', `${config.ux}${id}`)
                     .then((result) => {
-                        if (result && result.url)
-                            wpe(['PUT', '/Controller/Activate/UX'])
-                                .then(wpe.bind(null, ['POST', '/UX/URL', `{"url":"${result.url}"}`]))
-                                .then(resolve)
-                                .catch(reject);
-                        else
-                            reject();
+                        if (result && result.url) {
+                            let loadUXListener = thunderJS.on('Controller', 'all', (data) => {
+                                if (data.callsign !== 'UX')
+                                    return;
+
+                                let _data = data.data ? data.data : {};
+
+                                if (_data.state === 'activated')
+                                    thunderjs.call('UX', 'url',  url)
+                                    .then(  thunderjs.call('UX', 'state', 'resumed') )
+
+                                if (_data.url && _data.loaded) {
+                                    delay(5000).then( () => {
+                                        thunderJS.call('Controller', 'deactivate', { callsign: 'WebKitBrowser' } )
+                                    })
+                                    resolve()
+                                }
+                            })
+
+                            thunderJS.call('Controller', 'activate', { callsign : 'UX'})
+                        } else {
+                            reject()
+                        }
                     })
-                    .catch(reject);
+                    .catch(reject)
             });
         }
         return new Promise((resolve, reject) => {
-            var joining = false;
-            var socket = new WebSocket(`ws://${host}/Service/Controller`, 'notification');
-            socket.onmessage = (msg) => {
-                var data;
-                try {
-                    data = msg && msg.data && JSON.parse(msg.data.replace(/\\x00/g, ''));
-                } catch(err) {
-                    // Silently fail
-                    console.error(msg.data, err);
-                    return;
-                }
-                console.log(data);
-                if (data.callsign === 'WifiControl' && data.state === 'activated' && !joining) {
-                    statusEl.innerHTML = 'Scanning WiFi';
-                    delay(1000).then(wpe.bind(null, ['PUT', '/WifiControl/Scan']));
-                }
-                if (data.callsign === 'WifiControl' && data.data && data.data.networks && !joining) {
-                    joining = true;
-                    var networks = {};
-                    for (var i = 0; i < data.data.networks.length; i++) {
-                        var network = data.data.networks[i];
-                        if (network.ssid && !networks[network.ssid])
-                            networks[network.ssid] = network;
-                    }
-                    console.log(networks);
-                }
-                if (data.callsign === 'NetworkControl' && data.data && data.data.interface) {
-                    if (data.data.ip) {
-                        if (data.data.interface === wlan) {
-                            joining = false;
-                        }
+            let subsystemNotificationListener = thunderJS.on('Controller', 'subsystemchange', (data) => {
+                console.log(data)
+
+                data.map( d => {
+                    if (d.subsystem && d.active && d.subsystem === 'Internet')
+                        statusEl.innerHTML = 'We&#39;re connected!';
+
+                    if (d.subsystem && d.active && d.subsystem === 'Network') {
+                        statusEl.innerHTML = 'Waiting for connection'
                         interfaces().then(log);
-                    } else if (data.data.running) {
-                        statusEl.innerHTML = `Acquiring Network (${data.data.interface})`;
-                    } else if (data.data.status === 11) {
-                        // Ignore wlan DHCP failure when not in joining progress
-                        if (data.data.interface === wlan && !joining) return;
-                        delay(2000)
-                            .then(wpe.bind(null, ['PUT', `/NetworkControl/${data.data.interface}/Request`]))
-                            .catch(reject);
                     }
-                }
-                if (data.callsign === 'UX' && data.data && data.data.url && data.data.loaded) {
-                    delay(5000).then(wpe.bind(null, ['PUT', '/Controller/Deactivate/WebKitBrowser']));
-                }
-                if (data.subsystems && data.subsystems.Internet) {
-                    statusEl.innerHTML = 'We&#39;re connected!';
-                }
-                if (data.subsystems && data.subsystems.Time) {
-                    statusEl.innerHTML = 'Internet is up!';
-                    configUX()
-                        .then((config) => {
-                            statusEl.innerHTML = 'Loading UX';
-                            loadUX(config).then(() => {
-                                logoEl.className = '';
-                                statusEl.innerHTML = 'We&#39;re ready!';
+
+                    if (d.subsystem && d.active && d.subsystem === 'Time') {
+                        statusEl.innerHTML = 'Internet is up!';
+                        configUX()
+                            .then((config) => {
+                                statusEl.innerHTML = 'Loading UX';
+                                loadUX(config).then(() => {
+                                    logoEl.className = '';
+                                    statusEl.innerHTML = 'We&#39;re ready!';
+                                })
+                                .catch((err) => {
+                                    statusEl.innerHTML = 'Something went wrong (' + deviceId + ')';
+                                })
                             })
                             .catch((err) => {
-                                statusEl.innerHTML = 'Something went wrong (' + deviceId + ')';
-                            });
-                        })
-                        .catch((err) => {
-                                statusEl.innerHTML = 'We&#39;re ready!';
-                        });
-                }
-            };
-            socket.onopen = () => {
-                interfaces().then(log);
-            };
-            socket.onerror = (err) => {
-                reject(err);
-            };
-            socket.onclose = () => {
-                reject('Connection lost');
-            };
+                                    logoEl.className = '';
+                                    statusEl.innerHTML = 'We&#39;re ready!';
+                            })
+                    }
+                })
+            })
+
+            let networkNotificationListener = thunderJS.on('Controller', 'all', (data) => {
+                if (data.callsign !== 'NetworkControl')
+                    return;
+
+                if (data.data.running)
+                    statusEl.innerHTML = `Acquiring Network (${data.data.interface})`;
+                else if (data.data.status === 11)
+                    delay(2000)
+                        .then( thunderJS.call('NetworkControl', 'request', { device:  data.data.interface} ) )
+                        .catch(reject);
+            })
+
+            //fix me, thunderjs needs a connected event
+            delay(400).then( interfaces().then(log) )
         });
-    }(location.hostname, 'eth0', 'wlan0')).catch(console.error);
+    }(location.hostname)).catch(console.error)
 </script>
 </body>
 </html>