(chore): remove unneccesary code and add mode tracking to the telemetry.

Author: collapsinghierarchy

src/commands/recv.js

@@ -165,8 +165,10 @@ export async function run(outDir, opts, ctx = {}) {
     const throughputStr = humanThroughput(written, durationMs);
     const stats = sink.getStats?.() || {};
     const announced = Number.isFinite(stats.announced) ? stats.announced : null;
+    const hasAnnounced =
+      announced != null && (announced > 0 || (announced === 0 && written === 0));
     let announcedValue = "—";
-    if (announced != null) {
+    if (hasAnnounced) {
       const delta = announced - written;
       const deltaSuffix =
         delta === 0
@@ -202,7 +204,6 @@ export async function run(outDir, opts, ctx = {}) {
     // Return a structured result for programmatic use
     return {
       bytesWritten: written,
-      announcedBytes: stats.announced ?? 0,
       label: stats.label ?? null,
       path: stats.filePath ?? null,
       mode,
@@ -242,7 +243,7 @@ function makeSniffingSink({ outToStdout, outPath, appID, overwrite, onStart, onP
     filePath,
     started = false,
     written = 0,
-    announced = 0,
+    announced = null,
     label = null,
     desiredName = null; // <- set by sink.info({ name }) (sanitize it)
 
@@ -343,50 +344,4 @@ function makeSniffingSink({ outToStdout, outPath, appID, overwrite, onStart, onP
 
     onProgress,
   };
-}
-
-/**
- * Dumb sink: write everything to a single file (or stdout).
- * - If outToStdout is true, all data goes to process.stdout.
- * - Otherwise, if outPath is given it's treated as a FILE path.
- * - Otherwise we write ./nt-${appID || 'transfer'}.bin
- */
-export function makeSniffingDumbSink({ outToStdout = false, outPath, appID = "transfer", overwrite = false, onProgress } = {}) {
-  let stream;
-  let filePath = outToStdout ? null : (outPath
-    ? path.resolve(outPath)
-    : path.resolve(process.cwd(), `nt-${appID}.bin`)
-  );
-  let written = 0;
-
-  if (outToStdout) {
-    stream = process.stdout;
-  } else {
-    // ensure the directory exists
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    stream = fs.createWriteStream(filePath, {
-      flags: overwrite ? "w" : "wx", // "wx" -> error if exists
-    });
-  }
-
-  return {
-    async write(chunk) {
-      const buf = chunk instanceof Uint8Array ? chunk : Buffer.from(chunk);
-      if (buf.byteLength === 0) return;
-
-      await new Promise((res, rej) => stream.write(buf, (e) => (e ? rej(e) : res())));
-      written += buf.byteLength;
-      if (onProgress) onProgress({ w: written, t: 0 });
-    },
-
-    async close() {
-      if (!stream || stream === process.stdout) return;
-      await new Promise((res) => stream.end(res));
-    },
-
-    // Optional helper for callers
-    getStats() {
-      return { written, filePath };
-    },
-  };
-}
+}

src/commands/send.js

@@ -130,7 +130,8 @@ export async function run(paths, opts, ctx = {}) {
   getLogger().debug("send: RTC connected");
   let peerCloseObservedAt = null;
   try {
-    signal.send?.({ type: "telemetry", event: "ice-connected", sessionId });
+    const mode = opts.pq === true ? "pq" : "dtls";
+    signal.send?.({ type: "telemetry", event: "ice-connected", sessionId, mode });
     getLogger().debug("send: announced telemetry ice-connected");
   } catch (err) {
     getLogger().debug("send: failed to announce telemetry ice-connected", err);

src/transfer/default.js

@@ -287,8 +287,18 @@ export async function defaultRecv(rtc, { sessionId, sink, onProgress, assumeYes
       // INIT
       const init = safe(() => parseStreamInit(m));
       if (init && init.sessionId === sessionId) {
-        announced = Number(init.totalBytes) || 0;
-        getLogger().debug(`DTLS: recv INIT totalBytes=${announced}`);
+        const total = Number(init.totalBytes);
+        if (Number.isFinite(total) && total >= 0) {
+          announced = total;
+          try {
+            sink.info?.({ totalBytes: total });
+          } catch {}
+        } else {
+          announced = null;
+        }
+        getLogger().debug(
+          `DTLS: recv INIT totalBytes=${announced != null ? announced : "(none)"}`,
+        );
         return;
       }
 
@@ -313,10 +323,13 @@ export async function defaultRecv(rtc, { sessionId, sink, onProgress, assumeYes
         run(async () => {
           await sink.write(u8);
           written += u8.byteLength;
-          if (written % 4096 === 0 || (announced && written === announced))
+          if (
+            written % 4096 === 0 ||
+            (Number.isFinite(announced) && announced > 0 && written === announced)
+          )
             getLogger().debug(`DTLS: recv DATA written=${written}`);
           try {
-            onProgress?.(written, announced || 0);
+            onProgress?.(written, announced ?? 0);
           } catch {}
         });
         return;
@@ -331,7 +344,7 @@ export async function defaultRecv(rtc, { sessionId, sink, onProgress, assumeYes
           if (queueErr) throw queueErr;
         }).finally(() => {
           offMsg?.();
-          if (announced != null && announced !== 0 && written !== announced) {
+          if (Number.isFinite(announced) && announced >= 0 && written !== announced) {
             getLogger().debug(`recv FIN mismatch written=${written} announced=${announced}`);
             rejectDone(
               new NoisyError({

src/transfer/pq.js

@@ -285,12 +285,28 @@ export async function pqRecv(rtc, { sessionId, sink, onProgress, assumeYes }) {
   // Import SPKI bytes to a CryptoKey for verification
   const verifyKey = await importVerifyKey(spkiBytes);
 
+  let announcedTotal = null;
+  const handleProgress = (bytes, total) => {
+    if (
+      announcedTotal == null &&
+      Number.isFinite(total) &&
+      total >= 0
+    ) {
+      announcedTotal = total;
+      try {
+        sinkStripping.info?.({ totalBytes: total });
+      } catch {}
+    }
+    try {
+      onProgress?.(bytes, total);
+    } catch {}
+  };
 
   await recvFileWithAuth({
     tx: rtc,
     sessionId: streamSid(sessionId),
     sink: sinkStripping,        // <- strip the meta header
-    onProgress,
+    onProgress: handleProgress,
     hpke: { ownPriv: kp.privateKey },
     sign: {
       // Prefer explicit verify key from noisyauth if present; otherwise the FIN carries SPKI