npm - @supraio/client-daemon-js - Versions diffs - 1.0.0-mzscreengeometry.463 → 1.0.0-mzscreengeometry.464 - Mend

@supraio/client-daemon-js 1.0.0-mzscreengeometry.463 → 1.0.0-mzscreengeometry.464

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 (9) hide show

package/daemon.html CHANGED Viewed

@@ -4,6 +4,6 @@
 		<title>Supra daemon</title>
 	</head>
 	<body>
-		<script type="text/javascript" src="daemon.js?v=1.0.0-mzscreengeometry.463"></script>
+		<script type="text/javascript" src="daemon.js?v=1.0.0-mzscreengeometry.464"></script>
 	</body>
 </html>

package/daemon.js CHANGED Viewed

@@ -17206,6 +17206,37 @@
     }
   });
+  // node_modules/@signageos/nacl-decoder/dist/NaClDecoder/geometry.js
+  var require_geometry = __commonJS({
+    "node_modules/@signageos/nacl-decoder/dist/NaClDecoder/geometry.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.normalizeGeometry = normalizeGeometry2;
+      function normalizeGeometry2(geometry) {
+        if (!Number.isFinite(geometry.x) || !Number.isFinite(geometry.y) || !Number.isFinite(geometry.width) || !Number.isFinite(geometry.height)) {
+          throw new RangeError("NaCl module geometry values must be finite.");
+        }
+        var width = Math.floor(geometry.width);
+        var height = Math.floor(geometry.height);
+        if (width <= 0 || height <= 0) {
+          throw new RangeError("NaCl module geometry width and height must be positive.");
+        }
+        return __assign(__assign({}, geometry), { width, height });
+      }
+    }
+  });
   // node_modules/@signageos/nacl-decoder/dist/NaClDecoder/module.js
   var require_module = __commonJS({
     "node_modules/@signageos/nacl-decoder/dist/NaClDecoder/module.js"(exports) {
@@ -17213,14 +17244,17 @@
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.createNaClModule = createNaClModule;
       exports.removeNaClModule = removeNaClModule;
+      var geometry_1 = require_geometry();
       function handleLoad(event) {
         console.log("nacl load", event);
       }
       function handleCrash(event) {
         console.log("nacl crash", event);
       }
+      var messageListeners = /* @__PURE__ */ new WeakMap();
       function createNaClModule(handleMessage, geometry) {
         var _a, _b, _c, _d;
+        var normalizedGeometry = geometry ? (0, geometry_1.normalizeGeometry)(geometry) : void 0;
         var listenerEl = document.createElement("div");
         listenerEl.setAttribute("id", "listener");
         listenerEl.addEventListener("message", handleMessage, true);
@@ -17230,29 +17264,34 @@
         var baseHref = (_b = (_a = document.getElementsByTagName("base")[0]) === null || _a === void 0 ? void 0 : _a.href) !== null && _b !== void 0 ? _b : location.href;
         var nmpPath = new URL("nacl-decoder.nmf", baseHref).href;
         var naclModuleEl = document.createElement("embed");
-        var width = (_c = geometry === null || geometry === void 0 ? void 0 : geometry.width) !== null && _c !== void 0 ? _c : window.screen.width;
-        var height = (_d = geometry === null || geometry === void 0 ? void 0 : geometry.height) !== null && _d !== void 0 ? _d : window.screen.height;
+        var width = (_c = normalizedGeometry === null || normalizedGeometry === void 0 ? void 0 : normalizedGeometry.width) !== null && _c !== void 0 ? _c : window.screen.width;
+        var height = (_d = normalizedGeometry === null || normalizedGeometry === void 0 ? void 0 : normalizedGeometry.height) !== null && _d !== void 0 ? _d : window.screen.height;
         naclModuleEl.setAttribute("width", "".concat(width));
         naclModuleEl.setAttribute("height", "".concat(height));
-        if (geometry) {
+        if (normalizedGeometry) {
           naclModuleEl.style.position = "absolute";
-          naclModuleEl.style.left = "".concat(geometry.x, "px");
-          naclModuleEl.style.top = "".concat(geometry.y, "px");
+          naclModuleEl.style.left = "".concat(normalizedGeometry.x, "px");
+          naclModuleEl.style.top = "".concat(normalizedGeometry.y, "px");
         }
         naclModuleEl.setAttribute("src", nmpPath);
         naclModuleEl.setAttribute("type", "application/x-nacl");
         naclModuleEl.setAttribute("id", "nacl_module");
         listenerEl.appendChild(naclModuleEl);
+        messageListeners.set(naclModuleEl, handleMessage);
         return naclModuleEl;
       }
       function removeNaClModule(naclModuleEl) {
         var listenerEl = naclModuleEl.parentElement;
         if (listenerEl) {
-          listenerEl.removeEventListener("message", handleLoad, true);
+          var handleMessage = messageListeners.get(naclModuleEl);
+          if (handleMessage) {
+            listenerEl.removeEventListener("message", handleMessage, true);
+          }
           listenerEl.removeEventListener("load", handleLoad, true);
           listenerEl.removeEventListener("crash", handleCrash, true);
           listenerEl.remove();
         }
+        messageListeners.delete(naclModuleEl);
         naclModuleEl.remove();
       }
     }
@@ -17976,14 +18015,17 @@
       var NaClDecoder = (
         /** @class */
         function() {
-          function NaClDecoder2(messageSender, naclModuleEl) {
+          function NaClDecoder2(messageSender, naclModuleEl, onDestroy) {
             this.messageSender = messageSender;
             this.naclModuleEl = naclModuleEl;
+            this.onDestroy = onDestroy;
           }
           NaClDecoder2.prototype.destroy = function() {
             return __awaiter(this, void 0, void 0, function() {
-              return __generator(this, function(_a) {
+              var _a;
+              return __generator(this, function(_b) {
                 (0, module_1.removeNaClModule)(this.naclModuleEl);
+                (_a = this.onDestroy) === null || _a === void 0 ? void 0 : _a.call(this);
                 return [
                   2
                   /*return*/
@@ -18272,6 +18314,25 @@
   var require_dist = __commonJS({
     "node_modules/@signageos/nacl-decoder/dist/index.js"(exports) {
       "use strict";
+      var __extends = exports && exports.__extends || /* @__PURE__ */ function() {
+        var extendStatics = function(d, b) {
+          extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function(d2, b2) {
+            d2.__proto__ = b2;
+          } || function(d2, b2) {
+            for (var p in b2) if (Object.prototype.hasOwnProperty.call(b2, p)) d2[p] = b2[p];
+          };
+          return extendStatics(d, b);
+        };
+        return function(d, b) {
+          if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+          extendStatics(d, b);
+          function __() {
+            this.constructor = d;
+          }
+          d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+        };
+      }();
       var __assign = exports && exports.__assign || function() {
         __assign = Object.assign || function(t) {
           for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -18283,6 +18344,102 @@
         };
         return __assign.apply(this, arguments);
       };
+      var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) {
+        function adopt(value) {
+          return value instanceof P ? value : new P(function(resolve) {
+            resolve(value);
+          });
+        }
+        return new (P || (P = Promise))(function(resolve, reject) {
+          function fulfilled(value) {
+            try {
+              step(generator.next(value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function rejected(value) {
+            try {
+              step(generator["throw"](value));
+            } catch (e) {
+              reject(e);
+            }
+          }
+          function step(result) {
+            result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+          }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+        });
+      };
+      var __generator = exports && exports.__generator || function(thisArg, body) {
+        var _ = { label: 0, sent: function() {
+          if (t[0] & 1) throw t[1];
+          return t[1];
+        }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+        return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+          return this;
+        }), g;
+        function verb(n) {
+          return function(v) {
+            return step([n, v]);
+          };
+        }
+        function step(op) {
+          if (f) throw new TypeError("Generator is already executing.");
+          while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+              case 0:
+              case 1:
+                t = op;
+                break;
+              case 4:
+                _.label++;
+                return { value: op[1], done: false };
+              case 5:
+                _.label++;
+                y = op[1];
+                op = [0];
+                continue;
+              case 7:
+                op = _.ops.pop();
+                _.trys.pop();
+                continue;
+              default:
+                if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                  _ = 0;
+                  continue;
+                }
+                if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                  _.label = op[1];
+                  break;
+                }
+                if (op[0] === 6 && _.label < t[1]) {
+                  _.label = t[1];
+                  t = op;
+                  break;
+                }
+                if (t && _.label < t[2]) {
+                  _.label = t[2];
+                  _.ops.push(op);
+                  break;
+                }
+                if (t[2]) _.ops.pop();
+                _.trys.pop();
+                continue;
+            }
+            op = body.call(thisArg, _);
+          } catch (e) {
+            op = [6, e];
+            y = 0;
+          } finally {
+            f = t = 0;
+          }
+          if (op[0] & 5) throw op[1];
+          return { value: op[0] ? op[1] : void 0, done: true };
+        }
+      };
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.NaClTCPStreamConnection = exports.NaClTCPStream = exports.NaClTCPPacketConnection = exports.NaClTCPPacket = exports.NaClFrameCollector = exports.VideoProfile = exports.ResultStatus = exports.HWAcceleration = exports.NaClDecoder = void 0;
       exports.isNaClSupported = isNaClSupported3;
@@ -18325,6 +18482,29 @@
       var DEFAULT_OPTIONS = {
         timeoutMs: 1e3
       };
+      var RuntimeOwnedNaClDecoder = (
+        /** @class */
+        function(_super) {
+          __extends(RuntimeOwnedNaClDecoder2, _super);
+          function RuntimeOwnedNaClDecoder2(messageSender, naclModuleEl, releaseRuntime) {
+            var _this = _super.call(this, messageSender, naclModuleEl) || this;
+            _this.releaseRuntime = releaseRuntime;
+            return _this;
+          }
+          RuntimeOwnedNaClDecoder2.prototype.destroy = function() {
+            return __awaiter(this, void 0, void 0, function() {
+              return __generator(this, function(_a) {
+                this.releaseRuntime();
+                return [
+                  2
+                  /*return*/
+                ];
+              });
+            });
+          };
+          return RuntimeOwnedNaClDecoder2;
+        }(naclDecoder_1.NaClDecoder)
+      );
       var naclRuntime = null;
       function isNaClSupported3() {
         return (
@@ -18337,26 +18517,48 @@
         if (!isNaClSupported3()) {
           throw new Error("NaCl is not supported in this browser.");
         }
-        var runtime = getNaClRuntime(requiredOptions.timeoutMs, options === null || options === void 0 ? void 0 : options.geometry);
-        return new naclDecoder_1.NaClDecoder(runtime.messageSender, runtime.naclModuleEl);
+        var _a = acquireNaClRuntime(requiredOptions.timeoutMs, options === null || options === void 0 ? void 0 : options.geometry), runtime = _a.runtime, release = _a.release;
+        return new RuntimeOwnedNaClDecoder(runtime.messageSender, runtime.naclModuleEl, release);
       }
       function createNaClTCP2(options) {
         var decoder = createNaClDecoder2(options);
-        return decoder.createTCP();
+        return __assign(__assign({}, decoder.createTCP()), { destroy: function() {
+          return decoder.destroy();
+        } });
       }
-      function getNaClRuntime(timeoutMs, geometry) {
-        if (naclRuntime) {
-          return naclRuntime;
+      function acquireNaClRuntime(timeoutMs, geometry) {
+        var runtime = naclRuntime;
+        if (!runtime) {
+          var messageListeners = (0, messageListeners_1.createMessageListeners)();
+          var messageReceiver = new messageReceiver_1.MessageReceiver(messageListeners);
+          var naclModuleEl = (0, module_1.createNaClModule)(messageReceiver.handleMessage.bind(messageReceiver), geometry);
+          var messageSender = new messageSender_1.MessageSender(naclModuleEl, messageListeners, timeoutMs);
+          runtime = {
+            messageSender,
+            naclModuleEl,
+            ownerCount: 0
+          };
+          naclRuntime = runtime;
         }
-        var messageListeners = (0, messageListeners_1.createMessageListeners)();
-        var messageReceiver = new messageReceiver_1.MessageReceiver(messageListeners);
-        var naclModuleEl = (0, module_1.createNaClModule)(messageReceiver.handleMessage.bind(messageReceiver), geometry);
-        var messageSender = new messageSender_1.MessageSender(naclModuleEl, messageListeners, timeoutMs);
-        naclRuntime = {
-          messageSender,
-          naclModuleEl
+        runtime.ownerCount += 1;
+        var released = false;
+        return {
+          runtime,
+          release: function() {
+            if (released) {
+              return;
+            }
+            released = true;
+            runtime.ownerCount -= 1;
+            if (runtime.ownerCount > 0) {
+              return;
+            }
+            (0, module_1.removeNaClModule)(runtime.naclModuleEl);
+            if (naclRuntime === runtime) {
+              naclRuntime = null;
+            }
+          }
         };
-        return naclRuntime;
       }
     }
   });
@@ -18383,6 +18585,36 @@
     }
   });
+  // node_modules/@signageos/samsung-wasm-decoder/dist/WasmDecoder/videoElementGeometry.js
+  var require_videoElementGeometry = __commonJS({
+    "node_modules/@signageos/samsung-wasm-decoder/dist/WasmDecoder/videoElementGeometry.js"(exports) {
+      "use strict";
+      Object.defineProperty(exports, "__esModule", { value: true });
+      exports.normalizeVideoElementGeometry = normalizeVideoElementGeometry;
+      function normalizeDimension(name, value) {
+        var normalizedValue = Math.floor(value);
+        if (!Number.isFinite(value) || normalizedValue <= 0) {
+          throw new RangeError("".concat(name, " must be a finite positive number."));
+        }
+        return normalizedValue;
+      }
+      function normalizeCoordinate(name, value) {
+        if (!Number.isFinite(value)) {
+          throw new RangeError("".concat(name, " must be a finite number."));
+        }
+        return value;
+      }
+      function normalizeVideoElementGeometry(geometry) {
+        return {
+          x: normalizeCoordinate("x", geometry.x),
+          y: normalizeCoordinate("y", geometry.y),
+          width: normalizeDimension("width", geometry.width),
+          height: normalizeDimension("height", geometry.height)
+        };
+      }
+    }
+  });
   // node_modules/@signageos/samsung-wasm-decoder/dist/dom/script.js
   var require_script = __commonJS({
     "node_modules/@signageos/samsung-wasm-decoder/dist/dom/script.js"(exports) {
@@ -19667,6 +19899,7 @@
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.SamsungWasmDecoder = void 0;
       var videoDecoder_1 = require_videoDecoder2();
+      var videoElementGeometry_1 = require_videoElementGeometry();
       var wasmLoader_1 = require_wasmLoader();
       var wasmTCP_1 = require_wasmTCP();
       function detectKeyFrameAnnexB(bytes) {
@@ -19698,19 +19931,24 @@
         return false;
       }
       function ensureVideoElement(videoElementId, geometry) {
-        var _a, _b, _c, _d;
+        var normalizedGeometry = (0, videoElementGeometry_1.normalizeVideoElementGeometry)(geometry !== null && geometry !== void 0 ? geometry : {
+          x: 0,
+          y: 0,
+          width: screen.width,
+          height: screen.height
+        });
         var el = document.getElementById(videoElementId);
         if (!el) {
           el = document.createElement("video");
           el.id = videoElementId;
-          el.style.position = "absolute";
-          el.style.top = "".concat((_a = geometry === null || geometry === void 0 ? void 0 : geometry.y) !== null && _a !== void 0 ? _a : 0, "px");
-          el.style.left = "".concat((_b = geometry === null || geometry === void 0 ? void 0 : geometry.x) !== null && _b !== void 0 ? _b : 0, "px");
-          el.style.width = "".concat((_c = geometry === null || geometry === void 0 ? void 0 : geometry.width) !== null && _c !== void 0 ? _c : 1920, "px");
-          el.style.height = "".concat((_d = geometry === null || geometry === void 0 ? void 0 : geometry.height) !== null && _d !== void 0 ? _d : 1080, "px");
           el.style.backgroundColor = "#000";
           document.body.appendChild(el);
         }
+        el.style.position = "absolute";
+        el.style.top = "".concat(normalizedGeometry.y, "px");
+        el.style.left = "".concat(normalizedGeometry.x, "px");
+        el.style.width = "".concat(normalizedGeometry.width, "px");
+        el.style.height = "".concat(normalizedGeometry.height, "px");
         el.autoplay = true;
         el.muted = true;
         el.playsInline = true;
@@ -20482,7 +20720,7 @@
   }
   // daemon/plain.ts
-  var DAEMON_JS_URL = "supra-client-daemon.js?v=1.0.0-mzscreengeometry.463";
+  var DAEMON_JS_URL = "supra-client-daemon.js?v=1.0.0-mzscreengeometry.464";
   async function startPlainDaemon() {
     await initNaClTCP();
     await initSamsungWasmTCP();
@@ -20495,7 +20733,7 @@
   }
   // daemon/wasm.ts
-  var DAEMON_WASM_URL = "supra-client-daemon.wasm?v=1.0.0-mzscreengeometry.463";
+  var DAEMON_WASM_URL = "supra-client-daemon.wasm?v=1.0.0-mzscreengeometry.464";
   async function startWasmDaemon() {
     await initNaClTCP();
     await initSamsungWasmTCP();