From ffedd67a1153834e0d6d3452285694c415c77194 Mon Sep 17 00:00:00 2001 From: RemixDev Date: Tue, 1 Jun 2021 20:26:28 +0200 Subject: [PATCH] deemix lib update + prevent log data to reach frontend --- package.json | 4 ++-- server/dist/main.js | 7 ++++++- server/package.json | 4 ++-- server/src/main.ts | 4 +++- server/yarn.lock | 24 ++++++++++++------------ webui | 2 +- yarn.lock | 24 ++++++++++++------------ 7 files changed, 38 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index 82bfce4..36fe6ec 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "cookie-parser": "1.4.5", "debug": "2.6.9", - "deemix": "^0.1.2", - "deezer-js": "^0.0.10", + "deemix": "^0.1.3", + "deezer-js": "^1.0.0", "dotenv": "8.2.0", "express": "4.17.1", "express-session": "^1.17.1", diff --git a/server/dist/main.js b/server/dist/main.js index 51be1d2..78bc552 100644 --- a/server/dist/main.js +++ b/server/dist/main.js @@ -35,7 +35,12 @@ exports.plugins = { exports.plugins.spotify.setup(); exports.listener = { send(key, data) { - console.log(key, data); + if (data) + console.log(key, data); + else + console.log(key); + if (["downloadInfo", "downloadWarn"].includes(key)) + return; app_1.wss.clients.forEach(client => { if (client.readyState === ws_1.default.OPEN) { client.send(JSON.stringify({ key, data })); diff --git a/server/package.json b/server/package.json index f7ca948..8b6bd72 100644 --- a/server/package.json +++ b/server/package.json @@ -15,8 +15,8 @@ "dependencies": { "cookie-parser": "1.4.5", "debug": "2.6.9", - "deemix": "^0.1.2", - "deezer-js": "^0.0.10", + "deemix": "^0.1.3", + "deezer-js": "^1.0.0", "dotenv": "8.2.0", "express": "4.17.1", "express-session": "^1.17.1", diff --git a/server/src/main.ts b/server/src/main.ts index a3b897a..dcee43a 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -25,7 +25,9 @@ plugins.spotify.setup() export const listener = { send(key: string, data?: any) { - console.log(key, data) + if (data) console.log(key, data) + else console.log(key) + if (["downloadInfo", "downloadWarn"].includes(key)) return wss.clients.forEach(client => { if (client.readyState === WebSocket.OPEN) { client.send(JSON.stringify({ key, data })) diff --git a/server/yarn.lock b/server/yarn.lock index a4ccc26..797952f 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -1883,10 +1883,10 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -deemix@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.2.tgz#bbee3fe9259a7483715b2c3eb3b8c4203db967bc" - integrity sha512-k1mzztOo3nybKEngALeZwgKhLSAqPZwTcj56eddETyJH4K9lAIoZ5NOSf1jj+RSa35g8u3bsrT5WY9/E/zwIJw== +deemix@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.3.tgz#fe8a9cdb484ffd5c51d61eadb6d7a508022a9570" + integrity sha512-R0lp1hgxP4Z2kgqtJcBKkOrBIoSt9+C+rjFwQmW+UQSE9Vyzbr0ZYGBgV3qwHDj3mZ3OP+mr22hiTa43tYPSWw== dependencies: async "^3.2.0" browser-id3-writer "^4.4.0" @@ -1911,14 +1911,6 @@ deepmerge@^4.0.0, deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -deezer-js@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-0.0.10.tgz#40aae50082765b7bf93c2c61788306e24cfd39e9" - integrity sha512-V/ZQb3MsouBVHQ7BXQqiWR/5pZh1F9EtZuXGOLa7ZGbRzbN9dVPeYB9dHdr3k8Kf5YUGyp/rXrZtUD25NcZ27g== - dependencies: - got "^11.8.2" - tough-cookie "^4.0.0" - deezer-js@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-0.0.8.tgz#cadc58eb43bc43dd9a6ec5fdefe5a9f562b8e2bf" @@ -1927,6 +1919,14 @@ deezer-js@^0.0.8: got "^11.8.2" tough-cookie "^4.0.0" +deezer-js@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-1.0.0.tgz#fa206afe6cd19ad7ecf21a8f60a49589cdf70303" + integrity sha512-jcAheb/EvUZF/mN5csH4ikq0WLzVMzWGONUUomMu7sZsK9w54I/UzvKdEc6st+4d/rLNZr9LKWdqrFsGt4y/Nw== + dependencies: + got "^11.8.2" + tough-cookie "^4.0.0" + defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" diff --git a/webui b/webui index 1b369da..6dc73ac 160000 --- a/webui +++ b/webui @@ -1 +1 @@ -Subproject commit 1b369da0b9f3e046313e6c09ec577e723ebfe92d +Subproject commit 6dc73ac69e9936bcee444343984065e5b2bd6ee9 diff --git a/yarn.lock b/yarn.lock index 73fc0d0..90c68e4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -813,10 +813,10 @@ decompress-response@^6.0.0: dependencies: mimic-response "^3.1.0" -deemix@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.2.tgz#bbee3fe9259a7483715b2c3eb3b8c4203db967bc" - integrity sha512-k1mzztOo3nybKEngALeZwgKhLSAqPZwTcj56eddETyJH4K9lAIoZ5NOSf1jj+RSa35g8u3bsrT5WY9/E/zwIJw== +deemix@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deemix/-/deemix-0.1.3.tgz#fe8a9cdb484ffd5c51d61eadb6d7a508022a9570" + integrity sha512-R0lp1hgxP4Z2kgqtJcBKkOrBIoSt9+C+rjFwQmW+UQSE9Vyzbr0ZYGBgV3qwHDj3mZ3OP+mr22hiTa43tYPSWw== dependencies: async "^3.2.0" browser-id3-writer "^4.4.0" @@ -836,14 +836,6 @@ deepmerge@^4.0.0: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -deezer-js@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-0.0.10.tgz#40aae50082765b7bf93c2c61788306e24cfd39e9" - integrity sha512-V/ZQb3MsouBVHQ7BXQqiWR/5pZh1F9EtZuXGOLa7ZGbRzbN9dVPeYB9dHdr3k8Kf5YUGyp/rXrZtUD25NcZ27g== - dependencies: - got "^11.8.2" - tough-cookie "^4.0.0" - deezer-js@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-0.0.8.tgz#cadc58eb43bc43dd9a6ec5fdefe5a9f562b8e2bf" @@ -852,6 +844,14 @@ deezer-js@^0.0.8: got "^11.8.2" tough-cookie "^4.0.0" +deezer-js@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/deezer-js/-/deezer-js-1.0.0.tgz#fa206afe6cd19ad7ecf21a8f60a49589cdf70303" + integrity sha512-jcAheb/EvUZF/mN5csH4ikq0WLzVMzWGONUUomMu7sZsK9w54I/UzvKdEc6st+4d/rLNZr9LKWdqrFsGt4y/Nw== + dependencies: + got "^11.8.2" + tough-cookie "^4.0.0" + defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"