tkellem 0.9.0.beta3 → 0.9.0.beta4

data/lib/tkellem/bouncer.rb

@@ -1,14 +1,12 @@
 require 'active_support/core_ext/class/attribute_accessors'
-require 'celluloid/io'
 
+require 'tkellem/irc_server'
 require 'tkellem/bouncer_connection'
 
 module Tkellem
 
 class Bouncer
-  include Celluloid::IO
   include Tkellem::EasyLogger
-  include Tkellem::CelluloidTools::LineReader
 
   attr_reader :user, :network, :nick, :network_user, :connected_at
   cattr_accessor :plugins
@@ -33,7 +31,7 @@ class Bouncer
     # clients waiting for us to connect to the irc server
     @waiting_clients = []
 
-    async.connect
+    connect!
   end
 
   def data(key)
@@ -104,13 +102,6 @@ class Bouncer
     end
   end
 
-  def receive_line(line)
-    trace "from server: #{line}"
-    return if line.blank?
-    msg = IrcMessage.parse(line)
-    server_msg(msg)
-  end
-
   def server_msg(msg)
     return if plugins.any? do |plugin|
       !plugin.server_msg(self, msg)
@@ -187,27 +178,32 @@ class Bouncer
   alias_method :log_name, :name
 
   def send_msg(msg)
+    return unless @conn
     trace "to server: #{msg}"
-    @socket.write("#{msg}\r\n")
+    @conn.send_data("#{msg}\r\n")
   end
 
-  def connection_established
-    debug "Connected"
+  def connection_established(conn)
+    @conn = conn
     # TODO: support sending a real username, realname, etc
     send_msg("USER #{@user.username} somehost tkellem :#{@user.name}@tkellem")
     change_nick(@nick, true)
     @connected_at = Time.now
-    async.run
   end
 
   def disconnected!
     debug "OMG we got disconnected."
+    @conn = nil
     @connected = false
     @connected_at = nil
     @active_conns.each { |c,s| c.close_connection }
     connect!
   end
 
+  def kill!
+    @active_conns.each { |c,s| c.close_connection }
+  end
+
   protected
 
   def change_nick(new_nick, force = false)
@@ -220,21 +216,9 @@ class Bouncer
     @welcomes.each { |msg| msg.args[0] = nick; bouncer_conn.send_msg(msg) }
   end
 
-  def connect
-    hosts = network.reload.hosts
-    # random rather than round-robin, not totally ideal
-    # Note: Celluloid::TCPSocket also is random rather than round-robin when
-    # picking the DNS IP record to connect to
-    host = hosts[rand(hosts.length)]
-    begin
-      info "Connecting to #{host}"
-      @socket = TCPSocket.new(host.address, host.port)
-      if host.ssl
-        @socket = SSLSocket.new(@socket)
-        @socket.connect
-      end
-    end
-    connection_established
+  def connect!
+    @connector ||= IrcServerConnection.connector(self, network)
+    @connector.connect!
   end
 
   def ready!

data/lib/tkellem/bouncer_connection.rb

@@ -1,19 +1,19 @@
 require 'active_support/core_ext/object/blank'
-require 'celluloid/io'
 
+require 'eventmachine'
 require 'tkellem/irc_message'
-require 'tkellem/celluloid_tools'
 
 module Tkellem
 
-class BouncerConnection
-  include Celluloid::IO
+module BouncerConnection
+  include EM::Protocols::LineText2
   include Tkellem::EasyLogger
-  include Tkellem::CelluloidTools::LineReader
 
-  def initialize(tkellem_server, socket)
+  def initialize(tkellem_server, do_ssl)
+    set_delimiter "\r\n"
+
+    @ssl = do_ssl
     @tkellem = tkellem_server
-    @socket = socket
 
     @state = :auth
     @name = 'new-conn'
@@ -31,11 +31,24 @@ class BouncerConnection
     @data[key] ||= {}
   end
 
