From c63634b8513a374bec143ad9fb039d2412f0c61c Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 17 Oct 2023 18:18:35 +0000 Subject: [PATCH 01/27] added linebridge submodule --- .gitmodules | 3 +++ linebridge | 1 + 2 files changed, 4 insertions(+) create mode 160000 linebridge diff --git a/.gitmodules b/.gitmodules index 7c71543c..401ba0fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "evite"] path = evite url = https://github.com/ragestudio/evite +[submodule "linebridge"] + path = linebridge + url = https://github.com/ragestudio/linebridge diff --git a/linebridge b/linebridge new file mode 160000 index 00000000..3b95bcab --- /dev/null +++ b/linebridge @@ -0,0 +1 @@ +Subproject commit 3b95bcab0cfb0137cc9ccc8410afe96c78e7d692 From 1364fde2665a2d3368e438236e41610c76ddb2e2 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 17 Oct 2023 18:21:54 +0000 Subject: [PATCH 02/27] added new colors --- .vscode/settings.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ce175bff..1a6c947c 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,25 +1,25 @@ { "discord.enabled": false, "workbench.colorCustomizations": { - "activityBar.activeBackground": "#65c89b", - "activityBar.background": "#65c89b", + "activityBar.activeBackground": "#ff9396", + "activityBar.background": "#ff9396", "activityBar.foreground": "#15202b", "activityBar.inactiveForeground": "#15202b99", - "activityBarBadge.background": "#945bc4", + "activityBarBadge.background": "#048000", "activityBarBadge.foreground": "#e7e7e7", "commandCenter.border": "#15202b99", - "sash.hoverBorder": "#65c89b", - "statusBar.background": "#42b883", + "sash.hoverBorder": "#ff9396", + "statusBar.background": "#ff6064", "statusBar.foreground": "#15202b", - "statusBarItem.hoverBackground": "#359268", - "statusBarItem.remoteBackground": "#42b883", + "statusBarItem.hoverBackground": "#ff2d32", + "statusBarItem.remoteBackground": "#ff6064", "statusBarItem.remoteForeground": "#15202b", - "titleBar.activeBackground": "#42b883", + "titleBar.activeBackground": "#ff6064", "titleBar.activeForeground": "#15202b", - "titleBar.inactiveBackground": "#42b88399", + "titleBar.inactiveBackground": "#ff606499", "titleBar.inactiveForeground": "#15202b99" }, - "peacock.remoteColor": "#42b883", + "peacock.remoteColor": "#ff6064", "docify.inlineComments": true, "docify.moreExpressiveComments": true, "docify.sidePanelReviewMode": false, From e925cb5b85635e38b2b92de153091df5f46fafa9 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 17 Oct 2023 18:22:02 +0000 Subject: [PATCH 03/27] added missing changelog --- changelogs/v0-58-2.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 changelogs/v0-58-2.md diff --git a/changelogs/v0-58-2.md b/changelogs/v0-58-2.md new file mode 100644 index 00000000..0e1d7e39 --- /dev/null +++ b/changelogs/v0-58-2.md @@ -0,0 +1,13 @@ +* [+6/-6][chat_server | file_server | marketplace_server | music_server | server | sync_server] [bump version](https://github.com/ragestudio/comty/commit/9f745b706988f301dffc2308ea3cfaa7ce4150cc) - by [@SrGooglo](https://github.com/srgooglo) + +* [+11/-11][app | chat_server | comty.js | file_server | marketplace_server | music_server | server | sync_server | wrapper] [Bump version to 0.58.2](https://github.com/ragestudio/comty/commit/5195f019f609841e1f041ddd2d6d7357bd6cdd80) - by [@SrGooglo](https://github.com/srgooglo) + +* [+28/-1][app] [add touch effect](https://github.com/ragestudio/comty/commit/a0098296885d5d059e4bf9129be1504f2a734883) - by [@SrGooglo](https://github.com/srgooglo) + +* [+374/-85][app | comty.js | music_server | sync_server | classes] [Supporting multiplatform track likes](https://github.com/ragestudio/comty/commit/4add14652c387e2c23b557e3d68188888c9117c6) - by [@SrGooglo](https://github.com/srgooglo) + +* [+482/-127][app] [support sliders with profiles](https://github.com/ragestudio/comty/commit/fec281dece9263dd446e7dd460f4f4af471af8b4) - by [@SrGooglo](https://github.com/srgooglo) + +* [+2/-1][app] [force `max-width`](https://github.com/ragestudio/comty/commit/510ad757bb73ac4ed0d5e064105c94fd4fba6edb) - by [@SrGooglo](https://github.com/srgooglo) + +* [+17/-0][v0-58-1.md] [added changelog](https://github.com/ragestudio/comty/commit/6387a22edddbb9fab47cc5f6ee893c67390d7cbb) - by [@SrGooglo](https://github.com/srgooglo) \ No newline at end of file From 4d8fdd954912990ffafc5c5ba715b6b13d9bbe26 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 17:28:37 +0000 Subject: [PATCH 04/27] added `fontScale` --- packages/app/constants/defaultTheme.json | 1 + .../constants/settings/apparence/index.jsx | 26 ++++++++++++++++ packages/app/src/theme/index.less | 31 +++++++++++++++++-- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/packages/app/constants/defaultTheme.json b/packages/app/constants/defaultTheme.json index 37c9557f..cfb4039a 100755 --- a/packages/app/constants/defaultTheme.json +++ b/packages/app/constants/defaultTheme.json @@ -1,5 +1,6 @@ { "defaultVars": { + "fontScale": "1", "backgroundBlur": "10px", "colorPrimary": "#ff6064", "app-color": "#ff6064", diff --git a/packages/app/constants/settings/apparence/index.jsx b/packages/app/constants/settings/apparence/index.jsx index 9ae8e374..94ac4094 100755 --- a/packages/app/constants/settings/apparence/index.jsx +++ b/packages/app/constants/settings/apparence/index.jsx @@ -103,6 +103,32 @@ export default { }, storaged: true }, + { + id: "style.uiFontScale", + group: "aspect", + component: "Slider", + title: "UI font scale", + description: "Change the font scale of the application.", + props: { + min: 1, + max: 1.2, + step: 0.01, + tooltip: { + formatter: (value) => `${value}x` + } + }, + defaultValue: () => { + return app.cores.style.getValue("fontScale") + }, + onUpdate: (value) => { + app.cores.style.modify({ + "fontScale": value + }) + + return value + }, + storaged: true + }, { id: "style.uiFont", group: "aspect", diff --git a/packages/app/src/theme/index.less b/packages/app/src/theme/index.less index 942b4d15..e3cdab38 100755 --- a/packages/app/src/theme/index.less +++ b/packages/app/src/theme/index.less @@ -9,7 +9,35 @@ *:before, *:after { box-sizing: inherit; - //font-size: calc(1rem * var(--fontScale)); + font-size: calc(1em * var(--fontScale)); +} + +h1 { + font-size: calc(1.4em * var(--fontScale)); +} + +h2 { + font-size: calc(1.2em * var(--fontScale)); +} + +h3 { + font-size: calc(1em * var(--fontScale)); +} + +h4 { + font-size: calc(1em * var(--fontScale)); +} + +h5 { + font-size: calc(1em* var(--fontScale)); +} + +h6 { + font-size: calc(1em * var(--fontScale)); +} + +p { + font-size: calc(1em * var(--fontScale)); } #nprogress { @@ -162,7 +190,6 @@ svg { /* disable the IOS popup when long-press on a link */ } - // LAYOUT .app_layout { position: relative; From e2c9490e5ce4ac7ff3ad8cab65fcbb1f3b9404a3 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:46:48 +0000 Subject: [PATCH 05/27] remove unused import --- shared/classes/TidalAPI/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/classes/TidalAPI/index.js b/shared/classes/TidalAPI/index.js index 4151bf89..53975536 100644 --- a/shared/classes/TidalAPI/index.js +++ b/shared/classes/TidalAPI/index.js @@ -1,5 +1,4 @@ import axios from "axios" -import FormData from "form-data" import qs from "qs" const TIDAL_CLIENT_ID = process.env.TIDAL_CLIENT_ID From 438958c120d95cabfb114d3ab84b5eac771a49ef Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:47:05 +0000 Subject: [PATCH 06/27] support forced envs --- shared/lib/api_wrapper/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/lib/api_wrapper/index.js b/shared/lib/api_wrapper/index.js index 96da17b0..3fdfc6d8 100644 --- a/shared/lib/api_wrapper/index.js +++ b/shared/lib/api_wrapper/index.js @@ -63,7 +63,7 @@ global.toBoolean = (value) => { } async function injectEnvFromInfisical() { - const envMode = global.isProduction ? "prod" : "dev" + const envMode = global.FORCE_ENV ?? global.isProduction ? "prod" : "dev" console.log(`🔑 Injecting env variables from INFISICAL in [${envMode}] mode...`) @@ -72,7 +72,7 @@ async function injectEnvFromInfisical() { }) const secrets = await client.getAllSecrets({ - environment: global.isProduction ? "prod" : "dev", + environment: envMode, attachToProcessEnv: false, }) From 5c264177e288c31801887b6cdac3e7bf56674a25 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:47:14 +0000 Subject: [PATCH 07/27] update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 418b3367..e803e3c4 100755 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ /**/**/.evite /**/**/uploads /**/**/d_data +/**/**/redis_data /**/**/*.tar /**/**/*.7z /**/**/*.zip From 5c0a611cac6665d2448a925d1d8e95a304383b8e Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:47:23 +0000 Subject: [PATCH 08/27] added ignored packages --- .ignorepackages | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .ignorepackages diff --git a/.ignorepackages b/.ignorepackages new file mode 100644 index 00000000..0e50a085 --- /dev/null +++ b/.ignorepackages @@ -0,0 +1,3 @@ +rtengine +wrapper +comty.js \ No newline at end of file From 808ae2d8ff1fba8357cbcccf7bd7c18335c82e10 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:47:51 +0000 Subject: [PATCH 09/27] enable cluster mode for main_api --- ecosystem.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ecosystem.config.js b/ecosystem.config.js index 5c235f4f..4bce946c 100644 --- a/ecosystem.config.js +++ b/ecosystem.config.js @@ -3,8 +3,8 @@ module.exports = { { name: "main_api", script: "./dist/index.js", - // instances: "max", - // exec_mode: "cluster", + instances: "max", + exec_mode: "cluster", env: { "NODE_ENV": "production", "MAIN_LISTEN_PORT": 5000, @@ -64,7 +64,7 @@ module.exports = { { name: "sync_api", script: "./dist/index.js", - env:{ + env: { "NODE_ENV": "production", "HTTP_LISTEN_PORT": 5005, }, From 7fbdcced5245450019bb29b52034793db12e107b Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:48:07 +0000 Subject: [PATCH 10/27] ? --- linebridge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linebridge b/linebridge index 3b95bcab..13b01b21 160000 --- a/linebridge +++ b/linebridge @@ -1 +1 @@ -Subproject commit 3b95bcab0cfb0137cc9ccc8410afe96c78e7d692 +Subproject commit 13b01b21d6b63ecddd8625781a69355861d38db5 From ccc03fe13a29b33393fe8cd4736d56a251ec4ac4 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:49:15 +0000 Subject: [PATCH 11/27] update commands --- docker-compose.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9bfa7dfa..015cbd2e 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,14 +54,21 @@ services: env_file: - ./env_files/file.production.env redis: - image: docker.dragonflydb.io/dragonflydb/dragonfly + image: docker.dragonflydb.io/dragonflydb/dragonfly:latest restart: unless-stopped + ulimits: + memlock: -1 + command: + - "--requirepass=changeme2424" networks: - internal_network env_file: - ./env_files/redis.env ports: - "6379:6379" + volumes: + - ./redis_data:/data + networks: internal_network: \ No newline at end of file From 66446f79a211e2615889b94044e78536e3b906ae Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:51:15 +0000 Subject: [PATCH 12/27] use hermes --- packages/wrapper/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json index 98172f62..9f026215 100755 --- a/packages/wrapper/package.json +++ b/packages/wrapper/package.json @@ -4,7 +4,7 @@ "main": "./src/index.js", "license": "MIT", "scripts": { - "dev": "corenode-node ./src/index.js" + "dev": "hermes-node ./src/index.js" }, "dependencies": { "7zip-min": "^1.4.3", @@ -19,6 +19,6 @@ "pm2": "^5.3.0" }, "devDependencies": { - "corenode": "^0.28.26" + "@ragestudio/hermes": "^0.1.1" } } \ No newline at end of file From a0652dc81a1e47db1e9b8488a886bcffca3536a3 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:52:57 +0000 Subject: [PATCH 13/27] change validation session data property --- packages/chat_server/src/middlewares/withWsAuth.js | 2 +- packages/file_server/src/middlewares/withAuth/index.js | 2 +- packages/file_server/src/middlewares/withOptionalAuth/index.js | 2 +- packages/file_server/src/middlewares/withWsAuth.js | 2 +- packages/marketplace_server/src/useMiddlewares/useAuth/index.js | 2 +- packages/music_server/src/middlewares/withAuth/index.js | 2 +- packages/music_server/src/middlewares/withOptionalAuth/index.js | 2 +- packages/music_server/src/middlewares/withWsAuth.js | 2 +- packages/sync_server/src/middlewares/withAuth/index.js | 2 +- packages/sync_server/src/middlewares/withOptionalAuth/index.js | 2 +- packages/sync_server/src/middlewares/withWsAuth.js | 2 +- packages/sync_server/src/useMiddlewares/useAuth/index.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/chat_server/src/middlewares/withWsAuth.js b/packages/chat_server/src/middlewares/withWsAuth.js index 1e85e4de..31fed9d9 100644 --- a/packages/chat_server/src/middlewares/withWsAuth.js +++ b/packages/chat_server/src/middlewares/withWsAuth.js @@ -23,7 +23,7 @@ export default async (socket, next) => { return next(new Error(`auth:token_invalid`)) } - const session = validation.session + const session = validation.data const userData = await global.comty.rest.user.data({ user_id: session.user_id, diff --git a/packages/file_server/src/middlewares/withAuth/index.js b/packages/file_server/src/middlewares/withAuth/index.js index 44ee47ff..52a30f4a 100644 --- a/packages/file_server/src/middlewares/withAuth/index.js +++ b/packages/file_server/src/middlewares/withAuth/index.js @@ -19,7 +19,7 @@ export default async function (req, res, next) { return res.status(401).json({ error: "Unauthorized" }) } - req.session = validation.session + req.session = validation.data return next() } \ No newline at end of file diff --git a/packages/file_server/src/middlewares/withOptionalAuth/index.js b/packages/file_server/src/middlewares/withOptionalAuth/index.js index fc467e17..962d15d0 100644 --- a/packages/file_server/src/middlewares/withOptionalAuth/index.js +++ b/packages/file_server/src/middlewares/withOptionalAuth/index.js @@ -16,7 +16,7 @@ export default function (req, res, next) { } }) .then((validation) => { - req.session = validation.session + req.session = validation.data next() }) diff --git a/packages/file_server/src/middlewares/withWsAuth.js b/packages/file_server/src/middlewares/withWsAuth.js index 1e85e4de..31fed9d9 100644 --- a/packages/file_server/src/middlewares/withWsAuth.js +++ b/packages/file_server/src/middlewares/withWsAuth.js @@ -23,7 +23,7 @@ export default async (socket, next) => { return next(new Error(`auth:token_invalid`)) } - const session = validation.session + const session = validation.data const userData = await global.comty.rest.user.data({ user_id: session.user_id, diff --git a/packages/marketplace_server/src/useMiddlewares/useAuth/index.js b/packages/marketplace_server/src/useMiddlewares/useAuth/index.js index df7123f5..4d5bece4 100644 --- a/packages/marketplace_server/src/useMiddlewares/useAuth/index.js +++ b/packages/marketplace_server/src/useMiddlewares/useAuth/index.js @@ -19,7 +19,7 @@ export default async function (req, res, next) { return res.status(401).json({ error: "Unauthorized" }) } - req.session = validation.session + req.session = validation.data return true } \ No newline at end of file diff --git a/packages/music_server/src/middlewares/withAuth/index.js b/packages/music_server/src/middlewares/withAuth/index.js index 44ee47ff..52a30f4a 100644 --- a/packages/music_server/src/middlewares/withAuth/index.js +++ b/packages/music_server/src/middlewares/withAuth/index.js @@ -19,7 +19,7 @@ export default async function (req, res, next) { return res.status(401).json({ error: "Unauthorized" }) } - req.session = validation.session + req.session = validation.data return next() } \ No newline at end of file diff --git a/packages/music_server/src/middlewares/withOptionalAuth/index.js b/packages/music_server/src/middlewares/withOptionalAuth/index.js index cbc4bb49..9689973d 100644 --- a/packages/music_server/src/middlewares/withOptionalAuth/index.js +++ b/packages/music_server/src/middlewares/withOptionalAuth/index.js @@ -20,7 +20,7 @@ export default async function (req, res, next) { } req.sessionToken = auth - req.session = validation.session + req.session = validation.data return next() } \ No newline at end of file diff --git a/packages/music_server/src/middlewares/withWsAuth.js b/packages/music_server/src/middlewares/withWsAuth.js index 1e85e4de..31fed9d9 100644 --- a/packages/music_server/src/middlewares/withWsAuth.js +++ b/packages/music_server/src/middlewares/withWsAuth.js @@ -23,7 +23,7 @@ export default async (socket, next) => { return next(new Error(`auth:token_invalid`)) } - const session = validation.session + const session = validation.data const userData = await global.comty.rest.user.data({ user_id: session.user_id, diff --git a/packages/sync_server/src/middlewares/withAuth/index.js b/packages/sync_server/src/middlewares/withAuth/index.js index 44ee47ff..52a30f4a 100644 --- a/packages/sync_server/src/middlewares/withAuth/index.js +++ b/packages/sync_server/src/middlewares/withAuth/index.js @@ -19,7 +19,7 @@ export default async function (req, res, next) { return res.status(401).json({ error: "Unauthorized" }) } - req.session = validation.session + req.session = validation.data return next() } \ No newline at end of file diff --git a/packages/sync_server/src/middlewares/withOptionalAuth/index.js b/packages/sync_server/src/middlewares/withOptionalAuth/index.js index cbc4bb49..9689973d 100644 --- a/packages/sync_server/src/middlewares/withOptionalAuth/index.js +++ b/packages/sync_server/src/middlewares/withOptionalAuth/index.js @@ -20,7 +20,7 @@ export default async function (req, res, next) { } req.sessionToken = auth - req.session = validation.session + req.session = validation.data return next() } \ No newline at end of file diff --git a/packages/sync_server/src/middlewares/withWsAuth.js b/packages/sync_server/src/middlewares/withWsAuth.js index 1e85e4de..31fed9d9 100644 --- a/packages/sync_server/src/middlewares/withWsAuth.js +++ b/packages/sync_server/src/middlewares/withWsAuth.js @@ -23,7 +23,7 @@ export default async (socket, next) => { return next(new Error(`auth:token_invalid`)) } - const session = validation.session + const session = validation.data const userData = await global.comty.rest.user.data({ user_id: session.user_id, diff --git a/packages/sync_server/src/useMiddlewares/useAuth/index.js b/packages/sync_server/src/useMiddlewares/useAuth/index.js index df7123f5..4d5bece4 100644 --- a/packages/sync_server/src/useMiddlewares/useAuth/index.js +++ b/packages/sync_server/src/useMiddlewares/useAuth/index.js @@ -19,7 +19,7 @@ export default async function (req, res, next) { return res.status(401).json({ error: "Unauthorized" }) } - req.session = validation.session + req.session = validation.data return true } \ No newline at end of file From e934dc2ee3512a88eb20bb31d9e654d82939d428 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:53:56 +0000 Subject: [PATCH 14/27] use hermes --- packages/chat_server/package.json | 11 +++------- packages/comty.js/package.json | 3 ++- packages/file_server/package.json | 7 +++--- packages/marketplace_server/package.json | 8 +++---- packages/music_server/package.json | 10 +++------ packages/sync_server/package.json | 28 ++++++------------------ 6 files changed, 22 insertions(+), 45 deletions(-) diff --git a/packages/chat_server/package.json b/packages/chat_server/package.json index 6786cb41..1a089b26 100755 --- a/packages/chat_server/package.json +++ b/packages/chat_server/package.json @@ -3,8 +3,8 @@ "version": "0.58.2", "main": "dist/index.js", "scripts": { - "build": "corenode-cli build", - "dev": "nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "hermes build", + "dev": "nodemon --ignore dist/ --exec hermes-node ./src/index.js", "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "shared": { @@ -20,15 +20,10 @@ "license": "MIT", "dependencies": { "@foxify/events": "^2.1.0", - "@socket.io/cluster-adapter": "^0.2.2", - "@socket.io/sticky": "^1.0.3", - "@socket.io/redis-adapter": "^8.2.1", - "@socket.io/redis-emitter": "^5.1.0", "axios": "^1.4.0", "bcrypt": "5.0.1", "comty.js": "^0.58.2", "connect-mongo": "^4.6.0", - "corenode": "0.28.26", "cors": "^2.8.5", "dotenv": "^16.0.3", "express": "^4.18.2", @@ -40,11 +35,11 @@ "moment-timezone": "0.5.37", "mongoose": "^6.9.0", "morgan": "^1.10.0", - "nanoid": "3.2.0", "redis": "^4.6.6", "socket.io": "^4.5.4" }, "devDependencies": { + "@ragestudio/hermes": "^0.1.0", "cross-env": "^7.0.3", "nodemon": "^2.0.15" } diff --git a/packages/comty.js/package.json b/packages/comty.js/package.json index 9280050f..79313e5b 100644 --- a/packages/comty.js/package.json +++ b/packages/comty.js/package.json @@ -4,7 +4,7 @@ "main": "./dist/index.js", "author": "RageStudio ", "scripts": { - "build": "corenode-cli build" + "build": "hermes build" }, "files": [ "dist" @@ -20,6 +20,7 @@ "socket.io-client": "^4.6.1" }, "devDependencies": { + "@ragestudio/hermes": "^0.1.0", "corenode": "^0.28.26" } } \ No newline at end of file diff --git a/packages/file_server/package.json b/packages/file_server/package.json index c86eeef2..c5122c38 100644 --- a/packages/file_server/package.json +++ b/packages/file_server/package.json @@ -3,8 +3,8 @@ "version": "0.58.2", "main": "dist/index.js", "scripts": { - "build": "corenode-cli build", - "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "hermes build", + "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec hermes-node ./src/index.js", "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "shared": { @@ -28,7 +28,6 @@ "comty.js": "^0.58.2", "connect-mongo": "^4.6.0", "content-range": "^2.0.2", - "corenode": "0.28.26", "cors": "^2.8.5", "dotenv": "^16.0.3", "express": "^4.18.2", @@ -45,7 +44,6 @@ "moment-timezone": "^0.5.40", "mongoose": "^6.9.0", "morgan": "^1.10.0", - "nanoid": "3.2.0", "normalize-url": "^8.0.0", "p-map": "4.0.0", "p-queue": "^7.3.4", @@ -53,6 +51,7 @@ "split-chunk-merge": "^1.0.0" }, "devDependencies": { + "@ragestudio/hermes": "^0.1.0", "chai": "^4.3.7", "cross-env": "^7.0.3", "mocha": "^10.2.0", diff --git a/packages/marketplace_server/package.json b/packages/marketplace_server/package.json index 56a609fd..5078908f 100644 --- a/packages/marketplace_server/package.json +++ b/packages/marketplace_server/package.json @@ -3,8 +3,8 @@ "version": "0.58.2", "main": "dist/index.js", "scripts": { - "build": "corenode-cli build", - "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "hermes build", + "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec hermes-node ./src/index.js", "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "shared": { @@ -20,7 +20,6 @@ "license": "MIT", "dependencies": { "7zip-min": "^1.4.4", - "@corenode/utils": "0.28.26", "@foxify/events": "^2.1.0", "@octokit/rest": "^19.0.7", "axios": "^1.2.5", @@ -29,7 +28,6 @@ "comty.js": "^0.58.2", "connect-mongo": "^4.6.0", "content-range": "^2.0.2", - "corenode": "0.28.26", "dotenv": "^16.0.3", "form-data": "^4.0.0", "formidable": "^2.1.1", @@ -54,6 +52,8 @@ "uglify-js": "^3.17.4" }, "devDependencies": { + "@corenode/utils": "0.28.26", + "@ragestudio/hermes": "^0.1.0", "chai": "^4.3.7", "cross-env": "^7.0.3", "mocha": "^10.2.0", diff --git a/packages/music_server/package.json b/packages/music_server/package.json index 83a8135d..a24ff1ff 100644 --- a/packages/music_server/package.json +++ b/packages/music_server/package.json @@ -3,8 +3,8 @@ "version": "0.58.2", "main": "dist/index.js", "scripts": { - "build": "corenode-cli build", - "dev": "nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "hermes build", + "dev": "nodemon --ignore dist/ --exec hermes-node ./src/index.js", "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "shared": { @@ -21,10 +21,7 @@ "license": "MIT", "dependencies": { "@foxify/events": "^2.1.0", - "@socket.io/redis-adapter": "^8.2.1", - "@socket.io/redis-emitter": "^5.1.0", - "@socket.io/cluster-adapter": "^0.2.2", - "@socket.io/sticky": "^1.0.3", + "@ragestudio/hermes": "^0.1.0", "axios": "^1.4.0", "bcrypt": "5.0.1", "comty.js": "^0.58.2", @@ -41,7 +38,6 @@ "moment-timezone": "0.5.37", "mongoose": "^6.9.0", "morgan": "^1.10.0", - "nanoid": "3.2.0", "redis": "^4.6.6", "socket.io": "^4.5.4" }, diff --git a/packages/sync_server/package.json b/packages/sync_server/package.json index 80302555..6245c984 100644 --- a/packages/sync_server/package.json +++ b/packages/sync_server/package.json @@ -3,8 +3,8 @@ "version": "0.58.2", "main": "dist/index.js", "scripts": { - "build": "corenode-cli build", - "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec corenode-node ./src/index.js", + "build": "hermes build", + "dev": "cross-env NODE_ENV=development nodemon --ignore dist/ --exec hermes-node ./src/index.js", "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "shared": { @@ -21,45 +21,31 @@ }, "license": "MIT", "dependencies": { - "7zip-min": "^1.4.4", - "@corenode/utils": "0.28.26", "@foxify/events": "^2.1.0", - "@octokit/rest": "^19.0.7", "axios": "^1.2.5", "bcrypt": "^5.1.0", - "busboy": "^1.6.0", "comty.js": "^0.58.2", "connect-mongo": "^4.6.0", "content-range": "^2.0.2", - "corenode": "0.28.26", "dotenv": "^16.0.3", + "file-api": "^0.10.4", "form-data": "^4.0.0", - "formidable": "^2.1.1", "hyper-express": "^6.5.9", "jsonwebtoken": "^9.0.0", "linebridge": "0.15.12", - "live-directory": "^3.0.3", "luxon": "^3.2.1", - "merge-files": "^0.1.2", - "mime-types": "^2.1.35", - "minio": "^7.0.32", - "moment": "^2.29.4", - "moment-timezone": "^0.5.40", - "mongoose": "^6.9.0", "normalize-url": "^8.0.0", "p-map": "^6.0.0", "p-queue": "^7.3.4", "qs": "^6.11.2", - "redis": "^4.6.6", - "sharp": "^0.31.3", - "split-chunk-merge": "^1.0.0", - "sucrase": "^3.32.0", - "uglify-js": "^3.17.4" + "redis": "^4.6.6" }, "devDependencies": { + "@corenode/utils": "0.28.26", "chai": "^4.3.7", + "corenode": "0.28.26", "cross-env": "^7.0.3", "mocha": "^10.2.0", "nodemon": "^2.0.15" } -} \ No newline at end of file +} From 6434c11ebe3df32a1136a0e624635bfd832a2e79 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:55:17 +0000 Subject: [PATCH 15/27] improve measuring fail --- packages/comty.js/src/handlers/measurePing.js | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/comty.js/src/handlers/measurePing.js b/packages/comty.js/src/handlers/measurePing.js index 955729a8..20a3774c 100644 --- a/packages/comty.js/src/handlers/measurePing.js +++ b/packages/comty.js/src/handlers/measurePing.js @@ -7,6 +7,12 @@ export default async () => { new Promise(async (resolve) => { const start = Date.now() + const failTimeout = setTimeout(() => { + timings.http = "failed" + + resolve() + }, 10000) + request({ method: "GET", url: "/ping", @@ -15,35 +21,34 @@ export default async () => { // set http timing in ms timings.http = Date.now() - start + failTimeout && clearTimeout(failTimeout) + resolve() }) .catch(() => { timings.http = "failed" + resolve() }) - - setTimeout(() => { - timings.http = "failed" - - resolve() - }, 10000) }), new Promise((resolve) => { const start = Date.now() + const failTimeout = setTimeout(() => { + timings.ws = "failed" + + resolve() + }, 10000) + __comty_shared_state.wsInstances["default"].on("pong", () => { timings.ws = Date.now() - start + failTimeout && clearTimeout(failTimeout) + resolve() }) __comty_shared_state.wsInstances["default"].emit("ping") - - setTimeout(() => { - timings.ws = "failed" - - resolve() - }, 10000) }) ] From e9ff49d3768198bd2b1d2b4f897ec43ec4b216d8 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:55:33 +0000 Subject: [PATCH 16/27] update remotes properties --- packages/comty.js/src/remotes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/comty.js/src/remotes.js b/packages/comty.js/src/remotes.js index 60d6c50e..c508ca2d 100644 --- a/packages/comty.js/src/remotes.js +++ b/packages/comty.js/src/remotes.js @@ -50,8 +50,6 @@ export default { default: { origin: composeRemote("default"), hasWebsocket: true, - useClassicAuth: true, - autoconnect: true, }, chat: { origin: composeRemote("chat"), @@ -63,9 +61,11 @@ export default { }, livestreaming: { origin: composeRemote("livestreaming"), + hasWebsocket: false, }, marketplace: { origin: composeRemote("marketplace"), + hasWebsocket: false, }, files: { origin: composeRemote("files"), From 8ab696d346fc206bc265ed7c92a3feb7a6628d71 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:57:21 +0000 Subject: [PATCH 17/27] update deps --- packages/app/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index b9976968..40e2c8a8 100755 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -66,7 +66,7 @@ "jsmediatags": "^3.9.7", "jwt-decode": "3.1.2", "less": "4.1.2", - "linebridge": "0.15.7", + "linebridge": "0.16.0", "lottie-react": "^2.4.0", "lru-cache": "^10.0.0", "luxon": "^3.0.4", @@ -115,7 +115,6 @@ "tone": "^14.7.77", "tseep": "^1.1.1", "ua-parser-js": "^1.0.36", - "uuid": "^9.0.0", "virtual-scroller": "^1.12.3", "wait-on": "^6.0.1" }, From e1a9a9ef5b938d44e0a09fd0dd5ea1d047348813 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:57:58 +0000 Subject: [PATCH 18/27] disconnect websockets on logout --- packages/app/src/App.jsx | 3 +++ packages/app/src/cores/api/api.core.js | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx index 7065e3ce..20049579 100755 --- a/packages/app/src/App.jsx +++ b/packages/app/src/App.jsx @@ -408,7 +408,10 @@ class ComtyApp extends React.Component { app.eventBus.emit("layout.animations.fadeIn") }, "auth:logout_success": async () => { + app.cores.api.disconnectWebsockets() + app.navigation.goAuth() + await this.flushState() }, "session.invalid": async (error) => { diff --git a/packages/app/src/cores/api/api.core.js b/packages/app/src/cores/api/api.core.js index db9fe271..f81f2c4b 100644 --- a/packages/app/src/cores/api/api.core.js +++ b/packages/app/src/cores/api/api.core.js @@ -5,7 +5,7 @@ import createClient from "comty.js" import measurePing from "comty.js/handlers/measurePing" import request from "comty.js/handlers/request" import useRequest from "comty.js/hooks/useRequest" -import { reconnectWebsockets } from "comty.js" +import { reconnectWebsockets, disconnectWebsockets } from "comty.js" export default class APICore extends Core { static namespace = "api" @@ -25,6 +25,7 @@ export default class APICore extends Core { measurePing: measurePing, useRequest: useRequest, reconnectWebsockets: reconnectWebsockets, + disconnectWebsockets: disconnectWebsockets, } listenEvent(key, handler, instance) { From efd0ace00f8b7d92869b453e17dced28fc5a9968 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Tue, 28 Nov 2023 18:58:13 +0000 Subject: [PATCH 19/27] fix null --- packages/app/src/components/Player/ExtraActions/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/components/Player/ExtraActions/index.jsx b/packages/app/src/components/Player/ExtraActions/index.jsx index 23e02aae..7217a01c 100644 --- a/packages/app/src/components/Player/ExtraActions/index.jsx +++ b/packages/app/src/components/Player/ExtraActions/index.jsx @@ -17,7 +17,7 @@ const ExtraActions = (props) => { app.isMobile &&