update docker version to architecture layering

Author: Super-Badmen-Viper

.gitignore

@@ -40,4 +40,6 @@ NSMusicS-Electron/resources/mpv-0.39.0
 NSMusicS-Electron/src_example
 NSMusicS-Electron/yarn.lock
 
-NSMusicS-Go/tmp/main.exe
+NSMusicS-Go/tmp/main.exe
+
+NSMusicS-Web

NSMusicS-Electron/.env

@@ -1,2 +1,13 @@
-APP_ADDRESS=:5173
-APP_PORT=5173
+APP_ENV=development
+SERVER_PORT=8089
+APP_PORT=5173
+CONTEXT_TIMEOUT=2
+DB_HOST=mongodb
+DB_PORT=27017
+DB_USER=your_username
+DB_PASS=your_password
+DB_NAME=nsmusics-go-db
+ACCESS_TOKEN_EXPIRY_HOUR=2
+REFRESH_TOKEN_EXPIRY_HOUR=168
+ACCESS_TOKEN_SECRET=access_token_secret
+REFRESH_TOKEN_SECRET=refresh_token_secret

NSMusicS-Electron/Dockerfile

@@ -1,6 +1,19 @@
 FROM node:20.15.0-alpine
 WORKDIR /app
-RUN npm install -g serve
+RUN npm install -g serve --production --no-cache
 COPY dist/ /app
 EXPOSE $APP_PORT
-CMD ["sh", "-c", "serve -s -l ${APP_PORT}"]
+CMD ["sh", "-c", "serve -s -l ${APP_PORT}"]
+
+# NSMusicS-NodeServer
+# FROM node:20.15.0-alpine
+# WORKDIR /app
+# RUN npm install -g serve
+# COPY dist/ /app
+# COPY server.js /app
+# COPY nodemon.json /app
+# COPY package.json /app
+# EXPOSE $APP_PORT
+# RUN npm install -g nodemon --production --no-cache
+# RUN npm install koa koa-router @koa/cors koa-bodyparser mongodb --production --no-cache
+# CMD ["sh", "-c", "serve -s -l ${APP_PORT} & nodemon server.js"]

NSMusicS-Electron/package.json

@@ -7,15 +7,14 @@
     "email": "[email protected]"
   },
   "description": "NSMusicS For Web(Electron+Vue3+TS),Multi platform Multi mode Super Music Software (Full stack development, audio processing, artificial intelligence, natural language processing)",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "private": true,
   "license": "AGPL - 3.0",
   "scripts": {
     "dev": "vite",
-    "preview": "vite preview",
     "build": "vite build",
-    "clean": "rm -rf node_modules/.cache dist",
-    "type-check": "vue-tsc --build --force"
+    "preview": "vite preview",
+    "server": "nodemon server.js"
   },
   "dependencies": {
     "@lottiefiles/lottie-player": "^2.0.4",
@@ -48,7 +47,12 @@
     "vue-draggable-plus": "^0.5.3",
     "vue-i18n": "next",
     "vue-rate": "next",
-    "vue-virtual-scroller": "next"
+    "vue-virtual-scroller": "next",
+    "@koa/cors": "^3.3.0",
+    "koa": "^2.13.4",
+    "koa-bodyparser": "^4.3.0",
+    "koa-router": "^12.0.0",
+    "mongodb": "^4.9.0"
   },
   "devDependencies": {
     "@tsconfig/node18": "^18.2.2",

NSMusicS-Electron/resources/config/NSMusicS.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <item>
-<version>1.4.1</version>
+<version>1.4.2</version>
 <url> </url>
 <changelog>https://github.com/Super-Badmen-Viper/NSMusicS/releases</changelog>
 <changelog_explain>
-    1.4.1已更新内容;
+    1.4.2已更新内容;
     增加迷你播放窗口，竖向模式为仿制AppleMusic迷你播放悬浮窗，横向模式为桌面歌词[进行中];
     增加服务器配置种类，兼容emby-api[√];
     增加服务器配置种类，兼容jellyfin-api[√];

NSMusicS-Electron/src/App.vue

@@ -729,6 +729,7 @@
     inheritLocale: true,
     useScope: 'global'
   })
+  import axios from "axios";
   onMounted(async () => {
     if(isElectron) {
       store_app_configs_info.navidrome_db = await ipcRenderer.invoke('window-get-navidrome-db');
@@ -780,7 +781,7 @@
     }
 
     try {
-      store_app_configs_info.version = '1.4.1';
+      store_app_configs_info.version = '1.4.2';
       console.log('Current Version:', store_app_configs_info.version);
       const xmlUrl = 'https://github.com/Super-Badmen-Viper/NSMusicS/releases/download/NSMusicS-Win-Update/NSMusicS.xml';
       await store_app_configs_logic_update.fetchAndParseXML(xmlUrl);
@@ -793,6 +794,8 @@
     }catch {
       store_app_configs_info.version_updated = 0;
     }
+    const data = await axios('http://localhost:27017/');
+    console.log(data);
   });
 </script>
 <template>

NSMusicS-Electron/src/background.ts

