fix(stage-tamagotchi,stage-shared,stage-ui): unify electron-renderer globals and fix env checks in providers (#668)

sumimakito · web-flow · commit bcc262a50c6a · 2025-10-20T15:09:45.000+08:00
diff --git a/apps/stage-tamagotchi/electron.vite.config.ts b/apps/stage-tamagotchi/electron.vite.config.ts
@@ -74,13 +74,11 @@ export default defineConfig({
     plugins: [
       {
         name: 'proj-airi:define-runtime-environment',
-        config(ctx) {
-          if (ctx.mode === 'production') {
-            return {
-              define: {
-                'import.meta.env.RUNTIME_ENVIRONMENT': '\'electron\'',
-              },
-            }
+        config() {
+          return {
+            define: {
+              'import.meta.env.RUNTIME_ENVIRONMENT': '\'electron\'',
+            },
           }
         },
       },
diff --git a/apps/stage-tamagotchi/package.json b/apps/stage-tamagotchi/package.json
@@ -127,6 +127,7 @@
     "@iconify/utils": "^3.0.2",
     "@intlify/unplugin-vue-i18n": "^11.0.1",
     "@proj-airi/lobe-icons": "^1.0.13",
+    "@proj-airi/stage-shared": "workspace:^",
     "@proj-airi/ui-transitions": "workspace:^",
     "@proj-airi/unplugin-fetch": "^0.1.7",
     "@proj-airi/unplugin-live2d-sdk": "^0.1.6",
diff --git a/apps/stage-tamagotchi/src/preload/index.d.ts b/apps/stage-tamagotchi/src/preload/index.d.ts
diff --git a/apps/stage-tamagotchi/src/preload/index.ts b/apps/stage-tamagotchi/src/preload/index.ts
@@ -20,10 +20,7 @@ if (contextIsolated) {
   }
 }
 else {
-  // @ts-expect-error (define in dts)
   window.electron = electronAPI
-  // @ts-expect-error (define in dts)
   window.platform = platform
-  // @ts-expect-error (define in dts)
   window.api = api
 }
diff --git a/apps/stage-tamagotchi/src/renderer/electron-renderer.d.ts b/apps/stage-tamagotchi/src/renderer/electron-renderer.d.ts
diff --git a/apps/stage-tamagotchi/tsconfig.json b/apps/stage-tamagotchi/tsconfig.json
@@ -1,7 +1,8 @@
 {
   "references": [
-    { "path": "./tsconfig.web.json" },
-    { "path": "./tsconfig.node.json" }
+    { "path": "./tsconfig.preload.json" },
+    { "path": "./tsconfig.node.json" },
+    { "path": "./tsconfig.web.json" }
   ],
   "files": []
 }
diff --git a/apps/stage-tamagotchi/tsconfig.node.json b/apps/stage-tamagotchi/tsconfig.node.json
@@ -27,11 +27,6 @@
     "src/main/**/*.tsx",
     "src/main/**/*.vue",
 
-    "src/preload/**/*.ts",
-    "src/preload/**/*.d.ts",
-    "src/preload/**/*.tsx",
-    "src/preload/**/*.vue",
-
     "src/shared/**/*.ts",
     "src/shared/**/*.d.ts",
     "src/shared/**/*.tsx",
diff --git a/apps/stage-tamagotchi/tsconfig.preload.json b/apps/stage-tamagotchi/tsconfig.preload.json
@@ -0,0 +1,32 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "target": "ESNext",
+    "jsx": "preserve",
+    "lib": [
+      "DOM",
+      "ESNext"
+    ],
+    "useDefineForClassFields": true,
+    "resolveJsonModule": true,
+    "types": [
+      "vitest",
+      "vite/client",
+      "electron-vite/node",
+      "@proj-airi/stage-shared/electron-renderer"
+    ],
+    "allowJs": true,
+    "strict": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "vite.config.ts",
+    "electron.vite.config.ts",
+
+    "src/preload/**/*.ts",
+    "src/preload/**/*.d.ts",
+    "src/preload/**/*.tsx",
+    "src/preload/**/*.vue"
+  ]
+}
diff --git a/apps/stage-tamagotchi/tsconfig.web.json b/apps/stage-tamagotchi/tsconfig.web.json
@@ -26,7 +26,7 @@
       "unplugin-vue-router/client",
       "@types/audioworklet",
       "unplugin-info/client",
-      "./src/renderer/electron-renderer.d.ts"
+      "@proj-airi/stage-shared/electron-renderer"
     ],
     "allowJs": true,
     "strict": true,
diff --git a/packages/stage-shared/package.json b/packages/stage-shared/package.json
@@ -15,9 +15,13 @@
     "directory": "packages/stage-shared"
   },
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./src/index.ts",
+    "./electron-renderer": "./src/electron-renderer.d.ts"
   },
   "scripts": {
     "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "@electron-toolkit/preload": "^3.0.2"
   }
 }
