Merge pull request #264 from ueckoken/implement-frontend-api-call

use vite and implement blocks
ueckoken · Apr 24, 2024 · e83e49f · e83e49f
2 parents c84c9c9 + d46e1aa
commit e83e49f
Show file tree

Hide file tree

Showing 53 changed files with 2,919 additions and 3,285 deletions.
diff --git a/backend/auto-operation/main.ts b/backend/auto-operation/main.ts
@@ -64,6 +64,8 @@ async function main() {
     // 閉塞の確認する
     const block = blocks.find(b => b.blockId === collespondBlock);
     if (block && block.state === BlockStateEnum.BLOCK_STATE_CLOSE) {
+      // sakurajosui_down_s1はSTOPにしない chofufes
+      if (stop.id === "sakurajosui_down_s1") continue;
       if (stop.state !== StopStateEnum.STOP_STATE_STOP) {
         // 閉塞が閉じていたら列車を止めておく
         await client.updateStopState({
@@ -73,6 +75,16 @@ async function main() {
           }
         })
       }
+    } else {
+      if (stop.state !== StopStateEnum.STOP_STATE_GO) {
+        // 閉塞が開いていたら列車を開けておく
+        await client.updateStopState({
+          "state": {
+            "id": stop.id,
+            "state": StopStateEnum.STOP_STATE_GO
+          }
+        })
+      }
     }
   }
 
