npm - @mindexec/cli - Versions diffs - 0.2.134 → 0.2.135 - Mend

@mindexec/cli 0.2.134 → 0.2.135

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

package/package.json +1 -1
package/scripts/remote-fast-mdm-browser-smoke.mjs +13 -17
package/scripts/remote-frame-ws-smoke.mjs +11 -9
package/server.js +95 -1
package/wwwroot/_content/MindExecution.Shared/js/mind-map-css3d-manager.js +50 -4
package/wwwroot/service-worker-assets.js +2 -2
package/wwwroot/service-worker.js +1 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@mindexec/cli",
-  "version": "0.2.134",
+  "version": "0.2.135",
   "description": "MindExec local runtime and bridge CLI",
   "main": "server.js",
   "type": "module",

package/scripts/remote-fast-mdm-browser-smoke.mjs CHANGED Viewed

@@ -161,14 +161,14 @@ async function launchBrowser(chromium) {
     throw new Error(`Unable to launch a Chromium browser: ${lastError?.message || 'unknown error'}`);
 }
-async function paintRemoteFrameInBrowser(page, wsUrl, deviceId) {
+async function paintRemoteFrameInBrowser(page, wsUrl, deviceId, fps = REQUESTED_FPS) {
     await page.setContent(`
         <!doctype html>
         <meta charset="utf-8">
         <canvas id="screen" width="320" height="180"></canvas>
     `);
-    return await page.evaluate(async ({ wsUrl, deviceId }) => {
+    return await page.evaluate(async ({ wsUrl, deviceId, fps }) => {
         const canvas = document.getElementById('screen');
         const context = canvas.getContext('2d', { alpha: false, desynchronized: true }) || canvas.getContext('2d');
         if (!context) {
@@ -203,7 +203,15 @@ async function paintRemoteFrameInBrowser(page, wsUrl, deviceId) {
             const ws = new WebSocket(wsUrl);
             ws.binaryType = 'arraybuffer';
             ws.onopen = () => {
-                ws.send(JSON.stringify({ type: 'subscribe', deviceIds: [deviceId] }));
+                ws.send(JSON.stringify({
+                    type: 'subscribe',
+                    deviceIds: [deviceId],
+                    autoStartLive: true,
+                    fps,
+                    maxWidth: 960,
+                    maxHeight: 540,
+                    quality: 60
+                }));
             };
             ws.onerror = () => {
                 clearTimeout(timeout);
@@ -262,7 +270,7 @@ async function paintRemoteFrameInBrowser(page, wsUrl, deviceId) {
                 }
             };
         });
-    }, { wsUrl, deviceId });
+    }, { wsUrl, deviceId, fps });
 }
 async function main() {
@@ -320,23 +328,11 @@ async function main() {
                 && item.capabilities?.binaryFrames === true) || null;
         }, 15000, `RemoteFast device registration\n${hostBridge.details()}\n${clientBridge.details()}`);
-        const live = await fetchJson(`${hostBridge.baseUrl}/api/remote/devices/${encodeURIComponent(device.deviceId)}/live/start`, {
-            method: 'POST',
-            body: JSON.stringify({
-                fps: REQUESTED_FPS,
-                maxWidth: 960,
-                maxHeight: 540,
-                quality: 60
-            })
-        });
-        assert.equal(live.ok, true, JSON.stringify(live.payload));
-        assert.equal(live.payload?.ok, true, JSON.stringify(live.payload));
         const chromium = await loadPlaywrightChromium();
         browser = await launchBrowser(chromium);
         const page = await browser.newPage();
         const wsUrl = `${hostBridge.baseUrl.replace(/^http:/, 'ws:')}/api/remote/frames/ws?token=${encodeURIComponent(BRIDGE_TOKEN)}`;
-        const painted = await paintRemoteFrameInBrowser(page, wsUrl, device.deviceId);
+        const painted = await paintRemoteFrameInBrowser(page, wsUrl, device.deviceId, REQUESTED_FPS);
         assert.ok(painted.frameSeq > 0, JSON.stringify(painted));
         assert.equal(painted.fps, REQUESTED_FPS, JSON.stringify(painted));
         assert.ok(painted.width > 0 && painted.height > 0, JSON.stringify(painted));

package/scripts/remote-frame-ws-smoke.mjs CHANGED Viewed

