Sultan
/
Flowise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1786 from Jaredude/bug/nodespool-file-map-error-handling 

handles scenario where NodesPool require call fails
This commit is contained in:
Henry Heng 2024-02-24 17:12:21 +08:00 committed by GitHub
parent 6247b678a8 23f7e7802f
commit 2290ba9cc0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
packages/server/src/NodesPool.ts
View File

@ -4,6 +4,7 @@ import { Dirent } from 'fs'
import { getNodeModulesPackagePath } from './utils' import { getNodeModulesPackagePath } from './utils'
import { promises } from 'fs' import { promises } from 'fs'
import { ICommonObject } from 'flowise-components' import { ICommonObject } from 'flowise-components'
import logger from './utils/logger'
export class NodesPool { export class NodesPool {
componentNodes: IComponentNodes = {} componentNodes: IComponentNodes = {}
@ -28,36 +29,40 @@ export class NodesPool {
return Promise.all( return Promise.all(
nodeFiles.map(async (file) => { nodeFiles.map(async (file) => {
if (file.endsWith('.js')) { if (file.endsWith('.js')) {
const nodeModule = await require(file) try {
const nodeModule = await require(file)
if (nodeModule.nodeClass) { if (nodeModule.nodeClass) {
const newNodeInstance = new nodeModule.nodeClass() const newNodeInstance = new nodeModule.nodeClass()
newNodeInstance.filePath = file newNodeInstance.filePath = file
// Replace file icon with absolute path // Replace file icon with absolute path
if ( if (
newNodeInstance.icon && newNodeInstance.icon &&
(newNodeInstance.icon.endsWith('.svg') || (newNodeInstance.icon.endsWith('.svg') ||
newNodeInstance.icon.endsWith('.png') || newNodeInstance.icon.endsWith('.png') ||
newNodeInstance.icon.endsWith('.jpg')) newNodeInstance.icon.endsWith('.jpg'))
) { ) {
const filePath = file.replace(/\\/g, '/').split('/') const filePath = file.replace(/\\/g, '/').split('/')
filePath.pop() filePath.pop()
const nodeIconAbsolutePath = `${filePath.join('/')}/${newNodeInstance.icon}` const nodeIconAbsolutePath = `${filePath.join('/')}/${newNodeInstance.icon}`
newNodeInstance.icon = nodeIconAbsolutePath newNodeInstance.icon = nodeIconAbsolutePath
// Store icon path for componentCredentials // Store icon path for componentCredentials
if (newNodeInstance.credential) { if (newNodeInstance.credential) {
for (const credName of newNodeInstance.credential.credentialNames) { for (const credName of newNodeInstance.credential.credentialNames) {
this.credentialIconPath[credName] = nodeIconAbsolutePath this.credentialIconPath[credName] = nodeIconAbsolutePath
}
} }
} }
}
const skipCategories = ['Analytic'] const skipCategories = ['Analytic']
if (!skipCategories.includes(newNodeInstance.category)) { if (!skipCategories.includes(newNodeInstance.category)) {
this.componentNodes[newNodeInstance.name] = newNodeInstance this.componentNodes[newNodeInstance.name] = newNodeInstance
}
} }
} catch (err) {
logger.error(`❌ [server]: Error during initDatabase with file ${file}:`, err)
} }
} }
}) })

3
packages/server/src/index.ts
View File

@ -85,7 +85,7 @@ export class App {
// Initialize database // Initialize database
this.AppDataSource.initialize() this.AppDataSource.initialize()
.then(async () => { .then(async () => {
logger.info('📦 [server]: Data Source has been initialized!') logger.info('📦 [server]: Data Source is being initialized!')
// Run Migrations Scripts // Run Migrations Scripts
await this.AppDataSource.runMigrations({ transaction: 'each' }) await this.AppDataSource.runMigrations({ transaction: 'each' })
@ -112,6 +112,7 @@ export class App {
// Initialize telemetry // Initialize telemetry
this.telemetry = new Telemetry() this.telemetry = new Telemetry()
logger.info('📦 [server]: Data Source has been initialized!')
}) })
.catch((err) => { .catch((err) => {
logger.error('❌ [server]: Error during Data Source initialization:', err) logger.error('❌ [server]: Error during Data Source initialization:', err)