ruflet_server 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1274808d06afdf7dcc85a83667fdc9f5933ea3ee875a3b7e511062cc62e9aa7
-  data.tar.gz: 883096dfec88b4bbbe11f964cfe430f418bb1b8827c81a063677882ac1b4d595
+  metadata.gz: 2c35513240e60fcb581c31fd046248670f30e035c6c775d6308e55b573cad7f4
+  data.tar.gz: ae14a3359d2f0ef9d07f46c01a48387993c1aaa85f7432a5c36a98a09f37d752
 SHA512:
-  metadata.gz: a5511a185183913576248cda98b30d3e3a2ad1e81aff6491720b6c9d92c612ea7167a4e06d001aec31beae22df21f9fb3ef502275a1db447e23dca799258d374
-  data.tar.gz: a35ab333a4b059adf63d5727c93a388499bd00bec390b2f8e5f402b1d90ea59b364f1ef6e5ed38cb81ed072bc3f31b2706efc14f5f3163759de3988b226a812e
+  metadata.gz: af605adfe624b0bd74c0ce6e81a50c962829ac4a145e32e83ea50418798b9d4488dec2961bb4e41d67a8a4d5f28b9f6fd09d287aafc966c09753b6816ada476b
+  data.tar.gz: cf036c4fc05472ad511ab5a576cf6057a1f5b08d3c40958a8ce3a244228ab440fee99af2cf30964b06793f4e87f382b20c84f9a480876d6b50bcdf0dc8e51a64

data/lib/ruflet/server/wire_codec.rb

@@ -132,6 +132,12 @@ module Ruflet
         when 0xdd then read_array(reader, reader.read_u32)
         when 0xde then read_map(reader, reader.read_u16)
         when 0xdf then read_map(reader, reader.read_u32)
+        when 0xc7
+          read_ext(reader, reader.read_u8)
+        when 0xc8
+          read_ext(reader, reader.read_u16)
+        when 0xc9
+          read_ext(reader, reader.read_u32)
         else
           if (marker & 0xf0) == 0x90
             read_array(reader, marker & 0x0f)
@@ -157,6 +163,11 @@ module Ruflet
         end
         out
       end
+
+      def read_ext(reader, size)
+        reader.read_i8 # type (ignored)
+        reader.read_exact(size)
+      end
     end
 
     class ByteReader

data/lib/ruflet/server.rb

@@ -61,7 +61,9 @@ module Ruflet
         begin
           @server_socket = TCPServer.new(@host, candidate)
           @port = candidate
-          warn "Requested port #{requested} is busy; bound to #{@port}" if @port != requested
+          if @port != requested && ENV["RUFLET_SUPPRESS_SERVER_BANNER"] != "1"
+            warn "Requested port #{requested} is busy; bound to #{@port}"
+          end
           return
         rescue Errno::EADDRINUSE
           candidate += 1
@@ -157,11 +159,13 @@ module Ruflet
       ws = nil
       begin
         path, headers = read_http_upgrade_request(socket)
-        return unless websocket_upgrade_request?(path, headers)
-
-        send_handshake_response(socket, headers["sec-websocket-key"])
-        ws = Ruflet::WebSocketConnection.new(socket)
-        run_connection(ws)
+        if websocket_upgrade_request?(path, headers)
+          send_handshake_response(socket, headers["sec-websocket-key"])
+          ws = Ruflet::WebSocketConnection.new(socket)
+          run_connection(ws)
+        else
+          handle_http_request(socket, path)
+        end
       rescue StandardError => e
         warn "server error: #{e.class}: #{e.message}"
         warn e.backtrace.join("\n") if e.backtrace
@@ -221,6 +225,91 @@ module Ruflet
       true
     end
 
+    def handle_http_request(socket, path)
+      case path
+      when "/health"
+        write_http_response(socket, 200, "text/plain", "ok")
+      when "/"
+        write_http_response(socket, 200, "text/plain", "ruflet server")
+      else
+        if path.start_with?("/assets/")
+          serve_asset(socket, path)
+        else
+          write_http_response(socket, 404, "text/plain", "not found")
+        end
+      end
+    rescue StandardError => e
+      warn "http error: #{e.class}: #{e.message}"
+      write_http_response(socket, 500, "text/plain", "server error")
+    end
+
+    def serve_asset(socket, path)
+      asset_path = resolve_asset_path(path)
+      unless asset_path
+        write_http_response(socket, 404, "text/plain", "not found")
+        return
+      end
+
+      content = File.binread(asset_path)
+      write_http_response(socket, 200, content_type_for(asset_path), content, binary: true)
+    end
+
+    def resolve_asset_path(path)
+      root = assets_root
+      return nil unless root
+
+      root = File.expand_path(root)
+      relative = path.sub(%r{\A/assets/}, "")
+      full = File.expand_path(File.join(root, relative))
+      return nil unless full.start_with?(root + File::SEPARATOR) || full == root
+      return nil unless File.file?(full)
+
+      full
+    end
+
+    def assets_root
+      root = ENV["RUFLET_ASSETS_DIR"].to_s
+      return root unless root.empty?
+
+      default_root = File.join(Dir.pwd, "assets")
+      File.directory?(default_root) ? default_root : nil
+    end
+
+    def content_type_for(path)
+      case File.extname(path).downcase
+      when ".png"
+        "image/png"
+      when ".jpg", ".jpeg"
+        "image/jpeg"
+      when ".gif"
+        "image/gif"
+      when ".webp"
+        "image/webp"
+      when ".svg"
+        "image/svg+xml"
+      else
+        "application/octet-stream"
+      end
+    end
+
+    def write_http_response(socket, status, content_type, body, binary: false)
+      reason = {
+        200 => "OK",
+        404 => "Not Found",
+        500 => "Internal Server Error"
+      }[status] || "OK"
+
+      body_str = binary ? body : body.to_s
+      length = body_str.bytesize
+
+      socket.write("HTTP/1.1 #{status} #{reason}\r\n")
+      socket.write("Content-Type: #{content_type}\r\n")
+      socket.write("Content-Length: #{length}\r\n")
+      socket.write("Connection: close\r\n")
+      socket.write("\r\n")
+      socket.write(body_str)
+    end
+
     def send_handshake_response(socket, key)
       accept = [Digest::SHA1.digest("#{key}#{WEBSOCKET_GUID}")].pack("m0")
 
@@ -268,6 +357,8 @@ module Ruflet
         on_control_event(ws, payload)
       when Protocol::ACTIONS[:update_control], Protocol::ACTIONS[:update_control_props]
         on_update_control(ws, payload)
+      when Protocol::ACTIONS[:invoke_control_method]
+        on_invoke_control_method(ws, payload)
       else
         raise "Unknown action: #{action.inspect}"
       end
@@ -347,6 +438,11 @@ module Ruflet
       raise
     end
 
+    def on_invoke_control_method(_ws, _payload)
+      # Client response to invoke_control_method; no server-side handling yet.
+      nil
+    end
+
     def on_control_event(ws, payload)
       event = Protocol.normalize_control_event_payload(payload)
       page = fetch_page(ws)

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.3" unless const_defined?(:VERSION)
+  VERSION = "0.0.5" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_server
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - AdamMusa
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.5
 description: Ruflet WebSocket server runtime compatible with Flet protocol.
 email:
 - adammusa2222@gmail.com