From 86737c045a16d38a926794d4acdbaf5906455cf4 Mon Sep 17 00:00:00 2001 From: SrGooglo Date: Wed, 31 May 2023 20:01:26 +0000 Subject: [PATCH] use new `shared-classes` path --- packages/chat_server/.gitignore | 1 + packages/chat_server/package.json | 14 +++++++------- packages/chat_server/src/api.js | 2 +- packages/chat_server/src/index.js | 1 + packages/file_server/.gitignore | 1 + packages/file_server/package.json | 14 +++++++------- packages/file_server/src/api.js | 8 ++++---- .../src/controllers/upload/routes/post/chunk.js | 4 ++-- packages/file_server/src/index.js | 1 + packages/marketplace_server/.gitignore | 3 ++- packages/marketplace_server/package.json | 14 +++++++------- packages/marketplace_server/src/api.js | 8 ++++---- packages/marketplace_server/src/index.js | 1 + packages/music_server/.gitignore | 1 + packages/music_server/package.json | 10 +++++----- packages/music_server/src/api.js | 8 ++++---- .../playlists/routes/delete/:playlist_id.js | 2 +- .../playlists/routes/get/:playlist_id/data.js | 2 +- .../src/controllers/playlists/routes/get/self.js | 2 +- .../controllers/playlists/routes/put/playlist.js | 2 +- .../tracks/routes/get/:track_id/data.js | 2 +- .../tracks/routes/get/:track_id/stream.js | 2 +- .../tracks/routes/post/:track_id/refresh-cache.js | 2 +- packages/music_server/src/index.js | 1 + 24 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 packages/chat_server/.gitignore create mode 100644 packages/file_server/.gitignore create mode 100644 packages/music_server/.gitignore diff --git a/packages/chat_server/.gitignore b/packages/chat_server/.gitignore new file mode 100644 index 00000000..b124b166 --- /dev/null +++ b/packages/chat_server/.gitignore @@ -0,0 +1 @@ +shared-classes \ No newline at end of file diff --git a/packages/chat_server/package.json b/packages/chat_server/package.json index 9c4f7cb2..b9bd519b 100755 --- a/packages/chat_server/package.json +++ b/packages/chat_server/package.json @@ -8,13 +8,13 @@ "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "sharedClasses": { - "FileUpload": "src/classes", - "CacheService": "src/classes", - "ComtyClient": "src/classes", - "RedisClient": "src/classes", - "StorageClient": "src/classes", - "DbManager": "src/classes", - "Errors": "src/classes" + "FileUpload": "src/shared-classes", + "CacheService": "src/shared-classes", + "ComtyClient": "src/shared-classes", + "RedisClient": "src/shared-classes", + "StorageClient": "src/shared-classes", + "DbManager": "src/shared-classes", + "Errors": "src/shared-classes" }, "license": "MIT", "dependencies": { diff --git a/packages/chat_server/src/api.js b/packages/chat_server/src/api.js index e69bb8e7..19d18550 100755 --- a/packages/chat_server/src/api.js +++ b/packages/chat_server/src/api.js @@ -5,7 +5,7 @@ import express from "express" import http from "http" import EventEmitter from "@foxify/events" -import ComtyClient from "@classes/ComtyClient" +import ComtyClient from "@shared-classes/ComtyClient" import routes from "./routes" diff --git a/packages/chat_server/src/index.js b/packages/chat_server/src/index.js index 7c642795..1670b175 100755 --- a/packages/chat_server/src/index.js +++ b/packages/chat_server/src/index.js @@ -10,6 +10,7 @@ import path from "path" import { registerBaseAliases } from "linebridge/dist/server" const customAliases = { + "@shared-classes": path.resolve(__dirname, "shared-classes"), "@services": path.resolve(__dirname, "services"), } diff --git a/packages/file_server/.gitignore b/packages/file_server/.gitignore new file mode 100644 index 00000000..b124b166 --- /dev/null +++ b/packages/file_server/.gitignore @@ -0,0 +1 @@ +shared-classes \ No newline at end of file diff --git a/packages/file_server/package.json b/packages/file_server/package.json index 219187b5..13af342f 100644 --- a/packages/file_server/package.json +++ b/packages/file_server/package.json @@ -8,13 +8,13 @@ "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "sharedClasses": { - "FileUpload": "src/classes", - "CacheService": "src/classes", - "ComtyClient": "src/classes", - "RedisClient": "src/classes", - "StorageClient": "src/classes", - "DbManager": "src/classes", - "Errors": "src/classes" + "FileUpload": "src/shared-classes", + "CacheService": "src/shared-classes", + "ComtyClient": "src/shared-classes", + "RedisClient": "src/shared-classes", + "StorageClient": "src/shared-classes", + "DbManager": "src/shared-classes", + "Errors": "src/shared-classes" }, "license": "MIT", "dependencies": { diff --git a/packages/file_server/src/api.js b/packages/file_server/src/api.js index 04626992..4676af99 100644 --- a/packages/file_server/src/api.js +++ b/packages/file_server/src/api.js @@ -1,10 +1,10 @@ import fs from "fs" import path from "path" -import RedisClient from "@classes/RedisClient" -import StorageClient from "@classes/StorageClient" -import CacheService from "@classes/CacheService" -import ComtyClient from "@classes/ComtyClient" +import RedisClient from "@shared-classes/RedisClient" +import StorageClient from "@shared-classes/StorageClient" +import CacheService from "@shared-classes/CacheService" +import ComtyClient from "@shared-classes/ComtyClient" import express from "express" import hyperexpress from "hyper-express" diff --git a/packages/file_server/src/controllers/upload/routes/post/chunk.js b/packages/file_server/src/controllers/upload/routes/post/chunk.js index 5f8bcade..953a8bfc 100644 --- a/packages/file_server/src/controllers/upload/routes/post/chunk.js +++ b/packages/file_server/src/controllers/upload/routes/post/chunk.js @@ -1,8 +1,8 @@ import path from "path" import fs from "fs" -import * as Errors from "@classes/Errors" -import FileUpload from "@classes/FileUpload" +import * as Errors from "@shared-classes/Errors" +import FileUpload from "@shared-classes/FileUpload" import useCompression from "@services/useCompression" const cachePath = global.cache.constructor.cachePath diff --git a/packages/file_server/src/index.js b/packages/file_server/src/index.js index ac95a242..f3fc2194 100644 --- a/packages/file_server/src/index.js +++ b/packages/file_server/src/index.js @@ -10,6 +10,7 @@ globalThis["__root"] = path.resolve(__dirname) const customAliases = { "root": globalThis["__root"], "@services": path.resolve(__dirname, "services"), + "@shared-classes": path.resolve(__dirname, "shared-classes"), } if (!global.isProduction) { diff --git a/packages/marketplace_server/.gitignore b/packages/marketplace_server/.gitignore index 80401e47..0dd1cacd 100644 --- a/packages/marketplace_server/.gitignore +++ b/packages/marketplace_server/.gitignore @@ -1 +1,2 @@ -/static \ No newline at end of file +/static +shared-classes \ No newline at end of file diff --git a/packages/marketplace_server/package.json b/packages/marketplace_server/package.json index 70fcf582..6f32a181 100644 --- a/packages/marketplace_server/package.json +++ b/packages/marketplace_server/package.json @@ -8,13 +8,13 @@ "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "sharedClasses": { - "FileUpload": "src/classes", - "CacheService": "src/classes", - "ComtyClient": "src/classes", - "RedisClient": "src/classes", - "StorageClient": "src/classes", - "DbManager": "src/classes", - "Errors": "src/classes" + "FileUpload": "src/shared-classes", + "CacheService": "src/shared-classes", + "ComtyClient": "src/shared-classes", + "RedisClient": "src/shared-classes", + "StorageClient": "src/shared-classes", + "DbManager": "src/shared-classes", + "Errors": "src/shared-classes" }, "license": "MIT", "dependencies": { diff --git a/packages/marketplace_server/src/api.js b/packages/marketplace_server/src/api.js index 80d265f1..725e8123 100644 --- a/packages/marketplace_server/src/api.js +++ b/packages/marketplace_server/src/api.js @@ -1,10 +1,10 @@ import fs from "fs" import path from "path" -import DbManager from "@classes/DbManager" -import RedisClient from "@classes/RedisClient" -import StorageClient from "@classes/StorageClient" -import ComtyClient from "./classes/ComtyClient" +import DbManager from "@shared-classes/DbManager" +import RedisClient from "@shared-classes/RedisClient" +import StorageClient from "@shared-classes/StorageClient" +import ComtyClient from "@shared-classes/ComtyClient" import hyperexpress from "hyper-express" diff --git a/packages/marketplace_server/src/index.js b/packages/marketplace_server/src/index.js index d070502d..7a233534 100644 --- a/packages/marketplace_server/src/index.js +++ b/packages/marketplace_server/src/index.js @@ -7,6 +7,7 @@ import { registerBaseAliases } from "linebridge/dist/server" const customAliases = { "@services": path.resolve(__dirname, "services"), + "@shared-classes": path.resolve(__dirname, "shared-classes"), } if (!global.isProduction) { diff --git a/packages/music_server/.gitignore b/packages/music_server/.gitignore new file mode 100644 index 00000000..b124b166 --- /dev/null +++ b/packages/music_server/.gitignore @@ -0,0 +1 @@ +shared-classes \ No newline at end of file diff --git a/packages/music_server/package.json b/packages/music_server/package.json index 72d3c9b8..bba01e9e 100644 --- a/packages/music_server/package.json +++ b/packages/music_server/package.json @@ -8,11 +8,11 @@ "run:prod": "cross-env NODE_ENV=production node ./dist/index.js" }, "sharedClasses": { - "ComtyClient": "src/classes", - "RedisClient": "src/classes", - "StorageClient": "src/classes", - "DbManager": "src/classes", - "Errors": "src/classes" + "ComtyClient": "src/shared-classes", + "RedisClient": "src/shared-classes", + "StorageClient": "src/shared-classes", + "DbManager": "src/shared-classes", + "Errors": "src/shared-classes" }, "license": "MIT", "dependencies": { diff --git a/packages/music_server/src/api.js b/packages/music_server/src/api.js index 24514000..19ced206 100755 --- a/packages/music_server/src/api.js +++ b/packages/music_server/src/api.js @@ -5,10 +5,10 @@ import express from "express" import http from "http" import EventEmitter from "@foxify/events" -import ComtyClient from "@classes/ComtyClient" -import DbManager from "@classes/DbManager" -import RedisClient from "@classes/RedisClient" -import StorageClient from "@classes/StorageClient" +import ComtyClient from "@shared-classes/ComtyClient" +import DbManager from "@shared-classes/DbManager" +import RedisClient from "@shared-classes/RedisClient" +import StorageClient from "@shared-classes/StorageClient" import RoomServer from "./roomsServer" diff --git a/packages/music_server/src/controllers/playlists/routes/delete/:playlist_id.js b/packages/music_server/src/controllers/playlists/routes/delete/:playlist_id.js index fb0ee1d6..70235387 100644 --- a/packages/music_server/src/controllers/playlists/routes/delete/:playlist_id.js +++ b/packages/music_server/src/controllers/playlists/routes/delete/:playlist_id.js @@ -1,5 +1,5 @@ import { Playlist } from "@models" -import { AuthorizationError, PermissionError, NotFoundError } from "@classes/Errors" +import { AuthorizationError, PermissionError, NotFoundError } from "@shared-classes/Errors" export default async (req, res) => { if (!req.session) { diff --git a/packages/music_server/src/controllers/playlists/routes/get/:playlist_id/data.js b/packages/music_server/src/controllers/playlists/routes/get/:playlist_id/data.js index cc8fa8fb..ed7bd6e2 100644 --- a/packages/music_server/src/controllers/playlists/routes/get/:playlist_id/data.js +++ b/packages/music_server/src/controllers/playlists/routes/get/:playlist_id/data.js @@ -1,5 +1,5 @@ import { Playlist, Track } from "@models" -import { NotFoundError } from "@classes/Errors" +import { NotFoundError } from "@shared-classes/Errors" export default async (req, res) => { const { playlist_id } = req.params diff --git a/packages/music_server/src/controllers/playlists/routes/get/self.js b/packages/music_server/src/controllers/playlists/routes/get/self.js index 0a32bfa1..2749a8b8 100644 --- a/packages/music_server/src/controllers/playlists/routes/get/self.js +++ b/packages/music_server/src/controllers/playlists/routes/get/self.js @@ -1,5 +1,5 @@ import { Playlist, Track } from "@models" -import { AuthorizationError, NotFoundError } from "@classes/Errors" +import { AuthorizationError, NotFoundError } from "@shared-classes/Errors" export default async (req, res) => { if (!req.session) { diff --git a/packages/music_server/src/controllers/playlists/routes/put/playlist.js b/packages/music_server/src/controllers/playlists/routes/put/playlist.js index 7a234db3..b8fa7918 100644 --- a/packages/music_server/src/controllers/playlists/routes/put/playlist.js +++ b/packages/music_server/src/controllers/playlists/routes/put/playlist.js @@ -1,5 +1,5 @@ import { Playlist, Track } from "@models" -import { AuthorizationError, NotFoundError, PermissionError, BadRequestError } from "@classes/Errors" +import { AuthorizationError, NotFoundError, PermissionError, BadRequestError } from "@shared-classes/Errors" const PlaylistAllowedUpdateFields = [ "title", diff --git a/packages/music_server/src/controllers/tracks/routes/get/:track_id/data.js b/packages/music_server/src/controllers/tracks/routes/get/:track_id/data.js index 23e0f368..fa74cb89 100644 --- a/packages/music_server/src/controllers/tracks/routes/get/:track_id/data.js +++ b/packages/music_server/src/controllers/tracks/routes/get/:track_id/data.js @@ -1,5 +1,5 @@ import { Track } from "@models" -import { NotFoundError } from "@classes/Errors" +import { NotFoundError } from "@shared-classes/Errors" export default async (req, res) => { const { track_id } = req.params diff --git a/packages/music_server/src/controllers/tracks/routes/get/:track_id/stream.js b/packages/music_server/src/controllers/tracks/routes/get/:track_id/stream.js index ed90a22b..3ff3d4d6 100644 --- a/packages/music_server/src/controllers/tracks/routes/get/:track_id/stream.js +++ b/packages/music_server/src/controllers/tracks/routes/get/:track_id/stream.js @@ -1,5 +1,5 @@ import { Track } from "@models" -import { NotFoundError, InternalServerError } from "@classes/Errors" +import { NotFoundError, InternalServerError } from "@shared-classes/Errors" import mimetypes from "mime-types" diff --git a/packages/music_server/src/controllers/tracks/routes/post/:track_id/refresh-cache.js b/packages/music_server/src/controllers/tracks/routes/post/:track_id/refresh-cache.js index 198dca30..331f5bcc 100644 --- a/packages/music_server/src/controllers/tracks/routes/post/:track_id/refresh-cache.js +++ b/packages/music_server/src/controllers/tracks/routes/post/:track_id/refresh-cache.js @@ -1,5 +1,5 @@ import { Track } from "@models" -import { NotFoundError } from "@classes/Errors" +import { NotFoundError } from "@shared-classes/Errors" import getEnhancedLyricsFromTrack from "@services/getEnhancedLyricsFromTrack" export default async (req, res) => { diff --git a/packages/music_server/src/index.js b/packages/music_server/src/index.js index fa8f0637..ee335acd 100755 --- a/packages/music_server/src/index.js +++ b/packages/music_server/src/index.js @@ -14,6 +14,7 @@ globalThis["__root"] = path.resolve(__dirname) const customAliases = { "root": globalThis["__root"], "@services": path.resolve(__dirname, "services"), + "@shared-classes": path.resolve(__dirname, "shared-classes"), } if (!global.isProduction) {