mass-client 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89942512c664d6c1e10f0511db2f17c914a22d4b5b80d6b50fa4151c17997304
-  data.tar.gz: c7dc604ffa10a35ed2f1e74377d73a7402a2714b3c554c086c91216f867fccb7
+  metadata.gz: 960021fea3e8dc9a0735b20a24730083231b8109ec74dd738a3d8508ff5ced3a
+  data.tar.gz: 126df561fa20424d26c71d3b6b32000b7ae1ae72b6beda64bc37e9bfef56894b
 SHA512:
-  metadata.gz: b1480e0a4e9f4b414a7bec3148ee96c8611e2f44fd3b7dde949e296be04a4b3ab0354f485dfa964546ec40e1e15876612cfca54781073d8dcc104ad932205e1a
-  data.tar.gz: 6abc1702733af395df62d3c8ff01b1d2c701f337d32427bfb77b59ea4ebff591f87ab39690fb3943d87a77f2e7560a96f4aedbfb045ac69d08156734d6fd2bfd
+  metadata.gz: 92bb76f6c2cd71c2b9d5cbcc84fce102c7c5ab2de8949e6dedf5a09d8f928e221563133049ff212d4d601ea317b714a77e0767016d9e671c3df365b6120fc06f
+  data.tar.gz: 402f6999e082f2bc4e90168915a165c2f336bd3547bbd360e909d07ddc879af3add9c3d1363a39198d7a5d4e443505d7adc1936840b93a58d2b6131d8144e149

data/lib/base-line/profile.rb

@@ -2,6 +2,159 @@ module Mass
     class Profile < BlackStack::Base
         attr_accessor :type
 
+        # DROPBOX LOCKFILE PARAMETERS
+        LOCKFILE_PATH = '/tmp/dropbox_upload.lock' # Path to your lockfile
+        LOCK_TIMEOUT = 5 # Maximum time in seconds to wait for the lock
+
+        # DROPBOX LOCKFILE FUNCTIONS
+        def acquire_lock
+            begin
+                Timeout.timeout(LOCK_TIMEOUT) do
+                # Wait until the lockfile can be created (i.e., it's not already taken)
+                while File.exist?(LOCKFILE_PATH)
+                    sleep 0.1
+                end
+                # Create the lockfile
+                File.open(LOCKFILE_PATH, 'w') {}
+                end
+            rescue Timeout::Error
+                raise "Timeout while waiting for lockfile."
+            end
+        end
+
+        def release_lock
+            File.delete(LOCKFILE_PATH) if File.exist?(LOCKFILE_PATH)
+        end
+
+        def upload_to_dropbox_with_lock(tmp_path, path)
+            acquire_lock
+            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}"
+            ensure
+                # Always release the lock, even if an error occurs
+                release_lock
+            end
+        end
+
+        #
+        #
+        #
+
+        # download image from Selenium using JavaScript and upload to Dropbox 
+        # return the URL of the screenshot
+        # 
+        # Parameters:
+        # - url: Internet address of the image to download from the website and upload to dropbox.
+        # - dropbox_folder: Dropbox folder name to store the image.
+        #                
+        def download_image_0(url, dropbox_folder = nil)
+            raise "Either dropbox_folder parameter or self.desc['id_account'] are required." if dropbox_folder.nil? && self.desc['id_account'].nil?
+            dropbox_folder = self.desc['id_account'] if dropbox_folder.nil?
+            
+            # Parameters
+            id = SecureRandom.uuid
+            
+            # JavaScript to get base64 image data
+            js0 = "
+                function getImageBase64(imageSrc) {
+                return new Promise(async (resolve, reject) => {
+                    try {
+                    const response = await fetch(imageSrc);
+                    const blob = await response.blob();
+                    const reader = new FileReader();
+                    reader.onloadend = function() {
+                        resolve(reader.result);
+                    };
+                    reader.onerror = function(error) {
+                        reject(error);
+                    };
+                    reader.readAsDataURL(blob);
+                    } catch (error) {
+                    reject(error);
+                    }
+                });
+                }
+                return getImageBase64('#{url}');
+            "
+            
+            # Execute JavaScript and get base64 image data
+            base64_image = driver.execute_script(js0)
+            raise "Failed to retrieve image data from URL: #{url}" if base64_image.nil?
+            
+            # Extract MIME type and base64 data
+            mime_type_match = base64_image.match(/^data:image\/([a-zA-Z0-9.+-]+);base64,/)
+            if mime_type_match
+                mime_subtype = mime_type_match[1] # e.g., 'png', 'jpeg', 'gif'
+                # Map common MIME subtypes to file extensions
+                extension = case mime_subtype
+                            when 'jpeg' then 'jpg'
+                            else mime_subtype
+                            end
+                # Remove the data URL prefix
+                image_data = base64_image.sub(/^data:image\/[a-zA-Z0-9.+-]+;base64,/, '')
+            else
+                raise "Unsupported or invalid image data format."
+            end
+            
+            # Update filename and paths
+            filename = "#{id}.#{extension}"
+            tmp_paths = if Mass.download_path.is_a?(String)
+                            ["#{Mass.download_path}/#{filename}"]
+                        elsif Mass.download_path.is_a?(Array)
+                            Mass.download_path.map { |s| "#{s}/#{filename}" }
+                        else
+                            raise "Invalid Mass.download_path configuration."
+                        end
+            
+            # Save the image to the first available path
+            tmp_path = tmp_paths.find { |path| File.writable?(File.dirname(path)) }
+            raise "No writable path found in #{tmp_paths.join(', ')}." if tmp_path.nil?
+            
+            File.open(tmp_path, 'wb') do |file|
+                file.write(Base64.decode64(image_data))
+            end
+            
+            # 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}"
+            path = "#{folder}/#{filename}"
+            BlackStack::DropBox.dropbox_create_folder(folder)
+
+            # Upload the file to Dropbox
+            upload_to_dropbox_with_lock(tmp_path, path)
+
+            # Delete the local file
+            File.delete(tmp_path)
+
+            # Return the URL of the file in Dropbox
+            # 
+            # 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')
+        end
+                
+        # download image from Selenium using JavaScript and upload to Dropbox 
+        # return the URL of the screenshot
+        # 
+        # Parameters:
+        # - img: Selenium image element to download from the website and upload to dropbox.
+        # - dropbox_folder: Dropbox folder name to store the image.
+        #
+        def download_image(img, dropbox_folder=nil)
+            download_image_0(img.attribute('src'), dropbox_folder)
+        end # def download_image
+
+        #
+        #
+        #
         def self.object_name
             'profile'
         end

