Squashed commit of the following:

commit 3ed03f9 Author: Thaumy <[email protected]> Date: Wed Jan 4 17:09:45 2023 +0800 add compile time config
Thaumy · Jan 4, 2023 · e9ac8c4 · e9ac8c4
1 parent 11e532d
commit e9ac8c4
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 38 deletions.
diff --git a/app.vue b/app.vue
@@ -39,6 +39,7 @@ import FixedBtnZone from "@/components/common/FixedBtnZone.vue"
 import {useTheme} from "vuetify"
 import {addRouteMiddleware, useAsyncData, useNuxtApp, useRoute, useRouter, useState} from "#app"
 import {Tab} from "~/components/field/type"
+import build_meta from "~/field.meta"
 
 const route = useRoute()
 const router = useRouter()
@@ -61,6 +62,7 @@ addRouteMiddleware(async (to, from) => {
 })
 
 onBeforeMount(() => {
+  document.body.style.backgroundImage = `url('${build_meta.backgroundImgUrl}')`
   provide('isDarkTheme', useTheme().global.current.value.dark)
 })
 

diff --git a/components/Menu/Menu.vue b/components/Menu/Menu.vue
@@ -8,11 +8,11 @@
       />
       <Avatar
           :about_me_post_id="about_me_post_id"
-          :avatar-url="avatar_img_url"
+          :avatar-url="build_meta.avatarImgUrl"
       />
       <Info
           class="mb-4"
-          title="THAUMY的小站"
+          :title=build_meta.siteTitle
           :typing="[
             '你好！~~^400',
             '这里是THAUMY的博客！^300',
@@ -37,8 +37,9 @@
       </f-tabs>
 
       <About
+          v-ripple
           :about_site_post_id="about_site_post_id"
-          info="Thaumy's Blog©2016-2023<br>About Site" v-ripple
+          info="Thaumy's Blog©2016-2023<br>About Site"
       />
 
     </f-card>
@@ -56,7 +57,7 @@ import FTab from "@/components/field/f-tab.vue"
 import FTabs from "@/components/field/f-tabs.vue"
 import FCard from "@/components/field/f-card.vue"
 import ThemeToggleBtn from "@/components/btn/ThemeToggleBtn.vue"
-import {avatar_img_url} from "@/public/config/site"
+import build_meta from "~/field.meta"
 import {useRouter, useRoute} from "#app"
 
 const props =

diff --git a/components/MenuBar/MenuBar.vue b/components/MenuBar/MenuBar.vue
@@ -9,15 +9,14 @@
       <div class="cursor-pointer flex">
         <img
             class="avatar border-shadow"
-            :src="avatar_img_url" alt="avatar"
+            :src="build_meta.avatarImgUrl" alt="avatar"
             @click="router.push('/'+about_me_post_id)"
         />
         <div
             class="name"
             @click="router.push('/')"
-        >
-          THAUMY的小站
-        </div>
+            v-text=build_meta.siteTitle
+        />
       </div>
 
       <transition name="open-drawer-btn">
@@ -50,8 +49,8 @@ import {makeDebounce} from "@/scripts/util/debounce"
 import Drawer from "./Drawer.vue"
 import {Tab} from "@/components/field/type"
 import Shadow from "@/components/MenuBar/Shadow.vue"
-import {avatar_img_url} from "@/public/config/site"
 import {useRouter} from "#app"
+import build_meta from "~/field.meta"
 
 const router = useRouter()
 

diff --git a/field.meta.ts b/field.meta.ts
@@ -0,0 +1,35 @@
+class BuildMeta {
+    //config Field here
+    #site_title = 'THAUMY的小站'
+    #site_icon_url = 'https://cdn.thaumy.cn/ui/icon.png'
+    #enable_cdn = false
+    #cdn_url = 'https://cdn.thaumy.cn'
+
+    #avatar_img_url = 'https://cdn.thaumy.cn/ui/avatar.png'
+    #background_img_url = 'https://cdn.thaumy.cn/ui/background.jpg'
+
+    #ws_server_root = 'ws://127.0.0.1:10010'
+    #ws_client_root = 'ws://127.0.0.1:10011'
+    //#ws_client_root = 'wss://next.thaumy.cn:10011'
+
+    #enable_server_dev_log = true
+    #enable_client_dev_log = true
+
+
+    //public fields
+    siteTitle = this.#site_title
+    siteIconUrl = this.#site_icon_url
+    cdnURL = this.#enable_cdn ? this.#cdn_url : ''
+
+    avatarImgUrl = this.#avatar_img_url
+    backgroundImgUrl = this.#background_img_url
+
+    wsServerRoot = this.#ws_server_root
+    wsClientRoot = this.#ws_client_root
+
+    enableServerDevLog = this.#enable_server_dev_log
+    enableClientDevLog = this.#enable_client_dev_log
+}
+
+export default new BuildMeta()
+
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -1,5 +1,6 @@
 import vuetify from "vite-plugin-vuetify"
 import prismjsPlugin from "vite-plugin-prismjs"