+  def post_init
+    failsafe(:post_init) do
+      if ssl
+        start_tls :verify_peer => false
+      else
+        ssl_handshake_completed
+      end
+    end
+  end
+
+  def ssl_handshake_completed
+  end
+
   def error!(msg)
     info("ERROR :#{msg}")
     say_as_tkellem(msg)
     send_msg("ERROR :#{msg}")
-    close_connection
+    close_connection(true)
   end
 
   def connect_to_irc_server
@@ -77,38 +90,40 @@ class BouncerConnection
   end
 
   def receive_line(line)
-    trace "from client: #{line}"
-    return if line.blank?
-    msg = IrcMessage.parse(line)
-
-    command = msg.command
-    if @state != :auth && command == 'PRIVMSG' && msg.args.first == '-tkellem'
-      msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
-    elsif command == 'TKELLEM' || command == 'TK'
-      msg_tkellem(msg)
-    elsif command == 'CAP'
-      # TODO: full support for CAP -- this just gets mobile colloquy connecting
-      if msg.args.first =~ /req/i
-        send_msg("CAP NAK")
-      end
-    elsif command == 'PASS' && @state == :auth
-      @password = msg.args.first
-    elsif command == 'NICK' && @state == :auth
-      @connecting_nick = msg.args.first
-      maybe_connect
-    elsif command == 'QUIT'
-      close_connection
-    elsif command == 'USER' && @state == :auth
-      unless @username
-        @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
+    failsafe("message: {#{line}}") do
+      trace "from client: #{line}"
+      return if line.blank?
+      msg = IrcMessage.parse(line)
+
+      command = msg.command
+      if @state != :auth && command == 'PRIVMSG' && msg.args.first == '-tkellem'
+        msg_tkellem(IrcMessage.new(nil, 'TKELLEM', [msg.args.last]))
+      elsif command == 'TKELLEM' || command == 'TK'
+        msg_tkellem(msg)
+      elsif command == 'CAP'
+        # TODO: full support for CAP -- this just gets mobile colloquy connecting
+        if msg.args.first =~ /req/i
+          send_msg("CAP NAK")
+        end
+      elsif command == 'PASS' && @state == :auth
+        @password = msg.args.first
+      elsif command == 'NICK' && @state == :auth
+        @connecting_nick = msg.args.first
+        maybe_connect
+      elsif command == 'QUIT'
+        close_connection
+      elsif command == 'USER' && @state == :auth
+        unless @username
+          @username, @conn_info = msg.args.first.strip.split('@', 2).map { |a| a.downcase }
+        end
+        maybe_connect
+      elsif @state == :auth
+        error!("Protocol error. You must authenticate first.")
+      elsif @state == :connected
+        @bouncer.client_msg(self, msg)
+      else
+        say_as_tkellem("You must connect to an irc network to do that.")
       end
-      maybe_connect
-    elsif @state == :auth
-      error!("Protocol error. You must authenticate first.")
-    elsif @state == :connected
-      @bouncer.client_msg(self, msg)
-    else
-      say_as_tkellem("You must connect to an irc network to do that.")
     end
   end
 
@@ -182,13 +197,14 @@ class BouncerConnection
   end
 
   def send_msg(msg)
-    return if @socket.closed?
     trace "to client: #{msg}"
-    @socket.write("#{msg}\r\n")
+    send_data("#{msg}\r\n")
   end
 
   def unbind
-    @bouncer.try(:disconnect_client, self)
+    failsafe(:unbind) do
+      @bouncer.disconnect_client(self) if @bouncer
+    end
   end
 end
 

data/lib/tkellem/daemon.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'optparse'
 
 require 'tkellem'
+require 'tkellem/socket_server'
 
 class Tkellem::Daemon
   attr_reader :options
@@ -14,7 +15,7 @@ class Tkellem::Daemon
   end
 
   def run
