@aiscene/aiserver 1.6.4 → 1.6.6

package/dist/proxy/whistle-manager.d.ts

@@ -0,0 +1,127 @@
+export interface HostMapping {
+    domain: string;
+    ip: string;
+}
+/** Whistle 原始请求项（/cgi-bin/get-data 返回） */
+export interface WhistleRawRequest {
+    id: string;
+    url: string;
+    startTime: number;
+    endTime: number;
+    dnsTime?: number;
+    requestTime?: number;
+    responseTime?: number;
+    req: {
+        method: string;
+        httpVersion?: string;
+        ip?: string;
+        headers?: Record<string, string>;
+        body?: string;
+        base64?: string;
+    };
+    res: {
+        statusCode?: number;
+        statusMessage?: string;
+        headers?: Record<string, string>;
+        body?: string;
+        base64?: string;
+    };
+    clientId?: string;
+}
+/** 精简后的捕获请求（推送给前端 / AI 分析用） */
+export interface CapturedRequest {
+    id: string;
+    url: string;
+    method: string;
+    statusCode: number | null;
+    reqHeaders: Record<string, string>;
+    resHeaders: Record<string, string>;
+    reqBody: string | null;
+    resBody: string | null;
+    clientIp: string | null;
+    startTime: number;
+    endTime: number;
+    duration: number;
+    dnsTime?: number;
+    requestTime?: number;
+    responseTime?: number;
+}
+/** 请求抓包选项 */
+export interface CaptureOptions {
+    /** 起始请求ID（从此ID之后开始获取） */
+    sinceId?: string;
+    /** 获取数量（默认100，最大100） */
+    count?: number;
+    /** 按客户端IP过滤 */
+    clientIp?: string;
+    /** 按URL关键词过滤 */
+    urlKeyword?: string;
+}
+export declare class WhistleRuleManager {
+    private readonly apiBase;
+    private readonly clientId;
+    /** 活跃的抓包会话：sessionId -> CaptureSession */
+    private captureSessions;
+    constructor();
+    private formatRulesText;
+    createRuleGroup(ruleGroupName: string, hostMappings: HostMapping[], customApiBase?: string): Promise<boolean>;
+    removeRuleGroup(ruleGroupName: string, customApiBase?: string): Promise<boolean>;
+    generateRuleGroupName(environmentId: string): string;
+    /**
+     * 获取 Whistle 当前最新的请求ID
+     * 调试开始前调用，记录起始位置，后续增量获取从此ID之后开始
+     */
+    getLastDataId(customApiBase?: string): Promise<string | null>;
+    /**
+     * 增量获取请求列表
+     * @param options 抓包选项（sinceId、count、clientIp、urlKeyword）
+     * @returns 捕获请求列表 + 本批最后一条ID
+     */
+    fetchRequestList(options?: CaptureOptions, customApiBase?: string): Promise<{
+        requests: CapturedRequest[];
+        lastId: string | null;
+    }>;
+    /**
+     * 按ID获取请求详情（含完整 req/res body）
+     * 适用于需要获取完整 body 的场景（/cgi-bin/get-data 默认不返回 body）
+     */
+    fetchRequestDetail(ids: string[], customApiBase?: string): Promise<CapturedRequest[]>;
+    /**
+     * 开始抓包会话
+     * 记录当前最新请求ID，后续增量获取从此ID之后开始
+     * @param sessionId 调试会话ID
+     * @param clientIp 可选，设备IP（用于过滤只看该设备的请求）
+     * @param pollInterval 轮询间隔（毫秒），默认3000
+     */
+    startCapture(sessionId: string, clientIp?: string, pollInterval?: number, proxyAccount?: string): Promise<boolean>;
+    /**
+     * 停止抓包会话，返回所有采集到的请求
+     * @param sessionId 调试会话ID
+     * @returns 采集到的请求列表
+     */
+    stopCapture(sessionId: string): Promise<CapturedRequest[]>;
+    /**
+     * 启动定时轮询采集（调试期间持续采集请求）
+     * @param sessionId 调试会话ID
+     * @param onNewRequests 每次轮询到新请求时的回调
+     */
+    startPolling(sessionId: string, onNewRequests?: (requests: CapturedRequest[]) => void): void;
+    /**
+     * 停止定时轮询
+     */
+    stopPolling(sessionId: string): void;
+    /**
+     * 获取当前抓包会话已采集的请求数量
+     */
+    getCapturedCount(sessionId: string): number;
+    /**
+     * 获取当前抓包会话已采集的所有请求
+     */
+    getCapturedRequests(sessionId: string): CapturedRequest[];
+    /**
+     * 将 Whistle 原始请求转换为精简的 CapturedRequest
+     */
+    private convertRawRequest;
+}
+export declare const whistleManager: WhistleRuleManager;
+//# sourceMappingURL=whistle-manager.d.ts.map

