完善crontab脚本&docker镜像

CodFrm · CodFrm · commit 2aa21eb1ff03 · 2021-08-25T23:48:40.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,5 @@ config.yaml
 *.zip
 *.exe
 
+scriptcat
+cloudcat
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,28 @@
+FROM golang:1.16 as build
+
+ARG GOOS=linux
+ARG GOARCH=amd64
+ARG GOPROXY="https://goproxy.cn,direct"
+
+WORKDIR /cloudcat
+
+COPY . .
+
+# TODO: 交叉编译
+
+RUN CGO_LDFLAGS="-static" go build -o scriptcat ./cmd/scriptcat && \
+    go build -o cloudcat ./cmd/cloudcat
+
+ARG ARCH
+
+FROM ${ARCH}busybox:1.33.1-musl
+
+WORKDIR /cloudcat
+
+COPY --from=build /cloudcat/scriptcat .
+
+COPY --from=build /cloudcat/cloudcat .
+
+RUN ls -l && chmod +x scriptcat cloudcat
+
+ENTRYPOINT ["./scriptcat"]
diff --git a/Makefile b/Makefile
@@ -0,0 +1,21 @@
+VERSION=0.1.0
+DOCKER_REPO=codfrm
+REMOTE_REPO=$(DOCKER_REPO)/cloudcat:$(VERSION)
+
+build: scriptcat cloudcat
+
+scriptcat:
+	go build .\cmd\scriptcat
+
+cloudcat:
+	go build .\cmd\cloudcat
+
+docker:
+	docker build -t cloudcat .
+
+docker-test:
+	docker run -it -v $(PWD)/bilibili.zip:/cloudcat/bilibili.zip $(REMOTE_REPO) exec bilibili.zip
+
+docker-push: docker
+	docker tag cloudcat $(REMOTE_REPO)
+	docker push $(REMOTE_REPO)
diff --git a/cmd/cloudcat/main.go b/cmd/cloudcat/main.go
diff --git a/cmd/scriptcat/exec.go b/cmd/scriptcat/exec.go
@@ -2,13 +2,16 @@ package main
 
 import (
 	"archive/zip"
+	"context"
 	"io"
 	"io/fs"
 	"os"
+	"os/signal"
 	"path"
 
 	"github.com/scriptscat/cloudcat/pkg/scriptcat"
 	"github.com/scriptscat/cloudcat/pkg/utils"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -29,16 +32,15 @@ func (e *execCmd) Commands() []*cobra.Command {
 		Args:  cobra.ExactArgs(1),
 	}
 	ret.Flags().StringVarP(&e.cookiefile, "cookiefile", "c", "", "设置cookie文件")
-	ret.Flags().BoolVarP(&e.runOnce, "run-once", "", false, "运行一次(如果是定时脚本的话,不会进入定时逻辑)")
+	ret.Flags().BoolVarP(&e.runOnce, "run-once", "", false, "让定时脚本只运行一次")
 
 	return []*cobra.Command{ret}
 }
 
 func (e *execCmd) exec(cmd *cobra.Command, args []string) error {
-
 	var err error
 	var script, cookie, value fs.File
-	if path.Ext(args[0]) == ".zip" {
+	if path.Ext(args[0]) != ".js" {
 		// 软件包
 		pkg, err := zip.OpenReader(args[0])
 		if err != nil {
@@ -64,7 +66,7 @@ func (e *execCmd) exec(cmd *cobra.Command, args []string) error {
 		defer cookie.Close()
 	}
 
-	opts := make([]scriptcat.Option, 0)
+	opts := []scriptcat.Option{scriptcat.WithLogger(logrus.StandardLogger().Logf)}
 	if cookie != nil {
 		jar, err := utils.ReadCookie(readString(cookie))
 		if err != nil {
@@ -83,9 +85,13 @@ func (e *execCmd) exec(cmd *cobra.Command, args []string) error {
 	}
 
 	if e.runOnce {
-		return sc.RunOnce(readString(script), opts...)
+		_, err = sc.RunOnce(context.Background(), readString(script), opts...)
+	} else {
+		ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+		defer cancel()
+		_, err = sc.Run(ctx, readString(script), opts...)
 	}
-	return sc.Run(readString(script), opts...)
+	return err
 }
 
 func readString(r io.Reader) string {
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -0,0 +1,2 @@
+
+
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/scriptscat/cloudcat
 go 1.15
 
 require (
+	github.com/robfig/cron/v3 v3.0.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
diff --git a/go.sum b/go.sum
@@ -196,6 +196,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
diff --git a/pkg/executor/executor.go b/pkg/executor/executor.go
@@ -15,5 +15,5 @@ func NewExecutor() (*Executor, error) {
 }
 
 func (c *Executor) Run(ctx *Context, source string) (*v8go.Value, error) {
-	return ctx.RunScript(source, "main.js")
+	return ctx.RunScript(source, "app.js")
 }
diff --git a/pkg/executor/gmxhr_test.go b/pkg/executor/gmxhr_test.go
@@ -16,7 +16,7 @@ func TestGmXmlHttpRequest(t *testing.T) {
 	ctx, _ := NewContext(iso, WithLogger(logrus.StandardLogger().Logf), GmNotification(), GmXmlHttpRequest(nil), Console())
 
 	ret, err := iso.Run(ctx, `
-function main() {
+function app() {
     return new Promise(resolve => {
         GM_xmlhttpRequest({
             method: 'GET',
@@ -46,7 +46,7 @@ function main() {
         })
     })
 }
-main();
+app();
 `)
 	assert.Nil(t, err)
 	p, err := ret.AsPromise()
diff --git a/pkg/executor/option.go b/pkg/executor/option.go
@@ -10,13 +10,19 @@ type Options struct {
 	global *v8go.ObjectTemplate
 	ctx    *v8go.Context
 	err    error
-	log    func(level logrus.Level, format string, args ...interface{})
+	_log   func(level logrus.Level, format string, args ...interface{})
 }
 
 type Option func(opts *Options)
 
 func WithLogger(log func(level logrus.Level, format string, args ...interface{})) Option {
 	return func(opts *Options) {
-		opts.log = log
+		opts._log = log
+	}
+}
+
+func (o *Options) log(level logrus.Level, format string, args ...interface{}) {
+	if o._log != nil {
+		o._log(level, format, args...)
 	}
 }
diff --git a/pkg/scriptcat/option.go b/pkg/scriptcat/option.go
@@ -1,11 +1,16 @@
 package scriptcat
 
 import (
+	"context"
 	"net/http"
+
+	"github.com/sirupsen/logrus"
 )
 
 type Options struct {
+	context.Context
 	cookieJar http.CookieJar
+	_log      func(level logrus.Level, format string, args ...interface{})
 }
 
 type Option func(opts *Options)
@@ -21,3 +26,15 @@ func WithValue(value interface{}) Option {
 
 	}
 }
+
+func WithLogger(log func(level logrus.Level, format string, args ...interface{})) Option {
+	return func(opts *Options) {
+		opts._log = log
+	}
+}
+
+func (o *Options) log(level logrus.Level, format string, args ...interface{}) {
+	if o._log != nil {
+		o._log(level, format, args)
+	}
+}
diff --git a/pkg/scriptcat/scriptcat.go b/pkg/scriptcat/scriptcat.go
@@ -1,9 +1,11 @@
 package scriptcat
 
 import (
+	"context"
 	"errors"
-	"sync"
+	"strings"
 
+	"github.com/robfig/cron/v3"
 	"github.com/scriptscat/cloudcat/pkg/executor"
 	"github.com/sirupsen/logrus"
 	"rogchap.com/v8go"
@@ -13,76 +15,135 @@ type ScriptCat struct {
 	script string
 	meta   map[string][]string
 	code   string
-	opts   *Options
 }
 
 func NewScriptCat() (*ScriptCat, error) {
 
 	return &ScriptCat{}, nil
 }
 
-func (s *ScriptCat) Run(script string, opt ...Option) error {
-	ctx, code, err := s.compile(script, opt...)
+func (s *ScriptCat) options(opt ...Option) *Options {
+	options := &Options{}
+	for _, o := range opt {
+		o(options)
+	}
+	return options
+}
+
+func (s *ScriptCat) Run(ctx context.Context, script string, opt ...Option) (string, error) {
+	opts := s.options(opt...)
+	exec, meta, code, err := s.compile(script, opts)
 	if err != nil {
-		return err
+		return "", err
+	}
+	// 判断是否是定时脚本
+	c, ok := meta["crontab"]
+	if !ok {
+		opts.log(logrus.InfoLevel, "start run script")
+		return s.runOnce(ctx, exec, code)
 	}
-	_, err = ctx.RunScript(code, "main.js")
-	return err
+	cron := cron.New(cron.WithSeconds())
+	unit := strings.Split(c[0], " ")
+	if len(unit) == 5 {
+		unit = append([]string{"0"}, unit...)
+	}
+	// 对once进行处理
+	for i, v := range unit {
+		if v == "once" {
+			unit[i] = "*"
+			i -= 1
+			for ; i >= 0; i-- {
+				if unit[i] == "*" {
+					unit[i] = "0"
+				}
+			}
+			break
+		}
+	}
+	c[0] = strings.Join(unit, " ")
+	opts.log(logrus.InfoLevel, "start run crontab script: %s", c[0])
+	_, err = cron.AddFunc(c[0], func() {
+		ret, err := s.runOnce(ctx, exec, code)
+		if err != nil {
+			opts.log(logrus.ErrorLevel, "run script error: %v", err)
+		} else {
+			opts.log(logrus.InfoLevel, "run script ok: %v", ret)
+		}
+	})
+	if err != nil {
+		return "", err
+	}
+	cron.Start()
+	<-ctx.Done()
+	return "", nil
 }
 
-func (s *ScriptCat) RunOnce(script string, opt ...Option) error {
-	ctx, code, err := s.compile(script, opt...)
+func (s *ScriptCat) RunOnce(ctx context.Context, script string, opt ...Option) (string, error) {
+	opts := s.options(opt...)
+	exec, _, code, err := s.compile(script, opts)
+	if err != nil {
+		return "", err
+	}
+	ret, err := s.runOnce(ctx, exec, code)
 	if err != nil {
-		return err
+		return "", err
 	}
-	ret, err := ctx.RunScript(code, "main.js")
+	return ret, nil
+}
+
+func (s *ScriptCat) runOnce(ctx context.Context, exec *executor.Context, code string) (msg string, err error) {
+	ret, err := exec.RunScript(code, "app.js")
 	if err != nil {
-		return err
+		return "", err
 	}
 	if !ret.IsPromise() {
-		return errors.New("return is not a promise object")
+		return "", errors.New("return is not a promise object")
 	}
-	l := sync.WaitGroup{}
 	p, err := ret.AsPromise()
 	if err != nil {
-		return err
+		return "", err
 	}
-	l.Add(1)
+	done := make(chan struct{})
 	p.Then(func(info *v8go.FunctionCallbackInfo) *v8go.Value {
-		l.Done()
+		if len(info.Args()) == 1 && info.Args()[0].IsString() {
+			msg = info.Args()[0].String()
+		}
+		done <- struct{}{}
 		return nil
 	})
 	p.Catch(func(info *v8go.FunctionCallbackInfo) *v8go.Value {
-		l.Done()
+		if len(info.Args()) == 1 && info.Args()[0].IsString() {
+			err = errors.New(info.Args()[0].String())
+		}
+		done <- struct{}{}
 		return nil
 	})
-	l.Wait()
-	return nil
+	select {
+	case <-done:
+	case <-ctx.Done():
+	}
+	return
 }
 
-func (s *ScriptCat) compile(script string, opt ...Option) (*executor.Context, string, error) {
-	options := &Options{}
-	for _, o := range opt {
-		o(options)
-	}
+func (s *ScriptCat) compile(script string, options *Options) (*executor.Context, map[string][]string, string, error) {
 	exec, err := executor.NewExecutor()
 	if err != nil {
-		return nil, "", err
+		return nil, nil, "", err
 	}
 	// 解析script
 	metaJson := ParseMetaToJson(ParseMeta(script))
 	ctx, err := s.buildContext(exec, metaJson, options)
 	if err != nil {
-		return nil, "", err
+		return nil, nil, "", err
 	}
 	// TODO: 编译code(require resource等内容)
 
-	return ctx, "function main() {\n" + script + "\n}\nmain();", nil
+	return ctx, metaJson, "function app() {\n" + script + "\n}\napp();", nil
 }
 
 func (s *ScriptCat) buildContext(exec *executor.Executor, meta map[string][]string, opts *Options) (*executor.Context, error) {
 	contextOpts := []executor.Option{
-		executor.WithLogger(logrus.StandardLogger().Logf),
+		executor.WithLogger(opts.log),
 		executor.Console(),
 	}
 
diff --git a/pkg/utils/cookie.go b/pkg/utils/cookie.go

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ func NewExecutor() (*Executor, error) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func (c Executor) Run(ctx Context, source string) (*v8go.Value, error) {`
`18`		`- return ctx.RunScript(source, "main.js")`
	`18`	`+ return ctx.RunScript(source, "app.js")`
`19`	`19`	`}`