diff --git a/package-lock.json b/package-lock.json index 075f064..663721e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,14 +13,14 @@ "@ethersproject/keccak256": "^5.7.0", "@ethersproject/strings": "^5.7.0", "@faker-js/faker": "^8.0.2", - "@prisma/client": "^5.2.0", + "@prisma/client": "^5.5.2", "@semaphore-protocol/identity": "^3.15.0", "@socket.io/admin-ui": "^0.5.1", "bcrypt": "^5.1.1", "body-parser": "^1.20.2", "cors": "^2.8.5", "discreetly-claimcodes": "^1.1.5", - "discreetly-interfaces": "^0.1.41", + "discreetly-interfaces": "^0.1.42", "dotenv": "^16.3.1", "ethereumjs-util": "^7.1.5", "express": "^4.18.2", @@ -53,7 +53,7 @@ "express-async-handler": "^1.2.0", "jest": "^29.6.2", "nodemon": "^3.0.1", - "prisma": "^5.2.0", + "prisma": "^5.5.2", "rollup": "^3.26.2", "rollup-plugin-cleaner": "^1.0.0", "rollup-plugin-include-sourcemaps": "^0.7.0", @@ -1817,12 +1817,12 @@ } }, "node_modules/@prisma/client": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.2.0.tgz", - "integrity": "sha512-AiTjJwR4J5Rh6Z/9ZKrBBLel3/5DzUNntMohOy7yObVnVoTNVFi2kvpLZlFuKO50d7yDspOtW6XBpiAd0BVXbQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.5.2.tgz", + "integrity": "sha512-54XkqR8M+fxbzYqe+bIXimYnkkcGqgOh0dn0yWtIk6CQT4IUCAvNFNcQZwk2KqaLU+/1PHTSWrcHtx4XjluR5w==", "hasInstallScript": true, "dependencies": { - "@prisma/engines-version": "5.2.0-25.2804dc98259d2ea960602aca6b8e7fdc03c1758f" + "@prisma/engines-version": "5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a" }, "engines": { "node": ">=16.13" @@ -1837,16 +1837,16 @@ } }, "node_modules/@prisma/engines": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.2.0.tgz", - "integrity": "sha512-dT7FOLUCdZmq+AunLqB1Iz+ZH/IIS1Fz2THmKZQ6aFONrQD/BQ5ecJ7g2wGS2OgyUFf4OaLam6/bxmgdOBDqig==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.5.2.tgz", + "integrity": "sha512-Be5hoNF8k+lkB3uEMiCHbhbfF6aj1GnrTBnn5iYFT7GEr3TsOEp1soviEcBR0tYCgHbxjcIxJMhdbvxALJhAqg==", "devOptional": true, "hasInstallScript": true }, "node_modules/@prisma/engines-version": { - "version": "5.2.0-25.2804dc98259d2ea960602aca6b8e7fdc03c1758f", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.2.0-25.2804dc98259d2ea960602aca6b8e7fdc03c1758f.tgz", - "integrity": "sha512-jsnKT5JIDIE01lAeCj2ghY9IwxkedhKNvxQeoyLs6dr4ZXynetD0vTy7u6wMJt8vVPv8I5DPy/I4CFaoXAgbtg==" + "version": "5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.5.1-1.aebc046ce8b88ebbcb45efe31cbe7d06fd6abc0a.tgz", + "integrity": "sha512-O+qHFnZvAyOFk1tUco2/VdiqS0ym42a3+6CYLScllmnpbyiTplgyLt2rK/B9BTjYkSHjrgMhkG47S0oqzdIckA==" }, "node_modules/@rollup/plugin-commonjs": { "version": "25.0.2", @@ -3870,9 +3870,9 @@ "integrity": "sha512-pQueoGtBJk/FrTfGzepjqYfTLaymS+4t11byI4OcfjWQOagRsD7dtavGcowTVQ7Ib/vjKna5T+71WcgWZaAWuA==" }, "node_modules/discreetly-interfaces": { - "version": "0.1.41", - "resolved": "https://registry.npmjs.org/discreetly-interfaces/-/discreetly-interfaces-0.1.41.tgz", - "integrity": "sha512-EFSQn/SWTuFSaYMxZpbIFRFOMfvyZudL0HO0QGhi+w/EAaR+rTjHHbeTZG9chrS/HUSQ/vyH6JgotLAlQp5bVA==", + "version": "0.1.42", + "resolved": "https://registry.npmjs.org/discreetly-interfaces/-/discreetly-interfaces-0.1.42.tgz", + "integrity": "sha512-1nLULAJYc7ZC59gpT0sT3fyqjrhsdgUiRnMwd/jFq3v6wtESZAEma7eWw6SordVYxVUoOkAurxwEZf830aNQow==", "dependencies": { "@ethersproject/bytes": "^5.7.0", "@ethersproject/keccak256": "^5.7.0", @@ -7214,13 +7214,13 @@ } }, "node_modules/prisma": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.2.0.tgz", - "integrity": "sha512-FfFlpjVCkZwrqxDnP4smlNYSH1so+CbfjgdpioFzGGqlQAEm6VHAYSzV7jJgC3ebtY9dNOhDMS2+4/1DDSM7bQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.5.2.tgz", + "integrity": "sha512-WQtG6fevOL053yoPl6dbHV+IWgKo25IRN4/pwAGqcWmg7CrtoCzvbDbN9fXUc7QS2KK0LimHIqLsaCOX/vHl8w==", "devOptional": true, "hasInstallScript": true, "dependencies": { - "@prisma/engines": "5.2.0" + "@prisma/engines": "5.5.2" }, "bin": { "prisma": "build/index.js" diff --git a/package.json b/package.json index 6a6be16..b47038b 100644 --- a/package.json +++ b/package.json @@ -27,14 +27,14 @@ "@ethersproject/keccak256": "^5.7.0", "@ethersproject/strings": "^5.7.0", "@faker-js/faker": "^8.0.2", - "@prisma/client": "^5.2.0", + "@prisma/client": "^5.5.2", "@semaphore-protocol/identity": "^3.15.0", "@socket.io/admin-ui": "^0.5.1", "bcrypt": "^5.1.1", "body-parser": "^1.20.2", "cors": "^2.8.5", "discreetly-claimcodes": "^1.1.5", - "discreetly-interfaces": "^0.1.41", + "discreetly-interfaces": "^0.1.42", "dotenv": "^16.3.1", "ethereumjs-util": "^7.1.5", "express": "^4.18.2", @@ -67,7 +67,7 @@ "express-async-handler": "^1.2.0", "jest": "^29.6.2", "nodemon": "^3.0.1", - "prisma": "^5.2.0", + "prisma": "^5.5.2", "rollup": "^3.26.2", "rollup-plugin-cleaner": "^1.0.0", "rollup-plugin-include-sourcemaps": "^0.7.0", diff --git a/prisma/schema.prisma b/prisma/schema.prisma index e8dfdf4..2ba0ed6 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -84,7 +84,7 @@ model Messages { message String timeStamp DateTime @default(now()) roomId String - messageType String @default("TEXT") + messageType String? @default("TEXT") room Rooms @relation(fields: [roomId], references: [roomId]) proof String epoch Epoch? @relation(fields: [epochId], references: [id]) diff --git a/src/endpoints/gateways/theWord.ts b/src/endpoints/gateways/theWord.ts index d2cd116..6d7ad72 100644 --- a/src/endpoints/gateways/theWord.ts +++ b/src/endpoints/gateways/theWord.ts @@ -44,7 +44,7 @@ router.post( }); } } else { - res.status(500).json({ error: 'Invalid Proof' }); + res.status(500).json({ status: 'Invalid Proof' }); } }) ); diff --git a/src/websockets/index.ts b/src/websockets/index.ts index 6e2fedd..ea8338d 100644 --- a/src/websockets/index.ts +++ b/src/websockets/index.ts @@ -26,7 +26,7 @@ export function websocketSetup(io: SocketIOServer): NodeJS.Timer { pp('SocketIO: a user connected', 'debug'); socket.on('validateMessage', async (msg: MessageI) => { - msg.sessionID = socket.id; + msg.sessionId = socket.id; try { const room: RoomI | null = await findRoomById(String(msg.roomId)); if (!room) {