c64bridge 1.0.5 → 1.0.7

package/scripts/mockC64Server.mjs

@@ -685,7 +685,21 @@ export async function startMockC64Server(options = {}) {
       const lengthValue = routeUrl.searchParams.get("length") ?? "256";
       const address = parseNumeric(addressValue);
       const length = Math.max(0, parseNumeric(lengthValue, 10));
-      const bytes = readMemoryWithHeartbeat(state, address, length);
+      // Same checks as the firmware (route_machine.cc readmem).
+      if (length < 1 || length > 65536) {
+        sendJson(res, { errors: ["Invalid length"] }, 400);
+        return;
+      }
+      if (address + length > 65536) {
+        sendJson(res, { errors: ["Memory read exceeds location $FFFF"] }, 400);
+        return;
+      }
+      const bytes = Uint8Array.from(readMemoryWithHeartbeat(state, address, length));
+      // SID registers $D400-$D418 are write-only; the Ultimate 64 reads them as $00.
+      for (let i = 0; i < bytes.length; i += 1) {
+        const target = address + i;
+        if (target >= 0xd400 && target <= 0xd418) bytes[i] = 0;
+      }
 
       const accept = String(req.headers["accept"] || "");
       if (accept.includes("application/octet-stream")) {

package/scripts/run-coverage.mjs

@@ -98,7 +98,10 @@ export async function main() {
     legOutputs.push(legPath);
   }
 
-  const finalReport = mergeReports(await Promise.all(legOutputs.map(readReport)));
+  const finalReport = await dropNonCodeLines(
+    mergeReports(await Promise.all(legOutputs.map(readReport))),
+    (relativePath) => fs.readFile(path.join(repoRoot, relativePath), "utf8"),
+  );
   const finalPath = path.join(coverageDir, "lcov.info");
   await fs.writeFile(finalPath, serializeReport(finalReport), "utf8");
 
@@ -265,6 +268,33 @@ function parseReport(text) {
   return report;
 }
 
+/**
+ * Bun's LCOV output lists blank and comment-only lines inside executed
+ * functions as executable lines that were never hit. Drop them, using each
+ * file's source, so coverage counts only code.
+ */
+export async function dropNonCodeLines(report, readSource) {
+  const result = new Map();
+  for (const [filePath, record] of report.entries()) {
+    let sourceLines;
+    try {
+      sourceLines = (await readSource(filePath)).split(/\r?\n/);
+    } catch {
+      result.set(filePath, record);
+      continue;
+    }
+    const lines = new Map();
+    for (const [lineNo, hits] of record.lines.entries()) {
+      const text = (sourceLines[lineNo - 1] ?? "").trim();
+      const isComment = text.startsWith("//") || text.startsWith("/*") || text.startsWith("*");
+      if (text === "" || isComment) continue;
+      lines.set(lineNo, hits);
+    }
+    result.set(filePath, { ...record, lines });
+  }
+  return result;
+}
+
 function mergeReports(reports) {
   const merged = new Map();
   for (const report of reports) {

package/scripts/update-readme.ts

@@ -485,8 +485,9 @@ export async function updateReadme(): Promise<boolean> {
   const generatedDocs = `\n\n${buildDocumentation()}\n\n`;
   const generatedEnv = `\n\n${buildEnvironmentDocumentation()}\n\n`;
   const nextReadme = readme
-    .replace(docsPattern, `${START_MARKER}${generatedDocs}${END_MARKER}`)
-    .replace(envPattern, `${ENV_START_MARKER}${generatedEnv}${ENV_END_MARKER}`);
+    // Replacement functions, not strings: generated text such as "$1E" must not be read as "$1".
+    .replace(docsPattern, () => `${START_MARKER}${generatedDocs}${END_MARKER}`)
+    .replace(envPattern, () => `${ENV_START_MARKER}${generatedEnv}${ENV_END_MARKER}`);
 
   if (nextReadme === readme) {
     return false;

package/server.json

@@ -8,12 +8,12 @@
     "source": "github"
   },
   "websiteUrl": "https://github.com/chrisgleissner/c64bridge",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "c64bridge",
-      "version": "1.0.5",
+      "version": "1.0.7",
       "transport": {
         "type": "stdio"
       },
@@ -38,11 +38,12 @@
         },
         {
           "name": "C64_MODE",
-          "description": "Active backend.",
+          "description": "Active backend (c64u/U64 hardware, u2/U2-family cartridge, or vice emulator).",
           "format": "string",
           "default": "c64u",
           "choices": [
             "c64u",
+            "u2",
             "vice"
           ]
         },
@@ -64,6 +65,22 @@
           "format": "string",
           "isSecret": true
         },
+        {
+          "name": "U2_HOST",
+          "description": "U2/U2+/U2+L host name or IP address when C64_MODE=u2.",
+          "format": "string"
+        },
+        {
+          "name": "U2_PORT",
+          "description": "U2-family REST port when C64_MODE=u2.",
+          "format": "number"
+        },
+        {
+          "name": "U2_PASSWORD",
+          "description": "U2-family network password sent as X-Password.",
+          "format": "string",
+          "isSecret": true
+        },
         {
           "name": "VICE_BINARY",
           "description": "VICE emulator binary to launch.",