update at 2020-11-12 14:25:14 by ehlxr

Makefile

@@ -4,8 +4,8 @@ COMMIT_SHA1     := $(shell git rev-parse HEAD)
 ROOT_DIR    	:= $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 DIST_DIR 		:= $(ROOT_DIR)/dist/
 
-#VERSION_PATH	:= $(shell cat `go env GOMOD` | awk '/^module/{print $$2}')/
-VERSION_PATH	:= main
+VERSION_PATH	:= $(shell cat `go env GOMOD` | awk '/^module/{print $$2}')/pkg
+#VERSION_PATH	:= main
 LD_APP_NAMW		:= -X '$(VERSION_PATH).AppName=$(shell basename `pwd`)'
 LD_GIT_COMMIT	:= -X '$(VERSION_PATH).GitCommit=$(COMMIT_SHA1)'
 LD_BUILD_TIME	:= -X '$(VERSION_PATH).BuildTime=$(BUILD_TIME)'

README.md

@@ -1,30 +1,39 @@
 # DDGO
 
+[![license](https://badgen.net/badge/license/MIT/blue)](./LICENSE)
+[![](https://badgen.net/github/commits/ehlxr/ddgo)](https://github.com/ehlxr/ddgo/commits/)
+[![](https://badgen.net/github/last-commit/ehlxr/ddgo)]((https://github.com/ehlxr/ddgo/commits/))
+[![](https://badgen.net/github/releases/ehlxr/ddgo)](https://github.com/ehlxr/ddgo/releases)
+
 ```bash
 Usage:
   ddgo [OPTIONS]
 
 Application Options:
-  -a, --addr=        Addr to listen on for HTTP server (default: :80) [$ADDR]
-  -u, --webhook-url= Webhook url of dingtalk [$URL]
-  -v, --version      Show version info
+  -a, --addr=             Addr to listen on for HTTP server (default: :80) [$ADDR]
+  -v, --version           Show version info
+
+DingTalk Robot Options:
+  -t, --robot-token=      DingTalk robot access token [$ROBOT_TOKEN]
+  -s, --robot-secret=     DingTalk robot secret [$ROBOT_SECRET]
+  -m, --robot-at-mobiles= The mobile of the person will be at [$ROBOT_AT_MOBILES]
+  -e, --robot-at-all      Whether at everyone [$ROBOT_AT_ALL]
 
 Help Options:
-  -h, --help         Show this help message
+  -h, --help              Show this help message
 
 ```
 
 ```bash
- ____  ____    ___  _____ 
+ ____  ____    ___  _____
 (  _ \(  _ \  / __)(  _  )
- )(_) ))(_) )( (_-. )(_)( 
+ )(_) ))(_) )( (_-. )(_)(
 (____/(____/  \___/(_____)
 
 Name: ddgo
-Version: v0.0.1
-BuildTime: 2019-11-15 11:07:48
-GitCommit: 34859d9a5b80e55b5e3aa1a294bc8935b09a36d5
-GoVersion: go version go1.13.1 darwin/amd64
-
+Version: v0.0.3
+BuildTime: 2019-11-20 17:04:53
+GitCommit: 07fdff979c34534650c88a8c677f0446500886be
+GoVersion: go version go1.13.4 darwin/amd64
 
 ```

go.mod

@@ -3,7 +3,7 @@ module github.com/ehlxr/ddgo
 go 1.13
 
 require (
-	github.com/JetBlink/dingtalk-notify-go-sdk v0.0.0-20191112085213-0dc836cea13e // indirect
+	github.com/JetBlink/dingtalk-notify-go-sdk v0.0.0-20191112085213-0dc836cea13e
 	github.com/jessevdk/go-flags v1.4.1-0.20181221193153-c0795c8afcf4
 	golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 // indirect
 	unknwon.dev/clog/v2 v2.0.0-beta.5

main.go

@@ -2,44 +2,23 @@ package main
 
 import (
 	"context"
-	"encoding/base64"
+	"encoding/json"
+	"errors"
 	"fmt"
-	dt "github.com/JetBlink/dingtalk-notify-go-sdk"
-	"github.com/jessevdk/go-flags"
+	dtn "github.com/JetBlink/dingtalk-notify-go-sdk"
+	"github.com/ehlxr/ddgo/pkg"
 	"io"
 	"net/http"
 	"os"
 	"os/signal"
+	"strings"
+	"time"
 	log "unknwon.dev/clog/v2"
 )
 
 var (
-	AppName   string
-	Version   string
-	BuildTime string
-	GitCommit string
-	GoVersion string
-
-	versionTpl = `%s
-Name: %s
-Version: %s
-BuildTime: %s
-GitCommit: %s
-GoVersion: %s
-
-`
-	bannerBase64 = "DQogX19fXyAgX19fXyAgICBfX18gIF9fX19fIA0KKCAgXyBcKCAgXyBcICAvIF9fKSggIF8gICkNCiApKF8pICkpKF8pICkoIChfLS4gKShfKSggDQooX19fXy8oX19fXy8gIFxfX18vKF9fX19fKQ0K"
-
-	opts struct {
-		Addr      string   `short:"a" long:"addr" default:":80" env:"ADDR" description:"Addr to listen on for HTTP server"`
-		Token     string   `short:"t" long:"token" env:"TOKEN" description:"Dingtalk robot access token" required:"true"`
-		Secret    string   `short:"s" long:"secret" env:"SECRET" description:"Dingtalk robot secret"`
-		AtMobiles []string `short:"m" long:"at-mobiles" env:"AT_MOBILES" env-delim:"," description:"The mobile of the person will be @"`
-		IsAtAll   bool     `short:"e" long:"at-all" env:"AT_ALL" description:"Whether @ everyone"`
-		Version   bool     `short:"v" long:"version" description:"Show version info"`
-	}
-
-	robot *dt.Robot
+	dingTalk *dtn.Robot
+	limiter  *pkg.LimiterServer
 )
 
 func init() {
@@ -47,15 +26,29 @@ func init() {
 }
 
 func main() {
-	parseArg()
+	pkg.ParseArg()
 
-	robot = dt.NewRobot(opts.Token, opts.Secret)
+	dingTalk = dtn.NewRobot(pkg.Opts.Robot.Token, pkg.Opts.Robot.Secret)
 
+	// 每个机器人每分钟最多发送 20 条。如果超过 20 条，会限流 10 分钟 https://ding-doc.dingtalk.com/doc#/serverapi2/krgddi/3446b47e
+	limiter = pkg.NewLimiterServer(1*time.Minute, 20)
+
+	start()
+}
+
+func start() {
 	mux := http.NewServeMux()
-	mux.HandleFunc("/", requestHandle)
+	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		switch r.Header.Get("Content-Type") {
+		case "application/json":
+			handlePostJson(w, r)
+		case "application/x-www-form-urlencoded":
+			handlePostForm(w, r)
+		}
+	})
 
 	server := &http.Server{
-		Addr:    opts.Addr,
+		Addr:    pkg.Opts.Addr,
 		Handler: mux,
 	}
 
@@ -69,7 +62,7 @@ func main() {
 		}
 	}()
 
-	log.Info("Starting HTTP server on http://%s", opts.Addr)
+	log.Info("Starting HTTP server on http://%s", pkg.Opts.Addr)
 	if err := server.ListenAndServe(); err != nil {
 		if err == http.ErrServerClosed {
 			log.Info("Server closed under request")
@@ -98,32 +91,7 @@ func initLog() {
 	}
 }
 
-func parseArg() {
-	parser := flags.NewParser(&opts, flags.HelpFlag|flags.PassDoubleDash)
-	if AppName != "" {
-		parser.Name = AppName
-	}
-
-	if _, err := parser.Parse(); err != nil {
-		if opts.Version {
-			printVersion()
-			os.Exit(0)
-		}
-
-		if flagsErr, ok := err.(*flags.Error); ok && flagsErr.Type == flags.ErrHelp {
-			_, _ = fmt.Fprintln(os.Stdout, err)
-			os.Exit(0)
-		}
-
-		_, _ = fmt.Fprintln(os.Stderr, err)
-
-		parser.WriteHelp(os.Stderr)
-
-		os.Exit(1)
-	}
-}
-
-func requestHandle(w http.ResponseWriter, r *http.Request) {
+func handlePostForm(w http.ResponseWriter, r *http.Request) {
 	err := r.ParseForm()
 	if err != nil {
 		log.Error("parse request form %+v",
@@ -133,26 +101,85 @@ func requestHandle(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	content := r.Form.Get("content")
-	if content == "" {
-		log.Error("read content from request form nil")
-		_, _ = io.WriteString(w, "read content from request form nil")
+	if err = sendMessage(&Message{
+		r.Form.Get("content"),
+		r.Form.Get("at"),
+		r.Form.Get("app"),
+		r.Form.Get("dt"),
+		r.Form.Get("ds"),
+	}); err != nil {
+		http.Error(w, err.Error(), 400)
+		log.Error(err.Error())
+
 		return
 	}
 
-	err = robot.SendTextMessage(content, opts.AtMobiles, opts.IsAtAll)
+	_, _ = io.WriteString(w, "success")
+	return
+}
+
+func handlePostJson(w http.ResponseWriter, r *http.Request) {
+	if r.Body == nil {
+		http.Error(w, "Please sendMessage a request body", 400)
+		log.Error("Please sendMessage a request body")
+		return
+	}
+
+	m := &Message{}
+	err := json.NewDecoder(r.Body).Decode(m)
 	if err != nil {
-		log.Error("%+v", err)
-		_, _ = fmt.Fprintln(w, err)
+		http.Error(w, err.Error(), 400)
+		log.Error(err.Error())
 		return
 	}
 
-	log.Info("send message <%s> success", content)
-	_, _ = io.WriteString(w, "send message success")
+	if err = sendMessage(m); err != nil {
+		http.Error(w, err.Error(), 400)
+		log.Error(err.Error())
+		return
+	}
+
+	_, _ = io.WriteString(w, "success")
+	return
 }
 
-// printVersion Print out version information
-func printVersion() {
-	banner, _ := base64.StdEncoding.DecodeString(bannerBase64)
-	fmt.Printf(versionTpl, banner, AppName, Version, BuildTime, GitCommit, GoVersion)
+type Message struct {
+	Content string `json:"content" desc:"消息内容"`
+	At      string `json:"at" desc:"被@人的手机号"`
+	App     string `json:"app" desc:"发送消息应用名称（添加到消息之前）"`
+	Dt      string `json:"dt" desc:"钉钉机器人 token"`
+	Ds      string `json:"ds" desc:"钉钉机器人签名 secret"`
+}
+
+func sendMessage(m *Message) error {
+	if m.Content == "" {
+		return errors.New("content must not be null")
+	}
+
+	ats := pkg.Opts.Robot.AtMobiles
+	if m.At != "" {
+		ats = append(ats, strings.Split(m.At, ",")...)
+	}
+
+	if m.App != "" {
+		m.Content = fmt.Sprintf("%s\n%s", m.App, m.Content)
+	}
+
+	dtRobot := dingTalk
+
+	if m.Ds != "" && m.Dt != "" {
+		dtRobot = dtn.NewRobot(m.Dt, m.Ds)
+	}
+
+	if limiter.IsAvailable() {
+		err := dtRobot.SendTextMessage(m.Content, ats, pkg.Opts.Robot.IsAtAll)
+		if err != nil {
+			return err
+		}
+
+		log.Info("sendMessage message <%s> success", m.Content)
+	} else {
+		return errors.New("dingTalk 1 m allow sendMessage 20 msg. msg discarded")
+	}
+	return nil
 }

pkg/limiter.go

@@ -0,0 +1,40 @@
+package pkg
+
+import (
+	"sync"
+	"time"
+)
+
+type LimiterServer struct {
+	interval time.Duration
+	maxCount int
+	sync.Mutex
+	reqCount int
+	time     time.Time
+}
+
+func NewLimiterServer(interval time.Duration, maxCount int) *LimiterServer {
+	return &LimiterServer{
+		interval: interval,
+		maxCount: maxCount,
+	}
+}
+
+func (limiter *LimiterServer) IsAvailable() bool {
+	limiter.Lock()
+	defer limiter.Unlock()
+	now := time.Now()
+
+	if limiter.time.IsZero() ||
+		limiter.time.Add(limiter.interval).Before(now) {
+		limiter.reqCount = 0
+	}
+
+	if limiter.reqCount < limiter.maxCount {
+		limiter.reqCount += 1
+		limiter.time = now
+		return true
+	}
+
+	return false
+}

pkg/limiter_test.go

@@ -0,0 +1,32 @@
+package pkg
+
+import (
+	"fmt"
+	"testing"
+	"time"
+)
+
+func TestLimiter(t *testing.T) {
+	limiter := NewLimiterServer(1*time.Second, 5)
+
+	for {
+		if limiter.IsAvailable() {
+			t.Log("hello...", limiter.reqCount)
+		} else {
+			return
+		}
+	}
+}
+
+func TestLimiter2(t *testing.T) {
+	limiter := NewLimiterServer(10*time.Second, 10)
+
+	for i := 0; i < 20; i++ {
+		if limiter.IsAvailable() {
+			fmt.Println("hello...", limiter.reqCount)
+		} else {
+			fmt.Println("limited")
+		}
+		time.Sleep(1 * time.Second)
+	}
+}

pkg/parser.go

@@ -0,0 +1,49 @@
+package pkg
+
+import (
+	"fmt"
+	"github.com/jessevdk/go-flags"
+	"os"
+)
+
+var (
+	Opts struct {
+		Addr    string `short:"a" long:"addr" default:":80" env:"ADDR" description:"Addr to listen on for HTTP server"`
+		Version bool   `short:"v" long:"version" description:"Show version info"`
+		Robot   Robot  `group:"DingTalk Robot Options" namespace:"robot" env-namespace:"ROBOT" `
+	}
+)
+
+type Robot struct {
+	Token     string   `short:"t" long:"token" env:"TOKEN" description:"DingTalk robot access token" required:"true"`
+	Secret    string   `short:"s" long:"secret" env:"SECRET" description:"DingTalk robot secret"`
+	AtMobiles []string `short:"m" long:"at-mobiles" env:"AT_MOBILES" env-delim:"," description:"The mobile of the person will be at"`
+	IsAtAll   bool     `short:"e" long:"at-all" env:"AT_ALL" description:"Whether at everyone"`
+}
+
+func ParseArg() {
+	parser := flags.NewParser(&Opts, flags.HelpFlag|flags.PassDoubleDash)
+	parser.NamespaceDelimiter = "-"
+
+	if AppName != "" {
+		parser.Name = AppName
+	}
+
+	if _, err := parser.Parse(); err != nil {
+		if Opts.Version {
+			PrintVersion()
+			os.Exit(0)
+		}
+
+		if flagsErr, ok := err.(*flags.Error); ok && flagsErr.Type == flags.ErrHelp {
+			_, _ = fmt.Fprintln(os.Stdout, err)
+			os.Exit(0)
+		}
+
+		_, _ = fmt.Fprintln(os.Stderr, err)
+
+		parser.WriteHelp(os.Stderr)
+
+		os.Exit(1)
+	}
+}

pkg/version.go

@@ -0,0 +1,30 @@
+package pkg
+
+import (
+	"encoding/base64"
+	"fmt"
+)
+
+var (
+	AppName   string
+	Version   string
+	BuildTime string
+	GitCommit string
+	GoVersion string
+
+	versionTpl = `%s
+Name: %s
+Version: %s
+BuildTime: %s
+GitCommit: %s
+GoVersion: %s
+
+`
+	bannerBase64 = "DQogX19fXyAgX19fXyAgICBfX18gIF9fX19fIA0KKCAgXyBcKCAgXyBcICAvIF9fKSggIF8gICkNCiApKF8pICkpKF8pICkoIChfLS4gKShfKSggDQooX19fXy8oX19fXy8gIFxfX18vKF9fX19fKQ0K"
+)
+
+// PrintVersion Print out version information
+func PrintVersion() {
+	banner, _ := base64.StdEncoding.DecodeString(bannerBase64)
+	fmt.Printf(versionTpl, banner, AppName, Version, BuildTime, GitCommit, GoVersion)
+}

version

@@ -1 +1 @@
-v0.0.2
+v0.0.4