From d51a75e5bc91fd1ff639e77a5533b729fb7ca1e3 Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Tue, 18 Jul 2023 20:33:08 +0800
Subject: [PATCH] Re-organize code

---
 package.json                     | 1 +
 server/package.json              | 5 +++--
 server/{ => src/api}/socket.js   | 2 +-
 server/{ => src}/client.js       | 0
 server/{ => src}/index.js        | 4 ++--
 server/{ => src/utils}/docker.js | 0
 server/{api => }/swagger.yaml    | 0
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename server/{ => src/api}/socket.js (89%)
 rename server/{ => src}/client.js (100%)
 rename server/{ => src}/index.js (83%)
 rename server/{ => src/utils}/docker.js (100%)
 rename server/{api => }/swagger.yaml (100%)

diff --git a/package.json b/package.json
index b54330a..267f347 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
   "scripts": {
     "app": "yarn workspace app dev",
     "server": "yarn workspace server dev",
+    "cli": "yarn workspace server cli",
     "lint": "eslint --ext .js,.vue .",
     "format": "prettier --write ."
   },
diff --git a/server/package.json b/server/package.json
index ab91f2d..ded64b1 100644
--- a/server/package.json
+++ b/server/package.json
@@ -4,8 +4,9 @@
   "description": "Linux Odyssey Server",
   "type": "module",
   "scripts": {
-    "start": "node index.js",
-    "dev": "nodemon index.js"
+    "start": "node src/index.js",
+    "dev": "nodemon src/index.js",
+    "cli": "node src/client.js"
   },
   "dependencies": {
     "dockerode": "^3.3.5",
diff --git a/server/socket.js b/server/src/api/socket.js
similarity index 89%
rename from server/socket.js
rename to server/src/api/socket.js
index b02209c..d8c1379 100644
--- a/server/socket.js
+++ b/server/src/api/socket.js
@@ -1,5 +1,5 @@
 import { Server } from 'socket.io'
-import { getOrCreateContainer, attachContainer } from './docker.js'
+import { getOrCreateContainer, attachContainer } from '../utils/docker.js'
 
 export default (server) => {
   const io = new Server(server)
diff --git a/server/client.js b/server/src/client.js
similarity index 100%
rename from server/client.js
rename to server/src/client.js
diff --git a/server/index.js b/server/src/index.js
similarity index 83%
rename from server/index.js
rename to server/src/index.js
index 115446e..5ba38bd 100644
--- a/server/index.js
+++ b/server/src/index.js
@@ -4,14 +4,14 @@ import http from 'http'
 import YAML from 'yaml'
 import swaggerUI from 'swagger-ui-express'
 
-import socketServer from './socket.js'
+import socketServer from './api/socket.js'
 
 const port = 3000
 const app = express()
 const server = http.createServer(app)
 socketServer(server)
 
-const file = fs.readFileSync('./api/swagger.yaml', 'utf8')
+const file = fs.readFileSync('./swagger.yaml', 'utf8')
 const swaggerDocument = YAML.parse(file)
 app.use('/api-docs', swaggerUI.serve, swaggerUI.setup(swaggerDocument))
 
diff --git a/server/docker.js b/server/src/utils/docker.js
similarity index 100%
rename from server/docker.js
rename to server/src/utils/docker.js
diff --git a/server/api/swagger.yaml b/server/swagger.yaml
similarity index 100%
rename from server/api/swagger.yaml
rename to server/swagger.yaml