From 9fe51f6260e4778406b0c64a1271a1f3f2a7fe0f Mon Sep 17 00:00:00 2001 From: Huakun Date: Wed, 26 Mar 2025 01:08:16 -0400 Subject: [PATCH] Feat: gitea mirror (#262) * Update component props and add GitLab link - Made `ref` prop optional in TauriLink component - Added GitLab mirror URL to GitHubProvenanceCard - Included a link to the GitLab mirror in the card layout - Adjusted layout for StoreExtDetail component for better responsiveness - Imported Tooltip component for potential future use * chore: add parse-github-url dependency and update GitHub parsing logic - Added `parse-github-url` package as a dependency in `package.json`. - Updated `parseGitHubRepoFromUri` function to utilize `parse-github-url` for improved URI parsing. - Introduced `getGitHubRepoMetadata` function to fetch repository metadata using Octokit. - Updated validation data structure to include optional `repoId`. - Enhanced tests to cover new functionality and error handling for invalid URIs. * fix typo * refactor: update validation data structure and improve function documentation - Removed optional `repoId` from `ExtensionPublishValidationData` and adjusted related function to reflect this change. - Added a note in the `validateJsrPackageAsKunkunExtension` function documentation to clarify frontend/backend verification logic. - Updated `ExtPublishMetadata` to rename `repoId` to `repoNodeId` for clarity. * refactor: remove GitLab mirror link from GitHubProvenanceCard - Removed the GitLab mirror URL and its associated link from the GitHubProvenanceCard component. - Commented out the layout for the GitLab mirror instead of deleting it, preserving the structure for potential future use. * refactor: simplify GitHub repository URI parsing - Removed dependency on `parse-github-url` and implemented a regex-based approach for parsing GitHub repository URIs in the `parseGitHubRepoFromUri` function. - Enhanced error handling for invalid URIs while maintaining the function's output structure. * feat: add Gitea mirror link to GitHubProvenanceCard - Introduced a new link to the Gitea mirror repository in the GitHubProvenanceCard component. - Updated the layout to reflect the new mirror link while removing the commented-out GitLab mirror section. * refactor: enhance Globe component's location handling - Updated the Globe component to conditionally render markers based on the provided locations prop. - Simplified the destructuring of props for better readability. - Retained default marker locations for cases where no locations are provided. * pnpm lock --- .../src/__tests__/github.test.ts | 12 ++++-- packages/package-registry/src/github.ts | 18 +++++++++ packages/package-registry/src/jsr/index.ts | 8 +++- packages/package-registry/src/npm/index.ts | 2 + packages/supabase/src/models.ts | 5 ++- .../ui/src/components/animation/Globe.svelte | 40 +++++++++---------- .../ui/src/components/common/TauriLink.svelte | 2 +- .../extension/GitHubProvenanceCard.svelte | 7 ++++ .../extension/StoreExtDetail.svelte | 6 +-- pnpm-lock.yaml | 12 +----- 10 files changed, 72 insertions(+), 40 deletions(-) diff --git a/packages/package-registry/src/__tests__/github.test.ts b/packages/package-registry/src/__tests__/github.test.ts index 2e91c1e..69636a4 100644 --- a/packages/package-registry/src/__tests__/github.test.ts +++ b/packages/package-registry/src/__tests__/github.test.ts @@ -1,9 +1,15 @@ import { expect, test } from "bun:test" -import { parseGitHubRepoFromUri } from "../github" +import { getGitHubRepoMetadata, parseGitHubRepoFromUri } from "../github" test("parse github repo from uri", () => { - expect(parseGitHubRepoFromUri("https://github.com/huakunshen/kunkun-ext-ossinsight")).toEqual({ - owner: "huakunshen", + expect(parseGitHubRepoFromUri("https://github.com/kunkunsh/kunkun-ext-ossinsight")).toEqual({ + owner: "kunkunsh", repo: "kunkun-ext-ossinsight" }) + expect(() => parseGitHubRepoFromUri("invalid-uri")).toThrow("Invalid GitHub repository URI") +}) + +test("get github repo metadata", async () => { + const metadata = await getGitHubRepoMetadata("kunkunsh", "kunkun-ext-ossinsight") + expect(metadata).toBeDefined() }) diff --git a/packages/package-registry/src/github.ts b/packages/package-registry/src/github.ts index d07577f..6f94e0a 100644 --- a/packages/package-registry/src/github.ts +++ b/packages/package-registry/src/github.ts @@ -33,6 +33,12 @@ export function authenticatedUserIsMemberOfGitHubOrg( }) } +/** + * Parse a GitHub repository URI into owner and repo + * If not a valid GitHub repository URI, throw an error + * @param uri + * @returns owner and repo + */ export function parseGitHubRepoFromUri(uri: string): { owner: string repo: string @@ -46,3 +52,15 @@ export function parseGitHubRepoFromUri(uri: string): { const [, owner, repo] = match return { owner, repo } } + +/** + * Get GitHub repository metadata + * @param owner + * @param repo + * @param githubToken - Optional GitHub token to prevent rate limiting + * @returns repository metadata + */ +export function getGitHubRepoMetadata(owner: string, repo: string, githubToken?: string) { + const octokit = new Octokit({ auth: githubToken }) + return octokit.rest.repos.get({ owner, repo }).then((res) => res.data) +} diff --git a/packages/package-registry/src/jsr/index.ts b/packages/package-registry/src/jsr/index.ts index 66d12bb..e22bcdc 100644 --- a/packages/package-registry/src/jsr/index.ts +++ b/packages/package-registry/src/jsr/index.ts @@ -7,7 +7,11 @@ import { } from "@huakunshen/jsr-client/hey-api-client" import { ExtPackageJson, License } from "@kksh/api/models" import * as v from "valibot" -import { authenticatedUserIsMemberOfGitHubOrg, userIsPublicMemberOfGitHubOrg } from "../github" +import { + authenticatedUserIsMemberOfGitHubOrg, + getGitHubRepoMetadata, + userIsPublicMemberOfGitHubOrg +} from "../github" import type { ExtensionPublishValidationData } from "../models" import type { NpmPkgMetadata } from "../npm/models" import { getInfoFromRekorLog } from "../sigstore" @@ -205,6 +209,7 @@ export function jsrPackageExists(scope: string, name: string, version?: string): /** * Validate a Jsr package as a Kunkun extension + * !This function will also run in frontend, so if there is any verification logic that must be run in backend, do not add it here * - check if jsr pkg is linked to a github repo * - check if jsr pkg is signed with github action * - check if user's github username is the same as repo's owner name @@ -368,6 +373,7 @@ export async function validateJsrPackageAsKunkunExtension(payload: { } } const rekorInfo = await getInfoFromRekorLog(rekorLogId) + return { data: { pkgJson: parseResult.output, diff --git a/packages/package-registry/src/npm/index.ts b/packages/package-registry/src/npm/index.ts index 2624d49..3e29864 100644 --- a/packages/package-registry/src/npm/index.ts +++ b/packages/package-registry/src/npm/index.ts @@ -2,6 +2,7 @@ import { ExtPackageJson, License } from "@kksh/api/models" import * as v from "valibot" import { authenticatedUserIsMemberOfGitHubOrg, + getGitHubRepoMetadata, parseGitHubRepoFromUri, userIsPublicMemberOfGitHubOrg } from "../github" @@ -237,6 +238,7 @@ export async function validateNpmPackageAsKunkunExtension(payload: { provenance.summary.sourceRepositoryDigest, parseResult.output.readme ?? "README.md" ) + return { data: { pkgJson: parseResult.output, diff --git a/packages/supabase/src/models.ts b/packages/supabase/src/models.ts index 85535a7..8f8a6cc 100644 --- a/packages/supabase/src/models.ts +++ b/packages/supabase/src/models.ts @@ -20,7 +20,10 @@ export const ExtPublishMetadata = v.object({ repo: v.string("GitHub repo of the extension"), owner: v.string("GitHub owner of the extension"), commit: v.string("Commit hash of the extension"), - workflowPath: v.string("Workflow path of the extension") + workflowPath: v.string("Workflow path of the extension"), + repoNodeId: v.optional( + v.string("GitHub repo node ID of the extension (a string, not the number id)") + ) }) ) }) diff --git a/packages/ui/src/components/animation/Globe.svelte b/packages/ui/src/components/animation/Globe.svelte index 97991d6..4fc1cd8 100644 --- a/packages/ui/src/components/animation/Globe.svelte +++ b/packages/ui/src/components/animation/Globe.svelte @@ -12,8 +12,7 @@ // let className = "" // export { className as class } - let { locations = [], class: className }: { class?: string; locations?: [number, number][] } = - $props() + let { locations, class: className }: { class?: string; locations?: [number, number][] } = $props() let pointerInteracting: number | null = null let pointerInteractionMovement = 0 let canvas: HTMLCanvasElement @@ -54,24 +53,25 @@ baseColor: [0.3, 0.3, 0.3], markerColor: [251 / 255, 100 / 255, 21 / 255], glowColor: [1, 1, 1], - markers: locations.map((location) => { - return { - location: location, - size: 0.03 - } - }), - // [ - // { location: [14.5995, 120.9842], size: 0.03 }, - // { location: [19.076, 72.8777], size: 0.03 }, - // { location: [23.8103, 90.4125], size: 0.05 }, - // { location: [30.0444, 31.2357], size: 0.07 }, - // { location: [39.9042, 116.4074], size: 0.08 }, - // { location: [-23.5505, -46.6333], size: 0.05 }, - // { location: [19.4326, -99.1332], size: 0.04 }, - // { location: [40.7128, -74.006], size: 0.1 }, - // { location: [34.6937, 135.5022], size: 0.05 }, - // { location: [41.0082, 28.9784], size: 0.06 } - // ], + markers: locations + ? locations.map((location) => { + return { + location: location, + size: 0.03 + } + }) + : [ + { location: [14.5995, 120.9842], size: 0.03 }, + { location: [19.076, 72.8777], size: 0.03 }, + { location: [23.8103, 90.4125], size: 0.05 }, + { location: [30.0444, 31.2357], size: 0.07 }, + { location: [39.9042, 116.4074], size: 0.08 }, + { location: [-23.5505, -46.6333], size: 0.05 }, + { location: [19.4326, -99.1332], size: 0.04 }, + { location: [40.7128, -74.006], size: 0.1 }, + { location: [34.6937, 135.5022], size: 0.05 }, + { location: [41.0082, 28.9784], size: 0.06 } + ], // onRender: (state) => { // if (!pointerInteracting) { // // Called on every animation frame. diff --git a/packages/ui/src/components/common/TauriLink.svelte b/packages/ui/src/components/common/TauriLink.svelte index ce064d4..8a6bfa8 100644 --- a/packages/ui/src/components/common/TauriLink.svelte +++ b/packages/ui/src/components/common/TauriLink.svelte @@ -16,7 +16,7 @@ style?: HTMLAttributes["style"] class?: HTMLAttributes["class"] children: Snippet - ref: HTMLAnchorElement | HTMLButtonElement | null + ref?: HTMLAnchorElement | HTMLButtonElement | null } = $props() // @ts-expect-error window.__TAURI_INTERNALS__ is not defined in the browser diff --git a/packages/ui/src/components/extension/GitHubProvenanceCard.svelte b/packages/ui/src/components/extension/GitHubProvenanceCard.svelte index 8fd00c7..92e29e2 100644 --- a/packages/ui/src/components/extension/GitHubProvenanceCard.svelte +++ b/packages/ui/src/components/extension/GitHubProvenanceCard.svelte @@ -19,6 +19,7 @@ } = $props() const workflowRunId = githubActionInvocationId.split("/").at(-3) const workflowRunUrl = `https://github.com/${repoOwner}/${repoName}/actions/runs/${workflowRunId}/workflow` + const giteaMirrorUrl = `https://gitea.kunkun.sh/kunkun-extensions-mirror/${repoOwner}-${repoName}` @@ -60,6 +61,12 @@ class="underline">Transparentcy log entry

+

+ Mirror + + Mirror Repo + +

diff --git a/packages/ui/src/components/extension/StoreExtDetail.svelte b/packages/ui/src/components/extension/StoreExtDetail.svelte index 3b31517..2addcc4 100644 --- a/packages/ui/src/components/extension/StoreExtDetail.svelte +++ b/packages/ui/src/components/extension/StoreExtDetail.svelte @@ -4,7 +4,7 @@ import { ExtPackageJson, IconEnum, KunkunExtManifest } from "@kksh/api/models" import { ExtPublishMetadata, ExtPublishSourceTypeEnum } from "@kksh/supabase/models" import { type Tables } from "@kksh/supabase/types" - import { Badge, Button, ScrollArea, Separator } from "@kksh/svelte5" + import { Badge, Button, ScrollArea, Separator, Tooltip } from "@kksh/svelte5" import { Constants, IconMultiplexer } from "@kksh/ui" import { cn } from "@kksh/ui/utils" import { CircleCheckBigIcon, MoveRightIcon, Trash2Icon } from "lucide-svelte" @@ -186,7 +186,7 @@ {/if} -
+
{#if metadata && metadata.sourceType === ExtPublishSourceTypeEnum.jsr} @@ -201,7 +201,7 @@ href={`https://github.com/${metadata.git.owner}/${metadata.git.repo}/tree/${metadata.git.commit}`} target="_blank" > - + {metadata.git.owner}/{metadata.git.repo} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5ad64db..6f39340 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -338,7 +338,7 @@ importers: version: 8.25.0(eslint@9.21.0(jiti@2.4.0))(typescript@5.6.3) autoprefixer: specifier: ^10.4.20 - version: 10.4.20(postcss@8.5.3) + version: 10.4.20(postcss@8.4.49) bits-ui: specifier: 1.0.0-next.86 version: 1.0.0-next.86(svelte@5.20.5) @@ -18883,16 +18883,6 @@ snapshots: postcss: 8.5.1 postcss-value-parser: 4.2.0 - autoprefixer@10.4.20(postcss@8.5.3): - dependencies: - browserslist: 4.24.2 - caniuse-lite: 1.0.30001676 - fraction.js: 4.3.7 - normalize-range: 0.1.2 - picocolors: 1.1.1 - postcss: 8.5.3 - postcss-value-parser: 4.2.0 - available-typed-arrays@1.0.7: dependencies: possible-typed-array-names: 1.0.0