From 3f73fd5e9d7aa8fcd38e23a893d274091d28b452 Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Fri, 17 Jan 2025 16:45:54 +0700 Subject: [PATCH 1/7] chore: disable onIssue and onIssueLabel job --- src/lib/server/trigger-dev/jobs/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/server/trigger-dev/jobs/index.ts b/src/lib/server/trigger-dev/jobs/index.ts index d57ea90..4fe4499 100644 --- a/src/lib/server/trigger-dev/jobs/index.ts +++ b/src/lib/server/trigger-dev/jobs/index.ts @@ -24,6 +24,7 @@ config.integrationsList.forEach((org) => { event: events.onIssue, org: org.name }), + enabled: false, integrations: { github }, run: async (payload, io, ctx) => createIssueCreationJob>(payload, io, ctx, org) @@ -52,6 +53,7 @@ config.integrationsList.forEach((org) => { event: events.onIssueLabel, org: org.name }), + enabled: false, integrations: { github }, run: async (payload, io, ctx) => createIssueJob>(payload, io, ctx, org) From 4a8c419167d7645fe79278e77e99ec19c7571269 Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Tue, 21 Jan 2025 15:13:26 +0700 Subject: [PATCH 2/7] chore: disable issue comment and check run --- src/lib/server/trigger-dev/jobs/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/server/trigger-dev/jobs/index.ts b/src/lib/server/trigger-dev/jobs/index.ts index 4fe4499..3f06256 100644 --- a/src/lib/server/trigger-dev/jobs/index.ts +++ b/src/lib/server/trigger-dev/jobs/index.ts @@ -39,6 +39,7 @@ config.integrationsList.forEach((org) => { event: events.onIssueComment, org: org.name }), + enabled: false, integrations: { github }, run: async (payload, io, ctx) => createIssueCommentJob>(payload, io, ctx, org) @@ -118,6 +119,7 @@ config.integrationsList.forEach((org) => { event: events.onCheckRun, org: org.name }), + enabled: false, concurrencyLimit: 1, integrations: { github }, run: async (payload, io, ctx) => From 790593aac775219c1094b30df0cfd5f2d21f96e0 Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Fri, 24 Jan 2025 13:33:18 +0700 Subject: [PATCH 3/7] chore: disable remaining jobs --- src/lib/server/trigger-dev/jobs/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/server/trigger-dev/jobs/index.ts b/src/lib/server/trigger-dev/jobs/index.ts index 3f06256..2ae65ed 100644 --- a/src/lib/server/trigger-dev/jobs/index.ts +++ b/src/lib/server/trigger-dev/jobs/index.ts @@ -69,6 +69,7 @@ config.integrationsList.forEach((org) => { event: events.onPullRequest, org: org.name }), + enabled: false, integrations: { github }, run: async (payload, io, ctx) => createPrJob>(payload, io, ctx) @@ -83,6 +84,7 @@ config.integrationsList.forEach((org) => { event: events.onPullRequestReview, org: org.name }), + enabled: false, integrations: { github }, run: async (payload, io, ctx) => createPrReviewJob>(payload, io, ctx) @@ -105,6 +107,7 @@ config.integrationsList.forEach((org) => { senderLogin: zod.string() }) }), + enabled: false, concurrencyLimit: 1, integrations: { github }, run: async (payload, io, ctx) => @@ -138,6 +141,7 @@ if (!isDev) { content: zod.string() }) }), + enabled: false, run: async (payload, io) => { const { content } = payload; @@ -152,6 +156,7 @@ if (!isDev) { id: 'github-create-bug-report-issue', name: 'Create Github bug report issue', version: '0.0.1', + enabled: false, trigger: eventTrigger({ name: 'github-create-bug-report-issue', schema: zod.object({ From 7a23e3e820223631db80545c30197b761570ecc9 Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Fri, 24 Jan 2025 16:16:51 +0700 Subject: [PATCH 4/7] feat: enable custom event --- src/lib/server/trigger-dev/jobs/index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/server/trigger-dev/jobs/index.ts b/src/lib/server/trigger-dev/jobs/index.ts index 2ae65ed..de68030 100644 --- a/src/lib/server/trigger-dev/jobs/index.ts +++ b/src/lib/server/trigger-dev/jobs/index.ts @@ -107,7 +107,6 @@ config.integrationsList.forEach((org) => { senderLogin: zod.string() }) }), - enabled: false, concurrencyLimit: 1, integrations: { github }, run: async (payload, io, ctx) => @@ -141,7 +140,6 @@ if (!isDev) { content: zod.string() }) }), - enabled: false, run: async (payload, io) => { const { content } = payload; @@ -156,7 +154,6 @@ if (!isDev) { id: 'github-create-bug-report-issue', name: 'Create Github bug report issue', version: '0.0.1', - enabled: false, trigger: eventTrigger({ name: 'github-create-bug-report-issue', schema: zod.object({ From 7ad100979833e2b065ce94ec9a57d815b49fc4dc Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Mon, 27 Jan 2025 14:50:46 +0700 Subject: [PATCH 5/7] feat: trigger check run using server api endpoint --- src/routes/api/submissions/+server.ts | 52 ++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 8 deletions(-) diff --git a/src/routes/api/submissions/+server.ts b/src/routes/api/submissions/+server.ts index a8b5c15..084495a 100644 --- a/src/routes/api/submissions/+server.ts +++ b/src/routes/api/submissions/+server.ts @@ -1,6 +1,8 @@ import { json } from '@sveltejs/kit'; +import axios from 'axios'; import { dev } from '$app/environment'; +import { TRIGGER_SERVER_SECRET, TRIGGER_SERVER_URL } from '$env/static/private'; import type { RequestHandler } from '@sveltejs/kit'; @@ -61,14 +63,15 @@ export const POST: RequestHandler = async ({ url, request, cookies }) => { ); // get last commit - await checkRunFromEvent( - pr.org, - pr.repo, - contributor.id!, - contributor.login!, - pr.number as number - ); + await triggerRequestCheckRun({ + org: pr.org, + repoName: pr.repo, + senderId: contributor.id!, + senderLogin: contributor.login!, + prNumber: pr.number as number + }); } + return json({ data: await submissions.create(body!) }); @@ -136,7 +139,13 @@ export const PATCH: RequestHandler = async ({ request, cookies, url }) => { if (body!.approval === 'pending') { // get last commit - await checkRunFromEvent(pr.org, pr.repo, body!.owner_id, user!.login, pr.number as number); + await triggerRequestCheckRun({ + org: pr.org, + repoName: pr.repo, + senderId: body!.owner_id, + senderLogin: user!.login, + prNumber: pr.number as number + }); } } @@ -157,3 +166,30 @@ const validateDate = (dateStr: string | null | undefined): Date => { const date = new Date(dateStr); return Number.isNaN(date.getTime()) ? new Date() : date; }; + +async function triggerRequestCheckRun(data: { + org: string; + repoName: string; + senderId: number; + senderLogin: string; + prNumber: number; +}) { + try { + const url = TRIGGER_SERVER_URL; + const secret = TRIGGER_SERVER_SECRET; + + if (!url || !secret) throw new Error('Trigger server not configured'); + + const res = await axios.post(`${url}/api/submission-event`, data, { + headers: { + 'x-trigger-server-secret': secret + } + }); + + console.log(res); + + if (res.status !== 200) throw new Error(res.data.message); + } catch (e) { + throw new Error((e as any)?.response?.data || 'Failed to trigger check run'); + } +} From c9aea0fe14213fa688ebefb8bf59a44c996df741 Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Mon, 27 Jan 2025 14:51:26 +0700 Subject: [PATCH 6/7] chore: disable custom events --- src/lib/server/trigger-dev/jobs/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/server/trigger-dev/jobs/index.ts b/src/lib/server/trigger-dev/jobs/index.ts index de68030..d2efbf8 100644 --- a/src/lib/server/trigger-dev/jobs/index.ts +++ b/src/lib/server/trigger-dev/jobs/index.ts @@ -107,6 +107,7 @@ config.integrationsList.forEach((org) => { senderLogin: zod.string() }) }), + enabled: false, concurrencyLimit: 1, integrations: { github }, run: async (payload, io, ctx) => @@ -140,6 +141,7 @@ if (!isDev) { content: zod.string() }) }), + enabled: false, run: async (payload, io) => { const { content } = payload; @@ -161,6 +163,7 @@ if (!isDev) { title: zod.string() }) }), + enabled: false, run: async (payload, io) => { const { content, title } = payload; From bce6c6941533b663626ce3680d35b9c37eae475a Mon Sep 17 00:00:00 2001 From: teodorus-nathaniel Date: Mon, 27 Jan 2025 14:56:32 +0700 Subject: [PATCH 7/7] chore: remove logs --- src/routes/api/submissions/+server.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/routes/api/submissions/+server.ts b/src/routes/api/submissions/+server.ts index 084495a..ac59642 100644 --- a/src/routes/api/submissions/+server.ts +++ b/src/routes/api/submissions/+server.ts @@ -186,8 +186,6 @@ async function triggerRequestCheckRun(data: { } }); - console.log(res); - if (res.status !== 200) throw new Error(res.data.message); } catch (e) { throw new Error((e as any)?.response?.data || 'Failed to trigger check run');