-    opts = OptionParser.new do |opts|
+    op = OptionParser.new do |opts|
       opts.banner = "Usage #{$0} <command> <options>"
       opts.separator %{\nWhere <command> is one of:
   start      start the jobs daemon
@@ -29,13 +30,14 @@ class Tkellem::Daemon
       opts.on("-p", "--path", "Use alternate folder for tkellem data (default #{options[:path]})") { |p| options[:path] = p }
       opts.on_tail("-h", "--help", "Show this message") { puts opts; exit }
     end
-    opts.parse!(@args)
+    op.parse!(@args)
 
     FileUtils.mkdir_p(path)
     File.chmod(0700, path)
     command = @args.shift
     case command
     when 'start'
+      abort_if_running
       daemonize
       start
     when 'stop'
@@ -85,8 +87,12 @@ class Tkellem::Daemon
   end
 
   def start
+    trap("INT") { EM.stop }
     remove_files
-    Tkellem::TkellemServer.new(options).run
+    EM.run do
+      @admin = EM.start_unix_domain_server(socket_file, Tkellem::SocketServer)
+      Tkellem::TkellemServer.new
+    end
   ensure
     remove_files
   end
@@ -99,9 +105,6 @@ class Tkellem::Daemon
     @daemon = true
     File.open(pid_file, 'wb') { |f| f.write(Process.pid.to_s) }
 
-    # TODO: support syslog
-    require 'logger'
-    logger = Logger.new(log_file)
     STDIN.reopen("/dev/null")
     STDOUT.reopen(log_file, 'a')
     STDERR.reopen(STDOUT)
@@ -133,8 +136,16 @@ class Tkellem::Daemon
     pid.to_i > 0 ? pid.to_i : nil
   end
 
+  def abort_if_running
+    pid = File.read(pid_file) if File.file?(pid_file)
+    if pid.to_i > 0
+      puts "tkellem already running, pid: #{pid}"
+      exit
+    end
+  end
+
   def remove_files
-    FileUtils.rm(socket_file) if File.exist?(socket_file)
+    FileUtils.rm(socket_file) if File.file?(socket_file)
     return unless @daemon
     pid = File.read(pid_file) if File.file?(pid_file)
     if pid.to_i == Process.pid

data/lib/tkellem/irc_server.rb

@@ -0,0 +1,124 @@
+require 'eventmachine'
+require 'set'
+require 'socket'
+
+require 'tkellem/irc_message'
+require 'tkellem/bouncer_connection'
+
+module Tkellem
+
+module IrcServerConnection
+  include EM::Protocols::LineText2
+
+  def initialize(connection_state, bouncer, do_ssl)
+    set_delimiter "\r\n"
+    @bouncer = bouncer
+    @ssl = do_ssl
+    @connection_state = connection_state
+    @connected = false
+  end
+
+  def connection_completed
+    if @ssl
+      @bouncer.failsafe(:connection_completed) do
+        @bouncer.debug "starting TLS"
+        # TODO: support strict cert checks
+        start_tls :verify_peer => false
+      end
+    else
+      ssl_handshake_completed
+    end
+  end
+
+  def ssl_handshake_completed
+    @bouncer.failsafe(:ssl_handshake_completed) do
+      @connected = true
+      @bouncer.connection_established(self)
+    end
+  end
+
+  def receive_line(line)
+    @bouncer.failsafe(:receive_line) do
+      @bouncer.trace "from server: #{line}"
+      return if line.blank?
+      msg = IrcMessage.parse(line)
+      @bouncer.server_msg(msg)
+    end
+  end
+
+  def unbind
+    @bouncer.failsafe(:unbind) do
+      if @connected
+        @bouncer.disconnected!
+      else
+        @bouncer.debug "Connection failed, trying next"
+        @connection_state.connect!
+      end
+    end
+  end
+
+  class ConnectionState < Struct.new(:bouncer, :network, :attempted, :getting)
+    def initialize(bouncer, network)
+      super(bouncer, network, Set.new, false)
+      reset
+    end
+
+    def connect!
+      raise("already in the process of getting an address") if getting
+      self.getting = true
+      network.reload
+      host_infos = network.hosts.map { |h| h.attributes }
+      EM.defer(proc { find_address(host_infos) }, method(:got_address))
+    end
+
+    def reset
+      self.attempted.clear
+    end
+
+    # runs in threadpool
+    def find_address(hosts)
+      candidates = Set.new
+      hosts.each do |host|
+        Socket.getaddrinfo(host['address'], host['port'], Socket::AF_INET, Socket::SOCK_STREAM, Socket::IPPROTO_TCP).each do |found|
+          candidates << [found[3], host['port'], host['ssl']]
+        end
+      end
+
+      to_try = candidates.to_a.sort_by { rand }.find { |c| !attempted.include?(c) }
+      if to_try.nil?
+        # we've tried all possible hosts, start over
+        return nil
+      end
+
+      return to_try
+    end
+
+    # back on event thread
+    def got_address(to_try)
+      self.getting = false
+
+      if !to_try
+        # sleep for a bit and try again
+        bouncer.debug "All available addresses failed, sleeping 5s and then trying over"
+        reset
+        EM.add_timer(5) { connect! }
+        return
+      end
+
+      attempted << to_try
+      address, port, ssl = to_try
+
+      bouncer.debug "Connecting to: #{Host.address_string(address, port, ssl)}"
+      bouncer.failsafe("connect: #{Host.address_string(address, port, ssl)}") do
+        EM.connect(address, port, IrcServerConnection, self, bouncer, ssl)
+      end
+    end
+  end
+
+  def self.connector(bouncer, network)
+    ConnectionState.new(bouncer, network)
+  end
+
+end
+
+end

data/lib/tkellem/migrations/001_init_db.rb

@@ -1,50 +1,33 @@
-Sequel.migration do
-  up do
-    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '1')
-      next
+class InitDb < ActiveRecord::Migration
+  def self.up
+    create_table 'listen_addresses' do |t|
+      t.string  'address', :null => false
+      t.integer 'port', :null => false
+      t.boolean 'ssl', :null => false, :default => false
     end
 
