refactor: align the structure with npm

Signed-off-by: Umberto Sgueglia <usgueglia@contractor.linuxfoundation.org>

Author: ulemons

services/apps/packages_worker/src/maven/__tests__/normalize.test.ts

@@ -0,0 +1,130 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizeScmUrl } from '../extract'
+import { isPrerelease, parseRepoUrl } from '../normalize'
+
+describe('isPrerelease', () => {
+  it('returns false for a stable version', () => {
+    expect(isPrerelease('3.12.0')).toBe(false)
+  })
+
+  it('detects SNAPSHOT', () => {
+    expect(isPrerelease('1.0.0-SNAPSHOT')).toBe(true)
+  })
+
+  it('detects alpha', () => {
+    expect(isPrerelease('2.0.0-alpha')).toBe(true)
+    expect(isPrerelease('2.0.0-ALPHA.1')).toBe(true)
+  })
+
+  it('detects beta', () => {
+    expect(isPrerelease('1.5.0-beta.2')).toBe(true)
+  })
+
+  it('detects rc', () => {
+    expect(isPrerelease('4.0.0-rc1')).toBe(true)
+    expect(isPrerelease('4.0.0-RC.2')).toBe(true)
+  })
+
+  it('detects milestone (m1, m10)', () => {
+    expect(isPrerelease('5.3.0-m1')).toBe(true)
+    expect(isPrerelease('5.3.0-M10')).toBe(true)
+  })
+
+  it('returns false for versions with numbers that are not milestones', () => {
+    expect(isPrerelease('1.2.3')).toBe(false)
+    expect(isPrerelease('10.0.0')).toBe(false)
+  })
+})
+
+describe('parseRepoUrl', () => {
+  it('identifies github.com', () => {
+    expect(parseRepoUrl('https://github.com/apache/commons-lang')).toEqual({
+      host: 'github',
+      owner: 'apache',
+      name: 'commons-lang',
+    })
+  })
+
+  it('identifies gitlab.com', () => {
+    expect(parseRepoUrl('https://gitlab.com/owner/repo')).toEqual({
+      host: 'gitlab',
+      owner: 'owner',
+      name: 'repo',
+    })
+  })
+
+  it('identifies bitbucket.org', () => {
+    expect(parseRepoUrl('https://bitbucket.org/owner/repo')).toEqual({
+      host: 'bitbucket',
+      owner: 'owner',
+      name: 'repo',
+    })
+  })
+
+  it('returns other for unknown hosts', () => {
+    const result = parseRepoUrl('https://svn.example.com/repo')
+    expect(result?.host).toBe('other')
+  })
+
+  it('returns null for invalid URLs', () => {
+    expect(parseRepoUrl('not-a-url')).toBeNull()
+  })
+
+  it('handles URLs with no path segments', () => {
+    const result = parseRepoUrl('https://github.com/')
+    expect(result).toEqual({ host: 'github', owner: null, name: null })
+  })
+})
+
+describe('normalizeScmUrl', () => {
+  it('returns null for null input', () => {
+    expect(normalizeScmUrl(null)).toBeNull()
+  })
+
+  it('strips scm:git: prefix', () => {
+    expect(normalizeScmUrl('scm:git:https://github.com/apache/commons-lang')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('converts SSH git@ to https', () => {
+    expect(normalizeScmUrl('git@github.com:apache/commons-lang.git')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('converts git:// to https://', () => {
+    expect(normalizeScmUrl('git://github.com/apache/commons-lang.git')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('strips trailing .git', () => {
+    expect(normalizeScmUrl('https://github.com/apache/commons-lang.git')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('strips /tree/... path suffix', () => {
+    expect(normalizeScmUrl('https://github.com/apache/commons-lang/tree/master')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('strips trailing slash', () => {
+    expect(normalizeScmUrl('https://github.com/apache/commons-lang/')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('handles combined scm:git: + SSH form', () => {
+    expect(normalizeScmUrl('scm:git:git@github.com:apache/commons-lang.git')).toBe(
+      'https://github.com/apache/commons-lang',
+    )
+  })
+
+  it('returns null for non-https result', () => {
+    expect(normalizeScmUrl('svn://svn.apache.org/repos/commons-lang')).toBeNull()
+  })
+})

services/apps/packages_worker/src/maven/metadata.ts

@@ -29,14 +29,23 @@ export interface MavenVersionsMetadata {
   releaseVersion: string | null
 }
 
+export type MavenFetchError =
+  | { kind: 'NOT_FOUND' }
+  | { kind: 'RATE_LIMIT'; status: number }
+  | { kind: 'TRANSIENT'; message: string }
+
+export function isMavenFetchError(v: unknown): v is MavenFetchError {
+  return typeof v === 'object' && v !== null && 'kind' in v
+}
+
 async function sleep(ms: number): Promise<void> {
   return new Promise((r) => setTimeout(r, ms))
 }
 
 export async function resolveVersionsList(
   groupId: string,
   artifactId: string,
-): Promise<MavenVersionsMetadata | null> {
+): Promise<MavenVersionsMetadata | MavenFetchError> {
   const groupPath = groupId.replace(/\./g, '/')
   const url = `${MAVEN_REPO}/${groupPath}/${artifactId}/maven-metadata.xml`
 
@@ -61,25 +70,29 @@ export async function resolveVersionsList(
       return { versions, releaseVersion: release || latest || null }
     } catch (err) {
       if (axios.isAxiosError(err)) {
-        if (err.response?.status === 404) return null
+        const status = err.response?.status
+        if (status === 404) return { kind: 'NOT_FOUND' }
         // 429 = explicit rate limit, 403 = CDN throttle (Maven Central uses both)
-        if ((err.response?.status === 429 || err.response?.status === 403) && attempt < MAX_RETRIES) {
+        if ((status === 429 || status === 403) && attempt < MAX_RETRIES) {
           const delay = RETRY_BASE_MS * 2 ** attempt + Math.random() * 500
           await sleep(delay)
           continue
         }
+        if (status === 429 || status === 403) return { kind: 'RATE_LIMIT', status: status! }
       }
-      throw err
+      const message = err instanceof Error ? err.message : String(err)
+      return { kind: 'TRANSIENT', message }
     }
   }
 
-  return null
+  return { kind: 'RATE_LIMIT', status: 429 }
 }
 
 export async function resolveLatestVersion(
   groupId: string,
   artifactId: string,
 ): Promise<string | null> {
   const meta = await resolveVersionsList(groupId, artifactId)
-  return meta?.releaseVersion ?? null
+  if (isMavenFetchError(meta)) return null
+  return meta.releaseVersion
 }

services/apps/packages_worker/src/maven/normalize.ts

@@ -0,0 +1,19 @@
+export function isPrerelease(version: string): boolean {
+  return /-(SNAPSHOT|alpha|beta|rc|m\d+)/i.test(version)
+}
+
+export function parseRepoUrl(url: string): { host: string; owner: string | null; name: string | null } | null {
+  try {
+    const parsed = new URL(url)
+    const h = parsed.hostname.toLowerCase()
+    let host: string
+    if (h === 'github.com' || h.endsWith('.github.com')) host = 'github'
+    else if (h === 'gitlab.com' || h.includes('gitlab')) host = 'gitlab'
+    else if (h === 'bitbucket.org') host = 'bitbucket'
+    else host = 'other'
+    const parts = parsed.pathname.split('/').filter(Boolean)
+    return { host, owner: parts[0] ?? null, name: parts[1] ?? null }
+  } catch {
+    return null
+  }
+}