github-issue-tower-defence-management 2.63.4 → 2.63.6

package/bin/adapter/repositories/GitHubIssueCommentRepository.js

@@ -2,18 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitHubIssueCommentRepository = void 0;
 const commentDeduplication_1 = require("./commentDeduplication");
+const githubSecondaryRateLimitBreaker_1 = require("./issue/githubSecondaryRateLimitBreaker");
+const githubRateLimitRetry_1 = require("./issue/githubRateLimitRetry");
 function isRestCommentPayloadArray(value) {
     if (!Array.isArray(value))
         return false;
     return true;
 }
-function isCommentCacheEntry(value) {
+function isPageCacheEntry(value) {
     if (typeof value !== 'object' || value === null)
         return false;
     if (!('etag' in value) || typeof value.etag !== 'string')
         return false;
     if (!('comments' in value) || !Array.isArray(value.comments))
         return false;
+    if (!('hasNextPage' in value) || typeof value.hasNextPage !== 'boolean')
+        return false;
     return value.comments.every((c) => typeof c === 'object' &&
         c !== null &&
         'author' in c &&
@@ -23,6 +27,15 @@ function isCommentCacheEntry(value) {
         'createdAt' in c &&
         typeof c.createdAt === 'string');
 }
+function isCommentPageCache(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    if (!('pages' in value) ||
+        typeof value.pages !== 'object' ||
+        value.pages === null)
+        return false;
+    return Object.values(value.pages).every(isPageCacheEntry);
+}
 class GitHubIssueCommentRepository {
     constructor(token, commentCacheRepository = null) {
         this.token = token;
@@ -43,71 +56,88 @@ class GitHubIssueCommentRepository {
     commentCacheKey(owner, repo, issueNumber) {
         return `comments/${owner}/${repo}/${issueNumber}`;
     }
-    async readCommentCache(owner, repo, issueNumber) {
+    async readCommentPageCache(owner, repo, issueNumber) {
         if (!this.commentCacheRepository)
             return null;
         const raw = await this.commentCacheRepository.getSingle(this.commentCacheKey(owner, repo, issueNumber));
-        return isCommentCacheEntry(raw) ? raw : null;
+        return isCommentPageCache(raw) ? raw : null;
     }
-    async writeCommentCache(owner, repo, issueNumber, etag, comments) {
+    async writeCommentPageCache(owner, repo, issueNumber, pages) {
         if (!this.commentCacheRepository)
             return;
-        await this.commentCacheRepository.setSingle(this.commentCacheKey(owner, repo, issueNumber), {
-            etag,
-            comments: comments.map((c) => ({
-                author: c.author,
-                content: c.content,
-                createdAt: c.createdAt.toISOString(),
-            })),
-        });
+        await this.commentCacheRepository.setSingle(this.commentCacheKey(owner, repo, issueNumber), { pages });
     }
     async getCommentsFromIssue(issue) {
         const { owner, repo, issueNumber } = this.parseIssueUrl(issue);
-        const cachedEntry = await this.readCommentCache(owner, repo, issueNumber);
+        const existingCache = await this.readCommentPageCache(owner, repo, issueNumber);
+        const cachedPages = existingCache
+            ? { ...existingCache.pages }
+            : {};
+        const PER_PAGE = 100;
         const comments = [];
+        const updatedPages = { ...cachedPages };
+        let cacheWasUpdated = false;
         let page = 1;
         let hasNextPage = true;
-        let newEtag = null;
         while (hasNextPage) {
-            const url = `https://api.github.com/repos/${owner}/${repo}/issues/${issueNumber}/comments?per_page=100&page=${page}`;
+            const pageKey = String(page);
+            const url = `https://api.github.com/repos/${owner}/${repo}/issues/${issueNumber}/comments?per_page=${PER_PAGE}&page=${page}`;
             const headers = {
                 Authorization: `Bearer ${this.token}`,
                 Accept: 'application/vnd.github+json',
             };
-            if (page === 1 && cachedEntry) {
-                headers['If-None-Match'] = cachedEntry.etag;
+            const cachedPage = cachedPages[pageKey];
+            if (cachedPage) {
+                headers['If-None-Match'] = cachedPage.etag;
             }
             const response = await fetch(url, { headers });
-            if (response.status === 304 && cachedEntry) {
-                return cachedEntry.comments.map((c) => ({
-                    author: c.author,
-                    content: c.content,
-                    createdAt: new Date(c.createdAt),
-                }));
+            if (response.status === 304 && cachedPage) {
+                for (const c of cachedPage.comments) {
+                    comments.push({
+                        author: c.author,
+                        content: c.content,
+                        createdAt: new Date(c.createdAt),
+                    });
+                }
+                hasNextPage =
+                    cachedPage.hasNextPage || cachedPage.comments.length >= PER_PAGE;
+                page++;
+                continue;
             }
             if (!response.ok) {
                 throw new Error(`Failed to fetch comments from GitHub REST API: ${response.status} ${response.statusText}`);
             }
-            if (page === 1) {
-                newEtag = response.headers.get('ETag');
-            }
             const responseData = await response.json();
             if (!isRestCommentPayloadArray(responseData)) {
                 throw new Error('Unexpected response shape when fetching comments from GitHub REST API');
             }
-            for (const payload of responseData) {
-                comments.push({
-                    author: payload.user?.login ?? '',
-                    content: payload.body,
-                    createdAt: new Date(payload.created_at),
-                });
+            const pageComments = responseData.map((payload) => ({
+                author: payload.user?.login ?? '',
+                content: payload.body,
+                createdAt: new Date(payload.created_at),
+            }));
+            for (const c of pageComments) {
+                comments.push(c);
             }
             const linkHeader = response.headers.get('Link') ?? '';
             hasNextPage = linkHeader.includes('rel="next"');
+            const etag = response.headers.get('ETag');
+            if (etag) {
+                updatedPages[pageKey] = {
+                    etag,
+                    comments: pageComments.map((c) => ({
+                        author: c.author,
+                        content: c.content,
+                        createdAt: c.createdAt.toISOString(),
+                    })),
+                    hasNextPage,
+                };
+                cacheWasUpdated = true;
+            }
             page++;
         }
-        if (newEtag) {
-            await this.writeCommentCache(owner, repo, issueNumber, newEtag, comments);
+        if (cacheWasUpdated) {
+            await this.writeCommentPageCache(owner, repo, issueNumber, updatedPages);
         }
         return comments;
     }
@@ -155,6 +185,12 @@ class GitHubIssueCommentRepository {
                 return;
             }
         }
+        const stateFilePath = (0, githubSecondaryRateLimitBreaker_1.secondaryRateLimitStateFilePath)();
+        const nowMsBeforePost = Date.now();
+        const breaker = (0, githubSecondaryRateLimitBreaker_1.checkSecondaryRateLimitBreaker)(nowMsBeforePost, stateFilePath);
+        if (breaker.isBlocked && breaker.resetTimeMs !== null) {
+            throw new githubRateLimitRetry_1.GitHubRateLimitError(`GitHub secondary rate limit is active until ${new Date(breaker.resetTimeMs).toISOString()}`, new Date(breaker.resetTimeMs).toISOString());
+        }
         const response = await fetch(`https://api.github.com/repos/${owner}/${repo}/issues/${issueNumber}/comments`, {
             method: 'POST',
             headers: {
@@ -165,6 +201,13 @@ class GitHubIssueCommentRepository {
             body: JSON.stringify({ body: commentContent }),
         });
         if (!response.ok) {
+            const bodyText = await response.text().catch(() => '');
+            const nowMs = Date.now();
+            if ((0, githubRateLimitRetry_1.isSecondaryRateLimit)(response.headers, bodyText)) {
+                const backoffMs = (0, githubRateLimitRetry_1.computeSecondaryRateLimitBackoffMs)(response.headers, nowMs);
+                (0, githubSecondaryRateLimitBreaker_1.writeSecondaryRateLimitState)(nowMs + backoffMs, nowMs, stateFilePath);
+                throw new githubRateLimitRetry_1.GitHubRateLimitError(`HTTP ${response.status} GitHub API secondary rate limit exceeded`, new Date(nowMs + backoffMs).toISOString());
+            }
             throw new Error(`Failed to create comment via GitHub REST API: ${response.status} ${response.statusText}`);
         }
     }

package/bin/adapter/repositories/GitHubIssueCommentRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"GitHubIssueCommentRepository.js","sourceRoot":"","sources":["../../../src/adapter/repositories/GitHubIssueCommentRepository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GitHubIssueCommentRepository.js","sourceRoot":"","sources":["../../../src/adapter/repositories/GitHubIssueCommentRepository.ts"],"names":[],"mappings":"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"}

package/bin/adapter/repositories/issue/ApiV3CheerioRestIssueRepository.js

@@ -230,6 +230,13 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         this.lastIssuesFetchedAtByProjectId = new Map();
         this.getLastIssuesFetchedAt = (projectId) => this.lastIssuesFetchedAtByProjectId.get(projectId) ?? null;
         this.fetchWithRateLimitRetry = (request) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep);
+        /**
+         * Variant for content-creating requests (POST / PUT / PATCH / DELETE).
+         * Checks the shared secondary rate limit circuit breaker before issuing
+         * the request so that a block discovered by one process immediately
+         * silences all other processes on the host.
+         */
+        this.fetchWithRateLimitRetryForWrite = (request) => (0, githubRateLimitRetry_1.fetchWithGitHubRateLimitRetry)(request, this.sleep, Date.now, false, true);
         this.throwGitHubError = async (prefix, response) => {
             const bodyText = await response.clone().text();
             const isRateLimit = (0, githubRateLimitRetry_1.hasRateLimitSignals)(response.status, response.headers, bodyText);
@@ -1695,7 +1702,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.closePullRequest = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}`, {
                 method: 'PATCH',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1712,7 +1719,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const { owner, repo, issueNumber } = this.parseIssueUrl(issueUrl);
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/issues/${issueNumber}`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/issues/${issueNumber}`, {
                 method: 'PATCH',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1779,7 +1786,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.approvePullRequest = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1801,7 +1808,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 'Content-Type': 'application/json',
                 Accept: 'application/vnd.github+json',
             };
-            const mergeWith = (mergeMethod) => this.fetchWithRateLimitRetry(() => fetch(mergeUrl, {
+            const mergeWith = (mergeMethod) => this.fetchWithRateLimitRetryForWrite(() => fetch(mergeUrl, {
                 method: 'PUT',
                 headers,
                 body: JSON.stringify(mergeMethod ? { merge_method: mergeMethod } : {}),
@@ -1865,7 +1872,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                 body: commentBody,
                 comments: [inlineComment],
             };
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/reviews`, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1918,7 +1925,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
             const commitId = await this.fetchPullRequestHeadSha(owner, repo, prNumber, prUrl);
             const ownerSegment = encodeURIComponent(owner);
             const repoSegment = encodeURIComponent(repo);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}/comments`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${ownerSegment}/${repoSegment}/pulls/${prNumber}/comments`, {
                 method: 'POST',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -1988,7 +1995,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.updateBranch = async (prUrl) => {
             const { owner, repo, issueNumber: prNumber } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/update-branch`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/pulls/${prNumber}/update-branch`, {
                 method: 'PUT',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -2006,7 +2013,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
         };
         this.deletePullRequestBranch = async (prUrl, branchName) => {
             const { owner, repo } = this.parseIssueUrl(prUrl);
-            const response = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/refs/heads/${encodeURIComponent(branchName)}`, {
+            const response = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/git/refs/heads/${encodeURIComponent(branchName)}`, {
                 method: 'DELETE',
                 headers: {
                     Authorization: `Bearer ${this.ghToken}`,
@@ -2301,7 +2308,7 @@ class ApiV3CheerioRestIssueRepository extends BaseGitHubRepository_1.BaseGitHubR
                     throw new Error(`Unexpected response shape when fetching comments for ${issueOrPrUrl}`);
                 }
                 for (const comment of body) {
-                    const deleteResponse = await this.fetchWithRateLimitRetry(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/comments/${comment.id}`, {
+                    const deleteResponse = await this.fetchWithRateLimitRetryForWrite(() => fetch(`https://api.github.com/repos/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}/issues/comments/${comment.id}`, {
                         method: 'DELETE',
                         headers: {
                             Authorization: `Bearer ${this.ghToken}`,