Merge pull request #29 from sasjs/deployFixing

fix: makeRequest retry, getFolderUri error catching

package-lock.json

@@ -1648,9 +1648,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.5",
+      "version": "26.0.8",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.8.tgz",
-      "integrity": "sha512-heU+7w8snfwfjtcj2H458aTx3m5unIToOJhx75ebHilBiiQ39OIdA18WkG4LP08YKeAoWAGvWg8s+22w/PeJ6w==",
+      "integrity": "sha512-eo3VX9jGASSuv680D4VQ89UmuLZneNxv2MCZjfwlInav05zXVJTzfc//lavdV0GPwSxsXJTy2jALscB7Acqg0g==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",
@@ -14874,9 +14874,9 @@
       }
     },
     "ts-loader": {
-      "version": "8.0.1",
+      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.2.tgz",
-      "integrity": "sha512-I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ==",
+      "integrity": "sha512-oYT7wOTUawYXQ8XIDsRhziyW0KUEV38jISYlE+9adP6tDtG+O5GkRe4QKQXrHVH4mJJ88DysvEtvGP65wMLlhg==",
       "dev": true,
       "requires": {
         "chalk": "^2.3.0",
@@ -14901,9 +14901,9 @@
       "dev": true
     },
     "tslint": {
-      "version": "6.1.2",
+      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
-      "integrity": "sha512-UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA==",
+      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -14917,24 +14917,15 @@
         "mkdirp": "^0.5.3",
         "resolve": "^1.3.2",
         "semver": "^5.3.0",
-        "tslib": "^1.10.0",
+        "tslib": "^1.13.0",
         "tsutils": "^2.29.0"
       },
       "dependencies": {
-        "minimist": {
+        "tslib": {
-          "version": "1.2.5",
+          "version": "1.13.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
           "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
         }
       }
     },

package.json

@@ -37,7 +37,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.5",
+    "@types/jest": "^26.0.8",
     "cp": "^0.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",
@@ -45,8 +45,8 @@
     "rimraf": "^3.0.2",
     "semantic-release": "^17.1.1",
     "ts-jest": "^25.5.1",
-    "ts-loader": "^8.0.1",
+    "ts-loader": "^8.0.2",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",
     "typedoc": "^0.17.8",
     "typedoc-neo-theme": "^1.0.9",

src/SASViyaApiClient.ts

@@ -1018,7 +1018,10 @@ export class SASViyaApiClient {
     const { result: folder } = await this.request<Folder>(
       `${this.serverUrl}${url}`,
       requestInfo
-    );
+    ).catch((err) => {
+      return {result: null};
+    })
+    
     if (!folder) return undefined;
     return `/folders/folders/${folder.id}`;
   }

src/utils/makeRequest.ts

@@ -1,4 +1,8 @@
 import { CsrfToken } from "../types";
+import { needsRetry } from "./needsRetry";
+
+let retryCount: number = 0;
+let retryLimit: number = 5;
 
 export async function makeRequest<T>(
   url: string,
@@ -6,6 +10,8 @@ export async function makeRequest<T>(
   callback: (value: CsrfToken) => any,
   contentType: "text" | "json" = "json"
 ): Promise<{ result: T; etag: string | null }> {
+  let retryRequest: any = null;
+
   const responseTransform =
     contentType === "json"
       ? (res: Response) => res.json()
@@ -23,7 +29,7 @@ export async function makeRequest<T>(
             value: token || "",
           });
 
-          const retryRequest = {
+          retryRequest = {
             ...request,
             headers: { ...request.headers, [tokenHeader]: token },
           };
@@ -37,12 +43,35 @@ export async function makeRequest<T>(
         return Promise.reject({ status: response.status, body });
       }
     } else {
-      if (response.redirected && response.url.includes("SASLogon/login")) {
+      const responseTransformed = responseTransform(response);
-        const body = await response.text();
+      let responseText = '';
-        return Promise.reject({ status: 401, body });
+
+      if (typeof responseTransformed === 'string') {
+        responseText = responseTransformed;
+      } else {
+        responseText = JSON.stringify(responseTransformed);
       }
+
+      if (response.redirected && response.url.includes("SASLogon/login")) {
+        return Promise.reject({ status: 401, responseTransformed });
+      }
+      
+      if (needsRetry(responseText)) {
+        if (retryCount < retryLimit) {
+          retryCount++;
+          let retryResponse =  await makeRequest(url, retryRequest || request, callback, contentType);
+          retryCount = 0;
+
+          return retryResponse;
+        } else {
+          retryCount = 0;
+          
+          throw new Error('Request retry limit exceeded');
+        }
+      }
+
       etag = response.headers.get("ETag");
-      return responseTransform(response);
+      return responseTransformed;
     }
   });
   return { result, etag };