added necessary bits to fetch_json and check_active_job_status to retry

reascripts/ReaSpeech/source/ReaSpeechAPI.lua

@@ -27,60 +27,101 @@ function ReaSpeechAPI:get_curl_cmd()
   return curl
 end
 
--- Fetch simple JSON responses. Will block until result or curl timeout.
--- For large amounts of data, use fetch_large instead.
-function ReaSpeechAPI:fetch_json(url_path, http_method, error_handler, timeout_handler)
+function ReaSpeechAPI:fetch_json(url_path, http_method, error_handler, success_handler, timeout_handler, retry_count)
   http_method = http_method or 'GET'
   error_handler = error_handler or function(_msg) end
+  success_handler = success_handler or function(_response) end
   timeout_handler = timeout_handler or function() end
+  retry_count = retry_count or 0
+  
+  local max_retries = 5
+  local retry_delay = 1 * (2 ^ retry_count)  -- Exponential backoff
 
   local curl = self:get_curl_cmd()
   local api_url = self:get_api_url(url_path)
-
   local http_method_argument = ""
   if http_method ~= 'GET' then
-    http_method_argument = " -X " .. http_method
+      http_method_argument = " -X " .. http_method
   end
-
   local command = table.concat({
-    curl,
-    ' "', api_url, '"',
-    ' -H "accept: application/json"',
-    http_method_argument,
-    ' -m ', self.CURL_TIMEOUT_SECONDS,
-    ' -s',
-    ' -i',
-    ' --http1.1',
-    ' --retry 5',
+      curl,
+      ' "', api_url, '"',
+      ' -H "accept: application/json"',
+      http_method_argument,
+      ' -m ', self.CURL_TIMEOUT_SECONDS,
+      ' -s',
+      ' -i',
+      ' --http1.1',
+      ' --retry 5',
   })
-
   app:debug('Fetch JSON: ' .. command)
 
   local exec_result = (ExecProcess.new { command }):wait()
-
   if exec_result == nil then
-    local msg = "Unable to run curl"
-    app:log(msg)
-    error_handler(msg)
-    return nil
+      local msg = "Unable to run curl"
+      app:log(msg)
+      error_handler(msg)
+      return
   end
 
   local status, output = exec_result:match("(%d+)\n(.*)")
   status = tonumber(status)
 
   if status == 28 then
-    app:debug("Curl timeout reached")
-    timeout_handler()
-    return nil
+      app:debug("Curl timeout reached")
+      timeout_handler()
+      return
   elseif status ~= 0 then
-    local msg = "Curl failed with status " .. status
-    app:debug(msg)
-    error_handler(msg)
-    return nil
+      local msg = "Curl failed with status " .. status
+      app:debug(msg)
+      error_handler(msg)
+      return
   end
 
   local response_status, response_body = self.http_status_and_body(output)
 
+  if response_status >= 500 and retry_count < max_retries then
+      app:debug("Got 500 error, retrying in " .. retry_delay .. " seconds. Retry " .. (retry_count + 1) .. " of " .. max_retries)
+      reaper.defer(function()
+          self:fetch_json(url_path, http_method, error_handler, success_handler, timeout_handler, retry_count + 1)
+      end)
+      return
+  elseif response_status >= 400 then
+      local msg = "Request failed with status " .. response_status
+      app:log(msg)
+      error_handler(msg)
+      return
+  end
+
+  local response_json = nil
+  if app:trap(function()
+      response_json = json.decode(response_body)
+  end) then
+      success_handler(response_json)
+  else
+      app:log("JSON parse error")
+      app:log(output)
+      error_handler("JSON parse error")
+  end
+end
+
+function ReaSpeechWorker:check_active_job()
+  if not self.active_job then return end
+  local active_job = self.active_job
+
+  if active_job.request_output_file then
+      self:check_active_job_request_output_file()
+  end
+
+  if active_job.transcript_output_file then
+      self:check_active_job_transcript_output_file()
+  else
+      self:check_active_job_status()
+  end
+end
+
+  local response_status, response_body = self.http_status_and_body(output)
+
   if response_status >= 400 then
     local msg = "Request failed with status " .. response_status
     app:log(msg)

reascripts/ReaSpeech/source/ReaSpeechWorker.lua

@@ -131,7 +131,7 @@ function ReaSpeechWorker:get_job_status(job_id, retry_count)
           self.active_job = nil
       end
   end, function(response)
-
+    
       if self:handle_job_status(self.active_job, response) then
           self.active_job = nil
       end
@@ -250,16 +250,22 @@ end
 
 function ReaSpeechWorker:check_active_job_status()
   if not self.active_job then return end
-
   local active_job = self.active_job
   if not active_job.job.job_id then return end
 
-  local response = self:get_job_status(active_job.job.job_id)
-  if response then
-    if self:handle_job_status(active_job, response) then
-      self.active_job = nil
-    end
-  end
+  ReaSpeechAPI:fetch_json("jobs/" .. active_job.job.job_id, 'GET',
+      function(error_message)
+          -- Error handler
+          self:handle_error(active_job, error_message)
+          self.active_job = nil
+      end,
+      function(response)
+          -- Success handler
+          if self:handle_job_status(active_job, response) then
+              self.active_job = nil
+          end
+      end
+  )
 end
 
 ReaSpeechWorker.check_sentinel = function(filename)