@@ -151,7 +151,7 @@ async function main() {
         const seed = await fetchJson(`${bridge.baseUrl}/api/remote/synthetic/seed`, {
             method: 'POST',
-            body: JSON.stringify({ count: 4, connectedRatio: 1, liveRatio: 1 })
+            body: JSON.stringify({ count: 4, connectedRatio: 1, thumbnailRatio: 1, liveCount: 0 })
         });
         assert.equal(seed.ok, true);
@@ -165,20 +165,22 @@ async function main() {
             ws.once('open', resolve);
             ws.once('error', reject);
         });
-        ws.send(JSON.stringify({ type: 'subscribe', deviceIds: [device.deviceId] }));
+        ws.send(JSON.stringify({
+            type: 'subscribe',
+            deviceIds: [device.deviceId],
+            autoStartLive: true,
+            fps: 12,
+            maxWidth: 960,
+            maxHeight: 540,
+            quality: 60
+        }));
         const framePromise = waitForBinaryFrame(ws);
-        const live = await fetchJson(`${bridge.baseUrl}/api/remote/devices/${encodeURIComponent(device.deviceId)}/live/start`, {
-            method: 'POST',
-            body: JSON.stringify({ fps: 20 })
-        });
-        assert.equal(live.ok, true);
         const frame = await framePromise;
         assert.equal(frame.metadata.type, 'remote.frame.binary');
         assert.equal(frame.metadata.kind, 'live');
         assert.equal(frame.metadata.deviceId, device.deviceId);
-        assert.equal(frame.metadata.fps, 20);
+        assert.equal(frame.metadata.fps, 12);
         assert.ok(frame.metadata.frameSeq > 0, 'frameSeq should be positive');
         assert.equal(frame.metadata.mimeType, 'image/png');
         assert.ok(frame.payload.length > 0, 'payload should be non-empty');

package/server.js CHANGED Viewed

@@ -2128,6 +2128,11 @@ const remoteFrameWss = new WebSocketServer({ noServer: true });
 const wsClients = new Set();
 const remoteFrameClients = new Set();
 const shellJobs = new Map();
