diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 5eed496e8c..6ac1b5e822 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -9,7 +9,6 @@ ], "crossProvider": { "apktool -> artifacts": 2, - "captures -> pcap": 2, "desktop -> electron": 1, "gpu -> artifacts": 2, "model -> artifacts": 1 diff --git a/scripts/lib/module-layers.mjs b/scripts/lib/module-layers.mjs index 4ece67d960..ee74e5d995 100644 --- a/scripts/lib/module-layers.mjs +++ b/scripts/lib/module-layers.mjs @@ -442,6 +442,17 @@ export const PROVIDER_DEPENDENCIES = Object.freeze([ reason: "active Electron capture checks the inspect-arguments fuse with the electron provider's fuse reader", }), + Object.freeze({ + from: "captures", + to: "pcap", + files: Object.freeze(["PcapConfiguration.ts"]), + // Live packet capture runs the same Wireshark tshark that the pcap + // provider runs. It locates, selects, versions and identity-checks it + // through pcap's Wireshark tool configuration, so REA_TSHARK_COMMAND and + // the executable identity rules have one owner. + reason: + "live packet capture selects and verifies tshark with the pcap provider's Wireshark tool configuration", + }), ]); /** Whether one provider-to-provider import is a declared dependency. */ diff --git a/scripts/verify/architecture-guards.mjs b/scripts/verify/architecture-guards.mjs index a3e9d25073..07dfd8862c 100644 --- a/scripts/verify/architecture-guards.mjs +++ b/scripts/verify/architecture-guards.mjs @@ -474,14 +474,14 @@ checkCounted( [], ); -// `tshark -T json` has one envelope reader, src/pcap/TsharkJsonPackets.ts, +// `tshark -T json` has one envelope reader, src/domain/pcap/tsharkJsonPackets.ts, // which owns malformed JSON, the packet array and each packet's layers. checkCounted( - "local tshark JSON envelope read (use parseTsharkJsonPackets or readTsharkJsonPackets from src/pcap/TsharkJsonPackets)", + "local tshark JSON envelope read (use parseTsharkJsonPackets or readTsharkJsonPackets from src/domain/pcap/tsharkJsonPackets)", "tshark-json-envelope", files, /\b_source\s*\.\s*layers\b/gu, - ["src/pcap/TsharkJsonPackets.ts"], + ["src/domain/pcap/tsharkJsonPackets.ts"], ); // Text from an unknown caught value has one owner, src/kernel/errorMessage.ts. diff --git a/scripts/verify/baselines/parser-json-parse.json b/scripts/verify/baselines/parser-json-parse.json index 4bee57a0c0..8586049310 100644 --- a/scripts/verify/baselines/parser-json-parse.json +++ b/scripts/verify/baselines/parser-json-parse.json @@ -6,6 +6,7 @@ "src/artifacts/deno/DenoSectionLayout.ts": 1, "src/domain/android/proguardMapping.ts": 1, "src/domain/apple/interfaceBuilderKeyedArchive.ts": 1, + "src/domain/pcap/tsharkJsonPackets.ts": 1, "src/evm/EvmoleInterfaceWorker.ts": 2, "src/firmware/FirmwareReports.ts": 1, "src/model/SafetensorsHeader.ts": 1, diff --git a/src/captures/parsePacketOutput.ts b/src/captures/parsePacketOutput.ts index f98df0bbee..96cf6d3a45 100644 --- a/src/captures/parsePacketOutput.ts +++ b/src/captures/parsePacketOutput.ts @@ -1,7 +1,7 @@ import { z } from "zod"; import { packetFieldsSchema } from "../domain/captures/packetCapture.js"; import { err, ok, type Result } from "../domain/result.js"; -import { readTsharkJsonPackets } from "../pcap/TsharkJsonPackets.js"; +import { readTsharkJsonPackets } from "../domain/pcap/tsharkJsonPackets.js"; const packetsSchema = z.array(packetFieldsSchema); diff --git a/src/pcap/TsharkJsonPackets.test.ts b/src/domain/pcap/tsharkJsonPackets.test.ts similarity index 98% rename from src/pcap/TsharkJsonPackets.test.ts rename to src/domain/pcap/tsharkJsonPackets.test.ts index 984686b59c..7f6a894fcc 100644 --- a/src/pcap/TsharkJsonPackets.test.ts +++ b/src/domain/pcap/tsharkJsonPackets.test.ts @@ -2,7 +2,7 @@ import { expect, it } from "vitest"; import { parseTsharkJsonPackets, readTsharkJsonPackets, -} from "./TsharkJsonPackets.js"; +} from "./tsharkJsonPackets.js"; const budget = (maxBytes: number, maxDecodedBytes: number) => ({ maxBytes, diff --git a/src/pcap/TsharkJsonPackets.ts b/src/domain/pcap/tsharkJsonPackets.ts similarity index 97% rename from src/pcap/TsharkJsonPackets.ts rename to src/domain/pcap/tsharkJsonPackets.ts index 89412efd6a..92c5cce21a 100644 --- a/src/pcap/TsharkJsonPackets.ts +++ b/src/domain/pcap/tsharkJsonPackets.ts @@ -1,6 +1,6 @@ import { setImmediate as yieldToEventLoop } from "node:timers/promises"; -import { isRecord } from "../domain/isRecord.js"; -import { err, ok, type Result } from "../domain/result.js"; +import { isRecord } from "../isRecord.js"; +import { err, ok, type Result } from "../result.js"; /** * One `tshark -T json` packet's `_source.layers` record. Export metadata diff --git a/src/pcap/PcapOutput.ts b/src/pcap/PcapOutput.ts index d0f3925b17..e2b2c67b99 100644 --- a/src/pcap/PcapOutput.ts +++ b/src/pcap/PcapOutput.ts @@ -3,7 +3,7 @@ import { readTsharkJsonPackets, type TsharkJsonBudget, type TsharkPacketLayers, -} from "./TsharkJsonPackets.js"; +} from "../domain/pcap/tsharkJsonPackets.js"; import { AnalysisProtocolError, AnalysisResourceConstraintError,