From 34db391888719cb0665c48ad95ae5f8a5a1c5490 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:32:16 +0000 Subject: [PATCH 1/2] Update Node.js to v20.10.0 --- backend/auto-operation/package.json | 2 +- docker/backend/auto-operation/Dockerfile | 2 +- frontend/dashboard/package.json | 2 +- frontend/editor/package.json | 2 +- pnpm-lock.yaml | 40 ++++++++++++------------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index 5e38e84..1790658 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -20,7 +20,7 @@ "install": "^0.13.0" }, "devDependencies": { - "@types/node": "20.9.5", + "@types/node": "20.10.5", "tsx": "^4.3.0", "typescript": "5.2.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", diff --git a/docker/backend/auto-operation/Dockerfile b/docker/backend/auto-operation/Dockerfile index 5524583..5442e96 100644 --- a/docker/backend/auto-operation/Dockerfile +++ b/docker/backend/auto-operation/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.9-bookworm AS base +FROM node:20.10-bookworm AS base ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json index 8bd0406..5f18735 100644 --- a/frontend/dashboard/package.json +++ b/frontend/dashboard/package.json @@ -25,7 +25,7 @@ "@connectrpc/protoc-gen-connect-es": "^1.1.3", "@connectrpc/protoc-gen-connect-query": "^0.6.0", "@svgr/webpack": "^8.1.0", - "@types/node": "20.9.5", + "@types/node": "20.10.5", "@types/react": "18.2.38", "@types/react-dom": "18.2.17", "eslint-config-prettier": "^9.0.0", diff --git a/frontend/editor/package.json b/frontend/editor/package.json index ba9b895..7202b16 100644 --- a/frontend/editor/package.json +++ b/frontend/editor/package.json @@ -13,7 +13,7 @@ }, "devDependencies": { "prettier": "3.1.0", - "@types/node": "20.9.5", + "@types/node": "20.10.5", "@types/react": "18.2.38", "@types/react-dom": "18.2.17", "typescript": "5.3.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 93a561b..7b11663 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ importers: specifier: ^1.1.3 version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) '@types/node': - specifier: 20.9.5 - version: 20.9.5 + specifier: 20.10.5 + version: 20.10.5 tsx: specifier: ^4.3.0 version: 4.3.0 @@ -89,8 +89,8 @@ importers: specifier: ^8.1.0 version: 8.1.0(typescript@5.2.2) '@types/node': - specifier: 20.9.5 - version: 20.9.5 + specifier: 20.10.5 + version: 20.10.5 '@types/react': specifier: 18.2.38 version: 18.2.38 @@ -132,8 +132,8 @@ importers: version: 18.2.10(konva@9.2.3)(react-dom@18.2.0)(react@18.2.0) devDependencies: '@types/node': - specifier: 20.9.5 - version: 20.9.5 + specifier: 20.10.5 + version: 20.10.5 '@types/react': specifier: 18.2.38 version: 18.2.38 @@ -2239,26 +2239,26 @@ packages: resolution: {integrity: sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==} dependencies: '@types/connect': 3.4.38 - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/bonjour@3.5.13: resolution: {integrity: sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/connect-history-api-fallback@1.5.4: resolution: {integrity: sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==} dependencies: '@types/express-serve-static-core': 4.17.41 - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/connect@3.4.38: resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/eslint-scope@3.7.7: @@ -2282,7 +2282,7 @@ packages: /@types/express-serve-static-core@4.17.41: resolution: {integrity: sha512-OaJ7XLaelTgrvlZD8/aa0vvvxZdUmlCn6MtWeB7TkiKW70BQLc9XEPpDLPdbo52ZhXUCrznlWdCHWxJWtdyajA==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 '@types/qs': 6.9.10 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -2304,7 +2304,7 @@ packages: /@types/http-proxy@1.17.14: resolution: {integrity: sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/json-schema@7.0.15: @@ -2322,15 +2322,15 @@ packages: /@types/node-forge@1.3.10: resolution: {integrity: sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/node@12.20.55: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: false - /@types/node@20.9.5: - resolution: {integrity: sha512-Uq2xbNq0chGg+/WQEU0LJTSs/1nKxz6u1iemLcGomkSnKokbW1fbLqc3HOqCf2JP7KjlL4QkS7oZZTrOQHQYgQ==} + /@types/node@20.10.5: + resolution: {integrity: sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==} dependencies: undici-types: 5.26.5 dev: true @@ -2376,7 +2376,7 @@ packages: resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} dependencies: '@types/mime': 1.3.5 - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/serve-index@1.9.4: @@ -2390,19 +2390,19 @@ packages: dependencies: '@types/http-errors': 2.0.4 '@types/mime': 3.0.4 - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/sockjs@0.3.36: resolution: {integrity: sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@types/ws@8.5.10: resolution: {integrity: sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 dev: true /@typescript/vfs@1.5.0: @@ -4165,7 +4165,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.9.5 + '@types/node': 20.10.5 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true From 0b92442f9306f253c3e4d756016560e0cb18d55a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 18 Dec 2023 00:33:37 +0000 Subject: [PATCH 2/2] Commit from GitHub Actions (compile PB) --- .../state/v1/statev1connect/state.connect.go | 70 ++++++++++++++----- 1 file changed, 51 insertions(+), 19 deletions(-) diff --git a/backend/spec/state/v1/statev1connect/state.connect.go b/backend/spec/state/v1/statev1connect/state.connect.go index fba2f96..23ec261 100644 --- a/backend/spec/state/v1/statev1connect/state.connect.go +++ b/backend/spec/state/v1/statev1connect/state.connect.go @@ -18,7 +18,7 @@ import ( // generated with a version of connect newer than the one compiled into your binary. You can fix the // problem by either regenerating this code with an older version of connect or updating the connect // version compiled into your binary. -const _ = connect.IsAtLeastVersion0_1_0 +const _ = connect.IsAtLeastVersion1_13_0 const ( // StateManagerServiceName is the fully-qualified name of the StateManagerService service. @@ -62,6 +62,20 @@ const ( StateManagerServiceUpdateTrainProcedure = "/state.v1.StateManagerService/UpdateTrain" ) +// These variables are the protoreflect.Descriptor objects for the RPCs defined in this package. +var ( + stateManagerServiceServiceDescriptor = v1.File_state_v1_state_proto.Services().ByName("StateManagerService") + stateManagerServiceGetBlockStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetBlockStates") + stateManagerServiceUpdateBlockStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateBlockState") + stateManagerServiceUpdatePointStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdatePointState") + stateManagerServiceGetPointStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetPointStates") + stateManagerServiceUpdateStopStateMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateStopState") + stateManagerServiceGetStopStatesMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetStopStates") + stateManagerServiceGetTrainsMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("GetTrains") + stateManagerServiceAddTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("AddTrain") + stateManagerServiceUpdateTrainMethodDescriptor = stateManagerServiceServiceDescriptor.Methods().ByName("UpdateTrain") +) + // StateManagerServiceClient is a client for the state.v1.StateManagerService service. type StateManagerServiceClient interface { // Block @@ -92,47 +106,56 @@ func NewStateManagerServiceClient(httpClient connect.HTTPClient, baseURL string, getBlockStates: connect.NewClient[v1.GetBlockStatesRequest, v1.GetBlockStatesResponse]( httpClient, baseURL+StateManagerServiceGetBlockStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateBlockState: connect.NewClient[v1.UpdateBlockStateRequest, v1.UpdateBlockStateResponse]( httpClient, baseURL+StateManagerServiceUpdateBlockStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithClientOptions(opts...), ), updatePointState: connect.NewClient[v1.UpdatePointStateRequest, v1.UpdatePointStateResponse]( httpClient, baseURL+StateManagerServiceUpdatePointStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getPointStates: connect.NewClient[v1.GetPointStatesRequest, v1.GetPointStatesResponse]( httpClient, baseURL+StateManagerServiceGetPointStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), updateStopState: connect.NewClient[v1.UpdateStopStateRequest, v1.UpdateStopStateResponse]( httpClient, baseURL+StateManagerServiceUpdateStopStateProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithClientOptions(opts...), ), getStopStates: connect.NewClient[v1.GetStopStatesRequest, v1.GetStopStatesResponse]( httpClient, baseURL+StateManagerServiceGetStopStatesProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithClientOptions(opts...), ), getTrains: connect.NewClient[v1.GetTrainsRequest, v1.GetTrainsResponse]( httpClient, baseURL+StateManagerServiceGetTrainsProcedure, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithClientOptions(opts...), ), addTrain: connect.NewClient[v1.AddTrainRequest, v1.AddTrainResponse]( httpClient, baseURL+StateManagerServiceAddTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), updateTrain: connect.NewClient[v1.UpdateTrainRequest, v1.UpdateTrainResponse]( httpClient, baseURL+StateManagerServiceUpdateTrainProcedure, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithClientOptions(opts...), ), } } @@ -221,47 +244,56 @@ func NewStateManagerServiceHandler(svc StateManagerServiceHandler, opts ...conne stateManagerServiceGetBlockStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetBlockStatesProcedure, svc.GetBlockStates, - opts..., + connect.WithSchema(stateManagerServiceGetBlockStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateBlockStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateBlockStateProcedure, svc.UpdateBlockState, - opts..., + connect.WithSchema(stateManagerServiceUpdateBlockStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdatePointStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdatePointStateProcedure, svc.UpdatePointState, - opts..., + connect.WithSchema(stateManagerServiceUpdatePointStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetPointStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetPointStatesProcedure, svc.GetPointStates, - opts..., + connect.WithSchema(stateManagerServiceGetPointStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateStopStateHandler := connect.NewUnaryHandler( StateManagerServiceUpdateStopStateProcedure, svc.UpdateStopState, - opts..., + connect.WithSchema(stateManagerServiceUpdateStopStateMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetStopStatesHandler := connect.NewUnaryHandler( StateManagerServiceGetStopStatesProcedure, svc.GetStopStates, - opts..., + connect.WithSchema(stateManagerServiceGetStopStatesMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceGetTrainsHandler := connect.NewUnaryHandler( StateManagerServiceGetTrainsProcedure, svc.GetTrains, - opts..., + connect.WithSchema(stateManagerServiceGetTrainsMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceAddTrainHandler := connect.NewUnaryHandler( StateManagerServiceAddTrainProcedure, svc.AddTrain, - opts..., + connect.WithSchema(stateManagerServiceAddTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) stateManagerServiceUpdateTrainHandler := connect.NewUnaryHandler( StateManagerServiceUpdateTrainProcedure, svc.UpdateTrain, - opts..., + connect.WithSchema(stateManagerServiceUpdateTrainMethodDescriptor), + connect.WithHandlerOptions(opts...), ) return "/state.v1.StateManagerService/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path {