mirror of
https://github.com/sasjs/adapter.git
synced 2026-01-16 16:40:06 +00:00
fix: job definition debug log parse
This commit is contained in:
50
src/SASjs.ts
50
src/SASjs.ts
@@ -12,6 +12,7 @@ import {
|
|||||||
isLogInSuccess,
|
isLogInSuccess,
|
||||||
parseSourceCode,
|
parseSourceCode,
|
||||||
parseGeneratedCode,
|
parseGeneratedCode,
|
||||||
|
parseWeboutResponse,
|
||||||
needsRetry,
|
needsRetry,
|
||||||
asyncForEach,
|
asyncForEach,
|
||||||
} from "./utils";
|
} from "./utils";
|
||||||
@@ -559,7 +560,15 @@ export default class SASjs {
|
|||||||
this.appendSasjsRequest(response, sasJob, null);
|
this.appendSasjsRequest(response, sasJob, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
resolve(JSON.parse(response!.result));
|
let responseJson;
|
||||||
|
|
||||||
|
try {
|
||||||
|
responseJson = JSON.parse(response!.result);
|
||||||
|
} catch {
|
||||||
|
responseJson = JSON.parse(parseWeboutResponse(response!.result));
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve(responseJson);
|
||||||
})
|
})
|
||||||
.catch(async (e) => {
|
.catch(async (e) => {
|
||||||
if (needsRetry(JSON.stringify(e))) {
|
if (needsRetry(JSON.stringify(e))) {
|
||||||
@@ -639,7 +648,16 @@ export default class SASjs {
|
|||||||
} else {
|
} else {
|
||||||
this.appendSasjsRequest(response, sasJob, null);
|
this.appendSasjsRequest(response, sasJob, null);
|
||||||
}
|
}
|
||||||
return JSON.parse(response!.result);
|
|
||||||
|
let responseJson;
|
||||||
|
|
||||||
|
try {
|
||||||
|
responseJson = JSON.parse(response!.result);
|
||||||
|
} catch {
|
||||||
|
responseJson = JSON.parse(parseWeboutResponse(response!.result));
|
||||||
|
}
|
||||||
|
|
||||||
|
return responseJson;
|
||||||
})
|
})
|
||||||
.catch(async (e) => {
|
.catch(async (e) => {
|
||||||
if (needsRetry(JSON.stringify(e))) {
|
if (needsRetry(JSON.stringify(e))) {
|
||||||
@@ -834,7 +852,7 @@ export default class SASjs {
|
|||||||
} else {
|
} else {
|
||||||
if (config.serverType === ServerType.SAS9 && config.debug) {
|
if (config.serverType === ServerType.SAS9 && config.debug) {
|
||||||
this.updateUsername(responseText);
|
this.updateUsername(responseText);
|
||||||
const jsonResponseText = this.parseSAS9Response(responseText);
|
const jsonResponseText = parseWeboutResponse(responseText);
|
||||||
|
|
||||||
if (jsonResponseText !== "") {
|
if (jsonResponseText !== "") {
|
||||||
resolve(JSON.parse(jsonResponseText));
|
resolve(JSON.parse(jsonResponseText));
|
||||||
@@ -975,23 +993,6 @@ export default class SASjs {
|
|||||||
return uri;
|
return uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
private parseSAS9Response(response: string) {
|
|
||||||
let sas9Response = "";
|
|
||||||
|
|
||||||
if (response.includes(">>weboutBEGIN<<")) {
|
|
||||||
try {
|
|
||||||
sas9Response = response
|
|
||||||
.split(">>weboutBEGIN<<")[1]
|
|
||||||
.split(">>weboutEND<<")[0];
|
|
||||||
} catch (e) {
|
|
||||||
sas9Response = "";
|
|
||||||
console.error(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return sas9Response;
|
|
||||||
}
|
|
||||||
|
|
||||||
private parseSAS9ErrorResponse(response: string) {
|
private parseSAS9ErrorResponse(response: string) {
|
||||||
const logLines = response.split("\n");
|
const logLines = response.split("\n");
|
||||||
const parsedLines: string[] = [];
|
const parsedLines: string[] = [];
|
||||||
@@ -1049,7 +1050,12 @@ export default class SASjs {
|
|||||||
if (response && response.result && response.log) {
|
if (response && response.result && response.log) {
|
||||||
sourceCode = parseSourceCode(response.log);
|
sourceCode = parseSourceCode(response.log);
|
||||||
generatedCode = parseGeneratedCode(response.log);
|
generatedCode = parseGeneratedCode(response.log);
|
||||||
sasWork = JSON.parse(response.result).WORK;
|
|
||||||
|
if (this.sasjsConfig.debug) {
|
||||||
|
sasWork = JSON.parse(parseWeboutResponse(response.result)).WORK;
|
||||||
|
} else {
|
||||||
|
sasWork = JSON.parse(response.result).WORK;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (response) {
|
if (response) {
|
||||||
sourceCode = parseSourceCode(response);
|
sourceCode = parseSourceCode(response);
|
||||||
@@ -1078,7 +1084,7 @@ export default class SASjs {
|
|||||||
|
|
||||||
if (this.sasjsConfig.serverType === ServerType.SAS9) {
|
if (this.sasjsConfig.serverType === ServerType.SAS9) {
|
||||||
try {
|
try {
|
||||||
jsonResponse = JSON.parse(this.parseSAS9Response(response));
|
jsonResponse = JSON.parse(parseWeboutResponse(response));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,3 +12,4 @@ export * from "./parseSourceCode";
|
|||||||
export * from "./parseSasViyaLog";
|
export * from "./parseSasViyaLog";
|
||||||
export * from "./serialize";
|
export * from "./serialize";
|
||||||
export * from "./splitChunks";
|
export * from "./splitChunks";
|
||||||
|
export * from "./parseWeboutResponse";
|
||||||
|
|||||||
16
src/utils/parseWeboutResponse.ts
Normal file
16
src/utils/parseWeboutResponse.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
export const parseWeboutResponse = (response: string) => {
|
||||||
|
let sasResponse = "";
|
||||||
|
|
||||||
|
if (response.includes(">>weboutBEGIN<<")) {
|
||||||
|
try {
|
||||||
|
sasResponse = response
|
||||||
|
.split(">>weboutBEGIN<<")[1]
|
||||||
|
.split(">>weboutEND<<")[0];
|
||||||
|
} catch (e) {
|
||||||
|
sasResponse = "";
|
||||||
|
console.error(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sasResponse;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user