pinokiod 3.8.10 → 3.8.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.8.10",
+  "version": "3.8.11",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/public/install.js

@@ -109,26 +109,23 @@ const install = async (name, url, term, socket, options) => {
 
   }
 }
-const createTerm = () => {
-  const term = new Terminal({
-    //theme: xtermTheme.Piatto_Light,
-    //theme: xtermTheme.Github,
-    //theme: xtermTheme.Cobalt_Neon,      // top legibility
-    //theme: xtermTheme.Duotone_Dark,
-    theme: xtermTheme.FrontEndDelight,
-    //theme: xtermTheme.Seafoam_Pastel,
-    //theme: xtermTheme.IC_Green_PPL,
-    //theme: xtermTheme.FunForrest,
-    //theme: xtermTheme.Jackie_Brown,
-    //theme: xtermTheme.Ocean,
-
-    //theme: xtermTheme.Blazer,
-    //theme: xtermTheme.BirdsOfParadise,
-    //theme: xtermTheme.AtelierSulphurpool,
-    //theme: xtermTheme.Borland,
-    rows: 20,
-    fontSize: 12
-  });
+const createTerm = async () => {
+  const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+    selectionBackground: "red",
+    selectionForeground: "white"
+  })
+  let config = {
+    scrollback: 9999999,
+    fontSize: 14,
+    theme,
+  }
+  let res = await fetch("/xterm_config").then((res) => {
+    return res.json()
+  })
+  if (res && res.config) {
+    config = res.config
+  }
+  const term = new Terminal(config)
   const fitAddon = new FitAddon.FitAddon();
   term.loadAddon(fitAddon);
   term.loadAddon(new WebLinksAddon.WebLinksAddon());

package/server/public/style.css

@@ -1,9 +1,3 @@
-@font-face {
-  font-family: 'SpaceMono';
-  src: url('SpaceMono-Regular.ttf') format(truetype);
-  font-weight: normal;
-  font-style: normal;
-}
 :root {
   --content-width: 900px;
 
@@ -59,6 +53,18 @@
   */
   --dark-btn-color: whitesmoke;
 }
