1
1
mirror of https://github.com/Burn-E99/TheArtificer.git synced 2026-06-04 09:03:50 -04:00

move utils around

This commit is contained in:
Ean Milligan
2025-05-03 20:58:18 -04:00
parent 3e6844ed10
commit 9a5574f91e
42 changed files with 121 additions and 90 deletions

View File

@@ -18,7 +18,7 @@ import { generateCountDetailsEmbed, generateDMFailed, generateRollEmbed } from '
import stdResp from 'endpoints/stdResponses.ts';
import utils from 'src/utils.ts';
import utils from 'utils/utils.ts';
export const onWorkerComplete = async (workerMessage: MessageEvent<SolvedRoll>, workerTimeout: number, rollRequest: QueuedRoll) => {
let apiErroredOut = false;
@@ -32,7 +32,7 @@ export const onWorkerComplete = async (workerMessage: MessageEvent<SolvedRoll>,
const pubEmbedDetails = await generateRollEmbed(
rollRequest.apiRoll ? rollRequest.api.userId : rollRequest.dd.originalMessage.authorId,
returnMsg,
rollRequest.modifiers,
rollRequest.modifiers
);
const gmEmbedDetails = await generateRollEmbed(rollRequest.apiRoll ? rollRequest.api.userId : rollRequest.dd.originalMessage.authorId, returnMsg, {
...rollRequest.modifiers,
@@ -143,14 +143,14 @@ export const onWorkerComplete = async (workerMessage: MessageEvent<SolvedRoll>,
JSON.stringify(
rollRequest.modifiers.count
? {
counts: countEmbed,
details: pubEmbedDetails,
}
counts: countEmbed,
details: pubEmbedDetails,
}
: {
details: pubEmbedDetails,
},
),
),
details: pubEmbedDetails,
}
)
)
);
}
}

View File

@@ -9,7 +9,7 @@ import { generateRollEmbed } from 'embeds/artigen.ts';
import stdResp from 'endpoints/stdResponses.ts';
import utils from 'src/utils.ts';
import utils from 'utils/utils.ts';
export const terminateWorker = async (rollWorker: Worker, rollRequest: QueuedRoll) => {
rollWorker.terminate();
@@ -24,12 +24,12 @@ export const terminateWorker = async (rollWorker: Worker, rollRequest: QueuedRol
(
await generateRollEmbed(
rollRequest.dd.originalMessage.authorId,
<SolvedRoll> {
<SolvedRoll>{
error: true,
errorCode: 'TooComplex',
errorMsg: 'Error: Roll took too long to process, try breaking roll down into simpler parts',
},
<RollModifiers> {},
<RollModifiers>{}
)
).embed,
],

View File

@@ -9,7 +9,7 @@ import { handleRollRequest } from 'artigen/managers/workerManager.ts';
import { rollingEmbed } from 'embeds/artigen.ts';
import { infoColor2 } from 'embeds/colors.ts';
import utils from 'src/utils.ts';
import utils from 'utils/utils.ts';
const rollQueue: Array<QueuedRoll> = [];
@@ -41,7 +41,9 @@ The results for this roll will replace this message when it is done.`,
setInterval(() => {
log(
LT.LOG,
`Checking rollQueue for items, rollQueue length: ${rollQueue.length}, currentWorkers: ${getWorkerCnt()}, config.limits.maxWorkers: ${config.limits.maxWorkers}`,
`Checking rollQueue for items, rollQueue length: ${rollQueue.length}, currentWorkers: ${getWorkerCnt()}, config.limits.maxWorkers: ${
config.limits.maxWorkers
}`
);
if (rollQueue.length && getWorkerCnt() < config.limits.maxWorkers) {
const rollRequest = rollQueue.shift();