Stabilize strategy switch current-state reads

Author: Pigbibi

tests/strategy_switch_worker_validation.mjs

@@ -7,6 +7,7 @@ import worker, { __test } from "../web/strategy-switch-console/worker.js";
 
 const root = resolve(dirname(fileURLToPath(import.meta.url)), "..");
 const indexHtml = readFileSync(resolve(root, "web/strategy-switch-console/index.html"), "utf8");
+assert.ok(__test.currentStrategiesTimeoutMs >= 8000);
 const renderPlatformsBody = indexHtml.match(/function renderPlatforms\(\) \{([\s\S]*?)\n    \}/)?.[1] || "";
 assert.ok(!renderPlatformsBody.includes("syncStrategyForAccount("));
 assert.equal(indexHtml.includes(".innerHTML"), false);
@@ -406,6 +407,59 @@ try {
   globalThis.fetch = originalFetch;
 }
 
+let releaseReservedVariables;
+let reservedVariableRequests = 0;
+let reservedVariablesFinished = false;
+let runtimeTargetStartedBeforeReservedVariablesFinished = false;
+const reservedVariablesGate = new Promise((resolve) => {
+  releaseReservedVariables = () => {
+    reservedVariablesFinished = true;
+    resolve();
+  };
+});
+const reservedVariableFallback = setTimeout(releaseReservedVariables, 100);
+globalThis.fetch = async (url) => {
+  const requestUrl = String(url);
+  if (requestUrl.endsWith("/CLOUD_RUN_SERVICE_TARGETS_JSON")) {
+    return new Response("", { status: 404 });
+  }
+  if (requestUrl.endsWith("/SCHWAB_MIN_RESERVED_CASH_USD") || requestUrl.endsWith("/SCHWAB_RESERVED_CASH_RATIO")) {
+    reservedVariableRequests += 1;
+    await reservedVariablesGate;
+    return new Response(JSON.stringify({ value: requestUrl.endsWith("/SCHWAB_RESERVED_CASH_RATIO") ? "0.03" : "150" }), {
+      status: 200,
+      headers: { "Content-Type": "application/json" },
+    });
+  }
+  if (requestUrl.endsWith("/RUNTIME_TARGET_JSON")) {
+    runtimeTargetStartedBeforeReservedVariablesFinished = reservedVariableRequests === 2 && !reservedVariablesFinished;
+    releaseReservedVariables();
+    return new Response(JSON.stringify({
+      value: JSON.stringify({
+        platform_id: "schwab",
+        strategy_profile: "soxl_soxx_trend_income",
+        dry_run_only: false,
+        account_scope: "schwab",
+        service_name: "charles-schwab-quant-service",
+        execution_mode: "live",
+      }),
+    }), { status: 200, headers: { "Content-Type": "application/json" } });
+  }
+  return new Response("", { status: 404 });
+};
+try {
+  const currentStrategies = await __test.loadCurrentStrategies(
+    { schwab: accountOptions.schwab },
+    { RUNTIME_SETTINGS_DISPATCH_TOKEN: "test-token" },
+  );
+  assert.equal(currentStrategies.schwab.default.min_reserved_cash_usd, "150");
+  assert.equal(currentStrategies.schwab.default.reserved_cash_ratio, "0.03");
+  assert.equal(runtimeTargetStartedBeforeReservedVariablesFinished, true);
+} finally {
+  clearTimeout(reservedVariableFallback);
+  globalThis.fetch = originalFetch;
+}
+
 const longbridgeHk = __test.assertConfiguredAccount(
   {
     platform: "longbridge",

web/strategy-switch-console/worker.js

@@ -11,7 +11,7 @@ const ACCOUNT_OPTIONS_KEY = "account_options";
 const STRATEGY_PROFILES_KEY = "strategy_profiles";
 const AUDIT_LOG_KEY = "audit_log";
 const AUDIT_LOG_LIMIT = 50;
-const CURRENT_STRATEGIES_TIMEOUT_MS = 3500;
+const CURRENT_STRATEGIES_TIMEOUT_MS = 10000;
 const GITHUB_API_TIMEOUT_MS = 8000;
 
 const SUPPORTED_PLATFORMS = ["longbridge", "ibkr", "schwab", "firstrade"];
@@ -594,14 +594,18 @@ async function resolveCurrentStrategyForAccount({ platform, option, optionsCount
 
   const variableScope = resolveVariableScope(platform, option);
   const githubEnvironment = resolveGithubEnvironment(platform, option, variableScope);
-  const reservedCashPayload = await readReservedCashVariables({
+  const reservedCashPayloadPromise = readReservedCashVariables({
     platform,
     repository,
     variableScope,
     githubEnvironment,
     readVariable,
   });
-  const runtimeTargetValue = await readVariable(repository, variableScope, githubEnvironment, "RUNTIME_TARGET_JSON");
+  const runtimeTargetValuePromise = readVariable(repository, variableScope, githubEnvironment, "RUNTIME_TARGET_JSON");
+  const [reservedCashPayload, runtimeTargetValue] = await Promise.all([
+    reservedCashPayloadPromise,
+    runtimeTargetValuePromise,
+  ]);
   const runtimeTarget = parseJsonObject(runtimeTargetValue);
   const runtimeTargetMatches = runtimeTarget && runtimeTargetMatchesAccount(runtimeTarget, platform, option);
   const runtimeTargetProfile = runtimeTargetMatches ? cleanCurrentStrategy(runtimeTarget.strategy_profile) : "";
@@ -1805,6 +1809,7 @@ function escapeHtml(value) {
 
 export const __test = {
   assertConfiguredAccount,
+  currentStrategiesTimeoutMs: CURRENT_STRATEGIES_TIMEOUT_MS,
   assertStrategyAllowedForAccount,
   inferAccountSupportedDomains,
   loadCurrentStrategies,