@@ -138,8 +150,9 @@ async function main() {
       }
     }
     if (point.id === "sakurajosui_down_p1") {
-      const sakurajosui_down_s1 = stops.find(s => s.id === "sakurajosui_down_s1");
-      if (sakurajosui_down_s1 && sakurajosui_down_s1.state === StopStateEnum.STOP_STATE_STOP) {
+      // const sakurajosui_down_s1 = stops.find(s => s.id === "sakurajosui_down_s1");
+      const sakurajosui_down_b1 = blocks.find(b => b.blockId === "sakurajosui_down_b1");
+      if (sakurajosui_down_b1 && sakurajosui_down_b1.state === BlockStateEnum.BLOCK_STATE_CLOSE) {
         if (point.state !== PointStateEnum.POINT_STATE_REVERSE) {
           await client.updatePointState({
             "state": {
@@ -160,37 +173,63 @@ async function main() {
       }
     }
     if (point.id === "chofu_up_p1") {
-      // 調布ポイント
-      // 閉塞 chofu_up_b1 にいる列車の目的地に応じてポイントを切り替える
-      const train = trains.find(t => t.positionId === "chofu_up_b1");
-      if (train) {
-        const destination = train.destination;
-        if (destination.includes("hashimoto")) {
-          if (point.state !== PointStateEnum.POINT_STATE_REVERSE) {
+      // 閉塞が空いてる方に切り替える b1 or b2
+      const chofu_up_b1 = blocks.find(b => b.blockId === "chofu_up_b1");
+      const chofu_up_b2 = blocks.find(b => b.blockId === "chofu_up_b2");
+      if (chofu_up_b1 && chofu_up_b2) {
+        if (chofu_up_b1.state === BlockStateEnum.BLOCK_STATE_OPEN) {
+          if (point.state !== PointStateEnum.POINT_STATE_NORMAL) {
             await client.updatePointState({
               "state": {
                 "id": point.id,
-                "state": PointStateEnum.POINT_STATE_REVERSE
+                "state": PointStateEnum.POINT_STATE_NORMAL
               }
             })
           }
-        } else {
-          if (point.state !== PointStateEnum.POINT_STATE_NORMAL) {
+        } else if (chofu_up_b2.state === BlockStateEnum.BLOCK_STATE_OPEN) {
+          if (point.state !== PointStateEnum.POINT_STATE_REVERSE) {
             await client.updatePointState({
               "state": {
                 "id": point.id,
-                "state": PointStateEnum.POINT_STATE_NORMAL
+                "state": PointStateEnum.POINT_STATE_REVERSE
               }
             })
           }
-
         }
       }
     }
+
+    //   // 調布ポイント
+    //   // 閉塞 chofu_up_b1 にいる列車の目的地に応じてポイントを切り替える
+    //   const train = trains.find(t => t.positionId === "chofu_up_b1");
+    //   if (train) {
+    //     const destination = train.destination;
+    //     if (destination.includes("hashimoto")) {
+    //       if (point.state !== PointStateEnum.POINT_STATE_REVERSE) {
+    //         await client.updatePointState({
+    //           "state": {
+    //             "id": point.id,
+    //             "state": PointStateEnum.POINT_STATE_REVERSE
+    //           }
+    //         })
+    //       }
+    //     } else {
+    //       if (point.state !== PointStateEnum.POINT_STATE_NORMAL) {
+    //         await client.updatePointState({
+    //           "state": {
+    //             "id": point.id,
+    //             "state": PointStateEnum.POINT_STATE_NORMAL
+    //           }
+    //         })
+    //       }
+
+    //     }
+    //   }
+    // }
   }
 }
 
-addTest();
+// addTest();
 
 (async () => {
   while (true) {

diff --git a/backend/onetime/seed-data/data/chofufes-2023.yaml b/backend/onetime/seed-data/data/chofufes-2023.yaml
@@ -16,19 +16,18 @@ stop_rails:
 point_rails:
   - sakurajosui_up_p1
   - sakurajosui_down_p1
-  - chofu_up_p1
+  - chofu_down_p1
 blocks:
   - shinjyuku_down_b1
   - sakurajosui_down_b1
-  - sakurajosui_down_b1
+  - sakurajosui_up_b1
   - chofu_down_b2
   - hashimoto_down_b1
   - hashimoto_up_b1
   - chofu_up_b1
   - chofu_down_b1
   - hachioji_down_b1
   - hachioji_up_b1
-  - chofu_up_b1
   - sakurajosui_up_b1
   - sakurajosui_up_b1
   - shinjyuku_up_b1
diff --git a/backend/proxy/main.go b/backend/proxy/main.go
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	frontendURL, _ := url.Parse("http://localhost:3000")
+	frontendURL, _ := url.Parse("http://localhost:5173")
 	backendURL, _ := url.Parse("http://localhost:8080")
 
 	mux := http.NewServeMux()
@@ -24,5 +24,5 @@ func main() {
 	}
 	mux.Handle("/api/", &rev)
 
-	fmt.Println(http.ListenAndServe(":3030", mux))
+	fmt.Println(http.ListenAndServe(":3031", mux))
 }
diff --git a/backend/spec/state/v1/statev1connect/state.connect.go b/backend/spec/state/v1/statev1connect/state.connect.go
diff --git a/backend/state-manager/cmd/main.go b/backend/state-manager/cmd/main.go
@@ -132,7 +132,7 @@ func main() {
 					"version": version,
 					"commit":  commit,
 				},
-				LogLevel: slog.LevelDebug,
+				LogLevel: slog.LevelWarn,
 			},
 		),
 	),

diff --git a/backend/state-manager/pkg/connect/connect_handler.go b/backend/state-manager/pkg/connect/connect_handler.go
@@ -26,6 +26,10 @@ func (s *StateManagerServer) GetBlockStates(
 	ctx context.Context,
 	req *connect.Request[statev1.GetBlockStatesRequest],
 ) (*connect.Response[statev1.GetBlockStatesResponse], error) {
+	req.Header().Set("Access-Control-Allow-Headers", "*")
+	req.Header().Set("Access-Control-Allow-Origin", "*")
+	req.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
+
 	blockStates, err := s.DBHandler.GetBlocks()
 	if err != nil {
 		err = connect.NewError(
@@ -144,6 +148,9 @@ func (s *StateManagerServer) GetStopStates(
 	ctx context.Context,
 	req *connect.Request[statev1.GetStopStatesRequest],
 ) (*connect.Response[statev1.GetStopStatesResponse], error) {
+	req.Header().Set("Access-Control-Allow-Headers", "*")
+	req.Header().Set("Access-Control-Allow-Origin", "*")
+	req.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
 	stopStates, err := s.DBHandler.GetStops()
 	if err != nil {
 		err = connect.NewError(
@@ -178,6 +185,9 @@ func (s *StateManagerServer) GetTrains(
 	ctx context.Context,
 	req *connect.Request[statev1.GetTrainsRequest],
 ) (*connect.Response[statev1.GetTrainsResponse], error) {
+	req.Header().Set("Access-Control-Allow-Headers", "*")
+	req.Header().Set("Access-Control-Allow-Origin", "*")
+	req.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
 	trains, err := s.DBHandler.GetTrains()
 	if err != nil {
 		err = connect.NewError(
@@ -209,6 +219,9 @@ func (s *StateManagerServer) AddTrain(
 	ctx context.Context,
 	req *connect.Request[statev1.AddTrainRequest],
 ) (*connect.Response[statev1.AddTrainResponse], error) {
+	req.Header().Set("Access-Control-Allow-Headers", "*")
+	req.Header().Set("Access-Control-Allow-Origin", "*")
+	req.Header().Set("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS")
 	err := s.DBHandler.AddTrain(req.Msg.Train)
 	if err != nil {
 		err = connect.NewError(