Use @octokit/plugin-retry

package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@actions/core": "1.11.1",
     "@actions/github": "6.0.0",
+    "@octokit/plugin-retry": "7.1.2",
     "graphql": "16.9.0"
   },
   "devDependencies": {

src/filter.ts

@@ -0,0 +1,53 @@
+import * as core from '@actions/core'
+import { CommentsQuery } from './generated/graphql.js'
+
+type Inputs = {
+  authors: string[]
+  startsWith: string[]
+  endsWith: string[]
+  contains: string[]
+}
+
+export type Comment = NonNullable<
+  NonNullable<
+    NonNullable<NonNullable<NonNullable<CommentsQuery['repository']>['pullRequest']>['comments']>['nodes']
+  >[number]
+>
+
+export const filterComments = (q: CommentsQuery, inputs: Inputs): Comment[] => {
+  if (q.repository?.pullRequest?.comments.nodes == null) {
+    core.info(`unexpected response: repository === ${JSON.stringify(q.repository)}`)
+    return []
+  }
+  const comments = []
+  for (const node of q.repository.pullRequest.comments.nodes) {
+    if (node == null) {
+      continue
+    }
+    comments.push(node)
+  }
+  return comments.filter((c) => toMinimize(c, inputs))
+}
+
+export const toMinimize = (c: Comment, inputs: Inputs): boolean => {
+  if (c.isMinimized) {
+    return false
+  }
+  if (inputs.authors.some((a) => c.author?.login === a)) {
+    core.info(`authors filter matched: ${c.url}`)
+    return true
+  }
+  if (inputs.startsWith.some((s) => c.body.trimStart().startsWith(s))) {
+    core.info(`starts-with matched: ${c.url}`)
+    return true
+  }
+  if (inputs.endsWith.some((s) => c.body.trimEnd().endsWith(s))) {
+    core.info(`ends-with matched: ${c.url}`)
+    return true
+  }
+  if (inputs.contains.some((s) => c.body.includes(s))) {
+    core.info(`contains matched: ${c.url}`)
+    return true
+  }
+  return false
+}

src/github.ts

@@ -0,0 +1,8 @@
+import * as github from '@actions/github'
+import { retry } from '@octokit/plugin-retry'
+
+export type Octokit = ReturnType<typeof github.getOctokit>
+
+export const getOctokit = (token: string): Octokit => github.getOctokit(token, {}, retry)
+
+export const context = github.context

src/queries/comments.ts

@@ -1,8 +1,6 @@
-import * as github from '@actions/github'
+import * as github from '../github.js'
 import { CommentsQuery, CommentsQueryVariables } from '../generated/graphql.js'
 
-type Octokit = ReturnType<typeof github.getOctokit>
-
 const query = /* GraphQL */ `
   query comments($owner: String!, $name: String!, $number: Int!) {
     repository(owner: $owner, name: $name) {
@@ -23,6 +21,6 @@ const query = /* GraphQL */ `
   }
 `
 
-export const queryComments = async (o: Octokit, v: CommentsQueryVariables): Promise<CommentsQuery> => {
+export const queryComments = async (o: github.Octokit, v: CommentsQueryVariables): Promise<CommentsQuery> => {
   return await o.graphql<CommentsQuery>(query, v)
 }

src/queries/minimize.ts

@@ -1,8 +1,6 @@
-import * as github from '@actions/github'
+import * as github from '../github.js'
 import { MinimizeCommentMutation, MinimizeCommentMutationVariables } from '../generated/graphql.js'
 
-type Octokit = ReturnType<typeof github.getOctokit>
-
 const query = /* GraphQL */ `
   mutation minimizeComment($id: ID!) {
     minimizeComment(input: { classifier: OUTDATED, subjectId: $id }) {
@@ -12,7 +10,7 @@ const query = /* GraphQL */ `
 `
 
 export const minimizeComment = async (
-  o: Octokit,
+  o: github.Octokit,
   v: MinimizeCommentMutationVariables,
 ): Promise<MinimizeCommentMutation> => {
   return await o.graphql<MinimizeCommentMutation>(query, v)

src/run.ts

@@ -1,11 +1,9 @@
 import * as core from '@actions/core'
-import * as github from '@actions/github'
-import { CommentsQuery } from './generated/graphql.js'
+import * as github from './github.js'
+import { filterComments } from './filter.js'
 import { queryComments } from './queries/comments.js'
 import { minimizeComment } from './queries/minimize.js'
 
-type Octokit = ReturnType<typeof github.getOctokit>
-
 type Inputs = {
   authors: string[]
   startsWith: string[]
@@ -63,7 +61,7 @@ export const run = async (inputs: Inputs): Promise<void> => {
   }
 }
 
-const getCurrentLogin = async (octokit: Octokit) => {
+const getCurrentLogin = async (octokit: github.Octokit) => {
   try {
     const { data: user } = await octokit.rest.users.getAuthenticated()
     return user.login
@@ -72,47 +70,3 @@ const getCurrentLogin = async (octokit: Octokit) => {
     return 'github-actions'
   }
 }
-
-type Comment = NonNullable<
-  NonNullable<
-    NonNullable<NonNullable<NonNullable<CommentsQuery['repository']>['pullRequest']>['comments']>['nodes']
-  >[number]
->
-
-const filterComments = (q: CommentsQuery, inputs: Inputs): Comment[] => {
-  if (q.repository?.pullRequest?.comments.nodes == null) {
-    core.info(`unexpected response: repository === ${JSON.stringify(q.repository)}`)
-    return []
-  }
-  const comments = []
-  for (const node of q.repository.pullRequest.comments.nodes) {
-    if (node == null) {
-      continue
-    }
-    comments.push(node)
-  }
-  return comments.filter((c) => toMinimize(c, inputs))
-}
-
-export const toMinimize = (c: Comment, inputs: Inputs): boolean => {
-  if (c.isMinimized) {
-    return false
-  }
-  if (inputs.authors.some((a) => c.author?.login === a)) {
-    core.info(`authors filter matched: ${c.url}`)
-    return true
-  }
-  if (inputs.startsWith.some((s) => c.body.trimStart().startsWith(s))) {
-    core.info(`starts-with matched: ${c.url}`)
-    return true
-  }
-  if (inputs.endsWith.some((s) => c.body.trimEnd().endsWith(s))) {
-    core.info(`ends-with matched: ${c.url}`)
-    return true
-  }
-  if (inputs.contains.some((s) => c.body.includes(s))) {
-    core.info(`contains matched: ${c.url}`)
-    return true
-  }
-  return false
-}

tests/run.test.ts → tests/filter.test.ts

@@ -1,4 +1,4 @@
-import { toMinimize } from '../src/run.js'
+import { toMinimize } from '../src/filter.js'
 
 describe('filter to minimize', () => {
   test('no filter', () => {
@@ -15,7 +15,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeFalsy()
@@ -36,7 +35,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeFalsy()
@@ -57,7 +55,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeTruthy()
@@ -77,7 +74,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeFalsy()
@@ -97,7 +93,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: ['<!-- head -->'],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeTruthy()
@@ -116,7 +111,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: ['<!-- head -->'],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeFalsy()
@@ -136,7 +130,6 @@ describe('filter to minimize', () => {
           endsWith: ['<!-- tail -->'],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeTruthy()
@@ -155,7 +148,6 @@ describe('filter to minimize', () => {
           endsWith: ['<!-- tail -->'],
           startsWith: [],
           contains: [],
-          token: `token`,
         },
       ),
     ).toBeFalsy()
@@ -175,7 +167,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: ['<!-- mark -->'],
-          token: `token`,
         },
       ),
     ).toBeTruthy()
@@ -194,7 +185,6 @@ describe('filter to minimize', () => {
           endsWith: [],
           startsWith: [],
           contains: ['<!-- bar -->'],
-          token: `token`,
         },
       ),
     ).toBeFalsy()