doraemon 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d6031e236f4e0ecaad08587400227ecbc42f61eded9c4e446688ffb71e31a8
-  data.tar.gz: 42910edc1ff8273520e7c09edfd9105d243bbfa5553fd63cdacafe219d6973aa
+  metadata.gz: 39a6633934992e197f4a6137b6baa5d99bf9b06d2e8e439b21c0114e30e67708
+  data.tar.gz: 2d2a8020e445f9c4e487c7b8fd36c799fe288254705c151ba5853d0a1cdd1de9
 SHA512:
-  metadata.gz: 02b10db8fc9d4c64b38a388dd52d4639c3187dc344d62f666bca6697b4bc593d16e830fb1d01bdda33ba26868154191404e21a95d3491fc3f5383f2430230210
-  data.tar.gz: 5eff94c8fc5571a4edc5743ac32173414a0b27a397c773b3170ad7c8bb5354599a890252b2c6d4e1c29cd77cfb7d0c17edaec6aeca77c5432ea35e74d0bd1c35
+  metadata.gz: 9cc8090a09d2fb5d8962d24cdbf83a52cf84367dc01ba15afc7f101d684bf41d16a4ed557127f759075084375380e4ebd0617923dbcf301b5c795713382b3fa8
+  data.tar.gz: c9caeaf0074c6a85a5139fc4f844ae914912e5163916d971845850bf871a09b7cc8a7f1cad30237b98378e6f9d7430970c134d2bc1b35779dda598c02c718a88

data/lib/doraemon/proxy_server.rb

@@ -15,29 +15,25 @@ module Doraemon
       
       Cert.generate_cert
 
-      session = Ritm::Session.new
+      _session = Ritm::Session.new
 
-      port = @port
+      _port = @port
       
-      session.configure do
+      _session.configure do
         ssl_reverse_proxy.ca[:pem] = Cert.cert_path
         ssl_reverse_proxy.ca[:key] = Cert.key_path
         proxy[:bind_address] = '0.0.0.0'
-        proxy[:bind_port] = port
+        proxy[:bind_port] = _port
       end
       
-      session.on_response do |_req, _resp|
+      _session.on_response do |_req, _resp|
 
         if api_list.include?(_req.path)
 
-          _params = nil
-          begin
-            _params = JSON.parse(_req.body)
-          rescue
-            _params = _req.body
-          end
+          puts "- - - > #{_req.path}"
 
-          _result = JSON.parse(_resp.body)
+          _params = begin JSON.parse(_req.body) rescue _req.body end
+          _result = begin JSON.parse(_resp.body) rescue {} end
 
           begin
             _result = eval(File.read(File.join(@root, api_list[_req.path])))
@@ -53,16 +49,15 @@ module Doraemon
           _resp.header['content-length'] = _resp.body.bytesize
           _resp.header['content-type'] = 'application/json;charset=UTF-8'
           
-          puts "- - - > #{_req.path}"
           puts "#{JSON.pretty_generate(_result)}\n\n"
         end
         
       end
       
-      session.start
+      _session.start
       
       # trap 'INT' do
-      #   session.shutdown
+      #   _session.shutdown
       #   return
       # end
       # loop { gets }

data/lib/doraemon/version.rb

@@ -1,3 +1,3 @@
 module Doraemon
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doraemon
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - zhuoyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler