BotnetV2 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b511120a79c8dfb4146818da5f14c7c83b0fe440
-  data.tar.gz: 360c51c97647b13819c9588d18d8201122c1f074
+  metadata.gz: b7e73d7fbd098e9930c730c8983980ed1f831efc
+  data.tar.gz: 970cc0f1a5f27dea9bd5b76d04925a58b5ae0bdf
 SHA512:
-  metadata.gz: b7341772937b5c9486ad63b925f9ed66f05cf8802a6df17e4f2b70857d04f7ef0116033793ca76f7e56ddf0bc0bef9bcabb87c04e8c8128cffacf60d12e47f7f
-  data.tar.gz: 33f04c08ca82956da34879ddc3955feb2f02784dbb4d77cf0723f8ffe5c8c645d03d0e85476ccea97105037b82aa5affcde0afe4cdd680161ddf08cd6be404f4
+  metadata.gz: 5236d40fb87dbdfe04810f8fbb88927793bc11f9058eac5f530b3f76af09f9ed067dd178c6f8ae99c3b19b9a43fea472f2e85be29d0927583d117b87310942f1
+  data.tar.gz: e9fa0084cd5384a8a0f401982e6a43b4d8d59d8c5e18211c869c3ca964ff60584f8bffb217a1b79d0fe63e65edaf13e21992001eba513eb1b006e2db2426d259

data/BotnetV2.gemspec

@@ -14,12 +14,12 @@ require 'securerandom'
 Gem::Specification.new do |spec|
   spec.name          = "BotnetV2"
   spec.version       = BotnetV2::VERSION
-  spec.authors       = ["Michael Fürst"]
+  spec.authors       = ["Penguinmenac3"]
   spec.email         = ["penguinmenac3@gmail.com"]
   spec.summary       = %q{A bot net to calculate intense tasks on remote machines.}
   spec.description   = %q{A bot net to calculate intense tasks on remote machines.}
   spec.homepage      = "https://fuersts1.homeip.net/penguinmenac3/botnetv2"
-  spec.license       = "MIT"
+  spec.license       = "GPL"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/BotnetV2/Client.rb

@@ -27,6 +27,13 @@ module BotnetV2
       @connection.send @onReady
     end
 
+    def net_status(callback)
+      message = Hash.new
+      message['status'] = SecureRandom.hex
+      @callbacks[message['status']] = callback
+      @connection.send message
+    end
+
     def execute (task_src, callback)
       message = Hash.new
       message['onWork'] = Hash.new
@@ -47,6 +54,9 @@ module BotnetV2
         end
         @callbacks[message['onResult']['task_id']].call(res, error)
       end
+      if message['status'] != nil
+        @callbacks[message['status']['task_id']].call(message['status'])
+      end
     end
 
     def exit!

data/lib/BotnetV2/Master.rb

@@ -14,6 +14,9 @@ module BotnetV2
       @ready_clients = Hash.new
       @work_bundles = Queue.new
       @result_bundles = Hash.new
+      @processed_tasks = 0
+      @started_tasks = 0
+      @worker_corrector = 0
       @exit = false
       @t1 = nil
       @t2 = nil
@@ -33,11 +36,15 @@ module BotnetV2
     def main_loop
       loop do
         connection = @ready_workers.pop
+        @worker_corrector = 1
         unless connection.closed?
           msg = Hash.new
           msg['onWork'] = @work_bundles.pop
+          @worker_corrector = 0
+          @started_tasks += 1
           connection.send msg
         end
+        @worker_corrector = 0
       end
     end
 
@@ -47,11 +54,27 @@ module BotnetV2
 
     def on_message (message, connection)
       @verified_clients[connection] = true if message['verify'] == @password
-      @ready_workers << connection if message['worker_onReady'] != nil and @verified_clients[connection]
-      @work_bundles << message['onWork'] if message['onWork'] != nil and @verified_clients[connection]
-      @ready_clients[message['client_onDisconnect']] = nil if message['client_onDisconnect'] != nil  and @verified_clients[connection]
+      return unless @verified_clients[connection]
+      @ready_workers << connection if message['worker_onReady'] != nil
+      @work_bundles << message['onWork'] if message['onWork'] != nil
+      @ready_clients[message['client_onDisconnect']] = nil if message['client_onDisconnect'] != nil
 
