npm - @supraio/client-daemon-js - Versions diffs - 0.0.0-mznacl.298 → 0.0.0-mznacl.302 - Mend

@supraio/client-daemon-js 0.0.0-mznacl.298 → 0.0.0-mznacl.302

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/daemon.html +1 -1
package/daemon.js +62 -28
package/daemon.js.map +2 -2
package/package.json +2 -2
package/screen/nacldecoder.d.ts +2 -2
package/screen.html +1 -1
package/screen.js +63 -29
package/screen.js.map +2 -2
package/sdk.js +65 -31
package/sdk.js.map +2 -2
package/supra-client-daemon.js +90 -75
package/supra-client-daemon.js.map +1 -1
package/supra-client-daemon.wasm +0 -0
package/supra-client-screen.js +300 -244
package/supra-client-screen.js.map +1 -1
package/supra-client-screen.wasm +0 -0

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@supraio/client-daemon-js",
-  "version": "0.0.0-mznacl.298",
+  "version": "0.0.0-mznacl.302",
   "description": "",
   "main": "sdk.js",
   "types": "sdk.d.ts",
@@ -14,7 +14,7 @@
     "lint": "eslint \"**/*.ts\""
   },
   "devDependencies": {
-    "@signageos/nacl-decoder": "^0.0.5",
+    "@signageos/nacl-decoder": "^0.0.6",
     "@types/dropboxjs": "0.0.29",
     "@types/filesystem": "0.0.29",
     "@types/node": "14.14.34",

package/screen/nacldecoder.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
-import { NaClDecoder } from '@signageos/nacl-decoder';
+import { createNaClDecoder } from '@signageos/nacl-decoder';
 declare global {
     interface Window {
         /** Make it global accessible for x264/nacldecoder/nacldecoder.go */
-        naclDecoder?: NaClDecoder;
+        createNaClDecoder?: typeof createNaClDecoder;
     }
 }
 export declare function initNaCLDecoder(): void;

package/screen.html CHANGED Viewed

@@ -5,6 +5,6 @@
 		<link rel="stylesheet" href="screen.css"></link>
 	</head>
 	<body>
-		<script type="text/javascript" src="screen.js?v=0.0.0-mznacl.298"></script>
+		<script type="text/javascript" src="screen.js?v=0.0.0-mznacl.302"></script>
 	</body>
 </html>

package/screen.js CHANGED Viewed

@@ -17045,27 +17045,25 @@
       var MessageSender = (
         /** @class */
         function() {
-          function MessageSender2(naclModuleEl, messageListeners) {
+          function MessageSender2(naclModuleEl, messageListeners, timeoutMs) {
             this.naclModuleEl = naclModuleEl;
             this.messageListeners = messageListeners;
+            this.timeoutMs = timeoutMs;
           }
           MessageSender2.prototype.sendWithoutResult = function(message) {
             this.naclModuleEl.postMessage((0, messageConvertor_1.convertMessageToArrayBuffer)(message));
           };
-          MessageSender2.prototype.sendWithResult = function(message_1, resultMessageType_1) {
-            return __awaiter(this, arguments, void 0, function(message, resultMessageType, timeoutMs) {
+          MessageSender2.prototype.sendWithResult = function(message, resultMessageType) {
+            return __awaiter(this, void 0, void 0, function() {
               var arrayBuffer;
               var _this = this;
-              if (timeoutMs === void 0) {
-                timeoutMs = 500;
-              }
               return __generator(this, function(_a) {
                 arrayBuffer = (0, messageConvertor_1.convertMessageToArrayBuffer)(message);
                 return [2, new Promise(function(resolve, reject) {
                   var timeoutHandler = setTimeout(function() {
                     _this.messageListeners.delete(listener);
                     reject(new Error("Timeout of message ".concat(messages_1.JSToNaClMessageType[message.type])));
-                  }, timeoutMs);
+                  }, _this.timeoutMs);
                   var listener = function(message2) {
                     if (message2.type !== resultMessageType) {
                       return;
@@ -17093,6 +17091,7 @@
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.createNaClModule = createNaClModule;
+      exports.removeNaClModule = removeNaClModule;
       function handleLoad(event) {
         console.log("nacl load", event);
       }
@@ -17118,6 +17117,16 @@
         listenerEl.appendChild(naclModuleEl);
         return naclModuleEl;
       }
+      function removeNaClModule(naclModuleEl) {
+        var listenerEl = naclModuleEl.parentElement;
+        if (listenerEl) {
+          listenerEl.removeEventListener("message", handleLoad, true);
+          listenerEl.removeEventListener("load", handleLoad, true);
+          listenerEl.removeEventListener("crash", handleCrash, true);
+          listenerEl.remove();
+        }
+        naclModuleEl.remove();
+      }
     }
   });
@@ -17250,13 +17259,26 @@
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.NaClDecoder = void 0;
       var messages_1 = require_messages();
-      var NaClDecoder2 = (
+      var module_1 = require_module();
+      var NaClDecoder = (
         /** @class */
         function() {
-          function NaClDecoder3(messageSender) {
+          function NaClDecoder2(messageSender, naclModuleEl) {
             this.messageSender = messageSender;
+            this.naclModuleEl = naclModuleEl;
           }
-          NaClDecoder3.prototype.initialize = function(args) {
+          NaClDecoder2.prototype.destroy = function() {
+            return __awaiter(this, void 0, void 0, function() {
+              return __generator(this, function(_a) {
+                (0, module_1.removeNaClModule)(this.naclModuleEl);
+                return [
+                  2
+                  /*return*/
+                ];
+              });
+            });
+          };
+          NaClDecoder2.prototype.initialize = function(args) {
             return __awaiter(this, void 0, void 0, function() {
               var width, height, message, resultMessage, resultStatus;
               var _a, _b;
@@ -17270,10 +17292,7 @@
                       payload: new Uint8Array(__spreadArray(__spreadArray([
                         args.profile,
                         args.acceleration
-                      ], __read(new Uint8Array(new Uint32Array([args.minPictureCount]).buffer)), false), __read(new Uint8Array(new Int32Array([
-                        width,
-                        height
-                      ]).buffer)), false)).buffer
+                      ], __read(new Uint8Array(new Uint32Array([args.minPictureCount]).buffer)), false), __read(new Uint8Array(new Int32Array([width, height]).buffer)), false)).buffer
                     };
                     return [4, this.messageSender.sendWithResult(message, messages_1.NaClToJSMessageType.InitializeResult)];
                   case 1:
@@ -17284,7 +17303,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.decodeAndRender = function(data) {
+          NaClDecoder2.prototype.decodeAndRender = function(data) {
             return __awaiter(this, void 0, void 0, function() {
               var message, resultMessage, resultStatus;
               return __generator(this, function(_a) {
@@ -17306,7 +17325,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.decode = function(args) {
+          NaClDecoder2.prototype.decode = function(args) {
             return __awaiter(this, void 0, void 0, function() {
               var message, resultMessage, resultStatus;
               return __generator(this, function(_a) {
@@ -17329,7 +17348,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.getPicture = function() {
+          NaClDecoder2.prototype.getPicture = function() {
             return __awaiter(this, void 0, void 0, function() {
               var message, resultMessage, resultFirstUInt32Array, resultSecondInt32Array, picture;
               return __generator(this, function(_a) {
@@ -17363,7 +17382,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.recyclePicture = function(picture) {
+          NaClDecoder2.prototype.recyclePicture = function(picture) {
             var firstUint32Array = new Uint32Array([
               picture.decodeId,
               picture.textureId,
@@ -17383,7 +17402,7 @@
             };
             this.messageSender.sendWithoutResult(message);
           };
-          NaClDecoder3.prototype.flush = function() {
+          NaClDecoder2.prototype.flush = function() {
             return __awaiter(this, void 0, void 0, function() {
               var message, resultMessage, resultStatus;
               return __generator(this, function(_a) {
@@ -17401,7 +17420,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.reset = function() {
+          NaClDecoder2.prototype.reset = function() {
             return __awaiter(this, void 0, void 0, function() {
               var message, resultMessage, resultStatus;
               return __generator(this, function(_a) {
@@ -17419,7 +17438,7 @@
               });
             });
           };
-          NaClDecoder3.prototype.render = function(picture) {
+          NaClDecoder2.prototype.render = function(picture) {
             return __awaiter(this, void 0, void 0, function() {
               var firstUint32Array, secondInt32Array, message, resultMessage, resultStatus;
               return __generator(this, function(_a) {
@@ -17451,10 +17470,10 @@
               });
             });
           };
-          return NaClDecoder3;
+          return NaClDecoder2;
         }()
       );
-      exports.NaClDecoder = NaClDecoder2;
+      exports.NaClDecoder = NaClDecoder;
     }
   });
@@ -17518,6 +17537,17 @@
   var require_dist = __commonJS({
     "node_modules/@signageos/nacl-decoder/dist/index.js"(exports) {
       "use strict";
+      var __assign = exports && exports.__assign || function() {
+        __assign = Object.assign || function(t) {
+          for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+              t[p] = s[p];
+          }
+          return t;
+        };
+        return __assign.apply(this, arguments);
+      };
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.VideoProfile = exports.ResultStatus = exports.HWAcceleration = exports.NaClDecoder = void 0;
       exports.isNaClSupported = isNaClSupported2;
@@ -17540,21 +17570,25 @@
       Object.defineProperty(exports, "VideoProfile", { enumerable: true, get: function() {
         return videoDecoder_1.VideoProfile;
       } });
+      var DEFAULT_OPTIONS = {
+        timeoutMs: 1e3
+      };
       function isNaClSupported2() {
         return (
           // Keyed by mime type supported in older versions of Chrome that uses NaCl.
           navigator.mimeTypes["application/x-nacl"] !== void 0
         );
       }
-      function createNaClDecoder2() {
+      function createNaClDecoder2(options) {
+        var requiredOptions = __assign(__assign({}, DEFAULT_OPTIONS), options);
         if (!isNaClSupported2()) {
           throw new Error("NaCl is not supported in this browser.");
         }
         var messageListeners = (0, messageListeners_1.createMessageListeners)();
         var messageReceiver = new messageReceiver_1.MessageReceiver(messageListeners);
         var naclModuleEl = (0, module_1.createNaClModule)(messageReceiver.handleMessage.bind(messageReceiver));
-        var messageSender = new messageSender_1.MessageSender(naclModuleEl, messageListeners);
-        return new naclDecoder_1.NaClDecoder(messageSender);
+        var messageSender = new messageSender_1.MessageSender(naclModuleEl, messageListeners, requiredOptions.timeoutMs);
+        return new naclDecoder_1.NaClDecoder(messageSender, naclModuleEl);
       }
     }
   });
@@ -18043,7 +18077,7 @@
   var import_nacl_decoder = __toESM(require_dist());
   function initNaCLDecoder() {
     if ((0, import_nacl_decoder.isNaClSupported)()) {
-      window.naclDecoder = (0, import_nacl_decoder.createNaClDecoder)();
+      window.createNaClDecoder = import_nacl_decoder.createNaClDecoder;
     }
   }
@@ -18090,7 +18124,7 @@
   }
   // screen/plain.ts
-  var SCREEN_JS_URL = "supra-client-screen.js?v=0.0.0-mznacl.298";
+  var SCREEN_JS_URL = "supra-client-screen.js?v=0.0.0-mznacl.302";
   async function startPlainScreen(options) {
     options = options != null ? options : parseQueryOptions();
     initNaCLDecoder();
@@ -18116,7 +18150,7 @@
   }
   // screen/wasm.ts
-  var SCREEN_WASM_URL = "supra-client-screen.wasm?v=0.0.0-mznacl.298";
+  var SCREEN_WASM_URL = "supra-client-screen.wasm?v=0.0.0-mznacl.302";
   async function startWasmScreen(options) {
     options = options != null ? options : parseQueryOptions();
     await initH264Decoder();