Merge pull request #315 from rdkcentral/dev

Bumped version to 4.8.3 and updated the change log

Author: michielvandergeest

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v4.8.3
+
+*19 apr 2022*
+
+- Fixed bug in Router, app not closing when router history unavailable
+- Fixed bug in Router, router data hooks not always being called
+
 ## v4.8.2
 
 *21 mar 2022*

docs/changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v4.8.3
+
+*19 apr 2022*
+
+- Fixed bug in Router, app not closing when router history unavailable
+- Fixed bug in Router, router data hooks not always being called
+
 ## v4.8.2
 
 *21 mar 2022*

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "4.8.2",
+  "version": "4.8.3",
   "license": "Apache-2.0",
   "scripts": {
     "postinstall": "node ./scripts/postinstall.js",

package.json

@@ -346,7 +346,7 @@ const resolveHashChange = request => {
 
 /**
  * Directional step in history
- * @param direction
+ * @param level
  */
 export const step = (level = 0) => {
   if (!level || isNaN(level)) {
@@ -362,7 +362,7 @@ export const step = (level = 0) => {
     if (isFunction(app._handleAppClose)) {
       return app._handleAppClose()
     }
-    return false
+    return app.application.closeApp()
   } else if (history.length) {
     // for now we only support history back
     const route = history.splice(history.length - level, level)[0]

src/Router/index.js

@@ -48,12 +48,18 @@ const execProvider = (request, emitProvided) => {
   const provider = route.provider
   const expires = route.cache ? route.cache * 1000 : 0
   const params = addPersistData(request)
-  return provider.request(request.page, { ...params }).then(() => {
-    request.page[symbols.expires] = Date.now() + expires
-    if (emitProvided) {
-      emit(request.page, 'dataProvided')
-    }
-  })
+  return provider
+    .request(request.page, { ...params })
+    .then(() => {
+      request.page[symbols.expires] = Date.now() + expires
+      if (emitProvided) {
+        emit(request.page, 'dataProvided')
+      }
+    })
+    .catch(e => {
+      request.page[symbols.expires] = Date.now()
+      throw e
+    })
 }
 
 export const addPersistData = ({ page, route, hash, register = new Map() }) => {