Merge branch 'main' into main

graphieros · web-flow · commit f53d5122aded · 2026-02-04T08:34:40.000+01:00
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
   code:
     name: 🤖 Autofix code
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ permissions:
 jobs:
   lint:
     name: 🔠 Lint project
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -40,7 +40,7 @@ jobs:
 
   types:
     name: 💪 Type check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -62,7 +62,7 @@ jobs:
 
   unit:
     name: 🧪 Unit tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -84,7 +84,7 @@ jobs:
 
   test:
     name: 🧪 Component tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -114,7 +114,7 @@ jobs:
 
   browser:
     name: 🖥️ Browser tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     container:
       image: mcr.microsoft.com/playwright:v1.58.0-noble
 
@@ -141,7 +141,7 @@ jobs:
 
   a11y:
     name: ♿ Accessibility audit
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest # See https://github.com/GoogleChrome/lighthouse/discussions/16834
     strategy:
       matrix:
         mode: [dark, light]
@@ -172,7 +172,7 @@ jobs:
 
   knip:
     name: 🧹 Unused code check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
diff --git a/.github/workflows/lunaria.yml b/.github/workflows/lunaria.yml
@@ -18,7 +18,7 @@ permissions:
 jobs:
   lunaria-overview:
     name: 🌝 Generate Lunaria Overview
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
 
     steps:
       - name: Checkout
