Merge pull request #44 from RapidAPI/staging

Merge staging to master

Author: LMS007

.github/workflows/master-change.yml

@@ -76,7 +76,9 @@ jobs:
             LOCATION_CONTEXT=Default,
             LOCATION_KEY=${{ matrix.region.key }},
             LOCATION_SECRET=${{ secrets.LOCATION_SECRET_PROD_DEFAULT }},
-            WORKER_LOGGING=off
+            WORKER_LOGGING=off,
+            POLLING_TIME_MAX=5000,
+            FREQUENCY=1000
           aws_access_key_id: ${{ secrets.AWS_PROD_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_PROD_SECRET_ACCESS_KEY }}
           aws_region: ${{ matrix.region.name }}

.github/workflows/staging-change.yml

@@ -31,7 +31,9 @@ jobs:
             LOCATION_CONTEXT=Default,
             LOCATION_KEY=AWS-STAGING,
             LOCATION_SECRET=${{ secrets.LOCATION_SECRET_STAGING_DEFAULT }},
-            WORKER_LOGGING=cli
+            WORKER_LOGGING=cli,
+            POLLING_TIME_MAX=5000,
+            FREQUENCY=1000
           aws_access_key_id: ${{ secrets.AWS_STAGING_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_STAGING_SECRET_ACCESS_KEY }}
           aws_region: us-east-1

src/RapidRequest.js

@@ -19,7 +19,7 @@ const fetchRequests = async ({ baseUrl, locationSecret, locationKey, locationCon
   let requestsResponse = (
     await axios.get(`${baseUrl}/api/location/request?amount=${batchSize}`, {
       headers,
-      timeout: 10000,
+      timeout: 5000,
     })
   ).data;
   requests = requestsResponse["requests"];

src/RapidTest.js

@@ -119,15 +119,23 @@ async function fetchAndExecuteTests({ baseUrl, locationSecret, locationKey, loca
     headers["x-location-context"] = locationContext;
   }
 
+  if (logging) {
+    consola.info(`Getting executions....`);
+  }
+
   let executionsResponse = (
     await axios.get(`${baseUrl}/api/location/executable?amount=${batchSize}`, {
       headers,
-      timeout: 10000,
+      timeout: 5000,
     })
   ).data;
 
   testExecutions = executionsResponse["testExecutions"];
 
+  if (logging) {
+    consola.info(`Fetched ${testExecutions.length} executions`);
+  }
+
   if (logging) {
     if (testExecutions.length > 0) {
       consola.info(`Processing executions for ${baseUrl}:\n`);

src/main.js

@@ -12,18 +12,27 @@ const { program } = require("commander");
 const pjson = require("../package.json");
 
 if (require.main === module) {
-  execute("cli");
+  // local execution
+  execute({ Records: [{ body: null }] }, {});
 }
 
-async function execute(logLevel = "on") {
+// eslint-disable-next-line no-unused-vars
+async function execute(event, _context) {
+  let baseURlFromEvent;
+  const body = event.Records?.[0]?.body;
+  if (body) {
+    baseURlFromEvent = JSON.parse(body)?.baseUrl;
+  }
   const ignoreSSL = "false"; // Fail any "https" tests with missing cert.
+
   program.version(pjson.version);
   program
     .description("Start worker to execute RapidAPI tests and requests")
     .requiredOption(
       "-u, --url <baseUrl>",
       "The base URL to fetch executions from (env variable: BASE_URL)",
-      process.env.BASE_URL || process.env.URL || "https://rapidapi.com/testing"
+      // default workers get baseUrl from SQS event body, otherwise from config
+      baseURlFromEvent || process.env.BASE_URL || "https://rapidapi.com/testing"
     )
     .requiredOption(
       "-s, --secret <secret>",
@@ -58,7 +67,7 @@ async function execute(logLevel = "on") {
     .option(
       "-l, --logging [on, off, cli]",
       "Logging level. 'cli' prints additional information at startup useful for debugging",
-      process.env.WORKER_LOGGING || logLevel
+      process.env.WORKER_LOGGING || "off"
     )
     .option(
       "--ignore-ssl [true, false]",
@@ -97,39 +106,56 @@ async function execute(logLevel = "on") {
   const START_TIMESTAMP = Date.now();
 
   let cycle = 1;
-  // eslint-disable-next-line
-  if (logging) console.log(`Staring cycle ${cycle++}`);
-  try {
-    await executeOnce({ ...global.settings });
-  } catch (err) {
-    consola.error(err);
-  }
-  if (cmd.frequency) {
+  if (!cmd.frequency) {
+    if (logging) consola.log(`Staring cycle ${cycle}`);
+    try {
+      await executeOnce({ ...global.settings });
+    } catch (err) {
+      consola.error(err);
+    }
+  } else {
+    let unresolvedCycles = 0;
+    let maxTimeReached = false;
     const testLoop = new Promise((resolve) => {
       const interval = setInterval(async function () {
         if (parseInt(cmd.max)) {
           let currentTimestamp = Date.now();
           if (currentTimestamp > parseInt(START_TIMESTAMP) + parseInt(cmd.max)) {
+            if (logging) consola.log(`Max polling time reached`);
             clearInterval(interval);
-            resolve();
+            maxTimeReached = true;
+            if (unresolvedCycles <= 0) {
+              resolve();
+            }
+            return;
           }
         }
         if (logging) {
           // eslint-disable-next-line
           console.log(`Staring cycle ${cycle++}`);
         }
         try {
+          unresolvedCycles += 1;
           await executeOnce({ ...global.settings });
         } catch (err) {
           consola.error(err);
+        } finally {
+          unresolvedCycles -= 1;
+          if (maxTimeReached && unresolvedCycles <= 0) {
+            resolve();
+          }
         }
       }, cmd.frequency);
     });
     await testLoop;
+    if (logging) {
+      consola.log(`End execute()`);
+    }
   }
 }
 
 async function executeOnce(overwriteDetails = {}) {
+  // eslint-disable-next-line max-len
   return Promise.all([fetchAndExecuteTests(overwriteDetails), fetchAndExecuteRequests(overwriteDetails)]).catch((e) => {
     if (global.settings.logging) {
       if (e.response) {