Merge branch 'main' into bugfix_recvcleanup

Author: jsccast

doc/manual.md

@@ -605,7 +605,10 @@ single operation.  Currently the following steps are supported:
 		1. `redactString`: a function that compiles and adds a
            redaction pattern that matches the given string
            literally.
-		
+		   
+		1. `Failure`: return an object representing a failure with the
+           argument as the failure message.
+		   
 		1. `match`: [Sheen](https://github.com/Comcast/sheens)'s
             [pattern
             matching](https://github.com/Comcast/sheens#pattern-matching)

dsl/js.go

@@ -39,6 +39,10 @@ func JSExec(ctx *Ctx, src string, env map[string]interface{}) (interface{}, erro
 	return x, nil
 }
 
+func gojaPanic(vm *goja.Runtime, x interface{}) {
+	panic(vm.ToValue(x))
+}
+
 func jsExec(ctx *Ctx, src string, env map[string]interface{}) (interface{}, error) {
 
 	js := goja.New()
@@ -64,14 +68,14 @@ func jsExec(ctx *Ctx, src string, env map[string]interface{}) (interface{}, erro
 
 	js.Set("redactRegexp", func(pat string) {
 		if err := ctx.AddRedaction(pat); err != nil {
-			panic(err)
+			gojaPanic(js, NewBroken(err))
 		}
 	})
 
 	js.Set("redactString", func(pat string) {
 		pat = regexp.QuoteMeta(pat)
 		if err := ctx.AddRedaction(pat); err != nil {
-			panic(err)
+			gojaPanic(js, NewBroken(err))
 		}
 	})
 
@@ -81,9 +85,7 @@ func jsExec(ctx *Ctx, src string, env map[string]interface{}) (interface{}, erro
 		}
 		bss, err := match.Match(pat, msg, bs)
 		if err != nil {
-			// This panic is caught.  (That's how we
-			// return errors.)
-			panic(js.ToValue(err.Error()))
+			gojaPanic(js, NewBroken(err))
 		}
 		// Strip type (match.Bindings) to enable standard
 		// Javascript access to the maps.

dsl/js_test.go

@@ -92,4 +92,18 @@ bss[0]["?x"] == "queso";
 		}
 	})
 
+	t.Run("nopanic", func(t *testing.T) {
+		// ToDo: Iterate over all exposed native Go functions?
+
+		src := `redactRegexp("[}");`
+
+		_, err := JSExec(ctx, src, nil)
+		if err == nil {
+			t.Fatal("should have complained (politely)")
+		}
+		if _, is := IsBroken(err); !is {
+			t.Fatalf("should have reported Broken instead of %T", err)
+		}
+	})
+
 }