diff --git a/app/composables/useI18nStatus.ts b/app/composables/useI18nStatus.ts
@@ -15,7 +15,7 @@ export function useI18nStatus() {
     responseType: 'json',
     server: false,
     // Cache the result to avoid refetching on navigation
-    getCachedData: key => useNuxtApp().payload.data[key] || useNuxtApp().static.data[key],
+    getCachedData: (key, nuxtApp) => nuxtApp.payload.data[key] ?? nuxtApp.static.data[key],
   })
 
   /**
diff --git a/app/error.vue b/app/error.vue
@@ -5,9 +5,9 @@ const props = defineProps<{
   error: NuxtError
 }>()
 
-const status = computed(() => props.error.status || 500)
+const status = computed(() => props.error.statusCode || 500)
 const statusText = computed(() => {
-  if (props.error.statusText) return props.error.statusText
+  if (props.error.statusMessage) return props.error.statusMessage
   switch (status.value) {
     case 404:
       return 'Page not found'
diff --git a/app/pages/index.vue b/app/pages/index.vue
@@ -25,7 +25,12 @@ const handleInput = isTouchDevice()
 
 useSeoMeta({
   title: () => $t('seo.home.title'),
+  ogTitle: () => $t('seo.home.title'),
+  twitterTitle: () => $t('seo.home.title'),
+  twitterCard: 'summary_large_image',
   description: () => $t('seo.home.description'),
+  ogDescription: () => $t('seo.home.description'),
+  twitterDescription: () => $t('seo.home.description'),
 })
 
 defineOgImageComponent('Default', {
diff --git a/docs/content/2.guide/1.features.md b/docs/content/2.guide/1.features.md
@@ -158,18 +158,32 @@ Make sure to replace `TYPE` with one of the options listed below and `YOUR_PACKA
 
 You can further customize your badges by appending query parameters to the badge URL.
 
+##### `labelColor`
+
+Overrides the default label color. You can pass a standard hex code (with or without the `#` prefix).
+
+- **Default**: `#0a0a0a`
+- **Usage**: `?labelColor=HEX_CODE`
+
+##### `label`
+
+Overrides the default label text. You can pass any string to customize the label displayed on the badge.
+
+- **Default**: Depends on the badge type (e.g., "version", "downloads/mo").
+- **Usage**: `?label=YOUR_LABEL`
+
 ##### `color`
 
 Overrides the default strategy color. You can pass a standard hex code (with or without the `#` prefix).
 
 - **Default**: Depends on the badge type (e.g., version is blue, downloads are orange).
 - **Usage**: `?color=HEX_CODE`
 
-| Example        | URL                                   |
-| :------------- | :------------------------------------ |
-| **Hot Pink**   | `.../badge/version/nuxt?color=ff69b4` |
-| **Pure Black** | `.../badge/version/nuxt?color=000000` |
-| **Brand Blue** | `.../badge/version/nuxt?color=3b82f6` |
+| Example        | URL                                    |
+| :------------- | :------------------------------------- |
+| **Hot Pink**   | `.../badge/version/nuxt?colorB=ff69b4` |
+| **Pure Black** | `.../badge/version/nuxt?colorB=000000` |
+| **Brand Blue** | `.../badge/version/nuxt?colorB=3b82f6` |
 
 ##### `name`
 
diff --git a/public/robots.txt b/public/robots.txt
@@ -4,4 +4,5 @@ Allow: /$
 Allow: /about$
 Allow: /search$
 Allow: /settings$
+Allow: /__og-image__/*
 Disallow: /
diff --git a/server/api/registry/badge/[type]/[...pkg].get.ts b/server/api/registry/badge/[type]/[...pkg].get.ts
@@ -14,6 +14,8 @@ const NPMS_API = 'https://api.npms.io/v2/package'
 const QUERY_SCHEMA = v.object({
   color: v.optional(v.string()),
   name: v.optional(v.string()),
+  labelColor: v.optional(v.string()),
+  label: v.optional(v.string()),
 })
 
 const COLORS = {
@@ -263,7 +265,9 @@ export default defineCachedEventHandler(
 
       const queryParams = v.safeParse(QUERY_SCHEMA, query)
       const userColor = queryParams.success ? queryParams.output.color : undefined
+      const labelColor = queryParams.success ? queryParams.output.labelColor : undefined
       const showName = queryParams.success && queryParams.output.name === 'true'
+      const userLabel = queryParams.success ? queryParams.output.label : undefined
 
       const badgeTypeResult = v.safeParse(BadgeTypeSchema, typeParam)
       const strategyKey = badgeTypeResult.success ? badgeTypeResult.output : 'version'
@@ -274,12 +278,15 @@ export default defineCachedEventHandler(
       const pkgData = await fetchNpmPackage(packageName)
       const strategyResult = await strategy(pkgData, requestedVersion)
 
-      const finalLabel = showName ? packageName : strategyResult.label
+      const finalLabel = userLabel ? userLabel : showName ? packageName : strategyResult.label
       const finalValue = strategyResult.value
 
       const rawColor = userColor ?? strategyResult.color
       const finalColor = rawColor?.startsWith('#') ? rawColor : `#${rawColor}`
 
+      const rawLabelColor = labelColor ?? '#0a0a0a'
+      const finalLabelColor = rawLabelColor?.startsWith('#') ? rawLabelColor : `#${rawLabelColor}`
+
       const leftWidth = measureTextWidth(finalLabel)
       const rightWidth = measureTextWidth(finalValue)
       const totalWidth = leftWidth + rightWidth
@@ -291,7 +298,7 @@ export default defineCachedEventHandler(
             <rect width="${totalWidth}" height="${height}" rx="3" fill="#fff"/>
           </clipPath>
           <g clip-path="url(#r)">
-            <rect width="${leftWidth}" height="${height}" fill="#0a0a0a"/>
+            <rect width="${leftWidth}" height="${height}" fill="${finalLabelColor}"/>
             <rect x="${leftWidth}" width="${rightWidth}" height="${height}" fill="${finalColor}"/>
           </g>
           <g text-anchor="middle" font-family="'Geist', system-ui, -apple-system, sans-serif" font-size="11">
diff --git a/server/api/social/like.delete.ts b/server/api/social/like.delete.ts
@@ -31,6 +31,9 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {
     })
     const result = await likesUtil.unlikeAPackageAndReturnLikes(body.packageName, loggedInUsersDid)
     return result
+  } else {
+    // Always unlike in the cache if this endpoint is called. May be a mismatch
+    await likesUtil.setUnlikeInCache(body.packageName, loggedInUsersDid)
   }
 
   console.warn(
diff --git a/server/utils/atproto/oauth.ts b/server/utils/atproto/oauth.ts
@@ -43,22 +43,33 @@ type EventHandlerWithOAuthSession<T extends EventHandlerRequest, D> = (
 ) => Promise<D>
 
 async function getOAuthSession(event: H3Event): Promise<OAuthSession | undefined> {
-  const clientMetadata = getOauthClientMetadata()
-  const serverSession = await useServerSession(event)
-  const { stateStore, sessionStore } = useOAuthStorage(serverSession)
+  try {
+    const clientMetadata = getOauthClientMetadata()
+    const serverSession = await useServerSession(event)
+    const { stateStore, sessionStore } = useOAuthStorage(serverSession)
 
-  const client = new NodeOAuthClient({
-    stateStore,
-    sessionStore,
-    clientMetadata,
-    requestLock: getOAuthLock(),
-  })
+    const client = new NodeOAuthClient({
+      stateStore,
+      sessionStore,
+      clientMetadata,
+      requestLock: getOAuthLock(),
+    })
 
-  const currentSession = await sessionStore.get()
-  if (!currentSession) return undefined
+    const currentSession = await sessionStore.get()
+    if (!currentSession) return undefined
 
-  // restore using the subject
-  return await client.restore(currentSession.tokenSet.sub)
+    // restore using the subject
+    return await client.restore(currentSession.tokenSet.sub)
+  } catch (error) {
+    // Log error safely without using util.inspect on potentially problematic objects
+    // The @atproto library creates error objects with getters that crash Node's util.inspect
+    // eslint-disable-next-line no-console
+    console.error(
+      '[oauth] Failed to get session:',
+      error instanceof Error ? error.message : 'Unknown error',
+    )
+    return undefined
+  }
 }
 
 /**
diff --git a/server/utils/atproto/utils/likes.ts b/server/utils/atproto/utils/likes.ts
@@ -168,9 +168,10 @@ export class PackageLikesUtils {
     let totalLikes = await this.cache.get<number>(totalLikesKey)
     if (!totalLikes) {
       totalLikes = await this.constellationLikes(subjectRef)
-      totalLikes = totalLikes + 1
-      await this.cache.set(totalLikesKey, totalLikes, CACHE_MAX_AGE)
     }
+    totalLikes = totalLikes + 1
+    await this.cache.set(totalLikesKey, totalLikes, CACHE_MAX_AGE)
+
     // We already know the user has not liked the package before so set in the cache
     await this.cache.set(CACHE_USER_LIKES_KEY(packageName, usersDid), true, CACHE_MAX_AGE)
     return {
@@ -212,6 +213,15 @@ export class PackageLikesUtils {
     }
   }
 
+  /**
+   * Access to unlike a package for a user in the cache.
+   * @param packageName
+   * @param usersDid
+   */
+  async setUnlikeInCache(packageName: string, usersDid: string) {
+    await this.cache.set(CACHE_USER_LIKES_KEY(packageName, usersDid), false, CACHE_MAX_AGE)
+  }
+
   /**
    * At this point you should have checked if the user had a record for the package on the network and removed it before updating the cache
    * @param packageName
@@ -230,7 +240,7 @@ export class PackageLikesUtils {
     await this.cache.set(totalLikesKey, totalLikes, CACHE_MAX_AGE)
 
     //Clean up
-    await this.cache.set(CACHE_USER_LIKES_KEY(packageName, usersDid), false, CACHE_MAX_AGE)
+    await this.setUnlikeInCache(packageName, usersDid)
     await this.cache.delete(CACHE_USERS_BACK_LINK(packageName, usersDid))
 
     return {
diff --git a/test/e2e/badge.spec.ts b/test/e2e/badge.spec.ts
@@ -102,6 +102,14 @@ test.describe('badge API', () => {
     })
   })
 
+  test('custom labelColor parameter is applied to SVG', async ({ page, baseURL }) => {
+    const customColor = '00ff00'
+    const url = toLocalUrl(baseURL, `/api/registry/badge/version/nuxt?labelColor=${customColor}`)
+    const { body } = await fetchBadge(page, url)
+
+    expect(body).toContain(`fill="#${customColor}"`)
+  })
+
   test('custom color parameter is applied to SVG', async ({ page, baseURL }) => {
     const customColor = 'ff69b4'
     const url = toLocalUrl(baseURL, `/api/registry/badge/version/nuxt?color=${customColor}`)
@@ -110,6 +118,14 @@ test.describe('badge API', () => {
     expect(body).toContain(`fill="#${customColor}"`)
   })
 
+  test('custom label parameter is applied to SVG', async ({ page, baseURL }) => {
+    const customLabel = 'my-label'
+    const url = toLocalUrl(baseURL, `/api/registry/badge/version/nuxt?label=${customLabel}`)
+    const { body } = await fetchBadge(page, url)
+
+    expect(body).toContain(customLabel)
+  })
+
   test('invalid badge type defaults to version strategy', async ({ page, baseURL }) => {
     const url = toLocalUrl(baseURL, '/api/registry/badge/invalid-type/nuxt')
     const { body } = await fetchBadge(page, url)

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,9 @@ export default eventHandlerWithOAuthSession(async (event, oAuthSession) => {`
`31`	`31`	`})`
`32`	`32`	`const result = await likesUtil.unlikeAPackageAndReturnLikes(body.packageName, loggedInUsersDid)`
`33`	`33`	`return result`
	`34`	`+ } else {`
	`35`	`+ // Always unlike in the cache if this endpoint is called. May be a mismatch`
	`36`	`+ await likesUtil.setUnlikeInCache(body.packageName, loggedInUsersDid)`
`34`	`37`	`}`
`35`	`38`
`36`	`39`	`console.warn(`