@mindexec/cli 0.2.135 → 0.2.136

package/package.json

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

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

@@ -184,6 +184,20 @@ async function main() {
         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');
+
+        const frameStatus = await fetchJson(`${bridge.baseUrl}/api/status?remoteFrames=ws`);
+        assert.equal(frameStatus.ok, true);
+        assert.ok(frameStatus.payload?.remoteFrameWs?.clientCount >= 1, JSON.stringify(frameStatus.payload?.remoteFrameWs));
+        assert.ok(frameStatus.payload?.remoteFrameWs?.framesSent >= 1, JSON.stringify(frameStatus.payload?.remoteFrameWs));
+        assert.equal(frameStatus.payload?.remoteFrameWs?.lastFrameDeviceId, device.deviceId);
+        assert.equal(frameStatus.payload?.remoteFrameWs?.lastFrameSeq, frame.metadata.frameSeq);
+        assert.ok(
+            frameStatus.payload?.remoteFrameWs?.clients?.some(client =>
+                Array.isArray(client.deviceIds)
+                && client.deviceIds.includes(device.deviceId)
+                && client.autoStartLive === true
+                && client.sent >= 1),
+            JSON.stringify(frameStatus.payload?.remoteFrameWs));
         ws.close();
 
         console.log('Remote frame WebSocket smoke OK');

package/server.js

@@ -2128,6 +2128,35 @@ const remoteFrameWss = new WebSocketServer({ noServer: true });
 const wsClients = new Set();
 const remoteFrameClients = new Set();
 const shellJobs = new Map();
+let remoteFrameClientSeq = 0;
+const remoteFrameWsDiagnostics = {
+    opened: 0,
+    closed: 0,
+    errors: 0,
+    framesReceived: 0,
+    framesSent: 0,
+    framesDropped: 0,
+    framesInvalid: 0,
+    framesNoClients: 0,
+    framesNoSubscribers: 0,
+    autoStartRequested: 0,
+    autoStartStarted: 0,
+    autoStartSkipped: 0,
+    lastOpenAt: '',
+    lastCloseAt: '',
+    lastErrorAt: '',
+    lastFrameAt: '',
+    lastFrameDeviceId: '',
+    lastFrameSeq: 0,
+    lastFrameBytes: 0,
+    lastFrameMatchedClients: 0,
+    lastFrameSentClients: 0,
+    lastFrameDroppedClients: 0,
+    lastAutoStartAt: '',
+    lastAutoStartRequested: 0,
+    lastAutoStartStarted: 0,
+    lastAutoStartSkipped: 0
+};
 const REMOTE_FRAME_WS_AUTO_START_LIMIT = 120;
 const REMOTE_FRAME_WS_DEFAULT_FPS = 12;
 const REMOTE_FRAME_WS_DEFAULT_MAX_WIDTH = 960;
@@ -2308,9 +2337,20 @@ function maybeAutoStartRemoteFrameLiveStreams(ws, deviceIds = []) {
     }
 
     if (started.length > 0 || skipped.length > 0) {
+        const now = new Date().toISOString();
+        ws.remoteFrameLastAutoStartAt = now;
+        ws.remoteFrameLastAutoStartStarted = started.length;
+        ws.remoteFrameLastAutoStartSkipped = skipped.length;
+        remoteFrameWsDiagnostics.autoStartRequested += Math.min(deviceIds.length, REMOTE_FRAME_WS_AUTO_START_LIMIT);
+        remoteFrameWsDiagnostics.autoStartStarted += started.length;
+        remoteFrameWsDiagnostics.autoStartSkipped += skipped.length;
+        remoteFrameWsDiagnostics.lastAutoStartAt = now;
+        remoteFrameWsDiagnostics.lastAutoStartRequested = Math.min(deviceIds.length, REMOTE_FRAME_WS_AUTO_START_LIMIT);
+        remoteFrameWsDiagnostics.lastAutoStartStarted = started.length;
+        remoteFrameWsDiagnostics.lastAutoStartSkipped = skipped.length;
         sendRemoteFrameClientJson(ws, {
             type: 'RemoteFrameLiveAutoStart',
-            timestamp: new Date().toISOString(),
+            timestamp: now,
             requested: Math.min(deviceIds.length, REMOTE_FRAME_WS_AUTO_START_LIMIT),
             started,
             skipped: skipped.slice(0, 24),
@@ -2352,20 +2392,36 @@ function buildRemoteFrameBinaryPacket(frameEvent) {
 }
 
 function broadcastRemoteBinaryFrame(frameEvent) {
+    const frame = frameEvent?.frame || {};
+    remoteFrameWsDiagnostics.framesReceived += 1;
+    remoteFrameWsDiagnostics.lastFrameAt = new Date().toISOString();
+    remoteFrameWsDiagnostics.lastFrameDeviceId = String(frameEvent?.deviceId || frame.deviceId || '').trim();
+    remoteFrameWsDiagnostics.lastFrameSeq = Number(frame.frameSeq || 0) || 0;
+    remoteFrameWsDiagnostics.lastFrameBytes = Number(frameEvent?.byteLength || frameEvent?.payload?.length || 0) || 0;
+    remoteFrameWsDiagnostics.lastFrameMatchedClients = 0;
+    remoteFrameWsDiagnostics.lastFrameSentClients = 0;
+    remoteFrameWsDiagnostics.lastFrameDroppedClients = 0;
+
     if (remoteFrameClients.size === 0) {
+        remoteFrameWsDiagnostics.framesNoClients += 1;
         return;
     }
 
-    const deviceId = String(frameEvent?.deviceId || frameEvent?.frame?.deviceId || '').trim();
+    const deviceId = remoteFrameWsDiagnostics.lastFrameDeviceId;
     if (!deviceId) {
+        remoteFrameWsDiagnostics.framesInvalid += 1;
         return;
     }
 
     const packet = buildRemoteFrameBinaryPacket(frameEvent);
     if (!packet) {
+        remoteFrameWsDiagnostics.framesInvalid += 1;
         return;
     }
 
+    let matched = 0;
+    let sent = 0;
+    let dropped = 0;
     for (const client of remoteFrameClients) {
         if (client.readyState !== 1) {
             continue;
@@ -2376,23 +2432,85 @@ function broadcastRemoteBinaryFrame(frameEvent) {
             continue;
         }
 
+        matched += 1;
         if (client.bufferedAmount > 8 * 1024 * 1024) {
             client.remoteFrameDroppedCount = (client.remoteFrameDroppedCount || 0) + 1;
+            client.remoteFrameLastDropAt = new Date().toISOString();
+            remoteFrameWsDiagnostics.framesDropped += 1;
+            dropped += 1;
             continue;
         }
 
         try {
             client.send(packet, { binary: true });
             client.remoteFrameSentCount = (client.remoteFrameSentCount || 0) + 1;
+            client.remoteFrameLastSentAt = new Date().toISOString();
+            client.remoteFrameLastDeviceId = deviceId;
+            client.remoteFrameLastSeq = remoteFrameWsDiagnostics.lastFrameSeq;
+            remoteFrameWsDiagnostics.framesSent += 1;
+            sent += 1;
         } catch {
             client.remoteFrameDroppedCount = (client.remoteFrameDroppedCount || 0) + 1;
+            client.remoteFrameLastDropAt = new Date().toISOString();
+            remoteFrameWsDiagnostics.framesDropped += 1;
+            dropped += 1;
         }
     }
+
+    remoteFrameWsDiagnostics.lastFrameMatchedClients = matched;
+    remoteFrameWsDiagnostics.lastFrameSentClients = sent;
+    remoteFrameWsDiagnostics.lastFrameDroppedClients = dropped;
+    if (matched === 0) {
+        remoteFrameWsDiagnostics.framesNoSubscribers += 1;
+    }
+}
+
+function serializeRemoteFrameWsDiagnostics() {
+    const clients = [];
+    for (const client of remoteFrameClients) {
+        const deviceIds = client.remoteFrameDeviceIds instanceof Set
+            ? Array.from(client.remoteFrameDeviceIds)
+            : [];
+        clients.push({
+            id: client.remoteFrameClientId || '',
+            readyState: client.readyState,
+            connectedAt: client.remoteFrameConnectedAt || '',
+            subscribedAt: client.remoteFrameSubscriptionUpdatedAt || '',
+            deviceCount: deviceIds.length,
+            deviceIds: deviceIds.slice(0, 24),
+            autoStartLive: client.remoteFrameAutoStartLive === true,
+            autoStartOptions: client.remoteFrameAutoStartOptions || null,
+            sent: Number(client.remoteFrameSentCount || 0),
+            dropped: Number(client.remoteFrameDroppedCount || 0),
+            bufferedAmount: Number(client.bufferedAmount || 0),
+            lastSentAt: client.remoteFrameLastSentAt || '',
+            lastDropAt: client.remoteFrameLastDropAt || '',
+            lastDeviceId: client.remoteFrameLastDeviceId || '',
+            lastFrameSeq: Number(client.remoteFrameLastSeq || 0) || 0,
+            lastAutoStartAt: client.remoteFrameLastAutoStartAt || '',
+            lastAutoStartStarted: Number(client.remoteFrameLastAutoStartStarted || 0),
+            lastAutoStartSkipped: Number(client.remoteFrameLastAutoStartSkipped || 0)
+        });
+    }
+
+    return {
+        protocol: 'mindexec.remote.frames.binary.v1',
+        path: '/api/remote/frames/ws',
+        clientCount: remoteFrameClients.size,
+        ...remoteFrameWsDiagnostics,
+        clients
+    };
 }
 
 remoteFrameWss.on('connection', (ws, req) => {
     remoteFrameClients.add(ws);
     ws.binaryType = 'arraybuffer';
+    ws.remoteFrameClientId = `rfws-${++remoteFrameClientSeq}`;
+    ws.remoteFrameConnectedAt = new Date().toISOString();
+    ws.remoteFrameSentCount = 0;
+    ws.remoteFrameDroppedCount = 0;
+    remoteFrameWsDiagnostics.opened += 1;
+    remoteFrameWsDiagnostics.lastOpenAt = ws.remoteFrameConnectedAt;
     try {
         const parsed = new URL(req.url || '/', `http://${req.headers.host || '127.0.0.1'}`);
         updateRemoteFrameClientSubscription(ws, {
@@ -2416,12 +2534,21 @@ remoteFrameWss.on('connection', (ws, req) => {
             });
         }
     });
-    ws.on('close', () => remoteFrameClients.delete(ws));
-    ws.on('error', () => remoteFrameClients.delete(ws));
+    ws.on('close', () => {
+        remoteFrameClients.delete(ws);
+        remoteFrameWsDiagnostics.closed += 1;
+        remoteFrameWsDiagnostics.lastCloseAt = new Date().toISOString();
+    });
+    ws.on('error', () => {
+        remoteFrameClients.delete(ws);
+        remoteFrameWsDiagnostics.errors += 1;
+        remoteFrameWsDiagnostics.lastErrorAt = new Date().toISOString();
+    });
     sendRemoteFrameClientJson(ws, {
         type: 'RemoteFrameSocketReady',
         timestamp: new Date().toISOString(),
-        protocol: 'mindexec.remote.frames.binary.v1'
+        protocol: 'mindexec.remote.frames.binary.v1',
+        clientId: ws.remoteFrameClientId
     });
 });
 
@@ -9286,6 +9413,7 @@ app.get('/api/status', async (req, res) => {
         bridgeTokenHeader,
         bridgeAuthRequired,
         remoteHub: remoteHub.getStatus({ includeSecrets: false }),
+        remoteFrameWs: serializeRemoteFrameWsDiagnostics(),
         remoteAgent: serializeRemoteAgentState(),
         remoteRegistryFollower: serializeRemoteRegistryFollowerState(),
         shellJobsPath: '/api/shell/jobs',