From 52c9f75f4deb37a3bbe3013c5ec843d1699a2e77 Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 11 Dec 2024 11:51:44 +0000 Subject: [PATCH] refactor: extract repo metadata handlers --- server/routes/github/webhook.post.ts | 26 ++++++-------------------- server/utils/cached-cors.ts | 6 +++--- server/utils/metadata.ts | 26 ++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 server/utils/metadata.ts diff --git a/server/routes/github/webhook.post.ts b/server/routes/github/webhook.post.ts index 6ba70fa..ea04ccd 100644 --- a/server/routes/github/webhook.post.ts +++ b/server/routes/github/webhook.post.ts @@ -4,6 +4,7 @@ import { createAppAuth } from '@octokit/auth-app' import { Octokit } from '@octokit/rest' import { indexIssue, removeIssue, storagePrefixForRepo } from '../../utils/embeddings' +import { getMetadataForRepo, removeMetadataForRepo, setMetadataForRepo, type InstallationRepo } from '~~/server/utils/metadata' export default defineEventHandler(async (event) => { const isValidWebhook = await isValidGithubWebhook(event) @@ -16,7 +17,7 @@ export default defineEventHandler(async (event) => { const promises: Promise[] = [] if ('action' in body && 'installation' in body && !('client_payload' in body)) { if ('repository' in body && body.installation && body.repository) { - const repoMetadata = await hubKV().getItem(`repo:${body.repository.owner.login}:${body.repository.name}`) + const repoMetadata = await getMetadataForRepo(body.repository.owner.login, body.repository.name) if (repoMetadata && !repoMetadata.indexed) { promises.push(addRepos(event, body.installation, [body.repository])) } @@ -68,18 +69,6 @@ export default defineEventHandler(async (event) => { return null }) -export type InstallationRepo = { - id: number - node_id: string - name: string - full_name: string - private: boolean -} - -type RepoMetadata = InstallationRepo & { - indexed: boolean -} - async function addRepos(event: H3Event, installation: Installation | InstallationLite, repos: InstallationRepo[]) { const config = useRuntimeConfig(event) const octokit = new Octokit({ @@ -91,15 +80,12 @@ async function addRepos(event: H3Event, installation: Installation | Installatio }, }) - const kv = hubKV() - event.waitUntil(Promise.all(repos.map((repo) => { if (repo.private) { return } - const [owner, name] = repo.full_name.split('/') - return kv.setItem(`repo:${owner}:${name}`, { ...repo, indexed: false } satisfies RepoMetadata) + return setMetadataForRepo(owner!, name!, { ...repo, indexed: false }) }))) for (const repo of repos) { @@ -134,16 +120,16 @@ async function addRepos(event: H3Event, installation: Installation | Installatio console.log('added', promises.length - 1, 'issues from', `${owner}/${name}`, 'to the index') - event.waitUntil(kv.setItem(`repo:${owner}:${name}`, { ...repo, indexed: true } satisfies RepoMetadata)) + event.waitUntil(setMetadataForRepo(owner!, name!, { ...repo, indexed: true })) } } async function deleteRepo(event: H3Event, repo: InstallationRepo) { const [owner, name] = repo.full_name.split('/') - const kv = hubKV() - event.waitUntil(kv.removeItem(`repo:${owner}:${name}`)) + const kv = hubKV() + event.waitUntil(removeMetadataForRepo(owner!, name!)) const keys = await kv.getKeys(storagePrefixForRepo(owner!, name!)) await Promise.allSettled(keys.map(async key => kv.removeItem(key))).then((r) => { if (r.some(p => p.status === 'rejected')) { diff --git a/server/utils/cached-cors.ts b/server/utils/cached-cors.ts index 3b5ed2b..7dbf468 100644 --- a/server/utils/cached-cors.ts +++ b/server/utils/cached-cors.ts @@ -1,7 +1,7 @@ -import type { EventHandler } from 'h3' +import type { EventHandler, EventHandlerRequest, EventHandlerResponse } from 'h3' import type { CacheOptions } from 'nitropack/types' -export function defineCachedCorsEventHandler(eventHandler: EventHandler, cacheOptions?: CacheOptions) { +export function defineCachedCorsEventHandler(eventHandler: EventHandler, cacheOptions?: CacheOptions) { const handler = defineCachedEventHandler(eventHandler, cacheOptions) return defineEventHandler(async (event) => { @@ -14,7 +14,7 @@ export function defineCachedCorsEventHandler(eventHandler: EventHandler, cacheOp }) if (handled || event.method !== 'GET') { - return + return undefined as Response } return handler(event) diff --git a/server/utils/metadata.ts b/server/utils/metadata.ts new file mode 100644 index 0000000..2d12c9d --- /dev/null +++ b/server/utils/metadata.ts @@ -0,0 +1,26 @@ +export type InstallationRepo = { + id: number + node_id: string + name: string + full_name: string + private: boolean +} + +export type RepoMetadata = InstallationRepo & { + indexed: boolean +} + +export async function getMetadataForRepo(owner: string, name: string) { + const kv = hubKV() + return kv.getItem(`repo:${owner}:${name}`) +} + +export async function setMetadataForRepo(owner: string, name: string, metadata: RepoMetadata) { + const kv = hubKV() + return kv.setItem(`repo:${owner}:${name}`, metadata) +} + +export async function removeMetadataForRepo(owner: string, name: string) { + const kv = hubKV() + return kv.removeItem(`repo:${owner}:${name}`) +} -- knotmirror 0.0.1