+@font-face {
+  font-family: 'SpaceMono';
+  src: url('./SpaceMono-Regular.ttf') format(truetype);
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'SourceCode';
+  src: url('./SourceCodePro-Regular.ttf') format(truetype);
+  font-weight: normal;
+  font-style: normal;
+}
 .drawer {
   max-height: 100000px;
   overflow: hidden;
@@ -580,6 +586,9 @@ body.columns main #editor {
 
   height: 100%;
   /*
+  padding: 15px 0;
+  */
+  /*
   overflow: auto;
   */
   box-sizing: border-box;
@@ -622,6 +631,7 @@ body.columns .containers {
   height: 100%;
 }
 .terminal-container {
+  padding: 10px 0;
   background: white;
   flex-grow: 1;
   position: relative;
@@ -706,13 +716,16 @@ body.columns .containers {
 }
 */
 .xterm-rows {
-  font-family: "Space Mono", monospace !important;
+/*
+  font-family: "SpaceMono", monospace !important;
+  */
+  font-family: "SourceCode", monospace !important;
   font-weight: 400 !important;
   font-style: normal !important;
 
 }
 .xterm {
-  padding: 0 20px !important;
+  padding: 0 10px !important;
   /*
   padding: 10px 20px !important;
   */

package/server/views/404.ejs

@@ -2,7 +2,6 @@
 <head>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">

package/server/views/bootstrap.ejs

@@ -124,25 +124,23 @@ document.addEventListener("DOMContentLoaded", () => {
 
       document.querySelector("#bootstrap").classList.add("hidden")
       document.querySelector(".explain").classList.add("hidden")
-      const term = new Terminal({
-        //theme: xtermTheme.Piatto_Light,
-        //theme: xtermTheme.Github,
-        //theme: xtermTheme.Cobalt_Neon,      // top legibility
-        //theme: xtermTheme.Duotone_Dark,
-        //theme: xtermTheme.Seafoam_Pastel,
-        //theme: xtermTheme.IC_Green_PPL,
-        //theme: xtermTheme.FunForrest,
-        //theme: xtermTheme.Jackie_Brown,
-        theme: xtermTheme.FrontEndDelight,
-        //theme: xtermTheme.Ocean,
-
-        //theme: xtermTheme.Blazer,
-        //theme: xtermTheme.BirdsOfParadise,
-        //theme: xtermTheme.AtelierSulphurpool,
-        //theme: xtermTheme.Borland,
-        rows: 20,
-        fontSize: 12
-      });
+
+      const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+        selectionBackground: "red",
+        selectionForeground: "white"
+      })
+      let config = {
+        scrollback: 9999999,
+        fontSize: 14,
+        theme,
+      }
+      let res = await fetch("/xterm_config").then((res) => {
+        return res.json()
+      })
+      if (res && res.config) {
+        config = res.config
+      }
+      const term = new Terminal(config)
       const fitAddon = new FitAddon.FitAddon();
       term.loadAddon(fitAddon);
       term.loadAddon(new WebLinksAddon.WebLinksAddon());

package/server/views/download.ejs

@@ -220,7 +220,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     //  let name = "0x" + url.split("").map(c => c.charCodeAt(0).toString(16).padStart(2, "0")).join("");
       let name = await installname(url)
       if (name) {
-        if (!term) term = createTerm()
+        if (!term) term = await createTerm()
         let params = new URLSearchParams(location.search)
         let entries = [...params.entries()]
         let options;

package/server/views/editor.ejs

@@ -593,9 +593,14 @@ document.addEventListener("DOMContentLoaded", async () => {
     }
     async createTerm () {
       if (!this.term) {
+        const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+          selectionBackground: "red",
+          selectionForeground: "white"
+        })
         let config = {
-          fontSize: 12,
-          theme: xtermTheme.FrontEndDelight
+          scrollback: 9999999,
+          fontSize: 14,
+          theme,
         }
         let res = await fetch("/xterm_config").then((res) => {
           return res.json()

package/server/views/file_explorer.ejs

@@ -3,7 +3,6 @@
 <title>Pinokio</title>
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-<link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">
@@ -141,10 +140,6 @@ body.dark .browser-options-row {
 <script src="/sweetalert2.js"></script>
 <script src="/noty.js"></script>
 <script src="/notyq.js"></script>
-<script src="/xterm.js"></script>
-<script src="/xterm-addon-fit.js"></script>
-<script src="/xterm-addon-web-links.js"></script>
-<script src="/xterm-theme.js"></script>
 <script src="/Socket.js"></script>
 <script src="/install.js"></script>
 <script src="/common.js"></script>

package/server/views/install.ejs

@@ -127,8 +127,10 @@ body {
 <script src="/common.js"></script>
 </head>
 <body class='<%=theme%>'>
+<!--
 <header class='grabbable'></header>
-<div id='status-screen'><b><i class="fas fa-circle-notch fa-spin"></i></div>
+-->
+<div id='status-screen'><b><i class="fas fa-circle-notch fa-spin"></i></b></div>
 <div class='terminal-container'>
   <div id='terminal'></div>
 </div>
@@ -138,31 +140,23 @@ body {
 //
 // /install_bin?type=bin&uri=conda
 //
-const createTerm = () => {
-  const term = new Terminal({
-    //theme: xtermTheme.Piatto_Light,
-    //theme: xtermTheme.Spring,
-
-    //theme: xtermTheme.Github,
-
-    //theme: xtermTheme.Cobalt_Neon,      // top legibility
-    //theme: xtermTheme.Duotone_Dark,
-    theme: xtermTheme.FrontEndDelight,
-    //theme: xtermTheme.Seafoam_Pastel,
-    //theme: xtermTheme.IC_Green_PPL,
-    //theme: xtermTheme.FunForrest,
-    //theme: xtermTheme.Jackie_Brown,
-    //theme: xtermTheme.Ocean,
-
-    //theme: xtermTheme.Blazer,
-    //theme: xtermTheme.BirdsOfParadise,
-    //theme: xtermTheme.AtelierSulphurpool,
-    //theme: xtermTheme.Borland,
-    fontSize: 12,
-    //cursorBlink: false,
-    //cursorStyle: 'block'
-
-  });
+const createTerm = async () => {
+  const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+    selectionBackground: "red",
+    selectionForeground: "white"
+  })
+  let config = {
+    scrollback: 9999999,
+    fontSize: 14,
+    theme,
+  }
+  let res = await fetch("/xterm_config").then((res) => {
+    return res.json()
+  })
+  if (res && res.config) {
+    config = res.config
+  }
+  const term = new Terminal(config)
   term.open(document.querySelector("#terminal"))
 
   term.attachCustomKeyEventHandler(event => {
@@ -191,7 +185,7 @@ const createTerm = () => {
 document.addEventListener("DOMContentLoaded", async () => {
   const n = new N()
   let socket = new Socket()
-  let term = createTerm()
+  let term = await createTerm()
   let params = new URLSearchParams(location.search)
   let entries = [...params.entries()]
   let options;

package/server/views/minterm.ejs

@@ -108,6 +108,9 @@ header {
 .navheader3 {
   padding: 10px;
 }
+.navheader {
+  padding-bottom: 0;
+}
 /*
 .navheader {
   background: var(--dark-bg);
@@ -128,6 +131,9 @@ header {
 body.frozen {
   overflow: auto !important;
 }
+.terminal-container {
+  padding: 0;
+}
 </style>
 <link href="/terminal.css" rel="stylesheet"/>
 <script>

package/server/views/terminal.ejs

@@ -853,26 +853,26 @@ const reloadMemory = async () => {
 <% } else { %>
 <body class='<%=theme%>'>
 <% } %>
-  <header class='navheader2'>
   <% if (!install_required) { %>
-    <div class='runner'>
-      <% if (locals.prev) { %>
-        <a class='btn' href="<%=prev%>"><i class="fa-solid fa-arrow-left"></i> Back</a>
-      <% } %>
-      <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
-        <span class='play'><i class="fa-solid fa-play"></i> Start</span>
-        <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>
-        <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
+    <header class='navheader2'>
+      <div class='runner'>
+        <% if (locals.prev) { %>
+          <a class='btn' href="<%=prev%>"><i class="fa-solid fa-arrow-left"></i> Back</a>
+        <% } %>
+        <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
+          <span class='play'><i class="fa-solid fa-play"></i> Start</span>
+          <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>
+          <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
+        </div>
+        <% if (locals.filepath) { %>
+          <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
+        <% } %>
+        <!--
+        <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
+        -->
       </div>
-      <% if (locals.filepath) { %>
-        <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
-      <% } %>
-      <!--
-      <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
-      -->
-    </div>
+    </header>
   <% } %>
-  </header>
   <% if (locals.requirements_pending) { %>
     <div class='requirements'>
       <div class='content'>