mass-client 1.0.27 → 1.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 133144975142345da5264d7f64c7b5b4d3e8eeb2dd43a831ce6179de3445ed9d
-  data.tar.gz: d35fb41dbb971df3bb74a7dde7654056f1999df08fe60e3ebf398f07f07d99ce
+  metadata.gz: f7c4826e872e8cac9f58e00d66b13939016c482087bba516a54cc1e34b28a5b2
+  data.tar.gz: a5b754e2e85610ad2007939372438ecdd3346db69e89dc1797607ed694ecd0d7
 SHA512:
-  metadata.gz: d844268b3c371ad253843e6f7ee6f32211b9379aa9425a3f64a783cfbf829d41f5cca2ef31a5af740a0214fbd67468b410029447a205f0969368783054def5f0
-  data.tar.gz: 965e2a526949322ffa384a5f28168b1607594e29ac1747f875e56780fa714fbada1729bdf9b7a4185c06a447015b65311f4edeacd3b6eba837baff3fd83d5108
+  metadata.gz: 7b75129bd6625ab47e806ee1819ad248d277bdff2320844f027c11c0f5eff8672915c807d673f906afaba8e2c686a97c39e38b4bc91d050af6a00bb43e85ffa5
+  data.tar.gz: b68638e7923e67948a43175dce9aba69f8817d910a57f7652aee0f3e21a94c51e8a097413f3345d7b66e193ef573f9b7dcbd579e17d7b0b30756e67ce5cb649a

data/lib/base-line/profile.rb

@@ -26,22 +26,27 @@ module Mass
             File.delete(LOCKFILE_PATH) if File.exist?(LOCKFILE_PATH)
         end
 
-        def upload_to_dropbox_with_lock(tmp_path, path)
-            s = ''
-            # acquire_lock # https://github.com/MassProspecting/docs/issues/320 - I started getting error "Timeout while waiting for lockfile." very often.
-            begin
-                # Upload the file to Dropbox
-                s = BlackStack::DropBox.dropbox_upload_file(tmp_path, path)
-                json = JSON.parse(s)
-                if json['is_downloadable'].nil? || !json['is_downloadable']
-                    raise "Dropbox file upload failed. Dropbox response: #{s}"
-                end
-            rescue => e
-                raise "Error during upload: #{e.message} - Dropbox response: #{s}"
-            ensure
-                # Always release the lock, even if an error occurs
-                release_lock
-            end
+        # Function to upload a file to Amazon S3 and get its public URL
+        def upload_file_to_s3(file_path, s3_key)
+            # Upload the file
+            Mass.s3.put_object(
+                bucket: Mass.s3_bucket, 
+                key: s3_key, 
+                body: File.open(file_path)
+            )
+            # Generate the public URL
+            public_url = "https://#{Mass.s3_bucket}.s3.amazonaws.com/#{s3_key}"
+            # return
+            return public_url
+        end
+  
+        # Function to create a folder in S3
+        def create_s3_folder(folder_name)
+            Mass.s3.put_object(
+                bucket: Mass.s3_bucket, 
+                key: "#{folder_name}/"
+            )
+            return true
         end
 
         #
@@ -125,12 +130,12 @@ module Mass
             # Proceed with Dropbox operations
             year = Time.now.year.to_s.rjust(4, '0')
             month = Time.now.month.to_s.rjust(2, '0')
-            folder = "/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
+            folder = dropbox_folder #"/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
-            BlackStack::DropBox.dropbox_create_folder(folder)
+            create_s3_folder(folder)
 
             # Upload the file to Dropbox
-            upload_to_dropbox_with_lock(tmp_path, path)
+            ret = upload_file_to_s3(tmp_path, path)
 
             # Delete the local file
             File.delete(tmp_path)
@@ -139,7 +144,7 @@ module Mass
             # 
             # Add a timeout to wait the file is present in the cloud.
             # Reference: https://github.com/MassProspecting/docs/issues/320
-            self.wait_for_dropbox_url(path).gsub('&dl=1', '&dl=0')
+            ret
         end
                 
         # download image from Selenium using JavaScript and upload to Dropbox 

data/lib/first-line/profile_rpa.rb

@@ -208,46 +208,6 @@ module Mass
             raise "Downloaded file not found in paths #{file_paths.join(',')} after #{timeout} seconds."
         end
 
-
-        # Retrieves the URL of a file stored in Dropbox with a timeout mechanism.
-        # This function continuously attempts to retrieve the file URL until it 
-        # becomes available in Dropbox, up to a specified maximum wait time.
-        #
-        # @param path [String] The path to the file in Dropbox.
-        # @param max_wait [Integer] Maximum time to wait (in seconds) for the file to 
-        #                            appear in Dropbox. Default is 30 seconds.
-        # @param interval [Integer] Time interval (in seconds) between each retry 
-        #                            attempt. Default is 2 seconds.
-        #
-        # @return [String] The URL of the file in Dropbox, with the `&dl=1` parameter 
-        #                  replaced by `&dl=0`.
-        # @return nil If the file is not available within the specified 
-        #                       maximum wait time, raises an error with a timeout message.
-        #
-        # @example
-        #   wait_for_dropbox_url('/path/to/file', max_wait: 60, interval: 3)
-        #   # => "https://www.dropbox.com/s/yourfile?dl=0"
-        #
-        def wait_for_dropbox_url(path, max_wait: 5, interval: 2)
-            start_time = Time.now
-          
-            loop do
-                begin
-                    # Try to get the file URL
-                    return BlackStack::DropBox.get_file_url(path).gsub('&dl=1', '&dl=0')
-                rescue => e
-                    # Check if the timeout has been exceeded
-                    if Time.now - start_time > max_wait
-                        #raise "Timeout exceeded while waiting for Dropbox file (#{path}): #{e.message}"
-                        return nil
-                    end
-            
-                    # Wait for a short interval before retrying
-                    sleep(interval)
-                end
-            end
-        end
-
         # take screenshot and upload it to dropbox
         # return the URL of the screenshot
         def screenshot(dropbox_folder=nil)