package/dist/proxy/whistle-manager.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"whistle-manager.d.ts","sourceRoot":"","sources":["../../src/proxy/whistle-manager.ts"],"names":[],"mappings":"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"}

package/dist/proxy/whistle-manager.js

@@ -0,0 +1,374 @@
+import { createLogger } from '../core/logger.js';
+const logger = createLogger('WhistleManager');
+export class WhistleRuleManager {
+    apiBase;
+    clientId;
+    /** 活跃的抓包会话：sessionId -> CaptureSession */
+    captureSessions = new Map();
+    constructor() {
+        this.apiBase = process.env.WHISTLE_API_BASE || 'http://127.0.0.1:8899';
+        this.clientId = process.env.WHISTLE_CLIENT_ID || 'guada-ai-framework';
+    }
+    // ==================== 规则管理（已有功能） ====================
+    formatRulesText(hostMappings) {
+        return hostMappings.map(m => m.ip + ' ' + m.domain).join('\n');
+    }
+    async createRuleGroup(ruleGroupName, hostMappings, customApiBase) {
+        try {
+            const apiBase = customApiBase || this.apiBase;
+            const addParams = new URLSearchParams();
+            addParams.append('clientId', this.clientId);
+            addParams.append('name', ruleGroupName);
+            addParams.append('addToTop', '');
+            const addResponse = await fetch(apiBase + '/cgi-bin/rules/add', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: addParams.toString(),
+            });
+            const addResult = await addResponse.json();
+            if (addResult.ec !== 0) {
+                logger.error('Failed to create rule group: ' + JSON.stringify(addResult));
+                return false;
+            }
+            logger.info('Rule group [' + ruleGroupName + '] created');
+            const rulesText = this.formatRulesText(hostMappings);
+            const selectParams = new URLSearchParams();
+            selectParams.append('clientId', this.clientId);
+            selectParams.append('key', 'w-reactkey-' + Date.now());
+            selectParams.append('name', ruleGroupName);
+            selectParams.append('value', rulesText);
+            selectParams.append('hide', 'false');
+            selectParams.append('active', 'true');
+            selectParams.append('changed', 'true');
+            const selectResponse = await fetch(apiBase + '/cgi-bin/rules/select', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: selectParams.toString(),
+            });
+            const selectResult = await selectResponse.json();
+            if (selectResult.ec !== 0) {
+                logger.error('Failed to write rule content: ' + JSON.stringify(selectResult));
+                return false;
+            }
+            logger.info('Rule group [' + ruleGroupName + '] wrote ' + hostMappings.length + ' host mappings');
+            return true;
+        }
+        catch (error) {
+            logger.error('Error creating rule group [' + ruleGroupName + ']: ' + (error instanceof Error ? error.message : String(error)));
+            return false;
+        }
+    }
+    async removeRuleGroup(ruleGroupName, customApiBase) {
+        try {
+            const apiBase = customApiBase || this.apiBase;
+            const params = new URLSearchParams();
+            params.append('clientId', this.clientId);
+            params.append('list[]', ruleGroupName);
+            const response = await fetch(apiBase + '/cgi-bin/rules/remove', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: params.toString(),
+            });
+            const result = await response.json();
+            if (result.ec !== 0) {
+                logger.error('Failed to remove rule group: ' + JSON.stringify(result));
+                return false;
+            }
+            logger.info('Rule group [' + ruleGroupName + '] removed');
+            return true;
+        }
+        catch (error) {
+            logger.error('Error removing rule group [' + ruleGroupName + ']: ' + (error instanceof Error ? error.message : String(error)));
+            return false;
+        }
+    }
+    generateRuleGroupName(environmentId) {
+        return 'guada-env-' + environmentId;
+    }
+    // ==================== 请求抓包（新增功能） ====================
+    /**
+     * 获取 Whistle 当前最新的请求ID
+     * 调试开始前调用，记录起始位置，后续增量获取从此ID之后开始
+     */
+    async getLastDataId(customApiBase) {
+        try {
+            const apiBase = customApiBase || this.apiBase;
+            const url = apiBase + '/cgi-bin/get-data?count=1';
+            const response = await fetch(url);
+            const result = await response.json();
+            if (result.ec !== 0 || !result.data) {
+                logger.warn('Failed to get last data ID: ec=' + result.ec);
+                return null;
+            }
+            const lastId = result.data.endId || result.data.lastId || null;
+            logger.info('Last data ID: ' + lastId);
+            return lastId;
+        }
+        catch (error) {
+            logger.error('Error getting last data ID: ' + (error instanceof Error ? error.message : String(error)));
+            return null;
+        }
+    }
+    /**
+     * 增量获取请求列表
+     * @param options 抓包选项（sinceId、count、clientIp、urlKeyword）
+     * @returns 捕获请求列表 + 本批最后一条ID
+     */
+    async fetchRequestList(options = {}, customApiBase) {
+        try {
+            const count = Math.min(options.count || 100, 100);
+            const params = new URLSearchParams();
+            params.append('count', String(count));
+            if (options.sinceId) {
+                params.append('startTime', options.sinceId);
+            }
+            if (options.clientIp) {
+                params.append('ip', options.clientIp);
+            }
+            if (options.urlKeyword) {
+                params.append('url', options.urlKeyword);
+            }
+            const apiBase = customApiBase || this.apiBase;
+            const url = apiBase + '/cgi-bin/get-data?' + params.toString();
+            const response = await fetch(url);
+            const result = await response.json();
+            if (result.ec !== 0 || !result.data || !result.data.data) {
+                logger.warn('Failed to fetch request list: ec=' + result.ec);
+                return { requests: [], lastId: null };
+            }
+            const rawData = result.data.data;
+            const requests = [];
+            for (const id of (result.data.newIds || [])) {
+                const raw = rawData[id];
+                if (raw) {
+                    requests.push(this.convertRawRequest(raw));
+                }
+            }
+            // 按startTime排序（ID本身就是时间戳格式，所以按ID排序即可）
+            requests.sort((a, b) => a.startTime - b.startTime);
+            const lastId = result.data.lastId || result.data.endId || null;
+            return { requests, lastId };
+        }
+        catch (error) {
+            logger.error('Error fetching request list: ' + (error instanceof Error ? error.message : String(error)));
+            return { requests: [], lastId: null };
+        }
+    }
+    /**
+     * 按ID获取请求详情（含完整 req/res body）
+     * 适用于需要获取完整 body 的场景（/cgi-bin/get-data 默认不返回 body）
+     */
+    async fetchRequestDetail(ids, customApiBase) {
+        if (ids.length === 0)
+            return [];
+        try {
+            const params = new URLSearchParams();
+            // get-session 要求 reqList 和 resList 为 JSON 数组字符串
+            params.append('reqList', JSON.stringify(ids));
+            params.append('resList', JSON.stringify(ids));
+            const apiBase = customApiBase || this.apiBase;
+            const response = await fetch(apiBase + '/cgi-bin/get-session?' + params.toString());
+            const result = await response.json();
+            // get-session 直接返回数据对象（无 ec 字段），空对象表示无数据
+            if (!result || typeof result !== 'object' || Object.keys(result).length === 0) {
+                logger.warn('Failed to fetch request detail: empty response');
+                return [];
+            }
+            const requests = [];
+            for (const id of ids) {
+                const raw = result[id];
+                if (raw) {
+                    requests.push(this.convertRawRequest(raw));
+                }
+            }
+            return requests;
+        }
+        catch (error) {
+            logger.error('Error fetching request detail: ' + (error instanceof Error ? error.message : String(error)));
+            return [];
+        }
+    }
+    /**
+     * 开始抓包会话
+     * 记录当前最新请求ID，后续增量获取从此ID之后开始
+     * @param sessionId 调试会话ID
+     * @param clientIp 可选，设备IP（用于过滤只看该设备的请求）
+     * @param pollInterval 轮询间隔（毫秒），默认3000
+     */
+    async startCapture(sessionId, clientIp, pollInterval = 3000, proxyAccount) {
+        // 如果已有抓包会话，先停止
+        if (this.captureSessions.has(sessionId)) {
+            this.stopCapture(sessionId);
+        }
+        // 根据 proxyAccount 决定使用哪个 Whistle 实例
+        const captureApiBase = proxyAccount ? `http://proxy-pc.jd.com/account/${proxyAccount}` : this.apiBase;
+        // 获取当前最新请求ID作为起始点
+        const lastId = await this.getLastDataId(captureApiBase);
+        if (lastId === null) {
+            logger.warn('[Capture] Failed to get start data ID, using empty string as fallback');
+        }
+        const captureSession = {
+            startDataId: lastId || '',
+            sessionId,
+            clientIp,
+            capturedRequests: [],
+            pollTimer: null,
+            pollInterval,
+            apiBase: captureApiBase,
+        };
+        this.captureSessions.set(sessionId, captureSession);
+        logger.info('[Capture] Started capture session: sessionId=' + sessionId + ', startDataId=' + lastId + ', clientIp=' + (clientIp || 'all'));
+        return true;
+    }
+    /**
+     * 停止抓包会话，返回所有采集到的请求
+     * @param sessionId 调试会话ID
+     * @returns 采集到的请求列表
+     */
+    async stopCapture(sessionId) {
+        const capture = this.captureSessions.get(sessionId);
+        if (!capture) {
+            logger.warn('[Capture] No capture session found: sessionId=' + sessionId);
+            return [];
+        }
+        // 停止轮询
+        if (capture.pollTimer) {
+            clearInterval(capture.pollTimer);
+            capture.pollTimer = null;
+        }
+        // 最后一次拉取增量数据
+        try {
+            const lastId = capture.capturedRequests.length > 0
+                ? capture.capturedRequests[capture.capturedRequests.length - 1].id
+                : capture.startDataId;
+            const { requests } = await this.fetchRequestList({
+                sinceId: lastId,
+                clientIp: capture.clientIp,
+                count: 100,
+            }, capture.apiBase);
+            if (requests.length > 0) {
+                capture.capturedRequests.push(...requests);
+            }
+        }
+        catch (error) {
+            logger.warn('[Capture] Final fetch failed: ' + (error instanceof Error ? error.message : String(error)));
+        }
+        // 清理
+        this.captureSessions.delete(sessionId);
+        logger.info('[Capture] Stopped capture session: sessionId=' + sessionId + ', totalRequests=' + capture.capturedRequests.length);
+        return capture.capturedRequests;
+    }
+    /**
+     * 启动定时轮询采集（调试期间持续采集请求）
+     * @param sessionId 调试会话ID
+     * @param onNewRequests 每次轮询到新请求时的回调
+     */
+    startPolling(sessionId, onNewRequests) {
+        const capture = this.captureSessions.get(sessionId);
+        if (!capture) {
+            logger.warn('[Capture] Cannot start polling, no capture session: sessionId=' + sessionId);
+            return;
+        }
+        if (capture.pollTimer) {
+            clearInterval(capture.pollTimer);
+        }
+        capture.pollTimer = setInterval(async () => {
+            try {
+                const lastId = capture.capturedRequests.length > 0
+                    ? capture.capturedRequests[capture.capturedRequests.length - 1].id
+                    : capture.startDataId;
+                const { requests } = await this.fetchRequestList({
+                    sinceId: lastId,
+                    clientIp: capture.clientIp,
+                    count: 100,
+                }, capture.apiBase);
+                if (requests.length > 0) {
+                    capture.capturedRequests.push(...requests);
+                    if (onNewRequests) {
+                        onNewRequests(requests);
+                    }
+                    logger.debug('[Capture] Polling got ' + requests.length + ' new requests for session ' + sessionId);
+                }
+            }
+            catch (error) {
+                logger.warn('[Capture] Polling error: ' + (error instanceof Error ? error.message : String(error)));
+            }
+        }, capture.pollInterval);
+        logger.info('[Capture] Polling started: sessionId=' + sessionId + ', interval=' + capture.pollInterval + 'ms');
+    }
+    /**
+     * 停止定时轮询
+     */
+    stopPolling(sessionId) {
+        const capture = this.captureSessions.get(sessionId);
+        if (capture && capture.pollTimer) {
+            clearInterval(capture.pollTimer);
+            capture.pollTimer = null;
+            logger.info('[Capture] Polling stopped: sessionId=' + sessionId);
+        }
+    }
+    /**
+     * 获取当前抓包会话已采集的请求数量
+     */
+    getCapturedCount(sessionId) {
+        const capture = this.captureSessions.get(sessionId);
+        return capture ? capture.capturedRequests.length : 0;
+    }
+    /**
+     * 获取当前抓包会话已采集的所有请求
+     */
+    getCapturedRequests(sessionId) {
+        const capture = this.captureSessions.get(sessionId);
+        return capture ? [...capture.capturedRequests] : [];
+    }
+    // ==================== 内部工具方法 ====================
+    /**
+     * 将 Whistle 原始请求转换为精简的 CapturedRequest
+     */
+    convertRawRequest(raw) {
+        // base64 body 解码
+        let reqBody = null;
+        if (raw.req.base64) {
+            try {
+                reqBody = Buffer.from(raw.req.base64, 'base64').toString('utf-8');
+            }
+            catch {
+                reqBody = '[binary data]';
+            }
+        }
+        else if (raw.req.body) {
+            reqBody = raw.req.body;
+        }
+        let resBody = null;
+        if (raw.res.base64) {
+            try {
+                resBody = Buffer.from(raw.res.base64, 'base64').toString('utf-8');
+            }
+            catch {
+                resBody = '[binary data]';
+            }
+        }
+        else if (raw.res.body) {
+            resBody = raw.res.body;
+        }
+        return {
+            id: raw.id,
+            url: raw.url,
+            method: raw.req.method,
+            statusCode: raw.res.statusCode ?? null,
+            reqHeaders: raw.req.headers || {},
+            resHeaders: raw.res.headers || {},
+            reqBody,
+            resBody,
+            clientIp: raw.req.ip || null,
+            startTime: raw.startTime,
+            endTime: raw.endTime,
+            duration: raw.endTime - raw.startTime,
+            dnsTime: raw.dnsTime,
+            requestTime: raw.requestTime,
+            responseTime: raw.responseTime,
+        };
+    }
+}
+export const whistleManager = new WhistleRuleManager();
+//# sourceMappingURL=whistle-manager.js.map

