refactor: 迁移大鱼与汪汪 runtime 请求骨架

2026-06-03 16:35:01 +08:00
parent e9534baace
commit ab49c32e33
6 changed files with 99 additions and 127 deletions
--- a/src/services/bark-battle-runtime/barkBattleRuntimeClient.ts
+++ b/src/services/bark-battle-runtime/barkBattleRuntimeClient.ts
@@ -5,15 +5,11 @@ import type {
  BarkBattleRunStartResponse,
  BarkBattleRuntimeConfig,
 } from '../../../packages/shared/src/contracts/barkBattle';
-import {
-  type ApiRetryOptions,
-  requestJson,
-} from '../apiClient';
-import {
-  buildRuntimeGuestAuthOptions,
-  buildRuntimeGuestHeaders,
-  type RuntimeGuestRequestOptions,
-} from '../runtimeGuestAuth';
+import { type ApiRetryOptions } from '../apiClient';
+import { type RuntimeGuestRequestOptions } from '../runtimeGuestAuth';
+import { buildRuntimeApiPath, requestRuntimeJson } from '../runtimeRequest';
+
+const BARK_BATTLE_RUNTIME_API_BASE = '/api/runtime/bark-battle';

 const BARK_BATTLE_RUNTIME_READ_RETRY: ApiRetryOptions = {
  maxRetries: 1,
@@ -34,16 +30,17 @@ export function getBarkBattleRuntimeConfig(
  workId: string,
  options: BarkBattleRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BarkBattleRuntimeConfig>(
-    `/api/runtime/bark-battle/works/${encodeURIComponent(workId)}/config`,
-    { method: 'GET', headers: buildRuntimeGuestHeaders(options) },
-    '读取汪汪声浪大作战配置失败',
-    {
-      retry: BARK_BATTLE_RUNTIME_READ_RETRY,
-      ...requestOptions,
-    },
-  );
+  return requestRuntimeJson<BarkBattleRuntimeConfig>({
+    url: buildRuntimeApiPath(
+      BARK_BATTLE_RUNTIME_API_BASE,
+      'works',
+      workId,
+      'config',
+    ),
+    fallbackMessage: '读取汪汪声浪大作战配置失败',
+    retry: BARK_BATTLE_RUNTIME_READ_RETRY,
+    requestOptions: options,
+  });
 }

 export function startBarkBattleRun(
@@ -51,39 +48,34 @@ export function startBarkBattleRun(
  payload: Partial<BarkBattleRunStartRequest> = {},
  options: BarkBattleRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BarkBattleRunStartResponse>(
-    `/api/runtime/bark-battle/works/${encodeURIComponent(workId)}/runs`,
-    {
-      method: 'POST',
-      headers: buildRuntimeGuestHeaders(options, { 'Content-Type': 'application/json' }),
-      body: JSON.stringify({
-        ...payload,
-        workId: payload.workId ?? workId,
-      }),
+  return requestRuntimeJson<BarkBattleRunStartResponse>({
+    url: buildRuntimeApiPath(
+      BARK_BATTLE_RUNTIME_API_BASE,
+      'works',
+      workId,
+      'runs',
+    ),
+    method: 'POST',
+    jsonBody: {
+      ...payload,
+      workId: payload.workId ?? workId,
    },
-    '启动汪汪声浪大作战正式局失败',
-    {
-      retry: BARK_BATTLE_RUNTIME_WRITE_RETRY,
-      ...requestOptions,
-    },
-  );
+    fallbackMessage: '启动汪汪声浪大作战正式局失败',
+    retry: BARK_BATTLE_RUNTIME_WRITE_RETRY,
+    requestOptions: options,
+  });
 }

 export function getBarkBattleRun(
  runId: string,
  options: BarkBattleRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<unknown>(
-    `/api/runtime/bark-battle/runs/${encodeURIComponent(runId)}`,
-    { method: 'GET', headers: buildRuntimeGuestHeaders(options) },
-    '读取汪汪声浪大作战单局失败',
-    {
-      retry: BARK_BATTLE_RUNTIME_READ_RETRY,
-      ...requestOptions,
-    },
-  );
+  return requestRuntimeJson<unknown>({
+    url: buildRuntimeApiPath(BARK_BATTLE_RUNTIME_API_BASE, 'runs', runId),
+    fallbackMessage: '读取汪汪声浪大作战单局失败',
+    retry: BARK_BATTLE_RUNTIME_READ_RETRY,
+    requestOptions: options,
+  });
 }

 export function finishBarkBattleRun(
@@ -91,21 +83,20 @@ export function finishBarkBattleRun(
  payload: BarkBattleRunFinishRequest,
  options: BarkBattleRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BarkBattleFinishResponse>(
-    `/api/runtime/bark-battle/runs/${encodeURIComponent(runId)}/finish`,
-    {
-      method: 'POST',
-      headers: buildRuntimeGuestHeaders(options, { 'Content-Type': 'application/json' }),
-      body: JSON.stringify({
-        ...payload,
-        runId: payload.runId ?? runId,
-      }),
+  return requestRuntimeJson<BarkBattleFinishResponse>({
+    url: buildRuntimeApiPath(
+      BARK_BATTLE_RUNTIME_API_BASE,
+      'runs',
+      runId,
+      'finish',
+    ),
+    method: 'POST',
+    jsonBody: {
+      ...payload,
+      runId: payload.runId ?? runId,
    },
-    '提交汪汪声浪大作战成绩失败',
-    {
-      retry: BARK_BATTLE_RUNTIME_WRITE_RETRY,
-      ...requestOptions,
-    },
-  );
+    fallbackMessage: '提交汪汪声浪大作战成绩失败',
+    retry: BARK_BATTLE_RUNTIME_WRITE_RETRY,
+    requestOptions: options,
+  });
 }
--- a/src/services/big-fish-runtime/bigFishRuntimeClient.ts
+++ b/src/services/big-fish-runtime/bigFishRuntimeClient.ts
@@ -4,16 +4,11 @@ import type {
  SubmitBigFishInputRequest,
 } from '../../../packages/shared/src/contracts/bigFish';
 import type { BigFishWorksResponse } from '../../../packages/shared/src/contracts/bigFishWorkSummary';
-import {
-  type ApiRetryOptions,
-  requestJson,
-} from '../apiClient';
-import {
-  buildRuntimeGuestAuthOptions,
-  buildRuntimeGuestHeaders,
-  type RuntimeGuestRequestOptions,
-} from '../runtimeGuestAuth';
+import { type ApiRetryOptions } from '../apiClient';
+import { type RuntimeGuestRequestOptions } from '../runtimeGuestAuth';
+import { buildRuntimeApiPath, requestRuntimeJson } from '../runtimeRequest';

+const BIG_FISH_RUNTIME_API_BASE = '/api/runtime/big-fish';
 const BIG_FISH_RUNTIME_WRITE_RETRY: ApiRetryOptions = {
  maxRetries: 1,
  baseDelayMs: 120,
@@ -30,51 +25,44 @@ export function recordBigFishPlay(
  payload: RecordBigFishPlayRequest,
  options: BigFishRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BigFishWorksResponse>(
-    `/api/runtime/big-fish/sessions/${encodeURIComponent(sessionId)}/play`,
-    {
-      method: 'POST',
-      headers: buildRuntimeGuestHeaders(options, {
-        'Content-Type': 'application/json',
-      }),
-      body: JSON.stringify(payload),
-    },
-    '记录大鱼吃小鱼游玩失败',
-    {
-      retry: BIG_FISH_RUNTIME_WRITE_RETRY,
-      ...requestOptions,
-    },
-  );
+  return requestRuntimeJson<BigFishWorksResponse>({
+    url: buildRuntimeApiPath(
+      BIG_FISH_RUNTIME_API_BASE,
+      'sessions',
+      sessionId,
+      'play',
+    ),
+    method: 'POST',
+    jsonBody: payload,
+    fallbackMessage: '记录大鱼吃小鱼游玩失败',
+    retry: BIG_FISH_RUNTIME_WRITE_RETRY,
+    requestOptions: options,
+  });
 }

 export function startBigFishRun(
  sessionId: string,
  options: BigFishRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BigFishRunResponse>(
-    `/api/runtime/big-fish/sessions/${encodeURIComponent(sessionId)}/runs`,
-    {
-      method: 'POST',
-      headers: buildRuntimeGuestHeaders(options),
-    },
-    '启动大鱼吃小鱼玩法失败',
-    {
-      retry: BIG_FISH_RUNTIME_WRITE_RETRY,
-      ...requestOptions,
-    },
-  );
+  return requestRuntimeJson<BigFishRunResponse>({
+    url: buildRuntimeApiPath(
+      BIG_FISH_RUNTIME_API_BASE,
+      'sessions',
+      sessionId,
+      'runs',
+    ),
+    method: 'POST',
+    fallbackMessage: '启动大鱼吃小鱼玩法失败',
+    retry: BIG_FISH_RUNTIME_WRITE_RETRY,
+    requestOptions: options,
+  });
 }

 export function getBigFishRun(runId: string) {
-  return requestJson<BigFishRunResponse>(
-    `/api/runtime/big-fish/runs/${encodeURIComponent(runId)}`,
-    {
-      method: 'GET',
-    },
-    '读取大鱼吃小鱼玩法失败',
-  );
+  return requestRuntimeJson<BigFishRunResponse>({
+    url: buildRuntimeApiPath(BIG_FISH_RUNTIME_API_BASE, 'runs', runId),
+    fallbackMessage: '读取大鱼吃小鱼玩法失败',
+  });
 }

 export function submitBigFishInput(
@@ -82,20 +70,12 @@ export function submitBigFishInput(
  payload: SubmitBigFishInputRequest,
  options: BigFishRuntimeRequestOptions = {},
 ) {
-  const requestOptions = buildRuntimeGuestAuthOptions(options);
-  return requestJson<BigFishRunResponse>(
-    `/api/runtime/big-fish/runs/${encodeURIComponent(runId)}/input`,
-    {
-      method: 'POST',
-      headers: buildRuntimeGuestHeaders(options, {
-        'Content-Type': 'application/json',
-      }),
-      body: JSON.stringify(payload),
-    },
-    '同步大鱼吃小鱼输入失败',
-    {
-      retry: BIG_FISH_RUNTIME_WRITE_RETRY,
-      ...requestOptions,
-    },
-  );
+  return requestRuntimeJson<BigFishRunResponse>({
+    url: buildRuntimeApiPath(BIG_FISH_RUNTIME_API_BASE, 'runs', runId, 'input'),
+    method: 'POST',
+    jsonBody: payload,
+    fallbackMessage: '同步大鱼吃小鱼输入失败',
+    retry: BIG_FISH_RUNTIME_WRITE_RETRY,
+    requestOptions: options,
+  });
 }
--- a/src/services/recommendedRuntimeGuestLaunch.test.ts
+++ b/src/services/recommendedRuntimeGuestLaunch.test.ts
@@ -13,8 +13,8 @@ vi.mock('./apiClient', async () => {
  };
 });

-import { startBigFishRun } from './big-fish-runtime/bigFishRuntimeClient';
 import { startBarkBattleRun } from './bark-battle-runtime/barkBattleRuntimeClient';
+import { startBigFishRun } from './big-fish-runtime/bigFishRuntimeClient';
 import { startJumpHopRuntimeRun } from './jump-hop/jumpHopClient';
 import { startMatch3DRun } from './match3d-runtime/match3dRuntimeClient';
 import {