@@ -262,12 +222,12 @@ module Mass
             # code
             year = Time.now.year.to_s.rjust(4,'0')
             month = Time.now.month.to_s.rjust(2,'0')
-            folder = "/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
+            folder = dropbox_folder #"/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
-            BlackStack::DropBox.dropbox_create_folder(folder)
-            upload_to_dropbox_with_lock(tmp_path, path)
+            create_s3_folder(folder)
+            ret = upload_file_to_s3(tmp_path, path)
             File.delete(tmp_path)
-            BlackStack::DropBox.get_file_url(path).gsub('&dl=1', '&dl=0')
+            ret
         end # def screenshot
 
         # create a file in the cloud with the HTML of the current page
@@ -284,12 +244,12 @@ module Mass
             # code
             year = Time.now.year.to_s.rjust(4,'0')
             month = Time.now.month.to_s.rjust(2,'0')
-            folder = "/massprospecting.bots/#{dropbox_folder}.#{year}.#{month}"
+            folder = dropbox_folder #"/massprospecting.bots/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
-            BlackStack::DropBox.dropbox_create_folder(folder)
-            upload_to_dropbox_with_lock(tmp_path, path)
+            create_s3_folder(folder)
+            ret = upload_file_to_s3(tmp_path, path)
             File.delete(tmp_path)
-            BlackStack::DropBox.get_file_url(path).gsub('&dl=1', '&dl=0')
+            ret
         end # def snapshot
 
         # return a selnium driver for this profile

data/lib/mass-client.rb

@@ -8,12 +8,19 @@ require 'colorize'
 require 'timeout'
 require 'base64'
 require 'adspower-client'
+require 'aws-sdk-s3' # Ensure the AWS SDK for S3 is installed
 
 # mass client configuration
 module Mass
     @@js_path
     @@drownload_path
     @@api_client
+    
+    @@s3_bucket
+    @@s3_region
+    @@s3_access_key_id
+    @@s3_secret_access_key
+    @@s3
 
     # set the MassProspecting API client
     #
@@ -21,21 +28,33 @@ module Mass
     #
     # api_key: Mandatory. The API key of your MassProspecting account.
     # subaccount: Optional. The name of the subaccount you want to work with. If you provide a subaccount, the SDK will call the master to get the URL and port of the subaccount. Default is nil.
+    # 
     # api_url: Optional. The URL of the MassProspecting API. Default is 'https://massprospecting.com'.
     # api_port: Optional. The port of the MassProspecting API. Default is 443.
     # api_version: Optional. The version of the MassProspecting API. Default is '1.0'.
+    #
     # backtrace: Optional. If true, the backtrace of the exceptions will be returned by the access points. If false, only an error description is returned. Default is false.
+    # 
     # js_path: Optional. The path to the JavaScript file to be used by the SDK. Default is nil.
     # download_path: Optional. The path to the download folder(s) to be used by the SDK. Default is [].
+
     def self.set(
         api_key: ,
         subaccount: nil,
+
         api_url: 'https://massprospecting.com', 
         api_port: 443,
         api_version: '1.0',
+
         backtrace: false,
+
         js_path: nil, 
-        download_path: []
+        download_path: [],
+
+        s3_region: nil,
+        s3_access_key_id: nil,
+        s3_secret_access_key: nil,
+        s3_bucket: nil
     )
         # call the master to get the URL and port of the subaccount.
         BlackStack::API.set_client(
@@ -78,6 +97,25 @@ module Mass
 
         @@js_path = js_path
         @@download_path = download_path
+
+        @@s3_region = s3_region
+        @@s3_access_key_id = s3_access_key_id
+        @@s3_secret_access_key = s3_secret_access_key
+        @@s3_bucket = s3_bucket
+
+        # Initialize the S3 client
+        if (
+            @@s3_region
+            @@s3_access_key_id
+            @@s3_secret_access_key
+            @@s3_bucket
+        )
+            @@s3 = Aws::S3::Client.new(
+                region: @@s3_region,
+                access_key_id: @@s3_access_key_id,
+                secret_access_key: @@s3_secret_access_key
+            )
+        end
     end
 
     def self.download_path
@@ -87,6 +125,27 @@ module Mass
     def self.js_path
         @@js_path
     end
+
+    def self.s3_region
+        @@s3_region
+    end
+
+    def self.s3_access_key_id
+        @@s3_access_key_id
+    end
+
+    def self.s3_secret_access_key
+        @@s3_secret_access_key
+    end
+
+    def self.s3_bucket
+        @@s3_bucket
+    end
+
+    def self.s3
+        @@s3
+    end
+
 end # module Mass
 
 # base classes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mass-client
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.28
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timeout
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.14
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.169.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.169.0
 description: Ruby library for MassProspecting API.
 email: leandro@massprospecting.com
 executables: []