Merge pull request #43 from sasjs/parse-compute-log

fix(log): use compute log directly when available

CONTRIBUTING.md

@@ -70,6 +70,14 @@ parmcards4;
   %webout(CLOSE)
 ;;;;
 %mp_createwebservice(path=/Public/app/common,name=sendArr)
+filename ft15f001 temp;
+parmcards4;
+If you can keep your head when all about you   
+    Are losing theirs and blaming it on you,   
+If you can trust yourself when all men doubt you,
+    But make allowance for their doubting too; 
+;;;;
+%mp_createwebservice(path=/Public/app/common,name=makeErr)
 ```
 
 The above services will return anything you send. To run the tests simply launch `npm run cypress`.

package-lock.json

@@ -1648,9 +1648,9 @@
       }
     },
     "@types/jest": {
-      "version": "26.0.9",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.9.tgz",
-      "integrity": "sha512-k4qFfJ5AUKrWok5KYXp2EPm89b0P/KZpl7Vg4XuOTVVQEhLDBDBU3iBFrjjdgd8fLw96aAtmnwhXHl63bWeBQQ==",
+      "version": "26.0.10",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.10.tgz",
+      "integrity": "sha512-i2m0oyh8w/Lum7wWK/YOZJakYF8Mx08UaKA1CtbmFeDquVhAEdA7znacsVSf2hJ1OQ/OfVMGN90pw/AtzF8s/Q==",
       "dev": true,
       "requires": {
         "jest-diff": "^25.2.1",

package.json

@@ -37,7 +37,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.9",
+    "@types/jest": "^26.0.10",
     "cp": "^0.2.0",
     "jest": "^25.5.4",
     "path": "^0.12.7",

sasjs-tests/package-lock.json

@@ -1357,9 +1357,9 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
     },
     "@sasjs/adapter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.2.0.tgz",
-      "integrity": "sha512-PcQcmb7TsfPJ94tzFnvycm+tMYD3wKx2a6niwHfsV9+g6XHtmwReVV3EPZZ5XB4s565vU6Qc+ZnFbMIAeik8QA==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.3.6.tgz",
+      "integrity": "sha512-d2B+cTII+vabKCU8mJy90mEz3tCWw2pEp4qIBGsDamJiTS0Rx69dgXGHuRUm8KtjLDHHrzwXATsqviU3dnU0QQ==",
       "requires": {
         "es6-promise": "^4.2.8",
         "form-data": "^3.0.0",
@@ -1379,9 +1379,9 @@
       }
     },
     "@sasjs/test-framework": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.3.tgz",
-      "integrity": "sha512-Ou4UXlxBAVR8jv7boVvJ/eKLHRTQvDi9LouPAasLCO2EC4AD0wX1hLMwVhmydCvsdgVEeXs6InvX3ROHiKSADg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.4.0.tgz",
+      "integrity": "sha512-Pd8PUH5B5RO6q4w3OQXX7aWicvA/CJMXA/FCf2xp332ZTKBb/5uV+HphAOFKpCh58y+ykYYVSV0ZaDO/4t1h3A==",
       "requires": {
         "@types/react-highlight.js": "^1.0.0",
         "immer": "^7.0.7",
@@ -12234,9 +12234,9 @@
       }
     },
     "semantic-ui-react": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.1.1.tgz",
-      "integrity": "sha512-QtzLNkK4MUe1HQo4S7/tIkSp4NFtxSGDzTMKxmvztMJ6jt+nKGmMyjpyxJsrm3ohU8Z3sTyBUyiBsDYW4jNtjw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.2.0.tgz",
+      "integrity": "sha512-9tNL94nEy16RdupTQNiURyemWUIxtTpQgFimCbOOHRBOe1ApsFz3FWFsrGjv9zFtE7dQMslLYov9BQOelTCVwA==",
       "requires": {
         "@babel/runtime": "^7.10.5",
         "@semantic-ui-react/event-stack": "^3.1.0",
@@ -12260,9 +12260,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+          "version": "4.17.20",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
+          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
         }
       }
     },

sasjs-tests/package.json

@@ -4,8 +4,8 @@
   "homepage": ".",
   "private": true,
   "dependencies": {
-    "@sasjs/adapter": "^1.2.0",
-    "@sasjs/test-framework": "^1.3.3",
+    "@sasjs/adapter": "^1.3.6",
+    "@sasjs/test-framework": "^1.4.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.5.0",
     "@testing-library/user-event": "^7.2.1",

sasjs-tests/src/testSuites/SasjsRequests.ts

@@ -21,5 +21,26 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
         }
       },
     },
+    {
+      title: "Make error and capture log",
+      description: "Should make an error and capture log",
+      test: async () => {
+        return new Promise( async (resolve, reject) => {
+          adapter.request("common/makeErr", data)
+          .then((res) => {
+            //no action here, this request must throw error
+          })
+          .catch((err) => {
+            let sasRequests = adapter.getSasRequests();
+            let makeErrRequest = sasRequests.find(req => req.serviceLink.includes('makeErr')) || null;
+
+            resolve(!!makeErrRequest);
+          })
+        })
+      },
+      assertion: (response) => {
+        return response;
+      },
+    },
   ],
 });

src/FileUploader.ts

@@ -9,7 +9,8 @@ export class FileUploader {
     private appLoc: string,
     private serverUrl: string,
     private jobsPath: string,
-    private csrfToken: CsrfToken | null = null
+    private setCsrfTokenWeb: any,
+    private csrfToken: CsrfToken | null = null,
   ) {}
   private retryCount = 0;
 
@@ -61,6 +62,8 @@ export class FileUploader {
                   headerName: tokenHeader,
                   value: token || "",
                 };
+
+                this.setCsrfTokenWeb(this.csrfToken);
               }
             }
           }

src/SASViyaApiClient.ts

@@ -303,22 +303,8 @@ export class SASViyaApiClient {
 
     let jobResult, log;
 
-    if (jobStatus === "failed" || jobStatus === "error") {
-      return Promise.reject(currentJob.error);
-    }
-    const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`;
     const logLink = currentJob.links.find((l) => l.rel === "log");
 
