ruby-fcp 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3688159009b019973149954a320bd03b6c17764c
-  data.tar.gz: dd51314afb436cf9d0d0644be086afde15dfc67b
+  metadata.gz: c1155d73ac1fae96727ec974cd20478c07b37fe3
+  data.tar.gz: 6473e4a1b4fb1e1b2bdc16d05294cd1c8ba8869b
 SHA512:
-  metadata.gz: 862c30d01f87c9b7b86a372b8f277f42248ed653d64208155c28cb1b7a0f077cd68283b2b97a1a39c39197a6cbddf7ad2ea9346e86ba25fa3caff6a072541483
-  data.tar.gz: 66d413e5bae0929a2024f550ace7ab62b20d69e4ac17c0f1c64784df9903a21507fe631febfd14565b0901e40096d28369fa633f7adda0ce285e827fa48c713d
+  metadata.gz: 9283b3058d5ff46d336ba3ab00084a6e548328fe702b4c58defc0101c8b324097c3c9f85171632b457b3e306c45a70d3d727b2e0cc6421435ba1b9dbce079254
+  data.tar.gz: dc8cff53b6c29c12eedb8fd3edbed5bb188b2a92f8b9fb6403025fe96c69a2ae2d14619fbd865f154f879d9fe0aad147d94c6b0a93cf2fc69984bca5e1ffec9e

data/lib/ruby-fcp/communicator.rb

@@ -4,10 +4,12 @@ require 'ruby-fcp/utils'
 
 class Communicator 
   attr_reader   :ConnectionIdentifier
-  attr_accessor :responses, :heartbeat
+  attr_accessor :responses, :heartbeat, :utils
   
-  def initialize(client,host, port, version = 2.0)
-    @utils = Utils.new
+  # clients name must be unique
+  # This performs NodeHello operations upon initialization.
+  # Communicator handles packet sending and recieving and sorting
+  def initialize(client, host='127.0.0.1', port=9481, version = 2.0)
     @version = version
     @ConnectionIdentifier = ""
     @host = host
@@ -18,6 +20,7 @@ class Communicator
     @state = false
     @queue = Queue.new
     @heartbeat = 300
+    @utils = Utils.new
     connect
   end
  
@@ -125,6 +128,7 @@ class Communicator
     end
   end
   
+  # Send disconnect message and close the socket
   def close
     @tex.synchronize{@sock.write "Disconnect EndMessage\n"}
     @sock.close

data/lib/ruby-fcp/fcp_client.rb

@@ -5,31 +5,16 @@ require 'digest'
 require 'base64'
 require 'ruby-fcp/communicator'
 
-class FCPClient
-
-  attr_accessor :utils, :com
-
-  # clients name must be unique
-  # This performs NodeHello operations upon initialization.
-  # Communicator handles packet sending and recieving and sorting
-  def initialize(client, host = "127.0.0.1", port = 9481)
-    @utils = Utils.new
-    @com = Communicator.new(client,host,port)
-  end
+class FCPClient < Communicator
   
   # Simple attribute reader for you ConnectionIdentifier
   def identifier
-    @com.ConnectionIdentifier
-  end
-  
-  # Simple attribute reader to display all responses recieved
-  def responses
-    @com.responses
+    @ConnectionIdentifier
   end
 
   # return last response from request defined by Identifier
   def last_response(id)
-    @com.responses[id].last
+    @responses[id].last
   end
 
   # Simple interface to put a single file onto freenet from your disk uses ClientPut message
@@ -41,7 +26,7 @@ class FCPClient
     id = @utils.id_generate
     options = { "URI" => uri, "Identifier" => id, "UploadFrom" => 'disk', "Filename" => filename, "FileHash" => @utils.filehash_maker(id, filename,identifier), "Verbosity" => "111111111" }.merge(opts)
     options["TargetFilename"] = filename.split(File::SEPARATOR)[-1] if uri =~ /CHK@/
-    @com.send_packet @utils.packet_mangler(options,"ClientPut")
+    send_packet @utils.packet_mangler(options,"ClientPut")
     #@com.fcpackets.client_put uri, id, options
     if wait
       wait_for id, /PutFailed|PutSuccessful/
@@ -59,7 +44,7 @@ class FCPClient
   def direct_put(uri,data, wait = true, opts = {})
     id = @utils.id_generate
     options = {"Identifier" => id, "URI" => uri ,"UploadFrom" =>  "direct", "DataLength" => data.bytesize }.merge(opts)
-    @com.send_packet @utils.packet_mangler(options,"ClientPut").sub! "EndMessage\n", "Data\n#{data}"
+    send_packet @utils.packet_mangler(options,"ClientPut").sub! "EndMessage\n", "Data\n#{data}"
     if wait
       wait_for id,/PutFailed|PutSuccessful/
     else
@@ -77,7 +62,7 @@ class FCPClient
     id = @utils.id_generate
     ddarun(dir,true,false)
     options = {"Identifier" => id,"URI" => uri,"Filename" => dir, "Global" => 'true', "AllowUnreadableFiles" => 'true', "IncludeHiddenValues" => 'false'}.merge(opts)
-    @com.send_packet @utils.packet_mangler(options,"ClientPutDiskDir")
+    send_packet @utils.packet_mangler(options,"ClientPutDiskDir")
     if wait
       wait_for(id,/PutFailed|PutSuccessful/) 
     else
@@ -115,7 +100,7 @@ class FCPClient
     message = @utils.packet_mangler(options,"ClientPutComplexDir")
     files.each { |f| message << f[:data] if f.has_key? :data}
     puts message
-    @com.send_packet message
+    send_packet message
     if wait
      wait_for(id,/PutFailed|PutSuccessful/)  
     else
@@ -126,7 +111,7 @@ class FCPClient
   # performs TestDDARequest and TestDDAResponse automagically
   # read and write are true or false values
   def ddarun(directory,read, write)
-    @com.send_packet @utils.packet_mangler({"Directory" => directory,"WantReadDirectory" => read, "WantWriteDirectory" => write} ,"TestDDARequest")
+    send_packet @utils.packet_mangler({"Directory" => directory,"WantReadDirectory" => read, "WantWriteDirectory" => write} ,"TestDDARequest")
     res = wait_for(:dda, /TestDDAReply/).pop
     content = nil
     if write
@@ -136,7 +121,7 @@ class FCPClient
     elsif read
       content = File.open(res["ReadFilename"],'r').read
     end
-    @com.send_packet @utils.packet_mangler({"Directory" => directory,"ReadContent" => content}, "TestDDAResponse")
+    send_packet @utils.packet_mangler({"Directory" => directory,"ReadContent" => content}, "TestDDAResponse")
     response = wait_for(:dda ,/TestDDAComplete/).pop
     File.delete(res["WriteFilename"]) if write
     response
@@ -149,7 +134,7 @@ class FCPClient
     saveloc = File.join directory, uri.split('/')[-1]
     ddarun(directory,false, true)
     options = {"URI" => uri, "Identifier" => id, "ReturnType" => 'disk', "Filename" => saveloc, "TempFilename" => saveloc+".tmp" , "Persistence" => 'forever', "Global" => false, "Verbosity" => 1111111}.merge(opts)
-    @com.send_packet @utils.packet_mangler(options,"ClientGet")
+    send_packet @utils.packet_mangler(options,"ClientGet")
     if wait
      wait_for(id,/GetFailed|DataFound/) 
     else
@@ -160,7 +145,7 @@ class FCPClient
   def direct_get(uri ,wait = true, opts={})
     id = @utils.id_generate
     options = {"URI" => uri, "Identifier" => id, "ReturnType" => 'direct', "Global" => false}.merge(opts)
-    @com.send_packet @utils.packet_mangler(options,"ClientGet")
+    send_packet @utils.packet_mangler(options,"ClientGet")
     if wait
      wait_for(id,/AllData|GetFailed/) 
     else
@@ -171,45 +156,45 @@ class FCPClient
   # Implements GetPluginInfo
   def get_plugin_info(pluginname, detailed = false)
     id = @utils.id_generate
-    @com.send_packet @utils.packet_mangler({"PluginName" => pluginname, "Identifier" => id, "Detailed" => detailed },"GetPluginInfo")
+    send_packet @utils.packet_mangler({"PluginName" => pluginname, "Identifier" => id, "Detailed" => detailed },"GetPluginInfo")
     wait_for id, /PluginInfo/
   end
   
   # Straigt forward, ListPeers, sometimes it may choke up and give you end list peers before your peers, in that case check the id
   def listpeers
     id = @utils.id_generate
