diff --git a/eslint.config.mjs b/eslint.config.mjs index 0576c43..a287ae9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -2,6 +2,7 @@ import withNuxt from "./.nuxt/eslint.config.mjs"; import eslintConfigPrettier from "eslint-config-prettier/flat"; import vueI18n from "@intlify/eslint-plugin-vue-i18n"; +import noPrismaDelete from "./rules/no-prisma-delete.mts"; export default withNuxt([ eslintConfigPrettier, @@ -19,6 +20,7 @@ export default withNuxt([ }, ], "@intlify/vue-i18n/no-missing-keys": "error", + "drop/no-prisma-delete": "error", }, settings: { "vue-i18n": { @@ -29,5 +31,8 @@ export default withNuxt([ messageSyntaxVersion: "^11.0.0", }, }, + plugins: { + drop: { rules: { "no-prisma-delete": noPrismaDelete } }, + }, }, ]); diff --git a/rules/no-prisma-delete.mts b/rules/no-prisma-delete.mts new file mode 100644 index 0000000..e190fab --- /dev/null +++ b/rules/no-prisma-delete.mts @@ -0,0 +1,32 @@ +import type { TSESLint } from "@typescript-eslint/utils"; + +export default { + meta: { + type: "problem", + docs: { + description: "Don't use Prisma error-prone .delete function", + }, + messages: { + noPrismaDelete: + "Prisma .delete(...) function is used. Use .deleteMany(..) and check count instead.", + }, + schema: [], + }, + create(context) { + return { + CallExpression: function (node) { + const funcId = node.callee.property; + if (!funcId || funcId.name !== "delete") return; + const tableExpr = node.callee.object; + if (!tableExpr) return; + const prismaExpr = tableExpr.object; + if (!prismaExpr || prismaExpr.name !== "prisma") return; + context.report({ + node, + messageId: "noPrismaDelete", + }); + }, + }; + }, + defaultOptions: [], +} satisfies TSESLint.RuleModule<"noPrismaDelete">; diff --git a/server/api/v1/admin/auth/invitation/index.delete.ts b/server/api/v1/admin/auth/invitation/index.delete.ts index 195aae5..43177ad 100644 --- a/server/api/v1/admin/auth/invitation/index.delete.ts +++ b/server/api/v1/admin/auth/invitation/index.delete.ts @@ -17,6 +17,10 @@ export default defineEventHandler<{ const body = await readDropValidatedBody(h3, DeleteInvite); - await prisma.invitation.delete({ where: { id: body.id } }); + const { count } = await prisma.invitation.deleteMany({ + where: { id: body.id }, + }); + if (count == 0) + throw createError({ statusCode: 404, message: "Invitation not found." }); return {}; }); diff --git a/server/api/v1/admin/game/[id]/index.delete.ts b/server/api/v1/admin/game/[id]/index.delete.ts index 66e7027..1b32550 100644 --- a/server/api/v1/admin/game/[id]/index.delete.ts +++ b/server/api/v1/admin/game/[id]/index.delete.ts @@ -7,7 +7,7 @@ export default defineEventHandler(async (h3) => { const gameId = getRouterParam(h3, "id")!; - libraryManager.deleteGame(gameId); + await libraryManager.deleteGame(gameId); return {}; }); diff --git a/server/api/v1/admin/library/sources/index.delete.ts b/server/api/v1/admin/library/sources/index.delete.ts index 165a9b2..b4594e2 100644 --- a/server/api/v1/admin/library/sources/index.delete.ts +++ b/server/api/v1/admin/library/sources/index.delete.ts @@ -18,11 +18,13 @@ export default defineEventHandler<{ body: typeof DeleteLibrarySource.infer }>( const body = await readDropValidatedBody(h3, DeleteLibrarySource); - await prisma.library.delete({ + const { count } = await prisma.library.deleteMany({ where: { id: body.id, }, }); + if (count == 0) + throw createError({ statusCode: 404, message: "Library not found." }); libraryManager.removeLibrary(body.id); }, diff --git a/server/api/v1/admin/token/[id]/index.delete.ts b/server/api/v1/admin/token/[id]/index.delete.ts index 1e33730..dd9fac5 100644 --- a/server/api/v1/admin/token/[id]/index.delete.ts +++ b/server/api/v1/admin/token/[id]/index.delete.ts @@ -13,10 +13,10 @@ export default defineEventHandler(async (h3) => { statusMessage: "No id in router params", }); - const deleted = await prisma.aPIToken.delete({ + const { count } = await prisma.aPIToken.deleteMany({ where: { id: id, mode: APITokenMode.System }, })!; - if (!deleted) + if (count == 0) throw createError({ statusCode: 404, statusMessage: "Token not found" }); return; diff --git a/server/api/v1/admin/users/[id]/index.delete.ts b/server/api/v1/admin/users/[id]/index.delete.ts index 4b5b141..dc8f790 100644 --- a/server/api/v1/admin/users/[id]/index.delete.ts +++ b/server/api/v1/admin/users/[id]/index.delete.ts @@ -27,6 +27,7 @@ export default defineEventHandler(async (h3) => { if (!user) throw createError({ statusCode: 404, statusMessage: "User not found." }); + // eslint-disable-next-line drop/no-prisma-delete await prisma.user.delete({ where: { id: userId } }); await userStatsManager.deleteUser(); return { success: true }; diff --git a/server/api/v1/auth/signup/simple.post.ts b/server/api/v1/auth/signup/simple.post.ts index 9f11f92..c9e4c94 100644 --- a/server/api/v1/auth/signup/simple.post.ts +++ b/server/api/v1/auth/signup/simple.post.ts @@ -84,7 +84,7 @@ export default defineEventHandler<{ user: true, }, }), - prisma.invitation.delete({ where: { id: user.invitation } }), + prisma.invitation.deleteMany({ where: { id: user.invitation } }), ]); await userStatsManager.addUser(); diff --git a/server/api/v1/client/saves/[gameid]/[slotindex]/index.delete.ts b/server/api/v1/client/saves/[gameid]/[slotindex]/index.delete.ts index 0f36008..a055dd4 100644 --- a/server/api/v1/client/saves/[gameid]/[slotindex]/index.delete.ts +++ b/server/api/v1/client/saves/[gameid]/[slotindex]/index.delete.ts @@ -38,16 +38,14 @@ export default defineClientEventHandler( if (!game) throw createError({ statusCode: 400, statusMessage: "Invalid game ID" }); - const save = await prisma.saveSlot.delete({ + const { count } = await prisma.saveSlot.deleteMany({ where: { - id: { - userId: user.id, - gameId: gameId, - index: slotIndex, - }, + userId: user.id, + gameId: gameId, + index: slotIndex, }, }); - if (!save) + if (count == 0) throw createError({ statusCode: 404, statusMessage: "Save not found" }); }, ); diff --git a/server/api/v1/notifications/[id]/index.delete.ts b/server/api/v1/notifications/[id]/index.delete.ts index ac60839..c47b106 100644 --- a/server/api/v1/notifications/[id]/index.delete.ts +++ b/server/api/v1/notifications/[id]/index.delete.ts @@ -20,14 +20,14 @@ export default defineEventHandler(async (h3) => { userIds.push("system"); } - const notification = await prisma.notification.delete({ + const { count } = await prisma.notification.deleteMany({ where: { id: notificationId, userId: { in: userIds }, }, }); - if (!notification) + if (count == 0) throw createError({ statusCode: 400, statusMessage: "Invalid notification ID", diff --git a/server/api/v1/user/token/[id]/index.delete.ts b/server/api/v1/user/token/[id]/index.delete.ts index 54d1be1..2f0d473 100644 --- a/server/api/v1/user/token/[id]/index.delete.ts +++ b/server/api/v1/user/token/[id]/index.delete.ts @@ -13,10 +13,10 @@ export default defineEventHandler(async (h3) => { statusMessage: "No id in router params", }); - const deleted = await prisma.aPIToken.delete({ + const { count } = await prisma.aPIToken.deleteMany({ where: { id: id, userId: userId, mode: APITokenMode.User }, })!; - if (!deleted) + if (count == 0) throw createError({ statusCode: 404, statusMessage: "Token not found" }); return; diff --git a/server/internal/clients/handler.ts b/server/internal/clients/handler.ts index 960dd55..6b7da5f 100644 --- a/server/internal/clients/handler.ts +++ b/server/internal/clients/handler.ts @@ -185,15 +185,19 @@ export class ClientHandler { } async removeClient(id: string) { + const client = await prisma.client.findUnique({ where: { id } }); + if (!client) return false; const ca = useCertificateAuthority(); await ca.blacklistClient(id); + // eslint-disable-next-line drop/no-prisma-delete await prisma.client.delete({ where: { id, }, }); await userStatsManager.cacheUserStats(); + return true; } } diff --git a/server/internal/library/index.ts b/server/internal/library/index.ts index 0e6f0de..4c5b54c 100644 --- a/server/internal/library/index.ts +++ b/server/internal/library/index.ts @@ -378,12 +378,10 @@ class LibraryManager { } async deleteGameVersion(gameId: string, version: string) { - await prisma.gameVersion.delete({ + await prisma.gameVersion.deleteMany({ where: { - gameId_versionName: { - gameId: gameId, - versionName: version, - }, + gameId: gameId, + versionName: version, }, }); @@ -391,12 +389,12 @@ class LibraryManager { } async deleteGame(gameId: string) { - await prisma.game.delete({ + await prisma.game.deleteMany({ where: { id: gameId, }, }); - gameSizeManager.deleteGame(gameId); + await gameSizeManager.deleteGame(gameId); } async getGameVersionSize( diff --git a/server/internal/news/index.ts b/server/internal/news/index.ts index 00725eb..694ff26 100644 --- a/server/internal/news/index.ts +++ b/server/internal/news/index.ts @@ -124,7 +124,10 @@ class NewsManager { } async delete(id: string) { - const article = await prisma.article.delete({ + const article = await prisma.article.findUnique({ where: { id } }); + if (!article) return false; + // eslint-disable-next-line drop/no-prisma-delete + await prisma.article.delete({ where: { id }, }); if (article.imageObjectId) { diff --git a/server/internal/objects/fsBackend.ts b/server/internal/objects/fsBackend.ts index aedab6a..e6f58ec 100644 --- a/server/internal/objects/fsBackend.ts +++ b/server/internal/objects/fsBackend.ts @@ -259,16 +259,10 @@ class FsHashStore { */ async delete(id: ObjectReference) { await this.cache.remove(id); - - try { - // need to catch in case the object doesn't exist - await prisma.objectHash.delete({ - where: { - id, - }, - }); - } catch { - /* empty */ - } + await prisma.objectHash.deleteMany({ + where: { + id, + }, + }); } } diff --git a/server/internal/screenshots/index.ts b/server/internal/screenshots/index.ts index b41ac03..6035d69 100644 --- a/server/internal/screenshots/index.ts +++ b/server/internal/screenshots/index.ts @@ -53,12 +53,16 @@ class ScreenshotManager { * @param id */ async delete(id: string) { - const deletedScreenshot = await prisma.screenshot.delete({ + const screenshot = await prisma.screenshot.findUnique({ where: { id } }); + if (!screenshot) return false; + // eslint-disable-next-line drop/no-prisma-delete + await prisma.screenshot.delete({ where: { id, }, }); - await objectHandler.deleteAsSystem(deletedScreenshot.objectId); + await objectHandler.deleteAsSystem(screenshot.objectId); + return true; } /** diff --git a/server/internal/session/db.ts b/server/internal/session/db.ts index 5b8fd2e..de23a4c 100644 --- a/server/internal/session/db.ts +++ b/server/internal/session/db.ts @@ -43,12 +43,12 @@ export default function createDBSessionHandler(): SessionProvider { }, async removeSession(token) { await cache.remove(token); - await prisma.session.delete({ + const { count } = await prisma.session.deleteMany({ where: { token, }, }); - return true; + return count > 0; }, async cleanupSessions() { const now = new Date(); diff --git a/server/internal/userlibrary/index.ts b/server/internal/userlibrary/index.ts index 16db484..996ad3f 100644 --- a/server/internal/userlibrary/index.ts +++ b/server/internal/userlibrary/index.ts @@ -101,19 +101,16 @@ class UserLibraryManager { async collectionRemove(gameId: string, collectionId: string, userId: string) { // Delete if exists - return ( - ( - await prisma.collectionEntry.deleteMany({ - where: { - collectionId, - gameId, - collection: { - userId, - }, - }, - }) - ).count > 0 - ); + const { count } = await prisma.collectionEntry.deleteMany({ + where: { + collectionId, + gameId, + collection: { + userId, + }, + }, + }); + return count > 0; } async collectionCreate(name: string, userId: string) { @@ -133,12 +130,13 @@ class UserLibraryManager { } async deleteCollection(collectionId: string) { - await prisma.collection.delete({ + const { count } = await prisma.collection.deleteMany({ where: { id: collectionId, isDefault: false, }, }); + return count > 0; } }