package/dist/proxy/whistle-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"whistle-manager.js","sourceRoot":"","sources":["../../src/proxy/whistle-manager.ts"],"names":[],"mappings":"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"}

package/dist/scrcpy/server.d.ts

@@ -75,6 +75,7 @@ export declare class ScrcpyServer {
     private getAdbClient;
     private getDevicesList;
     private getAdb;
+    private wakeDeviceScreen;
     private startScrcpy;
     private broadcastJson;
     private broadcastDevicesList;

package/dist/scrcpy/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/scrcpy/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAWxD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAyED,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,kBAAkB,CAAM;IAChC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAiD;gBAErD,MAAM,EAAE,YAAY;YAmBlB,iBAAiB;YA6CjB,YAAY;YA2BZ,cAAc;YAuBd,MAAM;YAwCN,WAAW;IAwEzB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,oBAAoB;IA4B5B,OAAO,CAAC,sBAAsB;YAwBhB,iBAAiB;IAa/B,wDAAwD;YAC1C,cAAc;IAqB5B,OAAO,CAAC,oBAAoB;IAqe5B,OAAO,CAAC,qBAAqB;IAYvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B7B"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/scrcpy/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAWxD,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAgGD,qBAAa,YAAY;IACvB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,eAAe,CAAuB;IAC9C,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,kBAAkB,CAAM;IAChC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,iCAAiC;IACjC,OAAO,CAAC,QAAQ,CAAiD;gBAErD,MAAM,EAAE,YAAY;YAmBlB,iBAAiB;YA6CjB,YAAY;YA2BZ,cAAc;YAuBd,MAAM;YAqCN,gBAAgB;YA2BhB,WAAW;IAwEzB,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,oBAAoB;IA4B5B,OAAO,CAAC,sBAAsB;YAwBhB,iBAAiB;IAa/B,wDAAwD;YAC1C,cAAc;IAqB5B,OAAO,CAAC,oBAAoB;IAyd5B,OAAO,CAAC,qBAAqB;IAYvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA6B7B"}

