增强对实例的控制

main.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
 	"mime"
@@ -14,6 +15,7 @@ import (
 	"os/exec"
 	"os/user"
 	"path"
+	"regexp"
 	"runtime"
 	"strings"
 
@@ -44,7 +46,8 @@ func main() {
 	}
 	addr := flag.String("port", "8000", "http server port")
 	flag.Parse()
-
+	http.HandleFunc("/instance/import", importInstance)
+	http.HandleFunc("/instance/updateConfig", updateConfig)
 	http.HandleFunc("/instance/list", listInstance)
 	http.HandleFunc("/instance/create", initInstance)
 	http.HandleFunc("/instance/restart", restartInstance)
@@ -56,6 +59,70 @@ func main() {
 	}
 }
 
+func importInstance(w http.ResponseWriter, r *http.Request) {
+	var e error
+	defer func() {
+		result := "success"
+		if e != nil {
+			result = e.Error()
+		}
+		w.Write([]byte(result))
+	}()
+	name := r.URL.Query().Get("name")
+	if importPath := r.URL.Query().Get("path"); importPath != "" {
+		f, err := os.Open(importPath)
+		if e = err; err != nil {
+			return
+		}
+		children, err := f.Readdir(0)
+		if e = err; err == nil {
+			var hasMain, hasConfig, hasMod, hasRestart bool
+			for _, child := range children {
+				switch child.Name() {
+				case "main.go":
+					hasMain = true
+				case "config.toml":
+					hasConfig = true
+				case "go.mod":
+					hasMod = true
+				case "restart.sh":
+					hasRestart = true
+				}
+			}
+			if hasMain && hasConfig && hasMod && hasRestart {
+				if name == "" {
+					_, name = path.Split(importPath)
+				}
+				config, err := ioutil.ReadFile(path.Join(importPath, "config.toml"))
+				if e = err; err != nil {
+					return
+				}
+				mainGo, err := ioutil.ReadFile(path.Join(importPath, "main.go"))
+				if e = err; err != nil {
+					return
+				}
+				reg, err := regexp.Compile("_ \"(.+)\"")
+				if e = err; err != nil {
+					return
+				}
+				instances[name] = &InstanceDesc{
+					Name:    name,
+					Path:    importPath,
+					Plugins: nil,
+					Config:  string(config),
+				}
+				for _, m := range reg.FindAllStringSubmatch(string(mainGo), -1) {
+					instances[name].Plugins = append(instances[name].Plugins, m[1])
+				}
+			} else {
+				e = errors.New("路径中缺少文件")
+			}
+		}
+	} else {
+		w.Write([]byte("参数错误"))
+	}
+}
+
 func readInstances() error {
 	if homeDir, err := Home(); err == nil {
 		instancesDir = path.Join(homeDir, ".monibuca")
@@ -160,18 +227,18 @@ func restartInstance(w http.ResponseWriter, r *http.Request) {
 	needBuild := r.URL.Query().Get("build") != ""
 	if instance, ok := instances[instanceName]; ok {
 		if needUpdate {
-			if err := instance.writeExecSSE(sse, exec.Command("go", "get", "-u")); err != nil {
+			if err := sse.WriteExec(instance.command("go", "get", "-u")); err != nil {
 				sse.WriteEvent("failed", []byte(err.Error()))
 				return
 			}
 		}
 		if needBuild {
-			if err := instance.writeExecSSE(sse, exec.Command("go", "build")); err != nil {
+			if err := sse.WriteExec(instance.command("go", "build")); err != nil {
 				sse.WriteEvent("failed", []byte(err.Error()))
 				return
 			}
 		}
-		if err := instance.writeExecSSE(sse, exec.Command("sh", "restart.sh")); err != nil {
+		if err := sse.WriteExec(instance.command("sh", "restart.sh")); err != nil {
 			sse.WriteEvent("failed", []byte(err.Error()))
 			return
 		}
@@ -180,10 +247,7 @@ func restartInstance(w http.ResponseWriter, r *http.Request) {
 		sse.WriteEvent("failed", []byte("no such instance"))
 	}
 }
-func (p *InstanceDesc) writeExecSSE(sse *util.SSE, cmd *exec.Cmd) error {
-	cmd.Dir = p.Path
-	return sse.WriteExec(cmd)
-}
+
 func (p *InstanceDesc) command(name string, args ...string) (cmd *exec.Cmd) {
 	cmd = exec.Command(name, args...)
 	cmd.Dir = p.Path
@@ -223,12 +287,12 @@ func main(){
 		return
 	}
 	sse.WriteEvent("step", []byte("3:文件创建成功！"))
-	err = p.writeExecSSE(sse, exec.Command("go", "mod", "init", p.Name))
+	err = sse.WriteExec(p.command("go", "mod", "init", p.Name))
 	if err != nil {
 		return
 	}
 	sse.WriteEvent("step", []byte("4:go mod 初始化完成！"))
-	err = p.writeExecSSE(sse, exec.Command("go", "build"))
+	err = sse.WriteExec(p.command("go", "build"))
 	if err != nil {
 		return
 	}
@@ -238,12 +302,30 @@ func main(){
 	binFile := strings.TrimSuffix(p.Path, "/")
 	_, binFile = path.Split(binFile)
 	build.WriteString(binFile)
-	build.WriteString(" > log.txt & echo $! > pid\n")
+	build.WriteString(" & echo $! > pid\n")
 	err = ioutil.WriteFile(path.Join(p.Path, "restart.sh"), build.Bytes(), 0777)
 	if err != nil {
 		return
 	}
-	return p.writeExecSSE(sse, exec.Command("sh", "restart.sh"))
+	return sse.WriteExec(p.command("sh", "restart.sh"))
+}
+func updateConfig(w http.ResponseWriter, r *http.Request) {
+	instanceName := r.URL.Query().Get("instance")
+	if instance, ok := instances[instanceName]; ok {
+		f, err := os.OpenFile(path.Join(instance.Path, "config.toml"), os.O_WRONLY|os.O_TRUNC, 0666)
+		if err != nil {
+			w.Write([]byte(err.Error()))
+			return
+		}
+		_, err = io.Copy(f, r.Body)
+		if err != nil {
+			w.Write([]byte(err.Error()))
+			return
+		}
+		w.Write([]byte("success"))
+	} else {
+		w.Write([]byte("no such instance"))
+	}
 }
 func Home() (string, error) {
 	user, err := user.Current()

monica/index.go

@@ -10,7 +10,7 @@ import (
 )
 
 var ConfigRaw []byte
-var Version = "0.2.3"
+var Version = "0.2.6"
 var EngineInfo = &struct {
 	Version   string
 	StartTime time.Time

plugins/gateway/index.go

@@ -99,6 +99,7 @@ func summary(w http.ResponseWriter, r *http.Request) {
 	}
 }
 func sysInfo(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
 	bytes, err := json.Marshal(EngineInfo)
 	if err == nil {
 		_, err = w.Write(bytes)

plugins/logrotate/index.go

@@ -0,0 +1,73 @@
+package logrotate
+
+import (
+	"fmt"
+	. "github.com/langhuihui/monibuca/monica"
+	"log"
+	"os"
+	"path"
+	"time"
+)
+
+var config = new(LogRotate)
+
+type LogRotate struct {
+	Path        string
+	Size        int64
+	Days        int
+	file        *os.File
+	currentSize int64
+	createTime  time.Time
+	hours       float64
+	splitFunc   func() bool
+}
+
+func init() {
+	InstallPlugin(&PluginConfig{
+		Name:   "LogRotate",
+		Type:   PLUGIN_HOOK,
+		Config: config,
+		Run:    run,
+	})
+}
+func run() {
+	if config.Size > 0 {
+		config.splitFunc = config.splitBySize
+	} else {
+		if config.Days == 0 {
+			config.Days = 1
+		}
+		config.hours = float64(config.Days) * 24
+		config.splitFunc = config.splitByTime
+	}
+	config.createTime = time.Now()
+	file, err := os.OpenFile(path.Join(config.Path, fmt.Sprintf("%s.log", config.createTime.Format("2006-01-02T15:04:05"))), os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0666)
+	if err == nil {
+		config.file = file
+		stat, _ := file.Stat()
+		config.currentSize = stat.Size()
+		AddWriter(config)
+	} else {
+		log.Println(err)
+	}
+}
+func (l *LogRotate) splitBySize() bool {
+	return l.currentSize >= l.Size
+}
+func (l *LogRotate) splitByTime() bool {
+	return time.Since(l.createTime).Hours() > l.hours
+}
+func (l *LogRotate) Write(data []byte) (n int, err error) {
+	n, err = l.file.Write(data)
+	l.currentSize += int64(n)
+	if err == nil {
+		if l.splitFunc() {
+			l.createTime = time.Now()
+			if file, err := os.OpenFile(path.Join(l.Path, fmt.Sprintf("%s.log", l.createTime.Format("2006-01-02T15:04:05"))), os.O_TRUNC|os.O_WRONLY|os.O_CREATE, 0666); err == nil {
+				l.file = file
+				l.currentSize = 0
+			}
+		}
+	}
+	return
+}

pm/dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>Monibuca Instance Manager</title><script src=ajax.js></script><link href=/css/app.200d2f8f.css rel=preload as=style><link href=/css/chunk-vendors.22ebf426.css rel=preload as=style><link href=/js/app.9b5890f5.js rel=preload as=script><link href=/js/chunk-vendors.f701a5a3.js rel=preload as=script><link href=/css/chunk-vendors.22ebf426.css rel=stylesheet><link href=/css/app.200d2f8f.css rel=stylesheet></head><body><noscript><strong>We're sorry but pm doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.f701a5a3.js></script><script src=/js/app.9b5890f5.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>Monibuca Instance Manager</title><script src=ajax.js></script><link href=/css/app.200d2f8f.css rel=preload as=style><link href=/css/chunk-vendors.22ebf426.css rel=preload as=style><link href=/js/app.f5cfbf83.js rel=preload as=script><link href=/js/chunk-vendors.470a264b.js rel=preload as=script><link href=/css/chunk-vendors.22ebf426.css rel=stylesheet><link href=/css/app.200d2f8f.css rel=stylesheet></head><body><noscript><strong>We're sorry but pm doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.470a264b.js></script><script src=/js/app.f5cfbf83.js></script></body></html>

pm/src/components/CreateInstance.vue

@@ -1,5 +1,5 @@
 <template>
-    <Modal v-bind="$attrs" v-on="$listeners" :title="info.Path">
+    <Modal v-bind="$attrs" v-on="$listeners" :title="info && info.Path">
         <Steps :current="currentStep" size="small" :status="status">
             <Step title="解析请求"></Step>
             <Step title="创建目录"></Step>

pm/src/components/ImportInstance.vue

@@ -0,0 +1,41 @@
+<template>
+    <div>
+        <i-input v-model="instanceName" :placeholder="defaultInstanceName">
+            <span slot="prepend">实例名称</span>
+        </i-input>
+        <i-input prefix="ios-home" v-model="instancePath" placeholder="输入实例所在的路径" search enter-button="Import" @on-search="doImport">
+        </i-input>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "ImportInstance",
+        data(){
+            return {
+                instancePath:"",
+                instanceName:""
+            }
+        },
+        computed:{
+            defaultInstanceName(){
+                return this.instancePath.replace(/\\/g,"/").split("/").pop()
+            }
+        },
+        methods:{
+            doImport(){
+                window.ajax.get("/instance/import?path="+this.instancePath+"&name="+this.instanceName).then(x=>{
+                    if(x=="success"){
+                        this.$Message.success("导入成功！")
+                    }else{
+                        this.$Message.error(x)
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

pm/src/components/InstanceList.vue

@@ -1,39 +1,60 @@
 <template>
-    <List border>
-        <ListItem v-for="item in instances" :key="item.Name">
-            <ListItemMeta :title="item.Name" :description="item.Path"></ListItemMeta>
-            <template v-if="hasGateway(item)">
-                {{item.Info}}
-            </template>
-            <template slot="action">
-                <li v-if="hasGateway(item)" @click="window.open(gateWayHref(item),'_blank')">
-                    <Icon type="md-browsers"/>
-                    管理界面
-                </li>
-                <li @click="restart(item)">
-                    <Icon type="ios-refresh"/>
-                    重启
-                </li>
-                <li @click="shutdown(item)">
-                    <Icon type="ios-power"/>
-                    关闭
-                </li>
-            </template>
-        </ListItem>
-        <Modal v-model="showRestart">
+    <div>
+        <List border>
+            <ListItem v-for="item in instances" :key="item.Name">
+                <ListItemMeta :title="item.Name" :description="item.Path"></ListItemMeta>
+                <template v-if="item.Info.StartTime">
+                    引擎版本：{{item.Info.Version}} <br>启动时间：
+                    <StartTime :value="item.Info.StartTime"></StartTime>
+                </template>
+                <template v-else>{{item.Info}}</template>
+                <template slot="action">
+                    <li @click="changeConfig(item)">
+                        <Icon type="ios-settings"/>
+                        修改配置
+                    </li>
+                    <li v-if="hasGateway(item)" @click="openGateway(item)">
+                        <Icon type="md-browsers"/>
+                        管理界面
+                    </li>
+                    <li @click="currentItem=item,showRestart=true">
+                        <Icon type="ios-refresh"/>
+                        重启
+                    </li>
+                    <li @click="shutdown(item)">
+                        <Icon type="ios-power"/>
+                        关闭
+                    </li>
+                </template>
+            </ListItem>
+        </List>
+        <Modal v-model="showRestart" title="重启选项" @on-ok="restart">
             <Checkbox v-model="update">go get -u</Checkbox>
             <Checkbox v-model="build">go build</Checkbox>
         </Modal>
-    </List>
+        <Modal v-model="showConfig" title="修改实例配置" @on-ok="submitConfigChange">
+            <i-input type="textarea" v-model="currentConfig" :rows="20"></i-input>
+        </Modal>
+    </div>
 </template>
 
 <script>
     import toml from "@iarna/toml"
+    import StartTime from "./StartTime"
 
     export default {
         name: "InstanceList",
+        components: {StartTime},
         data() {
-            return {instances: {}, showRestart: false, update: false, build: false}
+            return {
+                instances: [],
+                showRestart: false,
+                update: false,
+                build: false,
+                showConfig: false,
+                currentItem: null,
+                currentConfig: ""
+            }
         },
         mounted() {
             window.ajax.getJSON("/instance/list").then(x => {
@@ -41,25 +62,52 @@
                     let instance = x[name]
                     instance.Config = toml.parse(instance.Config)
                     if (this.hasGateway(instance)) {
-                        window.ajax.getJSON("//" + this.gateWayHref(instance) + "/api/sysInfo").then(x => {
-                            instance.Info = "引擎版本：" + x.Version + "启动时间：" + x.StartTime
+                        window.ajax.getJSON(this.gateWayHref(instance) + "/api/sysInfo").then(x => {
+                            instance.Info = x
                         }).catch(() => {
                             instance.Info = "无法访问实例"
                         })
                     } else {
                         instance.Info = "实例未配置网关插件"
                     }
+                    this.instances.push(instance)
                 }
-                this.instances = x;
+                // this.instances = x;
             });
-        }, methods: {
+        },
+        methods: {
+            changeConfig(item) {
+                this.showConfig = true
+                this.currentItem = item
+                this.currentConfig = toml.stringify(item.Config)
+            },
+            submitConfigChange() {
+                try {
+                    this.currentItem.Config = toml.parse(this.currentConfig)
+                    window.ajax.post("/instance/updateConfig?instance=" + this.currentItem.Name, this.currentConfig).then(x => {
+                        if (x == "success") {
+                            this.$Message.success("更新成功！")
+                        } else {
+                            this.$Message.error(x)
+                        }
+                    }).catch(e => {
+                        this.$Message.error(e)
+                    })
+                } catch (e) {
+                    this.$Message.error(e)
+                }
+            },
+            openGateway(item) {
+                window.open(this.gateWayHref(item), '_blank')
+            },
             hasGateway(item) {
                 return item.Config.Plugins.hasOwnProperty("GateWay")
             },
             gateWayHref(item) {
-                return location.hostname + ":" + item.Config.Plugins.GateWay.split(":").pop()
+                return "http://" + location.hostname + ":" + item.Config.Plugins.GateWay.ListenAddr.split(":").pop()
             },
-            restart(item) {
+            restart() {
+                let item = this.currentItem
                 const msg = this.$Message.loading({
                     content: 'restart ' + item.Name + '...',
                     duration: 0
@@ -85,7 +133,7 @@
                     msg()
                 })
                 es.onerror = e => {
-                    if (e) this.$Message.error(e);
+                    if (e && e.toString()) this.$Message.error(e);
                     msg()
                     es.close()
                 }

pm/src/components/StartTime.vue

@@ -0,0 +1,18 @@
+<template>
+    <Poptip trigger="hover" :content="'⌚️'+ new Date(value).toLocaleString()">
+        <Time :time="new Date(value)"></Time>
+    </Poptip>
+</template>
+
+<script>
+    export default {
+        name: "StartTime",
+        props:{
+            value:String
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>

pm/src/store/index.js

@@ -1,10 +1,40 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-
 Vue.use(Vuex)
 
 export default new Vuex.Store({
   state: {
+    defaultPlugins:{
+      GateWay:[
+          "gateway",'ListenAddr = ":8081"',"网关插件，提供各种API服务，包括信息采集和控制等，控制台页面展示（静态资源服务器）"
+      ],
+      LogRotate:[
+          "logrotate",`Path = "log"
+Size = 0
+Days = 1`,"日志分割插件，Size 代表按照字节数分割，0代表采用时间分割"
+      ],
+      Jessica:[
+          "jessica",'ListenAddr = ":8080"',"WebSocket协议订阅，采用私有协议，搭配Jessibuca播放器实现低延时播放"
+      ],
+      Cluster:[
+          "cluster",'Master = "localhost:2019"\nListenAddr = ":2019"',"集群插件，可以实现级联转发功能，Master代表上游服务器，ListenAdder代表源服务器监听端口，可只配置一项"
+      ],
+      RTMP:[
+          "rtmp",'ListenAddr = ":1935"',"rtmp协议实现，基本发布和订阅功能"
+      ],
+      RecordFlv:[
+          "record",'Path="./resource"',"录制视频流到flv文件"
+      ],
+      HDL:[
+          "HDL",'ListenAddr = ":2020"',"Http-flv格式实现，可以对接CDN厂商进行回源拉流"
+      ],
+      Auth:[
+          "auth",'Key = "www.monibuca.com"',"一个鉴权验证模块"
+      ],
+      Qos:[
+          "QoS",'Suffix = ["high","medium","low"]',"质量控制插件，可以动态改变订阅的不同的质量的流"
+      ]
+    }
   },
   mutations: {
   },

pm/src/views/Instances.vue

@@ -79,7 +79,9 @@
                         </ButtonGroup>
                     </div>
                 </TabPane>
-                <TabPane label="导入" name="name3"></TabPane>
+                <TabPane label="导入" name="name3">
+                    <ImportInstance></ImportInstance>
+                </TabPane>
             </Tabs>
         </Content>
         <Modal v-model="showAddPlugin" title="添加Plugin" @on-ok="addPlugin">
@@ -92,9 +94,9 @@
                         <Button slot="append" @click="showBuiltinPlugin=true">内置插件</Button>
                     </i-input>
                 </FormItem>
-                <Alert
-                        type="show-icon"
-                        v-if="!Object.values(builtinPlugins).includes(formPlugin.Path)"
+                <Alert  show-icon
+                        type="warning"
+                        v-if="!isBuiltInPlugin(formPlugin.Path)"
                 >
                     如果该插件是私有仓库，请到服务器上输入：echo "machine {{privateHost}} login 用户名 password 密码" >> ~/.netrc
                     并且添加环境变量GOPRIVATE={{privateHost}}
@@ -106,8 +108,8 @@
         </Modal>
         <Modal v-model="showBuiltinPlugin">
             <List>
-                <ListItem v-for="(item,name) in builtinPlugins" :key="name">
-                    <ListItemMeta :title="name" :description="item"></ListItemMeta>
+                <ListItem v-for="(item,name) in $store.state.defaultPlugins" :key="name">
+                    <ListItemMeta :title="name" :description="item[2]"></ListItemMeta>
                     <template slot="action">
                         <li @click="addBuiltin(name,item)">
                             <Icon type="ios-add"/>
@@ -124,11 +126,11 @@
 <script>
     import CreateInstance from "../components/CreateInstance";
     import InstanceList from "../components/InstanceList";
-
+    import ImportInstance from "../components/ImportInstance";
 
     export default {
         components: {
-            CreateInstance,InstanceList
+            CreateInstance,InstanceList,ImportInstance
         },
         data() {
             return {
@@ -141,26 +143,6 @@
                 showAddPlugin: false,
                 formPlugin: {},
                 showBuiltinPlugin: false,
-                builtinPlugins: {
-                    Auth: "github.com/langhuihui/monibuca/plugins/auth",
-                    Cluster: "github.com/langhuihui/monibuca/plugins/cluster",
-                    GateWay: "github.com/langhuihui/monibuca/plugins/gateway",
-                    HDL: "github.com/langhuihui/monibuca/plugins/HDL",
-                    Jessica: "github.com/langhuihui/monibuca/plugins/jessica",
-                    QoS: "github.com/langhuihui/monibuca/plugins/QoS",
-                    RecordFlv: "github.com/langhuihui/monibuca/plugins/record",
-                    RTMP: "github.com/langhuihui/monibuca/plugins/rtmp"
-                },
-                defaultConfig: {
-                    Auth: 'Key = "www.monibuca.com"',
-                    RecordFlv: 'Path="./resource"',
-                    QoS: 'Suffix = ["high","medium","low"]',
-                    Cluster: 'Master = "localhost:2019"\nListenAddr = ":2019"',
-                    GateWay: 'ListenAddr = ":8081"',
-                    RTMP: 'ListenAddr = ":1935"',
-                    Jessica: 'ListenAddr = ":8080"',
-                    HDL: 'ListenAddr = ":2020"'
-                }
             };
         },
         computed: {
@@ -186,7 +168,9 @@ ${x.Config || ""}`
         },
 
         methods: {
-
+            isBuiltInPlugin(path){
+                return Object.values(this.$store.state.defaultPlugins).some(x=>"github.com/langhuihui/monibuca/plugins/"+x[0]==path)
+            },
             goUp() {
                 let paths = this.createPath.split("/");
                 paths.pop();
@@ -211,8 +195,8 @@ ${x.Config || ""}`
             },
             addBuiltin(name, item) {
                 this.formPlugin.Name = name;
-                this.formPlugin.Path = item;
-                this.formPlugin.Config = this.defaultConfig[name];
+                this.formPlugin.Path = "github.com/langhuihui/monibuca/plugins/"+item[0];
+                this.formPlugin.Config = item[1];
                 this.showBuiltinPlugin = false;
             },
         }