支持导出脚本包

Author: CodFrm

.gitignore

@@ -3,3 +3,7 @@
 .vscode
 
 config.yaml
+
+*.zip
+*.exe
+

cmd/scriptcat/exec.go

@@ -1,7 +1,11 @@
 package main
 
 import (
-	"io/ioutil"
+	"archive/zip"
+	"io"
+	"io/fs"
+	"os"
+	"path"
 
 	"github.com/scriptscat/cloudcat/pkg/scriptcat"
 	"github.com/scriptscat/cloudcat/pkg/utils"
@@ -10,6 +14,7 @@ import (
 
 type execCmd struct {
 	cookiefile string
+	runOnce    bool
 }
 
 func newExecCmd() *execCmd {
@@ -21,32 +26,72 @@ func (e *execCmd) Commands() []*cobra.Command {
 		Use:   "exec [file] [flags]",
 		Short: "执行一个脚本猫脚本",
 		RunE:  e.exec,
+		Args:  cobra.ExactArgs(1),
 	}
 	ret.Flags().StringVarP(&e.cookiefile, "cookiefile", "c", "", "设置cookie文件")
+	ret.Flags().BoolVarP(&e.runOnce, "run-once", "", false, "运行一次(如果是定时脚本的话,不会进入定时逻辑)")
 
 	return []*cobra.Command{ret}
 }
 
 func (e *execCmd) exec(cmd *cobra.Command, args []string) error {
 
-	sc, err := scriptcat.NewScriptCat()
-	if err != nil {
-		return err
-	}
-
-	script, err := ioutil.ReadFile(args[0])
-	if err != nil {
-		return err
+	var err error
+	var script, cookie, value fs.File
+	if path.Ext(args[0]) == ".zip" {
+		// 软件包
+		pkg, err := zip.OpenReader(args[0])
+		if err != nil {
+			return err
+		}
+		script, err = pkg.Open("userScript.js")
+		if err != nil {
+			return err
+		}
+		defer script.Close()
+		cookie, _ = pkg.Open("cookie.json")
+		value, _ = pkg.Open("value.json")
+	} else {
+		script, err = os.Open(args[0])
+		if err != nil {
+			return err
+		}
+		defer script.Close()
+		cookie, err = os.Open(e.cookiefile)
+		if err != nil {
+			return err
+		}
+		defer cookie.Close()
 	}
 
 	opts := make([]scriptcat.Option, 0)
-	if e.cookiefile != "" {
-		jar, err := utils.ReadCookie(e.cookiefile)
+	if cookie != nil {
+		jar, err := utils.ReadCookie(readString(cookie))
 		if err != nil {
 			return err
 		}
 		opts = append(opts, scriptcat.WithCookie(jar))
 	}
 
-	return sc.Run(string(script))
+	if value != nil {
+		opts = append(opts, scriptcat.WithValue(value))
+	}
+
+	sc, err := scriptcat.NewScriptCat()
+	if err != nil {
+		return err
+	}
+
+	if e.runOnce {
+		return sc.RunOnce(readString(script), opts...)
+	}
+	return sc.Run(readString(script), opts...)
+}
+
+func readString(r io.Reader) string {
+	if r == nil {
+		return ""
+	}
+	byte, _ := io.ReadAll(r)
+	return string(byte)
 }

pkg/scriptcat/option.go

@@ -1,6 +1,8 @@
 package scriptcat
 
-import "net/http"
+import (
+	"net/http"
+)
 
 type Options struct {
 	cookieJar http.CookieJar
@@ -13,3 +15,9 @@ func WithCookie(cookie http.CookieJar) Option {
 		opts.cookieJar = cookie
 	}
 }
+
+func WithValue(value interface{}) Option {
+	return func(opts *Options) {
+
+	}
+}

pkg/scriptcat/scriptcat.go

@@ -1,6 +1,13 @@
 package scriptcat
 
-import "github.com/scriptscat/cloudcat/pkg/executor"
+import (
+	"errors"
+	"sync"
+
+	"github.com/scriptscat/cloudcat/pkg/executor"
+	"github.com/sirupsen/logrus"
+	"rogchap.com/v8go"
+)
 
 type ScriptCat struct {
 	script string
@@ -24,7 +31,32 @@ func (s *ScriptCat) Run(script string, opt ...Option) error {
 }
 
 func (s *ScriptCat) RunOnce(script string, opt ...Option) error {
-
+	ctx, code, err := s.compile(script, opt...)
+	if err != nil {
+		return err
+	}
+	ret, err := ctx.RunScript(code, "main.js")
+	if err != nil {
+		return err
+	}
+	if !ret.IsPromise() {
+		return errors.New("return is not a promise object")
+	}
+	l := sync.WaitGroup{}
+	p, err := ret.AsPromise()
+	if err != nil {
+		return err
+	}
+	l.Add(1)
+	p.Then(func(info *v8go.FunctionCallbackInfo) *v8go.Value {
+		l.Done()
+		return nil
+	})
+	p.Catch(func(info *v8go.FunctionCallbackInfo) *v8go.Value {
+		l.Done()
+		return nil
+	})
+	l.Wait()
 	return nil
 }
 
@@ -44,16 +76,23 @@ func (s *ScriptCat) compile(script string, opt ...Option) (*executor.Context, st
 		return nil, "", err
 	}
 	// TODO: 编译code(require resource等内容)
-	return ctx, "", nil
+
+	return ctx, "function main() {\n" + script + "\n}\nmain();", nil
 }
 
 func (s *ScriptCat) buildContext(exec *executor.Executor, meta map[string][]string, opts *Options) (*executor.Context, error) {
-	contextOpts := make([]executor.Option, 0)
+	contextOpts := []executor.Option{
+		executor.WithLogger(logrus.StandardLogger().Logf),
+		executor.Console(),
+	}
 
 	optMap := map[string]func() executor.Option{
 		"GM_xmlhttpRequest": func() executor.Option {
 			return executor.GmXmlHttpRequest(opts.cookieJar)
 		},
+		"GM_notification": func() executor.Option {
+			return executor.GmNotification()
+		},
 	}
 
 	for _, v := range meta["grant"] {

pkg/scriptcat/utils.go

@@ -10,7 +10,7 @@ func ParseMeta(script string) string {
 }
 
 func ParseMetaToJson(meta string) map[string][]string {
-	reg := regexp.MustCompile("(?im)^//\\s*@(.+?)($|\\s+(.+?)$)")
+	reg := regexp.MustCompile("(?im)^//\\s*@(.+?)([\r\n]+|$|\\s+(.+?)$)")
 	list := reg.FindAllStringSubmatch(meta, -1)
 	ret := make(map[string][]string)
 	for _, v := range list {

pkg/scriptcat/utils_test.go

@@ -1,12 +1,13 @@
 package scriptcat
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
-func TestParseMeta(t *testing.T) {
-	ret := ParseMeta(`// ==UserScript==
+func TestParseMetaToJson(t *testing.T) {
+	ret := ParseMetaToJson(`// ==UserScript==
 // @name         bilibili自动签到
 // @namespace    wyz
 // @version      1.1.2
@@ -17,21 +18,11 @@ func TestParseMeta(t *testing.T) {
 // @grant GM_notification
 // @connect api.bilibili.com
 // @connect api.live.bilibili.com
-// ==/UserScript==
-script code
-`)
+// @cloudCat
+// @exportCookie domain=api.bilibili.com
+// @exportCookie domain=api.live.bilibili.com
+// ==/UserScript==`)
 
-	assert.Equal(t, `// ==UserScript==
-// @name         bilibili自动签到
-// @namespace    wyz
-// @version      1.1.2
-// @author       wyz
-// @crontab * * once * *
-// @debug
-// @grant GM_xmlhttpRequest
-// @grant GM_notification
-// @connect api.bilibili.com
-// @connect api.live.bilibili.com
-// ==/UserScript==`, ret)
+	assert.Equal(t, 2, len(ret["grant"]))
 
 }

pkg/utils/cookie.go

@@ -2,33 +2,37 @@ package utils
 
 import (
 	"encoding/json"
-	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+
+	"github.com/sirupsen/logrus"
 )
 
 type CookieFile struct {
 	*cookiejar.Jar
 }
 
-func ReadCookie(filename string) (http.CookieJar, error) {
+func ReadCookie(cookie string) (http.CookieJar, error) {
 	jar, _ := cookiejar.New(nil)
-	f, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
 	m := make(map[string][]*http.Cookie)
-	if err := json.Unmarshal(f, &m); err != nil {
+	if err := json.Unmarshal([]byte(cookie), &m); err != nil && len(m) == 0 {
 		return nil, err
+	} else if err != nil {
+		logrus.Errorf("cookie format error: %v", err)
 	}
 	for k, v := range m {
-		u, err := url.Parse(k)
-		if err != nil {
-			return nil, fmt.Errorf("parse %s: %w", k, err)
+		for _, v := range v {
+			urlStr := ""
+			if v.Secure {
+				urlStr = "https://"
+			} else {
+				urlStr = "http://"
+			}
+			urlStr += v.Domain
+			u, _ := url.Parse("https://" + k)
+			jar.SetCookies(u, []*http.Cookie{v})
 		}
-		jar.SetCookies(u, v)
 	}
 	return jar, nil
 }