@sasjs/adapter 4.19.0 → 4.19.1

package/node/request/RequestClient.d.ts

@@ -104,7 +104,7 @@ export declare class RequestClient implements HttpClient {
      * @param successCallBack - function that should be triggered on every HTTP response with the status 2**.
      * @param errorCallBack - function that should be triggered on every HTTP response with the status different from 2**.
      */
-    enableVerboseMode: (successCallBack?: (response: AxiosResponse) => AxiosResponse<any, any, {}>, errorCallBack?: (error: AxiosError) => AxiosError<unknown, any>) => void;
+    enableVerboseMode: (successCallBack?: (response: AxiosResponse) => AxiosResponse<any, any, {}, any>, errorCallBack?: (error: AxiosError) => AxiosError<unknown, any, any>) => void;
     /**
      * Turns off verbose mode to log every HTTP response.
      */

package/node/utils/extractWeboutBlob.d.ts

@@ -0,0 +1,13 @@
+/**
+ * True when the response inlines the webout in a script-constructed Blob,
+ * which is the shape the compute task debug path returns. The iframe file URL
+ * path does not, so callers use this to pick the matching parser.
+ */
+export declare const hasWeboutBlob: (response: string) => boolean;
+/**
+ * Extracts and parses the webout JSON from a JES web app debug response that
+ * inlines it via a script-constructed Blob - see blobPattern for the shapes
+ * handled. Returns null (rather than throwing) if no such blob is present, so
+ * callers can fall back to another extraction strategy first.
+ */
+export declare const extractWeboutBlob: (response: string) => object | null;

package/node/utils/index.d.ts

@@ -4,6 +4,7 @@ export * from './compareTimestamps';
 export * from './convertToCsv';
 export * from './createAxiosInstance';
 export * from './delay';
+export * from './extractWeboutBlob';
 export * from './fetchLogByChunks';
 export * from './getValidJson';
 export * from './isNode';

package/node/utils/parseViyaLogDebugResponse.d.ts

@@ -1,10 +1,8 @@
 /**
  * When querying a Viya job using the Web approach with _DEBUG=128 (used when
- * runAsTask is true), the webout JSON is inlined into the response via:
- *   var blob = new Blob([`{...}`], {type: 'application/json'});
- * On abort/error paths the same shape is used but with text/plain and
- * weboutBEGIN/END markers around the JSON:
- *   var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
- * No follow-up request is needed — extract and parse the JSON directly.
+ * runAsTask is true), the webout JSON is inlined into the response via a
+ * script-constructed Blob - see extractWeboutBlob for the exact shapes
+ * handled. No follow-up request is needed — extract and parse the JSON
+ * directly.
  */
 export declare const parseSasViyaLogDebugResponse: (response: any) => Promise<any>;

package/package.json

@@ -93,11 +93,11 @@
   "main": "index.js",
   "dependencies": {
     "@sasjs/utils": "^3.6.0",
-    "axios": "1.18.1",
+    "axios": "1.20.0",
     "axios-cookiejar-support": "5.0.5",
     "form-data": "4.0.6",
     "https": "1.0.0",
     "tough-cookie": "4.1.3"
   },
-  "version": "4.19.0"
+  "version": "4.19.1"
 }

package/request/RequestClient.d.ts

