kimchi 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d5856576f6d41a8007145e8c6080a468efd625
-  data.tar.gz: c88c31dddc62bbb70fc427990532a2b180261d04
+  metadata.gz: 8883424bb826544feaef6c94a6b55f11692b5d08
+  data.tar.gz: f28ce0474a811d495876985354ffc03c489c6457
 SHA512:
-  metadata.gz: c72e8abfe8f79ecfe5d09b5205d2672be0894da73e13ab6462ff3994a6df4cc3daa9706626830c3a68eb770b8ff8df5ce589332c4e5569e03ed883595f4968da
-  data.tar.gz: bfff490a7f1dabec46191ac90e8aadd9f21ab7c469f07975ca3bd2d3d00b0dbece19c21502cd6ebcdda65e94fbbcd98ae30803d820b8578a9dcc9e2be6bee36f
+  metadata.gz: 13a423da3a62ff956d1ed2e3eaa9d13db48d0af6070b0328abd4d3833e609a4c4b62d32f670e74be49f9226ce68948816c13919d5e5e00b577768533ee9382c2
+  data.tar.gz: 382c61c84602b4e7591d44611bc5d4abbcd2aa8789a384b3ba269d8fe6ff0d8f946d8294582a55c3f0978a203cc4889525a19bf9ada6622a2abfc757a1d5cbce

data/lib/kimchi/version.rb

@@ -1,3 +1,3 @@
 module Kimchi
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/wire.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "uuid"
 require "bunny"
+require "net/http"
 
 module Wire
 
@@ -12,8 +13,18 @@ module Wire
       @native_type = native_type
     end
 
+    # ignore this for any real service call, the http endpoint is evidently incapable of getting this from a header
+    def service= service
+      @service=service
+    end
+
+    # ignore this for any real service call, the http endpoint is evidently incapable of getting this from a header
+    def version= version
+      @version=version
+    end
+
     def to_json
-      "{\"endpoint\": \"#{@name}\"" + ((@signature == nil) ? "" : ", \"signature\": #{@signature}") + ((@result_type == nil) ? "" : ", \"resultType\": \"#{@result_type}\"") + ((@native_type == nil) ? "" : ", \"nativeType\": \"#{@native_type}\"") + "}"
+      "{\"endpoint\": \"#{@name}\"" + ((@signature == nil) ? "" : ", \"signature\": #{@signature}") + ((@result_type == nil) ? "" : ", \"resultType\": \"#{@result_type}\"") + ((@native_type == nil) ? "" : ", \"nativeType\": \"#{@native_type}\"") + ((@service == nil) ? "" : ", \"service\": \"#{@service}\"") + ((@version == nil) ? "" : ", \"version\": \"#{@version}\"") + "}"
     end
   end
 
@@ -24,8 +35,20 @@ module Wire
       @contexts = contexts
     end
 
+    def function
+      @function
+    end
+
+    def contexts=contexts
+      @contexts=contexts
+    end
+
+    def contexts
+      @contexts
+    end
+
     def to_json
-      "{\"address\": #{@function.to_json}, \"body\": #{@arguments.to_json}, \"contexts\": #{@contexts}}"
+      "{\"address\": #{@function.to_json}, \"body\": #{@arguments.to_json}, \"contexts\": #{@contexts.to_json}}"
     end
   end
 
@@ -55,39 +78,52 @@ module Wire
   end
 
   class RabbitMQTransport
-    def initialize (host, port, service_name)
+    def initialize (host, port)
       @connection = Bunny.new("amqp://#{host}:#{port}")
       @connection.start
 
+      @semaphore = Mutex.new
+
       @uuid = UUID.new
       @caller_id = @uuid.generate
 
+      @topic_hash = {}
       @message_hash = {}
+    end
 
-      request_channel = @connection.create_channel
-      @request_exchange = request_channel.topic("#{service_name}.request")
-
-      response_queue_name = @uuid.generate
-      response_channel = @connection.create_channel
-      response_exchange = response_channel.topic("#{service_name}.response")
-      response_queue = response_channel.queue("#{response_queue_name}", {:durable => false, :exclusive => true, :auto_delete => true})
-
-      response_queue.bind(response_exchange, :routing_key => "#{@caller_id}").subscribe do |delivery_info, metadata, payload|
-        if (message_callback = @message_hash[metadata[:correlation_id]]) != nil
-          result_body = JSON.parse(payload)
-          message_callback.set_result(result_body)
+    def initialize_service (service_name)
+      @semaphore.synchronize do
+        topic = @topic_hash[service_name]
+
+        if topic == nil
+          request_channel = @connection.create_channel
+          topic = request_channel.topic("#{service_name}.request")
+
+          response_queue_name = @uuid.generate
+          response_channel = @connection.create_channel
+          response_exchange = response_channel.topic("#{service_name}.response")
+          response_queue = response_channel.queue("#{response_queue_name}", {:durable => false, :exclusive => true, :auto_delete => true})
+
+          response_queue.bind(response_exchange, :routing_key => "#{@caller_id}").subscribe do |delivery_info, metadata, payload|
+            if (message_callback = @message_hash[metadata[:correlation_id]]) != nil
+              result_body = JSON.parse(payload)
+              message_callback.set_result(result_body)
+            end
+          end
         end
+
+        return topic
       end
     end
 
-    def transmit_in_only(version, invocation_signal)
-      @request_exchange.publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{@uuid.generate}", :timestamp => Time.new.to_i)
+    def transmit_in_only(service_name, version, invocation_signal)
+      initialize_service(service_name).publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{@uuid.generate}", :timestamp => Time.new.to_i)
     end
 
-    def transmit(version, invocation_signal, callback, timeout_seconds)
+    def transmit(service_name, version, invocation_signal, callback, timeout_seconds)
       message_id = "#{@uuid.generate}".freeze
       @message_hash[message_id] = MessageCallback.new(@message_hash, message_id, callback, timeout_seconds)
-      @request_exchange.publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{message_id}", :timestamp => Time.new.to_i)
+      initialize_service(service_name).publish(invocation_signal.to_json, :routing_key => "#{version}.2", :headers => {"x-opt-callerId" => "#{@caller_id}"}, :content_type => "application/json", :message_id => "#{message_id}", :timestamp => Time.new.to_i)
     end
   end
 
@@ -96,16 +132,31 @@ module Wire
       @host = host
       @port = port
     end
-    def transmit (version, invocation_signal, callback, timeout_seconds)
+
+    def transmit (service_name, version, invocation_signal, callback, timeout_seconds)
       uri = URI("#{@host}:#{@port}/api/message")
-      headers = {"Content-Type" => "application/json", "X-Icix-Version" => "#{version}"}
+      headers = {"Content-Type" => "application/json"}
       http = Net::HTTP.new(uri.host, uri.port)
+      http.read_timeout = timeout_seconds
+
+      invocation_signal.function.service = service_name
+      invocation_signal.function.version = version
+
+      context_hash = {}
+      invocation_signal.contexts.each {|context| context.each{|key,value| context_hash[key] = value}}
+      invocation_signal.contexts = context_hash
 
       res = http.post(uri.path, invocation_signal.to_json, headers)
-      res.code.should == '200'
 
-      response = JSON.parse res.body
-      callback.complete(response)
+      case res
+        when Net::HTTPSuccess
+          response = JSON.parse res.body
+          callback.complete(response)
+        else
+          res.error!
+      end
+    rescue Timeout::Error
+      callback.timeout
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kimchi
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Taylor Gautier