Merge remote-tracking branch 'origin/develop' into develop

Author: marle3003

engine/engine.go

@@ -83,9 +83,10 @@ func (e *Engine) AddScript(evt dynamic.ConfigEvent) error {
 			err := e.run(host)
 			if err != nil {
 				if errors.Is(err, UnsupportedError) {
-					return
+					log.Debugf("script not supported: %v", evt.Config.Info.Url.Path)
+				} else {
+					log.Errorf("error executing script %v: %v", evt.Config.Info.Url, err)
 				}
-				log.Errorf("error executing script %v: %v", evt.Config.Info.Url, err)
 			}
 		}()
 	} else {
@@ -137,9 +138,6 @@ func (e *Engine) addOrUpdate(host *scriptHost) {
 
 func (e *Engine) run(host *scriptHost) error {
 	err := host.Run()
-	if err != nil {
-		return err
-	}
 
 	if host.CanClose() {
 		if e.parallel {
@@ -151,7 +149,7 @@ func (e *Engine) run(host *scriptHost) error {
 		delete(e.scripts, host.name)
 	}
 
-	return nil
+	return err
 }
 
 func (e *Engine) Scripts() int {

engine/host.go

@@ -325,6 +325,9 @@ func (sh *scriptHost) HttpClient(opts common.HttpClientOptions) common.HttpClien
 }
 
 func (sh *scriptHost) CanClose() bool {
+	if sh.script == nil {
+		return true
+	}
 	return len(sh.events) == 0 && len(sh.jobs) == 0 && sh.script.CanClose() && len(sh.cleanupFuncs) == 0
 }
 

engine/js_test.go

@@ -50,6 +50,16 @@ func TestJsScriptEngine(t *testing.T) {
 		time.Sleep(2 * time.Second)
 		e.Close()
 	})
+	t.Run("script from GIT provider", func(t *testing.T) {
+		t.Parallel()
+		e := enginetest.NewEngine()
+		cfgEvent := newScript("https://foo.bar?file=test.js&ref=develop", `import { on } from 'mokapi';export default function() { on('http', function() {})}`)
+		cfgEvent.Config.Info.Provider = "git"
+		err := e.AddScript(cfgEvent)
+		r.NoError(t, err)
+		r.Equal(t, 1, e.Scripts())
+		e.Close()
+	})
 }
 
 func TestJsEvery(t *testing.T) {

engine/scripts.go

@@ -33,7 +33,14 @@ func NewDefaultScriptLoader(config *static.Config) ScriptLoader {
 func (l *DefaultScriptLoader) Load(file *dynamic.Config, host common.Host) (common.Script, error) {
 	s := file.Data.(string)
 	filename := file.Info.Path()
-	switch filepath.Ext(filename) {
+	if file.Info.Provider == "git" {
+		gitFile := file.Info.Url.Query()["file"]
+		if len(gitFile) > 0 {
+			filename = gitFile[0]
+		}
+	}
+	ext := filepath.Ext(filename)
+	switch ext {
 	case ".js", ".cjs", ".mjs", ".ts":
 		return js.New(file, host)
 	case ".lua":

examples/mail/package-lock.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "nodemailer": "^7.0.7"
+    "nodemailer": "^7.0.11"
   }
 }