package/dist/scrcpy/server.js

@@ -108,6 +108,27 @@ function buildVideoFrameBuffer(payload, isKeyFrame, isConfiguration, timestampMs
     buf.set(payload, 9);
     return buf;
 }
+function isH264IdrFrame(payload) {
+    for (let i = 0; i + 4 < payload.byteLength; i++) {
+        let nalOffset = -1;
+        if (payload[i] === 0 && payload[i + 1] === 0 && payload[i + 2] === 1) {
+            nalOffset = i + 3;
+        }
+        else if (payload[i] === 0 &&
+            payload[i + 1] === 0 &&
+            payload[i + 2] === 0 &&
+            payload[i + 3] === 1) {
+            nalOffset = i + 4;
+        }
+        if (nalOffset >= 0 && nalOffset < payload.byteLength) {
+            const nalType = payload[nalOffset] & 0x1f;
+            if (nalType === 5)
+                return true;
+            i = nalOffset;
+        }
+    }
+    return false;
+}
 export class ScrcpyServer {
     httpServer;
     wss;
@@ -216,6 +237,23 @@ export class ScrcpyServer {
         this.currentDeviceId = devices[0].serial;
         return new Adb(await withTimeout(client.createTransport(devices[0]), this.config.adbConnectTimeoutMs, `Timed out connecting to ${devices[0].serial} via ADB`));
     }
+    async wakeDeviceScreen(deviceId) {
+        const targetDeviceId = deviceId || this.currentDeviceId;
+        const serialArg = targetDeviceId ? `-s ${JSON.stringify(targetDeviceId)} ` : '';
+        const commands = [
+            'input keyevent KEYCODE_WAKEUP',
+            'wm dismiss-keyguard',
+            'input keyevent 82',
+        ];
+        for (const command of commands) {
+            try {
+                await withTimeout(promiseExec(`adb ${serialArg}shell ${JSON.stringify(command)}`), 3000, `Timed out waking Android screen with: ${command}`);
+            }
+            catch (error) {
+                logger.warn(`wake screen command failed (${command}): ${error.message}`);
+            }
+        }
+    }
     // ============================================================
     // Scrcpy lifecycle
     // ============================================================
@@ -238,7 +276,7 @@ export class ScrcpyServer {
             sendFrameMeta: true,
             videoBitRate: options.videoBitRate ?? this.config.videoBitRate,
             videoCodec: 'h264',
-            maxFps: 60,
+            maxFps: 30,
         });
         onProgress?.('starting-service');
         const startPromise = AdbScrcpyClient.start(adb, DefaultServerPath, scrcpyOptions);
