From 70328887da22637293b88f751a4951dd77fed0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:37:26 +0900 Subject: [PATCH 01/12] =?UTF-8?q?fix:=20target=E3=82=92esnext=E3=81=AB?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 559e7bc..2dac055 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,7 +9,7 @@ "strictNullChecks": true, "sourceMap": false, "resolveJsonModule": true, - "target": "es6", + "target": "esnext", "module": "commonjs", "removeComments": false, "noLib": false, From 90344c7e51ee469ae94662e8532706c9e60c7e1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:43:28 +0900 Subject: [PATCH 02/12] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..b417983 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "npm" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "daily" From 547973b6b39da14c3f7e468bdde5344b59e5e44d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:46:43 +0000 Subject: [PATCH 03/12] Bump @types/request from 2.48.5 to 2.48.12 Bumps [@types/request](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/request) from 2.48.5 to 2.48.12. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/request) --- updated-dependencies: - dependency-name: "@types/request" dependency-version: 2.48.12 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aee3bcb..e1eff45 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@types/koa-bodyparser": "5.0.2", "@types/koa-router": "7.4.1", "@types/node": "14.14.9", - "@types/request": "2.48.5", + "@types/request": "2.48.12", "crypto": "1.0.1", "koa": "2.13.0", "koa-bodyparser": "4.3.0", From e8496b27d85e5c2e25756419284007bdf1a24599 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:46:55 +0000 Subject: [PATCH 04/12] Bump ts-node from 9.0.0 to 10.9.2 Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 9.0.0 to 10.9.2. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Changelog](https://github.com/TypeStrong/ts-node/blob/main/development-docs/release-template.md) - [Commits](https://github.com/TypeStrong/ts-node/compare/v9.0.0...v10.9.2) --- updated-dependencies: - dependency-name: ts-node dependency-version: 10.9.2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aee3bcb..2095127 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "koa-bodyparser": "4.3.0", "koa-router": "10.0.0", "request": "2.88.2", - "ts-node": "9.0.0", + "ts-node": "10.9.2", "typescript": "4.1.2" }, "devDependencies": { From b1747639377d16e87d27701fa65d8da20e059c10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:47:00 +0000 Subject: [PATCH 05/12] Bump koa-bodyparser from 4.3.0 to 4.4.1 Bumps [koa-bodyparser](https://github.com/koajs/bodyparser) from 4.3.0 to 4.4.1. - [Release notes](https://github.com/koajs/bodyparser/releases) - [Changelog](https://github.com/koajs/bodyparser/blob/master/History.md) - [Commits](https://github.com/koajs/bodyparser/compare/4.3.0...4.4.1) --- updated-dependencies: - dependency-name: koa-bodyparser dependency-version: 4.4.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aee3bcb..58982c0 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@types/request": "2.48.5", "crypto": "1.0.1", "koa": "2.13.0", - "koa-bodyparser": "4.3.0", + "koa-bodyparser": "4.4.1", "koa-router": "10.0.0", "request": "2.88.2", "ts-node": "9.0.0", From c8354a727f0d6b87839fff7cda3b8ad6d566c435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:04:27 +0000 Subject: [PATCH 06/12] Bump typescript from 4.1.2 to 5.8.3 Bumps [typescript](https://github.com/microsoft/TypeScript) from 4.1.2 to 5.8.3. - [Release notes](https://github.com/microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml) - [Commits](https://github.com/microsoft/TypeScript/compare/v4.1.2...v5.8.3) --- updated-dependencies: - dependency-name: typescript dependency-version: 5.8.3 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c1443d4..4fc4af8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "koa-router": "10.0.0", "request": "2.88.2", "ts-node": "10.9.2", - "typescript": "4.1.2" + "typescript": "5.8.3" }, "devDependencies": { "@octokit/webhooks": "^13.2.7" From 3e6c56d62f460e82ba2d4eef85c4d65ad121b0eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:04:28 +0000 Subject: [PATCH 07/12] Bump koa and @types/koa Bumps [koa](https://github.com/koajs/koa) and [@types/koa](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa). These dependencies needed to be updated together. Updates `koa` from 2.13.0 to 2.16.1 - [Release notes](https://github.com/koajs/koa/releases) - [Changelog](https://github.com/koajs/koa/blob/master/History.md) - [Commits](https://github.com/koajs/koa/compare/2.13.0...v2.16.1) Updates `@types/koa` from 2.11.6 to 2.15.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa) --- updated-dependencies: - dependency-name: koa dependency-version: 2.16.1 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/koa" dependency-version: 2.15.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c1443d4..bc4417b 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,13 @@ "build": "tsc" }, "dependencies": { - "@types/koa": "2.11.6", + "@types/koa": "2.15.0", "@types/koa-bodyparser": "5.0.2", "@types/koa-router": "7.4.1", "@types/node": "14.14.9", "@types/request": "2.48.12", "crypto": "1.0.1", - "koa": "2.13.0", + "koa": "2.16.1", "koa-bodyparser": "4.4.1", "koa-router": "10.0.0", "request": "2.88.2", From 9fae3841768fd65781eeeffdc3285058880a0fcc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:13:44 +0000 Subject: [PATCH 08/12] Bump koa-router from 10.0.0 to 13.0.1 Bumps [koa-router](https://github.com/koajs/router) from 10.0.0 to 13.0.1. - [Release notes](https://github.com/koajs/router/releases) - [Changelog](https://github.com/koajs/router/blob/master/HISTORY.md) - [Commits](https://github.com/koajs/router/compare/v10.0.0...v13.0.1) --- updated-dependencies: - dependency-name: koa-router dependency-version: 13.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 509eb8f..8bb2221 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "crypto": "1.0.1", "koa": "2.16.1", "koa-bodyparser": "4.4.1", - "koa-router": "10.0.0", + "koa-router": "13.0.1", "request": "2.88.2", "ts-node": "10.9.2", "typescript": "5.8.3" From cb517d8f14732ae5f033c135f2fa2362109fcacb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:13:55 +0000 Subject: [PATCH 09/12] Bump @types/node from 14.14.9 to 22.14.1 Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.9 to 22.14.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-version: 22.14.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 509eb8f..50c9bd3 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "@types/koa": "2.15.0", "@types/koa-bodyparser": "5.0.2", "@types/koa-router": "7.4.1", - "@types/node": "14.14.9", + "@types/node": "22.14.1", "@types/request": "2.48.12", "crypto": "1.0.1", "koa": "2.16.1", From 089cb96f8e5e593aab9b69a51300b0931c9645d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:54:11 +0000 Subject: [PATCH 10/12] Bump @types/koa-router from 7.4.1 to 7.4.8 Bumps [@types/koa-router](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/koa-router) from 7.4.1 to 7.4.8. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/koa-router) --- updated-dependencies: - dependency-name: "@types/koa-router" dependency-version: 7.4.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6b84c0..43d5600 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@types/koa": "2.15.0", "@types/koa-bodyparser": "5.0.2", - "@types/koa-router": "7.4.1", + "@types/koa-router": "7.4.8", "@types/node": "22.14.1", "@types/request": "2.48.12", "crypto": "1.0.1", From 3b74ec1c7dc0e9b911d9af6c4caa05b084503ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Mon, 14 Apr 2025 21:33:04 +0900 Subject: [PATCH 11/12] fix: remove crypto --- package.json | 3 +-- src/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index a6b84c0..91c121d 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "@types/koa-router": "7.4.1", "@types/node": "22.14.1", "@types/request": "2.48.12", - "crypto": "1.0.1", "koa": "2.16.1", "koa-bodyparser": "4.4.1", "koa-router": "13.0.1", @@ -19,6 +18,6 @@ "typescript": "5.8.3" }, "devDependencies": { - "@octokit/webhooks": "^13.2.7" + "@octokit/webhooks": "13.8.0" } } diff --git a/src/index.ts b/src/index.ts index 2e5af43..05abe39 100644 --- a/src/index.ts +++ b/src/index.ts @@ -4,7 +4,7 @@ import * as Koa from 'koa'; import * as Router from 'koa-router'; import * as bodyParser from 'koa-bodyparser'; import * as request from 'request'; -import crypto = require('crypto'); +import * as crypto from 'node:crypto'; import type { EventPayloadMap } from '@octokit/webhooks/dist-types/generated/webhook-identifiers'; const config = require('../config.json'); @@ -40,7 +40,7 @@ const router = new Router(); router.post('/github', ctx => { const body = JSON.stringify(ctx.request.body); const hash = crypto.createHmac('sha1', secret).update(body).digest('hex'); - const sig1 = Buffer.from(ctx.headers['x-hub-signature']); + const sig1 = Buffer.from(ctx.headers['x-hub-signature'] as string); const sig2 = Buffer.from(`sha1=${hash}`); // シグネチャ比較 From 69c8d5b2a637a090b606991765a6d31a09dacf00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?= <46447427+samunohito@users.noreply.github.com> Date: Wed, 16 Apr 2025 22:08:51 +0900 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20request=E3=82=84=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/index.ts | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index c02674a..9309532 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "koa": "2.16.1", "koa-bodyparser": "4.4.1", "koa-router": "13.0.1", - "request": "2.88.2", "ts-node": "10.9.2", "typescript": "5.8.3" }, diff --git a/src/index.ts b/src/index.ts index 05abe39..14c2d70 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,7 +3,6 @@ import { EventEmitter } from 'events'; import * as Koa from 'koa'; import * as Router from 'koa-router'; import * as bodyParser from 'koa-bodyparser'; -import * as request from 'request'; import * as crypto from 'node:crypto'; import type { EventPayloadMap } from '@octokit/webhooks/dist-types/generated/webhook-identifiers'; @@ -19,15 +18,23 @@ class WebhookEventEmitter extends EventEmitter { const handler = new WebhookEventEmitter(); const post = async (text: string, home = true) => { - request.post(config.instance + '/api/notes/create', { - json: { + const instance = config.instance.endsWith('/') + ? config.instance.substring(0, config.instance.length - 1) + : config.instance; + + await fetch(`${instance}/api/notes/create`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ i: config.i, text, visibility: home ? 'home' : 'public', noExtractMentions: true, - noExtractHashtags: true - } - }); + noExtractHashtags: true, + }), + }) }; const app = new Koa(); @@ -59,7 +66,7 @@ const server = http.createServer(app.callback()); server.listen(config.port); -handler.on('status', event => { +handler.on('status', async event => { const state = event.state; switch (state) { case 'error': @@ -68,26 +75,24 @@ handler.on('status', event => { const parent = commit.parents[0]; // Fetch parent status - request({ - url: `${parent.url}/statuses`, - proxy: config.proxy, + await fetch(`${parent.url}/statuses`, { + method: "GET", headers: { 'User-Agent': 'misskey' - } - }, (err, res, body) => { - if (err) { - console.error(err); - return; - } - const parentStatuses = JSON.parse(body); + }, + }).then(async res => { + const parentStatuses = await res.json() const parentState = parentStatuses[0]?.state; const stillFailed = parentState === 'failure' || parentState === 'error'; if (stillFailed) { - post(`⚠️ **BUILD STILL FAILED** ⚠️: ?[${commit.commit.message}](${commit.html_url})`); + await post(`⚠️ **BUILD STILL FAILED** ⚠️: ?[${commit.commit.message}](${commit.html_url})`); } else { - post(`🚨 **BUILD FAILED** 🚨: → ?[${commit.commit.message}](${commit.html_url}) ←`); + await post(`🚨 **BUILD FAILED** 🚨: → ?[${commit.commit.message}](${commit.html_url}) ←`); } - }); + }).catch(err => { + console.error(err); + }) + break; } });