-    create_table 'listen_addresses' do
-      primary_key :id
-      String  'address', :null => false
-      Integer 'port', :null => false
-      boolean 'ssl', :null => false, :default => false
+    create_table 'users' do |t|
+      t.string 'username', :null => false
+      t.string 'password'
+      t.string 'role', :null => false, :default => 'user'
     end
 
-    create_table 'users' do
-      primary_key :id
-      String 'username', :null => false
-      String 'password'
-      String 'role', :null => false, :default => 'user'
+    create_table 'networks' do |t|
+      t.belongs_to 'user'
+      t.string 'name', :null => false
     end
 
-    create_table 'networks' do
-      primary_key :id
-      foreign_key :user_id, :users
-      String 'name', :null => false
+    create_table 'hosts' do |t|
+      t.belongs_to 'network'
+      t.string  'address', :null => false
+      t.integer 'port', :null => false
+      t.boolean 'ssl', :null => false, :default => false
     end
 
-    create_table 'hosts' do
-      primary_key :id
-      foreign_key :network_id, :networks
-      String  'address', :null => false
-      Integer 'port', :null => false
-      boolean 'ssl', :null => false, :default => false
+    create_table 'network_users' do |t|
+      t.belongs_to 'user'
+      t.belongs_to 'network'
+      t.string 'nick'
     end
-
-    create_table 'network_users' do
-      primary_key :id
-      foreign_key :user_id, :users
-      foreign_key :network_id, :networks
-      String 'nick'
-    end
-  end
-
-  down do
-    drop_table 'network_users'
-    drop_table 'hosts'
-    drop_table 'networks'
-    drop_table 'users'
-    drop_table 'listen_addresses'
   end
 end

data/lib/tkellem/migrations/002_at_connect_columns.rb

@@ -1,24 +1,7 @@
-Sequel.migration do
-  up do
-    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '2')
-      next
-    end
-
-    alter_table 'networks' do
-      add_column 'at_connect', String, :text => true
-    end
-    alter_table 'network_users' do
-      add_column 'at_connect', String, :text => true
-    end
-  end
-
-  down do
-    alter_table 'network_users' do
-      drop_column 'at_connect'
-    end
-    alter_table 'networks' do
-      drop_column 'at_connect'
-    end
+class AtConnectColumns < ActiveRecord::Migration
+  def self.up
+    add_column 'networks', 'at_connect', 'text'
+    add_column 'network_users', 'at_connect', 'text'
   end
 end
 

