mirror of
https://github.com/Tencent/BrowserSkill.git
synced 2026-09-10 13:01:23 +08:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
618bd6a0df | ||
|
|
c455a09fc3 | ||
|
|
b6be356e40 | ||
|
|
3c77ef7b01 |
@@ -45,10 +45,32 @@ function portHarness() {
|
|||||||
|
|
||||||
describe("RecordFrameAgent", () => {
|
describe("RecordFrameAgent", () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
vi.unstubAllGlobals();
|
||||||
document.documentElement.removeAttribute(RECORD_DOCUMENT_ATTRIBUTE);
|
document.documentElement.removeAttribute(RECORD_DOCUMENT_ATTRIBUTE);
|
||||||
document.body.replaceChildren();
|
document.body.replaceChildren();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("starts when crypto.randomUUID is unavailable", async () => {
|
||||||
|
const harness = portHarness();
|
||||||
|
const getRandomValues = vi.fn((bytes: Uint8Array) => {
|
||||||
|
bytes.fill(0x11);
|
||||||
|
return bytes;
|
||||||
|
});
|
||||||
|
vi.stubGlobal("crypto", { getRandomValues });
|
||||||
|
vi.stubGlobal("chrome", {
|
||||||
|
runtime: {
|
||||||
|
connect: vi.fn(() => harness.port),
|
||||||
|
sendMessage: vi.fn(),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const agent = new RecordFrameAgent();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
agent.start({ type: RECORD_FRAME_START, requestId: "rec-http", startedAtMs: 10 }),
|
||||||
|
).resolves.toEqual({ ok: true });
|
||||||
|
expect(getRandomValues).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it("keeps a failed stop retryable and flushes the final dirty fill", async () => {
|
it("keeps a failed stop retryable and flushes the final dirty fill", async () => {
|
||||||
const harness = portHarness();
|
const harness = portHarness();
|
||||||
const sendMessage = vi
|
const sendMessage = vi
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { createRandomUuid } from "@/lib/random-uuid";
|
||||||
import {
|
import {
|
||||||
isAcceptedRecordStepAck,
|
isAcceptedRecordStepAck,
|
||||||
RECORD_STEP,
|
RECORD_STEP,
|
||||||
@@ -18,7 +19,7 @@ export class RecordStepDelivery {
|
|||||||
constructor(
|
constructor(
|
||||||
requestId: string,
|
requestId: string,
|
||||||
send: SendRecordStepMessage = (message) => chrome.runtime.sendMessage(message),
|
send: SendRecordStepMessage = (message) => chrome.runtime.sendMessage(message),
|
||||||
producerId: string = crypto.randomUUID(),
|
producerId: string = createRandomUuid(),
|
||||||
) {
|
) {
|
||||||
this.#requestId = requestId;
|
this.#requestId = requestId;
|
||||||
this.#producerId = producerId;
|
this.#producerId = producerId;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { createRandomUuid } from "@/lib/random-uuid";
|
||||||
import {
|
import {
|
||||||
markRecordingDocument,
|
markRecordingDocument,
|
||||||
type RecordingDocumentMarker,
|
type RecordingDocumentMarker,
|
||||||
@@ -67,7 +68,7 @@ export class RecordFrameAgent {
|
|||||||
async #start(
|
async #start(
|
||||||
message: RecordFrameStartMessage,
|
message: RecordFrameStartMessage,
|
||||||
): Promise<{ ok: true } | { ok: false; error: string }> {
|
): Promise<{ ok: true } | { ok: false; error: string }> {
|
||||||
const producerId = crypto.randomUUID();
|
const producerId = createRandomUuid();
|
||||||
const root = await waitForDocumentElement();
|
const root = await waitForDocumentElement();
|
||||||
if (this.#disposed) return { ok: false, error: "recording document is disposed" };
|
if (this.#disposed) return { ok: false, error: "recording document is disposed" };
|
||||||
const marker = markRecordingDocument(producerId, root);
|
const marker = markRecordingDocument(producerId, root);
|
||||||
|
|||||||
@@ -0,0 +1,30 @@
|
|||||||
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||||
|
import { createRandomUuid } from "../random-uuid";
|
||||||
|
|
||||||
|
describe("createRandomUuid", () => {
|
||||||
|
afterEach(() => {
|
||||||
|
vi.unstubAllGlobals();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("uses crypto.randomUUID when it is available", () => {
|
||||||
|
const randomUUID = vi.fn(() => "00000000-0000-4000-8000-000000000000");
|
||||||
|
vi.stubGlobal("crypto", { randomUUID, getRandomValues: vi.fn() });
|
||||||
|
|
||||||
|
expect(createRandomUuid()).toBe("00000000-0000-4000-8000-000000000000");
|
||||||
|
expect(randomUUID).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("falls back to getRandomValues and sets UUID v4 bits", () => {
|
||||||
|
const bytes = new Uint8Array(16).fill(0xff);
|
||||||
|
const getRandomValues = vi.fn((target: Uint8Array) => {
|
||||||
|
target.set(bytes);
|
||||||
|
return target;
|
||||||
|
});
|
||||||
|
vi.stubGlobal("crypto", { getRandomValues });
|
||||||
|
|
||||||
|
const uuid = createRandomUuid();
|
||||||
|
|
||||||
|
expect(uuid).toBe("ffffffff-ffff-4fff-bfff-ffffffffffff");
|
||||||
|
expect(getRandomValues).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
/**
|
||||||
|
* Generate a UUID v4 in browser contexts where randomUUID() is unavailable.
|
||||||
|
*
|
||||||
|
* Crypto.randomUUID() is restricted to secure contexts, while
|
||||||
|
* crypto.getRandomValues() is available to content scripts on ordinary HTTP
|
||||||
|
* origins. BrowserSkill records many intranet pages served over HTTP, so the
|
||||||
|
* fallback is required for recording to work on those pages.
|
||||||
|
*/
|
||||||
|
export function createRandomUuid(): string {
|
||||||
|
const cryptoApi = globalThis.crypto;
|
||||||
|
if (typeof cryptoApi.randomUUID === "function") return cryptoApi.randomUUID();
|
||||||
|
|
||||||
|
const bytes = new Uint8Array(16);
|
||||||
|
cryptoApi.getRandomValues(bytes);
|
||||||
|
bytes[6] = (bytes[6]! & 0x0f) | 0x40;
|
||||||
|
bytes[8] = (bytes[8]! & 0x3f) | 0x80;
|
||||||
|
|
||||||
|
const hex = Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
|
||||||
|
return [
|
||||||
|
hex.slice(0, 8),
|
||||||
|
hex.slice(8, 12),
|
||||||
|
hex.slice(12, 16),
|
||||||
|
hex.slice(16, 20),
|
||||||
|
hex.slice(20),
|
||||||
|
].join("-");
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { createRandomUuid } from "../random-uuid";
|
||||||
import {
|
import {
|
||||||
isRecordFrameQueryMessage,
|
isRecordFrameQueryMessage,
|
||||||
RECORD_FRAME_PORT,
|
RECORD_FRAME_PORT,
|
||||||
@@ -188,7 +189,7 @@ export class RecordFrameCoordinator {
|
|||||||
const recording = this.#recordings.get(requestId);
|
const recording = this.#recordings.get(requestId);
|
||||||
if (!recording) return true;
|
if (!recording) return true;
|
||||||
recording.finishing = true;
|
recording.finishing = true;
|
||||||
const commandId = crypto.randomUUID();
|
const commandId = createRandomUuid();
|
||||||
const results = await Promise.all(
|
const results = await Promise.all(
|
||||||
[...recording.agents.values()].map((agent) => this.#stopAgent(agent, requestId, commandId)),
|
[...recording.agents.values()].map((agent) => this.#stopAgent(agent, requestId, commandId)),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -761,6 +761,7 @@ fn stage_windows_replacement(
|
|||||||
.with_context(|| format!("write {}", paths.script_path.display()))?;
|
.with_context(|| format!("write {}", paths.script_path.display()))?;
|
||||||
|
|
||||||
const CREATE_NO_WINDOW: u32 = 0x0800_0000;
|
const CREATE_NO_WINDOW: u32 = 0x0800_0000;
|
||||||
|
const CREATE_NEW_PROCESS_GROUP: u32 = 0x0000_0200;
|
||||||
let command = format!("\"{}\"", paths.script_path.display());
|
let command = format!("\"{}\"", paths.script_path.display());
|
||||||
if let Err(err) = Command::new("cmd.exe")
|
if let Err(err) = Command::new("cmd.exe")
|
||||||
.args(["/D", "/S", "/C"])
|
.args(["/D", "/S", "/C"])
|
||||||
@@ -768,7 +769,7 @@ fn stage_windows_replacement(
|
|||||||
.stdin(Stdio::null())
|
.stdin(Stdio::null())
|
||||||
.stdout(Stdio::null())
|
.stdout(Stdio::null())
|
||||||
.stderr(Stdio::null())
|
.stderr(Stdio::null())
|
||||||
.creation_flags(CREATE_NO_WINDOW)
|
.creation_flags(CREATE_NO_WINDOW | CREATE_NEW_PROCESS_GROUP)
|
||||||
.spawn()
|
.spawn()
|
||||||
{
|
{
|
||||||
let _ = std::fs::remove_file(&paths.binary_path);
|
let _ = std::fs::remove_file(&paths.binary_path);
|
||||||
@@ -806,7 +807,7 @@ fn windows_replacement_script(target: &Path, staged_binary: &Path, restart_daemo
|
|||||||
:retry\r\n\
|
:retry\r\n\
|
||||||
move /Y \"{staged_binary}\" \"{target}\" >nul 2>nul\r\n\
|
move /Y \"{staged_binary}\" \"{target}\" >nul 2>nul\r\n\
|
||||||
if errorlevel 1 (\r\n\
|
if errorlevel 1 (\r\n\
|
||||||
timeout /t 1 /nobreak >nul\r\n\
|
ping -n 2 127.0.0.1 >nul\r\n\
|
||||||
goto retry\r\n\
|
goto retry\r\n\
|
||||||
)\r\n\
|
)\r\n\
|
||||||
{restart}\
|
{restart}\
|
||||||
@@ -1007,6 +1008,8 @@ mod tests {
|
|||||||
|
|
||||||
assert!(script.contains(":retry"));
|
assert!(script.contains(":retry"));
|
||||||
assert!(script.contains("move /Y"));
|
assert!(script.contains("move /Y"));
|
||||||
|
assert!(script.contains("ping -n 2 127.0.0.1"));
|
||||||
|
assert!(!script.contains("timeout"));
|
||||||
assert!(script.contains(r#"start "" /B "C:\Program Files\bsk.exe" daemon start"#));
|
assert!(script.contains(r#"start "" /B "C:\Program Files\bsk.exe" daemon start"#));
|
||||||
assert!(script.contains(r#"del /F /Q "%~f0""#));
|
assert!(script.contains(r#"del /F /Q "%~f0""#));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user