rb-utcp 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f149ed8c39f7f9204dedf270af330dfca4a2a81af20da405e96c04b9b5102968
-  data.tar.gz: 4ba6c0e77734d204553d4d5de568870e1cdcab6e95057d185e1f3b653137fda1
+  metadata.gz: 7152973bd68d5f99cedef389ef3511ef2e0184ae1d57ec6c1d50fe69cb6b0862
+  data.tar.gz: 165379f2822e471133fa9fc6adde1ffb84c56b0e3b07c28afbf78d5e87aec92a
 SHA512:
-  metadata.gz: fc94f91b7227c7fef8d3a38532ead92eeb8360bcbc5ae8216c31e072f4e5de389121d93ffd1af284cfdcd81a166de159279e5b8d5d2a1739d465365a9c5883ea
-  data.tar.gz: 4e6b711fb478658fe17ed4acbe9148b2f25b60e901e3424561a5e55d9488117dbc9e69a4772d7f58de2c241af268a43565bcd701a6591afc1df04af7acad3fdb
+  metadata.gz: d27bc315ede501296dace44f2277e2cf2fdb32089ff56d201a56d826432f7ded5e084ee33e50b3e0e2b21fb23745313d2593a3649542bf8ce44a0b14cf2e31c7
+  data.tar.gz: 7a183a6e766d2d19f58a71dd31c9d9767fe65198cafa3724e81314ddc97a08e245d51cc54745f9e9da97df9df579690415d6f749332b23a0ec1284cf60af1711

data/lib/utcp/client.rb

@@ -98,7 +98,12 @@ module Utcp
           auth: auth,
           body_field: p["body_field"]
         )
-        exec.call_tool(t, arguments)
+        if stream
+          raise ConfigError, "Streaming requires a block for HTTP" unless block_given?
+          exec.call_tool(t, arguments, &block)
+        else
+          exec.call_tool(t, arguments)
+        end
 
       when "sse"
         raise ConfigError, "Streaming requires a block for SSE" if stream && !block_given?

data/lib/utcp/providers/http_provider.rb

@@ -79,12 +79,21 @@ module Utcp
 
         http = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https")
         begin
-          res = http.request(req)
-          # try to parse as JSON; fall back to raw string
-          begin
-            JSON.parse(res.body)
-          rescue
-            res.body
+          if block_given?
+            http.request(req) do |res|
+              res.read_body do |chunk|
+                yield chunk
+              end
+            end
+            nil
+          else
+            res = http.request(req)
+            # try to parse as JSON; fall back to raw string
+            begin
+              JSON.parse(res.body)
+            rescue
+              res.body
+            end
           end
         ensure
           http.finish if http.active?

data/lib/utcp/providers/http_stream_provider.rb

@@ -35,18 +35,36 @@ module Utcp
         @auth&.apply_headers(headers)
         headers.each { |k, v| req[k] = v }
 
-        http = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https")
+        http = Net::HTTP.start(
+          uri.host, uri.port,
+          use_ssl: uri.scheme == "https"
+        )
+        http.read_timeout = nil
+        http.open_timeout = 5
+
         begin
           http.request(req) do |res|
-            res.read_body do |chunk|
-              yield chunk if block_given?
+            begin
+              res.read_body do |chunk|
+                yield chunk if block_given?
+              end
+            rescue EOFError
+              warn "[HttpStreamProvider] EOFError during chunk read — treating as normal stream end"
+            rescue IOError
+              warn "[HttpStreamProvider] IOError during chunk read — treating as normal stream end"
             end
           end
-          nil
+        rescue EOFError
+          warn "[HttpStreamProvider] EOFError before body read — treating as end of stream"
+        rescue IOError
+          warn "[HttpStreamProvider] IOError before body read — treating as end of stream"
         ensure
-          http.finish if http.active?
+          http.finish if http&.active?
         end
+
+        nil
       end
+
     end
   end
 end

data/lib/utcp/providers/websocket_provider.rb

@@ -32,9 +32,13 @@ module Utcp
         uri = URI(Utils::Subst.apply(p["url"]))
         raise ConfigError, "WebSocket requires ws:// or wss:// URL" unless %w[ws wss].include?(uri.scheme)
 
+        headers = Utils::Subst.apply(p["headers"] || {}).transform_keys(&:to_s)
+        @auth&.apply_query(uri) if @auth&.respond_to?(:apply_query)
+        @auth&.apply_headers(headers)
+
         sock = connect_socket(uri)
         begin
-          handshake(sock, uri)
+          handshake(sock, uri, headers)
           # Compose a text message to send
           payload = compose_payload(p, arguments)
           if payload
@@ -94,20 +98,23 @@ module Utcp
         end
       end
 
-      def handshake(sock, uri)
+      def handshake(sock, uri, extra_headers = {})
         key = Base64.strict_encode64(Random.new.bytes(16))
         path = uri.request_uri
         host = uri.host
-        headers = [
+        host += ":#{uri.port}" if uri.port && uri.port != (uri.scheme == "wss" ? 443 : 80)
+        header_lines = [
           "GET #{path} HTTP/1.1",
           "Host: #{host}",
           "Upgrade: websocket",
           "Connection: Upgrade",
           "Sec-WebSocket-Key: #{key}",
           "Sec-WebSocket-Version: 13",
-          "", ""
-        ].join("\r\n")
-        sock.write(headers)
+        ]
+        extra_headers.each { |k, v| header_lines << "#{k}: #{v}" }
+        header_lines << "" << ""
+        sock.write(header_lines.join("\r\n"))
+        sock.flush if sock.respond_to?(:flush)
 
         status_line = sock.gets("\r\n") || ""
         unless status_line.start_with?("HTTP/1.1 101")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-utcp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - UTCP contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-12 00:00:00.000000000 Z