data/lib/first-line/profile_rpa.rb

@@ -1,8 +1,10 @@
 module Mass
     class ProfileRPA < Mass::Profile
+
         @@buffer_driver = nil
         attr_accessor :headless
 
+        # SELENIUM FUNCTIONS
         def self.buffer_driver
             @@buffer_driver
         end
@@ -218,14 +220,14 @@ module Mass
         #
         # @return [String] The URL of the file in Dropbox, with the `&dl=1` parameter 
         #                  replaced by `&dl=0`.
-        # @raise [RuntimeError] If the file is not available within the specified 
+        # @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: 30, interval: 2)
+        def wait_for_dropbox_url(path, max_wait: 5, interval: 2)
             start_time = Time.now
           
             loop do
@@ -235,7 +237,8 @@ module Mass
                 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}"
+                        #raise "Timeout exceeded while waiting for Dropbox file (#{path}): #{e.message}"
+                        return nil
                     end
             
                     # Wait for a short interval before retrying
@@ -244,110 +247,6 @@ module Mass
             end
         end
 
-        # download image from Selenium using JavaScript and upload to Dropbox 
-        # return the URL of the screenshot
-        # 
-        # Parameters:
-        # - url: Internet address of the image to download from the website and upload to dropbox.
-        # - dropbox_folder: Dropbox folder name to store the image.
-        #                
-        def download_image_0(url, dropbox_folder = nil)
-            raise "Either dropbox_folder parameter or self.desc['id_account'] are required." if dropbox_folder.nil? && self.desc['id_account'].nil?
-            dropbox_folder = self.desc['id_account'] if dropbox_folder.nil?
-            
-            # Parameters
-            id = SecureRandom.uuid
-            
-            # JavaScript to get base64 image data
-            js0 = "
-                function getImageBase64(imageSrc) {
-                return new Promise(async (resolve, reject) => {
-                    try {
-                    const response = await fetch(imageSrc);
-                    const blob = await response.blob();
-                    const reader = new FileReader();
-                    reader.onloadend = function() {
-                        resolve(reader.result);
-                    };
-                    reader.onerror = function(error) {
-                        reject(error);
-                    };
-                    reader.readAsDataURL(blob);
-                    } catch (error) {
-                    reject(error);
-                    }
-                });
-                }
-                return getImageBase64('#{url}');
-            "
-            
-            # Execute JavaScript and get base64 image data
-            base64_image = driver.execute_script(js0)
-            raise "Failed to retrieve image data from URL: #{url}" if base64_image.nil?
-            
-            # Extract MIME type and base64 data
-            mime_type_match = base64_image.match(/^data:image\/([a-zA-Z0-9.+-]+);base64,/)
-            if mime_type_match
-                mime_subtype = mime_type_match[1] # e.g., 'png', 'jpeg', 'gif'
-                # Map common MIME subtypes to file extensions
-                extension = case mime_subtype
-                            when 'jpeg' then 'jpg'
-                            else mime_subtype
-                            end
-                # Remove the data URL prefix
-                image_data = base64_image.sub(/^data:image\/[a-zA-Z0-9.+-]+;base64,/, '')
-            else
-                raise "Unsupported or invalid image data format."
-            end
-            
-            # Update filename and paths
-            filename = "#{id}.#{extension}"
-            tmp_paths = if Mass.download_path.is_a?(String)
-                            ["#{Mass.download_path}/#{filename}"]
-                        elsif Mass.download_path.is_a?(Array)
-                            Mass.download_path.map { |s| "#{s}/#{filename}" }
-                        else
-                            raise "Invalid Mass.download_path configuration."
-                        end
-            
-            # Save the image to the first available path
-            tmp_path = tmp_paths.find { |path| File.writable?(File.dirname(path)) }
-            raise "No writable path found in #{tmp_paths.join(', ')}." if tmp_path.nil?
-            
-            File.open(tmp_path, 'wb') do |file|
-                file.write(Base64.decode64(image_data))
-            end
-            
-            # 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}"
-            path = "#{folder}/#{filename}"
-            BlackStack::DropBox.dropbox_create_folder(folder)
-            
-            # Upload the file to Dropbox
-            BlackStack::DropBox.dropbox_upload_file(tmp_path, path)
-            # Delete the local file
-            File.delete(tmp_path)
-
-            # Return the URL of the file in Dropbox
-            # 
-            # 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')
-        end
-                
-        # download image from Selenium using JavaScript and upload to Dropbox 
-        # return the URL of the screenshot
-        # 
-        # Parameters:
-        # - img: Selenium image element to download from the website and upload to dropbox.
-        # - dropbox_folder: Dropbox folder name to store the image.
-        #
-        def download_image(img, dropbox_folder=nil)
-            download_image_0(img.attribute('src'), dropbox_folder)
-        end # def download_image
-
         # take screenshot and upload it to dropbox
         # return the URL of the screenshot
         def screenshot(dropbox_folder=nil)
@@ -365,7 +264,7 @@ module Mass
             folder = "/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
             BlackStack::DropBox.dropbox_create_folder(folder)
-            BlackStack::DropBox.dropbox_upload_file(tmp_path, path)
+            upload_to_dropbox_with_lock(tmp_path, path)
             File.delete(tmp_path)
             BlackStack::DropBox.get_file_url(path).gsub('&dl=1', '&dl=0')
         end # def screenshot
@@ -387,7 +286,7 @@ module Mass
             folder = "/massprospecting.bots/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
             BlackStack::DropBox.dropbox_create_folder(folder)
-            BlackStack::DropBox.dropbox_upload_file(tmp_path, path)
+            upload_to_dropbox_with_lock(tmp_path, path)
             File.delete(tmp_path)
             BlackStack::DropBox.get_file_url(path).gsub('&dl=1', '&dl=0')
         end # def snapshot

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mass-client
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors:
 - Leandro Daniel Sardi