Merge branch 'master' into issue-381

src/SASViyaApiClient.ts

@@ -412,7 +412,22 @@ export class SASViyaApiClient {
         etag,
         accessToken,
         pollOptions
-      ).catch((err) => {
+      ).catch(async (err) => {
+        const error = err?.response?.data
+        const result = /err=[0-9]*,/.exec(error)
+
+        const errorCode = '5113'
+        if (result?.[0]?.slice(4, -1) === errorCode) {
+          const sessionLogUrl =
+            postedJob.links.find((l: any) => l.rel === 'up')!.href + '/log'
+          const logCount = 1000000
+          err.log = await fetchLogByChunks(
+            this.requestClient,
+            accessToken!,
+            sessionLogUrl,
+            logCount
+          )
+        }
         throw prefixMessage(err, 'Error while polling job status. ')
       })
 
@@ -1063,6 +1078,7 @@ export class SASViyaApiClient {
   ) {
     let POLL_INTERVAL = 300
     let MAX_POLL_COUNT = 1000
+    let MAX_ERROR_COUNT = 5
 
     if (pollOptions) {
       POLL_INTERVAL = pollOptions.POLL_INTERVAL || POLL_INTERVAL
@@ -1071,6 +1087,7 @@ export class SASViyaApiClient {
 
     let postedJobState = ''
     let pollCount = 0
+    let errorCount = 0
     const headers: any = {
       'Content-Type': 'application/json',
       'If-None-Match': etag
@@ -1085,14 +1102,18 @@ export class SASViyaApiClient {
 
     const { result: state } = await this.requestClient
       .get<string>(
-        `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+        `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
         accessToken,
         'text/plain',
         {},
         this.debug
       )
       .catch((err) => {
-        throw prefixMessage(err, 'Error while getting job state. ')
+        console.error(
+          `Error fetching job state from ${this.serverUrl}${stateLink.href}. Starting poll, assuming job to be running.`,
+          err
+        )
+        return { result: 'unavailable' }
       })
 
     const currentState = state.trim()
@@ -1107,25 +1128,40 @@ export class SASViyaApiClient {
         if (
           postedJobState === 'running' ||
           postedJobState === '' ||
-          postedJobState === 'pending'
+          postedJobState === 'pending' ||
+          postedJobState === 'unavailable'
         ) {
           if (stateLink) {
             const { result: jobState } = await this.requestClient
               .get<string>(
-                `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+                `${this.serverUrl}${stateLink.href}?_action=wait&wait=300`,
                 accessToken,
                 'text/plain',
                 {},
                 this.debug
               )
               .catch((err) => {
-                throw prefixMessage(
-                  err,
-                  'Error while getting job state after interval. '
+                errorCount++
+                if (
+                  pollCount >= MAX_POLL_COUNT ||
+                  errorCount >= MAX_ERROR_COUNT
+                ) {
+                  throw prefixMessage(
+                    err,
+                    'Error while getting job state after interval. '
+                  )
+                }
+                console.error(
+                  `Error fetching job state from ${this.serverUrl}${stateLink.href}. Resuming poll, assuming job to be running.`,
+                  err
                 )
+                return { result: 'unavailable' }
               })
 
             postedJobState = jobState.trim()
+            if (postedJobState != 'unavailable' && errorCount > 0) {
+              errorCount = 0
+            }
 
             if (this.debug && printedState !== postedJobState) {
               console.log('Polling job status...')

src/SASjs.ts

@@ -10,7 +10,8 @@ import {
   JobExecutor,
   WebJobExecutor,
   ComputeJobExecutor,
-  JesJobExecutor
+  JesJobExecutor,
+  Sas9JobExecutor
 } from './job-execution'
 import { ErrorResponse } from './types/errors'
 
@@ -41,6 +42,7 @@ export default class SASjs {
   private webJobExecutor: JobExecutor | null = null
   private computeJobExecutor: JobExecutor | null = null
   private jesJobExecutor: JobExecutor | null = null
+  private sas9JobExecutor: JobExecutor | null = null
 
   constructor(config?: any) {
     this.sasjsConfig = {
@@ -569,6 +571,12 @@ export default class SASjs {
           accessToken
         )
       }
+    } else if (
+      config.serverType === ServerType.Sas9 &&
+      config.username &&
+      config.password
+    ) {
+      return await this.sas9JobExecutor!.execute(sasJob, data, config)
     } else {
       return await this.webJobExecutor!.execute(
         sasJob,
@@ -823,6 +831,12 @@ export default class SASjs {
       this.sasViyaApiClient!
     )
 
+    this.sas9JobExecutor = new Sas9JobExecutor(
+      this.sasjsConfig.serverUrl,
+      this.sasjsConfig.serverType!,
+      this.jobsPath
+    )
+
     this.computeJobExecutor = new ComputeJobExecutor(
       this.sasjsConfig.serverUrl,
       this.sasViyaApiClient!

src/job-execution/JesJobExecutor.ts

@@ -33,7 +33,7 @@ export class JesJobExecutor extends BaseJobExecutor {
         .then((response) => {
           this.appendRequest(response, sasJob, config.debug)
 
-          resolve(response.result)
+          resolve(response)
         })
         .catch(async (e: Error) => {
           if (e instanceof JobExecutionError) {

src/job-execution/Sas9JobExecutor.ts

@@ -0,0 +1,110 @@
+import { ServerType } from '@sasjs/utils/types'
+import * as NodeFormData from 'form-data'
+import { ErrorResponse } from '../types/errors'
+import { convertToCSV, isRelativePath } from '../utils'
+import { BaseJobExecutor } from './JobExecutor'
+import { Sas9RequestClient } from '../request/Sas9RequestClient'
+
+/**
+ * Job executor for SAS9 servers for use in Node.js environments.
+ * Initiates login with the provided username and password from the config
+ * The cookies are stored in the request client and used in subsequent
+ * job execution requests.
+ */
+export class Sas9JobExecutor extends BaseJobExecutor {
+  private requestClient: Sas9RequestClient
+  constructor(
+    serverUrl: string,
+    serverType: ServerType,
+    private jobsPath: string
+  ) {
+    super(serverUrl, serverType)
+    this.requestClient = new Sas9RequestClient(serverUrl, false)
+  }
+
+  async execute(sasJob: string, data: any, config: any) {
+    const program = isRelativePath(sasJob)
+      ? config.appLoc
+        ? config.appLoc.replace(/\/?$/, '/') + sasJob.replace(/^\//, '')
+        : sasJob
+      : sasJob
+    let apiUrl = `${config.serverUrl}${this.jobsPath}?${'_program=' + program}`
+    apiUrl = `${apiUrl}${
+      config.username && config.password
+        ? '&_username=' + config.username + '&_password=' + config.password
+        : ''
+    }`
+
+    let requestParams = {
+      ...this.getRequestParams(config)
+    }
+
+    let formData = new NodeFormData()
+
+    if (data) {
+      try {
+        formData = generateFileUploadForm(formData, data)
+      } catch (e) {
+        return Promise.reject(new ErrorResponse(e?.message, e))
+      }
+    }
+
+    for (const key in requestParams) {
+      if (requestParams.hasOwnProperty(key)) {
+        formData.append(key, requestParams[key])
+      }
+    }
+
+    await this.requestClient.login(
+      config.username,
+      config.password,
+      this.jobsPath
+    )
+    const contentType =
+      data && Object.keys(data).length
+        ? 'multipart/form-data; boundary=' + (formData as any)._boundary
+        : 'text/plain'
+    return await this.requestClient!.post(
+      apiUrl,
+      formData,
+      undefined,
+      contentType,
+      {
+        Accept: '*/*',
+        Connection: 'Keep-Alive'
+      }
+    )
+  }
+
+  private getRequestParams(config: any): any {
+    const requestParams: any = {}
+
+    if (config.debug) {
+      requestParams['_debug'] = 131
+    }
+
+    return requestParams
+  }
+}
+
+const generateFileUploadForm = (
+  formData: NodeFormData,
+  data: any
+): NodeFormData => {
+  for (const tableName in data) {
+    const name = tableName
+    const csv = convertToCSV(data[tableName])
+    if (csv === 'ERROR: LARGE STRING LENGTH') {
+      throw new Error(
+        'The max length of a string value in SASjs is 32765 characters.'
+      )
+    }
+
+    formData.append(name, csv, {
+      filename: `${name}.csv`,
+      contentType: 'application/csv'
+    })
+  }
+
+  return formData
+}

src/job-execution/index.ts

@@ -1,4 +1,5 @@
 export * from './ComputeJobExecutor'
 export * from './JesJobExecutor'
 export * from './JobExecutor'
+export * from './Sas9JobExecutor'
 export * from './WebJobExecutor'

src/request/RequestClient.ts

@@ -44,11 +44,11 @@ export interface HttpClient {
 }
 
 export class RequestClient implements HttpClient {
-  private csrfToken: CsrfToken = { headerName: '', value: '' }
-  private fileUploadCsrfToken: CsrfToken | undefined
-  private httpClient: AxiosInstance
+  protected csrfToken: CsrfToken = { headerName: '', value: '' }
+  protected fileUploadCsrfToken: CsrfToken | undefined
+  protected httpClient: AxiosInstance
 
-  constructor(private baseUrl: string, allowInsecure = false) {
+  constructor(protected baseUrl: string, allowInsecure = false) {
     const https = require('https')
     if (allowInsecure && https.Agent) {
       this.httpClient = axios.create({
@@ -290,7 +290,7 @@ export class RequestClient implements HttpClient {
       })
   }
 
-  private getHeaders = (
+  protected getHeaders = (
     accessToken: string | undefined,
     contentType: string
   ) => {
@@ -315,7 +315,7 @@ export class RequestClient implements HttpClient {
     return headers
   }
 
-  private parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
+  protected parseAndSetFileUploadCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -323,7 +323,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  private parseAndSetCsrfToken = (response: AxiosResponse) => {
+  protected parseAndSetCsrfToken = (response: AxiosResponse) => {
     const token = this.parseCsrfToken(response)
 
     if (token) {
@@ -347,7 +347,7 @@ export class RequestClient implements HttpClient {
     }
   }
 
-  private handleError = async (
+  protected handleError = async (
     e: any,
     callback: any,
     debug: boolean = false
@@ -405,7 +405,7 @@ export class RequestClient implements HttpClient {
     throw e
   }
 
-  private parseResponse<T>(response: AxiosResponse<any>) {
+  protected parseResponse<T>(response: AxiosResponse<any>) {
     const etag = response?.headers ? response.headers['etag'] : ''
     let parsedResponse
     let includeSAS9Log: boolean = false
@@ -439,7 +439,7 @@ export class RequestClient implements HttpClient {
   }
 }
 
-const throwIfError = (response: AxiosResponse) => {
+export const throwIfError = (response: AxiosResponse) => {
   if (response.status === 401) {
     throw new LoginRequiredError()
   }

src/request/Sas9RequestClient.ts

@@ -0,0 +1,121 @@
+import { AxiosRequestConfig } from 'axios'
+import axiosCookieJarSupport from 'axios-cookiejar-support'
+import * as tough from 'tough-cookie'
+import { prefixMessage } from '@sasjs/utils/error'
+import { RequestClient, throwIfError } from './RequestClient'
+
+/**
+ * Specific request client for SAS9 in Node.js environments.
+ * Handles redirects and cookie management.
+ */
+export class Sas9RequestClient extends RequestClient {
+  constructor(baseUrl: string, allowInsecure = false) {
+    super(baseUrl, allowInsecure)
+    this.httpClient.defaults.maxRedirects = 0
+    this.httpClient.defaults.validateStatus = (status) =>
+      status >= 200 && status < 303
+
+    if (axiosCookieJarSupport) {
+      axiosCookieJarSupport(this.httpClient)
+      this.httpClient.defaults.jar = new tough.CookieJar()
+    }
+  }
+
+  public async login(username: string, password: string, jobsPath: string) {
+    const codeInjectorPath = `/User Folders/${username}/My Folder/sasjs/runner`
+    if (this.httpClient.defaults.jar) {
+      ;(this.httpClient.defaults.jar as tough.CookieJar).removeAllCookies()
+      await this.get(
+        `${jobsPath}?_program=${codeInjectorPath}&_username=${username}&_password=${password}`,
+        undefined,
+        'text/plain'
+      )
+    }
+  }
+
+  public async get<T>(
+    url: string,
+    accessToken: string | undefined,
+    contentType: string = 'application/json',
+    overrideHeaders: { [key: string]: string | number } = {},
+    debug: boolean = false
+  ): Promise<{ result: T; etag: string }> {
+    const headers = {
+      ...this.getHeaders(accessToken, contentType),
+      ...overrideHeaders
+    }
+
+    const requestConfig: AxiosRequestConfig = {
+      headers,
+      responseType: contentType === 'text/plain' ? 'text' : 'json',
+      withCredentials: true
+    }
+    if (contentType === 'text/plain') {
+      requestConfig.transformResponse = undefined
+    }
+
+    return this.httpClient
+      .get<T>(url, requestConfig)
+      .then((response) => {
+        if (response.status === 302) {
+          return this.get(
+            response.headers['location'],
+            accessToken,
+            contentType
+          )
+        }
+        throwIfError(response)
+        return this.parseResponse<T>(response)
+      })
+      .catch(async (e) => {
+        return await this.handleError(
+          e,
+          () =>
+            this.get<T>(url, accessToken, contentType, overrideHeaders).catch(
+              (err) => {
+                throw prefixMessage(
+                  err,
+                  'Error while executing handle error callback. '
+                )
+              }
+            ),
+          debug
+        ).catch((err) => {
+          throw prefixMessage(err, 'Error while handling error. ')
+        })
+      })
+  }
+
+  public post<T>(
+    url: string,
+    data: any,
+    accessToken: string | undefined,
+    contentType = 'application/json',
+    overrideHeaders: { [key: string]: string | number } = {}
+  ): Promise<{ result: T; etag: string }> {
+    const headers = {
+      ...this.getHeaders(accessToken, contentType),
+      ...overrideHeaders
+    }
+
+    return this.httpClient
+      .post<T>(url, data, { headers, withCredentials: true })
+      .then(async (response) => {
+        if (response.status === 302) {
+          return await this.get(
+            response.headers['location'],
+            undefined,
+            contentType,
+            overrideHeaders
+          )
+        }
+        throwIfError(response)
+        return this.parseResponse<T>(response)
+      })
+      .catch(async (e) => {
+        return await this.handleError(e, () =>
+          this.post<T>(url, data, accessToken, contentType, overrideHeaders)
+        )
+      })
+  }
+}

src/test/utils/isUrl.spec.ts

@@ -0,0 +1,39 @@
+import { isUrl } from '../../utils/isUrl'
+
+describe('urlValidator', () => {
+  it('should return true with an HTTP URL', () => {
+    const url = 'http://google.com'
+
+    expect(isUrl(url)).toEqual(true)
+  })
+
+  it('should return true with an HTTPS URL', () => {
+    const url = 'https://google.com'
+
+    expect(isUrl(url)).toEqual(true)
+  })
+
+  it('should return true when the URL is blank', () => {
+    const url = ''
+
+    expect(isUrl(url)).toEqual(false)
+  })
+
+  it('should return false when the URL has not supported protocol', () => {
+    const url = 'htpps://google.com'
+
+    expect(isUrl(url)).toEqual(false)
+  })
+
+  it('should return false when the URL is null', () => {
+    const url = null
+
+    expect(isUrl(url as unknown as string)).toEqual(false)
+  })
+
+  it('should return false when the URL is undefined', () => {
+    const url = undefined
+
+    expect(isUrl(url as unknown as string)).toEqual(false)
+  })
+})

src/utils/convertToCsv.spec.ts

@@ -0,0 +1,170 @@
+import { convertToCSV } from './convertToCsv'
+
+describe('convertToCsv', () => {
+  it('should convert single quoted values', () => {
+    const data = [
+      { foo: `'bar'`, bar: 'abc' },
+      { foo: 'sadf', bar: 'def' },
+      { foo: 'asd', bar: `'qwert'` }
+    ]
+
+    const expectedOutput = `foo:$char5. bar:$char7.\r\n"'bar'",abc\r\nsadf,def\r\nasd,"'qwert'"`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert double quoted values', () => {
+    const data = [
+      { foo: `"bar"`, bar: 'abc' },
+      { foo: 'sadf', bar: 'def' },
+      { foo: 'asd', bar: `"qwert"` }
+    ]
+
+    const expectedOutput = `foo:$char5. bar:$char7.\r\n"""bar""",abc\r\nsadf,def\r\nasd,"""qwert"""`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `'blah'`, bar: `"blah"` }]
+
+    const expectedOutput = `foo:$char6. bar:$char6.\r\n"'blah'","""blah"""`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `'blah,"'`, bar: `"blah,blah" "` }]
+
+    const expectedOutput = `foo:$char8. bar:$char13.\r\n"'blah,""'","""blah,blah"" """`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `',''`, bar: `","` }]
+
+    const expectedOutput = `foo:$char4. bar:$char3.\r\n"',''",""","""`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `','`, bar: `,"` }]
+
+    const expectedOutput = `foo:$char3. bar:$char2.\r\n"','",","""`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `"`, bar: `'` }]
+
+    const expectedOutput = `foo:$char1. bar:$char1.\r\n"""","'"`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with mixed quotes', () => {
+    const data = [{ foo: `,`, bar: `',` }]
+
+    const expectedOutput = `foo:$char1. bar:$char2.\r\n",","',"`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with number cases 1', () => {
+    const data = [
+      { col1: 42, col2: null, col3: 'x', col4: null },
+      { col1: 42, col2: null, col3: 'x', col4: null },
+      { col1: 42, col2: null, col3: 'x', col4: null },
+      { col1: 42, col2: null, col3: 'x', col4: '' },
+      { col1: 42, col2: null, col3: 'x', col4: '' }
+    ]
+
+    const expectedOutput = `col1:best. col2:best. col3:$char1. col4:$char1.\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with number cases 2', () => {
+    const data = [
+      { col1: 42, col2: null, col3: 'x', col4: '' },
+      { col1: 42, col2: null, col3: 'x', col4: '' },
+      { col1: 42, col2: null, col3: 'x', col4: '' },
+      { col1: 42, col2: 1.62, col3: 'x', col4: 'x' },
+      { col1: 42, col2: 1.62, col3: 'x', col4: 'x' }
+    ]
+
+    const expectedOutput = `col1:best. col2:best. col3:$char1. col4:$char1.\r\n42,.,x,\r\n42,.,x,\r\n42,.,x,\r\n42,1.62,x,x\r\n42,1.62,x,x`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+  })
+
+  it('should convert values with common special characters', () => {
+    expect(convertToCSV([{ tab: '\t' }])).toEqual(`tab:$char1.\r\n\"\t\"`)
+    expect(convertToCSV([{ lf: '\n' }])).toEqual(`lf:$char1.\r\n\"\n\"`)
+    expect(convertToCSV([{ semicolon: ';semi' }])).toEqual(
+      `semicolon:$char5.\r\n;semi`
+    )
+    expect(convertToCSV([{ percent: '%' }])).toEqual(`percent:$char1.\r\n%`)
+    expect(convertToCSV([{ singleQuote: "'" }])).toEqual(
+      `singleQuote:$char1.\r\n\"'\"`
+    )
+    expect(convertToCSV([{ doubleQuote: '"' }])).toEqual(
+      `doubleQuote:$char1.\r\n""""`
+    )
+    expect(convertToCSV([{ crlf: '\r\n' }])).toEqual(`crlf:$char2.\r\n\"\n\"`)
+    expect(convertToCSV([{ euro: '€euro' }])).toEqual(`euro:$char7.\r\n€euro`)
+    expect(convertToCSV([{ banghash: '!#banghash' }])).toEqual(
+      `banghash:$char10.\r\n!#banghash`
+    )
+  })
+
+  it('should convert values with other special characters', () => {
+    const data = [
+      {
+        speech0: '"speech',
+        pct: '%percent',
+        speech: '"speech',
+        slash: '\\slash',
+        slashWithSpecial: '\\\tslash',
+        macvar: '&sysuserid',
+        chinese: '传/傳chinese',
+        sigma: 'Σsigma',
+        at: '@at',
+        serbian: 'Српски',
+        dollar: '$'
+      }
+    ]
+
+    const expectedOutput = `speech0:$char7. pct:$char8. speech:$char7. slash:$char6. slashWithSpecial:$char7. macvar:$char10. chinese:$char14. sigma:$char7. at:$char3. serbian:$char12. dollar:$char1.\r\n"""speech",%percent,"""speech",\\slash,\"\\\tslash\",&sysuserid,传/傳chinese,Σsigma,@at,Српски,$`
+
+    expect(convertToCSV(data)).toEqual(expectedOutput)
+
+    expect(convertToCSV([{ speech: 'menext' }])).toEqual(
+      `speech:$char6.\r\nmenext`
+    )
+    expect(convertToCSV([{ speech: 'me\nnext' }])).toEqual(
+      `speech:$char7.\r\n\"me\nnext\"`
+    )
+    expect(convertToCSV([{ speech: `me'next` }])).toEqual(
+      `speech:$char7.\r\n\"me'next\"`
+    )
+    expect(convertToCSV([{ speech: `me"next` }])).toEqual(
+      `speech:$char7.\r\n\"me""next\"`
+    )
+    expect(convertToCSV([{ speech: `me""next` }])).toEqual(
+      `speech:$char8.\r\n\"me""""next\"`
+    )
+    expect(convertToCSV([{ slashWithSpecial: '\\\tslash' }])).toEqual(
+      `slashWithSpecial:$char7.\r\n\"\\\tslash\"`
+    )
+    expect(convertToCSV([{ slashWithSpecial: '\\ \tslash' }])).toEqual(
+      `slashWithSpecial:$char8.\r\n\"\\ \tslash\"`
+    )
+    expect(
+      convertToCSV([{ slashWithSpecialExtra: '\\\ts\tl\ta\ts\t\th\t' }])
+    ).toEqual(`slashWithSpecialExtra:$char13.\r\n\"\\\ts\tl\ta\ts\t\th\t\"`)
+  })
+})

