From 21a6c99c5d5ac7fd1ed0e39b84d5e2767c2f42dc Mon Sep 17 00:00:00 2001 From: Namrata Jha Date: Tue, 21 Dec 2021 18:23:06 +0000 Subject: [PATCH] rate throttling at 100 --- dist/index.js | 13 ++++++------- src/delete.ts | 12 +++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dist/index.js b/dist/index.js index ff6d73d..87934e6 100644 --- a/dist/index.js +++ b/dist/index.js @@ -63,17 +63,16 @@ function finalIds(input) { 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 < 100) { + if (toDelete > 0 && input.numDeleted < 99) { // using input.numDeleted to keep track of deleted and remaining packages - if (input.numDeleted + toDelete > 100) { - toDelete = 100 - input.numDeleted; - input.numDeleted = 100; + if (input.numDeleted + toDelete > 99) { + toDelete = 99 - input.numDeleted; + input.numDeleted = 99; } else { input.numDeleted = input.numDeleted + toDelete; } - //return value.map(info => info.id).slice(0, toDelete) - return []; + return value.map(info => info.id).slice(0, toDelete); } else return []; @@ -95,7 +94,7 @@ function deleteVersions(input) { return rxjs_1.of(true); } const result = finalIds(input); - return result.pipe(operators_1.tap(value => (input.numDeleted = value.length < 100 ? value.length : 100)), operators_1.tap(() => { + return result.pipe(operators_1.tap(() => { if (input.numDeleted > 0) console.log(`${input.numDeleted} versions will be deleted`); }), operators_1.concatMap(ids => version_1.deletePackageVersions(ids, input.token))); diff --git a/src/delete.ts b/src/delete.ts index 87b98e7..1fa8ce1 100644 --- a/src/delete.ts +++ b/src/delete.ts @@ -88,16 +88,15 @@ export function finalIds(input: Input): Observable { 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 < 100) { + if (toDelete > 0 && input.numDeleted < 99) { // using input.numDeleted to keep track of deleted and remaining packages - if (input.numDeleted + toDelete > 100) { - toDelete = 100 - input.numDeleted - input.numDeleted = 100 + if (input.numDeleted + toDelete > 99) { + toDelete = 99 - input.numDeleted + input.numDeleted = 99 } else { input.numDeleted = input.numDeleted + toDelete } - //return value.map(info => info.id).slice(0, toDelete) - return [] + return value.map(info => info.id).slice(0, toDelete) } else return [] }) ) @@ -128,7 +127,6 @@ export function deleteVersions(input: Input): Observable { const result = finalIds(input) return result.pipe( - tap(value => (input.numDeleted = value.length < 100 ? value.length : 100)), tap(() => { if (input.numDeleted > 0) console.log(`${input.numDeleted} versions will be deleted`)