fix backend

Author: makiuchi-d

wsnet2-dashboard/backend/src/plugins/binary.js

@@ -11,7 +11,7 @@ const binary = globalThis.binary;
 
 export function UnmarshalRecursive(src) {
     const ret = binary.UnmarshalRecursive(src);
-    if (ret.err != null) {
+    if (ret.err != "") {
         return [null, ret.err]
     }
     return [JSON.parse(ret.val), null];

wsnet2-dashboard/backend/src/routes/game.ts

@@ -43,7 +43,7 @@ export interface RoomInfo {
         watchers: number | undefined;
         publicProps: binary.Unmarshaled;
         privateProps: binary.Unmarshaled;
-        created: Timestamp | undefined;
+        created: string | undefined;
       }
     | undefined;
   clientInfosList: ClientInfo[];
@@ -77,7 +77,7 @@ function ConvertRoomInfo(src: GetRoomInfoRes): RoomInfo {
       privateProps: room
         ? binary.UnmarshalRecursive(room?.privateProps)
         : [null, {}],
-      created: room?.created,
+        created: room?.created?.timestamp?.seconds?.toString(),
     },
     clientInfosList: src.clientInfos.map((info) => {
       return {
@@ -107,7 +107,7 @@ async function getCachedGameClient(hostId: number) {
     throw new Error("Can't find game server by given hostId!");
 
   const gameClient = createClient(Game, createGrpcTransport({
-    baseUrl: `${server.hostname}:${server.grpc_port}`,
+    baseUrl: `http://${server.hostname}:${server.grpc_port}`,
     interceptors: [],
   }));
 

wsnet2-dashboard/backend/src/routes/overview.ts

@@ -11,7 +11,6 @@ const sql = mysql.createPool({
 
 //一覧取得
 router.get("/", (req: express.Request, res: express.Response) => {
-	console.log("get /overview/");
   Promise.all([
     sql.query(`
         SELECT room.host_id, game_server.hostname, COUNT(room.host_id) AS num 
@@ -39,7 +38,6 @@ router.get("/", (req: express.Request, res: express.Response) => {
 
 // パッケージのバージョンを取得
 router.get("/version", (req: express.Request, res: express.Response) => {
-	console.log("get /overview/version");
   res.status(200).send({
     version: process.env.npm_package_version,
   });
@@ -49,7 +47,6 @@ router.get("/version", (req: express.Request, res: express.Response) => {
 router.get(
   "/graphql_result_limit",
   (req: express.Request, res: express.Response) => {
-	console.log("get /overview/graphql_result_limit");
     res.status(200).send({
       limit: process.env.GRAPHQL_RESULT_MAX_SIZE,
     });

wsnet2-dashboard/compose.yaml

@@ -31,4 +31,4 @@ services:
     working_dir: /repo/wsnet2-dashboard/backend
     ports:
       - 5555:5555
-    command: bash -c "make install-deps && arelo -t src -t ../../server/pb -t ../../server/sql -t ../../server/binary -i '**/.*' -i 'src/pb' -i 'node_modules' -p '**/*.{ts,proto,trigger}' -p '../../server/binary/*.go' -- /wait-for-it.sh wsnet2-db:3306 -s -t 0 -- make re-run"
+    command: bash -c "make install-deps && arelo -t src -t ../../server/pb -t ../../server/sql -t ../../server/binary -i '**/.*' -i 'src/pb' -i 'node_modules' -p '**/*.{js,ts,proto,trigger}' -p '../../server/binary/*.go' -- /wait-for-it.sh wsnet2-db:3306 -s -t 0 -- make re-run"