From b09f3cd8cd63131b4563e046cc129371e60fcff7 Mon Sep 17 00:00:00 2001
From: gitcommitshow <pradeep@gitcommit.show>
Date: Wed, 20 Dec 2023 14:29:14 +0530
Subject: [PATCH] fix: increase wait time for requests

---
 ENV_SAMPLE |  3 ++-
 network.js | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ENV_SAMPLE b/ENV_SAMPLE
index df41ecb..d81e635 100644
--- a/ENV_SAMPLE
+++ b/ENV_SAMPLE
@@ -1,4 +1,5 @@
 REPO_OWNER="Git-Commit-Show"
 GITHUB_PERSONAL_TOKEN="ghp_adsfdsf32sdfasdfcdcsdfsdf23sfasdf1"
 APERTURE_SERVICE_ADDRESS="my.app.fluxninja.com:443"
-APERTURE_API_KEY="4dsfs323db7dsfsde310ca6dsdf12sfr4"
\ No newline at end of file
+APERTURE_API_KEY="4dsfs323db7dsfsde310ca6dsdf12sfr4"
+MAX_RATE_LIMIT_WAIT_DURATION_MS=60000
\ No newline at end of file
diff --git a/network.js b/network.js
index da4fbba..003aec6 100644
--- a/network.js
+++ b/network.js
@@ -1,6 +1,7 @@
 import * as https from 'https';
-import { ApertureClient } from "@fluxninja/aperture-js";
+import { ApertureClient, FlowStatus } from "@fluxninja/aperture-js";
 
+const MAX_RATE_LIMIT_WAIT_DURATION_MS = process.env.MAX_RATE_LIMIT_WAIT_DURATION_MS || 60000; // 10 mins
 
 var apertureClient;
 
@@ -47,7 +48,9 @@ export async function makeRequest(method, url, requestOptions) {
             // Handle HTTP response stream
             let data = '';
             res.on('data', chunk => data += chunk);
-            res.on('end', () => resolve({ res, data }));
+            res.on('end', function(){
+              resolve({ res, data })
+          });
         });
 
         req.on('error', error => {
@@ -92,17 +95,18 @@ export async function makeRequest(method, url, requestOptions) {
  * }
  * */
 export async function makeRequestWithRateLimit(method, url, options){
+  if(!method) method = "GET";
   let flow;
   try {
     flow = await getApertureClient().startFlow("external-api", {
       labels: {
         url: url,
         priority: 1,
-        tokens: 1,
+        tokens: ["POST", "PUT", "DELETE", "PATCH"].includes(method.toUpperCase()) ? 5 : 1,
         workload: 'api.github'
       },
       grpcCallOptions: {
-        deadline: Date.now() + 300, // ms
+        deadline: Date.now() + MAX_RATE_LIMIT_WAIT_DURATION_MS, // ms
       },
     });
   } catch(err){
@@ -116,7 +120,7 @@ export async function makeRequestWithRateLimit(method, url, options){
       // Add business logic to process incoming request
       console.log("Request accepted. Processing...");
       // Wait for 500ms
-      await new Promise(resolve => setTimeout(resolve, 2000));
+      await new Promise(resolve => setTimeout(resolve, 500));
       const {res, data} = await makeRequest(...arguments)
       return { res, data}
     } else {