@@ -74,10 +74,8 @@ else {
 
         await initModifyMediaTag();
 
-        context_MainWin.mainWindow.once('ready-to-show', () => {
-            context_MainWin.mainWindow.webContents.setZoomFactor(1);
-            context_MainWin.mainWindow.show()
-        })
+        context_MainWin.mainWindow.webContents.setZoomFactor(1);
+        context_MainWin.mainWindow.show()
 
         setTimeout(clearSessionClearCache, 5000);
     });

NSMusicS-Electron/src/data/data_access/servers_configs/jellyfin_api/services_web/Jellyfin_Api_Services_Web.ts

@@ -26,7 +26,7 @@ export class Jellyfin_Api_Services_Web {
             if(store_server_user_model.authorization_of_Je != undefined &&
                 store_server_user_model.authorization_of_Je.length > 0) {
                 const headers = {
-                    'Authorization': `MediaBrowser Token="${store_server_user_model.authorization_of_Je}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.4.1"`
+                    'Authorization': `MediaBrowser Token="${store_server_user_model.authorization_of_Je}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.4.2"`
                 };
 
                 const queryString = params ? new URLSearchParams(params).toString() : '';

NSMusicS-Electron/src/data/data_access/servers_configs/jellyfin_api/services_web/Users/index_service.ts

@@ -24,7 +24,7 @@ export class Users_ApiService_of_Je extends Jellyfin_Api_Services_Web {
             const url = `${baseUrl}/${endpoint}`;
             const AccessToken = '27ec731cc56344159d05822f13bfef75';
             const headers = {
-                'Authorization': `MediaBrowser Token="${AccessToken}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.4.1"`
+                'Authorization': `MediaBrowser Token="${AccessToken}", Client="Electron Desktop", Device="NSMusicS", DeviceId="NSMusicS-GO", Version="1.4.2"`
             };
             const data = {
                 Username: username,

NSMusicS-Electron/vite.config.ts

@@ -37,26 +37,8 @@ export default defineConfig({
   base:'./', //默认绝对路径改为相对路径 否则打包白屏
   resolve: {
     alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url)),
-      // os: 'os-browserify/browser',
-      // path: 'path-browserify',
+      '@': fileURLToPath(new URL('./src', import.meta.url))
     }
-  },
-  // build: {
-  //   outDir: 'dist',
-  //   assetsDir: 'static',
-  //   rollupOptions: {
-  //     external: ['os', 'path'],
-  //     input: 'src/main.ts',
-  //     output: {
-  //       format: 'iife',
-  //       name: 'NSMusicS',
-  //     },
-  //   },
-  // },
-  // server: {
-  //   host: '0.0.0.0', // 允许外部访问
-  //   port: 5173, // 确保端口与 Docker 映射一致
-  // },
+  }
 })
 

NSMusicS-GO/.env

@@ -1,13 +1,19 @@
+# 应用配置
 APP_ENV=development
 SERVER_ADDRESS=:8089
 PORT=8089
-CONTEXT_TIMEOUT=2
-DB_HOST=localhost #localhost: local #mongodb: docker
+APP_PORT=5173
+CONTEXT_TIMEOUT=10 # 增加超时时间
+
+# MongoDB 配置
+DB_HOST=mongodb # 必须使用服务名称
 DB_PORT=27017
 DB_USER=jiuge01
 DB_PASS=jiuge01
 DB_NAME=nsmusics-go-db
-ACCESS_TOKEN_EXPIRY_HOUR = 2
-REFRESH_TOKEN_EXPIRY_HOUR = 168
+
+# Token 配置
+ACCESS_TOKEN_EXPIRY_HOUR=2
+REFRESH_TOKEN_EXPIRY_HOUR=168
 ACCESS_TOKEN_SECRET=access_token_secret
 REFRESH_TOKEN_SECRET=refresh_token_secret

NSMusicS-GO/Dockerfile

@@ -1,19 +1,42 @@
-# Build Normal Model
+# Build -GO Model
 # FROM golang:1.24.0-alpine
 # RUN mkdir /app
 # ADD . /app
 # WORKDIR /app
 # RUN go build -o main cmd/main.go
 # CMD ["/app/main"]
 
-# Build Simplify Model
+# Build Simplify-GO Model
 FROM golang:1.24.0-alpine AS builder
 WORKDIR /app
 ADD . /app
 RUN go mod download
-RUN CGO_ENABLED=0 go build -o main cmd/main.go
+RUN go build -o main cmd/main.go
 FROM alpine:latest
 WORKDIR /app
 COPY --from=builder /app/main /app/main
 COPY --from=builder /app/.env /app/.env
-CMD ["/app/main"]
+CMD ["/app/main"]
+
+# Build Vue-GO Model
+# FROM golang:1.24.0-alpine AS go-builder
+# WORKDIR /app
+# COPY . .
+# RUN go mod download && \
+#     go build -o main cmd/main.go
+# FROM node:20.15.0-alpine
+# WORKDIR /app
+# COPY --from=go-builder /app/main /app/main
+# COPY --from=go-builder /app/.env /app/.env
+# RUN npm install -g serve
+# COPY dist/ /app/dist
+
+# RUN echo $'#!/bin/sh\n\
+# /app/main &\n\
+# serve -s -l ${APP_PORT:-5173} /app/dist\n\
+# ' > /app/start.sh && \
+#     chmod +x /app/start.sh
+
+# EXPOSE 8089 5173 27017
+
+# CMD ["/app/start.sh"]