+const REMOTE_FRAME_WS_AUTO_START_LIMIT = 120;
+const REMOTE_FRAME_WS_DEFAULT_FPS = 12;
+const REMOTE_FRAME_WS_DEFAULT_MAX_WIDTH = 960;
+const REMOTE_FRAME_WS_DEFAULT_MAX_HEIGHT = 540;
+const REMOTE_FRAME_WS_DEFAULT_QUALITY = 60;
 httpServer.on('upgrade', (req, socket, head) => {
     try {
@@ -2217,12 +2222,101 @@ function updateRemoteFrameClientSubscription(ws, payload = {}) {
     const deviceIds = normalizeRemoteFrameWsDeviceIds(payload.deviceIds ?? payload.devices ?? payload.deviceId);
     ws.remoteFrameDeviceIds = new Set(deviceIds);
     ws.remoteFrameSubscriptionUpdatedAt = new Date().toISOString();
+    ws.remoteFrameAutoStartLive = /^(1|true|yes|on|live)$/i.test(String(payload.autoStartLive ?? payload.startLive ?? ''));
+    ws.remoteFrameAutoStartOptions = normalizeRemoteFrameWsLiveOptions(payload);
     sendRemoteFrameClientJson(ws, {
         type: 'RemoteFrameSubscription',
         timestamp: ws.remoteFrameSubscriptionUpdatedAt,
         deviceIds,
-        mode: deviceIds.length > 0 ? 'selected-devices' : 'all-devices'
+        mode: deviceIds.length > 0 ? 'selected-devices' : 'all-devices',
+        autoStartLive: ws.remoteFrameAutoStartLive === true
     });
+    maybeAutoStartRemoteFrameLiveStreams(ws, deviceIds);
+}
+function clampRemoteFrameWsNumber(value, min, max, fallback) {
+    const number = Number(value);
+    if (!Number.isFinite(number)) {
+        return fallback;
+    }
+    return Math.max(min, Math.min(max, Math.round(number)));
+}
+function normalizeRemoteFrameWsLiveOptions(payload = {}) {
+    return {
+        fps: clampRemoteFrameWsNumber(payload.fps, 1, 24, REMOTE_FRAME_WS_DEFAULT_FPS),
+        maxWidth: clampRemoteFrameWsNumber(payload.maxWidth, 320, 2560, REMOTE_FRAME_WS_DEFAULT_MAX_WIDTH),
+        maxHeight: clampRemoteFrameWsNumber(payload.maxHeight, 180, 1440, REMOTE_FRAME_WS_DEFAULT_MAX_HEIGHT),
+        quality: clampRemoteFrameWsNumber(payload.quality, 20, 95, REMOTE_FRAME_WS_DEFAULT_QUALITY),
+        mode: String(payload.mode || 'remote-fast').trim() || 'remote-fast'
+    };
+}
+function getRemoteFrameWsDeviceLookup() {
+    const devices = remoteHub.listDevices({ includeDataUrl: false });
+    return new Map(devices.map(device => [String(device?.deviceId || '').trim(), device]).filter(([id]) => id));
+}
+function maybeAutoStartRemoteFrameLiveStreams(ws, deviceIds = []) {
+    if (!ws || ws.remoteFrameAutoStartLive !== true || !Array.isArray(deviceIds) || deviceIds.length === 0) {
+        return;
+    }
+    const options = ws.remoteFrameAutoStartOptions || normalizeRemoteFrameWsLiveOptions();
+    const lookup = getRemoteFrameWsDeviceLookup();
+    const started = [];
+    const skipped = [];
+    for (const deviceId of deviceIds.slice(0, REMOTE_FRAME_WS_AUTO_START_LIMIT)) {
+        const device = lookup.get(String(deviceId || '').trim());
+        if (!device?.connected) {
+            skipped.push({ deviceId, reason: 'not-connected' });
+            continue;
+        }
+        if (device.liveStreamActive === true) {
+            skipped.push({ deviceId, reason: 'already-live' });
+            continue;
+        }
+        const liveCapable = device.liveStreamEnabled === true
+            || device.liveStreamCapable === true
+            || device.capabilities?.liveStream === true
+            || device.capabilities?.stream === true
+            || device.capabilities?.screenStream === true;
+        if (!liveCapable) {
+            skipped.push({ deviceId, reason: 'live-unavailable' });
+            continue;
+        }
+        const result = remoteHub.startLiveStream(deviceId, {
+            ...options,
+            streamId: `mdm-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`
+        });
+        if (result?.ok === true) {
+            started.push({
+                deviceId,
+                streamId: result.streamId || '',
+                fps: result.fps || options.fps
+            });
+        } else {
+            skipped.push({
+                deviceId,
+                reason: result?.error || 'start-failed'
+            });
+        }
+    }
+    if (started.length > 0 || skipped.length > 0) {
+        sendRemoteFrameClientJson(ws, {
+            type: 'RemoteFrameLiveAutoStart',
+            timestamp: new Date().toISOString(),
+            requested: Math.min(deviceIds.length, REMOTE_FRAME_WS_AUTO_START_LIMIT),
+            started,
+            skipped: skipped.slice(0, 24),
+            options
+        });
+    }
 }
 function buildRemoteFrameBinaryPacket(frameEvent) {

package/wwwroot/_content/MindExecution.Shared/js/mind-map-css3d-manager.js CHANGED Viewed

@@ -13828,7 +13828,16 @@
         }
         const deviceIds = getRemoteFleetBinaryFrameDeviceIds(session);
-        const key = deviceIds.join('\n');
+        const liveOptions = session.liveOptions || {};
+        const optionKey = [
+            liveOptions.autoStartLive === true ? 'auto-live' : 'passive',
+            Number(liveOptions.fps || 0) || 0,
+            Number(liveOptions.maxWidth || 0) || 0,
+            Number(liveOptions.maxHeight || 0) || 0,
+            Number(liveOptions.quality || 0) || 0,
+            String(liveOptions.mode || '')
+        ].join('|');
+        const key = `${deviceIds.join('\n')}::${optionKey}`;
         if (!force && session.subscriptionKey === key) {
             return true;
         }
@@ -13837,7 +13846,13 @@
         session.ws.send(JSON.stringify({
             type: 'subscribe',
             nodeId: session.nodeId,
-            deviceIds
+            deviceIds,
+            autoStartLive: liveOptions.autoStartLive === true,
+            fps: liveOptions.fps,
+            maxWidth: liveOptions.maxWidth,
+            maxHeight: liveOptions.maxHeight,
+            quality: liveOptions.quality,
+            mode: liveOptions.mode
         }));
         return true;
     }
@@ -13984,7 +13999,7 @@
         }
     }
