v86 0.5.43 → 0.5.64

package/build/libv86-debug.js

@@ -3845,42 +3845,56 @@ $FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.connect = fun
 $FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.tcp_probe = function($port$jscomp$1$$) {
   return $fake_tcp_probe$$module$src$browser$fake_network$$($port$jscomp$1$$, this);
 };
-async function $on_data_http$$module$src$browser$fetch_network$$($data$jscomp$132_headers_opts$$) {
+async function $on_data_http$$module$src$browser$fetch_network$$($data$jscomp$132_data$jscomp$133_offset$jscomp$48$$) {
   this.read = this.read || "";
-  if ((this.read += (new TextDecoder).decode($data$jscomp$132_headers_opts$$)) && -1 !== this.read.indexOf("\r\n\r\n")) {
-    var $data$jscomp$133_offset$jscomp$48$$ = this.read.indexOf("\r\n\r\n");
-    $data$jscomp$132_headers_opts$$ = this.read.substring(0, $data$jscomp$133_offset$jscomp$48$$).split(/\r\n/);
-    $data$jscomp$133_offset$jscomp$48$$ = this.read.substring($data$jscomp$133_offset$jscomp$48$$ + 4);
+  if ((this.read += (new TextDecoder).decode($data$jscomp$132_data$jscomp$133_offset$jscomp$48$$)) && -1 !== this.read.indexOf("\r\n\r\n")) {
+    $data$jscomp$132_data$jscomp$133_offset$jscomp$48$$ = this.read.indexOf("\r\n\r\n");
+    var $headers_localport_opts$$ = this.read.substring(0, $data$jscomp$132_data$jscomp$133_offset$jscomp$48$$).split(/\r\n/);
+    $data$jscomp$132_data$jscomp$133_offset$jscomp$48$$ = this.read.substring($data$jscomp$132_data$jscomp$133_offset$jscomp$48$$ + 4);
     this.read = "";
-    let $first_line$$ = $data$jscomp$132_headers_opts$$[0].split(" "), $target$jscomp$93$$;
+    let $first_line$$ = $headers_localport_opts$$[0].split(" "), $target$jscomp$93$$;
     $target$jscomp$93$$ = /^https?:/.test($first_line$$[1]) ? new URL($first_line$$[1]) : new URL("http://host" + $first_line$$[1]);
     "undefined" !== typeof window && "http:" === $target$jscomp$93$$.protocol && "https:" === window.location.protocol && ($target$jscomp$93$$.protocol = "https:");
     let $req_headers$$ = new Headers;
-    for (let $i$jscomp$51$$ = 1; $i$jscomp$51$$ < $data$jscomp$132_headers_opts$$.length; ++$i$jscomp$51$$) {
-      const $header$jscomp$3$$ = this.net.parse_http_header($data$jscomp$132_headers_opts$$[$i$jscomp$51$$]);
+    for (let $i$jscomp$51$$ = 1; $i$jscomp$51$$ < $headers_localport_opts$$.length; ++$i$jscomp$51$$) {
+      const $header$jscomp$3$$ = this.net.parse_http_header($headers_localport_opts$$[$i$jscomp$51$$]);
       if (!$header$jscomp$3$$) {
-        console.warn('The request contains an invalid header: "%s"', $data$jscomp$132_headers_opts$$[$i$jscomp$51$$]);
-        this.write((new TextEncoder).encode("HTTP/1.1 400 Bad Request\r\nContent-Length: 0"));
+        console.warn('The request contains an invalid header: "%s"', $headers_localport_opts$$[$i$jscomp$51$$]);
+        this.net.respond_text_and_close(this, 400, "Bad Request", `Invalid header in request: ${$headers_localport_opts$$[$i$jscomp$51$$]}`);
         return;
       }
       "host" === $header$jscomp$3$$.key.toLowerCase() ? $target$jscomp$93$$.host = $header$jscomp$3$$.value : $req_headers$$.append($header$jscomp$3$$.key, $header$jscomp$3$$.value);
     }
+    if (!this.net.cors_proxy && /^\d+\.external$/.test($target$jscomp$93$$.hostname)) {
+      if ($dbg_log$$module$src$log$$("Request to localhost: " + $target$jscomp$93$$.href, 16777216), $headers_localport_opts$$ = parseInt($target$jscomp$93$$.hostname.split(".")[0], 10), !isNaN($headers_localport_opts$$) && 0 < $headers_localport_opts$$ && 65536 > $headers_localport_opts$$) {
+        $target$jscomp$93$$.protocol = "http:", $target$jscomp$93$$.hostname = "localhost", $target$jscomp$93$$.port = $headers_localport_opts$$.toString(10);
+      } else {
+        console.warn('Unknown port for localhost: "%s"', $target$jscomp$93$$.href);
+        this.net.respond_text_and_close(this, 400, "Bad Request", `Unknown port for localhost: ${$target$jscomp$93$$.href}`);
+        return;
+      }
+    }
     $dbg_log$$module$src$log$$("HTTP Dispatch: " + $target$jscomp$93$$.href, 16777216);
     this.name = $target$jscomp$93$$.href;
-    $data$jscomp$132_headers_opts$$ = {method:$first_line$$[0], headers:$req_headers$$, };
-    -1 !== ["put", "post"].indexOf($data$jscomp$132_headers_opts$$.method.toLowerCase()) && ($data$jscomp$132_headers_opts$$.body = $data$jscomp$133_offset$jscomp$48$$);
-    const $fetch_url$jscomp$1$$ = this.net.cors_proxy ? this.net.cors_proxy + encodeURIComponent($target$jscomp$93$$.href) : $target$jscomp$93$$.href, $encoder$$ = new TextEncoder;
+    $headers_localport_opts$$ = {method:$first_line$$[0], headers:$req_headers$$, };
+    -1 !== ["put", "post"].indexOf($headers_localport_opts$$.method.toLowerCase()) && ($headers_localport_opts$$.body = $data$jscomp$132_data$jscomp$133_offset$jscomp$48$$);
+    const $fetch_url$jscomp$1$$ = this.net.cors_proxy ? this.net.cors_proxy + encodeURIComponent($target$jscomp$93$$.href) : $target$jscomp$93$$.href;
+    new TextEncoder;
     let $response_started$$ = !1;
-    this.net.fetch($fetch_url$jscomp$1$$, $data$jscomp$132_headers_opts$$).then($resp$jscomp$1$$ => {
-      const $header_lines$$ = [`HTTP/1.1 ${$resp$jscomp$1$$.status} ${$resp$jscomp$1$$.statusText}`, `x-was-fetch-redirected: ${!!$resp$jscomp$1$$.redirected}`, `x-fetch-resp-url: ${$resp$jscomp$1$$.url}`, "Connection: closed"];
-      for (const [$key$jscomp$37$$, $value$jscomp$136$$] of $resp$jscomp$1$$.headers.entries()) {
-        ["content-encoding", "connection", "content-length", "transfer-encoding"].includes($key$jscomp$37$$.toLowerCase()) || $header_lines$$.push(`${$key$jscomp$37$$}:  ${$value$jscomp$136$$}`);
-      }
-      this.write($encoder$$.encode($header_lines$$.join("\r\n") + "\r\n\r\n"));
+    this.net.fetch($fetch_url$jscomp$1$$, $headers_localport_opts$$).then($resp$jscomp$1$$ => {
+      let $resp_headers$$ = new Headers($resp$jscomp$1$$.headers);
+      $resp_headers$$.delete("content-encoding");
+      $resp_headers$$.delete("keep-alive");
+      $resp_headers$$.delete("content-length");
+      $resp_headers$$.delete("transfer-encoding");
+      $resp_headers$$.set("x-was-fetch-redirected", `${!!$resp$jscomp$1$$.redirected}`);
+      $resp_headers$$.set("x-fetch-resp-url", $resp$jscomp$1$$.url);
+      $resp_headers$$.set("connection", "close");
+      this.write(this.net.form_response_head($resp$jscomp$1$$.status, $resp$jscomp$1$$.statusText, $resp_headers$$));
       $response_started$$ = !0;
       if ($resp$jscomp$1$$.body && $resp$jscomp$1$$.body.getReader) {
-        const $resp_reader$$ = $resp$jscomp$1$$.body.getReader(), $pump$$ = ({value:$value$jscomp$137$$, done:$done$jscomp$3$$}) => {
-          $value$jscomp$137$$ && this.write($value$jscomp$137$$);
+        const $resp_reader$$ = $resp$jscomp$1$$.body.getReader(), $pump$$ = ({value:$value$jscomp$136$$, done:$done$jscomp$3$$}) => {
+          $value$jscomp$136$$ && this.write($value$jscomp$136$$);
           if ($done$jscomp$3$$) {
             this.close();
           } else {
@@ -3894,21 +3908,33 @@ async function $on_data_http$$module$src$browser$fetch_network$$($data$jscomp$13
           this.close();
         });
       }
-    }).catch($body$jscomp$1_e$jscomp$17$$ => {
-      console.warn("Fetch Failed: " + $fetch_url$jscomp$1$$ + "\n" + $body$jscomp$1_e$jscomp$17$$);
-      $response_started$$ || ($body$jscomp$1_e$jscomp$17$$ = $encoder$$.encode(`Fetch ${$fetch_url$jscomp$1$$} failed:\n\n${$body$jscomp$1_e$jscomp$17$$.stack || $body$jscomp$1_e$jscomp$17$$.message}`), this.writev([$encoder$$.encode(["HTTP/1.1 502 Fetch Error", "Content-Type: text/plain", `Content-Length: ${$body$jscomp$1_e$jscomp$17$$.length}`, "Connection: closed"].join("\r\n") + "\r\n\r\n"), $body$jscomp$1_e$jscomp$17$$]));
+    }).catch($e$jscomp$17$$ => {
+      console.warn("Fetch Failed: " + $fetch_url$jscomp$1$$ + "\n" + $e$jscomp$17$$);
+      $response_started$$ || this.net.respond_text_and_close(this, 502, "Fetch Error", `Fetch ${$fetch_url$jscomp$1$$} failed:\n\n${$e$jscomp$17$$.stack || $e$jscomp$17$$.message}`);
       this.close();
     });
   }
 }
-$FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.fetch = async function($url$jscomp$25$$, $headers$jscomp$1_options$jscomp$39$$) {
+$FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.fetch = async function($url$jscomp$25$$, $options$jscomp$39$$) {
   this.cors_proxy && ($url$jscomp$25$$ = this.cors_proxy + encodeURIComponent($url$jscomp$25$$));
   try {
-    const $resp$jscomp$2$$ = await fetch($url$jscomp$25$$, $headers$jscomp$1_options$jscomp$39$$), $ab$jscomp$1$$ = await $resp$jscomp$2$$.arrayBuffer();
+    const $resp$jscomp$2$$ = await fetch($url$jscomp$25$$, $options$jscomp$39$$), $ab$jscomp$1$$ = await $resp$jscomp$2$$.arrayBuffer();
     return [$resp$jscomp$2$$, $ab$jscomp$1$$];
   } catch ($e$jscomp$18$$) {
-    return console.warn("Fetch Failed: " + $url$jscomp$25$$ + "\n" + $e$jscomp$18$$), $headers$jscomp$1_options$jscomp$39$$ = new Headers, $headers$jscomp$1_options$jscomp$39$$.set("Content-Type", "text/plain"), [{status:502, statusText:"Fetch Error", headers:$headers$jscomp$1_options$jscomp$39$$, }, (new TextEncoder).encode(`Fetch ${$url$jscomp$25$$} failed:\n\n${$e$jscomp$18$$.stack}`).buffer];
+    return console.warn("Fetch Failed: " + $url$jscomp$25$$ + "\n" + $e$jscomp$18$$), [{status:502, statusText:"Fetch Error", headers:new Headers({"Content-Type":"text/plain"}), }, (new TextEncoder).encode(`Fetch ${$url$jscomp$25$$} failed:\n\n${$e$jscomp$18$$.stack}`).buffer];
+  }
+};
+$FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.form_response_head = function($lines_status_code$$, $status_text$$, $headers$jscomp$1$$) {
+  $lines_status_code$$ = [`HTTP/1.1 ${$lines_status_code$$} ${$status_text$$}`];
+  for (const [$key$jscomp$37$$, $value$jscomp$137$$] of $headers$jscomp$1$$.entries()) {
+    $lines_status_code$$.push(`${$key$jscomp$37$$}: ${$value$jscomp$137$$}`);
   }
+  return (new TextEncoder).encode($lines_status_code$$.join("\r\n") + "\r\n\r\n");
+};
+$FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.respond_text_and_close = function($conn$jscomp$2$$, $status_code$jscomp$1$$, $status_text$jscomp$1$$, $body$jscomp$1$$) {
+  const $headers$jscomp$2$$ = new Headers({"content-type":"text/plain", "content-length":$body$jscomp$1$$.length.toString(10), connection:"close"});
+  $conn$jscomp$2$$.writev([this.form_response_head($status_code$jscomp$1$$, $status_text$jscomp$1$$, $headers$jscomp$2$$), (new TextEncoder).encode($body$jscomp$1$$)]);
+  $conn$jscomp$2$$.close();
 };
 $FetchNetworkAdapter$$module$src$browser$fetch_network$$.prototype.parse_http_header = function($header$jscomp$4_key$jscomp$38$$) {
   var $parts$jscomp$3_value$jscomp$138$$ = $header$jscomp$4_key$jscomp$38$$.match(/^([^:]*):(.*)$/);
@@ -4056,25 +4082,25 @@ $WispNetworkAdapter$$module$src$browser$wisp_network$$.prototype.destroy = funct
   this.wispws && (this.wispws.onmessage = null, this.wispws.onclose = null, this.wispws.close(), this.wispws = null);
 };
 $WispNetworkAdapter$$module$src$browser$wisp_network$$.prototype.on_tcp_connection = function($packet$jscomp$15$$, $tuple$jscomp$3$$) {
-  let $conn$jscomp$2$$ = new $TCPConnection$$module$src$browser$fake_network$$;
-  $conn$jscomp$2$$.state = "syn-received";
-  $conn$jscomp$2$$.net = this;
-  $conn$jscomp$2$$.tuple = $tuple$jscomp$3$$;
-  $conn$jscomp$2$$.stream_id = this.last_stream++;
-  this.tcp_conn[$tuple$jscomp$3$$] = $conn$jscomp$2$$;
-  $conn$jscomp$2$$.on("data", $data$jscomp$138$$ => {
-    0 !== $data$jscomp$138$$.length && this.send_wisp_frame({type:"DATA", stream_id:$conn$jscomp$2$$.stream_id, data:$data$jscomp$138$$});
-  });
-  $conn$jscomp$2$$.on_close = () => {
-    this.send_wisp_frame({type:"CLOSE", stream_id:$conn$jscomp$2$$.stream_id, reason:2});
+  let $conn$jscomp$3$$ = new $TCPConnection$$module$src$browser$fake_network$$;
+  $conn$jscomp$3$$.state = "syn-received";
+  $conn$jscomp$3$$.net = this;
+  $conn$jscomp$3$$.tuple = $tuple$jscomp$3$$;
+  $conn$jscomp$3$$.stream_id = this.last_stream++;
+  this.tcp_conn[$tuple$jscomp$3$$] = $conn$jscomp$3$$;
+  $conn$jscomp$3$$.on("data", $data$jscomp$138$$ => {
+    0 !== $data$jscomp$138$$.length && this.send_wisp_frame({type:"DATA", stream_id:$conn$jscomp$3$$.stream_id, data:$data$jscomp$138$$});
+  });
+  $conn$jscomp$3$$.on_close = () => {
+    this.send_wisp_frame({type:"CLOSE", stream_id:$conn$jscomp$3$$.stream_id, reason:2});
   };
-  $conn$jscomp$2$$.on_shutdown = $conn$jscomp$2$$.on_close;
-  this.send_wisp_frame({type:"CONNECT", stream_id:$conn$jscomp$2$$.stream_id, hostname:$packet$jscomp$15$$.ipv4.dest.join("."), port:$packet$jscomp$15$$.tcp.dport, data_callback:$data$jscomp$139$$ => {
-    $conn$jscomp$2$$.write($data$jscomp$139$$);
+  $conn$jscomp$3$$.on_shutdown = $conn$jscomp$3$$.on_close;
+  this.send_wisp_frame({type:"CONNECT", stream_id:$conn$jscomp$3$$.stream_id, hostname:$packet$jscomp$15$$.ipv4.dest.join("."), port:$packet$jscomp$15$$.tcp.dport, data_callback:$data$jscomp$139$$ => {
+    $conn$jscomp$3$$.write($data$jscomp$139$$);
   }, close_callback:() => {
-    $conn$jscomp$2$$.close();
+    $conn$jscomp$3$$.close();
   }});
-  $conn$jscomp$2$$.accept($packet$jscomp$15$$);
+  $conn$jscomp$3$$.accept($packet$jscomp$15$$);
   return !0;
 };
 $WispNetworkAdapter$$module$src$browser$wisp_network$$.prototype.send = function($data$jscomp$141$$) {
@@ -9736,12 +9762,12 @@ $VGAScreen$$module$src$vga$$.prototype.update_vga_size = function() {
     if ($horizontal_characters_screen_width$$ && $screen_height_vertical_scans$$) {
       if (this.graphical_mode) {
         $horizontal_characters_screen_width$$ <<= 3;
-        var $height$jscomp$30_virtual_width$jscomp$1$$ = this.offset_register << 4;
-        this.attribute_mode & 64 && ($horizontal_characters_screen_width$$ >>>= 1, $height$jscomp$30_virtual_width$jscomp$1$$ >>>= 1);
+        var $height$jscomp$30_virtual_width$jscomp$1$$ = this.offset_register << 4, $bpp$jscomp$1$$ = 4;
+        this.attribute_mode & 64 ? ($horizontal_characters_screen_width$$ >>>= 1, $height$jscomp$30_virtual_width$jscomp$1$$ >>>= 1, $bpp$jscomp$1$$ = 8) : this.attribute_mode & 2 && ($bpp$jscomp$1$$ = 1);
         $screen_height_vertical_scans$$ = this.scan_line_to_screen_row($screen_height_vertical_scans$$);
         var $available_bytes$$ = $VGA_HOST_MEMORY_SPACE_SIZE$$module$src$vga$$[0];
         const $bytes_per_line$jscomp$1$$ = this.vga_bytes_per_line();
-        this.set_size_graphical($horizontal_characters_screen_width$$, $screen_height_vertical_scans$$, $height$jscomp$30_virtual_width$jscomp$1$$, $bytes_per_line$jscomp$1$$ ? Math.ceil($available_bytes$$ / $bytes_per_line$jscomp$1$$) : $screen_height_vertical_scans$$, 8);
+        this.set_size_graphical($horizontal_characters_screen_width$$, $screen_height_vertical_scans$$, $height$jscomp$30_virtual_width$jscomp$1$$, $bytes_per_line$jscomp$1$$ ? Math.ceil($available_bytes$$ / $bytes_per_line$jscomp$1$$) : $screen_height_vertical_scans$$, $bpp$jscomp$1$$);
         this.update_vertical_retrace();
         this.update_layers();
       } else {
@@ -11474,9 +11500,9 @@ $CPU$$module$src$cpu$$.prototype.debug_init = function() {
   };
   $debug$$.get_regs_short = $get_regs_short$$;
   $debug$$.dump_regs = function() {
-    var $lines$$ = $get_regs_short$$();
-    $dbg_log$$module$src$log$$($lines$$[0], 2);
-    $dbg_log$$module$src$log$$($lines$$[1], 2);
+    var $lines$jscomp$1$$ = $get_regs_short$$();
+    $dbg_log$$module$src$log$$($lines$jscomp$1$$[0], 2);
+    $dbg_log$$module$src$log$$($lines$jscomp$1$$[1], 2);
   };
   $debug$$.get_state = $get_state$$;
   $debug$$.dump_state = function($where$jscomp$3$$) {