ipc_transit 0.0.1 → 0.0.2

data/bin/transitd

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+require 'net/http'
+require 'uri'
+require 'ipc_transit'
+
+$url = 'http://127.0.0.1:8726/transit_data'
+
+
+def one_message
+    message = IPCTransit.receive('qname' => 'transitd', 'raw' => 1)
+    if not (serialized_message = message['serialized_wire_data'])
+        raise 'Message did not contain serialized_wire_data'
+    end
+    if not (wire_headers = message['wire_headers'])
+        raise 'Message did not contain wire_headers'
+    end
+    if not (d = wire_headers['d'])
+        raise 'Message did not contain required wire attribite "d"'
+    end
+    postData = Net::HTTP.post_form(URI.parse($url), 
+                               {'data'=>serialized_message})
+    puts postData.body
+end
+while 1
+    begin
+        one_message()
+    rescue Exception => e
+        puts "Exception: #{e}"
+    end
+end
+

data/bin/trsend

@@ -2,9 +2,14 @@
 require 'ipc_transit'
 require 'json'
 
+
 qname = ARGV[0]
 message = JSON.parse(ARGV[1])
+dest = ARGV[2]
 
-
-ret = IPCTransit.send('message' => message, 'qname' => qname)
+if dest.nil?
+    ret = IPCTransit.send('message' => message, 'qname' => qname)
+else
+    ret = IPCTransit.send('message' => message, 'qname' => qname, 'd' => dest)
+end
 puts ret

data/bin/trserver

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+require 'webrick'
+require 'ipc_transit'
+
+
+class PersistAnswers < WEBrick::HTTPServlet::AbstractServlet
+    def do_POST(request, response)
+        status, content_type, body = handle_data(request)
+
+        response.status = status
+        response['Content-Type'] = content_type
+        response.body = body
+    end
+
+    def handle_data(request)
+        if (data = request.query['data'])
+            qname = handle_message({ 'serialized_wire_data' => data })
+        end
+        return 200, 'text/plain', "Forwarding message to queue '#{qname}'"
+    end
+    def handle_message(args)
+        IPCTransit.unpack_data(args)
+        if not (wire_headers = args['wire_headers'])
+            raise 'Message did not contain wire_headers'
+        end
+        if not (args['qname'] = wire_headers['q'])
+            raise 'Message did not contain required wire attribite "q"'
+        end
+        #at this point we should make sure the message we received
+        #is truly destined for this box
+        #we should also decrement the TTL
+        puts "Forwarding message to queue '#{args['qname']}'"
+        IPCTransit.send(args)
+        return args['qname']
+    end
+end
+
+server = WEBrick::HTTPServer.new(:Port => 8726)
+server.mount '/transit_data', PersistAnswers
+trap "INT" do server.shutdown end
+server.start

data/lib/ipc_transit.rb

@@ -3,7 +3,7 @@ require 'SysVIPC'
 include SysVIPC
 
 ##
-# Fast, serverless message queueing
+# Fast, brokerless message queueing
 #
 # Author::    Dana M. Diederich (diederich@gmail.com)
 # Copyright:: Copyright (c) 2012 Dana M. Diederich
