sasjs/adapter
1
0
Fork 0
mirror of https://github.com/sasjs/adapter.git synced 2026-01-03 10:40:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #148 from sasjs/issue113

Browse Source 
feat: service not found error handling
This commit is contained in:
Yury Shkoda
2020-11-16 09:54:03 +03:00
committed by GitHub
parent d223e83c60 e9be1cf99a
commit 35aa4235e4
3 changed files with 60 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SASViyaApiClient.ts
View File

@@ -607,7 +607,7 @@ export class SASViyaApiClient {
})
return Promise.reject(
new ErrorResponse('Job execution failed', {
new ErrorResponse('Job execution failed.', {
status: 500,
body: log
})
@@ -1114,7 +1114,7 @@ export class SASViyaApiClient {
}
if (!jobToExecute) {
throw new Error(`The job ${sasJob} was not found.`)
throw new Error(`Job was not found.`)
}
const jobDefinitionLink = jobToExecute?.links.find(
(l) => l.rel === 'getResource'

61
src/SASjs.ts
View File

@@ -780,11 +780,23 @@ export default class SASjs {
} else {
this.retryCountComputeApi = 0
reject(
new ErrorResponse('Compute API retry requests limit reached')
new ErrorResponse('Compute API retry requests limit reached.')
)
}
}
if (response?.log) {
this.appendSasjsRequest(response.log, sasJob, null)
}
if (error.toString().includes('Job was not found')) {
reject(
new ErrorResponse('Service not found on the server.', {
sasJob: sasJob
})
)
}
if (error && error.status === 401) {
if (loginRequiredCallback) loginRequiredCallback(true)
sasjsWaitingRequest.requestPromise.resolve = resolve
@@ -792,10 +804,8 @@ export default class SASjs {
sasjsWaitingRequest.config = config
this.sasjsWaitingRequests.push(sasjsWaitingRequest)
} else {
reject(new ErrorResponse('Job execution failed', error))
reject(new ErrorResponse('Job execution failed.', error))
}
this.appendSasjsRequest(response.log, sasJob, null)
})
}
)
@@ -875,12 +885,24 @@ export default class SASjs {
} else {
this.retryCountJeseApi = 0
reject(
new ErrorResponse('Jes API retry requests limit reached')
new ErrorResponse('Jes API retry requests limit reached.')
)
}
}
reject(new ErrorResponse('Job execution failed', e))
if (e?.log) {
this.appendSasjsRequest(e.log, sasJob, null)
}
if (e.toString().includes('Job was not found')) {
reject(
new ErrorResponse('Service not found on the server.', {
sasJob: sasJob
})
)
}
reject(new ErrorResponse('Job execution failed.', e))
})
)
}
@@ -1064,7 +1086,7 @@ export default class SASjs {
} else {
reject(
new ErrorResponse(
'Job WEB execution failed',
'Job WEB execution failed.',
this.parseSAS9ErrorResponse(responseText)
)
)
@@ -1082,7 +1104,7 @@ export default class SASjs {
} catch (e) {
reject(
new ErrorResponse(
'Job WEB debug response parsing failed',
'Job WEB debug response parsing failed.',
{ response: resText, exception: e }
)
)
@@ -1091,7 +1113,7 @@ export default class SASjs {
(err: any) => {
reject(
new ErrorResponse(
'Job WEB debug response parsing failed',
'Job WEB debug response parsing failed.',
err
)
)
@@ -1100,19 +1122,34 @@ export default class SASjs {
} catch (e) {
reject(
new ErrorResponse(
'Job WEB debug response parsing failed',
'Job WEB debug response parsing failed.',
{ response: responseText, exception: e }
)
)
}
} else {
this.updateUsername(responseText)
if (
responseText.includes(
'The requested URL /SASStoredProcess/do/ was not found on this server.'
) ||
responseText.includes('Stored process not found')
) {
reject(
new ErrorResponse(
'Service not found on the server.',
{ service: sasJob },
responseText
)
)
}
try {
const parsedJson = JSON.parse(responseText)
resolve(parsedJson)
} catch (e) {
reject(
new ErrorResponse('Job WEB response parsing failed', {
new ErrorResponse('Job WEB response parsing failed.', {
response: responseText,
exception: e
})
@@ -1123,7 +1160,7 @@ export default class SASjs {
}
})
.catch((e: Error) => {
reject(new ErrorResponse('Job WEB request failed', e))
reject(new ErrorResponse('Job WEB request failed.', e))
})
}
)

16
src/types/ErrorResponse.ts
View File

@@ -1,14 +1,16 @@
export class ErrorResponse {
error: ErrorBody
constructor(message: string, details?: any) {
let detailsString = ''
let raw
constructor(message: string, details?: any, raw?: any) {
let detailsString = details
try {
detailsString = JSON.stringify(details)
} catch {
raw = details
if (typeof details !== 'object') {
try {
detailsString = JSON.parse(details)
} catch {
raw = details
detailsString = ''
}
}
this.error = {