Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion packages/backends/backend-test/src/createNewJob.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { NewJobData } from "@sidequest/backend";
import { DuplicatedJobError } from "@sidequest/core";
import { describe, it } from "vitest";
import { backend } from "./backend";

Expand Down Expand Up @@ -124,7 +125,7 @@ export default function defineCreateNewJobTestSuite() {
};

await backend.createNewJob(job);
await expect(backend.createNewJob(job2)).rejects.toThrow();
await expect(backend.createNewJob(job2)).rejects.toThrow(DuplicatedJobError);
});
});
}
17 changes: 15 additions & 2 deletions packages/backends/mongo/src/mongo-backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
UpdateJobData,
UpdateQueueData,
} from "@sidequest/backend";
import { JobData, JobState, QueueConfig } from "@sidequest/core";
import { DuplicatedJobError, JobData, JobState, QueueConfig } from "@sidequest/core";
import { Collection, Db, Filter, MongoClient } from "mongodb";
import { addCoalescedField, generateTimeBuckets, getTimeRangeConfig, matchDateRange, parseTimeRange } from "./utils";

Expand Down Expand Up @@ -156,7 +156,20 @@ export default class MongoBackend implements Backend {
inserted_at: now,
available_at: job.available_at ?? now,
};
await this.jobs.insertOne(doc);
try {
await this.jobs.insertOne(doc);
} catch (error) {
if (
error instanceof Error &&
(("code" in error && error.code === 11000) ||
error.message?.includes("E11000") ||
error.message?.includes("unique_digest"))
) {
throw new DuplicatedJobError(doc);
}

throw error;
}
return doc;
}

Expand Down
31 changes: 26 additions & 5 deletions packages/backends/mysql/src/mysql-backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,31 @@ const defaultKnexConfig = {
},
};

const MYSQL_ER_DUP_ENTRY = 1062;

function isUniqueDigestDuplicateError(error: unknown): boolean {
if (!(error instanceof Error)) {
return false;
}

const code = "code" in error ? error.code : undefined;
const errno = "errno" in error ? error.errno : undefined;
const sqlMessage = "sqlMessage" in error && typeof error.sqlMessage === "string" ? error.sqlMessage : "";
const constraint = "constraint" in error && typeof error.constraint === "string" ? error.constraint : "";
const details = `${error.message}\n${sqlMessage}\n${constraint}`;

if (!details.includes("unique_digest")) {
return false;
}

return (
code === "ER_DUP_ENTRY" ||
errno === MYSQL_ER_DUP_ENTRY ||
constraint === "sidequest_jobs_unique_digest_active_idx" ||
/duplicate entry/i.test(details)
);
}

export default class MysqlBackend extends SQLBackend {
constructor(dbConfig: string | SQLDriverConfig) {
const knexConfig: Knex.Config = {
Expand Down Expand Up @@ -119,11 +144,7 @@ export default class MysqlBackend extends SQLBackend {

return insertedJob;
} catch (error) {
if (
error instanceof Error &&
(error.message?.includes("sidequest_jobs.unique_digest") ||
("constraint" in error && error.constraint === "sidequest_jobs_unique_digest_active_idx"))
) {
if (isUniqueDigestDuplicateError(error)) {
throw new DuplicatedJobError(job as JobData);
}

Expand Down
Loading