adspower-client 1.0.17 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fa9af194c360323a9ddb4533f0be4df21414e2a3645fdebb03a9a13eb315183
-  data.tar.gz: 474d47d140310200db7919c293e260761e90f33bbeef72ad923b27cfdbb180e2
+  metadata.gz: 6c91e849c43700d337b826208f705deef1bb3ec6e493ac872cd7d838afc67859
+  data.tar.gz: 176aefa58b9bd965fcbab16b7714dec6ac5cf3a8e0cad23b759248ae82b6fbd3
 SHA512:
-  metadata.gz: 3e39840a574b00918fc9365be4ee9ffde97c8d9bdbcc4017184a2b4589dd99de31c6c6cc0e7a4eb14f6506b0e8e686ffe96f256d69dd7688dd379de9bab61b0d
-  data.tar.gz: 93957f83998d804fe74a423337fb13afa8bff70ed1eddb74a4da0f7cd9722b857eed3870797670ce71c8387e3f7cab745752c48df7f6c5b9520e9f3d8b21c152
+  metadata.gz: 564d87a5328385d750e0734363a7dae2a20e56469801b4042818deb6c6f81468cdf0172d80bc47b09a432fb03b0834147771f11c6b939e10544b3d73952b450c
+  data.tar.gz: 4aa7af6322c6489d26733ff50117e3341d50fe68ecdba7846642149cbccb2874619483aa4a5bf0debacbb4d2ed93d2b5ca9eaf5507ca57afa755190c6dda2724

data/adspower-client.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'adspower-client'
-    s.version     = '1.0.17'
-    s.date        = '2025-07-27'
+    s.version     = '1.0.19'
+    s.date        = '2025-11-03'
     s.summary     = "Ruby library for operating AdsPower API."
     s.description = "Ruby library for operating AdsPower API."
     s.authors     = ["Leandro Daniel Sardi"]

data/lib/adspower-client.rb

@@ -49,9 +49,23 @@ class AdsPowerClient
 
     # Release the lock
     def release_lock
-        @lockfile.flock(File::LOCK_UN) if @lockfile
+        if @lockfile
+            @lockfile.flock(File::LOCK_UN)
+            # don't close while you expect further operations; close only on object shutdown
+            # @lockfile.close
+        end
     end
-
+=begin
+    # add a destructor to close file when object is GC'd / program shuts down
+    # Call client.close when you're done with the client instance (e.g., at program exit).
+    def close
+        if @lockfile && !@lockfile.closed?
+            @lockfile.flock(File::LOCK_UN) rescue nil
+            @lockfile.close rescue nil
+            @lockfile = nil
+        end
+    end
+=end
     # Wrapper method for critical sections
     def with_lock
         acquire_lock
@@ -81,12 +95,67 @@ class AdsPowerClient
         return
     end
 
+    def self.drivers
+        @@drivers
+    end
+
+    # Quit and remove all drivers (safe)
+    def self.cleanup_all
+        @@drivers.keys.each do |id|
+            drv = @@drivers[id]
+            begin
+                drv.quit if drv
+            rescue => e
+            # best-effort: ignore but log if desired
+            ensure
+                @@drivers.delete(id)
+            end
+        end
+    end
+
+    # Quit and remove a specific driver (safe)
+    def self.cleanup(id)
+        drv = @@drivers[id]
+        begin
+            drv.quit if drv
+        rescue => e
+            # best-effort: ignore but log if desired
+        ensure
+            @@drivers.delete(id)
+        end
+    end
+=begin
+    # Try to kill processes matching a pattern (last resort)
+    # Call it only if quit and client.stop both failed.
+    def self.force_kill_by_ws(ws_endpoint)
+        # example ws_endpoint: "127.0.0.1:12345" -> 12345
+        port = ws_endpoint.split(':').last rescue nil
+        return unless port
+        # find and kill processes that hold that port
+        begin
+            pids = `lsof -ti tcp:#{port}`.split.map(&:to_i)
+            pids.each { |pid| Process.kill('KILL', pid) rescue nil }
+        rescue => e
+            # ignore/ log
+        end
+    end
+=end
     # Kill all the adspower_global processes running on the local computer.
     def server_stop
         with_lock do
             self.server_pids.each { |pid|
                 `kill -9 #{pid}`
             }
+            # clean up @@driver
+            @@drivers.each do |id, driver|
+                begin
+                    driver.quit if driver
+                rescue => e
+                    # Log or handle the exception if needed
+                ensure
+                    @@drivers[id] = nil
+                end
+            end
         end
         return
     end
@@ -104,6 +173,41 @@ class AdsPowerClient
             end
         end
     end
+    
+    # Fetch all groups
+    def list_groups
+        uri  = URI("#{adspower_listener}:#{port}/api/v1/group/list?api_key=#{key}")
+        resp = Net::HTTP.get(uri)
+        data = JSON.parse(resp)
+        raise "Error listing groups: #{data['msg']}" unless data['code'] == 0
+        data['data']['list']   # => [{ "id" => 0, "name" => "Ungrouped" }, …]
+    end
+
+    # Find the numeric ID for a given group name (exact match)
+    def find_group_id_by_name(name)
+        grp = list_groups.find { |g| g['group_name'].casecmp(name).zero? }
+        grp ? grp['group_id'] : nil
+    end
+
+    # returns an Array of profile‑hashes from the local API
+    def list_profiles(group_id: nil)
+        all = []
+        page = 1
+
+        loop do
+            params = { page: page, limit: 100 }
+            params[:group_id] = group_id if group_id
+            url    = "#{adspower_listener}:#{port}/api/v2/browser-profile/list"
+            resp   = BlackStack::Netting.call_post(url, params)
+            data   = JSON.parse(resp.body)
+            break unless data['code'] == 0 && data.dig('data','list').any?
+            batch = data['data']['list']
+            all += batch
+            page += 1
+        end
+
+        all
+    end
 
     # Count current profiles (optionally filtered by group)
     def profile_count(group_id: nil)
@@ -443,8 +547,25 @@ class AdsPowerClient
     end
 
     def driver2(id, headless: false, read_timeout: 180)
-        return @@drivers[id] if @@drivers[id]
-      
+        #return @@drivers[id] if @@drivers[id]
+        # If we have a cached driver, verify it's still valid
+        if @@drivers[id]
+            begin
+                # quick, non-destructive sanity check: ask for window_handles
+                @@drivers[id].window_handles
+                return @@drivers[id]
+            rescue  Selenium::WebDriver::Error::InvalidSessionIdError,
+                    Selenium::WebDriver::Error::NoSuchWindowError,
+                    Errno::ECONNREFUSED => e
+                # stale/broken driver: best-effort cleanup and continue to create a new one
+                #warn "detected stale driver for #{id}: #{e.class}: #{e.message}"
+                self.class.cleanup(id)
+            rescue => e
+                #warn "unexpected error checking cached driver: #{e.class}: #{e.message}"
+                self.class.cleanup(id)
+            end
+        end
+
         # 1) start the AdsPower profile / grab its WebSocket URL
         data = start(id, headless)['data']
         ws   = data['ws']['selenium']  # e.g. "127.0.0.1:XXXXX"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adspower-client
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.19
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-27 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri