diff --git a/src/browser/CdpCanonicalJsonDigest.ts b/src/browser/CdpCanonicalJsonDigest.ts new file mode 100644 index 000000000..b7fa9f8d1 --- /dev/null +++ b/src/browser/CdpCanonicalJsonDigest.ts @@ -0,0 +1,10 @@ +import { createHash } from "node:crypto"; + +import canonicalize from "canonicalize"; + +/** Hash a value using the canonical JSON representation. */ +export const canonicalJsonDigest = (value: unknown): string => { + const encoded = canonicalize(value); + if (encoded === undefined) throw new TypeError("Expected canonical JSON"); + return createHash("sha256").update(encoded).digest("hex"); +}; diff --git a/src/browser/CdpElectronInspection.ts b/src/browser/CdpElectronInspection.ts index f8fe10459..cebdbb375 100644 --- a/src/browser/CdpElectronInspection.ts +++ b/src/browser/CdpElectronInspection.ts @@ -1,7 +1,3 @@ -import { createHash } from "node:crypto"; - -import canonicalize from "canonicalize"; - import type { ProgressReporter } from "../application/ProgressReporter.js"; import type { ElectronPageInspection, @@ -11,6 +7,7 @@ import { BrowserObservationError } from "../domain/errors.js"; import type { CdpConnection, CdpEvent } from "./CdpConnection.js"; import type { CdpEndpointDiscovery, CdpEndpointTarget } from "./CdpEndpoint.js"; import { CdpCaptureCompleteness } from "./CdpCaptureCompleteness.js"; +import { canonicalJsonDigest } from "./CdpCanonicalJsonDigest.js"; import { delayWithCancellation, numberValue, @@ -298,7 +295,7 @@ const captureResources = async ( ? null : Math.max(0, numberValue(resource.contentSize) ?? 0), }; - const resourceKey = `electron_resource_${digest(item)}`; + const resourceKey = `electron_resource_${canonicalJsonDigest(item)}`; if (seen.has(resourceKey)) continue; seen.add(resourceKey); resources.push({ @@ -381,12 +378,6 @@ const integer = (value: unknown, fallback: number): number => { return number === undefined ? fallback : Math.trunc(number); }; -const digest = (value: unknown): string => { - const encoded = canonicalize(value); - if (encoded === undefined) throw new TypeError("Expected canonical JSON"); - return createHash("sha256").update(encoded).digest("hex"); -}; - const report = async ( progress: ProgressReporter | undefined, completed: number, diff --git a/src/browser/CdpElectronScripts.ts b/src/browser/CdpElectronScripts.ts index 7ba55db96..8048c6a3b 100644 --- a/src/browser/CdpElectronScripts.ts +++ b/src/browser/CdpElectronScripts.ts @@ -1,7 +1,3 @@ -import { createHash } from "node:crypto"; - -import canonicalize from "canonicalize"; - import type { ElectronPageInspection, InspectElectronPageInput, @@ -9,6 +5,7 @@ import type { import { createWebTextArtifact } from "../domain/webContentArtifact.js"; import type { CdpConnection } from "./CdpConnection.js"; import { CdpCaptureCompleteness } from "./CdpCaptureCompleteness.js"; +import { canonicalJsonDigest } from "./CdpCanonicalJsonDigest.js"; import { requiredRecord, stringValue } from "./CdpCaptureValues.js"; import type { ElectronScriptDraft } from "./CdpElectronScriptEvents.js"; import { authorizedElectronFile } from "./ElectronFileScope.js"; @@ -52,7 +49,7 @@ export const captureElectronScripts = async ( is_module: script.isModule, language: script.language, }; - const scriptKey = `electron_script_${digest(identity)}`; + const scriptKey = `electron_script_${canonicalJsonDigest(identity)}`; if (seen.has(scriptKey)) continue; seen.add(scriptKey); total += 1; @@ -105,9 +102,3 @@ const captureScriptSource = async ( }, }; }; - -const digest = (value: unknown): string => { - const encoded = canonicalize(value); - if (encoded === undefined) throw new TypeError("Expected canonical JSON"); - return createHash("sha256").update(encoded).digest("hex"); -};