-    function startRemoteFleetBinaryFrameSocket(bodyView, getDeviceIds) {
+    function startRemoteFleetBinaryFrameSocket(bodyView, getDeviceIds, options = {}) {
         const nodeId = String(bodyView?.dataset?.nodeId || '').trim();
         if (!nodeId || typeof WebSocket !== 'function') {
             return false;
@@ -14007,6 +14022,14 @@
         session.bodies.add(bodyView);
         session.getDeviceIds = getDeviceIds;
+        session.liveOptions = {
+            autoStartLive: options.autoStartLive === true,
+            fps: Number(options.fps || REMOTE_FLEET_MONITOR_LIVE_FPS) || REMOTE_FLEET_MONITOR_LIVE_FPS,
+            maxWidth: Number(options.maxWidth || 960) || 960,
+            maxHeight: Number(options.maxHeight || 540) || 540,
+            quality: Number(options.quality || 60) || 60,
+            mode: String(options.mode || 'remote-fast')
+        };
         bodyView._remoteFleetBinaryFrameSession = session;
         openRemoteFleetBinaryFrameSocket(session).catch(() => undefined);
         return true;
@@ -15304,7 +15327,14 @@
         let binarySession = bodyView._remoteFleetBinaryFrameSession || null;
         if (!binarySession) {
-            if (!startRemoteFleetBinaryFrameSocket(bodyView, () => [])) {
+            if (!startRemoteFleetBinaryFrameSocket(bodyView, () => [], {
+                autoStartLive: true,
+                fps: REMOTE_FLEET_CONTROL_LIVE_FPS,
+                maxWidth: 1280,
+                maxHeight: 720,
+                quality: 65,
+                mode: 'remote-fast-control'
+            })) {
                 return false;
             }
             binarySession = bodyView._remoteFleetBinaryFrameSession || null;
@@ -15319,6 +15349,15 @@
         }
         binarySession.controlSessions.add(controlSession);
+        binarySession.liveOptions = {
+            ...(binarySession.liveOptions || {}),
+            autoStartLive: true,
+            fps: REMOTE_FLEET_CONTROL_LIVE_FPS,
+            maxWidth: 1280,
+            maxHeight: 720,
+            quality: 65,
+            mode: 'remote-fast-control'
+        };
         controlSession.binaryFrameSession = binarySession;
         controlSession.binaryFramePreferred = true;
         refreshRemoteFleetBinaryFrameSubscription(binarySession, true);
@@ -17970,6 +18009,13 @@
             const binaryFrameSocketStarted = startRemoteFleetBinaryFrameSocket(bodyView, () => {
                 const liveIds = getVisibleLiveFrameDeviceIds();
                 return liveIds.length > 0 ? liveIds : getVisibleFrameDeviceIds();
+            }, {
+                autoStartLive: true,
+                fps: REMOTE_FLEET_MONITOR_LIVE_FPS,
+                maxWidth: 960,
+                maxHeight: 540,
+                quality: 60,
+                mode: 'remote-fast'
             });
             if (!binaryFrameSocketStarted) {
                 window.RuntimeTrace?.emit?.('remote.frame.wsUnavailable', {

package/wwwroot/service-worker-assets.js CHANGED Viewed

@@ -1,5 +1,5 @@
 self.assetsManifest = {
-    "version":  "yUK/iR3X",
+    "version":  "IfRQGIi2",
     "assets":  [
                    {
                        "hash":  "sha256-+CSYMcqLNTsq3VnH11jgYyOCCdxvHzL74CBmo4sCmMU=",
@@ -86,7 +86,7 @@
                        "url":  "_content/MindExecution.Shared/js/mind-map-core.js.backup"
                    },
                    {
-                       "hash":  "sha256-RLe5Ta1um44TU9QYuOpzKHrl8t1tOWQdkL+zwH79MFA=",
+                       "hash":  "sha256-WBIjGLmIxv1h8qPdh1KvY1XXHi1slyoTo2BVqXis+hQ=",
                        "url":  "_content/MindExecution.Shared/js/mind-map-css3d-manager.js"
                    },
                    {

package/wwwroot/service-worker.js CHANGED Viewed

@@ -1,4 +1,4 @@
-/* Manifest version: yUK/iR3X */
+/* Manifest version: IfRQGIi2 */
 // Hosted deployments should prefer the network over stale offline caches.
 // This service worker immediately clears old Blazor offline caches and unregisters itself.