+import build_meta from './field.meta'
 
 export default defineNuxtConfig({
     typescript: {
@@ -17,12 +18,11 @@ export default defineNuxtConfig({
         }
     },
     app: {
-        //config CDN here
-        cdnURL: 'https://cdn.thaumy.cn',
+        cdnURL: build_meta.cdnURL,
         head: {
-            title: 'THAUMY的博客',
+            title: build_meta.siteTitle,
             link: [
-                {rel: 'icon', href: 'https://cdn.thaumy.cn/ui/icon.png'}
+                {rel: 'icon', href: build_meta.siteIconUrl}
             ],
             script: [
                 {src: './config/mathjax.js'},
@@ -74,7 +74,6 @@ export default defineNuxtConfig({
                     'python', 'fsharp', 'scheme', 'kotlin',
                     'haskell',
                     'javascript', 'typescript',
-                    //rare usage
                     'idris', 'less', 'lisp', 'agda', 'racket', 'julia', 'graphql', 'http', 'lua'
                 ]
                 //TODO fix style

diff --git a/public/config/config.json b/public/config/config.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/public/config/site.ts b/public/config/site.ts
diff --git a/public/config/mathjax.js → public/script/mathjax.js b/public/config/mathjax.js → public/script/mathjax.js
diff --git a/styles/global/tag.styl b/styles/global/tag.styl
@@ -9,8 +9,6 @@ body
   background-size cover
   background-position center
   background-attachment fixed
-  //background-image url("@/public/background.jpg")
-  background-image url("https://cdn.thaumy.cn/ui/background.jpg")
 
 .v-application
   background unset !important
diff --git a/ws/client/helper.ts b/ws/client/helper.ts
@@ -1,14 +1,14 @@
 import {randomId, reqStringify, rspParse} from "@/ws/helper"
 import {ApiRequest, ApiResponse} from "@/ws/helper"
-import {wsClientRoot} from "~/ws/meta"
+import build_meta from "~/field.meta"
 
 export {
     makeWebSocket,
     makeHandler
 }
 
 function makeWebSocket(api_path: string) {
-    return new WebSocket(`${wsClientRoot}${api_path}`)
+    return new WebSocket(`${build_meta.wsClientRoot}${api_path}`)
 }
 
 async function makeHandler<REQ, RSP>
@@ -33,7 +33,9 @@ async function sendApiReq<T>
     if (ws.readyState === WebSocket.OPEN) {
         const msg = reqStringify<T>(api_req)
         ws.send(msg)
-        console.log(`send ${loggingHead} req:\n${msg}`)
+
+        if (build_meta.enableClientDevLog)
+            console.log(`send ${loggingHead} req:\n${msg}`)
     } else
         setTimeout(() => {
             sendApiReq(loggingHead, ws, api_req)
@@ -47,10 +49,11 @@ async function recvApiRsp<T>
             const msg = ev.data
             const api_rsp = rspParse<T>(msg)
             if (api_rsp.Seq === seq) {
-                ws
-                    .removeEventListener("message", handler)
+                ws.removeEventListener("message", handler)
                 resolve(api_rsp)
-                console.log(`recv ${loggingHead} rsp:\n${msg}`)
+
+                if (build_meta.enableClientDevLog)
+                    console.log(`recv ${loggingHead} rsp:\n${msg}`)
             }
         }
         ws

diff --git a/ws/meta.ts b/ws/meta.ts
diff --git a/ws/server/helper.ts b/ws/server/helper.ts
@@ -1,15 +1,15 @@
 import WebSocketSSR from "ws"
 import {randomId, reqStringify, rspParse} from "@/ws/helper"
 import {ApiRequest, ApiResponse} from "@/ws/helper"
-import {wsServerRoot} from "~/ws/meta"
+import build_meta from "~/field.meta"
 
 export {
     makeHandler
 }
 
 async function makeHandler<REQ, RSP>
 (api_path: string, req: REQ) {
-    const conn = new WebSocketSSR(`${wsServerRoot}${api_path}`)
+    const conn = new WebSocketSSR(`${build_meta.wsServerRoot}${api_path}`)
     const api_rsp = await request<REQ, RSP>(api_path, conn, req)
     conn.close()
     return api_rsp
@@ -28,7 +28,9 @@ async function sendApiReq<T>
     if (ws.readyState === WebSocketSSR.OPEN) {
         const msg = reqStringify<T>(api_req)
         ws.send(msg)
-        console.log(`send ${loggingHead} req:\n${msg}`)
+
+        if (build_meta.enableServerDevLog)
+            console.log(`send ${loggingHead} req:\n${msg}`)
     } else
         setTimeout(() => {
             sendApiReq(loggingHead, ws, api_req)
@@ -42,10 +44,11 @@ async function recvApiRsp<T>
             const msg = data.toString()
             const api_rsp = rspParse<T>(msg)
             if (api_rsp.Seq === seq) {
-                ws
-                    .off("message", handler)
+                ws.off("message", handler)
                 resolve(api_rsp)
-                console.log(`recv ${loggingHead} rsp:\n${msg}`)
+
+                if (build_meta.enableServerDevLog)
+                    console.log(`recv ${loggingHead} rsp:\n${msg}`)
             }
         }
         ws