-      if message['client_onReady'] != nil and @verified_clients[connection]
+      if message['status']
+        msg = Hash.new
+        report = Hash.new
+        report['ready_clients'] = @ready_clients.count
+        report['ready_workers'] = @ready_workers.length + @worker_corrector
+        report['verified_clients'] = @verified_clients.count
+        report['work_bundles'] = @work_bundles.length
+        report['result_bundles'] = count_pending_results @result_bundles
+        report['processed_tasks'] = @processed_tasks
+        report['active_tasks'] = @started_tasks - @processed_tasks
+        report['task_id'] = message['status']
+        msg['status'] = report
+        connection.send msg
+      end
+
+      if message['client_onReady'] != nil
         client_id = message['client_onReady']
         @ready_clients[client_id] = connection
         @result_bundles[client_id] = Queue.new if @result_bundles[client_id] == nil
@@ -61,7 +84,8 @@ module BotnetV2
           connection.send msg
         end
       end
-      if message['onResult'] != nil and @verified_clients[connection]
+      if message['onResult'] != nil
+        @processed_tasks += 1
         client_id = message['onResult']['clientId']
         if @ready_clients[client_id] == nil
           @result_bundles[client_id] = Queue.new if @result_bundles[client_id] == nil
@@ -74,6 +98,14 @@ module BotnetV2
       end
     end
 
+    def count_pending_results(hashed_queues)
+      counter = 0
+      hashed_queues.each_key do |key|
+        counter += hashed_queues[key].length
+      end
+      counter
+    end
+
     def exit!
       @exit = true
       @main_loop.kill

data/lib/BotnetV2/version.rb

@@ -1,3 +1,3 @@
 module BotnetV2
-  VERSION = '1.0'
+  VERSION = '1.1'
 end

data/test/master_test.rb

@@ -22,20 +22,54 @@ class MasterTest < Test::Unit::TestCase
   end
 
   def test_create
+    # Create a master and a client to play with.
     master = BotnetV2::BotnetV2.create_master 'foobar'
-    worker = BotnetV2::BotnetV2.create_worker 'foobar12', 'localhost'
-    worker = BotnetV2::BotnetV2.create_worker 'foobar', 'localhost'
     client = BotnetV2::BotnetV2.create_client 'foobar', 1, 'localhost'
+    @verified_clients = 1
+    @ready_workers = 0
+    @processed_tasks = 0
+
+    # Test status of botnet...
+    client.net_status(Proc.new do |res| on_status(res) end)
+    sleep(0) until @done
+    @done = false
+
+    # Create a worker
+    worker = BotnetV2::BotnetV2.create_worker 'foobar', 'localhost'
+    @verified_clients = 2
+    @ready_workers = 1
+
+    # Now execute tasks and watch the status of the server change.
     client.execute('1+1', Proc.new do |res| on_result(res) end)
     sleep(0) until @done
+    @processed_tasks = 1
+    @done = false
+    client.net_status(Proc.new do |res| on_status(res) end)
+    sleep(0) until @done
+    @done = false
+    client.execute('1+1', Proc.new do |res| on_result(res) end)
+    sleep(0) until @done
+    @processed_tasks = 2
+    @done = false
+    client.net_status(Proc.new do |res| on_status(res) end)
+    sleep(0) until @done
     client.exit!
     worker.exit!
     master.exit!
-    assert_equal(@result, 2, 'Wrong result')
+  end
+
+  def on_status(result)
+    assert_equal(result['ready_clients'], 1, "Invalid client count.")
+    assert_equal(result['verified_clients'], @verified_clients, "Invalid verified client count.")
+    assert_equal(result['ready_workers'], @ready_workers, "Invalid worker count.")
+    assert_equal(result['work_bundles'], 0, "Invalid worker count.")
+    assert_equal(result['processed_tasks'], @processed_tasks, "Invalid amount of tasks processed.")
+    assert_equal(result['active_tasks'], 0, "Invalid amount of tasks active.")
+    @done = true
   end
 
   def on_result(result)
-    @result = result
+    assert_equal(result, 2, 'Wrong result')
     @done = true
   end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: BotnetV2
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
-- Michael Fürst
+- Penguinmenac3
 autorequire:
 bindir: bin
 cert_chain: []
@@ -62,7 +62,7 @@ files:
 - test/private.pem
 homepage: https://fuersts1.homeip.net/penguinmenac3/botnetv2
 licenses:
-- MIT
+- GPL
 metadata: {}
 post_install_message:
 rdoc_options: []