From 4f82ef46d0095f1867ca1cff2aa975de38a7cd67 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Thu, 24 Apr 2025 10:37:51 +0000 Subject: [PATCH] Clean up microservices package files and configurations --- packages/server/services/auth/package.json | 3 +- packages/server/services/chats/package.json | 5 +- packages/server/services/ems/ems.service.js | 62 ++++++++++--------- packages/server/services/ems/package.json | 13 ++-- packages/server/services/files/package.json | 1 - packages/server/services/main/main.service.js | 5 +- packages/server/services/main/package.json | 9 ++- packages/server/services/music/package.json | 8 +-- .../services/notifications/package.json | 3 +- packages/server/services/posts/log.txt | 0 packages/server/services/posts/package.json | 10 +-- .../server/services/posts/posts.service.js | 7 +-- packages/server/services/search/package.json | 5 +- .../server/services/search/search.service.js | 31 +++++----- .../server/services/users/users.service.js | 34 +++++----- 15 files changed, 88 insertions(+), 108 deletions(-) delete mode 100644 packages/server/services/posts/log.txt diff --git a/packages/server/services/auth/package.json b/packages/server/services/auth/package.json index 932e2eb2..2c943a0e 100644 --- a/packages/server/services/auth/package.json +++ b/packages/server/services/auth/package.json @@ -1,4 +1,3 @@ { - "name": "auth", - "version": "1.0.0" + "name": "auth" } diff --git a/packages/server/services/chats/package.json b/packages/server/services/chats/package.json index 4e136e1b..9a34bc34 100755 --- a/packages/server/services/chats/package.json +++ b/packages/server/services/chats/package.json @@ -1,4 +1,3 @@ { - "name": "chats", - "version": "0.60.2" -} \ No newline at end of file + "name": "chats" +} diff --git a/packages/server/services/ems/ems.service.js b/packages/server/services/ems/ems.service.js index 3efc85af..42eaf6c4 100644 --- a/packages/server/services/ems/ems.service.js +++ b/packages/server/services/ems/ems.service.js @@ -3,40 +3,42 @@ import nodemailer from "nodemailer" import DbManager from "@shared-classes/DbManager" import SharedMiddlewares from "@shared-middlewares" + export default class API extends Server { - static refName = "ems" - static useEngine = "hyper-express" - static routesPath = `${__dirname}/routes` - static listen_port = process.env.HTTP_LISTEN_PORT ?? 3007 + static refName = "ems" + static useEngine = "hyper-express" + static routesPath = `${__dirname}/routes` + static listen_port = process.env.HTTP_LISTEN_PORT ?? 3007 - middlewares = { - ...SharedMiddlewares - } + middlewares = { + ...SharedMiddlewares, + } - contexts = { - db: new DbManager(), - mailTransporter: nodemailer.createTransport({ - host: process.env.SMTP_HOSTNAME, - port: process.env.SMTP_PORT ?? 587, - secure: ToBoolean(process.env.SMTP_SECURE) ?? false, - auth: { - user: process.env.SMTP_USERNAME, - pass: process.env.SMTP_PASSWORD, - }, - }), - } + contexts = { + db: new DbManager(), + mailTransporter: nodemailer.createTransport({ + host: process.env.SMTP_HOSTNAME, + port: process.env.SMTP_PORT ?? 587, + secure: ToBoolean(process.env.SMTP_SECURE) ?? false, + auth: { + user: process.env.SMTP_USERNAME, + pass: process.env.SMTP_PASSWORD, + }, + }), + } - ipcEvents = { - "account:activation:send": require("./ipcEvents/accountActivation").default, - "new:login": require("./ipcEvents/newLogin").default, - "mfa:send": require("./ipcEvents/mfaSend").default, - "apr:send": require("./ipcEvents/aprSend").default, - "password:changed": require("./ipcEvents/passwordChanged").default, - } + ipcEvents = { + "account:activation:send": require("./ipcEvents/accountActivation") + .default, + "new:login": require("./ipcEvents/newLogin").default, + "mfa:send": require("./ipcEvents/mfaSend").default, + "apr:send": require("./ipcEvents/aprSend").default, + "password:changed": require("./ipcEvents/passwordChanged").default, + } - async onInitialize() { - await this.contexts.db.initialize() - } + async onInitialize() { + await this.contexts.db.initialize() + } } -Boot(API) \ No newline at end of file +Boot(API) diff --git a/packages/server/services/ems/package.json b/packages/server/services/ems/package.json index 0f28a259..142583aa 100644 --- a/packages/server/services/ems/package.json +++ b/packages/server/services/ems/package.json @@ -1,10 +1,7 @@ { - "name": "ems", - "description": "External Messaging Service (SMS, EMAIL, PUSH)", - "version": "0.1.0", - "dependencies": { - "handlebars": "^4.7.8", - "nodemailer": "^6.9.11", - "web-push": "^3.6.7" - } + "name": "ems", + "dependencies": { + "handlebars": "^4.7.8", + "nodemailer": "^6.9.11" + } } diff --git a/packages/server/services/files/package.json b/packages/server/services/files/package.json index 5071d937..c9a52227 100755 --- a/packages/server/services/files/package.json +++ b/packages/server/services/files/package.json @@ -4,7 +4,6 @@ "file-type": "^20.4.1", "fluent-ffmpeg": "^2.1.2", "mime-types": "^2.1.35", - "minio": "^7.0.32", "p-map": "4", "sharp": "0.32.6" } diff --git a/packages/server/services/main/main.service.js b/packages/server/services/main/main.service.js index 896a090d..817f6a22 100755 --- a/packages/server/services/main/main.service.js +++ b/packages/server/services/main/main.service.js @@ -7,9 +7,10 @@ import SharedMiddlewares from "@shared-middlewares" export default class API extends Server { static refName = "main" - static enableWebsockets = true + static useEngine = "hyper-express-ng" static routesPath = `${__dirname}/routes` static listen_port = process.env.HTTP_LISTEN_PORT || 3000 + static enableWebsockets = false middlewares = { ...require("@middlewares").default, @@ -26,8 +27,6 @@ export default class API extends Server { await this.contexts.db.initialize() await StartupDB() } - - handleWsAuth = require("@shared-lib/handleWsAuth").default } Boot(API) diff --git a/packages/server/services/main/package.json b/packages/server/services/main/package.json index aaa6e4ae..0baaaa2d 100755 --- a/packages/server/services/main/package.json +++ b/packages/server/services/main/package.json @@ -1,7 +1,6 @@ { - "name": "main", - "version": "0.60.2", - "dependencies": { - "@octokit/rest": "^20.0.2" - } + "name": "main", + "dependencies": { + "@octokit/rest": "^20.0.2" + } } diff --git a/packages/server/services/music/package.json b/packages/server/services/music/package.json index f114a35f..07e7f330 100755 --- a/packages/server/services/music/package.json +++ b/packages/server/services/music/package.json @@ -1,9 +1,3 @@ { - "name": "music", - "version": "0.60.2", - "dependencies": { - "ms": "^2.1.3", - "music-metadata": "^7.14.0", - "openai": "^4.47.2" - } + "name": "music" } diff --git a/packages/server/services/notifications/package.json b/packages/server/services/notifications/package.json index b4692cff..71499320 100644 --- a/packages/server/services/notifications/package.json +++ b/packages/server/services/notifications/package.json @@ -1,4 +1,3 @@ { - "name": "notifications", - "version": "1.0.0" + "name": "notifications" } diff --git a/packages/server/services/posts/log.txt b/packages/server/services/posts/log.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/packages/server/services/posts/package.json b/packages/server/services/posts/package.json index 56952f06..925e670e 100644 --- a/packages/server/services/posts/package.json +++ b/packages/server/services/posts/package.json @@ -1,7 +1,7 @@ { - "name": "posts", - "version": "1.0.0", - "dependencies": { - "moment-timezone": "^0.5.45" - } + "name": "posts", + "dependencies": { + "linebridge": "^1.0.0-a3", + "moment-timezone": "^0.5.45" + } } diff --git a/packages/server/services/posts/posts.service.js b/packages/server/services/posts/posts.service.js index 013ca605..1a226219 100644 --- a/packages/server/services/posts/posts.service.js +++ b/packages/server/services/posts/posts.service.js @@ -1,5 +1,5 @@ -import { Server } from "../../../../linebridge/server/src" -//import { Server } from "linebridge" +//import { Server } from "../../../../linebridge/server/src" +import { Server } from "linebridge" import DbManager from "@shared-classes/DbManager" import RedisClient from "@shared-classes/RedisClient" @@ -10,10 +10,9 @@ import SharedMiddlewares from "@shared-middlewares" export default class API extends Server { static refName = "posts" - //static useEngine = "hyper-express-ng" static websockets = true static listenPort = process.env.HTTP_LISTEN_PORT ?? 3001 - // static useMiddlewares = ["logs"] + static useMiddlewares = ["logs"] static bypassCors = true middlewares = { diff --git a/packages/server/services/search/package.json b/packages/server/services/search/package.json index 4373c84f..68b82853 100644 --- a/packages/server/services/search/package.json +++ b/packages/server/services/search/package.json @@ -1,6 +1,3 @@ { - "name": "search", - "version": "1.0.0", - "main": "index.js", - "license": "MIT" + "name": "search" } diff --git a/packages/server/services/search/search.service.js b/packages/server/services/search/search.service.js index de54af63..109161b8 100644 --- a/packages/server/services/search/search.service.js +++ b/packages/server/services/search/search.service.js @@ -6,24 +6,23 @@ import RedisClient from "@shared-classes/RedisClient" import SharedMiddlewares from "@shared-middlewares" class API extends Server { - static refName = "search" - static wsRoutesPath = `${__dirname}/ws_routes` - static routesPath = `${__dirname}/routes` - static listen_port = process.env.HTTP_LISTEN_PORT ?? 3010 + static refName = "search" + static routesPath = `${__dirname}/routes` + static listen_port = process.env.HTTP_LISTEN_PORT ?? 3010 - middlewares = { - ...SharedMiddlewares - } + middlewares = { + ...SharedMiddlewares, + } - contexts = { - db: new DbManager(), - redis: RedisClient(), - } + contexts = { + db: new DbManager(), + redis: RedisClient(), + } - async onInitialize() { - await this.contexts.db.initialize() - await this.contexts.redis.initialize() - } + async onInitialize() { + await this.contexts.db.initialize() + await this.contexts.redis.initialize() + } } -Boot(API) \ No newline at end of file +Boot(API) diff --git a/packages/server/services/users/users.service.js b/packages/server/services/users/users.service.js index 38acde4f..3c58eee8 100644 --- a/packages/server/services/users/users.service.js +++ b/packages/server/services/users/users.service.js @@ -6,26 +6,24 @@ import RedisClient from "@shared-classes/RedisClient" import SharedMiddlewares from "@shared-middlewares" export default class API extends Server { - static refName = "users" - static useEngine = "hyper-express" - static routesPath = `${__dirname}/routes` - static listen_port = process.env.HTTP_LISTEN_PORT ?? 3008 + static refName = "users" + static useEngine = "hyper-express" + static routesPath = `${__dirname}/routes` + static listen_port = process.env.HTTP_LISTEN_PORT ?? 3008 - middlewares = { - ...SharedMiddlewares - } + middlewares = { + ...SharedMiddlewares, + } - handleWsAuth = require("@shared-lib/handleWsAuth").default + contexts = { + db: new DbManager(), + redis: RedisClient(), + } - contexts = { - db: new DbManager(), - redis: RedisClient() - } - - async onInitialize() { - await this.contexts.db.initialize() - await this.contexts.redis.initialize() - } + async onInitialize() { + await this.contexts.db.initialize() + await this.contexts.redis.initialize() + } } -Boot(API) \ No newline at end of file +Boot(API)