@@ -104,7 +104,7 @@ export declare class RequestClient implements HttpClient {
      * @param successCallBack - function that should be triggered on every HTTP response with the status 2**.
      * @param errorCallBack - function that should be triggered on every HTTP response with the status different from 2**.
      */
-    enableVerboseMode: (successCallBack?: (response: AxiosResponse) => AxiosResponse<any, any, {}>, errorCallBack?: (error: AxiosError) => AxiosError<unknown, any>) => void;
+    enableVerboseMode: (successCallBack?: (response: AxiosResponse) => AxiosResponse<any, any, {}, any>, errorCallBack?: (error: AxiosError) => AxiosError<unknown, any, any>) => void;
     /**
      * Turns off verbose mode to log every HTTP response.
      */

package/src/job-execution/WebJobExecutor.ts

@@ -20,6 +20,7 @@ import {
   appendExtraResponseAttributes,
   parseWeboutResponse,
   getFormData,
+  hasWeboutBlob,
   isNode
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
@@ -59,7 +60,7 @@ export class WebJobExecutor extends BaseJobExecutor {
     if (config.serverType === ServerType.SasViya) {
       let jobUri
       try {
-        jobUri = await this.getJobUri(sasJob)
+        jobUri = await this.getJobUri(program)
       } catch (e: any) {
         return new Promise(async (resolve, reject) => {
           if (e instanceof LoginRequiredError) {
@@ -88,8 +89,6 @@ export class WebJobExecutor extends BaseJobExecutor {
         })
       }
 
-      apiUrl += jobUri.length > 0 ? '&_job=' + jobUri : ''
-
       if (jobUri.length > 0) {
         apiUrl += '&_job=' + jobUri
         /**
@@ -205,8 +204,17 @@ export class WebJobExecutor extends BaseJobExecutor {
           if (config.debug) {
             switch (this.serverType) {
               case ServerType.SasViya:
+                // Route on the shape of the response itself. The JES web app
+                // returns the webout inline in a script-constructed Blob when
+                // it runs the job as a compute task, and as an iframe file URL
+                // otherwise - but the _debug value sent does not determine
+                // which: a _debug=128 request without _EXECUTIONTASKS gets the
+                // iframe form back. A result that is already an object has
+                // been parsed upstream, and parseSasViyaDebugResponse also
+                // falls back to blob extraction, so either parser copes with
+                // a response that mixes the two.
                 jsonResponse =
-                  config.useComputeApi === null && config.runAsTask === true
+                  typeof res.result !== 'string' || hasWeboutBlob(res.result)
                     ? await parseSasViyaLogDebugResponse(res.result)
                     : await parseSasViyaDebugResponse(
                         res.result,
@@ -292,17 +300,13 @@ export class WebJobExecutor extends BaseJobExecutor {
     if (!this.sasViyaApiClient) return ''
     let uri = ''
 
-    let folderPath
-    let jobName: string
-    if (isRelativePath(sasJob)) {
-      const folderPathParts = sasJob.split('/')
-      folderPath = folderPathParts.length > 1 ? folderPathParts[0] : ''
-      jobName = folderPathParts.length > 1 ? folderPathParts[1] : ''
-    } else {
-      const folderPathParts = sasJob.split('/')
-      jobName = folderPathParts.pop() || ''
-      folderPath = folderPathParts.join('/')
-    }
+    // sasJob arrives with the appLoc already applied, so the folder is
+    // everything before the last segment. Reading the first two segments only
+    // would look up folder 'services' and job 'common' for a job like
+    // services/common/configure.
+    const folderPathParts = sasJob.split('/')
+    const jobName = folderPathParts.pop() || ''
+    const folderPath = folderPathParts.join('/')
 
     if (!jobName) {
       throw new Error('Job name is empty, null or undefined.')

package/src/utils/extractWeboutBlob.ts

@@ -0,0 +1,36 @@
+import { getValidJson } from './getValidJson'
+import { parseWeboutResponse } from './parseWeboutResponse'
+
+// Matches the script-constructed Blob that the JES web app uses to inline the
+// webout: `new Blob([`{...}`], {type: 'application/json'})`. The type is
+// text/plain on abort and error paths, where the JSON is wrapped in
+// weboutBEGIN/END markers. Quote style and whitespace vary between Viya
+// releases, so both are tolerated here rather than in a second pattern.
+const blobPattern =
+  /new Blob\(\[`([\s\S]*?)`\],\s*\{\s*type:\s*['"](?:application\/json|text\/plain)['"]\s*\}/
+
+/**
+ * True when the response inlines the webout in a script-constructed Blob,
+ * which is the shape the compute task debug path returns. The iframe file URL
+ * path does not, so callers use this to pick the matching parser.
+ */
+export const hasWeboutBlob = (response: string): boolean =>
+  blobPattern.test(response)
+
+/**
+ * Extracts and parses the webout JSON from a JES web app debug response that
+ * inlines it via a script-constructed Blob - see blobPattern for the shapes
+ * handled. Returns null (rather than throwing) if no such blob is present, so
+ * callers can fall back to another extraction strategy first.
+ */
+export const extractWeboutBlob = (response: string): object | null => {
+  const blobMatch = response.match(blobPattern)
+  if (!blobMatch) return null
+
+  const blobContent = blobMatch[1]
+  const stripped = blobContent.includes('>>weboutBEGIN<<')
+    ? parseWeboutResponse(blobContent)
+    : blobContent
+
+  return getValidJson(stripped)
+}

package/src/utils/index.ts

@@ -4,6 +4,7 @@ export * from './compareTimestamps'
 export * from './convertToCsv'
 export * from './createAxiosInstance'
 export * from './delay'
+export * from './extractWeboutBlob'
 export * from './fetchLogByChunks'
 export * from './getValidJson'
 export * from './isNode'

package/src/utils/parseViyaDebugResponse.ts

@@ -1,5 +1,6 @@
 import { RequestClient } from '../request/RequestClient'
 import { getValidJson } from '../utils'
+import { extractWeboutBlob } from './extractWeboutBlob'
 
 /**
  * When querying a Viya job using the Web approach (as opposed to using the APIs) with _DEBUG enabled,
@@ -25,11 +26,21 @@ export const parseSasViyaDebugResponse = async (
   const jsonUrl = iframeStart
     ? iframeStart.split(/"><\/iframe>|><\/iframe>/)[0]
     : null
-  if (!jsonUrl) {
-    throw new Error('Unable to find webout file URL.')
+
+  if (jsonUrl) {
+    return requestClient
+      .get(serverUrl + jsonUrl, undefined, 'text/plain')
+      .then((res: any) => getValidJson(res.result))
   }
 
-  return requestClient
-    .get(serverUrl + jsonUrl, undefined, 'text/plain')
-    .then((res: any) => getValidJson(res.result))
+  // Fallback: some Viya configurations inline the webout via a
+  // script-constructed Blob instead of an iframe src URL, e.g. when the
+  // _debug=128 format is served on a path expecting the older _debug=131
+  // iframe-URL format.
+  const blobResult = extractWeboutBlob(response)
+  if (blobResult !== null) return blobResult
+
+  throw new Error(
+    'Unable to find webout content - no iframe URL and no inline blob.'
+  )
 }

package/src/utils/parseViyaLogDebugResponse.ts

@@ -1,14 +1,11 @@
-import { getValidJson } from './getValidJson'
-import { parseWeboutResponse } from './parseWeboutResponse'
+import { extractWeboutBlob } from './extractWeboutBlob'
 
 /**
  * When querying a Viya job using the Web approach with _DEBUG=128 (used when
- * runAsTask is true), the webout JSON is inlined into the response via:
- *   var blob = new Blob([`{...}`], {type: 'application/json'});
- * On abort/error paths the same shape is used but with text/plain and
- * weboutBEGIN/END markers around the JSON:
- *   var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
- * No follow-up request is needed — extract and parse the JSON directly.
+ * runAsTask is true), the webout JSON is inlined into the response via a
+ * script-constructed Blob - see extractWeboutBlob for the exact shapes
+ * handled. No follow-up request is needed — extract and parse the JSON
+ * directly.
  */
 export const parseSasViyaLogDebugResponse = async (response: any) => {
   // If upstream already parsed the response as JSON (object), pass through.
@@ -16,17 +13,10 @@ export const parseSasViyaLogDebugResponse = async (response: any) => {
     return response
   }
 
-  const blobMatch = response.match(
-    /new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
-  )
-  if (!blobMatch) {
+  const result = extractWeboutBlob(response)
+  if (result === null) {
     throw new Error('Unable to find webout blob in debug log response.')
   }
 
-  const blobContent = blobMatch[1]
-  const stripped = blobContent.includes('>>weboutBEGIN<<')
-    ? parseWeboutResponse(blobContent)
-    : blobContent
-
-  return getValidJson(stripped)
+  return result
 }

package/utils/extractWeboutBlob.d.ts

@@ -0,0 +1,13 @@
+/**
+ * True when the response inlines the webout in a script-constructed Blob,
+ * which is the shape the compute task debug path returns. The iframe file URL
+ * path does not, so callers use this to pick the matching parser.
+ */
+export declare const hasWeboutBlob: (response: string) => boolean;
+/**
+ * Extracts and parses the webout JSON from a JES web app debug response that
+ * inlines it via a script-constructed Blob - see blobPattern for the shapes
+ * handled. Returns null (rather than throwing) if no such blob is present, so
+ * callers can fall back to another extraction strategy first.
+ */
+export declare const extractWeboutBlob: (response: string) => object | null;

package/utils/index.d.ts

@@ -4,6 +4,7 @@ export * from './compareTimestamps';
 export * from './convertToCsv';
 export * from './createAxiosInstance';
 export * from './delay';
+export * from './extractWeboutBlob';
 export * from './fetchLogByChunks';
 export * from './getValidJson';
 export * from './isNode';

package/utils/parseViyaLogDebugResponse.d.ts

@@ -1,10 +1,8 @@
 /**
  * When querying a Viya job using the Web approach with _DEBUG=128 (used when
- * runAsTask is true), the webout JSON is inlined into the response via:
- *   var blob = new Blob([`{...}`], {type: 'application/json'});
- * On abort/error paths the same shape is used but with text/plain and
- * weboutBEGIN/END markers around the JSON:
- *   var blob = new Blob([`>>weboutBEGIN<<\n{...}\n>>weboutEND<<\n`], {type: 'text/plain'});
- * No follow-up request is needed — extract and parse the JSON directly.
+ * runAsTask is true), the webout JSON is inlined into the response via a
+ * script-constructed Blob - see extractWeboutBlob for the exact shapes
+ * handled. No follow-up request is needed — extract and parse the JSON
+ * directly.
  */
 export declare const parseSasViyaLogDebugResponse: (response: any) => Promise<any>;