@sasjs/adapter 4.16.7 → 4.17.1

package/node/job-execution/WebJobExecutor.d.ts

@@ -13,5 +13,6 @@ export declare class WebJobExecutor extends BaseJobExecutor {
     private sasViyaApiClient;
     constructor(serverUrl: string, serverType: ServerType, jobsPath: string, requestClient: RequestClient, sasViyaApiClient: SASViyaApiClient);
     execute(sasJob: string, data: any, config: any, loginRequiredCallback?: any, authConfig?: AuthConfig, extraResponseAttributes?: ExtraResponseAttributes[]): Promise<unknown>;
+    protected getRequestParams(config: any): any;
     private getJobUri;
 }

package/node/request/RequestClient.d.ts

@@ -12,12 +12,15 @@ export declare class RequestClient implements HttpClient {
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
+    private isRecoveringFromNetworkError;
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number, verboseMode?: VerboseMode);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;
     clearCsrfTokens(): void;
     clearLocalStorageTokens(): void;
+    resetInMemoryAuthState(): void;
+    private clearAllCookies;
     getBaseUrl(): string;
     /**
      * this method returns all requests, an array of SASjsRequest type

package/node/request/Sas9RequestClient.d.ts

@@ -7,6 +7,7 @@ import { RequestClient } from './RequestClient';
  */
 export declare class Sas9RequestClient extends RequestClient {
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    resetInMemoryAuthState(): void;
     login(username: string, password: string, jobsPath: string): Promise<void>;
     get<T>(url: string, accessToken: string | undefined, contentType?: string, overrideHeaders?: {
         [key: string]: string | number;

package/node/types/SASjsConfig.d.ts

@@ -79,6 +79,14 @@ export declare class SASjsConfig {
      * may affect browser performance, especially with debug (logs) enabled.
      */
     requestHistoryLimit?: number;
+    /**
+     * Optional setting. When `true`, the request runs as a Viya execution task —
+     * appends `_executionTasks=true` to the request URL. Only applies to the Viya
+     * web jobs path, i.e. when `serverType === SASVIYA` AND
+     * `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
+     * is explicitly set to `true` or `false`.
+     */
+    runAsTask?: boolean;
 }
 export declare enum LoginMechanism {
     Default = "Default",

package/node/utils/index.d.ts

@@ -15,6 +15,7 @@ export * from './parseGeneratedCode';
 export * from './parseSasViyaLog';
 export * from './parseSourceCode';
 export * from './parseViyaDebugResponse';
+export * from './parseViyaLogDebugResponse';
 export * from './parseWeboutResponse';
 export * from './serialize';
 export * from './splitChunks';

package/node/utils/parseViyaLogDebugResponse.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+export declare const parseSasViyaLogDebugResponse: (response: any) => Promise<any>;

package/package.json

@@ -23,10 +23,24 @@
   },
   "release": {
     "plugins": [
-      "@semantic-release/npm",
-      {
-        "pkgRoot": "/build"
-      }
+      "@semantic-release/commit-analyzer",
+      "@semantic-release/release-notes-generator",
+      [
+        "@semantic-release/exec",
+        {
+          "prepareCmd": "npm version ${nextRelease.version} --no-git-tag-version"
+        }
+      ],
+      [
+        "@semantic-release/git",
+        {
+          "assets": [
+            "package.json",
+            "package-lock.json"
+          ]
+        }
+      ],
+      "@semantic-release/github"
     ]
   },
   "keywords": [
@@ -34,14 +48,16 @@
     "viya",
     "sasjs"
   ],
-  "author": "Allan Bowe <support@macropeople.com>",
+  "author": "support@4gl.io",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sasjs/adapter"
+    "url": "git+https://github.com/sasjs/adapter.git"
   },
   "license": "ISC",
   "devDependencies": {
     "@cypress/webpack-preprocessor": "5.9.1",
+    "@semantic-release/exec": "6.0.3",
+    "@semantic-release/git": "10.0.1",
     "@types/cors": "^2.8.17",
     "@types/express": "4.17.13",
     "@types/jest": "29.5.14",
@@ -79,9 +95,9 @@
     "@sasjs/utils": "^3.5.6",
     "axios": "1.16.0",
     "axios-cookiejar-support": "5.0.5",
-    "form-data": "4.0.4",
+    "form-data": "4.0.6",
     "https": "1.0.0",
     "tough-cookie": "4.1.3"
   },
-  "version": "4.16.7"
+  "version": "4.17.1"
 }

package/request/RequestClient.d.ts

@@ -12,12 +12,15 @@ export declare class RequestClient implements HttpClient {
     protected csrfToken: CsrfToken;
     protected fileUploadCsrfToken: CsrfToken | undefined;
     protected httpClient: AxiosInstance;
+    private isRecoveringFromNetworkError;
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions, requestsLimit?: number, verboseMode?: VerboseMode);
     setConfig(baseUrl: string, httpsAgentOptions?: https.AgentOptions): void;
     saveLocalStorageToken(accessToken: string, refreshToken: string): void;
     getCsrfToken(type?: 'general' | 'file'): CsrfToken | undefined;
     clearCsrfTokens(): void;
     clearLocalStorageTokens(): void;
+    resetInMemoryAuthState(): void;
+    private clearAllCookies;
     getBaseUrl(): string;
     /**
      * this method returns all requests, an array of SASjsRequest type

package/request/Sas9RequestClient.d.ts

@@ -7,6 +7,7 @@ import { RequestClient } from './RequestClient';
  */
 export declare class Sas9RequestClient extends RequestClient {
     constructor(baseUrl: string, httpsAgentOptions?: https.AgentOptions);
+    resetInMemoryAuthState(): void;
     login(username: string, password: string, jobsPath: string): Promise<void>;
     get<T>(url: string, accessToken: string | undefined, contentType?: string, overrideHeaders?: {
         [key: string]: string | number;

package/src/auth/AuthManager.ts

@@ -375,7 +375,7 @@ export class AuthManager {
    *
    */
   public async logOut() {
-    this.requestClient.clearCsrfTokens()
+    this.requestClient.resetInMemoryAuthState()
 
     return this.requestClient.get(this.logoutUrl, undefined).then(() => true)
   }

package/src/file/generateTableUploadForm.ts

@@ -11,6 +11,13 @@ export const generateTableUploadForm = (
   let tableCounter = 0
 
   for (const tableName in data) {
+    if (
+      isFormatsTable(tableName) &&
+      Object.keys(data).includes(tableName.replace(/^\$/, ''))
+    ) {
+      continue
+    }
+
     tableCounter++
 
     // Formats table should not be sent as part of 'sasjs_tables'

package/src/job-execution/JobExecutor.ts

@@ -55,7 +55,6 @@ export abstract class BaseJobExecutor implements JobExecutor {
     if (config.debug) {
       requestParams['_omittextlog'] = 'false'
       requestParams['_omitSessionResults'] = 'false'
-
       requestParams['_debug'] = 131
     }
 

package/src/job-execution/WebJobExecutor.ts

@@ -16,9 +16,11 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   isRelativePath,
   parseSasViyaDebugResponse,
+  parseSasViyaLogDebugResponse,
   appendExtraResponseAttributes,
   parseWeboutResponse,
-  getFormData
+  getFormData,
+  isNode
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 
@@ -101,6 +103,10 @@ export class WebJobExecutor extends BaseJobExecutor {
       apiUrl += config.contextName?.trim()
         ? `&_contextname=${encodeURIComponent(config.contextName)}`
         : ''
+
+      if (config.runAsTask === true) {
+        apiUrl += '&_executionTasks=true'
+      }
     }
 
     let requestParams = {
@@ -113,6 +119,26 @@ export class WebJobExecutor extends BaseJobExecutor {
      */
     let formData = getFormData()
 
+    // FIXME(viya - SAS Track CS0409737): remove when Viya stops rejecting empty multipart on
+    // _executionTasks=true. Dummy file keeps the body non-empty
+    const hasExecutionTasksFlag = config.runAsTask === true
+
+    // Move debug params to URL for viya; viya seems to honor them more
+    // reliably in the query string than the multipart body.
+    if (
+      hasExecutionTasksFlag &&
+      config.debug &&
+      config.serverType === ServerType.SasViya
+    ) {
+      const debugKeys = ['_debug', '_omitSessionResults']
+      debugKeys.forEach((key) => {
+        if (requestParams[key] !== undefined) {
+          apiUrl += `&${key}=${encodeURIComponent(requestParams[key])}`
+          delete requestParams[key]
+        }
+      })
+    }
+
     if (data) {
       const stringifiedData = JSON.stringify(data)
       if (
@@ -133,10 +159,21 @@ export class WebJobExecutor extends BaseJobExecutor {
             generateTableUploadForm(formData, data)
           formData = newFormData
           requestParams = { ...requestParams, ...params }
+
+          if (
+            config.serverType === ServerType.SasViya &&
+            hasExecutionTasksFlag
+          ) {
+            addDummyFile(formData)
+          }
         } catch (e: any) {
           return Promise.reject(new ErrorResponse(e?.message, e))
         }
       }
+    } else {
+      if (config.serverType === ServerType.SasViya && hasExecutionTasksFlag) {
+        addDummyFile(formData)
+      }
     }
 
     for (const key in requestParams) {
@@ -168,11 +205,14 @@ export class WebJobExecutor extends BaseJobExecutor {
           if (config.debug) {
             switch (this.serverType) {
               case ServerType.SasViya:
-                jsonResponse = await parseSasViyaDebugResponse(
-                  res.result,
-                  this.requestClient,
-                  this.serverUrl
-                )
+                jsonResponse =
+                  config.useComputeApi === null && config.runAsTask === true
+                    ? await parseSasViyaLogDebugResponse(res.result)
+                    : await parseSasViyaDebugResponse(
+                        res.result,
+                        this.requestClient,
+                        this.serverUrl
+                      )
                 break
               case ServerType.Sas9:
                 jsonResponse =
@@ -231,6 +271,23 @@ export class WebJobExecutor extends BaseJobExecutor {
     return requestPromise
   }
 
+  protected getRequestParams(config: any): any {
+    const requestParams = super.getRequestParams(config)
+
+    // FIXME(viya - possible issue with default debug flags)
+    // runAsTask on Viya: use _debug=128 (not 131) and omit _omittextlog
+    if (
+      config.debug &&
+      config.serverType === ServerType.SasViya &&
+      config.runAsTask === true
+    ) {
+      requestParams['_debug'] = 128
+      delete requestParams['_omittextlog']
+    }
+
+    return requestParams
+  }
+
   private async getJobUri(sasJob: string) {
     if (!this.sasViyaApiClient) return ''
     let uri = ''
@@ -263,3 +320,18 @@ export class WebJobExecutor extends BaseJobExecutor {
     return uri
   }
 }
+
+function addDummyFile(formData: NodeFormData | FormData) {
+  if (isNode()) {
+    ;(formData as NodeFormData).append('_sasjs_noop', '', {
+      filename: '_sasjs_noop.txt',
+      contentType: 'text/plain'
+    })
+  } else {
+    ;(formData as FormData).append(
+      '_sasjs_noop',
+      new Blob([''], { type: 'text/plain' }),
+      '_sasjs_noop.txt'
+    )
+  }
+}

package/src/request/RequestClient.ts

@@ -28,6 +28,9 @@ import {
 import { InvalidSASjsCsrfError } from '../types/errors/InvalidSASjsCsrfError'
 import { inspect } from 'util'
 
+const getLogger = () =>
+  (typeof process !== 'undefined' && process.logger) || console
+
 export class RequestClient implements HttpClient {
   private requests: SASjsRequest[] = []
   private requestsLimit: number = 10
@@ -37,6 +40,7 @@ export class RequestClient implements HttpClient {
   protected csrfToken: CsrfToken = { headerName: '', value: '' }
   protected fileUploadCsrfToken: CsrfToken | undefined
   protected httpClient!: AxiosInstance
+  private isRecoveringFromNetworkError = false
 
   constructor(
     protected baseUrl: string,
@@ -77,6 +81,25 @@ export class RequestClient implements HttpClient {
     localStorage.setItem('refreshToken', '')
   }
 
+  public resetInMemoryAuthState() {
+    this.clearCsrfTokens()
+    if (typeof localStorage !== 'undefined') {
+      this.clearLocalStorageTokens()
+    }
+    if (typeof document !== 'undefined') {
+      this.clearAllCookies()
+    }
+  }
+
+  private clearAllCookies() {
+    const cookies = document.cookie.split(';')
+    for (const cookie of cookies) {
+      const name = cookie.split('=')[0].trim()
+      if (!name) continue
+      document.cookie = `${name}=; Max-Age=0; Path=/;`
+    }
+  }
+
   public getBaseUrl() {
     return this.httpClient.defaults.baseURL || ''
   }
@@ -354,6 +377,7 @@ export class RequestClient implements HttpClient {
     const csrfTokenKey = Object.keys(params).find((k) =>
       k?.toLowerCase().includes('csrf')
     )
+
     if (csrfTokenKey) {
       this.csrfToken.value = params[csrfTokenKey]
       this.csrfToken.headerName = this.csrfToken.headerName || 'x-csrf-token'
@@ -378,7 +402,7 @@ export class RequestClient implements HttpClient {
       })
       .then((res) => res.data)
       .catch((error) => {
-        const logger = process.logger || console
+        const logger = getLogger()
         logger.error(error)
       })
   }
@@ -687,6 +711,45 @@ ${resHeaders}${parsedResBody ? `\n\n${parsedResBody}` : ''}
       throw new CertificateError(e.message)
     }
 
+    if (
+      e.isAxiosError &&
+      !response &&
+      e.code === 'ERR_NETWORK' &&
+      !this.isRecoveringFromNetworkError
+    ) {
+      // Opaque ERR_NETWORK usually means the server rejected stale credentials.
+      // Wipe in-memory auth state, re-establish session via GET /,
+      // then retry the original request.
+      this.resetInMemoryAuthState()
+      this.isRecoveringFromNetworkError = true
+      try {
+        // Re-establish session and CSRF cookie
+        const rootResponse = await this.httpClient
+          .get('/', { withXSRFToken: true })
+          .catch((err) => err.response)
+
+        if (rootResponse?.data) {
+          const cookie =
+            /<script>document.cookie = '(XSRF-TOKEN=.*; Max-Age=86400; SameSite=Strict; Path=\/;)'<\/script>/.exec(
+              rootResponse.data
+            )?.[1]
+
+          if (cookie && typeof document !== 'undefined') {
+            document.cookie = cookie
+          }
+
+          this.parseAndSetCsrfToken(rootResponse)
+        }
+
+        return await callback()
+      } catch {
+        // Session could not be recovered — surface LoginRequiredError
+        throw new LoginRequiredError()
+      } finally {
+        this.isRecoveringFromNetworkError = false
+      }
+    }
+
     if (e.message) throw e
     else throw prefixMessage(e, 'Error while handling error. ')
   }

package/src/request/Sas9RequestClient.ts

@@ -23,6 +23,13 @@ export class Sas9RequestClient extends RequestClient {
     }
   }
 
+  public resetInMemoryAuthState() {
+    super.resetInMemoryAuthState()
+    if (this.httpClient.defaults.jar) {
+      ;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookiesSync()
+    }
+  }
+
   public async login(username: string, password: string, jobsPath: string) {
     const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
     if (this.httpClient.defaults.jar) {

package/src/types/SASjsConfig.ts

@@ -79,6 +79,14 @@ export class SASjsConfig {
    * may affect browser performance, especially with debug (logs) enabled.
    */
   requestHistoryLimit?: number = 10
+  /**
+   * Optional setting. When `true`, the request runs as a Viya execution task —
+   * appends `_executionTasks=true` to the request URL. Only applies to the Viya
+   * web jobs path, i.e. when `serverType === SASVIYA` AND
+   * `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
+   * is explicitly set to `true` or `false`.
+   */
+  runAsTask?: boolean = false
 }
 
 export enum LoginMechanism {

package/src/utils/index.ts

@@ -15,6 +15,7 @@ export * from './parseGeneratedCode'
 export * from './parseSasViyaLog'
 export * from './parseSourceCode'
 export * from './parseViyaDebugResponse'
+export * from './parseViyaLogDebugResponse'
 export * from './parseWeboutResponse'
 export * from './serialize'
 export * from './splitChunks'

package/src/utils/parseViyaLogDebugResponse.ts

@@ -0,0 +1,32 @@
+import { getValidJson } from './getValidJson'
+import { parseWeboutResponse } from './parseWeboutResponse'
+
+/**
+ * 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.
+ */
+export const parseSasViyaLogDebugResponse = async (response: any) => {
+  // If upstream already parsed the response as JSON (object), pass through.
+  if (typeof response !== 'string') {
+    return response
+  }
+
+  const blobMatch = response.match(
+    /new Blob\(\[`([\s\S]*?)`\],\s*\{type:\s*'(?:application\/json|text\/plain)'\}\)/
+  )
+  if (!blobMatch) {
+    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)
+}

package/types/SASjsConfig.d.ts

@@ -79,6 +79,14 @@ export declare class SASjsConfig {
      * may affect browser performance, especially with debug (logs) enabled.
      */
     requestHistoryLimit?: number;
+    /**
+     * Optional setting. When `true`, the request runs as a Viya execution task —
+     * appends `_executionTasks=true` to the request URL. Only applies to the Viya
+     * web jobs path, i.e. when `serverType === SASVIYA` AND
+     * `useComputeApi` is `null`/`undefined`. Has no effect when `useComputeApi`
+     * is explicitly set to `true` or `false`.
+     */
+    runAsTask?: boolean;
 }
 export declare enum LoginMechanism {
     Default = "Default",

package/utils/index.d.ts

@@ -15,6 +15,7 @@ export * from './parseGeneratedCode';
 export * from './parseSasViyaLog';
 export * from './parseSourceCode';
 export * from './parseViyaDebugResponse';
+export * from './parseViyaLogDebugResponse';
 export * from './parseWeboutResponse';
 export * from './serialize';
 export * from './splitChunks';

package/utils/parseViyaLogDebugResponse.d.ts

@@ -0,0 +1,10 @@
+/**
+ * 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.
+ */
+export declare const parseSasViyaLogDebugResponse: (response: any) => Promise<any>;

package/utils/spec/parseViyaLogDebugResponse.spec.d.ts

@@ -0,0 +1 @@
+export {};