@@ -414,6 +452,7 @@ export class ScrcpyServer {
                         wsSend(ws, 'error', { message: 'No device found' });
                         return;
                     }
+                    await this.wakeDeviceScreen(this.currentDeviceId || requestedDeviceId);
                     state.scrcpyClient = await this.startScrcpy(state.adb, options || {}, emitStatus);
                     logger.info(`Scrcpy started for device=${this.currentDeviceId},client=${state.id}`);
                     const videoStreamRaw = state.scrcpyClient?.videoStream;
@@ -469,34 +508,18 @@ export class ScrcpyServer {
                     const reader = stream.getReader();
                     state.streamReader = reader;
                     const processStream = async () => {
-                        // 跳过开头的黑帧：直到收到一个数据量足够的关键帧才开始转发
-                        // 黑屏帧通常极小（<1KB），正常关键帧在 1080p 下至少 30KB+
-                        let gotValidKeyFrame = false;
                         try {
                             while (true) {
                                 const { done, value } = await reader.read();
                                 if (done)
                                     break;
+                                const data = value.data;
                                 const frameType = value.type || 'data';
-                                const isKey = !!(value.keyframe ?? value.keyFrame);
+                                const isKey = !!(value.keyframe ?? value.keyFrame) || isH264IdrFrame(data);
                                 const isConfig = frameType === 'configuration';
-                                // 还没拿到有效关键帧时，只保留 config 帧，跳过 P 帧和小关键帧
-                                if (!gotValidKeyFrame) {
-                                    if (isConfig) {
-                                        // config 帧总是转发（SPS/PPS），jmuxer 需要它
-                                    }
-                                    else if (isKey && value.data.byteLength > 10000) {
-                                        // 数据量足够的关键帧，说明屏幕已亮
-                                        gotValidKeyFrame = true;
-                                    }
-                                    else {
-                                        // P 帧或黑屏关键帧，跳过
-                                        continue;
-                                    }
-                                }
                                 if (ws.readyState !== WebSocket.OPEN)
                                     break;
-                                ws.send(buildVideoFrameBuffer(value.data, isKey, isConfig, Date.now()), { binary: true });
+                                ws.send(buildVideoFrameBuffer(data, isKey, isConfig, Date.now()), { binary: true });
                             }
                         }
                         catch (error) {