@@ -13,15 +13,18 @@ class IPCTransit
     @@queues = {}
 
     @@ipc_transit_wire_header_args = {
-        'e' => {
+        'e' => { #encoding
             'json' => 1,
             'yaml' => 1,
         },
-        'c' => {
+        'c' => { #compression
             'zlib' => 1,
             'snappy' => 1,
             'none' => 1,
         },
+        'd' => 1, #destination address
+        't' => 1, #hop TTL
+        'q' => 1, #destination qname
     }
     @@ipc_transit_std_args = {
         'message' => 1,
@@ -42,14 +45,25 @@ class IPCTransit
         ret = nil
         flags = IPC_NOWAIT
         begin
+            if args['d']
+                args['q'] = args['qname']
+                args['qname'] = 'transitd'
+                if not args['t']
+                    args['t'] = 9
+                end
+            end
             key = self.get_queue_id(args)
             mq = MessageQueue.new(key, IPC_CREAT | 0666)
-            ret = mq.snd(1, pack_message(args), flags)
+            if args['serialized_wire_data'].nil?
+                pack_message(args)
+            end
+            ret = mq.snd(1, args['serialized_wire_data'], flags)
         rescue Exception => msg
             puts "Exception: #{msg}"
         end
         return ret
     end
+
     ##
     #  Receive a message from a queue
     #
@@ -73,8 +87,12 @@ class IPCTransit
             mq = MessageQueue.new(key, IPC_CREAT | 0666)
             args['serialized_wire_data'] = mq.receive(0, 10000, flags)
             self.unpack_data(args)
+            #at this point I need to see if this is a remote transit
+            #if it is, then do not thaw the message proper
+            args['message'] = self.transit_thaw(args)
         rescue Exception => msg
 #            puts "Exception: #{msg}"
+#            need to do something smarter with this
         end
         if args['raw']
             ret = args;
@@ -83,11 +101,21 @@ class IPCTransit
         end
         return ret
     end
+
     def self.all_queue_info()
         self.gather_queue_info()
         return @@queues
     end
 
+    ##
+    #  Return info about all of the queues on the system
+    #
+    # Arguments: none
+    #
+    # Returns: hash. key is qname, value contains:
+    #   qid - integer queue ID
+    #   count - number of messages in this queue
+
     def self.all_queues()
         ret = {}
         self.all_queue_info().each_pair do |qname,v|
@@ -103,7 +131,38 @@ class IPCTransit
         return ret
     end
 
+    ##
+    #  Unpack the wire meta data from a message
+    #
+    # Arguments:
+    #  serialized_wire_data - the serialized message
+    #
+    # Returns: (in the passed args)
+    #   wire_headers - all of the wire headers
+    #   serialized_message - the message itself, still serialized
+
+    def self.unpack_data(args)
+        stuff = args['serialized_wire_data'].split(':')
+        offset = Integer(stuff.shift)
+        header_and_message = stuff.join(':')
+        if offset == 0
+            args['serialized_header'] = ''
+        else
+            args['serialized_header'] = header_and_message[0..offset-1]
+            self.thaw_wire_headers(args)
+        end
+        args['serialized_message'] = header_and_message[offset..header_and_message.length]
+        return true
+    end
+#NB: I know this is all hideously inefficient.  I'm still learning Ruby,
+#and I'm focusing on getting this correct first.
+#
+#returns a serialized_message and wire_meta_data
+#takes serialized_wire_data
+
+
     private
+
     def self.get_next_id
         new_id = 1
         @@queues.each_pair do |k,v|
@@ -197,8 +256,8 @@ class IPCTransit
         args['serialized_message'] = self.transit_freeze(args)
         self.serialize_wire_meta(args)
         l = args['serialized_wire_meta_data'].length
-        ret = "#{l}:#{args['serialized_wire_meta_data']}#{args['serialized_message']}"
-        return ret
+        args['serialized_wire_data'] = "#{l}:#{args['serialized_wire_meta_data']}#{args['serialized_message']}"
+        return args['serialized_wire_data']
     end
 
     def self.serialize_wire_meta(args)
@@ -221,25 +280,6 @@ class IPCTransit
         args['serialized_wire_meta_data'] = s
     end
 
-#NB: I know this is all hideously inefficient.  I'm still learning Ruby,
-#and I'm focusing on getting this correct first.
-#
-#returns a serialized_message and wire_meta_data
-#takes serialized_wire_data
-    def self.unpack_data(args)
-        stuff = args['serialized_wire_data'].split(':')
-        offset = Integer(stuff.shift)
-        header_and_message = stuff.join(':')
-        if offset == 0
-            args['serialized_header'] = ''
-        else
-            args['serialized_header'] = header_and_message[0..offset-1]
-            self.thaw_wire_headers(args)
-        end
-        args['serialized_message'] = header_and_message[offset..header_and_message.length]
-        args['message'] = self.transit_thaw(args)
-        return true
-    end
 
     def self.thaw_wire_headers(args)
         h = args['serialized_header']

data/test/tc_transit_remote.rb

@@ -0,0 +1,51 @@
+require 'test/unit'
+require 'ipc_transit'
+
+#kind of ghetto, but I don't have a better way right now
+def drain_test_queue
+    begin
+        while ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+        end
+    rescue Exception => msg
+    end
+end
+
+def run_daemon(prog)
+    pid = fork
+    if pid.nil? #child
+        exec "bin/#{prog}"
+        exit
+    end
+    return pid
+end
+def kill_daemon(pid)
+    Process.kill(9, pid)
+end
+
+class TestIPCTransit < Test::Unit::TestCase
+    def test_basic_remote
+        drain_test_queue()
+        IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'd' => '127.0.0.1')
+        ret = IPCTransit.receive('qname' => 'transitd', 'nowait' => 1)
+        assert(ret, 'IPCTransit.receive returned true')
+        assert_equal(ret['foo'], 'bar')
+    end
+
+    def test_full_remote
+        drain_test_queue()
+        begin
+            trserver_pid = run_daemon('trserver')
+            transitd_pid = run_daemon('transitd')
+            sleep 1
+            IPCTransit.send('message' => { 'foo' => 'bar' }, 'qname' => 'test_qname', 'd' => '127.0.0.1')
+            ret = IPCTransit.receive('qname' => 'test_qname', 'nowait' => 1)
+            assert(ret, 'IPCTransit.receive returned true')
+            assert_equal(ret['foo'], 'bar')
+        rescue Exception => msg
+            puts "Exception: #{msg}"
+        end
+        kill_daemon(transitd_pid)
+        kill_daemon(trserver_pid)
+    end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ipc_transit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -43,12 +43,14 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Serverless Message Queue
+description: Brokerless Message Queue
 email: diederich@gmail.com
 executables:
 - trrecv
 - trsend
 - trlist
+- transitd
+- trserver
 extensions: []
 extra_rdoc_files: []
 files:
@@ -57,7 +59,10 @@ files:
 - bin/trrecv
 - bin/trsend
 - bin/trlist
+- bin/transitd
+- bin/trserver
 - test/tc_transit_simple.rb
+- test/tc_transit_remote.rb
 homepage: http://rubygems.org/gems/ipc_transit
 licenses: []
 post_install_message: 
@@ -81,6 +86,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Serverless, cross-language, fast message queue library
+summary: Brokerless, cross-language, fast message queue library
 test_files:
 - test/tc_transit_simple.rb
+- test/tc_transit_remote.rb