pickynode 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc0ef2704c9184ce652cd12af4ee96ee988bc736
-  data.tar.gz: 9c19242a064f84086ab8e73e8b236bce762fedf1
+  metadata.gz: a9ed335fbc05dfe5122819dab044c3f087f6855d
+  data.tar.gz: ae580a59583a6c5b355883ee71e76cf8b30f8665
 SHA512:
-  metadata.gz: f77e1a6596316b140a708fefa357d74a9636c37f81734b407e559e4df725080514de35cf753a8a09fadb864a521e95b0f8cdc6973346d40ccf9869cd6b84337e
-  data.tar.gz: 76d8f030acbb90b34de574d255e9f7eb2b1304ce181d518fc34d62afa101c34504ec7f1e7c46faa3e1ba9e6100a92bdf151850eb4c191c21babcc2666d0c1773
+  metadata.gz: 1051e7d02b39ee86c2a2cc031d484c5f00ac9ee21c9634822395a10ff03702560ff9d5c76d24a4e8fad5374594920b8b42969dfca2159b5161a28c22a86be952
+  data.tar.gz: 7d215790b39f5b36b0f05cb0e4f4e47bdaaa552e4b975d81a6452e558740f0bdf84cf3818879be03fdc44b2366a3e0e8709df101f1a7faf48161e122f1281ec8

data/bin/pickynode

@@ -6,15 +6,16 @@ require 'pp'
 require 'trollop'
 require 'uri'
 
-VERSION = "0.0.2"
+VERSION = "0.0.3"
 
 opts = Trollop::options do
   version "pickynode v#{VERSION}"
-  opt :add, "Node type to add", :type => :string
-  opt :ban, "Node type to ban", :type => :string
+  opt :add, "Add node type", :type => :string
+  opt :connect, "Connect to node type", :type => :string
+  opt :ban, "Ban node type", :type => :string
   opt :debug, "Debug mode"
   opt :output, "Output commands"
-  opt :disconnect, "Node type to disconnect", :type => :string
+  opt :disconnect, "Disconnect from node type", :type => :string
 end
 
 def run(cmd, opts={})
@@ -22,36 +23,58 @@ def run(cmd, opts={})
   `#{cmd}` unless opts[:debug]
 end
 
-if filter = opts[:add]
+def get_addr_types
+  nodes = `bitcoin-cli getpeerinfo`
+  parsed_nodes = JSON.parse(nodes)
+  parsed_nodes.map { |n| [n["addr"], n["subver"]] }.to_h
+end
+
+def get_bitnode_addr_types
   u = URI.parse("https://bitnodes.21.co/api/v1/snapshots/latest/")
   nodelist = Net::HTTP.get(u)
   parsed_nodelist = JSON.parse(nodelist)
-  bitnode_addr_types = parsed_nodelist['nodes'].map { |k,v| [k, v[1]] }.to_h
-  bitnode_addr_types.each do |k,v|
-    if v.include?(filter)
-      u = URI.parse("https://#{k}")
-      run(%^bitcoin-cli addnode "#{u.host}" "add"^, opts)
+  parsed_nodelist['nodes'].map { |k,v| [k, v[1]] }.to_h
+end
+
+if opts[:add] || opts[:connect]
+  bitnode_addr_types = get_bitnode_addr_types
+
+  if filter = opts[:add]
+    bitnode_addr_types.each do |k,v|
+      if v.include?(filter)
+        u = URI.parse("https://#{k}")
+        run(%^bitcoin-cli addnode "#{u.host}" "add"^, opts)
+      end
+    end
+  end
+
+  if filter = opts[:connect]
+    bitnode_addr_types.each do |k,v|
+      if v.include?(filter)
+        u = URI.parse("https://#{k}")
+        run(%^bitcoin-cli addnode "#{u.host}" "onetry"^, opts)
+      end
     end
   end
 end
 
-nodes = `bitcoin-cli getpeerinfo`
-parsed_nodes = JSON.parse(nodes)
-addr_types = parsed_nodes.map { |n| [n["addr"], n["subver"]] }.to_h
+if opts[:ban] || opts[:disconnect]
+  addr_types = get_addr_types
 
-if filter = opts[:disconnect]
-  addr_types.each do |k,v|
-    if v.include?(filter)
-      run(%^bitcoin-cli disconnectnode "#{k}"^, opts)
+  if filter = opts[:ban]
+    addr_types.each do |k,v|
+      if v.include?(filter)
+        u = URI.parse("https://#{k}")
+        run(%^bitcoin-cli setban "#{u.host}" "add"^, opts)
+      end
     end
   end
-end
 
-if filter = opts[:ban]
-  addr_types.each do |k,v|
-    if v.include?(filter)
-      u = URI.parse("https://#{k}")
-      run(%^bitcoin-cli setban "#{u.host}" "add"^, opts)
+  if filter = opts[:disconnect]
+    addr_types.each do |k,v|
+      if v.include?(filter)
+        run(%^bitcoin-cli disconnectnode "#{k}"^, opts)
+      end
     end
   end
 end
@@ -60,4 +83,4 @@ unless opts.values.select { |v| v }.empty?
   exit(0)
 end
 
-ap addr_types
+ap get_addr_types

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickynode
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josh Ellithorpe