diff --git a/dist/util.js b/dist/util.js index 12123d4..9cae5c2 100644 --- a/dist/util.js +++ b/dist/util.js @@ -1,4 +1,40 @@ "use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; var __importStar = (this && this.__importStar) || function (mod) { if (mod && mod.__esModule) return mod; var result = {}; @@ -28,37 +64,50 @@ exports.buildOutput = function (res) { "headers": res.headers }); }; -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 { - try { - axios_1.default(config) - .then(function (res) { +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; - output_1.default(res); - }) - .catch(function (err) { - throw new Error(err); - }); + 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*/]; } - catch (err) { - countRetry += 1; - core.info("retry: " + countRetry); - if (countRetry <= numberOfRetry) { - sleep(backoff); - } - else { - exit = true; - core.setFailed(err); - } - } - } 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 639d646..5e6bc90 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,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;QACC,IAAG;YACC,eAAK,CAAC,MAAM,CAAC;iBACZ,IAAI,CAAC,UAAA,GAAG;gBACL,IAAI,GAAG,IAAI,CAAA;gBACX,gBAAS,CAAC,GAAG,CAAC,CAAA;YAClB,CAAC,CAAC;iBACD,KAAK,CAAC,UAAA,GAAG;gBACN,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAAA;YACxB,CAAC,CAAC,CAAA;SACL;QAAA,OAAM,GAAG,EAAC;YACP,UAAU,IAAI,CAAC,CAAA;YACf,IAAI,CAAC,IAAI,CAAC,YAAU,UAAY,CAAC,CAAA;YACjC,IAAI,UAAU,IAAI,aAAa,EAAE;gBAC7B,KAAK,CAAC,OAAO,CAAC,CAAA;aACjB;iBAAM;gBACH,IAAI,GAAG,IAAI,CAAA;gBACX,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;aACtB;SACJ;KACJ,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 +{"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 diff --git a/src/util.ts b/src/util.ts index 3d40051..78c1eda 100644 --- a/src/util.ts +++ b/src/util.ts @@ -19,7 +19,7 @@ export const buildOutput = (res: AxiosResponse): string => { }) } -export const sendRequestWithRetry = (config: AxiosRequestConfig): void => { +export const sendRequestWithRetry = async (config: AxiosRequestConfig) => { var exit = false var countRetry = 0 const retryArr: string[] = core.getInput('retry').split('/') @@ -40,7 +40,7 @@ export const sendRequestWithRetry = (config: AxiosRequestConfig): void => { countRetry += 1 core.info(`retry: ${countRetry}`) if (countRetry <= numberOfRetry) { - sleep(backoff * 1000) + await sleep(backoff * 1000) } else { exit = true core.setFailed(err)