@bomon/nestjs-cct-explorer 0.1.0 → 1.1.0

package/dist/cct-explorer.controller.d.ts

@@ -1,13 +1,21 @@
 import type { Response } from 'express';
 import { DeviceGateway } from './device-gateway.interface';
 import { CctExplorerModuleOptions } from './tokens';
+import { DeviceQueueCacheService } from './device-queue-cache.service';
 export declare class CctExplorerController {
     private readonly gateway;
     private readonly options;
-    constructor(gateway: DeviceGateway, options: CctExplorerModuleOptions);
+    private readonly queueCache;
+    constructor(gateway: DeviceGateway, options: CctExplorerModuleOptions, queueCache: DeviceQueueCacheService);
     renderBrowser(res: Response): Promise<void>;
     getDevices(): Promise<{
-        devices: import("./device-gateway.interface").DeviceInfo[];
+        devices: {
+            scriptQueue: import("./device-gateway.interface").ScriptQueueSnapshot | null;
+            queueUpdatedAt: number | null;
+            queueError: string | null;
+            name: string;
+            connectedAt?: string;
+        }[];
     }>;
     readDir(device: string, virtualPath?: string): Promise<{
         entries: import("./device-gateway.interface").DirEntry[];
@@ -21,4 +29,5 @@ export declare class CctExplorerController {
         ok: boolean;
         message: string;
     }>;
+    getScriptQueue(device: string): Promise<import("./device-gateway.interface").ScriptQueueSnapshot>;
 }

package/dist/cct-explorer.controller.js

@@ -17,10 +17,12 @@ const common_1 = require("@nestjs/common");
 const node_path_1 = require("node:path");
 const tokens_1 = require("./tokens");
 const path_utils_1 = require("./path-utils");
+const device_queue_cache_service_1 = require("./device-queue-cache.service");
 let CctExplorerController = class CctExplorerController {
-    constructor(gateway, options) {
+    constructor(gateway, options, queueCache) {
         this.gateway = gateway;
         this.options = options;
+        this.queueCache = queueCache;
     }
     async renderBrowser(res) {
         const filePath = (0, node_path_1.join)(__dirname, 'public', 'browser.html');
@@ -28,7 +30,16 @@ let CctExplorerController = class CctExplorerController {
     }
     async getDevices() {
         const devices = await this.gateway.listDevices();
-        return { devices };
+        const enriched = devices.map((d) => {
+            const state = this.queueCache.getState(d.name);
+            return {
+                ...d,
+                scriptQueue: state?.snapshot ?? null,
+                queueUpdatedAt: state?.updatedAt ?? null,
+                queueError: state?.error ?? null,
+            };
+        });
+        return { devices: enriched };
     }
     async readDir(device, virtualPath = '') {
         if (!device || !virtualPath) {
@@ -104,6 +115,20 @@ let CctExplorerController = class CctExplorerController {
         await this.gateway.writeFile(device, parsed.devicePath, content ?? '');
         return { ok: true, message: 'saved' };
     }
+    async getScriptQueue(device) {
+        if (!this.gateway.getScriptQueue) {
+            throw new common_1.HttpException({ code: '400', message: '当前网关未实现队列查询能力' }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        if (!device) {
+            throw new common_1.HttpException({ code: '400', message: '缺少 device' }, common_1.HttpStatus.BAD_REQUEST);
+        }
+        const cached = this.queueCache.getState(device);
+        if (cached?.snapshot && Date.now() - cached.updatedAt < 2000) {
+            return cached.snapshot;
+        }
+        const snapshot = await this.gateway.getScriptQueue(device);
+        return snapshot;
+    }
 };
 exports.CctExplorerController = CctExplorerController;
 __decorate([
@@ -153,9 +178,16 @@ __decorate([
     __metadata("design:paramtypes", [String, Object, String]),
     __metadata("design:returntype", Promise)
 ], CctExplorerController.prototype, "writeFile", null);
+__decorate([
+    (0, common_1.Get)('api/scripts/queue'),
+    __param(0, (0, common_1.Query)('device')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String]),
+    __metadata("design:returntype", Promise)
+], CctExplorerController.prototype, "getScriptQueue", null);
 exports.CctExplorerController = CctExplorerController = __decorate([
     (0, common_1.Controller)(),
     __param(0, (0, common_1.Inject)(tokens_1.DEVICE_GATEWAY_TOKEN)),
     __param(1, (0, common_1.Inject)(tokens_1.CCT_EXPLORER_OPTIONS)),
-    __metadata("design:paramtypes", [Object, Object])
+    __metadata("design:paramtypes", [Object, Object, device_queue_cache_service_1.DeviceQueueCacheService])
 ], CctExplorerController);

package/dist/cct-explorer.module.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CctExplorerModule = void 0;
 const common_1 = require("@nestjs/common");
 const cct_explorer_controller_1 = require("./cct-explorer.controller");
+const device_queue_cache_service_1 = require("./device-queue-cache.service");
 const tokens_1 = require("./tokens");
 let CctExplorerModule = CctExplorerModule_1 = class CctExplorerModule {
     static forRoot(options) {
@@ -27,6 +28,7 @@ let CctExplorerModule = CctExplorerModule_1 = class CctExplorerModule {
                     provide: tokens_1.DEVICE_GATEWAY_TOKEN,
                     useExisting: deviceGatewayClass,
                 },
+                device_queue_cache_service_1.DeviceQueueCacheService,
             ],
             exports: [tokens_1.CCT_EXPLORER_OPTIONS, tokens_1.DEVICE_GATEWAY_TOKEN],
         };

package/dist/device-gateway.interface.d.ts

@@ -6,10 +6,27 @@ export interface DirEntry {
     name: string;
     type: 'file' | 'dir';
 }
+export interface ScriptJob {
+    id: string;
+    type: 'local' | 'remote';
+    filename?: string;
+    description?: string;
+    createdAt: number;
+    startedAt?: number;
+    finishedAt?: number;
+    status: 'pending' | 'running' | 'success' | 'failed';
+    errorMessage?: string;
+}
+export interface ScriptQueueSnapshot {
+    running: ScriptJob | null;
+    pending: ScriptJob[];
+    capacity: number;
+}
 export interface DeviceGateway {
     listDevices(): Promise<DeviceInfo[]>;
     readDir(device: string, devicePath: string): Promise<DirEntry[]>;
     readFile(device: string, devicePath: string): Promise<Buffer>;
     removeFile(device: string, devicePath: string): Promise<void>;
     writeFile?(device: string, devicePath: string, content: Buffer | string): Promise<void>;
+    getScriptQueue?(device: string): Promise<ScriptQueueSnapshot>;
 }

package/dist/device-queue-cache.service.d.ts

@@ -0,0 +1,20 @@
+import { OnModuleInit } from '@nestjs/common';
+import type { ScriptQueueSnapshot } from './device-gateway.interface';
+import type { DeviceGateway } from './device-gateway.interface';
+import { type CctExplorerModuleOptions } from './tokens';
+export interface DeviceQueueState {
+    snapshot: ScriptQueueSnapshot | null;
+    updatedAt: number;
+    error?: string;
+}
+export declare class DeviceQueueCacheService implements OnModuleInit {
+    private readonly gateway;
+    private readonly options;
+    private readonly cache;
+    private intervalId;
+    private refreshing;
+    constructor(gateway: DeviceGateway, options: CctExplorerModuleOptions);
+    onModuleInit(): void;
+    getState(deviceName: string): DeviceQueueState | null;
+    private refresh;
+}

package/dist/device-queue-cache.service.js

@@ -0,0 +1,72 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeviceQueueCacheService = void 0;
+const common_1 = require("@nestjs/common");
+const tokens_1 = require("./tokens");
+const tokens_2 = require("./tokens");
+let DeviceQueueCacheService = class DeviceQueueCacheService {
+    constructor(gateway, options) {
+        this.gateway = gateway;
+        this.options = options;
+        this.cache = new Map();
+        this.intervalId = null;
+        this.refreshing = false;
+    }
+    onModuleInit() {
+        const ms = this.options.scriptQueuePollIntervalMs ?? 1000;
+        if (ms <= 0 || typeof this.gateway.getScriptQueue !== 'function')
+            return;
+        this.refresh();
+        this.intervalId = setInterval(() => this.refresh(), ms);
+    }
+    getState(deviceName) {
+        return this.cache.get(deviceName) ?? null;
+    }
+    async refresh() {
+        if (this.refreshing)
+            return;
+        this.refreshing = true;
+        const now = Date.now();
+        try {
+            const devices = await this.gateway.listDevices();
+            await Promise.all(devices.map(async (d) => {
+                try {
+                    const snapshot = await this.gateway.getScriptQueue(d.name);
+                    this.cache.set(d.name, { snapshot, updatedAt: now });
+                }
+                catch (err) {
+                    this.cache.set(d.name, {
+                        snapshot: null,
+                        updatedAt: now,
+                        error: err?.message ?? '获取队列失败',
+                    });
+                }
+            }));
+        }
+        catch (err) {
+            // listDevices 失败时不覆盖已有缓存
+        }
+        finally {
+            this.refreshing = false;
+        }
+    }
+};
+exports.DeviceQueueCacheService = DeviceQueueCacheService;
+exports.DeviceQueueCacheService = DeviceQueueCacheService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(0, (0, common_1.Inject)(tokens_1.DEVICE_GATEWAY_TOKEN)),
+    __param(1, (0, common_1.Inject)(tokens_2.CCT_EXPLORER_OPTIONS)),
+    __metadata("design:paramtypes", [Object, Object])
+], DeviceQueueCacheService);

package/dist/public/browser.html

@@ -556,6 +556,16 @@
           </div>
         </section>
 
+        <section class="panel" id="script-queue-panel" style="flex: 0 0 auto;">
+          <div class="panel-header">
+            <div class="panel-title">脚本队列</div>
+            <div class="panel-sub" id="script-queue-subtitle">选择设备后每秒刷新</div>
+          </div>
+          <div id="script-queue-content" style="font-size:12px;color:var(--text-muted);min-height:48px;">
+            未选择设备
+          </div>
+        </section>
+
         <div class="status-bar">
           <div class="status-badge">
             <span class="status-dot" id="status-dot"></span>
@@ -594,6 +604,63 @@
         currentPath: null,
       };
 
+      function formatElapsed(startedAt) {
+        if (!startedAt) return '';
+        var s = Math.floor((Date.now() - startedAt) / 1000);
+        if (s < 60) return s + ' 秒';
+        var m = Math.floor(s / 60);
+        var r = s % 60;
+        return m + ' 分 ' + r + ' 秒';
+      }
+
+      function jobLabel(job) {
+        return job.filename || job.description || job.id || job.type;
+      }
+
+      function loadScriptQueue() {
+        var device = state.currentDevice;
+        var el = document.getElementById('script-queue-content');
+        var sub = document.getElementById('script-queue-subtitle');
+        if (!device) {
+          el.textContent = '未选择设备';
+          sub.textContent = '选择设备后每秒刷新';
+          return;
+        }
+        var meta = state.devices.find(function (d) { return d.name === device; });
+        if (!meta) {
+          el.textContent = '未找到设备信息';
+          sub.textContent = '';
+          return;
+        }
+        var data = meta.scriptQueue;
+        if (!data) {
+          el.textContent = '暂无脚本队列信息（等待服务端刷新）';
+          sub.textContent = meta.queueError ? ('上次刷新失败：' + meta.queueError) : '选择设备后每秒刷新';
+          return;
+        }
+        var cap = data.capacity != null ? data.capacity : 10;
+        var running = data.running || null;
+        var pending = data.pending || [];
+        var total = (running ? 1 : 0) + pending.length;
+        sub.textContent = total + ' / ' + cap + ' 占用';
+        var html = '';
+        if (running) {
+          var elapsed = formatElapsed(running.startedAt);
+          html += '<div style="margin-bottom:6px;"><span style="color:var(--accent);">▶ 运行中</span> ' + jobLabel(running) + (elapsed ? ' <span style="color:var(--text-muted);">已运行 ' + elapsed + '</span>' : '') + '</div>';
+        } else {
+          html += '<div style="margin-bottom:6px;color:var(--text-muted);">无运行中脚本</div>';
+        }
+        if (pending.length) {
+          html += '<div style="color:var(--text-muted);">排队中 (' + pending.length + ')：</div>';
+          pending.forEach(function (j, i) {
+            html += '<div style="padding-left:8px;">' + (i + 1) + '. ' + jobLabel(j) + '</div>';
+          });
+        } else {
+          html += '<div style="color:var(--text-muted);">无排队任务</div>';
+        }
+        el.innerHTML = html;
+      }
+
       function setStatus(text, level) {
         level = level || 'info';
         statusTextEl.textContent = text;
@@ -636,6 +703,7 @@
             selectedDeviceLabelEl.textContent = '当前设备：' + d.name;
             renderDevices();
             renderRootForDevice();
+            loadScriptQueue();
             setStatus('已选择设备 ' + d.name + '，请选择目录。');
           });
           deviceListEl.appendChild(item);
@@ -717,13 +785,17 @@
             selectedDeviceLabelEl.textContent = '当前设备：' + state.currentDevice;
             renderDevices();
             renderRootForDevice();
+            loadScriptQueue();
             setStatus('已加载设备列表，当前设备：' + state.currentDevice);
           } else if (!state.devices.length) {
+            state.currentDevice = null;
             selectedDeviceLabelEl.textContent = '未选择设备';
             fileTbodyEl.innerHTML = '';
             breadcrumbsEl.innerHTML = '<span style="font-size:12px;color:var(--text-muted)">暂无在线设备</span>';
+            loadScriptQueue();
             setStatus('暂无在线设备。', 'warn');
           } else {
+            loadScriptQueue();
             setStatus('已刷新设备列表。');
           }
         } catch (err) {
@@ -798,7 +870,10 @@
       btnRootScreenshots.addEventListener('click', () => { if (state.currentDevice) openDir('/' + state.currentDevice + '/screenshots'); else setStatus('请先选择设备。', 'warn'); });
       btnRefreshDir.addEventListener('click', () => { if (state.currentPath) openDir(state.currentPath); else if (state.currentDevice) renderRootForDevice(); else setStatus('请先选择设备。', 'warn'); });
 
+      // 首次加载
       loadDevices();
+      // 设备列表轮询（页面打开期间每秒拉一次）
+      setInterval(loadDevices, 1000);
     })();
   </script>
 </body>

package/dist/tokens.d.ts

@@ -10,5 +10,10 @@ export interface CctExplorerModuleOptions {
      * 空字符串表示挂载在根路径
      */
     pathPrefix?: string;
+    /**
+     * 脚本队列轮询间隔（毫秒）。模块内会定时向所有设备拉取 script_queue 并缓存，GET api/devices 会带上 scriptQueue/queueUpdatedAt/queueError。
+     * 默认 1000。设为 0 则关闭轮询，由接入方自行实现。
+     */
+    scriptQueuePollIntervalMs?: number;
 }
 export declare const CCT_EXPLORER_OPTIONS: unique symbol;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bomon/nestjs-cct-explorer",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "description": "NestJS 模块：封装 CDP client 的设备资源浏览器 HTTP 接口与 /browser 页面",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",