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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supraio/client-daemon-js",
-  "version": "0.0.1",
+  "version": "1.0.0-mzscreengeometry.447",
   "description": "",
   "main": "sdk.js",
   "types": "sdk.d.ts",
@@ -14,8 +14,8 @@
     "lint": "eslint \"**/*.ts\""
   },
   "devDependencies": {
-    "@signageos/nacl-decoder": "0.1.0",
-    "@signageos/samsung-wasm-decoder": "0.1.0",
+    "@signageos/nacl-decoder": "0.1.1-mz-screen-geometry.9",
+    "@signageos/samsung-wasm-decoder": "0.1.1-mz-screen-geometry.7",
     "@types/dropboxjs": "0.0.29",
     "@types/filesystem": "0.0.29",
     "@types/node": "14.14.34",

package/screen/control.d.ts

@@ -4,6 +4,16 @@ declare global {
         __supra?: {
             setEncodingPreferences(json: string): void;
             getCurrentStats(): string | null;
+            stopScreen?(): void;
+            /** Set by the Go runtime when geometry was requested via screen options. */
+            geometry?: {
+                x: number;
+                y: number;
+                width: number;
+                height: number;
+            } | null;
+            /** Set to true by the Go runtime after stopScreen() was invoked. */
+            screenStopped?: boolean;
         };
     }
 }
@@ -55,6 +65,12 @@ export interface IScreenControl {
     getEncodingPreferences(): IEncodingPreferences;
     /** Returns a snapshot of client-daemon stats, or null if the bridge is not ready. */
     getCurrentStats(): IClientStats | null;
+    /**
+     * Stops local rendering of the screen. The server-side app keeps running;
+     * only the client screen process disconnects and exits. Returns false when
+     * the rendering bridge is not available (screen not started on this device).
+     */
+    stop(): boolean;
 }
 /**
  * Creates a screen control instance for runtime adjustments.

package/screen/nacldecoder.d.ts

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

package/screen/options.d.ts

@@ -5,6 +5,16 @@ export interface IEncodingPreferences {
     preferredTune?: string;
     preferredProfile?: string;
 }
+/**
+ * Position and size of the rendering surface on the physical screen, in CSS
+ * pixels. When omitted, the renderer covers the whole screen (legacy behavior).
+ */
+export interface IScreenGeometry {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
 export interface IScreenOptions {
     screenID: string;
     screenDriver: string;
@@ -18,6 +28,7 @@ export interface IScreenOptions {
         width: number;
         height: number;
     };
+    geometry?: IScreenGeometry;
     interactive: boolean;
     encodingPreferences?: IEncodingPreferences;
     control?: import('./control').IScreenControl;

package/screen/plain.d.ts

@@ -1,2 +1,3 @@
+import type { StartOptions } from "../sdk";
 import { IScreenOptions } from "./options";
-export declare function startPlainScreen(options?: IScreenOptions): Promise<void>;
+export declare function startPlainScreen(options?: StartOptions & IScreenOptions): Promise<void>;

package/screen/samsungwasmdecoder.d.ts

@@ -6,4 +6,4 @@ declare global {
         samsungWasmDecoder?: SamsungWasmDecoder;
     }
 }
-export declare function initSamsungWasmDecoder(options: Pick<IScreenOptions, 'interactive'>): Promise<void>;
+export declare function initSamsungWasmDecoder(options: Pick<IScreenOptions, 'interactive' | 'geometry'>): Promise<void>;

package/screen/shared.d.ts

@@ -1,3 +1,4 @@
+import type { StartOptions } from "../sdk";
 import { IScreenOptions } from "./options";
-export declare function parseQueryOptions(): IScreenOptions;
+export declare function parseQueryOptions(): StartOptions & IScreenOptions;
 export declare function getGoArgv(binFile: string, options: IScreenOptions): string[];

package/screen/wasm.d.ts

@@ -1,3 +1,4 @@
 import '../go/go';
+import type { StartOptions } from '../sdk';
 import { IScreenOptions } from './options';
-export declare function startWasmScreen(options?: IScreenOptions): Promise<void>;
+export declare function startWasmScreen(options?: StartOptions & IScreenOptions): Promise<void>;

package/screen/workerFrameConnection.d.ts

@@ -9,10 +9,11 @@ interface SupraFrameWorkerConnection {
         timestamp: number;
         length: number;
         data: ArrayBuffer;
+        firstPacketAt: number;
     }>;
     write(data: ArrayBuffer): Promise<number>;
     close(): Promise<void>;
 }
 /** Make it global accessible for netpacket/js_websocket.go */
-export declare function initWorkerFrameConnection(): void;
+export declare function initWorkerFrameConnection(enabled: boolean): void;
 export {};

package/screen.html

@@ -5,6 +5,6 @@
 		<link rel="stylesheet" href="screen.css"></link>
 	</head>
 	<body>
-		<script type="text/javascript" src="screen.js?v=0.0.1"></script>
+		<script type="text/javascript" src="screen.js?v=1.0.0-mzscreengeometry.447"></script>
 	</body>
 </html>

package/screen.js

@@ -17227,8 +17227,8 @@
       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);
@@ -17238,8 +17238,15 @@
         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");
@@ -18338,20 +18345,20 @@
         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,
@@ -19698,16 +19705,17 @@
         }
         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);
         }
@@ -19719,14 +19727,14 @@
       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() {
@@ -20099,7 +20107,7 @@
                 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)];
             }
           });
         });
@@ -20636,9 +20644,10 @@
 
   // 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 });
     }
   }
 
@@ -20651,8 +20660,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) });
@@ -20672,7 +20690,8 @@ function resolveFrame() {
 		frameType: frame.frameType,
 		timestamp: frame.timestamp,
 		length: frame.length,
-		data: frame.data
+		data: frame.data,
+		firstPacketAt: frame.firstPacketAt
 	}, [frame.data]);
 }
 
@@ -20699,11 +20718,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) {
@@ -20717,25 +20737,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();
 	}
@@ -20822,7 +20856,8 @@ self.onmessage = function(event) {
           frameType: message.frameType,
           timestamp: message.timestamp,
           length: message.length,
-          data: message.data
+          data: message.data,
+          firstPacketAt: message.firstPacketAt
         });
       }
     };
@@ -20848,8 +20883,9 @@ self.onmessage = function(event) {
       }
     };
   };
-  function initWorkerFrameConnection() {
-    if (typeof Worker !== "undefined") {
+  function initWorkerFrameConnection(enabled) {
+    delete window.createSupraFrameWorkerConnection;
+    if (enabled && typeof Worker !== "undefined") {
       window.createSupraFrameWorkerConnection = createSupraFrameWorkerConnection;
     }
   }
@@ -20860,7 +20896,8 @@ self.onmessage = function(event) {
   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 });
@@ -20901,7 +20938,8 @@ self.onmessage = function(event) {
       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");
@@ -20915,6 +20953,17 @@ self.onmessage = function(event) {
       }
       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;
@@ -20949,16 +20998,17 @@ self.onmessage = function(event) {
       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.447";
   async function startPlainScreen(options) {
     options = options != null ? options : parseQueryOptions();
-    initNaCLDecoder();
-    initWorkerFrameConnection();
+    initNaCLDecoder(options);
+    initWorkerFrameConnection(options.netInWorker === true);
     await initNaClTCP();
     await initSamsungWasmTCP();
     await initSamsungWasmDecoder(options);
@@ -20967,7 +21017,15 @@ self.onmessage = function(event) {
     process.argv = ["go", ...getGoArgv(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
@@ -20984,10 +21042,10 @@ self.onmessage = function(event) {
   }
 
   // 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.447";
   async function startWasmScreen(options) {
     options = options != null ? options : parseQueryOptions();
-    initWorkerFrameConnection();
+    initWorkerFrameConnection(options.netInWorker === true);
     await initSamsungWasmTCP();
     await initSamsungWasmDecoder(options);
     await initH264Decoder();