From f7d0a106b7101675e5537d124833431f0ae0a36b Mon Sep 17 00:00:00 2001
From: yutent <yutent.io@gmail.com>
Date: Tue, 2 Jan 2024 17:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=98=E5=8C=96=E8=87=AA=E5=8A=A8=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.js         | 45 ++++++++++++++++++++++++++++-----------------
 package.json     |  6 +++---
 test/.httpserver |  5 +++--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/index.js b/index.js
index e4e7998..ec44e28 100644
--- a/index.js
+++ b/index.js
@@ -5,14 +5,14 @@
  */
 
 const vsc = require('vscode')
-const { join } = require('path')
+const { join, basename } = require('path')
 const { parse } = require('url')
 const http = require('http')
 const fs = require('iofs')
 const { WebSocketServer } = require('ws')
 
-const std = vsc.window.createOutputChannel('http.server')
 const decode = decodeURIComponent
+const statItem = vsc.window.createStatusBarItem(vsc.StatusBarAlignment.Left, 0)
 
 const MIME_TYPES = {
   html: 'text/html;charset=utf-8',
@@ -49,6 +49,8 @@ const COMMON_HEADERS = {
   'X-Powered-By': 'VS Code simple.http'
 }
 
+const CONFIG_FILE = '.httpserver'
+
 MIME_TYPES.htm = MIME_TYPES.html
 MIME_TYPES.jpeg = MIME_TYPES.jpg
 MIME_TYPES.tif = MIME_TYPES.tiff
@@ -57,13 +59,9 @@ let root
 let enabled = false
 let port = 23333
 let baseUrl = 'http://127.0.0.1:' + port
+let server
 let ws = null
 
-std.out = function (...args) {
-  std.appendLine('[simple.http]: ' + args.join(' '))
-  // console.log('[simple.http]: ' + args.join(' '))
-}
-
 const HMR_SCRIPT = `
 <script>
 !(function http_hmr(){
@@ -115,12 +113,12 @@ class WebSocket {
 
 function createServer() {
   if (port > 65535) {
-    std.out('端口超出有效范围0-65535, 当前为: ' + port)
     enabled = false
     return
   }
-  std.out(`尝试使用${port}端口...`)
-  const server = http
+  console.log(`尝试使用${port}端口...`)
+
+  server = http
     .createServer(function (req, res) {
       let pathname = parse(req.url).pathname.slice(1)
       let paths = pathname.split('/')
@@ -204,7 +202,7 @@ function createServer() {
     })
     .listen(port)
     .on('error', err => {
-      std.out(`${port}端口被占用~~~`)
+      console.log(`${port}端口被占用~~~`)
       port++
       createServer()
     })
@@ -212,18 +210,28 @@ function createServer() {
   server.on('listening', _ => {
     baseUrl = 'http://127.0.0.1:' + port
     ws = new WebSocket(server)
-    std.out('启动成功, 请访问', baseUrl)
+    statItem.text = `http.server (🟢)`
+    statItem.show()
   })
 }
 
 function __init__() {
   let folders = vsc.workspace.workspaceFolders
 
+  statItem.hide()
+
   if (folders && folders.length) {
     root = folders[0].uri.fsPath
   }
+
+  if (server) {
+    server.close()
+    server.closeAllConnections()
+    server = null
+  }
+
   if (root) {
-    let file = join(root, '.httpserver')
+    let file = join(root, CONFIG_FILE)
     //
     if (fs.isfile(file)) {
       let conf = JSON.parse(fs.cat(file).toString())
@@ -248,21 +256,25 @@ function __init__() {
 
         createServer()
       } else {
-        std.out('发现配置文件, 但服务为 关闭状态')
+        statItem.text = `http.server (🔴)`
+        statItem.show()
       }
     }
   }
 }
 
-function deactivate() {}
+export function deactivate() {}
 
-exports.activate = function (ctx) {
+export function activate(ctx) {
   __init__()
 
   vsc.workspace.onDidSaveTextDocument(doc => {
     if (enabled) {
       let file = doc.fileName
       if (file.startsWith(root)) {
+        if (basename(file) === CONFIG_FILE) {
+          return __init__()
+        }
         ws.send()
       }
     }
@@ -280,4 +292,3 @@ exports.activate = function (ctx) {
   })
   ctx.subscriptions.push(cmd)
 }
-exports.deactivate = deactivate
diff --git a/package.json b/package.json
index 2f1f277..1c3564a 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "simple-http",
-  "displayName": "simple http",
+  "displayName": "http server",
   "description": "🔥 简单的http服务器, 方便临时调试html",
-  "version": "1.5.3",
+  "version": "1.6.0",
   "publisher": "yutent",
   "author": "Yutent [@yutent]",
   "icon": "logo.png",
@@ -44,7 +44,7 @@
     "yutent"
   ],
   "scripts": {
-    "bundle": "esbuild index.js --bundle --outfile=out.js --external:vscode --format=cjs --platform=node",
+    "bundle": "esbuild index.js --bundle --outfile=out.js --external:vscode --format=cjs --target=es2020 --platform=node",
     "start": "npm run bundle -- --watch",
     "pack": "npm run bundle -- --minify"
   },
diff --git a/test/.httpserver b/test/.httpserver
index 37c8cef..3cf1d27 100644
--- a/test/.httpserver
+++ b/test/.httpserver
@@ -1,3 +1,4 @@
 {
-  "enabled": true
-}
\ No newline at end of file
+  "enabled": true,
+  "port": 9090
+}