Merge branch 'master' into heroku

Author: andre-dietrich

Dockerfile

@@ -284,4 +284,4 @@ RUN printf '#!/bin/bash\n\
 
 EXPOSE 4000
 
-CMD python3 -m server --host 0.0.0.0 --port $PORT
+ENTRYPOINT ["python3","-m","server","--host","0.0.0.0","--port","4000"]

README.md

@@ -3,7 +3,7 @@ author:   André Dietrich
 
 email:    LiaScript@web.de
 
-version:  0.0.3
+version:  0.0.4
 
 language: en
 
@@ -17,6 +17,7 @@ window.CodeRunner = {
     error: "",
     url: "",
     firstConnection: true,
+    pingTimer: null,
 
     init(url, step = 0) {
         this.url = url
@@ -39,11 +40,10 @@ window.CodeRunner = {
         this.ws.onopen = function () {
             clearTimeout(connectionTimeout);
             self.log("connections established");
-
             self.connected = true
-            
-            setInterval(function() {
-                self.ws.send("ping")
+            if (self.pingTimer) clearInterval(self.pingTimer)
+            self.pingTimer = setInterval(function() {
+              try { self.ws.send("ping") } catch (_) {}
             }, 15000);
         }
         this.ws.onmessage = function (e) {
@@ -61,16 +61,17 @@ window.CodeRunner = {
         }
         this.ws.onclose = function () {
             clearTimeout(connectionTimeout);
+            if (self.pingTimer) { clearInterval(self.pingTimer); self.pingTimer = null }
             self.connected = false
             self.warn("connection closed ... reconnecting")
-
             setTimeout(function(){
                 console.warn("....", step+1)
                 self.init(url, step+1)
             }, 1000)
         }
         this.ws.onerror = function (e) {
             clearTimeout(connectionTimeout);
+            if (self.pingTimer) { clearInterval(self.pingTimer); self.pingTimer = null }
             self.warn("an error has occurred")
         }
     },
@@ -2215,29 +2216,54 @@ window.CodeRunner = {
 }
 
 //window.CodeRunner.init("wss://coderunner.informatik.tu-freiberg.de/")
-//window.CodeRunner.init("ws://127.0.0.1:8000/")
+//window.CodeRunner.init("ws://localhost:4000/")
 window.CodeRunner.init("wss://ancient-hollows-41316.herokuapp.com/")
 @end
 
 
 @LIA.ada:               @LIA.eval(`["main.ada"]`, `gnatmake main.ada`, `./main`)
+@LIA.algol:             @LIA.eval(`["main.alg"]`, `none`, `a68g main.alg`)
+@LIA.apl:               @LIA.eval(`["main.apl"]`, `none`, `dyalog -script main.apl`)
+@LIA.awk:               @LIA.eval(`["main.awk"]`, `none`, `awk -f main.awk`)
+@LIA.basic:             @LIA.eval(`["main.bas"]`, `none`, `bwbasic main.bas`)
 @LIA.c:                 @LIA.eval(`["main.c"]`, `gcc -Wall main.c -o a.out`, `./a.out`)
 @LIA.clojure:           @LIA.eval(`["main.clj"]`, `none`, `clojure -M main.clj`)
 @LIA.clojure_withShell: @LIA.eval(`["main.clj"]`, `none`, `clojure -M -i main.clj -r`)
 @LIA.cpp:               @LIA.eval(`["main.cpp"]`, `g++ main.cpp -o a.out`, `./a.out`)
+@LIA.cobol:             @LIA.eval(`["main.cob"]`, `cobc -x --free main.cob`, `./main`)
+@LIA.coq:               @LIA.eval(`["file.v"]`, `coqc file.v`, `coqtop -lv file.v`)
+@LIA.d:                 @LIA.eval(`["main.d"]`, `gdc main.d`, `./a.out`)
 @LIA.elixir:            @LIA.eval(`["main.exs"]`, `none`, `elixir main.exs`)
 @LIA.elixir_withShell:  @LIA.eval(`["main.exs"]`, `none`, `iex main.exs`)
+@LIA.erlang:            @LIA.eval(`["hello.erl"]`, `erlc hello.erl`, `erl -noshell -s hello hello -s init stop`)
+@LIA.erlang_withShell:  @LIA.eval(`["hello.erl"]`, `erlc hello.erl`, `erl -noshell -s hello hello`)
+@LIA.forth:             @LIA.eval(`["main.fs"]`, `none`, `gforth main.fs -e BYE`)
+@LIA.forth_withShell:   @LIA.eval(`["main.fs"]`, `none`, `gforth main.fs`)
+@LIA.fortran:           @LIA.eval(`["main.f90"]`, `gfortran main.f90 -o a.out`, `./a.out`)
 @LIA.go:                @LIA.eval(`["main.go"]`, `go build main.go`, `./main`)
+@LIA.groovy:            @LIA.eval(`["main.groovy"]`, `none`, `groovy main.groovy`)
 @LIA.haskell:           @LIA.eval(`["main.hs"]`, `ghc main.hs -o main`, `./main`)
 @LIA.haskell_withShell: @LIA.eval(`["main.hs"]`, `none`, `ghci main.hs`)
+@LIA.haxe:              @LIA.eval(`["Main.hx"]`, `none`, `haxe -main Main --interp`)
+@LIA.inform:            @LIA.eval(`["main.inf"]`, `inform -o main.inf > compile.log && [ -f "main.z5" ] || { cat compile.log >&2; exit 1; }`, `/usr/games/dfrotz main.z5`)
+@LIA.io:                @LIA.eval(`["main.io"]`, `none`, `io main.io`)
+@LIA.io_withShell:      @LIA.eval(`["main.io"]`, `none`, `io -i main.io`)
 @LIA.java:              @LIA.eval(`["@0.java"]`, `javac @0.java`, `java @0`)
 @LIA.julia:             @LIA.eval(`["main.jl"]`, `none`, `julia main.jl`)
 @LIA.julia_withShell:   @LIA.eval(`["main.jl"]`, `none`, `julia -i main.jl`)
+@LIA.kotlin:            @LIA.eval(`["main.kt"]`, `kotlinc main.kt -include-runtime -d main.jar`, `java -jar main.jar`)
+@LIA.lua:               @LIA.eval(`["main.lua"]`, `none`, `lua main.lua`)
 @LIA.mono:              @LIA.eval(`["main.cs"]`, `mcs main.cs`, `mono main.exe`)
 @LIA.nasm:              @LIA.eval(`["main.asm"]`, `nasm -felf64 main.asm && ld main.o`, `./a.out`)
 @LIA.nim:               @LIA.eval(`["main.nim"]`, `nim c main.nim`, `./main`)
+@LIA.nodejs:            @LIA.eval(`["main.js"]`, `none`, `node main.js`)
+@LIA.ocaml:             @LIA.eval(`["main.ml"]`, `none`, `ocaml main.ml`)
 @LIA.perl:              @LIA.eval(`["main.pl"]`, `perl -c main.pl`, `perl main.pl`)
 @LIA.perl_withShell:    @LIA.eval(`["main.pl"]`, `perl -c main.pl`, `perl -d main.pl`)
+@LIA.php:               @LIA.eval(`["main.php"]`, `none`, `php main.php`)
+@LIA.postscript:        @LIA.eval(`["input.ps"]`, `none`, `gs -sDEVICE=png16m -r300 -o output.png input.ps`)
+@LIA.prolog:            @LIA.eval(`["main.pl"]`, `none`, `swipl -s main.pl -g @0 -t halt`)
+@LIA.prolog_withShell:  @LIA.eval(`["main.pl"]`, `none`, `swipl -s main.pl`)
 @LIA.python:            @LIA.python3
 @LIA.python_withShell:  @LIA.python3_withShell
 @LIA.python2:           @LIA.eval(`["main.py"]`, `python2.7 -m compileall .`, `python2.7 main.pyc`)
@@ -2246,11 +2272,19 @@ window.CodeRunner.init("wss://ancient-hollows-41316.herokuapp.com/")
 @LIA.python3_withShell: @LIA.eval(`["main.py"]`, `none`, `python3 -i main.py`)
 @LIA.r:                 @LIA.eval(`["main.R"]`, `none`, `Rscript main.R`)
 @LIA.r_withShell:       @LIA.eval(`["main.R"]`, `none`, `sh -c "cat main.R - | R --interactive"`)
+@LIA.racket:            @LIA.eval(`["main.rkt"]`, `none`, `racket main.rkt`)
 @LIA.ruby:              @LIA.eval(`["main.rb"]`, `none`, `ruby main.rb`)
 @LIA.ruby_withShell:    @LIA.eval(`["main.rb"]`, `none`, `irb --nomultiline -r ./main.rb`)
 @LIA.rust:              @LIA.eval(`["main.rs"]`, `rustc main.rs`, `./main`)
+@LIA.scala:             @LIA.eval(`["@0.scala"]`, `scalac @0.scala`, `scala @0`)
+@LIA.scheme:            @LIA.eval(`["main.scm"]`, `none`, `guile --no-auto-compile main.scm`)
+@LIA.selectscript:      @LIA.eval(`["main.s2"]`, `none`, `S2c -x main.s2`)
+@LIA.smalltalk:         @LIA.eval(`["main.st"]`, `none`, `gst main.st`)
+@LIA.tcl:               @LIA.eval(`["main.tcl"]`, `none`, `tclsh main.tcl`)
 @LIA.v:                 @LIA.eval(`["main.v"]`, `v main.v`, `./main`)
 @LIA.v_withShell:       @LIA.eval(`["main.v"]`, `none`, `sh -c "cat main.v - | v repl"`)
+@LIA.verilog:           @LIA.eval(`["main.v"]`, `iverilog -o main.vvp main.v`, `vvp main.vvp`)
+@LIA.vhdl:              @LIA.eval(`["@0.vhdl"]`, `ghdl -a @0.vhdl && ghdl -e @0`, `ghdl -r @0`)
 @LIA.zig:               @LIA.eval(`["main.zig"]`, `zig build-exe ./main.zig -O ReleaseSmall`, `./main`)
 
 @LIA.dotnet
@@ -2282,6 +2316,18 @@ window.CodeRunner.init("wss://ancient-hollows-41316.herokuapp.com/")
 @LIA.eval(`["Program.fs", "project.fsproj"]`, `dotnet build -nologo`, `dotnet run`)
 @end
 
+@LIA.qsharp
+```xml    -project.csproj
+<Project Sdk="Microsoft.Quantum.Sdk/0.28.302812">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+  </PropertyGroup>
+</Project>
+```
+@LIA.eval(`["Program.qs", "project.csproj"]`, `dotnet build -nologo`, `dotnet run`)
+@end
+
 @LIA.eval:  @LIA.eval_(false,`@0`,@1,@2,@3)
 
 @LIA.evalWithDebug: @LIA.eval_(true,`@0`,@1,@2,@3)
@@ -2393,6 +2439,13 @@ CodeRunner.handle(uid, function (msg) {
                 }
             }
 
+            if (msg.videos) {
+                for(let i = 0; i < msg.videos.length; i++) {
+                    console.html("<hr/>", msg.videos[i].file)
+                    console.html("<video controls style='width:100%' title='" + msg.videos[i].file + "' src='" + msg.videos[i].data + "'></video>")
+                }
+            }
+
             if (msg.files) {
                 let str = "<hr/>"
                 for(let i = 0; i < msg.files.length; i++) {

server.py

@@ -20,30 +20,35 @@
 
 coloredlogs.install()
 
-
 class NewWebSocketHandler (WebSocketHandler):
     def read_http_headers(self):
         headers = {}
-        # first line should be HTTP GET
         http_get = self.rfile.readline().decode().strip()
-        
+
         if not http_get.upper().startswith('GET'):
-            logging.warning("Unsupported HTTP method")
-            response = 'HTTP/1.1 400 Bad Request\r\n\r\n'
-            with self._send_lock:
-                self.request.sendall(response.encode())
-            self.keep_alive = False
-            return headers           
-                 
-        
-        #assert http_get.upper().startswith('GET')
-        # remaining should be headers
+            logging.info("Unsupported HTTP method")
+            response = 'HTTP/1.1 405 Method Not Allowed\r\nConnection: close\r\nContent-Length: 0\r\n\r\n'
+            try:
+                with self._send_lock:
+                    self.request.sendall(response.encode())
+            except BrokenPipeError:
+                logging.debug("Client closed before error response could be sent.")
+            except Exception as e:
+                logging.debug("Failed to send error response: %s", e)
+            finally:
+                self.keep_alive = False
+            return headers
+
+        # headers lesen
         while True:
             header = self.rfile.readline().decode().strip()
             if not header:
                 break
-            head, value = header.split(':', 1)
-            headers[head.lower().strip()] = value.strip()
+            try:
+                head, value = header.split(':', 1)
+                headers[head.lower().strip()] = value.strip()
+            except ValueError:
+                logging.debug("Malformed header line ignored: %r", header)
         return headers
 
     def handshake(self):
@@ -64,36 +69,51 @@ def handshake(self):
                 return
 
             response = self.make_handshake_response(key)
-            with self._send_lock:
-                self.handshake_done = self.request.send(response.encode())
+            try:
+                with self._send_lock:
+                    self.handshake_done = self.request.send(response.encode())
+            except BrokenPipeError:
+                logging.debug("Client closed during handshake response.")
+                self.keep_alive = False
+                return
             self.valid_client = True
             self.server._new_client_(self)
         else:
-            # timeStr = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
-            # print(f"请升级到ws协议{timeStr}")
-            response = 'HTTP/1.1 400 Bad Request\r\n\r\n'
-            
-            with self._send_lock:
-                self.request.sendall(response.encode())
-            self.keep_alive = False
+            # Health-Check: freundlich 200 OK und schließen
+            body = b"OK\n"
+            response = (
+                'HTTP/1.1 200 OK\r\n'
+                'Content-Type: text/plain; charset=utf-8\r\n'
+                f'Content-Length: {len(body)}\r\n'
+                'Connection: close\r\n\r\n'
+            ).encode() + body
+            try:
+                with self._send_lock:
+                    self.request.sendall(response)
+            except BrokenPipeError:
+                logging.debug("Client closed before health-check response.")
+            except Exception as e:
+                logging.debug("Failed to send health-check response: %s", e)
+            finally:
+                self.keep_alive = False
+
 
 class Server (WebsocketServer):
     def __init__(self, host='127.0.0.1', port=0, loglevel=logging.WARNING, key=None, cert=None):
         #logging.setLevel(loglevel)
         TCPServer.__init__(self, (host, port), NewWebSocketHandler)
         self.host = host
         self.port = self.socket.getsockname()[1]
-
         self.key = key
         self.cert = cert
-
         self.clients = []
         self.id_counter = 0
         self.thread = None
-
         self._deny_clients = False
 
-
+    def handle_error(self, request, client_address):
+        # Unterdrücke laute Tracebacks von erwartbaren Client-Abbrüchen
+        logging.debug("Suppressed client error from %s", client_address)
 
 
 class Process:
@@ -511,31 +531,6 @@ def stop(error_message: str | None = None, images=[], videos=[], files=[]):
         server.send_message(client, json.dumps({"ok": True, "service": "stop", "uid": message["uid"]}))
 
 
-def handshake(self):
-        headers = self.read_http_headers()
-        if 'upgrade' in headers:
-            
-            try:
-                assert headers['upgrade'].lower() == 'websocket'
-            except AssertionError:
-                self.keep_alive = False
-                return
-
-            try:
-                key = headers['sec-websocket-key']
-            except KeyError:
-                logger.warning("Client tried to connect but was missing a key")
-                self.keep_alive = False
-                return
-
-            response = self.make_handshake_response(key)
-            with self._send_lock:
-                self.handshake_done = self.request.send(response.encode())
-            self.valid_client = True
-            self.server._new_client_(self)
-        else:
-            print("upgrade to ws")
-
 if __name__ == "__main__":
     argv = sys.argv[1:]
 
@@ -569,7 +564,6 @@ def handshake(self):
     server.set_fn_new_client(new_client)
     server.set_fn_client_left(client_left)
     server.set_fn_message_received(message_received)
-    server.handshake = (handshake)
 
     logging.basicConfig(level=logging.DEBUG)