diff --git a/packages/stage-shared/src/electron-renderer.d.ts b/packages/stage-shared/src/electron-renderer.d.ts
@@ -0,0 +1,5 @@
+import type { ElectronWindow } from './window'
+
+declare global {
+  interface Window extends ElectronWindow {}
+}
diff --git a/packages/stage-shared/src/index.ts b/packages/stage-shared/src/index.ts
@@ -1,2 +1,3 @@
 export * from './environment'
 export * from './url'
+export * from './window'
diff --git a/packages/stage-shared/src/window.ts b/packages/stage-shared/src/window.ts
@@ -0,0 +1,13 @@
+import type { ElectronAPI } from '@electron-toolkit/preload'
+
+import { isStageTamagotchi } from './environment'
+
+export interface ElectronWindow {
+  electron: ElectronAPI
+  platform: NodeJS.Platform
+  api: unknown
+}
+
+export function isElectronWindow(window: Window): window is (Window & ElectronWindow) {
+  return isStageTamagotchi() && typeof window === 'object' && window !== null && 'electron' in window
+}
diff --git a/packages/stage-shared/tsconfig.json b/packages/stage-shared/tsconfig.json
@@ -38,6 +38,7 @@
   ],
   "exclude": [
     "dist",
-    "node_modules"
+    "node_modules",
+    "src/electron-renderer.d.ts"
   ]
 }
diff --git a/packages/stage-ui/src/stores/providers.ts b/packages/stage-ui/src/stores/providers.ts
@@ -17,7 +17,7 @@ import type {
   VoiceProviderWithExtraOptions,
 } from 'unspeech'
 
-import { isUrl } from '@proj-airi/stage-shared'
+import { isStageTamagotchi, isUrl } from '@proj-airi/stage-shared'
 import { computedAsync, useLocalStorage } from '@vueuse/core'
 import {
   createAzure,
@@ -214,19 +214,8 @@ export const useProvidersStore = defineStore('providers', () => {
     return null
   })
 
-  async function isTamagotchi() {
-    if ('window' in globalThis && globalThis.window != null) {
-      if (('__TAURI_INTERNALS__' in globalThis.window && globalThis.window.__TAURI_INTERNALS__ != null) || location.host === 'tauri.localhost') {
-        return true
-      }
-    }
-    return false
-  }
-
   async function isBrowserAndMemoryEnough() {
-    const isInApp = await isTamagotchi()
-
-    if (isInApp)
+    if (isStageTamagotchi())
       return false
 
     const webGPUAvailable = await isWebGPUSupported()
@@ -313,7 +302,7 @@ export const useProvidersStore = defineStore('providers', () => {
       description: 'https://github.com/huggingface/candle',
       category: 'speech',
       tasks: ['text-to-speech', 'tts'],
-      isAvailableBy: isTamagotchi,
+      isAvailableBy: isStageTamagotchi,
       creator: createOpenAI,
       validation: [],
       validators: {
@@ -343,7 +332,7 @@ export const useProvidersStore = defineStore('providers', () => {
       description: 'https://github.com/huggingface/candle',
       category: 'transcription',
       tasks: ['speech-to-text', 'automatic-speech-recognition', 'asr', 'stt'],
-      isAvailableBy: isTamagotchi,
+      isAvailableBy: isStageTamagotchi,
       creator: createOpenAI,
       validation: [],
       validators: {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,7 @@ if (contextIsolated) {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`else {`
`23`		`- // @ts-expect-error (define in dts)`
`24`	`23`	`window.electron = electronAPI`
`25`		`- // @ts-expect-error (define in dts)`
`26`	`24`	`window.platform = platform`
`27`		`- // @ts-expect-error (define in dts)`
`28`	`25`	`window.api = api`
`29`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"references": [`
`3`		`- { "path": "./tsconfig.web.json" },`
`4`		`- { "path": "./tsconfig.node.json" }`
	`3`	`+ { "path": "./tsconfig.preload.json" },`
	`4`	`+ { "path": "./tsconfig.node.json" },`
	`5`	`+ { "path": "./tsconfig.web.json" }`
`5`	`6`	`],`
`6`	`7`	`"files": []`
`7`	`8`	`}`