Skip to content

Commit 1abbcb2

Browse files
authored
fix(shared): use global config for env (#996)
* fix(shared): use global config for env * refactor(shared): streamline global config initialization and access
1 parent de46a7b commit 1abbcb2

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

packages/shared/src/env.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
declare global {
2+
var midsceneGlobalConfig: Partial<ReturnType<typeof allConfigFromEnv>> | null;
3+
}
4+
15
// config keys
26
export const MIDSCENE_OPENAI_INIT_CONFIG_JSON =
37
'MIDSCENE_OPENAI_INIT_CONFIG_JSON';
@@ -131,13 +135,11 @@ export const allConfigFromEnv = () => {
131135
};
132136
};
133137

134-
let globalConfig: Partial<ReturnType<typeof allConfigFromEnv>> | null = null;
135-
136138
const getGlobalConfig = () => {
137-
if (globalConfig === null) {
138-
globalConfig = allConfigFromEnv();
139+
if (!globalThis.midsceneGlobalConfig) {
140+
globalThis.midsceneGlobalConfig = allConfigFromEnv();
139141
}
140-
return globalConfig;
142+
return globalThis.midsceneGlobalConfig;
141143
};
142144

143145
// import { UITarsModelVersion } from '@ui-tars/shared/constants';
@@ -276,7 +278,7 @@ export const overrideAIConfig = (
276278
}
277279

278280
const currentConfig = getGlobalConfig();
279-
globalConfig = extendMode
281+
globalThis.midsceneGlobalConfig = extendMode
280282
? { ...currentConfig, ...newConfig }
281283
: { ...newConfig };
282284
};

0 commit comments

Comments
 (0)