From 78fadbd8b45b4734d90eb332520a85f327fb6a38 Mon Sep 17 00:00:00 2001 From: Wathanyu Phromma Date: Fri, 29 May 2020 20:49:58 +0700 Subject: [PATCH] test --- dist/util.js | 78 +++++++++++++++++++++--------------------------- dist/util.js.map | 2 +- src/util.ts | 24 +++++++-------- 3 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dist/util.js b/dist/util.js index 9cae5c2..321dba0 100644 --- a/dist/util.js +++ b/dist/util.js @@ -64,50 +64,40 @@ exports.buildOutput = function (res) { "headers": res.headers }); }; -exports.sendRequestWithRetry = function (config) { return __awaiter(void 0, void 0, void 0, function () { - var exit, countRetry, retryArr, numberOfRetry, backoff, err_1; - return __generator(this, function (_a) { - switch (_a.label) { - case 0: - exit = false; - countRetry = 0; - retryArr = core.getInput('retry').split('/'); - numberOfRetry = Number(retryArr[0]); - backoff = Number(retryArr[1]); - core.info("retry: " + countRetry); - _a.label = 1; - case 1: - _a.trys.push([1, 2, , 6]); - axios_1.default(config) - .then(function (res) { - exit = true; - output_1.default(res); - }) - .catch(function (err) { - throw new Error(err); - }); - return [3 /*break*/, 6]; - case 2: - err_1 = _a.sent(); - countRetry += 1; - core.info("retry: " + countRetry); - if (!(countRetry <= numberOfRetry)) return [3 /*break*/, 4]; - return [4 /*yield*/, sleep(backoff * 1000)]; - case 3: - _a.sent(); - return [3 /*break*/, 5]; - case 4: - exit = true; - core.setFailed(err_1); - _a.label = 5; - case 5: return [3 /*break*/, 6]; - case 6: - if (!exit) return [3 /*break*/, 1]; - _a.label = 7; - case 7: return [2 /*return*/]; - } - }); -}); }; +exports.sendRequestWithRetry = function (config) { + var exit = false; + var countRetry = 0; + var retryArr = core.getInput('retry').split('/'); + var numberOfRetry = Number(retryArr[0]); + var backoff = Number(retryArr[1]); + core.info("retry: " + countRetry); + do { + axios_1.default(config) + .then(function (res) { + exit = true; + output_1.default(res); + }) + .catch(function (err) { return __awaiter(void 0, void 0, void 0, function () { + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + countRetry += 1; + core.info("retry: " + countRetry); + if (!(countRetry <= numberOfRetry)) return [3 /*break*/, 2]; + return [4 /*yield*/, sleep(backoff * 1000)]; + case 1: + _a.sent(); + return [3 /*break*/, 3]; + case 2: + exit = true; + core.setFailed(err); + _a.label = 3; + case 3: return [2 /*return*/]; + } + }); + }); }); + } while (!exit); +}; function sleep(ms) { return new Promise(function (resolve) { return setTimeout(resolve, ms); }); } diff --git a/dist/util.js.map b/dist/util.js.map index 5e6bc90..53c0296 100644 --- a/dist/util.js.map +++ b/dist/util.js.map @@ -1 +1 @@ -{"version":3,"file":"util.js","sourceRoot":"./src/","sources":["util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAqC;AACrC,gDAAgE;AAChE,oDAAgC;AAEnB,QAAA,kBAAkB,GAAG,UAAC,gBAAwB;IACvD,IAAM,kBAAkB,GAAa,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACvD,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,EAAE,EAAR,CAAQ,CAAC;SAChC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,EAAE,EAAR,CAAQ,CAAC,CAAC;IACxB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,iCAA+B,kBAAkB,iBAAY,gBAAkB,CAAC,CAAA;KACnG;AACL,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,UAAC,GAAuB;IAC/C,OAAO,IAAI,CAAC,SAAS,CAAC;QAClB,aAAa,EAAE,GAAG,CAAC,MAAM;QACzB,MAAM,EAAE,GAAG,CAAC,IAAI;QAChB,SAAS,EAAE,GAAG,CAAC,OAAO;KACzB,CAAC,CAAA;AACN,CAAC,CAAA;AAEY,QAAA,oBAAoB,GAAG,UAAO,MAA0B;;;;;gBAC7D,IAAI,GAAG,KAAK,CAAA;gBACZ,UAAU,GAAG,CAAC,CAAA;gBACZ,QAAQ,GAAa,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;gBACtD,aAAa,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC3C,OAAO,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC3C,IAAI,CAAC,IAAI,CAAC,YAAU,UAAY,CAAC,CAAA;;;;gBAGzB,eAAK,CAAC,MAAM,CAAC;qBACZ,IAAI,CAAC,UAAA,GAAG;oBACL,IAAI,GAAG,IAAI,CAAA;oBACX,gBAAS,CAAC,GAAG,CAAC,CAAA;gBAClB,CAAC,CAAC;qBACD,KAAK,CAAC,UAAA,GAAG;oBACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;gBACxB,CAAC,CAAC,CAAA;;;;gBAEF,UAAU,IAAI,CAAC,CAAA;gBACf,IAAI,CAAC,IAAI,CAAC,YAAU,UAAY,CAAC,CAAA;qBAC7B,CAAA,UAAU,IAAI,aAAa,CAAA,EAA3B,wBAA2B;gBAC3B,qBAAM,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,EAAA;;gBAA3B,SAA2B,CAAA;;;gBAE3B,IAAI,GAAG,IAAI,CAAA;gBACX,IAAI,CAAC,SAAS,CAAC,KAAG,CAAC,CAAA;;;;oBAGtB,CAAC,IAAI;;;;;KACjB,CAAA;AAED,SAAS,KAAK,CAAC,EAAU;IACrB,OAAO,IAAI,OAAO,CAAC,UAAA,OAAO,IAAI,OAAA,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAvB,CAAuB,CAAC,CAAC;AAC3D,CAAC"} \ No newline at end of file +{"version":3,"file":"util.js","sourceRoot":"./src/","sources":["util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAqC;AACrC,gDAAgE;AAChE,oDAAgC;AAEnB,QAAA,kBAAkB,GAAG,UAAC,gBAAwB;IACvD,IAAM,kBAAkB,GAAa,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;SACvD,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,EAAE,EAAR,CAAQ,CAAC;SAChC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,EAAE,EAAR,CAAQ,CAAC,CAAC;IACxB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QAChD,MAAM,IAAI,KAAK,CAAC,iCAA+B,kBAAkB,iBAAY,gBAAkB,CAAC,CAAA;KACnG;AACL,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,UAAC,GAAuB;IAC/C,OAAO,IAAI,CAAC,SAAS,CAAC;QAClB,aAAa,EAAE,GAAG,CAAC,MAAM;QACzB,MAAM,EAAE,GAAG,CAAC,IAAI;QAChB,SAAS,EAAE,GAAG,CAAC,OAAO;KACzB,CAAC,CAAA;AACN,CAAC,CAAA;AAEY,QAAA,oBAAoB,GAAG,UAAC,MAA0B;IAC3D,IAAI,IAAI,GAAG,KAAK,CAAA;IAChB,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,IAAM,QAAQ,GAAa,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC5D,IAAM,aAAa,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,IAAM,OAAO,GAAW,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;IAC3C,IAAI,CAAC,IAAI,CAAC,YAAU,UAAY,CAAC,CAAA;IACjC,GAAG;QACK,eAAK,CAAC,MAAM,CAAC;aACZ,IAAI,CAAC,UAAA,GAAG;YACL,IAAI,GAAG,IAAI,CAAA;YACX,gBAAS,CAAC,GAAG,CAAC,CAAA;QAClB,CAAC,CAAC;aACD,KAAK,CAAC,UAAM,GAAG;;;;wBACZ,UAAU,IAAI,CAAC,CAAA;wBACf,IAAI,CAAC,IAAI,CAAC,YAAU,UAAY,CAAC,CAAA;6BAC7B,CAAA,UAAU,IAAI,aAAa,CAAA,EAA3B,wBAA2B;wBAC3B,qBAAM,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,EAAA;;wBAA3B,SAA2B,CAAA;;;wBAE3B,IAAI,GAAG,IAAI,CAAA;wBACX,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;;;;;aAE1B,CAAC,CAAA;KACT,QAAQ,CAAC,IAAI,EAAC;AACnB,CAAC,CAAA;AAED,SAAS,KAAK,CAAC,EAAU;IACrB,OAAO,IAAI,OAAO,CAAC,UAAA,OAAO,IAAI,OAAA,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,EAAvB,CAAuB,CAAC,CAAC;AAC3D,CAAC"} \ No newline at end of file diff --git a/src/util.ts b/src/util.ts index 78c1eda..182b2ce 100644 --- a/src/util.ts +++ b/src/util.ts @@ -19,7 +19,7 @@ export const buildOutput = (res: AxiosResponse): string => { }) } -export const sendRequestWithRetry = async (config: AxiosRequestConfig) => { +export const sendRequestWithRetry = (config: AxiosRequestConfig) => { var exit = false var countRetry = 0 const retryArr: string[] = core.getInput('retry').split('/') @@ -27,25 +27,21 @@ export const sendRequestWithRetry = async (config: AxiosRequestConfig) => { const backoff: number = Number(retryArr[1]) core.info(`retry: ${countRetry}`) do { - try{ axios(config) .then(res => { exit = true setOutput(res) }) - .catch(err => { - throw new Error(err) + .catch(async err => { + countRetry += 1 + core.info(`retry: ${countRetry}`) + if (countRetry <= numberOfRetry) { + await sleep(backoff * 1000) + } else { + exit = true + core.setFailed(err) + } }) - }catch(err){ - countRetry += 1 - core.info(`retry: ${countRetry}`) - if (countRetry <= numberOfRetry) { - await sleep(backoff * 1000) - } else { - exit = true - core.setFailed(err) - } - } } while (!exit) }