adspower-client 1.0.18 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f42b0809ed76da37b7806a4f70ce727efe871def40a4a90c5810d972b0ea0556
-  data.tar.gz: d22f49494cae5e3ae3195984c604eea018c6dc180cb1b9dd3d62fcab55f21851
+  metadata.gz: d0ccba83af94aa8269d8f9900dc833c8272dae8d157488f5e8f6f5e6b0271655
+  data.tar.gz: 26eb3e2830ba0fdac9c393baf0b1bd5ccb68ee06ee23107b63d45beb1bbcbc62
 SHA512:
-  metadata.gz: e5951622b5d9f01c5515df6ce671cd0afd6a20872e6dedab34be1d088ebef3f6811b9473a700221e7447e3e6d2d811fe149a6fa3e8cd917ae9abad84e5f8dc24
-  data.tar.gz: 7c589af8831eb9596ab2799ae04bd9af6433883f467234e8fe220cd04a6bfc526e31aed74d4b5671330ab5034fc207cbb54c34fc5854f1ae291b431e6985de40
+  metadata.gz: c4012e0f78559bc6b729b926c104d3c16571a95624690243468757d93f4648df504149614901c26eb100f83255525db4859549e0fe06ef29754fd3df7f021c2b
+  data.tar.gz: 87085d7433b2eaf109ca6e2c467597add299c110d175950baa5786302372398eea303ed722af08e5d18aa6d280d7d2e32451739399784f1970dfe41686c84a2b

data/adspower-client.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'adspower-client'
-    s.version     = '1.0.18'
-    s.date        = '2025-07-28'
+    s.version     = '1.0.20'
+    s.date        = '2025-12-10'
     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
@@ -247,13 +316,14 @@ class AdsPowerClient
         proxy_config:, 
         group_id: '0', 
         browser_version: nil,
-        os:              'linux64',# new: one of linux64, mac-x64, mac-arm64, win32, win64
+        os:              'linux64', # new: one of linux64, mac-x64, mac-arm64, win32, win64
         fingerprint:     nil,
-        platform:        '',       # default: no platform
-        tabs:            [],       # default: no tabs to open
-        username:        '',       # default: no login
-        password:        '',       # default: no password
-        fakey:           ''        # leave blank if no 2FA
+        platform:        '',        # default: no platform
+        tabs:            [],        # default: no tabs to open
+        username:        '',        # default: no login
+        password:        '',        # default: no password
+        fakey:           '',        # leave blank if no 2FA
+        cookie:          nil        # import cookies - Type: Text - Format: JSON - username/password are ignored if cookie is not nil.
     )
         browser_version ||= adspower_default_browser_version
         
@@ -313,6 +383,7 @@ class AdsPowerClient
                 'username'          => username,
                 'password'          => password,
                 'fakey'             => fakey,     # 2FA, if any
+                'cookie'            => cookie,
 
                 # ─── FINGERPRINT ──────────────────────────────────
                 "fingerprint_config" => fingerprint || {
@@ -478,8 +549,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.18
+  version: 1.0.20
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri