Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
53 changes: 39 additions & 14 deletions src/services/nodeHelpService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ class NodeHelpService {
async fetchNodeHelp(node: ComfyNodeDefImpl, locale: string): Promise<string> {
const nodeSource = getNodeSource(node.python_module)

if (nodeSource.type === NodeSourceType.Blueprint) {
return node.description || ''
}

if (nodeSource.type === NodeSourceType.CustomNodes) {
return this.fetchCustomNodeHelp(node, locale)
} else {
Expand All @@ -19,39 +23,60 @@ class NodeHelpService {
locale: string
): Promise<string> {
const customNodeName = extractCustomNodeName(node.python_module)
let lastError: string | undefined
if (!customNodeName) {
throw new Error('Invalid custom node module')
}

// Try locale-specific path first
const localePath = `/extensions/${customNodeName}/docs/${node.name}/${locale}.md`
let res = await fetch(api.fileURL(localePath))
const localeDoc = await this.tryFetchMarkdown(localePath)
if (localeDoc.text) return localeDoc.text
lastError = localeDoc.errorText

if (!res.ok) {
// Fall back to non-locale path
const fallbackPath = `/extensions/${customNodeName}/docs/${node.name}.md`
res = await fetch(api.fileURL(fallbackPath))
}

if (!res.ok) {
throw new Error(res.statusText)
}
// Fall back to non-locale path
const fallbackPath = `/extensions/${customNodeName}/docs/${node.name}.md`
const fallbackDoc = await this.tryFetchMarkdown(fallbackPath)
if (fallbackDoc.text) return fallbackDoc.text
lastError = fallbackDoc.errorText ?? lastError

return res.text()
throw new Error(lastError ?? 'Help not found')
}

private async fetchCoreNodeHelp(
node: ComfyNodeDefImpl,
locale: string
): Promise<string> {
const mdUrl = `/docs/${node.name}/${locale}.md`
const res = await fetch(api.fileURL(mdUrl))
const doc = await this.tryFetchMarkdown(mdUrl)
if (!doc.text) {
throw new Error(doc.errorText ?? 'Help not found')
}

return doc.text
}

/**
* Fetch a markdown file and return its text, guarding against HTML/SPA fallbacks.
* Returns null when not OK or when the content type indicates HTML.
*/
private async tryFetchMarkdown(
path: string
): Promise<{ text: string | null; errorText?: string }> {
const res = await fetch(api.fileURL(path))

if (!res.ok) {
throw new Error(res.statusText)
return { text: null, errorText: res.statusText }
}

return res.text()
const contentType = res.headers?.get?.('content-type') ?? ''
const text = await res.text()

const isHtmlContentType = contentType.includes('text/html')

if (isHtmlContentType) return { text: null, errorText: res.statusText }

return { text }
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/workbench/utils/nodeHelpUtil.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ export function extractCustomNodeName(

export function getNodeHelpBaseUrl(node: ComfyNodeDefImpl): string {
const nodeSource = getNodeSource(node.python_module)
if (nodeSource.type === NodeSourceType.Blueprint) {
return ''
}
if (nodeSource.type === NodeSourceType.CustomNodes) {
const customNodeName = extractCustomNodeName(node.python_module)
if (customNodeName) {
Expand Down
Loading