From 1a7a0291b8a2e8b96794bfb7cc7da2cef0509203 Mon Sep 17 00:00:00 2001 From: Namrata Jha Date: Wed, 22 Dec 2021 19:21:20 +0000 Subject: [PATCH] RATE_LIMIT=100 --- dist/index.js | 62 +++++++++-------------------------- src/delete.ts | 2 +- src/version/delete-version.ts | 33 ------------------- 3 files changed, 17 insertions(+), 80 deletions(-) diff --git a/dist/index.js b/dist/index.js index 0671e1b..95ac5b9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -58,30 +58,31 @@ function finalIds(input) { })); } else { - return getVersionIds(input.owner, input.repo, input.packageName, 100, '', input.token).pipe(operators_1.map(value => { + return getVersionIds(input.owner, input.repo, input.packageName, RATE_LIMIT, '', input.token).pipe(operators_1.map(value => { totalCount = totalCount - value.filter(info => input.ignoreVersions.test(info.version)).length; value = value.filter(info => !input.ignoreVersions.test(info.version)); let toDelete = totalCount - input.minVersionsToKeep - input.numDeleted; toDelete = toDelete > value.length ? value.length : toDelete; - /* if (toDelete > 0 && input.numDeleted < RATE_LIMIT) { - // using input.numDeleted to keep track of deleted and remaining packages - if (input.numDeleted + toDelete > RATE_LIMIT) { - toDelete = RATE_LIMIT - input.numDeleted - input.numDeleted = RATE_LIMIT - } else { - input.numDeleted = input.numDeleted + toDelete - } - return value.map(info => info.id).slice(0, toDelete) - } else return []*/ - if (toDelete > 0) { - input.numDeleted += toDelete; + // using input.numDeleted to keep track of deleted and remaining packages + if (input.numDeleted + toDelete > RATE_LIMIT) { + toDelete = RATE_LIMIT - input.numDeleted; + input.numDeleted = RATE_LIMIT; + } + else { + input.numDeleted = input.numDeleted + toDelete; + } return value.map(info => info.id).slice(0, toDelete); } else return []; + /* + if (toDelete > 0) { + input.numDeleted += toDelete + return value.map(info => info.id).slice(0, toDelete) + } else return []*/ })); } } @@ -171,21 +172,12 @@ exports.Input = Input; /***/ }), /***/ 5544: -/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { +/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { "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()); - }); -}; Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.deletePackageVersions = exports.deletePackageVersion = exports.getRateLimit = void 0; +exports.deletePackageVersions = exports.deletePackageVersion = void 0; const rxjs_1 = __nccwpck_require__(5805); const operators_1 = __nccwpck_require__(7801); const graphql_1 = __nccwpck_require__(6320); @@ -196,28 +188,6 @@ const mutation = ` success } }`; -const ratelimitQuery = ` -query { - viewer { - login - } - rateLimit { - limit - cost - remaining - resetAt - } -}`; -function getRateLimit(token) { - return __awaiter(this, void 0, void 0, function* () { - return graphql_1.graphql(token, ratelimitQuery, { - headers: { - Accept: 'application/vnd.github.package-deletes-preview+json' - } - }); - }); -} -exports.getRateLimit = getRateLimit; function deletePackageVersion(packageVersionId, token) { if (deleted === 100) { console.log(`reaching rate limit`); diff --git a/src/delete.ts b/src/delete.ts index 403894e..22d2191 100644 --- a/src/delete.ts +++ b/src/delete.ts @@ -78,7 +78,7 @@ export function finalIds(input: Input): Observable { input.owner, input.repo, input.packageName, - 100, + RATE_LIMIT, '', input.token ).pipe( diff --git a/src/version/delete-version.ts b/src/version/delete-version.ts index e7b7814..07b20b7 100644 --- a/src/version/delete-version.ts +++ b/src/version/delete-version.ts @@ -18,39 +18,6 @@ const mutation = ` } }` -export interface RateLimitResponse { - viewer: { - login: string - } - ratelimit: { - limit: number - cost: number - remaining: number - resetAt: string - } -} - -const ratelimitQuery = ` -query { - viewer { - login - } - rateLimit { - limit - cost - remaining - resetAt - } -}` - -export async function getRateLimit(token: string): Promise { - return graphql(token, ratelimitQuery, { - headers: { - Accept: 'application/vnd.github.package-deletes-preview+json' - } - }) as Promise -} - export function deletePackageVersion( packageVersionId: string, token: string