sappho-socket 0.0.2 → 0.0.3

data/lib/sappho-socket/auto_flush_log.rb

@@ -0,0 +1,60 @@
+# See https://github.com/sappho/sappho-heatmiser-proxy/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+
+module Sappho
+  module Socket
+
+    require 'singleton'
+    require 'thread'
+    require 'logger'
+
+    class AutoFlushLog
+
+      include Singleton
+
+      def initialize
+        @mutex = Mutex.new
+        @log = Logger.new $stdout
+        @log.level = ENV['application.log.level'] == 'debug' ? Logger::DEBUG : Logger::INFO
+      end
+
+      def info message
+        @mutex.synchronize do
+          @log.info message
+          $stdout.flush
+        end if @log.info?
+      end
+
+      def debug message
+        @mutex.synchronize do
+          @log.debug message
+          $stdout.flush
+        end if @log.debug?
+      end
+
+      def error error
+        @mutex.synchronize do
+          @log.error "error! #{error.message}"
+          error.backtrace.each { |error| @log.error error }
+          $stdout.flush
+        end if @log.error?
+      end
+
+      def debug?
+        @log.debug?
+      end
+
+    end
+
+    module LogUtilities
+
+      def hexString bytes
+        (bytes.collect {|byte| "%02x " % (byte & 0xFF)}).join
+      end
+
+    end
+
+  end
+end

data/lib/sappho-socket/connected_socket.rb

@@ -3,11 +3,11 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'socket'
-
 module Sappho
   module Socket
 
+    require 'socket'
+
     class ConnectedSocket
 
       def attach socket

data/lib/sappho-socket/mock_socket.rb

@@ -3,8 +3,6 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'timeout'
-
 module Sappho
   module Socket
 

data/lib/sappho-socket/safe_server.rb

@@ -0,0 +1,76 @@
+# See https://github.com/sappho/sappho-socket/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+
+module Sappho
+  module Socket
+
+    require 'sappho-socket/auto_flush_log'
+    require 'thread'
+    require 'socket'
+
+    class SafeServer
+
+      def initialize name, port, maxClients = 10
+        @name = name
+        @port = port
+        @maxClients = maxClients
+        @clients = {}
+        @mutex = Mutex.new
+        @log = AutoFlushLog.instance
+      end
+
+      def serve
+        Thread.new do
+          begin
+            @log.info "opening #{@name} server port #{@port}"
+            @server = TCPServer.open @port
+            @log.info "#{@name} server port #{@port} is now open"
+            clientCount = 0
+            loop do
+              @mutex.synchronize do
+                clientCount = @clients.size
+              end
+              if clientCount >= @maxClients
+                sleep 1
+              else
+                @log.info "listening for new clients on #{@name} server port #{@port}"
+                client = @server.accept
+                ip = client.getpeername
+                ip = (4 ... 8).map{|pos|ip[pos]}.join('.')
+                @mutex.synchronize do
+                  @clients[client] = ip
+                  log ip, 'connected'
+                end
+                Thread.new client, ip do | client, ip |
+                  socket = SafeSocket.new 30
+                  socket.attach client
+                  begin
+                    yield socket, ip, @name, @port
+                  rescue => error
+                    @log.error error
+                  end
+                  socket.close
+                  @mutex.synchronize do
+                    @clients.delete client
+                    log ip, 'disconnected'
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
+      private
+
+      def log ip, status
+        @log.info "client #{ip} #{status}"
+        @log.info "clients: #{@clients.size > 0 ? (@clients.collect{|client, ip| ip}).join(', ') : 'none'}"
+      end
+
+    end
+
+  end
+end

data/lib/sappho-socket/safe_socket.rb

@@ -3,13 +3,13 @@
 # See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
 # Copyright 2012 Andrew Heald.
 
-require 'timeout'
-require 'socket'
-require 'sappho-socket/connected_socket'
-
 module Sappho
   module Socket
 
+    require 'timeout'
+    require 'socket'
+    require 'sappho-socket/connected_socket'
+
     class SafeSocket
 
       def SafeSocket.mock session, timeout = 10

data/lib/sappho-socket/version.rb

@@ -6,7 +6,7 @@
 module Sappho
   module Socket
     NAME = 'sappho-socket'
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
     AUTHORS = ['Andrew Heald']
     EMAILS = ['andrew@heald.co.uk']
     HOMEPAGE = 'https://github.com/sappho/sappho-socket/wiki'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-socket
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andrew Heald
@@ -45,7 +45,9 @@ extra_rdoc_files: []
 
 files: 
 - lib/sappho-socket/version.rb
+- lib/sappho-socket/auto_flush_log.rb
 - lib/sappho-socket/connected_socket.rb
+- lib/sappho-socket/safe_server.rb
 - lib/sappho-socket/mock_socket.rb
 - lib/sappho-socket/safe_socket.rb
 - test/ruby/socket_test.rb