data/lib/tkellem/migrations/003_settings.rb

@@ -1,22 +1,13 @@
-Sequel.migration do
-  up do
-    if self.table_exists?(:schema_migrations) && self[:schema_migrations].first(:version => '3')
-      next
+class Settings < ActiveRecord::Migration
+  def self.up
+    create_table 'settings' do |t|
+      t.string :name, :null => false
+      t.string :value, :null => false
+      t.boolean :unchanged, :null => false, :default => true
     end
 
-    create_table 'settings' do
-      primary_key :id
-      String :name, :null => false
-      String :value, :null => false
-      boolean :unchanged, :null => false, :default => true
-    end
-
-    self[:settings].insert(:name => 'user_registration', :value => 'closed')
-    self[:settings].insert(:name => 'recaptcha_api_key', :value => '')
-    self[:settings].insert(:name => 'allow_user_networks', :value =>  'false')
-  end
-
-  down do
-    drop_table 'settings'
+    Tkellem::Setting.make_new('user_registration', 'closed')
+    Tkellem::Setting.make_new('recaptcha_api_key', '')
+    Tkellem::Setting.make_new('allow_user_networks', 'false')
   end
 end

data/lib/tkellem/models/host.rb

@@ -1,7 +1,7 @@
 module Tkellem
 
-class Host < Sequel::Model
-  many_to_one :network
+class Host < ActiveRecord::Base
+  belongs_to :network
 
   def to_s
     self.class.address_string(address, port, ssl)

data/lib/tkellem/models/listen_address.rb

@@ -1,24 +1,12 @@
 module Tkellem
 
-class ListenAddress < Sequel::Model
-  plugin :validation_class_methods
-
+class ListenAddress < ActiveRecord::Base
   validates_uniqueness_of :port, :scope => [:address]
   validates_presence_of :address, :port
 
   def to_s
     "#{ssl ? 'ircs' : 'irc'}://#{address}:#{port}"
   end
-
-  def after_create
-    super
-    $tkellem_server.try(:after_create, self)
-  end
-
-  def after_destroy
-    super
-    $tkellem_server.try(:after_destroy, self)
-  end
 end
 
 end

data/lib/tkellem/models/network.rb

@@ -1,24 +1,20 @@
 module Tkellem
 
-class Network < Sequel::Model
-  plugin :nested_attributes
-  plugin :validation_class_methods
-  plugin :serialization
+class Network < ActiveRecord::Base
+  has_many :hosts, :dependent => :destroy
+  accepts_nested_attributes_for :hosts
 
-  one_to_many :hosts, :dependent => :destroy
-  nested_attributes :hosts
-
-  one_to_many :network_users, :dependent => :destroy
+  has_many :network_users, :dependent => :destroy
   # networks either belong to a specific user, or they are public and any user
   # can join them.
-  many_to_one :user
+  belongs_to :user
 
   validates_uniqueness_of :name, :scope => :user_id
 
-  serialize_attributes :yaml, :at_connect
+  serialize :at_connect, Array
 
   def at_connect
-    super || []
+    read_attribute(:at_connect) || []
   end
 
   def public?

data/lib/tkellem/models/network_user.rb

@@ -1,33 +1,17 @@
 module Tkellem
 
-class NetworkUser < Sequel::Model
-  plugin :serialization
+class NetworkUser < ActiveRecord::Base
+  belongs_to :network
+  belongs_to :user
 
-  many_to_one :network
-  many_to_one :user
-
-  serialize_attributes :yaml, :at_connect
-
-  def at_connect
-    super || []
-  end
+  serialize :at_connect, Array
 
   def nick
-    super || user.name
+    read_attribute(:nick) || user.name
   end
 
   def combined_at_connect
-    network.at_connect + at_connect
-  end
-
-  def after_create
-    super
-    $tkellem_server.try(:after_create, self)
-  end
-
-  def after_destroy
-    super
-    $tkellem_server.try(:after_destroy, self)
+    network.at_connect + (at_connect || [])
   end
 end