Skip to content

fix: 设置保存提示透出宿主原文；带路径前缀的 apiBase 不再探活误报 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ExSchwi wants to merge 1 commit into from
Closed

fix: 设置保存提示透出宿主原文；带路径前缀的 apiBase 不再探活误报 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 73 additions & 15 deletions lib/client.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 24 additions & 3 deletions lib/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3170,6 +3170,11 @@ export class CommandCodeAdapter<C extends CommandCodeConnectionOptions = Command
// Keep received-but-unreadable bodies separate from requests that never
// received a response. The former used to be counted as "network".
const failed: UsageEndpointFailure[] = []
// Name the address every attempt actually used. A bare `/alpha/whoami`
// cannot tell a moved port from a wrong path, and behind a prefix reverse
// proxy the prefix is exactly the part that differs — the user's own
// ECONNREFUSED diagnosis needs scheme://host:port in the failure text.
const targetOf = (path: string): string => `${base.replace(/\/+$/, '')}${path}`

const getJson = async (path: string, share = true): Promise<Record<string, unknown> | undefined> => {
try {
Expand All @@ -3185,13 +3190,13 @@ export class CommandCodeAdapter<C extends CommandCodeConnectionOptions = Command
share,
)
if (record === undefined) {
failures.push(`${path}: HTTP ${status}${responseFailure ? `；${responseFailure}` : ''}`)
failures.push(`${targetOf(path)}: HTTP ${status}${responseFailure ? `；${responseFailure}` : ''}`)
failed.push(responseFailure ? { kind: 'invalid-response', status } : { kind: 'http', status })
return undefined
}
return record
} catch (error: unknown) {
failures.push(`${path}: ${readableErrorText(error)}`)
failures.push(`${targetOf(path)}: ${readableErrorText(error)}`)
failed.push({ kind: 'transport' })
return undefined
}
Expand Down
Loading