Player: Add 404 handling when requesting data

relates to xibosignageltd/xibo-private#264

modules/calendar.xml

@@ -89,6 +89,17 @@
             <default></default>
         </property>
     </properties>
+    <onDataError><![CDATA[
+    if (typeof httpStatus === 'undefined' || typeof response === 'undefined') {
+        return false;
+    }
+
+    var hasSucceed = response.hasOwnProperty('success') && response.success === true;
+
+    if (!hasSucceed) {
+        return false;
+    }
+]]></onDataError>
     <onParseData><![CDATA[
 // item - element to be parsed
 // properties - object containing the values to be evaluated/used

modules/src/player-bundle.js

@@ -35,7 +35,7 @@ window.Hls = require('hls.js');
 window.transformer = require('../../ui/src/helpers/transformer.js');
 
 // Our own imports
-import '../vendor/xibo-interactive-control.min.js';
+import 'xibo-interactive-control/dist/xibo-interactive-control.min.js';
 import './xibo-calendar-render';
 import './xibo-countdown-render';
 import './xibo-finance-render';

modules/src/player.js

@@ -160,6 +160,21 @@ $(function() {
         }).done(function(data) {
           resolve(data);
         }).fail(function(jqXHR, textStatus, errorThrown) {
+          if (
+              typeof window[`onDataError_${widget.widgetId}`] === 'function'
+          ) {
+            const onDataError = window[
+              `onDataError_${widget.widgetId}`
+            ](jqXHR.status, jqXHR.responseJSON);
+
+            if (onDataError == false) {
+              xiboIC.reportFault({
+                code: '5001',
+                reason: 'No Data',
+              });
+            }
+          }
+
           console.log(jqXHR, textStatus, errorThrown);
         });
       } else {
@@ -192,6 +207,10 @@ $(function() {
       showError,
     } = composeFinalData(widget, data);
 
+    if (dataItems.length === 0 && showError) {
+      xiboIC.expireNow({targetId: widget.widgetId});
+    }
+
     if (showError && data?.message) {
       $target.append(
         '<div class="error-message" role="alert">' +

package.json

@@ -119,6 +119,7 @@
     "select2-bootstrap-theme": "0.1.0-beta.10",
     "serialize-javascript": "^3.1.0",
     "toastr": "~2.1.4",
-    "underscore": "^1.12.1"
+    "underscore": "^1.12.1",
+    "xibo-interactive-control": "git+https://github.com/xibosignage/xibo-interactive-control.git#0f3d5e62b9fc3daa57689047b740399cc28eac19"
   }
 }