mirror of
https://github.com/langgenius/dify.git
synced 2026-02-09 23:20:12 -05:00
feat: introduce trigger functionality (#27644)
Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com> Co-authored-by: Stream <Stream_2@qq.com> Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com> Co-authored-by: zhsama <torvalds@linux.do> Co-authored-by: Harry <xh001x@hotmail.com> Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com> Co-authored-by: yessenia <yessenia.contact@gmail.com> Co-authored-by: hjlarry <hjlarry@163.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: WTW0313 <twwu@dify.ai> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
import type { AppMode } from '@/types/app'
|
||||
import { AppModeEnum } from '@/types/app'
|
||||
|
||||
export const getRedirectionPath = (
|
||||
isCurrentWorkspaceEditor: boolean,
|
||||
app: { id: string, mode: AppMode },
|
||||
app: { id: string, mode: AppModeEnum },
|
||||
) => {
|
||||
if (!isCurrentWorkspaceEditor) {
|
||||
return `/app/${app.id}/overview`
|
||||
}
|
||||
else {
|
||||
if (app.mode === 'workflow' || app.mode === 'advanced-chat')
|
||||
if (app.mode === AppModeEnum.WORKFLOW || app.mode === AppModeEnum.ADVANCED_CHAT)
|
||||
return `/app/${app.id}/workflow`
|
||||
else
|
||||
return `/app/${app.id}/configuration`
|
||||
@@ -17,7 +17,7 @@ export const getRedirectionPath = (
|
||||
|
||||
export const getRedirection = (
|
||||
isCurrentWorkspaceEditor: boolean,
|
||||
app: { id: string, mode: AppMode },
|
||||
app: { id: string, mode: AppModeEnum },
|
||||
redirectionFunc: (href: string) => void,
|
||||
) => {
|
||||
const redirectionPath = getRedirectionPath(isCurrentWorkspaceEditor, app)
|
||||
|
||||
52
web/utils/error-parser.ts
Normal file
52
web/utils/error-parser.ts
Normal file
@@ -0,0 +1,52 @@
|
||||
/**
|
||||
* Parse plugin error message from nested error structure
|
||||
* Extracts the real error message from PluginInvokeError JSON string
|
||||
*
|
||||
* @example
|
||||
* Input: { message: "req_id: xxx PluginInvokeError: {\"message\":\"Bad credentials\"}" }
|
||||
* Output: "Bad credentials"
|
||||
*
|
||||
* @param error - Error object (can be Response object or error with message property)
|
||||
* @returns Promise<string> or string - Parsed error message
|
||||
*/
|
||||
export const parsePluginErrorMessage = async (error: any): Promise<string> => {
|
||||
let rawMessage = ''
|
||||
|
||||
// Handle Response object from fetch/ky
|
||||
if (error instanceof Response) {
|
||||
try {
|
||||
const body = await error.clone().json()
|
||||
rawMessage = body?.message || error.statusText || 'Unknown error'
|
||||
}
|
||||
catch {
|
||||
rawMessage = error.statusText || 'Unknown error'
|
||||
}
|
||||
}
|
||||
else {
|
||||
rawMessage = error?.message || error?.toString() || 'Unknown error'
|
||||
}
|
||||
|
||||
console.log('rawMessage', rawMessage)
|
||||
|
||||
// Try to extract nested JSON from PluginInvokeError
|
||||
// Use greedy match .+ to capture the complete JSON object with nested braces
|
||||
const pluginErrorPattern = /PluginInvokeError:\s*(\{.+\})/
|
||||
const match = rawMessage.match(pluginErrorPattern)
|
||||
|
||||
if (match) {
|
||||
try {
|
||||
const errorData = JSON.parse(match[1])
|
||||
// Return the inner message if exists
|
||||
if (errorData.message)
|
||||
return errorData.message
|
||||
// Fallback to error_type if message not available
|
||||
if (errorData.error_type)
|
||||
return errorData.error_type
|
||||
}
|
||||
catch (parseError) {
|
||||
console.warn('Failed to parse plugin error JSON:', parseError)
|
||||
}
|
||||
}
|
||||
|
||||
return rawMessage
|
||||
}
|
||||
@@ -21,3 +21,44 @@ export function validateRedirectUrl(url: string): void {
|
||||
throw new Error(`Invalid URL: ${url}`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if URL is a private/local network address or cloud debug URL
|
||||
* @param url - The URL string to check
|
||||
* @returns true if the URL is a private/local address or cloud debug URL
|
||||
*/
|
||||
export function isPrivateOrLocalAddress(url: string): boolean {
|
||||
try {
|
||||
const urlObj = new URL(url)
|
||||
const hostname = urlObj.hostname.toLowerCase()
|
||||
|
||||
// Check for localhost
|
||||
if (hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1')
|
||||
return true
|
||||
|
||||
// Check for private IP ranges
|
||||
const ipv4Regex = /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/
|
||||
const ipv4Match = hostname.match(ipv4Regex)
|
||||
if (ipv4Match) {
|
||||
const [, a, b] = ipv4Match.map(Number)
|
||||
// 10.0.0.0/8
|
||||
if (a === 10)
|
||||
return true
|
||||
// 172.16.0.0/12
|
||||
if (a === 172 && b >= 16 && b <= 31)
|
||||
return true
|
||||
// 192.168.0.0/16
|
||||
if (a === 192 && b === 168)
|
||||
return true
|
||||
// 169.254.0.0/16 (link-local)
|
||||
if (a === 169 && b === 254)
|
||||
return true
|
||||
}
|
||||
|
||||
// Check for .local domains
|
||||
return hostname.endsWith('.local')
|
||||
}
|
||||
catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user