+date: 2025-08-13 00:00:00.000000000 Z
 dependencies: []
 description: Minimal Ruby implementation of UTCP with HTTP/SSE/HTTP-stream transports.
 email:
@@ -19,7 +19,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.md
 - bin/utcp
 - lib/utcp.rb
 - lib/utcp/auth.rb

data/README.md

@@ -1,129 +0,0 @@
-# ruby-utcp (alpha)
-
-A small, dependency-light Ruby implementation of the **Universal Tool Calling Protocol (UTCP)**.
-It mirrors the core models — **Manual**, **Tool**, **Providers**, and **Auth** — and lets you
-discover tools and call them over HTTP, SSE, and HTTP chunked streams.
-
-> Status: early alpha, but usable for simple demos. Standard library only.
-
-## Features
-- Load one or more "manual providers" from `providers.json` (HTTP or local file).
-- Store discovered tools in an in-memory repository.
-- Call tools via HTTP (`GET/POST/PUT/PATCH/DELETE`), SSE, or HTTP chunked streaming.
-- API Key, Basic, and OAuth2 Client Credentials auth (token cached in memory).
-- Simple variable substitution for `${VAR}` using values from environment and `.env` files.
-- Tiny search helper scoring tags + description to find relevant tools.
-
-## Install
-This is a vanilla Ruby project. No external gems are required.
-```bash
-ruby -v   # Ruby 3.x recommended
-```
-
-## Quickstart
-```bash
-# 1) Unzip, cd in
-cd ruby-utcp
-
-# 2) (Optional) create a .env file with secrets
-echo 'OPEN_WEATHER_API_KEY=replace-me' > .env
-
-# 3) Run the example (uses httpbin.org)
-ruby examples/basic_call.rb
-```
-
-## Layout
-```
-lib/utcp.rb
-lib/utcp/version.rb
-lib/utcp/client.rb
-lib/utcp/tool.rb
-lib/utcp/errors.rb
-lib/utcp/utils/env_loader.rb
-lib/utcp/utils/subst.rb
-lib/utcp/auth.rb
-lib/utcp/tool_repository.rb
-lib/utcp/search.rb
-lib/utcp/providers/base_provider.rb
-lib/utcp/providers/http_provider.rb
-lib/utcp/providers/sse_provider.rb
-lib/utcp/providers/http_stream_provider.rb
-bin/utcp
-examples/providers.json
-examples/tools_weather.json
-examples/basic_call.rb
-```
-
-## Example manual (local file)
-See `examples/tools_weather.json` for a minimal UTCP manual that exposes two tools:
-- `echo` (POST JSON to httpbin.org)
-- `stream_http` (stream 20 JSON lines from httpbin.org)
-
-## CLI
-```bash
-# List all discovered tools
-ruby bin/utcp list examples/providers.json
-
-# Call a tool (args as JSON)
-ruby bin/utcp call examples/providers.json echo --args '{"message":"hello"}'
-```
-
-## License
-MPL-2.0
-
-
-## New transports (alpha)
-- **WebSocket**: minimal RFC6455 text-only client; great for echo/testing.
-- **GraphQL**: POST query + variables to any GraphQL endpoint.
-- **TCP/UDP**: raw sockets with simple `${var}` templating; includes local echo servers under `examples/dev/`.
-- **CLI**: call local commands (use carefully!).
-
-### Try them
-Start local echo servers (optional, for TCP/UDP):
-```bash
-ruby examples/dev/echo_tcp_server.rb 5001
-ruby examples/dev/echo_udp_server.rb 5002
-```
-
-Use the extra providers file:
-```bash
-ruby bin/utcp list examples/providers_extra.json
-ruby bin/utcp call examples/providers_extra.json ws_demo.ws_echo --args '{"text":"hello ws"}' --stream
-ruby bin/utcp call examples/providers_extra.json cli_demo.shell_echo --args '{"msg":"hi from shell"}'
-ruby bin/utcp call examples/providers_extra.json sock_demo.tcp_echo --args '{"name":"kamil"}'
-ruby bin/utcp call examples/providers_extra.json gql_demo.country_by_code --args '{"code":"DE"}'
-```
-
-
-## MCP provider
-This adds a minimal HTTP-based MCP bridge.
-
-### Discovery
-Manual discovery expects the server to return a UTCP manual at `{url}/manual` (configurable via `discovery_path`). Point a manual provider to `"provider_type": "mcp"` in `providers.json` to fetch tools.
-
-### Calls
-Tools with `"provider_type": "mcp"` will POST to `{url}/call` with:
-```json
-{ "tool": "<name>", "arguments": { "...": "..." } }
-```
-If the response is `text/event-stream` we parse SSE and yield each `data:` line; otherwise we stream raw chunks when `--stream` is used.
-
-### Example
-```bash
-# assuming an MCP test server on http://localhost:8220/mcp
-ruby bin/utcp list examples/providers_mcp.json
-ruby bin/utcp call examples/providers_mcp.json mcp_demo.hello --args '{"name":"Kamil"}'
-```
-
-
-## Tests
-This project uses **Minitest** (stdlib only).
-
-Run all tests:
-```bash
-ruby bin/test
-```
-or
-```bash
-ruby -Ilib -Itest -rminitest/autorun test/*_test.rb
-```