Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release #117

Merged
merged 1 commit into from
Oct 11, 2024
+12 −11
Merged

chore: release #117

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions packages/scs-jobs/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const _filterJobData = (data: Data, encode: boolean, logger: Logger): Pic

if (encode) {
if (picked?.payload?.value && typeof picked.payload.value === 'string') {
(picked as any).payload = marshallProtobufAny(unmarshallProtobufAny(picked.payload, logger));
picked.payload = marshallProtobufAny(unmarshallProtobufAny(picked.payload, logger));
}
}

Expand All @@ -44,15 +44,17 @@ export const _filterJobData = (data: Data, encode: boolean, logger: Logger): Pic
picked.meta.modified = new Date(picked.meta.modified);
}

return picked as any;
return picked;
};


export const _filterQueuedJob = <T extends FilterOpts>(job: T, logger: Logger): T => {
const picked: T = {
...job,
type: job.name,
};
export const _filterQueuedJob = <T extends FilterOpts>(job: T, logger: Logger): Pick<T, 'id' | 'type' | 'data' | 'opts' | 'name'> => {
if (job && !job.type) {
(job as any).type = (job as any).name;
}
const picked: any = _.pick(job, [
'id', 'type', 'data', 'opts', 'name'
]);

if (picked?.data) {
picked.data = _filterJobData(picked.data, false, logger);
Expand All @@ -64,7 +66,6 @@ export const _filterQueuedJob = <T extends FilterOpts>(job: T, logger: Logger):
return picked;
};


export const runWorker = async (
queue: string,
concurrency: number,
Expand Down Expand Up @@ -93,13 +94,13 @@ export const runWorker = async (

logger.info(`Registering worker for queue ${queue}`);
const worker = new Worker(queue, async job => {
const filteredJob = _filterQueuedJob<JobType>(job as any, logger);
const filteredJob = _filterQueuedJob(job, logger);
// For recurring job add time so if service goes down we can fire jobs
// for the missed schedules comparing the last run time
let lastRunTime;
if (filteredJob?.opts?.repeat &&
((filteredJob.opts.repeat as any)?.every ||
(filteredJob.opts.repeat as any)?.pattern)) {
(filteredJob.opts.repeat?.every ||
filteredJob.opts.repeat?.pattern)) {
if (filteredJob?.data) {
// adding time to payload data for recurring jobs
const dateTime = new Date();
Expand Down
Loading