src/utils/convertToCsv.ts

@@ -1,6 +1,6 @@
 /**
- * Converts the given JSON object to a CSV string.
- * @param data - the JSON object to convert.
+ * Converts the given JSON object array to a CSV string.
+ * @param data - the array of JSON objects to convert.
  */
 export const convertToCSV = (data: any) => {
   const replacer = (key: any, value: any) => (value === null ? '' : value)
@@ -37,15 +37,7 @@ export const convertToCSV = (data: any) => {
           let byteSize
 
           if (typeof row[field] === 'string') {
-            let doubleQuotesFound = row[field]
-              .split('')
-              .filter((char: any) => char === '"')
-
             byteSize = getByteSize(row[field])
-
-            if (doubleQuotesFound.length > 0) {
-              byteSize += doubleQuotesFound.length
-            }
           }
 
           return byteSize
@@ -61,7 +53,7 @@ export const convertToCSV = (data: any) => {
       )
     }
 
-    return `${field}:${firstFoundType === 'chars' ? '$' : ''}${
+    return `${field}:${firstFoundType === 'chars' ? '$char' : ''}${
       longestValueForField
         ? longestValueForField
         : firstFoundType === 'chars'
@@ -73,35 +65,28 @@ export const convertToCSV = (data: any) => {
   if (invalidString) {
     return 'ERROR: LARGE STRING LENGTH'
   }
+
   csvTest = data.map((row: any) => {
     const fields = Object.keys(row).map((fieldName, index) => {
       let value
-      let containsSpecialChar = false
       const currentCell = row[fieldName]
 
-      if (JSON.stringify(currentCell).search(/(\\t|\\n|\\r)/gm) > -1) {
-        value = currentCell.toString()
-        containsSpecialChar = true
-      } else {
-        value = JSON.stringify(currentCell, replacer)
-      }
+      if (typeof currentCell === 'number') return currentCell
 
-      value = value.replace(/\\\\/gm, '\\')
+      // stringify with replacer converts null values to empty strings
+      value = currentCell === null ? '' : currentCell
 
-      if (containsSpecialChar) {
-        if (value.includes(',') || value.includes('"')) {
-          value = '"' + value + '"'
-        }
-      } else {
-        if (
-          !value.includes(',') &&
-          value.includes('"') &&
-          !value.includes('\\"')
-        ) {
-          value = value.substring(1, value.length - 1)
-        }
+      // if there any present, it should have preceding (") for escaping
+      value = value.replace(/"/g, `""`)
 
-        value = value.replace(/\\"/gm, '""')
+      // also wraps the value in double quotes
+      value = `"${value}"`
+
+      if (
+        value.substring(1, value.length - 1).search(/(\t|\n|\r|,|\'|\")/gm) < 0
+      ) {
+        // Remove wrapping quotes for values that don't contain special characters
+        value = value.substring(1, value.length - 1)
       }
 
       value = value.replace(/\r\n/gm, '\n')

src/utils/isUrl.ts

@@ -1,16 +1,17 @@
 /**
  * Checks if string is in URL format.
- * @param url - string to check.
+ * @param str - string to check.
  */
-export const isUrl = (url: string): boolean => {
-  const pattern = new RegExp(
-    '^(http://|https://)[a-z0-9]+([-.]{1}[a-z0-9]+)*.[a-z]{2,5}(:[0-9]{1,5})?(/.*)?$',
-    'gi'
-  )
+export const isUrl = (str: string): boolean => {
+  const supportedProtocols = ['http:', 'https:']
 
-  if (pattern.test(url)) return true
-  else
-    throw new Error(
-      `'${url}' is not a valid url. An example of a valid url is 'http://valid-url.com'.`
-    )
+  try {
+    const url = new URL(str)
+
+    if (!supportedProtocols.includes(url.protocol)) return false
+  } catch (_) {
+    return false
+  }
+
+  return true
 }