xwcoder · xwcoder · Nov 7, 2023 · Nov 7, 2023
diff --git a/build/renderer/webpack.config.common.ts b/build/renderer/webpack.config.common.ts
@@ -4,14 +4,14 @@ import HtmlWebpackPlugin from 'html-webpack-plugin'
 import baseConfig from '../webpack.config.base'
 import { src, dist } from '../paths'
 
-const context = path.resolve(src, './renderer')
+const context = path.resolve(src, './ui')
 
 const config = merge(baseConfig, {
   context,
   target: ['web'],
   entry: ['./index.tsx'],
   output: {
-    path: path.resolve(dist, './renderer'),
+    path: path.resolve(dist, './ui'),
     publicPath: './',
   },
   plugins: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -56,6 +56,7 @@
     "@electron-forge/publisher-github": "^6.4.2",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@types/lodash.get": "^4.4.7",
+    "@types/lodash.set": "^4.3.9",
     "@types/node": "^20.5.9",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.7",
@@ -92,6 +93,7 @@
     "@fluentui/react-icons": "^2.0.218",
     "electron-squirrel-startup": "^1.0.0",
     "lodash.get": "^4.4.2",
+    "lodash.set": "^4.3.2",
     "mobx": "^6.10.2",
     "mobx-react-lite": "^4.0.4",
     "react": "^18.2.0",

diff --git a/src/utils/browser/fetch.ts → src/base/browser/fetch.ts b/src/utils/browser/fetch.ts → src/base/browser/fetch.ts
diff --git a/src/utils/browser/shell.ts → src/base/browser/shell.ts b/src/utils/browser/shell.ts → src/base/browser/shell.ts
diff --git a/src/utils/common/date.ts → src/base/common/date.ts b/src/utils/common/date.ts → src/base/common/date.ts
diff --git a/src/utils/electron-main/env.ts → src/base/electron-main/env.ts b/src/utils/electron-main/env.ts → src/base/electron-main/env.ts
diff --git a/src/utils/node/feed.ts → src/base/node/feed.ts b/src/utils/node/feed.ts → src/base/node/feed.ts
diff --git a/src/utils/node/fs/index.ts → src/base/node/fs/index.ts b/src/utils/node/fs/index.ts → src/base/node/fs/index.ts
diff --git a/src/utils/node/fs/promise.ts → src/base/node/fs/promise.ts b/src/utils/node/fs/promise.ts → src/base/node/fs/promise.ts
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -1,11 +1,15 @@
 import '@/main/setup'
+import * as fs from 'node:fs'
+import { join } from 'node:path'
 import { app } from 'electron'
-import { isMac } from '@/utils/electron-main/env'
-import { createWindow } from './window'
+import { isMac } from '@/base/electron-main/env'
+import { createPushChannel } from '@/services/push/electron-main/push'
+import { register as registerCommands } from '@/services/commands/electron-main/commands'
+import { createWindow } from '@/services/window/electron-main/window'
+import * as themeService from '@/services/theme/electron-main/theme'
+import * as settingService from '@/services/settings/electron-main/settings'
 import { createApp as createReaderApp } from './reader'
 import { createApp as createSettingsApp } from './setttings'
-import { createPushChannel } from './push'
-import { register as registerCommands } from './commands'
 
 registerCommands()
 
@@ -15,6 +19,21 @@ createReaderApp()
 const window = createWindow()
 createPushChannel(window)
 
+themeService.init()
+
+settingService.on('change', (path, dataPath, oldDataPath) => {
+  if (path !== 'dataPath' || !dataPath) {
+    return
+  }
+
+  if (!fs.existsSync(join(dataPath, 'emo.db'))) {
+    fs.renameSync(join(oldDataPath, 'emo.db'), join(dataPath, 'emo.db'))
+  }
+
+  app.relaunch()
+  app.exit()
+})
+
 app.on('window-all-closed', () => {
   if (!isMac) {
     app.quit()

diff --git a/src/main/reader/db.ts b/src/main/reader/db.ts
@@ -1,5 +1,5 @@
-import { exec } from '@/main/db'
-import { logger } from '@/utils/electron-main/logger'
+import { exec } from '@/services/db/electron-main/db'
+import { logger } from '@/services/logger/electron-main/logger'
 
 const sql = `
   CREATE TABLE IF NOT EXISTS feeds (

diff --git a/src/main/reader/index.ts b/src/main/reader/index.ts
@@ -1,6 +1,6 @@
+import { router } from '@/router/reader/electron-main'
+import { startCrawler } from '@/services/reader/electron-main/crawler'
 import { init as initDB } from './db'
-import { router } from './router'
-import { startCrawler } from './crawler'
 
 export function createApp() {
   initDB()

diff --git a/src/main/reader/router/router.ts b/src/main/reader/router/router.ts
diff --git a/src/main/setttings/index.ts b/src/main/setttings/index.ts
@@ -1,61 +1,5 @@
-import * as path from 'node:path'
-import * as fs from 'node:fs'
-import { app, nativeTheme } from 'electron'
-import { Router } from '@/main/router'
-import { readJSON, writeJSON } from '@/utils/node/fs'
-
-const router = new Router({ prefix: '/settings' })
-
-const settingsFilePath = path.join(app.getPath('userData'), 'settings.json')
-
-type Settings = {
-  locale: string
-  appearance: 'light' | 'dark' | 'auto'
-  defaultDataPath: string
-  dataPath: string
-}
-
-export const settings: Settings = {
-  locale: '',
-  appearance: 'auto',
-  defaultDataPath: app.getPath('userData'),
-  dataPath: app.getPath('userData'),
-  ...readJSON(settingsFilePath),
-}
-
-const getTheme = () => settings.appearance === 'auto' ? 'system' : settings.appearance
-
-router.use('get', () => settings)
-
-router.use('put', (_, data: Partial<Settings> = {}) => {
-  let restart = false
-
-  if (data.dataPath && data.dataPath !== settings.dataPath) {
-    if (!fs.existsSync(path.join(data.dataPath, 'emo.db'))) {
-      fs.renameSync(path.join(settings.dataPath, 'emo.db'), path.join(data.dataPath, 'emo.db'))
-    }
-
-    restart = true
-  }
-
-  Object.assign(settings, data)
-
-  nativeTheme.themeSource = getTheme()
-
-  writeJSON(settingsFilePath, settings)
-
-  if (restart) {
-    app.relaunch()
-    app.exit()
-  }
-})
+import { router } from '@/router/settings/electron-main/settings'
 
 export const createApp = () => {
-  app.whenReady()
-    .then(() => {
-      settings.locale = settings.locale || app.getLocale()
-      nativeTheme.themeSource = getTheme()
-    })
-
   router.listen()
 }
diff --git a/src/main/setup.ts b/src/main/setup.ts
@@ -1,5 +1,5 @@
 import { app } from 'electron'
-import { isDev } from '@/utils/electron-main/env'
+import { isDev } from '@/base/electron-main/env'
 
 if (isDev) {
   app.setName(`${app.getName()}-dev`)

diff --git a/src/main/reader/router/article.ts → src/router/reader/electron-main/article.ts b/src/main/reader/router/article.ts → src/router/reader/electron-main/article.ts
@@ -1,4 +1,4 @@
-import * as articleService from '@/main/reader/services/article'
+import * as articleService from '@/services/reader/electron-main/article'
 import { router } from './router'
 
 router.get('/articles', async (_, params) => {

diff --git a/src/main/reader/router/feed.ts → src/router/reader/electron-main/feed.ts b/src/main/reader/router/feed.ts → src/router/reader/electron-main/feed.ts
@@ -1,8 +1,8 @@
 import { Feed } from '@/types/reader'
-import * as feedService from '@/main/reader/services/feed'
-import * as articleService from '@/main/reader/services/article'
-import { parseURL } from '@/utils/node/feed'
-import { logger } from '@/utils/electron-main/logger'
+import * as feedService from '@/services/reader/electron-main/feed'
+import * as articleService from '@/services/reader/electron-main/article'
+import { parseURL } from '@/base/node/feed'
+import { logger } from '@/services/logger/electron-main/logger'
 import { router } from './router'
 
 router.get('/feed/preflight', async (_, url: string) => {

diff --git a/src/main/reader/router/index.ts → src/router/reader/electron-main/index.ts b/src/main/reader/router/index.ts → src/router/reader/electron-main/index.ts
diff --git a/src/router/reader/electron-main/router.ts b/src/router/reader/electron-main/router.ts
@@ -0,0 +1,3 @@
+import { Router } from '@/services/router/electron-main/router'
+
+export const router = new Router({ prefix: '/reader' })
diff --git a/src/router/settings/electron-main/settings.ts b/src/router/settings/electron-main/settings.ts
@@ -0,0 +1,10 @@
+import { Router } from '@/services/router/electron-main/router'
+import * as settingService from '@/services/settings/electron-main/settings'
+
+export const router = new Router({ prefix: '/settings' })
+
+// const getTheme = () => settings.appearance === 'auto' ? 'system' : settings.appearance
+
+router.use('get', () => settingService.get())
+
+router.use('set', (_, { path, value }: { path: string, value: any }) => settingService.set(path, value))
diff --git a/src/main/commands.ts → ...rvices/commands/electron-main/commands.ts b/src/main/commands.ts → ...rvices/commands/electron-main/commands.ts
diff --git a/src/main/db.ts → src/services/db/electron-main/db.ts b/src/main/db.ts → src/services/db/electron-main/db.ts
@@ -1,13 +1,11 @@
 import * as path from 'node:path'
 import { verbose } from 'sqlite3'
-import { logger } from '@/utils/electron-main/logger'
+import { logger } from '@/services/logger/electron-main/logger'
+import * as settingService from '@/services/settings/electron-main/settings'
 
-import { settings } from './setttings'
-
-const { dataPath } = settings
 const { Database } = verbose()
 
-const file = path.join(dataPath, 'emo.db')
+const file = path.join(settingService.get('dataPath'), 'emo.db')
 
 const db = new Database(file)
 

diff --git a/src/utils/electron-main/logger.ts → src/services/logger/electron-main/logger.ts b/src/utils/electron-main/logger.ts → src/services/logger/electron-main/logger.ts
diff --git a/src/main/push.ts → src/services/push/electron-main/push.ts b/src/main/push.ts → src/services/push/electron-main/push.ts
@@ -1,4 +1,4 @@
-import { Window } from './window'
+import { Window } from '../../window/electron-main/window'
 
 let window: Window
 

diff --git a/src/renderer/services/reader/article.ts → src/services/reader/browser/article.ts b/src/renderer/services/reader/article.ts → src/services/reader/browser/article.ts
@@ -1,4 +1,4 @@
-import fetch from '@/utils/browser/fetch'
+import fetch from '@/base/browser/fetch'
 import { Tab, Article } from '@/types/reader'
 
 export const find = (param: { tab: Tab | number, page: number, size: number }) => fetch('/reader/get/articles', param)

diff --git a/src/renderer/services/reader/feed.ts → src/services/reader/browser/feed.ts b/src/renderer/services/reader/feed.ts → src/services/reader/browser/feed.ts
@@ -1,4 +1,4 @@
-import fetch from '@/utils/browser/fetch'
+import fetch from '@/base/browser/fetch'
 
 export const preflight = (url: string) => fetch('/reader/get/feed/preflight', url)
 

diff --git a/src/main/reader/services/article.ts → src/services/reader/electron-main/article.ts b/src/main/reader/services/article.ts → src/services/reader/electron-main/article.ts
@@ -1,4 +1,4 @@
-import db, { get, all, run } from '@/main/db'
+import db, { get, all, run } from '@/services/db/electron-main/db'
 import { Article, Tab } from '@/types/reader'
 
 export const upsert = (articles: Article | Article[]) => new Promise<void>((resolve, reject) => {

diff --git a/src/main/reader/crawler.ts → src/services/reader/electron-main/crawler.ts b/src/main/reader/crawler.ts → src/services/reader/electron-main/crawler.ts
@@ -1,7 +1,7 @@
-import * as feedService from '@/main/reader/services/feed'
-import * as articleService from '@/main/reader/services/article'
-import { parseURL } from '@/utils/node/feed'
-import { logger } from '@/utils/electron-main/logger'
+import * as feedService from '@/services/reader/electron-main/feed'
+import * as articleService from '@/services/reader/electron-main/article'
+import { parseURL } from '@/base/node/feed'
+import { logger } from '@/services/logger/electron-main/logger'
 import { Feed } from '@/types/reader'
 
 const crawlOne = async (f: Feed) => {

diff --git a/src/main/reader/services/feed.ts → src/services/reader/electron-main/feed.ts b/src/main/reader/services/feed.ts → src/services/reader/electron-main/feed.ts
@@ -1,5 +1,5 @@
-import db, { run, get, all } from '@/main/db'
-import { push } from '@/main/push'
+import db, { run, get, all } from '@/services/db/electron-main/db'
+import { push } from '@/services/push/electron-main/push'
 import { Feed } from '@/types/reader'
 
 export const upsert = (feed: Feed) => {

diff --git a/src/utils/browser/remote-event.ts → src/services/remote/browser/remote.ts b/src/utils/browser/remote-event.ts → src/services/remote/browser/remote.ts
diff --git a/src/main/router.ts → src/services/router/electron-main/router.ts b/src/main/router.ts → src/services/router/electron-main/router.ts
@@ -1,5 +1,5 @@
 import { app, ipcMain } from 'electron'
-import { logger } from '@/utils/electron-main/logger'
+import { logger } from '@/services/logger/electron-main/logger'
 
 type RouteHandler = (ch: string, data?: any) => any
 

diff --git a/src/services/settings/browser/settings.ts b/src/services/settings/browser/settings.ts
@@ -0,0 +1,5 @@
+import fetch from '@/base/browser/fetch'
+
+export const get = (path?: string) => fetch('/settings/get', path)
+
+export const set = (path: string, value: any) => fetch('/settings/set', { path, value })
diff --git a/src/services/settings/electron-main/settings.ts b/src/services/settings/electron-main/settings.ts
@@ -0,0 +1,46 @@
+import { join } from 'node:path'
+import { EventEmitter } from 'node:events'
+import { app } from 'electron'
+import _get from 'lodash.get'
+import _set from 'lodash.set'
+import { readJSON, writeJSON } from '@/base/node/fs'
+
+const emitter = new EventEmitter()
+const settingsFilePath = join(app.getPath('userData'), 'settings.json')
+
+export type Settings = {
+  locale: string
+  appearance: 'light' | 'dark' | 'auto'
+  defaultDataPath: string
+  dataPath: string
+}
+
+const settings: Settings = {
+  locale: '',
+  appearance: 'auto',
+  defaultDataPath: app.getPath('userData'),
+  dataPath: app.getPath('userData'),
+  ...readJSON(settingsFilePath),
+}
+
+export const get = (path?: string) => path ? _get(settings, path) : settings
+
+export const set = (path: string, value: any) => {
+  const oldValue = get(path)
+
+  _set(settings, path, value)
+  writeJSON(settingsFilePath, settings)
+
+  if (oldValue !== value) {
+    emitter.emit('change', path, value, oldValue)
+  }
+}
+
+type changeListener = (path: string, newValue: any, oldValue: any) => void
+
+export const on = (eventName: 'change', listener: changeListener): EventEmitter => emitter.on(eventName, listener)
+
+app.whenReady()
+  .then(() => {
+    settings.locale = settings.locale || app.getLocale()
+  })
diff --git a/src/services/theme/electron-main/theme.ts b/src/services/theme/electron-main/theme.ts
@@ -0,0 +1,20 @@
+import { app, nativeTheme } from 'electron'
+import * as settingService from '@/services/settings/electron-main/settings'
+
+const getTheme = () => {
+  const appearance = settingService.get('appearance')
+  return appearance === 'auto' ? 'system' : appearance
+}
+
+export const init = () => {
+  app.whenReady()
+    .then(() => {
+      nativeTheme.themeSource = getTheme()
+    })
+
+  settingService.on('change', (path) => {
+    if (path === 'appearance') {
+      nativeTheme.themeSource = getTheme()
+    }
+  })
+}
diff --git a/src/main/window.ts → src/services/window/electron-main/window.ts b/src/main/window.ts → src/services/window/electron-main/window.ts
@@ -1,7 +1,7 @@
 import * as path from 'node:path'
 import { app, BrowserWindow } from 'electron'
-import { isDev, isMac, isWin } from '@/utils/electron-main/env'
-import { WindowStateManager } from './windowState'
+import { isDev, isMac, isWin } from '@/base/electron-main/env'
+import { WindowStateManager } from '@/services/windowState/electron-main/windowState'
 
 export class Window {
   window: BrowserWindow | null = null
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import { Router } from '@/services/router/electron-main/router'

		export const router = new Router({ prefix: '/reader' })