adspower-client 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a6276d009445088184bda9fb619b9f64da4a2f50e383eeef8e7166503d5c38f
-  data.tar.gz: 27127685f33523332a282fc6e50d43f6e7064bde27666c7b18bde1f407a97fbf
+  metadata.gz: fe1ffd582aadfbb03a1587f3043d08637bcab9e9f562f9772398f790f4a49278
+  data.tar.gz: 7df20a1ca2798b495d4ab9dddd1e6d2a2c2a84afdcff60adfe5eb09b5b5ae17c
 SHA512:
-  metadata.gz: 50a25edcd5c54207f6f4e86004671596f47e8b360bd3961b8e2c67759dfd134f30939ca330a45c54a80777ee5e805d6cb1ebfa90a4a2bde0cea46ab7b917efb7
-  data.tar.gz: 106df641acb2442c19da7ba0bb24e7603d5d9521621b6a0968a172c9746ab9ac98f99af1cbe04df307b62c8be9564c1090aeae9d88e7fbe7934cf7a70fdc0616
+  metadata.gz: f730364d0a375f0c517958d5e8f1f6fc9599581b415b4298b09d913224b0cf3cbd95307fc1f00263962f5214a8edc9310493629929210c6b5386720d0bfbcbec
+  data.tar.gz: e2330dc7f033d8b0c4a1405e741c2014ac66b358fd78a201342f80096dc9898e1cd09a57146bc7b239e28bbb6365ef9158d8753cf5b818ba69fca4ff1310c1c4

data/adspower-client.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'adspower-client'
-    s.version     = '1.0.3'
-    s.date        = '2023-12-07'
+    s.version     = '1.0.5'
+    s.date        = '2024-01-14'
     s.summary     = "Ruby library for operating AdsPower API."
     s.description = "Ruby library for operating AdsPower API."
     s.authors     = ["Leandro Daniel Sardi"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency 'blackstack-core', '~> 1.2.15', '>= 1.2.15'
     s.add_runtime_dependency 'selenium-webdriver', '~> 4.10.0', '>= 4.10.0'
     s.add_runtime_dependency 'watir', '~> 7.3.0', '>= 7.3.0'
-    s.add_runtime_dependency 'sequel', '~> 5.75.0', '>= 5.75.0'
+    #s.add_runtime_dependency 'sequel', '~> 5.75.0', '>= 5.75.0'
     s.add_runtime_dependency 'colorize', '~> 1.1.0', '>= 1.1.0'
     s.add_runtime_dependency 'simple_cloud_logging', '~> 1.2.2', '>= 1.2.2'
 end

data/lib/adspower-client.rb

@@ -18,17 +18,21 @@ class AdsPowerClient
 #        self.profiles_created = []
     end
 
-    # send an GET request to "#{url}/status"
-    # and return the response body.
+    # send an GET request to "#{url}/status".
+    # Return true if it responded successfully.
     # 
     # reference: https://localapi-doc-en.adspower.com/docs/6DSiws
     # 
-    def status
-        url = "#{self.adspower_listener}/status"
-        uri = URI.parse(url)
-        res = Net::HTTP.get(uri)
-        # show respose body
-        return JSON.parse(res)['msg']
+    def online?
+        begin
+            url = "#{self.adspower_listener}/status"
+            uri = URI.parse(url)
+            res = Net::HTTP.get(uri)
+            # show respose body
+            return JSON.parse(res)['msg'] == 'success'
+        rescue => e
+            return false
+        end
     end
 
     # send a post request to "#{url}/api/v1/user/create"
@@ -80,8 +84,8 @@ class AdsPowerClient
     # 
     # reference: https://localapi-doc-en.adspower.com/docs/FFMFMf
     # 
-    def start(id)
-        uri = URI.parse("#{self.adspower_listener}/api/v1/browser/start?user_id=#{id}&headless=1")
+    def start(id, headless=false)
+        uri = URI.parse("#{self.adspower_listener}/api/v1/browser/start?user_id=#{id}&headless=#{headless ? '1' : '0'}'}")
         res = Net::HTTP.get(uri)
         # show respose bo
         ret = JSON.parse(res)
@@ -105,9 +109,25 @@ class AdsPowerClient
         ret
     end
 
+    # send an GET request to "#{url}/status"
+    # and return if I get the json response['data']['status'] == 'Active'.
+    # Otherwise, return false.
+    # 
+    # reference: https://localapi-doc-en.adspower.com/docs/YjFggL
+    # 
+    def check(id)
+        url = "#{self.adspower_listener}/api/v1/browser/active?user_id=#{id}"
+        uri = URI.parse(url)
+        res = Net::HTTP.get(uri)
+        # show respose body
+        return false if JSON.parse(res)['msg'] != 'success'
+        # return
+        JSON.parse(res)['data']['status'] == 'Active'
+    end
+
     #
-    def driver(id)
-        ret = self.start(id)
+    def driver(id, headless=false)
+        ret = self.start(id, headless)
 
         # Attach test execution to the existing browser
         # reference: https://zhiminzhan.medium.com/my-innovative-solution-to-test-automation-attach-test-execution-to-the-existing-browser-b90cda3b7d4a

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adspower-client
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-07 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri
@@ -130,26 +130,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.3.0
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.75.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.75.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.75.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.75.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement