Skip to content

Commit

Permalink
一部TypedArrayがサポートされてないため、dashboardでのmsgpack通信を無効化 (#25)
Browse files Browse the repository at this point in the history
Fixes #24.


一部TypedArrayがサポートされてないため、msgpack通信を無効化しました([参考](msgpack/msgpack-javascript#182
-
[msgpack-lite](https://www.npmjs.com/package/msgpack-lite)の方がサポートされてるTypeは多いようですが、パッケージが古い(6年〜)・decodeAsyncがサポートされてないなどの理由で不採用。
- カスタム拡張を自作することで対応できそうですが、時間がかかる・frontend/backend両方実装する必要があると難易度が高い。

その他変更点まとめ:
- `npm audit fix`でdashboardの依存パッケージ脆弱性を修正
- M1Macでも動けるよう、`docker-compose.yml`に`platform`指定を追加
  • Loading branch information
makiuchi-d committed Feb 17, 2023
2 parents 60dd018 + cd8c695 commit 302e17f
Show file tree
Hide file tree
Showing 9 changed files with 1,157 additions and 1,895 deletions.
2,439 changes: 781 additions & 1,658 deletions wsnet2-dashboard/backend/package-lock.json

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions wsnet2-dashboard/backend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wsnet2-dashboard-backend",
"version": "0.0.1",
"version": "0.0.2",
"description": "Backend for wsnet2-dashboard",
"main": "src/index.ts",
"scripts": {
Expand All @@ -23,7 +23,6 @@
"cors": "^2.8.5",
"dotenv": "^14.3.2",
"express": "^4.17.2",
"express-msgpack": "^3.0.2",
"graphql": "^15.8.0",
"mysql2": "^2.3.3",
"nexus": "^1.1.0",
Expand Down
15 changes: 9 additions & 6 deletions wsnet2-dashboard/backend/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import express from "express";
import msgpack from "express-msgpack";
import cors from "cors";
import { ApolloServer } from "apollo-server-express";
// local imports
Expand All @@ -24,9 +23,9 @@ async function init() {
})
);

app.use(msgpack());
// app.use(express.json());
// app.use(express.urlencoded({ extended: true }));
// app.use(msgpack());
app.use(express.json());
app.use(express.urlencoded({ extended: true }));
await server.start();
server.applyMiddleware({ app, path: "/graphql" });

Expand All @@ -39,8 +38,12 @@ async function init() {
// start server
init()
.then((app) => {
app.listen(process.env.SERVER_PORT, () => {
console.log(`Start on port ${String(process.env.SERVER_PORT)}.`);
app.listen({
port: process.env.SERVER_PORT,
// host: "0.0.0.0",
callback: () => {
console.log(`Start on port ${String(process.env.SERVER_PORT)}.`);
},
});
})
.catch((err: Error) => {
Expand Down
5 changes: 4 additions & 1 deletion wsnet2-dashboard/backend/src/routes/overview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ router.get("/", (req: express.Request, res: express.Response) => {
`),
])
.then(([[rooms], [servers]]) => {
res.status(200).send({ rooms: rooms, servers: servers });
res.status(200).send({
rooms: rooms,
servers: servers,
});
})
.catch((err: Error) => {
res.status(500).send({ details: err.message });
Expand Down
Loading

0 comments on commit 302e17f

Please sign in to comment.