rk86 2.0.4 → 2.0.6

package/package.json

@@ -1,12 +1,19 @@
 {
     "name": "rk86",
-    "version": "2.0.4",
+    "version": "2.0.6",
     "description": "Эмулятор Радио-86РК (Intel 8080) для терминала",
     "bin": {
         "rk86": "rk86.js"
     },
     "type": "module",
-    "keywords": ["rk86", "radio-86rk", "emulator", "intel-8080", "i8080", "retro"],
+    "keywords": [
+        "rk86",
+        "radio-86rk",
+        "emulator",
+        "intel-8080",
+        "i8080",
+        "retro"
+    ],
     "author": "Alexander Demin",
     "license": "MIT",
     "repository": {

package/rk86.js

@@ -1588,6 +1588,10 @@ var init_catalog_data = __esm(() => {
   ];
 });
 
+// src/lib/rk86_terminal.ts
+import { existsSync } from "fs";
+import { readFile } from "fs/promises";
+
 // src/lib/hex.ts
 function hex(v, prefix) {
   return v.toString(16).toUpperCase();
@@ -3701,12 +3705,12 @@ function decodeMon32() {
   return Array.from(new Uint8Array(Uint8Array.from(atob(MON32_B64), (c) => c.charCodeAt(0))));
 }
 async function fetchFile(name) {
-  try {
-    const data = await Bun.file(name).arrayBuffer();
-    return Array.from(new Uint8Array(data));
-  } catch {
-    console.error(`\u043E\u0448\u0438\u0431\u043A\u0430 \u0437\u0430\u0433\u0440\u0443\u0437\u043A\u0438 \u0444\u0430\u0439\u043B\u0430: ${name}`);
+  if (!existsSync(name)) {
+    console.error(`\u0444\u0430\u0439\u043B \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D: ${name}`);
+    process.exit(1);
   }
+  const data = await readFile(name);
+  return Array.from(data);
 }
 function printHelp() {
   console.log(`\u042D\u043C\u0443\u043B\u044F\u0442\u043E\u0440 \u0420\u0430\u0434\u0438\u043E-86\u0420\u041A (\u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B)
@@ -3716,15 +3720,15 @@ function printHelp() {
 \u041E\u043F\u0446\u0438\u0438:
   -h              \u0441\u043F\u0440\u0430\u0432\u043A\u0430
   -l              \u0441\u043F\u0438\u0441\u043E\u043A \u0444\u0430\u0439\u043B\u043E\u0432 \u0438\u0437 \u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0430
-  -m <\u0444\u0430\u0439\u043B>      \u043C\u043E\u043D\u0438\u0442\u043E\u0440 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E: \u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439 mon32.bin)
+  -m <\u0444\u0430\u0439\u043B>       \u043C\u043E\u043D\u0438\u0442\u043E\u0440 (\u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E: \u0432\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0439 mon32.bin)
   -p              \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0430\u0439\u043B \u0431\u0435\u0437 \u0437\u0430\u043F\u0443\u0441\u043A\u0430
 
 \u041F\u0440\u0438\u043C\u0435\u0440\u044B:
-  bun rk86.ts                  \u0437\u0430\u043F\u0443\u0441\u043A \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u0430
-  bun rk86.ts CHESS.GAM        \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0438 \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0444\u0430\u0439\u043B
-  bun rk86.ts -p CHESS.GAM     \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0430\u0439\u043B (\u0431\u0435\u0437 \u0437\u0430\u043F\u0443\u0441\u043A\u0430)
-  bun rk86.ts -m mon16.bin     \u0437\u0430\u043F\u0443\u0441\u043A \u0441 \u0434\u0440\u0443\u0433\u0438\u043C \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u043E\u043C
-  bun rk86.ts -l               \u0441\u043F\u0438\u0441\u043E\u043A \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0445 \u0444\u0430\u0439\u043B\u043E\u0432
+  bunx rk86                  \u0437\u0430\u043F\u0443\u0441\u043A \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u0430
+  bunx rk86 CHESS.GAM        \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0438 \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u044C \u0444\u0430\u0439\u043B
+  bunx rk86 -p CHESS.GAM     \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0444\u0430\u0439\u043B (\u0431\u0435\u0437 \u0437\u0430\u043F\u0443\u0441\u043A\u0430)
+  bunx rk86 -m mon16.bin     \u0437\u0430\u043F\u0443\u0441\u043A \u0441 \u0434\u0440\u0443\u0433\u0438\u043C \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u043E\u043C
+  bunx rk86 -l               \u0441\u043F\u0438\u0441\u043E\u043A \u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B\u0445 \u0444\u0430\u0439\u043B\u043E\u0432
 
 \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435:
   Ctrl+C    \u0432\u044B\u0445\u043E\u0434`);
@@ -3753,7 +3757,7 @@ async function main() {
   const loadOnly = args.includes("-p");
   const monitorIdx = args.indexOf("-m");
   const monitorFile_ = monitorIdx >= 0 ? args[monitorIdx + 1] : undefined;
-  const positional = args.filter((a, i) => !a.startsWith("-") && i !== monitorIdx + 1);
+  const positional = args.filter((a, i) => !a.startsWith("-") && (monitorIdx < 0 || i !== monitorIdx + 1));
   const programFile = positional[0];
   const keyboard = new Keyboard;
   const io = new IO;
@@ -3770,26 +3774,12 @@ async function main() {
   machine.tape = new Tape(machine);
   machine.runner = new Runner(machine);
   machine.memory.update_ruslat = machine.ui.update_ruslat;
-  let monitorContent;
-  if (monitorFile_) {
-    const content = await fetchFile(monitorFile_);
-    if (!content) {
-      console.error(`\u043C\u043E\u043D\u0438\u0442\u043E\u0440 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D: ${monitorFile_}`);
-      process.exit(1);
-    }
-    monitorContent = content;
-  } else {
-    monitorContent = decodeMon32();
-  }
+  const monitorContent = monitorFile_ ? await fetchFile(monitorFile_) : decodeMon32();
   const monitorFile = parse_rk86_binary(monitorFile_ || "mon32.bin", monitorContent);
   machine.memory.load_file(monitorFile);
   let entryPoint;
   if (programFile) {
     const content = await fetchFile(programFile);
-    if (!content) {
-      console.error(`\u0444\u0430\u0439\u043B \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D: ${programFile}`);
-      process.exit(1);
-    }
     const file = parse_rk86_binary(programFile, content);
     machine.memory.load_file(file);
     entryPoint = file.entry;