-    @com.send_packet @utils.packet_mangler({"Identifier" => id, "WithMetaData" => true, "WithVolatile" => false},"ListPeers")
+    send_packet @utils.packet_mangler({"Identifier" => id, "WithMetaData" => true, "WithVolatile" => false},"ListPeers")
     wait_for id, /EndListPeers/
   end
   
   #Uses GenerateSSK
   def new_ssk_pair
     id = @utils.id_generate
-    @com.send_packet @utils.packet_mangler({"Identifier" => id}, "GenerateSSK")
+    send_packet @utils.packet_mangler({"Identifier" => id}, "GenerateSSK")
     wait_for id, /SSKKeypair/
   end
   
   # returns information on a given peer not peers implements ListPeer
   def peerinfo(peer)
-    @com.send_packet @utils.packet_mangler({"NodeIdentifier" => peer,"WithVolatile" => false,"WithMetadata" => true}, "ListPeer")
+    send_packet @utils.packet_mangler({"NodeIdentifier" => peer,"WithVolatile" => false,"WithMetadata" => true}, "ListPeer")
     wait_for :peer, /Peer/
   end
   
   # List all persistent request just implements ListPersistentRequest
   def list_persistent_requests
-    @com.send_packet "ListPersistentRequests\nEndMessage\n"
+    send_packet "ListPersistentRequests\nEndMessage\n"
     wait_for :default ,/EndListPersistentRequests/
   end
   
   def modify_persistent_request(id,clienttoken,priorityclass)
-    @com.send_packet @utils.packet_mangler({"Identifier" => id,"ClientToken" => clienttoken, "PriorityClass" => priorityclass}, "ModifyPersistentRequest")
+    send_packet @utils.packet_mangler({"Identifier" => id,"ClientToken" => clienttoken, "PriorityClass" => priorityclass}, "ModifyPersistentRequest")
     wait_for id, /PersistentRequestModified/
   end
   
   #subscirbe to a usk, have to poll it yourself by using responses[id]
   def subscribe_usk(uri, wait = false ,opts ={})
     id = @utils.id_generate
-    @com.send_packet @utils.packet_mangler({"URI" => uri, "Identifier" => id} ,"SubscribeUSK")
+    send_packet @utils.packet_mangler({"URI" => uri, "Identifier" => id} ,"SubscribeUSK")
     id
   end
   
@@ -221,13 +206,13 @@ class FCPClient
   end
   
   def unsubscribe_usk(id)
-    @com.send_packet "UnsubscribeUSK\nIdentifier=#{id}\nEndMessage\n"
+    send_packet "UnsubscribeUSK\nIdentifier=#{id}\nEndMessage\n"
     id
   end
   
   def proberequest(type,hopstolive=25,wait = true)
     id = @utils.id_generate
-    @com.send_packet @utils.packet_mangler({"Identifier" => id,"Type" => type,"HopsToLive" => hopstolive}, "ProbeRequest")
+    send_packet @utils.packet_mangler({"Identifier" => id,"Type" => type,"HopsToLive" => hopstolive}, "ProbeRequest")
     if wait
       wait_for id,/Probe/
     else
@@ -240,8 +225,8 @@ class FCPClient
     response = [ ]
     loop do
       begin
-      x = @com.responses[id].pop
-      print @com.responses[:error].pop
+      x = @responses[id].pop
+      print @responses[:error].pop
       rescue
       sleep(2)
       end
@@ -269,30 +254,25 @@ class FCPClient
   def wait_for_ever(id)
     loop do
       begin
-        x = @com.responses[id].pop
+        x = @responses[id].pop
       rescue
         print '.'
         sleep(2)
-        print @com.responses[:error]
-        print @com.responses[:default]
+        print @responses[:error]
+        print @responses[:default]
       end
       unless x.nil?
         x.each { |key, value| puts "#{key}=#{value}" }
       else
         print '.'
         sleep(1)
-        puts @com.responses[:error]
-        print @com.responses[:default]
+        puts @responses[:error]
+        print @responses[:default]
       end
     end
   end
   
-  # Send disconnect message and close the socket
-  def close
-    @com.close
-  end
-  
   def killswitch
-    @com.send_packet "Shutdown\nEndMessage\n"
+    send_packet "Shutdown\nEndMessage\n"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-fcp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - hikiko