pacproxy 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a592de5e8ef2da33cd52d19f4ca3360a6204cbdf
-  data.tar.gz: 00e5f8e3243b2f608c40f82df2afb7d90529debd
+  metadata.gz: 939a5cb325172af7871512401d56ff751cd1967d
+  data.tar.gz: b34263afc3967ac616ff91934a5ce27d494fbd1d
 SHA512:
-  metadata.gz: 504b321afecb58a6b42a985df6057ec628c84ad19e8dd8a16fa81262a84a33865e6b2aa5d3432c87b905c8d48e662b3e50b08ad6929d937dc8bcbc050ff38fc7
-  data.tar.gz: 9422b0603fa43f68ac991f32ca19114ef9d7e0214405799fb94b11340d033f7f95fa14f40e3463292e97d980150426e1dcd7e17589618294d0f87675b513389c
+  metadata.gz: 5110e58d398e43ed60cbe71b020bdf248e196deb4f4c6c34987313e4741666459c3b00e68521fb95de2763056f0447c5b0e94125e6391f6db6f88dcf2fadf95f
+  data.tar.gz: 29f7152972637a36a4436d788a8a8da309daf067db15cce4409f2d5382b22cb1a2ba756dd1fcfe106f4659ed3571597c7f579fd27b1acb415b3bb2e06a0c6ad0

data/lib/pacproxy/pac_file.rb

@@ -20,7 +20,8 @@ module Pacproxy
     end
 
     def shutdown
-      @runtime.shutdown
+      @update_thread.kill if @update_thread
+      @runtime.shutdown   if @runtime
     end
 
     def find(uri)
@@ -32,7 +33,7 @@ module Pacproxy
 
     def begin_update
       is_updated = false
-      Thread.new do
+      @update_thread = Thread.new do
         loop do
           @runtime.update(@file_location)
           is_updated = true

data/lib/pacproxy/runtimes/node/node.rb

@@ -4,6 +4,7 @@ require 'pacproxy/runtimes/base'
 require 'open-uri'
 require 'dnode'
 require 'thread'
+require 'monitor'
 require 'os'
 
 module Pacproxy
@@ -41,6 +42,8 @@ module Pacproxy
               Process.detach(@server_pid)
             end
             sleep 0.01 until port_open?
+
+            initialize_client
           end
         rescue Timeout::Error
           shutdown
@@ -56,6 +59,7 @@ module Pacproxy
       end
 
       def shutdown
+        @client_thread.kill if @client_thread
         if OS.windows?
           stop_server(@server_pid)
         else
@@ -77,6 +81,18 @@ module Pacproxy
 
       private
 
+      def initialize_client
+        @queue = Queue.new
+        @client_thread = Thread.new do
+          DNode.new.connect('127.0.0.1', @port) do |remote|
+            q = @queue.pop
+            if q[:uri] && q[:uri].host && q[:call_back]
+              remote.find(@source, q[:uri], q[:uri].host, q[:call_back])
+            end
+          end
+        end
+      end
+
       def port_open?
         Timeout.timeout(TIMEOUT_JS_CALL) do
           begin
@@ -93,13 +109,16 @@ module Pacproxy
       def call_find(uri, retries = 3)
         proxy = nil
         begin
+          mon = Monitor.new
+          cond = mon.new_cond
           thread = Thread.new do
-            DNode.new.connect('127.0.0.1', @port) do |remote|
-              remote.find(@source, uri, uri.host,
-                          proc do |p|
+            mon.synchronize do
+              @queue.push(uri: uri,
+                          call_back: proc do |p|
                             proxy = p
-                            EM.stop
+                            cond.signal
                           end)
+              cond.wait
             end
           end
           thread.join(TIMEOUT_JS_CALL)

data/lib/pacproxy/runtimes/pac/pac.rb

@@ -30,8 +30,10 @@ module Pacproxy
       end
 
       def update(file_location)
-        tmp = PAC.load(file_location)
-        @pac = tmp if @pac.nil? || @pac.source != tmp.source
+        Pac.js_lock.synchronize do
+          tmp = PAC.load(file_location)
+          @pac = tmp if @pac.nil? || @pac.source != tmp.source
+        end
       rescue => e
         error("#{file_location} update error: #{e}")
       end

data/lib/pacproxy/version.rb

@@ -1,4 +1,4 @@
 # Pacproxy provides http/https proxy routed with proxy.pac.
 module Pacproxy
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/pacproxy.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "pacproxy"
   spec.version       = Pacproxy::VERSION
   spec.authors       = ["OTA Hiroshi"]
-  spec.email         = ["ota_h@nifty.com"]
+  spec.email         = ["otahi.pub@gmail.com"]
   spec.summary       = %q{A proxy server works with proxy.pac}
   spec.description   = %q{A proxy server works with proxy.pac}
   spec.homepage      = "https://github.com/otahi/pacproxy"
@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'pac', '~> 1.0.0'
   spec.add_dependency 'dnode', '~> 0.0.2'
   spec.add_dependency 'os', '~> 0.9.6'
-  spec.add_dependency 'win32-process', '~> 0.7.4'
+  if  /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+    spec.add_dependency 'win32-process', '~> 0.7.4'
+  end
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rspec', '~> 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pacproxy
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - OTA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pac
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.6
-- !ruby/object:Gem::Dependency
-  name: win32-process
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +166,7 @@ dependencies:
         version: 3.4.0
 description: A proxy server works with proxy.pac
 email:
-- ota_h@nifty.com
+- otahi.pub@gmail.com
 executables:
 - pacproxy
 extensions: []