@foundation0/git 1.2.5 → 1.3.0

package/src/issue-dependencies.ts

@@ -79,15 +79,44 @@ const fetchWithTimeout = async (url: string, init: RequestInit): Promise<Respons
 const readStream = async (stream: NodeJS.ReadableStream | null): Promise<Buffer> => {
   if (!stream) return Buffer.from([])
 
-  const chunks: Buffer[] = []
-  for await (const chunk of stream) {
-    if (typeof chunk === 'string') {
-      chunks.push(Buffer.from(chunk))
-    } else {
-      chunks.push(Buffer.from(chunk as ArrayBufferView))
+  return await new Promise<Buffer>((resolve) => {
+    const chunks: Buffer[] = []
+    let settled = false
+
+    const cleanup = () => {
+      stream.removeListener('data', onData)
+      stream.removeListener('end', onDone)
+      stream.removeListener('close', onDone)
+      stream.removeListener('error', onDone)
     }
-  }
-  return Buffer.concat(chunks)
+
+    const settle = () => {
+      if (settled) return
+      settled = true
+      cleanup()
+      resolve(Buffer.concat(chunks))
+    }
+
+    const onDone = () => settle()
+
+    const onData = (chunk: unknown) => {
+      try {
+        if (typeof chunk === 'string') {
+          chunks.push(Buffer.from(chunk))
+          return
+        }
+
+        chunks.push(Buffer.from(chunk as ArrayBufferView))
+      } catch {
+        // best effort
+      }
+    }
+
+    stream.on('data', onData)
+    stream.on('end', onDone)
+    stream.on('close', onDone)
+    stream.on('error', onDone)
+  })
 }
 
 const callCurl = async (
@@ -111,6 +140,7 @@ const callCurl = async (
   const timeoutSeconds = requestTimeoutMs > 0 ? Math.max(1, Math.ceil(requestTimeoutMs / 1000)) : null
   if (timeoutSeconds !== null) {
     args.push('--max-time', String(timeoutSeconds))
+    args.push('--connect-timeout', String(Math.max(1, Math.min(30, timeoutSeconds))))
   }
 
   for (const [name, value] of Object.entries(init.headers)) {
@@ -128,20 +158,54 @@ const callCurl = async (
     windowsHide: true,
   })
 
+  const hardTimeoutMs = requestTimeoutMs > 0 ? requestTimeoutMs + 2_000 : null
+  let hardTimedOut = false
+  const hardTimeoutId = hardTimeoutMs
+    ? setTimeout(() => {
+        hardTimedOut = true
+        try {
+          child.kill()
+        } catch {
+          // best effort
+        }
+        try {
+          child.stdout?.destroy()
+        } catch {
+          // best effort
+        }
+        try {
+          child.stderr?.destroy()
+        } catch {
+          // best effort
+        }
+      }, hardTimeoutMs)
+    : null
+
   if (init.body !== undefined) {
     child.stdin.write(init.body)
   }
   child.stdin.end()
 
-  const [stdoutBytes, stderrBytes] = await Promise.all([
-    readStream(child.stdout),
-    readStream(child.stderr),
-  ])
+  const stdoutPromise = readStream(child.stdout)
+  const stderrPromise = readStream(child.stderr)
 
-  const exitCode: number = await new Promise((resolve) => {
-    child.on('close', (code) => resolve(code ?? 0))
-    child.on('error', () => resolve(1))
-  })
+  let exitCode: number
+  try {
+    exitCode = await new Promise((resolve) => {
+      child.on('close', (code) => resolve(code ?? 0))
+      child.on('error', () => resolve(1))
+    })
+  } finally {
+    if (hardTimeoutId) {
+      clearTimeout(hardTimeoutId)
+    }
+  }
+
+  const [stdoutBytes, stderrBytes] = await Promise.all([stdoutPromise, stderrPromise])
+
+  if (hardTimedOut && requestTimeoutMs > 0) {
+    throw new Error(`Request timed out after ${requestTimeoutMs}ms: ${init.method} ${requestUrl}`)
+  }
 
   const stdout = stdoutBytes.toString('utf8')
   const stderr = stderrBytes.toString('utf8').trim()

package/src/platform/gitea-adapter.ts

@@ -386,6 +386,11 @@ export class GiteaPlatformAdapter {
       return values
     }
 
+    const isRepoScoped =
+      segments.length >= 2 &&
+      segments[0] === '{owner}' &&
+      segments[1] === '{repo}'
+
     if (values[0].includes('/') && placeholderCount >= 2) {
       const split = values[0].split('/')
       if (split.length >= 2 && split[0] && split[1]) {
@@ -394,12 +399,19 @@ export class GiteaPlatformAdapter {
       }
     }
 
-    if (placeholderCount >= 2 && values.length >= 2) {
-      return values
+    // For repo-scoped commands, allow passing the "rest" of the arguments (number/id/path) without
+    // explicitly providing owner/repo. The git-service layer can hydrate {owner}/{repo} from defaults.
+    //
+    // Example: swaggerPath "/repos/{owner}/{repo}/pulls/{number}" with args ["123"] should map to:
+    //   owner="{owner}" repo="{repo}" number="123"
+    //
+    // We achieve this by left-padding args with empty strings so mapSwaggerPath leaves placeholders intact.
+    if (isRepoScoped && placeholderCount > 2 && values.length === 1 && !values[0].includes('/')) {
+      values.unshift('', '')
     }
 
-    while (values.length < placeholderCount) {
-      values.push(`{v${values.length}}`)
+    if (placeholderCount >= 2 && values.length >= 2) {
+      return values
     }
 
     return values