realtimex 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186c4a4f137225ab7ca45bfa90451ec86b5ec8fad21aeb61b8900bf43b7f5a6e
-  data.tar.gz: ace0043ea61e33a3ccffe10a30e879af118179c2757e8a48ee5cc5313bcaa1ac
+  metadata.gz: 8401391664a412d0b303e7b627ec75580d6d56f1d6b20d4cccb5b537d0f3f07a
+  data.tar.gz: 984978e072d033e17394e63a14c57228dad5851be3ac854fb965079d12cec125
 SHA512:
-  metadata.gz: 96e9b4348dd23ae60c4e5ff9e0b69826a56f22d6c56a3911ed4379b5b859d9d8c1c7992924abef71f09ed254dd431f8e75ed958bb116a7e178972a52634ceb31
-  data.tar.gz: 31de2c7549e275d9586649ac96d8a5468755a1c0508a7822f50338114b6e223a43b064441c86dce4b3f0bf7613a9aaff5f50f886ecc1b8ae63fa67815ce24b3c
+  metadata.gz: d6a3aba3f5638d32dc590e89bdf84ca32f750eed94decc155aab2c96f3ed42ceeec4fe0f71b3de63899cba5e9f4880b55563090dad817e9e2fc37453e8a74fec
+  data.tar.gz: fc0dd351bdffaddedc26493265acc6f3a9489455ee76f2b4fe6f62b76090705cf97956f6305811a08be4d693d0c92c4f31cacec1cea4857eecac5bd6c09e5745

data/lib/realtimex/connection.rb

@@ -1,14 +1,5 @@
-require 'uri'
-require 'cgi'
-
-# Patch for Ruby 3.4 compatibility
-module URI
-  def self.encode(str)
-    CGI.escape(str)
-  end
-end unless URI.respond_to?(:encode)
-
-require 'socket.io-client-simple'
+require 'websocket-client-simple'
+require 'json'
 
 class RealtimeX::Connection
   def initialize(url, debug: false)
@@ -20,68 +11,82 @@ class RealtimeX::Connection
   end
 
   def connect
-    debug_log "Connecting to: #{@url}"
+    puts "[RealtimeX] Connecting to: #{@url}" if @debug
     
     begin
-      @socket = SocketIO::Client::Simple.connect(@url, transports: ['websocket'])
+      @socket = WebSocket::Client::Simple.connect(@url)
       setup_handlers
-      debug_log "Socket.IO client created successfully"
+      puts "[RealtimeX] WebSocket client created successfully" if @debug
     rescue => e
-      debug_log "Connection failed: #{e.message}"
+      puts "[RealtimeX] Connection failed: #{e.message}" if @debug
       emit('error', { message: e.message, type: 'connection_error' })
       raise e
     end
   end
 
   def setup_handlers
-    @socket.on :connect do
+    @socket.on :open do
       @connected = true
-      debug_log "Socket.IO connected successfully"
+      puts "[RealtimeX] WebSocket connected successfully" if @debug
       emit('connected')
     end
     
-    @socket.on :disconnect do
+    @socket.on :close do
       @connected = false
-      debug_log "Socket.IO disconnected"
+      puts "[RealtimeX] WebSocket disconnected" if @debug
       emit('disconnected')
     end
     
     @socket.on :error do |error|
-      debug_log "Socket.IO error: #{error}"
+      puts "[RealtimeX] WebSocket error: #{error}" if @debug
       emit('error', error)
     end
     
-    @socket.on 'server-event' do |data|
-      debug_log "Received server-event: #{data}"
-      emit('message', data)
+    @socket.on :message do |msg|
+      puts "[RealtimeX] Received message: #{msg.data}" if @debug
+      handle_message(msg.data)
     end
+  end
 
-    @socket.on 'realtimex_internal:subscription_succeeded' do |data|
-      debug_log "Subscription succeeded: #{data}"
-      emit('subscription_succeeded', data)
+  def handle_message(data)
+    # Parse Socket.IO message format: 42["event",{data}]
+    if data.start_with?('42[')
+      json_part = data[3..-2] # Remove '42[' and ']'
+      parts = JSON.parse("[#{json_part}]")
+      event = parts[0]
+      event_data = parts[1]
+      
+      case event
+      when 'server-event'
+        emit('message', event_data)
+      when 'realtimex_internal:subscription_succeeded'
+        emit('subscription_succeeded', event_data)
+      end
     end
+  rescue JSON::ParserError => e
+    puts "[RealtimeX] Failed to parse message: #{e.message}" if @debug
   end
 
   def send_subscribe(channel)
     ensure_connected
-    debug_log "Subscribing to channel: #{channel}"
-    @socket.emit('realtimex:subscribe', { channel: channel })
+    puts "[RealtimeX] Subscribing to channel: #{channel}" if @debug
+    message = "42[\"realtimex:subscribe\",{\"channel\":\"#{channel}\"}]"
+    @socket.send(message)
   end
 
   def send_client_event(channel, event, data)
     ensure_connected
-    debug_log "Sending client event: #{event} to #{channel}"
-    @socket.emit('client-event', {
-      channel: channel,
-      event: event,
-      data: data
-    })
+    puts "[RealtimeX] Sending client event: #{event} to #{channel}" if @debug
+    data_json = JSON.generate(data)
+    message = "42[\"client-event\",{\"channel\":\"#{channel}\",\"event\":\"#{event}\",\"data\":#{data_json}}]"
+    @socket.send(message)
   end
 
   def send_unsubscribe(channel)
     ensure_connected
-    debug_log "Unsubscribing from channel: #{channel}"
-    @socket.emit('realtimex:unsubscribe', { channel: channel })
+    puts "[RealtimeX] Unsubscribing from channel: #{channel}" if @debug
+    message = "42[\"realtimex:unsubscribe\",{\"channel\":\"#{channel}\"}]"
+    @socket.send(message)
   end
 
   def bind(event, &block)
@@ -93,11 +98,19 @@ class RealtimeX::Connection
   end
 
   def disconnect
-    debug_log "Disconnecting..."
-    @socket&.disconnect
+    puts "[RealtimeX] Disconnecting..." if @debug
+    @socket&.close
     @connected = false
   end
 
+  def wait_for_connection(timeout = 5)
+    start_time = Time.now
+    while !@connected && (Time.now - start_time) < timeout
+      sleep 0.1
+    end
+    @connected
+  end
+
   def connected?
     @connected
   end
@@ -109,8 +122,4 @@ class RealtimeX::Connection
       raise "Not connected to RealtimeX. Call connect() first."
     end
   end
-
-  def debug_log(message)
-    puts "[RealtimeX] #{message}" if @debug
-  end
 end

data/lib/realtimex/version.rb

@@ -1,3 +1,3 @@
 class RealtimeX
-  VERSION = "1.0.4"
+  VERSION = "2.0.0"
 end

data/lib/realtimex.rb

@@ -57,7 +57,7 @@ class RealtimeX
   end
 
   def build_url
-    protocol = @options[:encrypted] ? 'https' : 'http'
+    protocol = @options[:encrypted] ? 'wss' : 'ws'
     host = @options[:ws_host]
     port = @options[:ws_port]
     "#{protocol}://#{host}:#{port}/socket.io/?EIO=4&transport=websocket&api_key=#{@api_key}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realtimex
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - RealtimeX Team
@@ -11,19 +11,19 @@ cert_chain: []
 date: 2025-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: socket.io-client-simple
+  name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement