albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added worker to search for stuff in db (ask) #10

Browse source
This commit is contained in:
mrfry 2020-10-05 08:45:56 +02:00
parent ecd3a9805f
commit f1f7b86fea
3 changed files with 48 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/modules/api/api.js
View file

@ -33,7 +33,7 @@ const utils = require('../../utils/utils.js')
const actions = require('../../utils/actions.js')
const dbtools = require('../../utils/dbtools.js')
const auth = require('../../middlewares/auth.middleware.js')
const { searchData } = require('../../utils/classes.js')
// const { searchData } = require('../../utils/classes.js')
// files
const searchDataWorkerFile = './src/utils/searchData.js'
@ -763,49 +763,53 @@ function GetApp() {
)
}
// const worker = new Worker(searchDataWorkerFile, {
// workerData: {
// data,
// question,
// subj,
// recData,
// },
// })
// worker.on('error', (err) => {
// logger.Log('Search Data Worker error!', logger.GetColor('redbg'))
// console.error(err)
// // TODO: handle error
// })
// worker.on('exit', (code) => {
// logger.DebugLog('Search Data exit, code: ' + code, 'actions', 1)
// if (code !== 0) {
// logger.Log(
// 'Search Data Worker error! Exit code is not 0',
// logger.GetColor('redbg')
// )
// // TODO: handle error
// }
// })
// // let result = data.Search(question, subj, recData)
// worker.on('message', (workerMsg) => {
// const result = workerMsg
// res.json({
// result: result,
// success: true,
// })
// logger.DebugLog(`Question result length: ${result.length}`, 'ask', 1)
// logger.DebugLog(result, 'ask', 2)
// })
let result = searchData(data, question, subj, recData)
res.json({
result: result,
success: true,
const worker = new Worker(searchDataWorkerFile, {
workerData: {
data,
question,
subj,
recData,
},
})
logger.DebugLog(`Question result length: ${result.length}`, 'ask', 1)
logger.DebugLog(result, 'ask', 2)
worker.on('error', (err) => {
logger.Log('Search Data Worker error!', logger.GetColor('redbg'))
console.error(err)
res.json({
message: `There was an error processing the question: ${err.message}`,
result: [],
recievedData: JSON.stringify(req.query),
success: false,
})
})
worker.on('exit', (code) => {
logger.DebugLog('Search Data exit, code: ' + code, 'actions', 1)
if (code !== 0) {
logger.Log(
'Search Data Worker error! Exit code is not 0',
logger.GetColor('redbg')
)
}
})
worker.on('message', (workerMsg) => {
const result = workerMsg
res.json({
result: result,
success: true,
})
logger.DebugLog(`Question result length: ${result.length}`, 'ask', 1)
logger.DebugLog(result, 'ask', 2)
})
// let result = data.Search(question, subj, recData)
// res.json({
// result: result,
// success: true,
// })
// logger.DebugLog(`Question result length: ${result.length}`, 'ask', 1)
// logger.DebugLog(result, 'ask', 2)
} else {
logger.DebugLog(`Invalid question`, 'ask', 1)
res.json({

2
src/utils/classes.js
View file

@ -299,7 +299,6 @@ function searchQuestion(subj, question, questionData, subjName) {
}
})
// TODO: check if sorting is correct!
result = result.sort((q1, q2) => {
return q1.match < q2.match
})
@ -413,7 +412,6 @@ function searchData(data, question, subjName, questionData) {
}
}
// TODO: check if sorting is correct!
result = result.sort((q1, q2) => {
return q1.match < q2.match
})

2
src/utils/searchData.js
View file

@ -1,6 +1,6 @@
const { isMainThread, parentPort, workerData } = require('worker_threads')
const logger = require('../utils/logger.js')
const { searchData } = require('../../utils/classes.js')
const { searchData } = require('./classes.js')
if (!isMainThread) {
logger.DebugLog('Starting worker thread', 'searchdata', 1)