pinokiod 3.9.0 → 3.9.3

package/server/socket.js

@@ -1,8 +1,10 @@
 const WebSocket = require('ws');
+const Util = require("../kernel/util")
 class Socket {
   constructor(parent) {
     this.buffer = {}
     this.connected = {}
+    this.active_shell = {}
     this.parent = parent
     this.server = parent.server
 //    this.kernel = parent.kernel
@@ -15,8 +17,35 @@ class Socket {
           set.delete(ws);
         });
       });
-      ws.on('message', async (message) => {
-        const req = JSON.parse(message);
+      ws.on('message', async (message, isBinary) => {
+
+        let req
+        if (isBinary) {
+          const buffer = Buffer.from(message);
+          const sepIndex = buffer.indexOf(0);
+          if (sepIndex === -1) throw new Error("Missing metadata separator");
+          const metaStr = buffer.slice(0, sepIndex).toString('utf-8');
+          const meta = JSON.parse(metaStr);
+          const bufferKeys = meta.buffer_keys;
+          const resultBuffers = {};
+          let offset = sepIndex + 1;
+          for (const key of bufferKeys) {
+            if (offset + 4 > buffer.length) throw new Error("Unexpected EOF while reading buffer length");
+            const len = buffer.readUInt32BE(offset);
+            offset += 4;
+            if (offset + len > buffer.length) throw new Error("Unexpected EOF while reading buffer data");
+            const fileBuf = buffer.slice(offset, offset + len);
+            resultBuffers[key] = fileBuf;
+            offset += len;
+          }
+          // Now you can save files
+          for (const [key, buf] of Object.entries(resultBuffers)) {
+            meta.response[key] = buf
+          }
+          req = meta
+        } else {
+          req = JSON.parse(message)
+        }
         if (req.response) {
           this.parent.kernel.api.respond(req)
         } else {
@@ -25,49 +54,94 @@ class Socket {
           // look for repos that match
 
           if (req.uri) {
-            /******************************************************************
-            *
-            *  req.uri is ALWAYS either of the two:
-            *  1. ~/...
-            *  2. https://github.com/...
-            *
-            *  Need to turn it into absolute file path before subscribing
-            *
-            ******************************************************************/
-
-            // req.uri is always http or absolute path
-            let id = this.parent.kernel.api.filePath(req.uri)
-
-            if (req.status) {
-              ws.send(JSON.stringify({
-                data: this.parent.kernel.api.running[id] ? true : false
-              }))
-            } else if (req.stop) {
-              this.parent.kernel.api.stop({ params: req })
+            if (req.mode === "open") {
+              // get the default script and respond
+              let id = this.parent.kernel.api.filePath(req.uri)
+              try {
+                let default_url = await this.parent.kernel.api.get_default(id)
+                ws.send(JSON.stringify({
+                  data: {
+                    uri: default_url 
+                  }
+                }))
+              } catch (e) {
+                console.log(e)
+              }
             } else {
-              this.subscribe(ws, id)
-
-              if (req.mode !== "listen") {
-                // Run only if currently not running
-                if (!this.parent.kernel.api.running[id]) {
-
-                  // clear the log first
-
-                  await this.parent.kernel.clearLog(id)
-
-
-                  this.parent.kernel.api.process(req)
+              if (req.uri.startsWith("http")) {
+                // open
+                Util.openfs(req.uri, { mode: "open" })
+              } else {
+                /******************************************************************
+                *
+                *  req.uri is ALWAYS either of the two:
+                *  1. ~/...
+                *  2. https://github.com/...
+                *
+                *  Need to turn it into absolute file path before subscribing
+                *
+                ******************************************************************/
+
+                // req.uri is always http or absolute path
+                let id = this.parent.kernel.api.filePath(req.uri)
+
+                if (req.status) {
+                  ws.send(JSON.stringify({
+                    data: this.parent.kernel.api.running[id] ? true : false
+                  }))
+                } else if (req.stop) {
+                  this.parent.kernel.api.stop({ params: req })
+                } else {
+                  let buf = this.buffer[id]
+                  let sh = this.active_shell[id]
+                  this.subscribe(ws, id, buf, sh)
+                  if (req.mode !== "listen") {
+                    // Run only if currently not running
+                    if (!this.parent.kernel.api.running[id]) {
+
+                      // clear the log first
+
+                      await this.parent.kernel.clearLog(id)
+
+
+                      this.parent.kernel.api.process(req)
+                    }
+                  }
                 }
               }
-            }
 
+            }
           } else if (req.method) {
-            this.subscribe(ws, req.method)
-            if (req.mode !== "listen") {
-              this.parent.kernel.api.process(req)
+            if (req.id) {
+              let buf = this.buffer[req.id]
+              let sh = this.active_shell[req.id]
+              this.subscribe(ws, req.id, buf, sh)
+              if (sh) {
+                // if the active shell exists, check if it's killed
+                // if the shell is running, don't do anything
+                // if the shell is not running, run the request
+                let shell = this.parent.kernel.shell.get(sh)
+                console.log("get shell for", sh, shell)
+                if (!shell) {
+                  this.parent.kernel.api.process(req)
+                }
+                // if it's not killed, don't do anything
+              } else {
+                this.parent.kernel.api.process(req)
+              }
+            } else {
+              this.subscribe(ws, req.method)
+              if (req.mode !== "listen") {
+                this.parent.kernel.api.process(req)
+              }
             }
           } else if (req.emit) {
             this.parent.kernel.shell.emit(req)
+          } else if (req.key && req.id) {
+            this.parent.kernel.shell.emit({
+              id: req.id,
+              emit: req.key
+            })
           }
         }
 
@@ -78,11 +152,16 @@ class Socket {
       headers.push('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept');
     });
   }
-  subscribe(ws, id) {
+  subscribe(ws, id, buf, sh) {
 
     if (this.parent.kernel.api.running[id]) {
       ws.send(JSON.stringify({
-        type: "connect"
+        type: "connect",
+        data: {
+          id,
+          state: buf,
+          shell: sh
+        }
       }))
     }
 
@@ -120,6 +199,15 @@ class Socket {
       });
     }
 
+    if (!this.buffer[id]) {
+      this.buffer[id] = ""
+    }
+    if (e.data && e.data.raw) this.buffer[id] += e.data.raw
+
+    if (e.data && e.data.shell_id) {
+      this.active_shell[id] = e.data.shell_id
+    }
+
     // send to caller session
     if (e.caller) {
       let caller
@@ -148,6 +236,15 @@ class Socket {
           }
         });
       }
+
+      if (!this.buffer[caller]) {
+        this.buffer[caller] = ""
+      }
+      if (e.data.raw) this.buffer[caller] += e.data.raw
+
+      if (e.data && e.data.shell_id) {
+        this.active_shell[caller] = e.data.shell_id
+      }
     }
   }
 }

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">