Merge pull request #61 from 2skydev/dev

v0.0.12

Author: 2skydev

.gitignore

@@ -7,4 +7,5 @@ yarn-error.log*
 /resources/windows/chromium
 chrome_data
 out
-release
+release
+.env

electron.vite.config.ts

@@ -1,34 +1,54 @@
-import { defineConfig, externalizeDepsPlugin, swcPlugin } from 'electron-vite'
+import { defineConfig, externalizeDepsPlugin, loadEnv, swcPlugin } from 'electron-vite'
 
+import { sentryVitePlugin } from '@sentry/vite-plugin'
 import react from '@vitejs/plugin-react'
 import { resolve } from 'path'
 
-export default defineConfig({
-  main: {
-    plugins: [externalizeDepsPlugin(), swcPlugin()],
-    build: {
-      watch: {},
-    },
-    resolve: {
-      alias: {
-        '@main': resolve('src/main'),
+export default defineConfig(({ mode }) => {
+  const isDev = mode === 'development'
+  const env = loadEnv(mode, process.cwd(), '')
+
+  const sentryVitePluginArray = isDev
+    ? []
+    : [
+        sentryVitePlugin({
+          org: '2skydev',
+          project: 'lada',
+          authToken: env.SENTRY_AUTH_TOKEN,
+        }),
+      ]
+
+  return {
+    main: {
+      plugins: [externalizeDepsPlugin(), swcPlugin(), ...sentryVitePluginArray],
+      build: {
+        watch: {},
+        sourcemap: true,
       },
-    },
-  },
-  preload: {
-    plugins: [externalizeDepsPlugin()],
-  },
-  renderer: {
-    plugins: [react()],
-    resolve: {
-      alias: {
-        '@main': resolve('src/main'),
-        '@renderer': resolve('src/renderer/src'),
+      resolve: {
+        alias: {
+          '@main': resolve('src/main'),
+        },
       },
     },
-    server: {
-      port: 3000,
-      strictPort: true,
+    preload: {
+      plugins: [externalizeDepsPlugin()],
+    },
+    renderer: {
+      plugins: [react(), ...sentryVitePluginArray],
+      resolve: {
+        alias: {
+          '@main': resolve('src/main'),
+          '@renderer': resolve('src/renderer/src'),
+        },
+      },
+      server: {
+        port: 3000,
+        strictPort: true,
+      },
+      build: {
+        sourcemap: true,
+      },
     },
-  },
+  }
 })

package.json

@@ -26,6 +26,7 @@
   },
   "dependencies": {
     "@launchtray/tsyringe-async": "^4.3.3",
+    "@sentry/electron": "^4.8.0",
     "auto-launch": "^5.0.5",
     "axios": "^1.2.3",
     "cheerio": "^1.0.0-rc.12",
@@ -43,6 +44,8 @@
     "ts-pattern": "^4.3.0"
   },
   "devDependencies": {
+    "@sentry/react": "^7.58.1",
+    "@sentry/vite-plugin": "^2.4.0",
     "@swc/core": "^1.3.51",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@types/auto-launch": "^5.0.2",

src/main/env.d.ts

@@ -0,0 +1,7 @@
+interface ImportMetaEnv {
+  readonly MAIN_VITE_SENTRY_DSN: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}

src/main/index.ts

@@ -1,6 +1,7 @@
 import 'reflect-metadata'
 
 import { container } from '@launchtray/tsyringe-async'
+import * as Sentry from '@sentry/electron/main'
 
 import { AppFactory } from '@main/core/factory'
 import { AppModule } from '@main/modules/app/app.module'
@@ -11,6 +12,9 @@ import { MigrationModule } from '@main/modules/migration/migration.module'
 import { PSModule } from '@main/modules/ps/ps.module'
 import { UpdateModule } from '@main/modules/update/update.module'
 
+Sentry.init({
+  dsn: import.meta.env.MAIN_VITE_SENTRY_DSN,
+})
 ;(async () => {
   const appModule = await AppFactory.create(AppModule, [
     MigrationModule,

src/main/modules/ps/ps.module.ts

@@ -41,19 +41,9 @@ export class PSModule {
     this.server.add('/summoner-ps-id/:summonerName', async ({ params }) => {
       const { summonerName } = params
 
-      const { data: html } = await axios.get(`https://lol.ps/summoner/${summonerName}`)
-      const $ = cheerio.load(html)
+      const summoner = await this.getSummoner(summonerName)
 
-      const [
-        ,
-        ,
-        ,
-        {
-          data: { summary },
-        },
-      ] = JSON.parse($('script[sveltekit\\:data-type="server_data"]').text())
-
-      return summary._id
+      return summoner?.summonerPsId ?? null
     })
 
     this.server.add('/summoners', async ({ payload }) => {

src/renderer/index.html

@@ -2,7 +2,7 @@
 <html lang="ko">
   <head>
     <meta charset="UTF-8" />
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self';" />
+    <meta http-equiv="Content-Security-Policy" content="script-src 'self'; worker-src blob:;" />
     <link href="/fonts.css" rel="stylesheet" />
     <link href="/fonts/Boxicons/css/boxicons.min.css" rel="stylesheet" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />

src/renderer/src/assets/images/error.webp

@@ -0,0 +1,53 @@
+import { useState } from 'react'
+import { useLocation, useRouteError } from 'react-router-dom'
+
+import { Button } from 'antd'
+
+import errorImage from '@renderer/assets/images/error.webp'
+import Titlebar from '@renderer/components/Titlebar'
+
+import { ErrorFallbackStyled } from './styled'
+
+const ignorePaths = [/\/overlays\/.+/]
+
+const ErrorFallback = () => {
+  const [loading, setLoading] = useState(false)
+
+  const { message } = useRouteError() as any
+  const { pathname } = useLocation()
+
+  const isIgnore = ignorePaths.some(path => path.test(pathname))
+
+  const handleReload = () => {
+    setLoading(true)
+    setTimeout(() => window.location.reload(), 500)
+  }
+
+  if (isIgnore) return null
+
+  return (
+    <ErrorFallbackStyled
+      className="ErrorFallback"
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+    >
+      <Titlebar />
+
+      <img src={errorImage} alt="error" />
+
+      <h1>알 수 없는 곳으로 와버린 거 같아요</h1>
+      <p>원인은 저희가 찾아볼게요 여러분들은 다시 돌아가는 게 좋을 것 같아요</p>
+
+      <Button onClick={handleReload} loading={loading}>
+        돌아가기
+      </Button>
+
+      <div className="error">
+        <div className="title">오류 내용</div>
+        <div className="content">{message}</div>
+      </div>
+    </ErrorFallbackStyled>
+  )
+}
+
+export default ErrorFallback

src/renderer/src/components/ErrorFallback/ErrorFallback.tsx

@@ -0,0 +1,3 @@
+// === Automatically generated file. Don't edit it. ===
+export * from './ErrorFallback';
+export { default } from './ErrorFallback';