Fix connect to remote 2.0 servers (used to only work in local)

Author: nark

Gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gemspec

Gemfile.lock

@@ -0,0 +1,49 @@
+PATH
+  remote: .
+  specs:
+    wired (0.0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bindata (2.4.4)
+    deep_clone (0.0.1)
+    diff-lcs (1.3)
+    little-plugger (1.1.4)
+    logging (1.8.2)
+      little-plugger (>= 1.1.3)
+      multi_json (>= 1.8.4)
+    mini_portile2 (2.4.0)
+    multi_json (1.13.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    openssl (2.1.2)
+    pr-zlib (1.0.6)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    timers (1.1.0)
+    zlib (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bindata (~> 2.4.4)
+  deep_clone (~> 0.0.1)
+  logging (~> 1.8, >= 1.8.1)
+  nokogiri (~> 1.5, >= 1.5.5)
+  openssl (~> 2.1.2)
+  pr-zlib (~> 1.0.6)
+  rspec (~> 2.13, >= 2.13.0)
+  timers (~> 1.1, >= 1.1.0)
+  wired!
+  zlib (~> 1.0.0)
+
+BUNDLED WITH
+   1.17.3

README.md

@@ -88,6 +88,10 @@ And run:
 
 Have a look to `bin/rwire` code, rspec test cases and the source code for more examples.
 
+## RWire example
+
+	bin/rwire connect example.org:4875 -l admin -p ********
+
 ## Contribute
 
 Of course, every contributions are welcome, do not hesitate to commit pull-requests.

bin/rwire

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
-
 require 'curses'
-require "./lib/wired"
+require './lib/wired'
 require 'thor'
 
 
@@ -64,6 +63,18 @@ class Window
 				message.add_parameter("wired.chat.id", 1)
 				message.add_parameter("wired.chat.topic.topic", reststring)
 
+      elsif string.start_with? "/nick"
+        @client.nick = reststring
+        @client.set_nick
+
+      elsif string.start_with? "/status"
+        @client.status = reststring
+        @client.set_status
+
+      elsif string.start_with? "/icon"
+        @client.icon = reststring
+        @client.set_icon
+        
   		end
   	else
   		message = Wired::Message.new(:name => "wired.chat.send_say", :spec => @client.spec)
@@ -84,7 +95,7 @@ class Window
   def draw_text_field
     setpos(divider_line, 0)
     attron(color_pair(COLOR_WHITE) | A_NORMAL) do
-      addstr("#" * cols)
+      addstr("_" * cols)
     end
 
     cursor_to_input_line
@@ -122,23 +133,26 @@ end
 
 
 class RWire < Thor
-  desc "connect <hostname:port> <username> <password>", "Connect to a Wired 2.0 server"
+  desc "connect <hostname> [OPTIONS]", "Connect to a Wired 2.0 server"
   long_desc <<-LONGDESC
     RWire is a lightweight Wired 2.0 client written in Ruby.
 
-    With --nick option, you can specify your user nickname in the public chat.
-
-    With --status option, you can specify your user status in the public chat.
-
     Copyright © 2015, Rafaël Warnault <[email protected]>. All rights reserved.
   LONGDESC
 
 
-  option :nick, :type => :string, :default => "RWire Client", :banner => "<nick>"
-  option :status, :type => :string, :default => "Red Ruby", :banner => "<status>"
+  method_option :login,     :aliases => "-l", :type => :string, :desc => "User login", :banner => "<login>", :default => "guest"
+  method_option :password,  :aliases => "-p", :type => :string, :desc => "User password", :banner => "<password>"
+  method_option :port,      :aliases => "-P", :type => :string, :desc => "Server port", :banner => "<port>", :default => "4871"
+  method_option :nick,      :aliases => "-n", :type => :string, :desc => "User nickname", :banner => "<nick>", :default => "RWire Client"
+  method_option :status,    :aliases => "-s", :type => :string, :desc => "User status", :banner => "<status>"
+  method_option :icon,      :aliases => "-i", :type => :string, :desc => "User icon", :banner => "/path/to/image"
 
+  def connect(hostname)
+    login     = options[:login]    || "guest"
+    password  = options[:password] || ""
+    port      = options[:port]     || "4871"
 
-  def connect(hostname, login="guest", password="")
   	# Logging setup (remove stdout and add rwire.log file)
   	Wired::Log.remove_appenders Logging.appenders.stdout
   	Wired::Log.add_appenders Logging.appenders.file('log/rwire.log')
@@ -148,10 +162,10 @@ class RWire < Thor
 		spec = Wired::Spec.new
 
 		# Create a Wired Url object pointing to "localhost"
-		url = Wired::Url.new "wired://admin@localhost"
+		url = Wired::Url.new "wired://#{login}:#{password}@#{hostname}:#{port}"
 
 		# Create a Client object against the specification
-		client = Wired::Client.new spec 
+		client = Wired::Client.new(spec, options)
 
 		# Handle interupt properly
 		#Kernel.trap("INT") { client.disconnect }
@@ -164,7 +178,7 @@ class RWire < Thor
 
     begin
       window.start
-    rescue Interrupt
+    rescue Interrupt => e
       client.disconnect
       warn "\nYou have been disconnected from #{client.server.name}"
       exit 1

database.sqlite3

@@ -1,5 +1,6 @@
 require_relative 'wired/cipher'
 require_relative 'wired/client'
+require_relative 'wired/icon'
 require_relative 'wired/logger'
 require_relative 'wired/message'
 require_relative 'wired/server'

lib/wired.rb

@@ -23,6 +23,7 @@ def initialize(spec, options = {})
 			@spec				= spec
 			@nick 			= options[:nick]  	|| "Ruby Wired Client"
 			@status			= options[:status]  || "Ruby version " + RUBY_VERSION
+			@icon				= options[:icon] 		|| nil
 			@options 		= options
 			@listeners  = []
 			@users 			= []
@@ -45,7 +46,7 @@ def connect(url, listener = nil)
 
 			@socket = Wired::Socket.new(@url.hostname, @spec, options)
 			if @socket.connect
-				if client_info and login
+				if client_info and set_user and login
 					if listener
 						@listeners << listener
 						listen
@@ -95,8 +96,40 @@ def join_chat(chat_id)
 
 
 
-		def destroy
+		def set_nick
+			message = Wired::Message.new(:spec => @spec, :name => "wired.user.set_nick")
+			message.add_parameter("wired.user.nick", @nick)
 
+			send_message message
+			message = @socket.read
+		end
+
+
+		def set_status
+			message = Wired::Message.new(:spec => @spec, :name => "wired.user.set_status")
+			message.add_parameter("wired.user.status", @status)
+
+			send_message message
+			message = @socket.read
+		end
+
+
+		def set_icon
+			new_icon = nil
+
+			if @icon != nil 
+				new_icon = Wired::Icon.new path: options[:icon] 
+			else
+				new_icon = Wired::Icon.new string: $default_icon
+			end
+
+			Wired::Log.info new_icon.string
+
+			message = Wired::Message.new(:spec => @spec, :name => "wired.user.set_icon")
+			message.add_parameter("wired.user.icon", new_icon.to_bin)
+
+			send_message message
+			message = @socket.read
 		end
 
 
@@ -256,16 +289,19 @@ def client_info
 			message = Wired::Message.new(:spec => @spec, :name => "wired.client_info")
 
 			message.add_parameters({
-					"wired.info.application.name" 		=> "Wired Ruby",
-					"wired.info.application.version" 	=> "0.1",
-					"wired.info.application.build" 		=> "0",
-					"wired.info.os.name" 							=> "OSX",
-					"wired.info.os.version" 					=> "10.8",
-					"wired.info.arch" 								=> "x86_64",
-					"wired.info.supports_rsrc" 				=> "false"
-				})
+				"wired.info.application.name" 		=> "Wired Ruby",
+				"wired.info.application.version"  => "0.1",
+				"wired.info.application.build" 		=> "1",
+				"wired.info.os.name" 							=> "macOS",
+				"wired.info.os.version" 					=> "10.8",
+				"wired.info.arch" 								=> "x86_64",
+				"wired.info.supports_rsrc" 				=> "false"
+			})
+
+			send_message message		
+
+			sleep 1
 
-			send_message message
 			message = @socket.read
 
 			@server = Wired::Server.new message if message
@@ -275,6 +311,8 @@ def client_info
 
 
 		def login
+			puts "login"
+
 			message = Wired::Message.new(:spec => @spec, :name => "wired.send_login")
 
 			if @url.login && @url.login.size > 0
@@ -292,5 +330,14 @@ def login
 			send_message message
 			message = @socket.read
 		end
+
+
+		def set_user
+			puts "set_user"
+
+			set_nick
+			set_status
+			set_icon
+		end
 	end
 end

lib/wired/client.rb

@@ -0,0 +1,106 @@
+require 'base64'
+
+$default_icon = "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr
+								 0AAAAAXNSR0IArs4c6QAAAAlwSFlzAAALEwAACxMBAJ
+								 qcGAAAAVlpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAA
+								 Dx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0
+								 YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICA
+								 gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3Ln
+								 czLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjI
+								 j4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJv
+								 dXQ9IiIKICAgICAgICAgICAgeG1sbnM6dGlmZj0iaHR
+								 0cDovL25zLmFkb2JlLmNvbS90aWZmLzEuMC8iPgogIC
+								 AgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmO
+								 k9yaWVudGF0aW9uPgogICAgICA8L3JkZjpEZXNjcmlw
+								 dGlvbj4KICAgPC9yZGY6UkRGPgo8L3g6eG1wbWV0YT4
+								 KTMInWQAACCdJREFUWAntVmuMVGcZfs53bnO/7czO7D
+								 Iss7DQcsdKu1RssYXEpmpsU4mxRrGYoOkvo8SY6B9Nj
+								 YkYIjb+MobQP8ZgIcQixVagFVqX+wLCXplZdhZ2534/
+								 M+fqe8ZlWQRajP9M35lvzvV73+d93tsAn8j/AQPc/+L
+								 Df7tZ6H+tf0Mi3v1sxB9Y63P5uyQmyKql1qpKLZUrlA
+								 auXh5/d3D34MjDgnpoABtee+yrfUsT3+uJxfrj3THO5
+								 /TBKcqQBRkGVChWHeVGGempmdrI6OThvw2c/mXut7nz
+								 HwfkYwGEd4S7VqzsfX1x36KXemJhRHx++F0+uCQPvKI
+								 fHOOgoUkAKlDMOnRTg95kSA6V60F14a92btl5FAIaBK
+								 REq8BxXHU+qI8EEH810te1tPNAT9+C1TFfECu64ujwh
+								 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
+								 k6d3UEBImrAAAAAElFTkSuQmCC"
+
+module Wired
+	class Icon
+		attr_accessor	:path
+		attr_accessor	:string
+
+		def initialize(options = {})
+			@path 	= options[:path]
+			@string = options[:string] || $default_icon
+
+			@string = Base64.strict_encode64(File.open(@path, "rb").read).to_s if @path
+		end
+
+
+		def to_b64
+			return @string if @string
+			return nil
+		end
+
+
+		def to_bin
+			@string.unpack('m*')[0]
+		end
+	end
+end