Internal - Now webui_script() supports Binary

Example: "return new Uint8Array([0xAA, 0x00, 0xBB]);"

Author: AlbertShown

bridge/js2c.js

@@ -20,7 +20,7 @@ async function jsToCHeader(inputFilename, outputFilename) {
         // Convert each character in JS content to its hexadecimal value
         const hexValues = [...newContent].map(char => `0x${char.charCodeAt(0).toString(16).padStart(2, '0')}`);
         // Prepare the content for the C header file
-        let headerContent = `${comment}// --- PLEASE DO NOT EDIT THIS FILE -------\n// --- THIS FILE IS GENERATED BY JS2C.PY --\n\n`;
+        let headerContent = `${comment}// --- PLEASE DO NOT EDIT THIS FILE -------\n// --- THIS FILE IS GENERATED BY JS2C.JS --\n\n`;
         headerContent += `#ifndef WEBUI_BRIDGE_H\n#define WEBUI_BRIDGE_H\n`;
         headerContent += `unsigned char webui_javascript_bridge[] = { `;
         // Split the hexadecimal values to make the output more readable, adding a new line every 10 values

bridge/webui.ts

@@ -676,10 +676,17 @@ class WebuiBridge {
 						const scriptSanitize = script.replace(/(?:\r\n|\r|\n)/g, '\n');
 						if (this.#log) console.log(`WebUI -> CMD -> JS [${scriptSanitize}]`);
 						// Get callback result
-						let FunReturn = 'undefined';
+						let FunReturn: string | Uint8Array = 'undefined';
 						let FunError = false;
+						let isBinaryReturn = false;
 						try {
-							FunReturn = await AsyncFunction(scriptSanitize)();
+							const result = await AsyncFunction(scriptSanitize)();
+							if (result instanceof Uint8Array) {
+								FunReturn = result;
+								isBinaryReturn = true;
+							} else {
+								FunReturn = String(result);
+							}
 						} catch (e) {
 							FunError = true;
 							FunReturn = e.message;
@@ -691,8 +698,20 @@ class WebuiBridge {
 							FunReturn = 'undefined';
 						}
 						// Logging
-						if (this.#log && !FunError) console.log(`WebUI -> CMD -> JS -> Return Success [${FunReturn}]`);
-						if (this.#log && FunError) console.log(`WebUI -> CMD -> JS -> Return Error [${FunReturn}]`);
+						if (this.#log && !FunError) {
+							if (isBinaryReturn) {
+								const binaryData = FunReturn as Uint8Array;
+								const hexPreview = Array.from(binaryData.slice(0, 64)).map(b => `0x${b.toString(16).padStart(2, '0')}`).join(', ');
+								console.log(`WebUI -> CMD -> JS -> Return Success (${binaryData.length} Bytes) [${hexPreview}${binaryData.length > 64 ? '...' : ''}]`);
+							} else {
+								const stringData = String(FunReturn);
+								console.log(`WebUI -> CMD -> JS -> Return Success (${new TextEncoder().encode(stringData).length} Bytes) [${stringData.substring(0, 64)}${stringData.length > 64 ? '...' : ''}]`);
+							}
+						}
+						else if (this.#log && FunError) {
+							const errorString = String(FunReturn);
+							console.log(`WebUI -> CMD -> JS -> Return Error [${errorString.substring(0, 64)}${errorString.length > 64 ? '...' : ''}]`);
+						}
 						// Protocol
 						// 0: [SIGNATURE]
 						// 1: [TOKEN]
@@ -724,7 +743,11 @@ class WebuiBridge {
 						packetPush(new Uint8Array([0, 0])); // ID (2 Bytes)
 						packetPush(new Uint8Array([this.#CMD_JS]));
 						packetPush(new Uint8Array(FunError ? [1] : [0]));
-						packetPushStr(FunReturn);
+						if (isBinaryReturn) {
+							packetPush(FunReturn as Uint8Array);
+						} else {
+							packetPushStr(FunReturn as string);
+						}
 						packetPush(new Uint8Array([0]));
 						this.#addToken(packet, this.#token, this.#PROTOCOL_TOKEN);
 						this.#addID(packet, callId, this.#PROTOCOL_ID);