@supraio/client-daemon-js 0.0.1 → 1.0.0-mzscreengeometry.449

package/sdk.d.ts

@@ -3,6 +3,7 @@ export { IScreenOptions, IEncodingPreferences } from "./screen/options";
 export { IScreenControl, IClientStats, createScreenControl } from "./screen/control";
 export interface StartOptions {
     forcePlain?: boolean;
+    netInWorker?: boolean;
 }
 export declare function startDaemon(options?: StartOptions): Promise<void>;
 export declare function startScreen(options?: StartOptions & IScreenOptions): Promise<void>;

package/sdk.js

@@ -17226,8 +17226,8 @@ var require_module = __commonJS({
     function handleCrash(event) {
       console.log("nacl crash", event);
     }
-    function createNaClModule(handleMessage) {
-      var _a, _b;
+    function createNaClModule(handleMessage, geometry) {
+      var _a, _b, _c, _d;
       var listenerEl = document.createElement("div");
       listenerEl.setAttribute("id", "listener");
       listenerEl.addEventListener("message", handleMessage, true);
@@ -17237,8 +17237,15 @@ var require_module = __commonJS({
       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");
-      naclModuleEl.setAttribute("width", "".concat(window.screen.width));
-      naclModuleEl.setAttribute("height", "".concat(window.screen.height));
+      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;
+      naclModuleEl.setAttribute("width", "".concat(width));
+      naclModuleEl.setAttribute("height", "".concat(height));
+      if (geometry) {
+        naclModuleEl.style.position = "absolute";
+        naclModuleEl.style.left = "".concat(geometry.x, "px");
+        naclModuleEl.style.top = "".concat(geometry.y, "px");
+      }
       naclModuleEl.setAttribute("src", nmpPath);
       naclModuleEl.setAttribute("type", "application/x-nacl");
       naclModuleEl.setAttribute("id", "nacl_module");
@@ -18337,20 +18344,20 @@ var require_dist = __commonJS({
       if (!isNaClSupported3()) {
         throw new Error("NaCl is not supported in this browser.");
       }
-      var runtime = getNaClRuntime(requiredOptions.timeoutMs);
+      var runtime = getNaClRuntime(requiredOptions.timeoutMs, options === null || options === void 0 ? void 0 : options.geometry);
       return new naclDecoder_1.NaClDecoder(runtime.messageSender, runtime.naclModuleEl);
     }
     function createNaClTCP2(options) {
       var decoder = createNaClDecoder2(options);
       return decoder.createTCP();
     }
-    function getNaClRuntime(timeoutMs) {
+    function getNaClRuntime(timeoutMs, geometry) {
       if (naclRuntime) {
         return naclRuntime;
       }
       var messageListeners = (0, messageListeners_1.createMessageListeners)();
       var messageReceiver = new messageReceiver_1.MessageReceiver(messageListeners);
-      var naclModuleEl = (0, module_1.createNaClModule)(messageReceiver.handleMessage.bind(messageReceiver));
+      var naclModuleEl = (0, module_1.createNaClModule)(messageReceiver.handleMessage.bind(messageReceiver), geometry);
       var messageSender = new messageSender_1.MessageSender(naclModuleEl, messageListeners, timeoutMs);
       naclRuntime = {
         messageSender,
@@ -19697,16 +19704,17 @@ var require_wasmDecoder = __commonJS({
       }
       return false;
     }
-    function ensureVideoElement(videoElementId) {
+    function ensureVideoElement(videoElementId, geometry) {
+      var _a, _b, _c, _d;
       var el = document.getElementById(videoElementId);
       if (!el) {
         el = document.createElement("video");
         el.id = videoElementId;
         el.style.position = "absolute";
-        el.style.top = "0";
-        el.style.left = "0";
-        el.style.width = "1920px";
-        el.style.height = "1080px";
+        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);
       }
@@ -19718,14 +19726,14 @@ var require_wasmDecoder = __commonJS({
     var SamsungWasmDecoder2 = (
       /** @class */
       function() {
-        function SamsungWasmDecoder3(videoElementId) {
+        function SamsungWasmDecoder3(videoElementId, geometry) {
           this.videoElementId = videoElementId;
           this.initialized = false;
           this.destroyed = false;
           this.decoderHandle = 0;
           this.ptsSeconds = 0;
           this.frameDurationSeconds = 0;
-          this.videoElement = ensureVideoElement(videoElementId);
+          this.videoElement = ensureVideoElement(videoElementId, geometry);
         }
         SamsungWasmDecoder3.prototype.destroy = function() {
           return __awaiter(this, void 0, void 0, function() {
@@ -20098,7 +20106,7 @@ var require_dist2 = __commonJS({
               return [4, (0, wasmLoader_1.loadWasmModule)()];
             case 1:
               _a.sent();
-              return [2, new wasmDecoder_1.SamsungWasmDecoder(options.videoElementId)];
+              return [2, new wasmDecoder_1.SamsungWasmDecoder(options.videoElementId, options.geometry)];
           }
         });
       });
@@ -20643,7 +20651,7 @@ async function initSamsungWasmTCP() {
 }
 
 // daemon/plain.ts
-var DAEMON_JS_URL = "supra-client-daemon.js?v=0.0.1";
+var DAEMON_JS_URL = "supra-client-daemon.js?v=1.0.0-mzscreengeometry.449";
 async function startPlainDaemon() {
   await initNaClTCP();
   await initSamsungWasmTCP();
@@ -20656,7 +20664,7 @@ async function startPlainDaemon() {
 }
 
 // daemon/wasm.ts
-var DAEMON_WASM_URL = "supra-client-daemon.wasm?v=0.0.1";
+var DAEMON_WASM_URL = "supra-client-daemon.wasm?v=1.0.0-mzscreengeometry.449";
 async function startWasmDaemon() {
   await initNaClTCP();
   await initSamsungWasmTCP();
@@ -20678,9 +20686,10 @@ function getGoArgv() {
 
 // screen/nacldecoder.ts
 var import_nacl_decoder2 = __toESM(require_dist());
-function initNaCLDecoder() {
+function initNaCLDecoder(options) {
   if ((0, import_nacl_decoder2.isNaClSupported)()) {
-    window.createNaClDecoder = import_nacl_decoder2.createNaClDecoder;
+    const geometry = options == null ? void 0 : options.geometry;
+    window.createNaClDecoder = (decoderOptions) => (0, import_nacl_decoder2.createNaClDecoder)({ geometry, ...decoderOptions });
   }
 }
 
@@ -20693,8 +20702,17 @@ var frames = {};
 var closed = false;
 var GENERAL_HEADER_SIZE = 6;
 var FIRST_HEADER_SIZE = GENERAL_HEADER_SIZE + 9;
-var MAX_PACKET_SIZE = 32768;
-var DATA_PART_SIZE = MAX_PACKET_SIZE - GENERAL_HEADER_SIZE;
+
+function now() {
+	if (
+		typeof performance !== 'undefined' &&
+		typeof performance.timeOrigin === 'number' &&
+		typeof performance.now === 'function'
+	) {
+		return performance.timeOrigin + performance.now();
+	}
+	return Date.now();
+}
 
 function postError(id, error) {
 	self.postMessage({ type: 'error', id: id, error: error && error.message ? error.message : String(error) });
@@ -20714,7 +20732,8 @@ function resolveFrame() {
 		frameType: frame.frameType,
 		timestamp: frame.timestamp,
 		length: frame.length,
-		data: frame.data
+		data: frame.data,
+		firstPacketAt: frame.firstPacketAt
 	}, [frame.data]);
 }
 
@@ -20741,11 +20760,12 @@ function handlePacket(buffer) {
 	var item = frames[frameID];
 	if (!item || seq === 0 || item.total !== total) {
 		item = {
-			buffer: new Uint8Array(total * DATA_PART_SIZE),
+			packets: new Array(total),
 			frameType: 0,
 			timestamp: 0,
 			total: total,
-			received: 0
+			received: 0,
+			firstPacketAt: now()
 		};
 		frames[frameID] = item;
 		if (seq === 0) {
@@ -20759,25 +20779,39 @@ function handlePacket(buffer) {
 		}
 	}
 
-	var dataStartsAt = seq * DATA_PART_SIZE;
-	if (seq > 0) {
-		dataStartsAt -= FIRST_HEADER_SIZE - GENERAL_HEADER_SIZE;
+	if (total === 0 || seq >= total) {
+		delete frames[frameID];
+		return;
 	}
 	var packetData = new Uint8Array(buffer, headerSize);
-	item.buffer.set(packetData, dataStartsAt);
-	item.received++;
+	if (!item.packets[seq]) {
+		item.received++;
+	}
+	item.packets[seq] = packetData;
 
 	if (seq + 1 === total) {
 		delete frames[frameID];
 		if (item.received !== item.total) {
 			return;
 		}
-		var dataEndsAt = dataStartsAt + length - headerSize;
+		var dataLength = 0;
+		var packetIndex;
+		for (packetIndex = 0; packetIndex < item.packets.length; packetIndex++) {
+			dataLength += item.packets[packetIndex].byteLength;
+		}
+		var frameBuffer = new Uint8Array(dataLength);
+		var dataStartsAt = 0;
+		for (packetIndex = 0; packetIndex < item.packets.length; packetIndex++) {
+			var completedPacket = item.packets[packetIndex];
+			frameBuffer.set(completedPacket, dataStartsAt);
+			dataStartsAt += completedPacket.byteLength;
+		}
 		latestFrame = {
 			frameType: item.frameType,
 			timestamp: item.timestamp,
-			length: dataEndsAt,
-			data: item.buffer.buffer
+			length: dataLength,
+			data: frameBuffer.buffer,
+			firstPacketAt: item.firstPacketAt
 		};
 		resolveFrame();
 	}
@@ -20864,7 +20898,8 @@ var createSupraFrameWorkerConnection = (url) => {
         frameType: message.frameType,
         timestamp: message.timestamp,
         length: message.length,
-        data: message.data
+        data: message.data,
+        firstPacketAt: message.firstPacketAt
       });
     }
   };
@@ -20890,8 +20925,9 @@ var createSupraFrameWorkerConnection = (url) => {
     }
   };
 };
-function initWorkerFrameConnection() {
-  if (typeof Worker !== "undefined") {
+function initWorkerFrameConnection(enabled) {
+  delete window.createSupraFrameWorkerConnection;
+  if (enabled && typeof Worker !== "undefined") {
     window.createSupraFrameWorkerConnection = createSupraFrameWorkerConnection;
   }
 }
@@ -20902,7 +20938,8 @@ var import_videoDecoder = __toESM(require_videoDecoder2());
 async function initSamsungWasmDecoder(options) {
   if ((0, import_samsung_wasm_decoder2.isSamsungWasmSupported)()) {
     window.samsungWasmDecoder = await (0, import_samsung_wasm_decoder2.createSamsungWasmDecoder)({
-      videoElementId: "samsung-wasm-video"
+      videoElementId: "samsung-wasm-video",
+      geometry: options.geometry
     });
     const latencyMode = options.interactive ? import_videoDecoder.LatencyMode.UltraLow : import_videoDecoder.LatencyMode.Low;
     await window.samsungWasmDecoder.initialize({ latencyMode });
@@ -20943,7 +20980,8 @@ function parseQueryOptions() {
     clientID: params.clientID,
     clientSecret: params.clientSecret,
     secure: params.secure !== "false",
-    interactive: params.interactive === "true"
+    interactive: params.interactive === "true",
+    netInWorker: params.netInWorker === "true"
   };
   if (typeof params.forceScreenSize === "string") {
     const sizeParts = params.forceScreenSize.split("x");
@@ -20957,6 +20995,17 @@ function parseQueryOptions() {
     }
     options.forceScreenSize = { width, height };
   }
+  if (typeof params.geometry === "string" && params.geometry !== "") {
+    const geometryParts = params.geometry.split(",");
+    if (geometryParts.length !== 4) {
+      throw new Error(`Invalid geometry query param, expected "x,y,width,height"`);
+    }
+    const [x, y, width, height] = geometryParts.map(Number);
+    if ([x, y, width, height].some(isNaN) || width <= 0 || height <= 0) {
+      throw new Error(`Invalid geometry query param`);
+    }
+    options.geometry = { x, y, width, height };
+  }
   const encodingPreferences = {};
   if (params.preferredPreset) {
     encodingPreferences.preferredPreset = params.preferredPreset;
@@ -20991,16 +21040,17 @@ function getGoArgv2(binFile, options) {
     options.clientSecret,
     options.secure ? "1" : "0",
     options.forceScreenSize ? `${options.forceScreenSize.width}x${options.forceScreenSize.height}` : "",
-    encodingPrefsJson
+    encodingPrefsJson,
+    options.geometry ? JSON.stringify(options.geometry) : ""
   ];
 }
 
 // screen/plain.ts
-var SCREEN_JS_URL = "supra-client-screen.js?v=0.0.1";
+var SCREEN_JS_URL = "supra-client-screen.js?v=1.0.0-mzscreengeometry.449";
 async function startPlainScreen(options) {
   options = options != null ? options : parseQueryOptions();
-  initNaCLDecoder();
-  initWorkerFrameConnection();
+  initNaCLDecoder(options);
+  initWorkerFrameConnection(options.netInWorker === true);
   await initNaClTCP();
   await initSamsungWasmTCP();
   await initSamsungWasmDecoder(options);
@@ -21009,7 +21059,15 @@ async function startPlainScreen(options) {
   process.argv = ["go", ...getGoArgv2(SCREEN_JS_URL, options)];
   Object.assign(process.env, getGoEnv());
   await injectScript(SCREEN_JS_URL);
-  await new Promise(() => void 0);
+  await new Promise((resolve) => {
+    const interval = setInterval(() => {
+      var _a;
+      if (((_a = window.__supra) == null ? void 0 : _a.screenStopped) === true) {
+        clearInterval(interval);
+        resolve();
+      }
+    }, 500);
+  });
 }
 
 // screen/h264decoder.ts
@@ -21026,10 +21084,10 @@ async function createH264Decoder() {
 }
 
 // screen/wasm.ts
-var SCREEN_WASM_URL = "supra-client-screen.wasm?v=0.0.1";
+var SCREEN_WASM_URL = "supra-client-screen.wasm?v=1.0.0-mzscreengeometry.449";
 async function startWasmScreen(options) {
   options = options != null ? options : parseQueryOptions();
-  initWorkerFrameConnection();
+  initWorkerFrameConnection(options.netInWorker === true);
   await initSamsungWasmTCP();
   await initSamsungWasmDecoder(options);
   await initH264Decoder();
@@ -21076,6 +21134,14 @@ function createScreenControl(initialPreferences) {
       } catch {
         return null;
       }
+    },
+    stop() {
+      var _a;
+      if (typeof window === "undefined" || !((_a = window.__supra) == null ? void 0 : _a.stopScreen)) {
+        return false;
+      }
+      window.__supra.stopScreen();
+      return true;
     }
   };
 }