Merge branch 'main' into fix-simulator-code

# Conflicts:
#	frontend/app/components/modules/simulator-display/simulator-chair-display.tsx
#	frontend/app/routes/simulator._index/route.tsx

bench/benchmarker/webapp/api/generate.go

@@ -1,3 +1,3 @@
 package api
 
-//go:generate go run github.com/ogen-go/ogen/cmd/ogen --target . --clean ../../../../openapi/openapi.yaml
+//go:generate go run github.com/ogen-go/ogen/cmd/ogen --target . --clean ../../../../webapp/openapi.yaml

development/dockerfiles/Dockerfile.rust

@@ -1,4 +1,4 @@
-FROM rust:1.82-bookworm
+FROM rust:1.83-bookworm
 
 WORKDIR /home/isucon/webapp/rust
 

frontend/.eslintrc.cjs

@@ -13,7 +13,7 @@ module.exports = {
     commonjs: true,
     es6: true,
   },
-  ignorePatterns: ["!**/.server", "!**/.client", "app/apiClient/"],
+  ignorePatterns: ["!**/.server", "!**/.client", "app/api/"],
   extends: ["eslint:recommended"],
   overrides: [
     // React

frontend/.prettierignore

@@ -1 +1 @@
-app/apiClient/
+app/api/

frontend/app/apiClient/apiComponents.ts → frontend/app/api/api-components.ts

@@ -4,10 +4,10 @@
  * @version 1.0
  */
 import * as reactQuery from "@tanstack/react-query";
-import { useApiContext, ApiContext } from "./apiContext";
-import type * as Fetcher from "./apiFetcher";
-import { apiFetch } from "./apiFetcher";
-import type * as Schemas from "./apiSchemas";
+import { useApiContext, ApiContext } from "./api-context";
+import type * as Fetcher from "./api-fetcher";
+import { apiFetch } from "./api-fetcher";
+import type * as Schemas from "./api-schemas";
 
 export type PostInitializeError = Fetcher.ErrorWrapper<undefined>;
 
@@ -610,6 +610,9 @@ export type AppGetNearbyChairsVariables = {
   queryParams: AppGetNearbyChairsQueryParams;
 } & ApiContext["fetcherOptions"];
 
+/**
+ * 椅子からサーバーに記録された座標情報は3秒以内に反映されている必要があります。
+ */
 export const fetchAppGetNearbyChairs = (
   variables: AppGetNearbyChairsVariables,
   signal?: AbortSignal,
@@ -623,6 +626,9 @@ export const fetchAppGetNearbyChairs = (
     {}
   >({ url: "/app/nearby-chairs", method: "get", ...variables, signal });
 
+/**
+ * 椅子からサーバーに記録された座標情報は3秒以内に反映されている必要があります。
+ */
 export const useAppGetNearbyChairs = <TData = AppGetNearbyChairsResponse,>(
   variables: AppGetNearbyChairsVariables,
   options?: Omit<
@@ -1182,6 +1188,42 @@ export const useChairPostRideStatus = (
   });
 };
 
+export type InternalGetMatchingError = Fetcher.ErrorWrapper<undefined>;
+
+export type InternalGetMatchingVariables = ApiContext["fetcherOptions"];
+
+export const fetchInternalGetMatching = (
+  variables: InternalGetMatchingVariables,
+  signal?: AbortSignal,
+) =>
+  apiFetch<undefined, InternalGetMatchingError, undefined, {}, {}, {}>({
+    url: "/internal/matching",
+    method: "get",
+    ...variables,
+    signal,
+  });
+
+export const useInternalGetMatching = <TData = undefined,>(
+  variables: InternalGetMatchingVariables,
+  options?: Omit<
+    reactQuery.UseQueryOptions<undefined, InternalGetMatchingError, TData>,
+    "queryKey" | "queryFn" | "initialData"
+  >,
+) => {
+  const { fetcherOptions, queryOptions, queryKeyFn } = useApiContext(options);
+  return reactQuery.useQuery<undefined, InternalGetMatchingError, TData>({
+    queryKey: queryKeyFn({
+      path: "/internal/matching",
+      operationId: "internalGetMatching",
+      variables,
+    }),
+    queryFn: ({ signal }) =>
+      fetchInternalGetMatching({ ...fetcherOptions, ...variables }, signal),
+    ...options,
+    ...queryOptions,
+  });
+};
+
 export type QueryOperation =
   | {
       path: "/app/rides";
@@ -1212,4 +1254,9 @@ export type QueryOperation =
       path: "/chair/notification";
       operationId: "chairGetNotification";
       variables: ChairGetNotificationVariables;
+    }
+  | {
+      path: "/internal/matching";
+      operationId: "internalGetMatching";
+      variables: InternalGetMatchingVariables;
     };

frontend/app/apiClient/apiContext.ts → frontend/app/api/api-context.ts

@@ -1,5 +1,5 @@
 import type { QueryKey, UseQueryOptions } from "@tanstack/react-query";
-import { QueryOperation } from "./apiComponents";
+import { QueryOperation } from "./api-components";
 
 export type ApiContext = {
   fetcherOptions: {

frontend/app/apiClient/apiFetcher.ts → frontend/app/api/api-fetcher.ts

@@ -1,4 +1,4 @@
-import { ApiContext } from "./apiContext";
+import { ApiContext } from "./api-context";
 
 const baseUrl = __API_BASE_URL__;
 

frontend/app/components/hooks/use-emulator.ts

@@ -2,8 +2,8 @@ import { useEffect } from "react";
 import {
   fetchChairPostCoordinate,
   fetchChairPostRideStatus,
-} from "~/apiClient/apiComponents";
-import { Coordinate } from "~/apiClient/apiSchemas";
+} from "~/api/api-components";
+import { Coordinate } from "~/api/api-schemas";
 import type { SimulatorChair } from "~/types";
 import {
   setSimulatorCurrentCoordinate,

frontend/app/components/modules/location-button/location-button.tsx

@@ -1,6 +1,6 @@
 import type { ComponentProps, FC } from "react";
 import { twMerge } from "tailwind-merge";
-import { Coordinate } from "~/apiClient/apiSchemas";
+import { Coordinate } from "~/api/api-schemas";
 import { PinIcon } from "~/components/icon/pin";
 import { Button } from "~/components/primitives/button/button";
 

frontend/app/components/modules/simulator-chair-status/simulator-chair-status.tsx

@@ -1,6 +1,6 @@
 import { ComponentProps, FC } from "react";
 import { twMerge } from "tailwind-merge";
-import { RideStatus } from "~/apiClient/apiSchemas";
+import { RideStatus } from "~/api/api-schemas";
 import { Text } from "~/components/primitives/text/text";
 
 const StatusList = {

frontend/app/components/modules/simulator-display/simulator-chair-display.tsx

@@ -1,7 +1,7 @@
 import { FC, memo, useCallback, useMemo, useRef, useState } from "react";
 import { twMerge } from "tailwind-merge";
 import colors from "tailwindcss/colors";
-import { RideStatus } from "~/apiClient/apiSchemas";
+import { RideStatus } from "~/api/api-schemas";
 import { ChairIcon } from "~/components/icon/chair";
 import { PinIcon } from "~/components/icon/pin";
 import { LocationButton } from "~/components/modules/location-button/location-button";

frontend/app/contexts/owner-context.tsx

@@ -12,7 +12,7 @@ import {
   OwnerGetSalesResponse,
   fetchOwnerGetChairs,
   fetchOwnerGetSales,
-} from "~/apiClient/apiComponents";
+} from "~/api/api-components";
 import { isClientApiError } from "~/types";
 import { getCookieValue } from "~/utils/get-cookie-value";
 

frontend/app/contexts/simulator-context.tsx

@@ -6,14 +6,14 @@ import {
   useMemo,
   useState,
 } from "react";
-import type { Coordinate } from "~/apiClient/apiSchemas";
+import type { Coordinate } from "~/api/api-schemas";
 import { getSimulateChair } from "~/utils/get-initial-data";
 
-import { apiBaseURL } from "~/apiClient/APIBaseURL";
+import { apiBaseURL } from "~/api/api-base-url";
 import {
   ChairGetNotificationResponse,
   fetchChairGetNotification,
-} from "~/apiClient/apiComponents";
+} from "~/api/api-components";
 import type { ClientChairRide, SimulatorChair } from "~/types";
 import { getSimulatorCurrentCoordinate } from "~/utils/storage";
 

frontend/app/contexts/user-context.tsx

@@ -7,12 +7,12 @@ import {
   useState,
   type ReactNode,
 } from "react";
-import { apiBaseURL } from "~/apiClient/APIBaseURL";
+import { apiBaseURL } from "~/api/api-base-url";
 import {
   AppGetNotificationResponse,
   fetchAppGetNotification,
-} from "~/apiClient/apiComponents";
-import type { Coordinate, RideStatus } from "~/apiClient/apiSchemas";
+} from "~/api/api-components";
+import type { Coordinate, RideStatus } from "~/api/api-schemas";
 import { isClientApiError, type ClientAppRide } from "~/types";
 import { getCookieValue } from "~/utils/get-cookie-value";
 import {

frontend/app/routes/client._index/driving-state/arrived.tsx

@@ -1,7 +1,7 @@
 import { Form } from "@remix-run/react";
 import { MouseEventHandler, useCallback, useEffect, useState } from "react";
 import colors from "tailwindcss/colors";
-import { fetchAppPostRideEvaluation } from "~/apiClient/apiComponents";
+import { fetchAppPostRideEvaluation } from "~/api/api-components";
 import { PinIcon } from "~/components/icon/pin";
 import { Price } from "~/components/modules/price/price";
 import { Button } from "~/components/primitives/button/button";

frontend/app/routes/client._index/route.tsx

@@ -5,8 +5,8 @@ import {
   fetchAppGetNearbyChairs,
   fetchAppPostRides,
   fetchAppPostRidesEstimatedFare,
-} from "~/apiClient/apiComponents";
-import { Coordinate, RideStatus } from "~/apiClient/apiSchemas";
+} from "~/api/api-components";
+import { Coordinate, RideStatus } from "~/api/api-schemas";
 import { useGhostChairs } from "~/components/hooks/use-ghost-chairs";
 import { CampaignBanner } from "~/components/modules/campaign-banner/campaign-banner";
 import { LocationButton } from "~/components/modules/location-button/location-button";