-    if (resultLink) {
-      jobResult = await this.request<any>(
-        `${this.serverUrl}${resultLink}`,
-        { headers },
-        "text"
-      ).catch((e) => ({
-        result: JSON.stringify(e),
-      }));
-    }
-
     if (true && logLink) {
       log = await this.request<any>(
         `${this.serverUrl}${logLink.href}/content?limit=10000`,
@@ -328,6 +314,21 @@ export class SASViyaApiClient {
       ).then((res: any) => res.result.items.map((i: any) => i.line).join("\n"));
     }
 
+    if (jobStatus === "failed" || jobStatus === "error") {
+      return Promise.reject({error: currentJob.error, log: log});
+    }
+    const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`;
+    
+    if (resultLink) {
+      jobResult = await this.request<any>(
+        `${this.serverUrl}${resultLink}`,
+        { headers },
+        "text"
+      ).catch((e) => ({
+        result: JSON.stringify(e),
+      }));
+    }
+
     await this.sessionManager.clearSession(executionSessionId, accessToken);
 
     return { result: jobResult?.result, log };

src/SASjs.ts

@@ -2,7 +2,9 @@ import { isIEorEdgeOrOldFirefox } from "./utils/isIeOrEdge";
 import * as e6p from "es6-promise";
 (e6p as any).polyfill();
 if (isIEorEdgeOrOldFirefox()) {
-  window.fetch = undefined as any; // ensure the polyfill runs
+  if (window) {
+    window.fetch = undefined as any; // ensure the polyfill runs
+  }
 }
 // tslint:disable-next-line
 require("isomorphic-fetch");
@@ -397,8 +399,10 @@ export default class SASjs {
         this.sasjsConfig.appLoc,
         this.sasjsConfig.serverUrl,
         this.jobsPath,
+        this.setCsrfTokenWeb,
         this.csrfTokenWeb
       );
+      
     return fileUploader.uploadFile(sasJob, files, params);
   }
 
@@ -575,8 +579,10 @@ export default class SASjs {
 
             resolve(responseJson);
           })
-          .catch(async (e) => {
-            if (needsRetry(JSON.stringify(e))) {
+          .catch(async (response) => {
+            let error = response.error || response;
+            
+            if (needsRetry(JSON.stringify(error))) {
               if (this.retryCountComputeApi < requestRetryLimit) {
                 let retryResponse = await this.executeJobViaComputeApi(
                   sasJob,
@@ -595,15 +601,17 @@ export default class SASjs {
               }
             }
 
-            if (e && e.status === 401) {
+            if (error && error.status === 401) {
               if (loginRequiredCallback) loginRequiredCallback(true);
               sasjsWaitingRequest.requestPromise.resolve = resolve;
               sasjsWaitingRequest.requestPromise.reject = reject;
               sasjsWaitingRequest.config = config;
               this.sasjsWaitingRequests.push(sasjsWaitingRequest);
             } else {
-              reject({ MESSAGE: e || "Job execution failed" });
+              reject({ MESSAGE: error || "Job execution failed" });
             }
+
+            this.appendSasjsRequest(response.log, sasJob, null);
           });
       }
     );
@@ -909,6 +917,10 @@ export default class SASjs {
 
     return sasjsWaitingRequest.requestPromise.promise;
   }
+  
+  private setCsrfTokenWeb = (csrfToken: CsrfToken) => {
+    this.csrfTokenWeb = csrfToken;
+  };
 
   private setCsrfTokenApi = (csrfToken: CsrfToken) => {
     this.csrfTokenApi = csrfToken;
@@ -1059,7 +1071,11 @@ export default class SASjs {
       generatedCode = parseGeneratedCode(response.log);
 
       if (this.sasjsConfig.debug) {
-        sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK;
+        if (response.log) {
+          sasWork = response.log;
+        } else {
+          sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK;
+        }
       } else {
         sasWork = JSON.parse(response.result).WORK;
       }
@@ -1175,7 +1191,8 @@ export default class SASjs {
     this.fileUploader = new FileUploader(
       this.sasjsConfig.appLoc,
       this.sasjsConfig.serverUrl,
-      this.jobsPath
+      this.jobsPath,
+      this.setCsrfTokenWeb
     );
   }
 

src/utils/isIeOrEdge.ts

@@ -1,4 +1,7 @@
 export function isIEorEdgeOrOldFirefox() {
+  if (typeof window === "undefined") {
+    return false;
+  }
   const ua = window.navigator.userAgent;
 
   if (ua.indexOf("Firefox") > 0) {