fix: replace eventemitter2 with emittery

scarlett
NGPixel 5 days ago
parent debbb10ed8
commit c83aae1b00
No known key found for this signature in database

@ -70,7 +70,7 @@ async function routes(app, options) {
}
)
app.get(
app.post(
'/checkForUpdate',
{
config: {

@ -172,7 +172,7 @@ export default {
async unsubscribeFromNotifications() {
if (this.pubsubClient) {
WIKI.events.outbound.offAny(this.notifyViaDB)
WIKI.events.inbound.removeAllListeners()
WIKI.events.inbound.clearListeners()
this.pubsubClient.release(true)
}
},
@ -182,15 +182,19 @@ export default {
* @param {string} event Event fired
* @param {object} value Payload of the event
*/
notifyViaDB(event, value) {
this.pubsubClient.query(`SELECT pg_notify($1, $2)`, [
'wiki',
JSON.stringify({
source: WIKI.INSTANCE_ID,
event,
value
})
])
notifyViaDB({ name, data }) {
try {
WIKI.dbManager.pubsubClient.query(`SELECT pg_notify($1, $2)`, [
'wiki',
JSON.stringify({
source: WIKI.INSTANCE_ID,
event: name,
value: data ?? null
})
])
} catch (err) {
WIKI.logger.warn(err)
}
},
/**
* Attempt initial connection

@ -26,7 +26,7 @@ import fastifyView from '@fastify/view'
import gracefulServer from '@gquittet/graceful-server'
import ajvFormats from 'ajv-formats'
import pug from 'pug'
import eventemitter2 from 'eventemitter2'
import Emittery from 'emittery'
import NodeCache from 'node-cache'
import configSvc from './core/config.js'
@ -121,8 +121,8 @@ async function preBoot() {
WIKI.cache = new NodeCache({ checkperiod: 0 })
WIKI.scheduler = await scheduler.init()
WIKI.events = {
inbound: new eventemitter2.EventEmitter2(),
outbound: new eventemitter2.EventEmitter2()
inbound: new Emittery(),
outbound: new Emittery()
}
}

@ -28,7 +28,7 @@ class Settings {
* @param {Object} value Setting value object
*/
async updateConfig(key, value) {
await WIKI.models
await WIKI.db
.insert(settingsTable)
.values({ key, value })
.onConflictDoUpdate({ target: settingsTable.key, set: { value } })

@ -27,8 +27,8 @@
"chalk": "5.6.2",
"cron-parser": "5.5.0",
"drizzle-orm": "1.0.0-beta.15-859cf75",
"emittery": "2.0.0",
"es-toolkit": "1.45.1",
"eventemitter2": "6.4.9",
"fastify": "5.7.1",
"fastify-favicon": "5.0.0",
"filesize": "11.0.13",
@ -2872,6 +2872,18 @@
"safe-buffer": "^5.0.1"
}
},
"node_modules/emittery": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/emittery/-/emittery-2.0.0.tgz",
"integrity": "sha512-FLtgn/CGBXiX3ZtPAm5q4LWWepHChOt55J9u01WFu3dyap2U7IwptlrqoE1COR/kxwdy/DOxIBALSxIW449I1g==",
"license": "MIT",
"engines": {
"node": ">=22"
},
"funding": {
"url": "https://github.com/sindresorhus/emittery?sponsor=1"
}
},
"node_modules/end-of-stream": {
"version": "1.4.5",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
@ -2978,12 +2990,6 @@
"node": ">=6"
}
},
"node_modules/eventemitter2": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.9.tgz",
"integrity": "sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==",
"license": "MIT"
},
"node_modules/events": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",

@ -56,8 +56,8 @@
"chalk": "5.6.2",
"cron-parser": "5.5.0",
"drizzle-orm": "1.0.0-beta.15-859cf75",
"emittery": "2.0.0",
"es-toolkit": "1.45.1",
"eventemitter2": "6.4.9",
"fastify": "5.7.1",
"fastify-favicon": "5.0.0",
"filesize": "11.0.13",

Loading…
Cancel
Save