High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.
fix: match wait url pattern in Go instead of a browser-evaluated boolean (#634)
Luigi Agostidb67c49a77d5
diff --git a/internal/handlers/wait.go b/internal/handlers/wait.goindex 6b68932a..e5767c98 100644--- a/internal/handlers/wait.go+++ b/internal/handlers/wait.go@@ -6,6 +6,8 @@ import ("errors""fmt""net/http"+ "regexp"+ "strings""time""github.com/pinchtab/pinchtab/internal/activity"@@ -198,7 +200,6 @@ func (h *Handlers) handleWaitCore(w http.ResponseWriter, r *http.Request, req wajs = fmt.Sprintf(`!document.body || !document.body.innerText.includes(%s)`, jsonStr(req.NotText))matchLabel = "!" + req.NotTextcase "url":- js = buildURLMatchJS(req.URL)matchLabel = req.URLcase "load":canonical, ok := canonicalLoadState(req.Load)@@ -222,6 +223,13 @@ func (h *Handlers) handleWaitCore(w http.ResponseWriter, r *http.Request, req wa}err = pollUntil(tCtx, pollInterval, func() (bool, error) {+ if mode == "url" {+ var href string+ if evalErr := h.Bridge.Evaluate(tCtx, "window.location.href", &href, bridge.EvalOpts{}); evalErr != nil {+ return false, nil+ }+ return matchURLPattern(req.URL, href), nil+ }var result boolevalErr := h.Bridge.Evaluate(tCtx, js, &result, bridge.EvalOpts{})return evalErr == nil && result, nil@@ -340,20 +348,32 @@ func buildSelectorJS(sel, state string) (string, string) {return js, sel}-// buildURLMatchJS builds a JS expression that checks if the current URL matches a glob pattern.-func buildURLMatchJS(pattern string) string {- // Convert glob to regex: ** → .*, * → [^/]*, ? → .- return fmt.Sprintf(`(function(){- var p = %s;- var u = window.location.href;- // Convert glob to regex- var re = p.replace(/[.+^${}()|[\\]\\\\]/g, '\\\\$&')- .replace(/\\*\\*/g, '<<<DOUBLESTAR>>>')- .replace(/\\*/g, '[^/]*')- .replace(/<<<DOUBLESTAR>>>/g, '.*')- .replace(/\\?/g, '.');- return new RegExp(re).test(u);- })()`, jsonStr(pattern))+func matchURLPattern(pattern, url string) bool {+ var b strings.Builder+ for i := 0; i < len(pattern); i++ {+ c := pattern[i]+ switch c {+ case '*':+ if i+1 < len(pattern) && pattern[i+1] == '*' {+ b.WriteString(".*")+ i+++ continue+ }+ b.WriteString("[^/]*")+ case '?':+ b.WriteByte('.')+ case '.', '+', '^', '$', '{', '}', '(', ')', '|', '[', ']', '\\':+ b.WriteByte('\\')+ b.WriteByte(c)+ default:+ b.WriteByte(c)+ }+ }+ re, err := regexp.Compile(b.String())+ if err != nil {+ return false+ }+ return re.MatchString(url)}func jsonStr(s string) string {diff --git a/internal/handlers/wait_test.go b/internal/handlers/wait_test.goindex c4b17131..fc493990 100644--- a/internal/handlers/wait_test.go+++ b/internal/handlers/wait_test.go@@ -451,10 +451,23 @@ func TestBuildSelectorJS_HiddenText(t *testing.T) {}}-func TestBuildURLMatchJS(t *testing.T) {- js := buildURLMatchJS("**/dashboard")- if js == "" {- t.Error("expected non-empty JS for URL match")+func TestMatchURLPattern(t *testing.T) {+ cases := []struct {+ pattern string+ url string+ want bool+ }{+ {"http://127.0.0.1:8998/page2.html", "http://127.0.0.1:8998/page2.html", true},+ {"*page2.html", "http://127.0.0.1:8998/page2.html", true},+ {"*.html", "http://127.0.0.1:8998/page2.html", true},+ {"**/dashboard", "http://app.example.com/x/dashboard", true},+ {"http://127.0.0.1:8998/page2.html", "http://127.0.0.1:8998/page1.html", false},+ {"*page2.html", "http://127.0.0.1:8998/page3.html", false},+ }+ for _, c := range cases {+ if got := matchURLPattern(c.pattern, c.url); got != c.want {+ t.Errorf("matchURLPattern(%q, %q) = %v, want %v", c.pattern, c.url, got, c.want)+ }}}