opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat:avoid on the fly regex compile and move them during initializaiton

Browse source
This commit is contained in:
GordonT0110 2026-02-27 20:35:36 +11:00
parent 438f764c7a
commit 5e3b3e051b
5 changed files with 60 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pkg/channels/telegram.go
View file

@ -23,6 +23,19 @@ import (
"github.com/sipeed/picoclaw/pkg/voice" "github.com/sipeed/picoclaw/pkg/voice"
) )
var (
reHeading = regexp.MustCompile(`^#{1,6}\s+(.+)$`)
reBlockquote = regexp.MustCompile(`^>\s*(.*)$`)
reLink = regexp.MustCompile(`\[([^\]]+)\]\(([^)]+)\)`)
reBold1 = regexp.MustCompile(`\*\*(.+?)\*\*`)
reBold2 = regexp.MustCompile(`__(.+?)__`)
reItalic = regexp.MustCompile(`_([^_]+)_`)
reStrike = regexp.MustCompile(`~~(.+?)~~`)
reBullet = regexp.MustCompile(`^[-*]\s+`)
reCodeBlock = regexp.MustCompile("```[\\w]*\\n?([\\s\\S]*?)```")
reInlineCode = regexp.MustCompile("`([^`]+)`")
)
type TelegramChannel struct { type TelegramChannel struct {
*BaseChannel *BaseChannel
bot *telego.Bot bot *telego.Bot
@ -431,19 +444,18 @@ func markdownToTelegramHTML(text string) string {
inlineCodes := extractInlineCodes(text) inlineCodes := extractInlineCodes(text)
text = inlineCodes.text text = inlineCodes.text
text = regexp.MustCompile(`^#{1,6}\s+(.+)$`).ReplaceAllString(text, "$1") text = reHeading.ReplaceAllString(text, "$1")
text = regexp.MustCompile(`^>\s*(.*)$`).ReplaceAllString(text, "$1") text = reBlockquote.ReplaceAllString(text, "$1")
text = escapeHTML(text) text = escapeHTML(text)
text = regexp.MustCompile(`\[([^\]]+)\]\(([^)]+)\)`).ReplaceAllString(text, `<a href="$2">$1</a>`) text = reLink.ReplaceAllString(text, `<a href="$2">$1</a>`)
text = regexp.MustCompile(`\*\*(.+?)\*\*`).ReplaceAllString(text, "<b>$1</b>") text = reBold1.ReplaceAllString(text, "<b>$1</b>")
text = regexp.MustCompile(`__(.+?)__`).ReplaceAllString(text, "<b>$1</b>") text = reBold2.ReplaceAllString(text, "<b>$1</b>")
reItalic := regexp.MustCompile(`_([^_]+)_`)
text = reItalic.ReplaceAllStringFunc(text, func(s string) string { text = reItalic.ReplaceAllStringFunc(text, func(s string) string {
match := reItalic.FindStringSubmatch(s) match := reItalic.FindStringSubmatch(s)
if len(match) < 2 { if len(match) < 2 {
@ -452,9 +464,9 @@ func markdownToTelegramHTML(text string) string {
return "<i>" + match[1] + "</i>" return "<i>" + match[1] + "</i>"
}) })
text = regexp.MustCompile(`~~(.+?)~~`).ReplaceAllString(text, "<s>$1</s>") text = reStrike.ReplaceAllString(text, "<s>$1</s>")
text = regexp.MustCompile(`^[-*]\s+`).ReplaceAllString(text, "• ") text = reBullet.ReplaceAllString(text, "• ")
for i, code := range inlineCodes.codes { for i, code := range inlineCodes.codes {
escaped := escapeHTML(code) escaped := escapeHTML(code)
@ -479,8 +491,7 @@ type codeBlockMatch struct {
} }
func extractCodeBlocks(text string) codeBlockMatch { func extractCodeBlocks(text string) codeBlockMatch {
re := regexp.MustCompile("```[\\w]*\\n?([\\s\\S]*?)```") matches := reCodeBlock.FindAllStringSubmatch(text, -1)
matches := re.FindAllStringSubmatch(text, -1)
codes := make([]string, 0, len(matches)) codes := make([]string, 0, len(matches))
for _, match := range matches { for _, match := range matches {
@ -488,7 +499,7 @@ func extractCodeBlocks(text string) codeBlockMatch {
} }
i := 0 i := 0
text = re.ReplaceAllStringFunc(text, func(m string) string { text = reCodeBlock.ReplaceAllStringFunc(text, func(m string) string {
placeholder := fmt.Sprintf("\x00CB%d\x00", i) placeholder := fmt.Sprintf("\x00CB%d\x00", i)
i++ i++
return placeholder return placeholder
@ -503,8 +514,7 @@ type inlineCodeMatch struct {
} }
func extractInlineCodes(text string) inlineCodeMatch { func extractInlineCodes(text string) inlineCodeMatch {
re := regexp.MustCompile("`([^`]+)`") matches := reInlineCode.FindAllStringSubmatch(text, -1)
matches := re.FindAllStringSubmatch(text, -1)
codes := make([]string, 0, len(matches)) codes := make([]string, 0, len(matches))
for _, match := range matches { for _, match := range matches {
@ -512,7 +522,7 @@ func extractInlineCodes(text string) inlineCodeMatch {
} }
i := 0 i := 0
text = re.ReplaceAllStringFunc(text, func(m string) string { text = reInlineCode.ReplaceAllStringFunc(text, func(m string) string {
placeholder := fmt.Sprintf("\x00IC%d\x00", i) placeholder := fmt.Sprintf("\x00IC%d\x00", i)
i++ i++
return placeholder return placeholder

12
pkg/providers/error_classifier.go
View file

@ -15,6 +15,11 @@ type errorPattern struct {
func substr(s string) errorPattern { return errorPattern{substring: s} } func substr(s string) errorPattern { return errorPattern{substring: s} }
func rxp(r string) errorPattern { return errorPattern{regex: regexp.MustCompile("(?i)" + r)} } func rxp(r string) errorPattern { return errorPattern{regex: regexp.MustCompile("(?i)" + r)} }
var (
reHTTPStatus = regexp.MustCompile(`status[:\s]+(\d{3})`)
reHTTPStatusLine = regexp.MustCompile(`HTTP[/\s]+\d*\.?\d*\s+(\d{3})`)
)
// Error patterns organized by FailoverReason, matching OpenClaw production (~40 patterns). // Error patterns organized by FailoverReason, matching OpenClaw production (~40 patterns).
var ( var (
rateLimitPatterns = []errorPattern{ rateLimitPatterns = []errorPattern{
@ -201,12 +206,7 @@ func classifyByMessage(msg string) FailoverReason {
// Looks for patterns like "status: 429", "status 429", "HTTP 429", or standalone "429". // Looks for patterns like "status: 429", "status 429", "HTTP 429", or standalone "429".
func extractHTTPStatus(msg string) int { func extractHTTPStatus(msg string) int {
// Common patterns in Go HTTP error messages // Common patterns in Go HTTP error messages
patterns := []*regexp.Regexp{ for _, p := range []*regexp.Regexp{reHTTPStatus, reHTTPStatusLine} {
regexp.MustCompile(`status[:\s]+(\d{3})`),
regexp.MustCompile(`HTTP[/\s]+\d*\.?\d*\s+(\d{3})`),
}
for _, p := range patterns {
if m := p.FindStringSubmatch(msg); len(m) > 1 { if m := p.FindStringSubmatch(msg); len(m) > 1 {
return parseDigits(m[1]) return parseDigits(m[1])
} }

12
pkg/skills/loader.go
View file

@ -13,7 +13,11 @@ import (
"github.com/sipeed/picoclaw/pkg/logger" "github.com/sipeed/picoclaw/pkg/logger"
) )
var namePattern = regexp.MustCompile(`^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$`) var (
namePattern = regexp.MustCompile(`^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$`)
reFrontmatterExtract = regexp.MustCompile(`(?s)^---(?:\r\n|\n|\r)(.*?)(?:\r\n|\n|\r)---`)
reFrontmatterStrip = regexp.MustCompile(`(?s)^---(?:\r\n|\n|\r)(.*?)(?:\r\n|\n|\r)---(?:\r\n|\n|\r)*`)
)
const ( const (
MaxNameLength = 64 MaxNameLength = 64
@ -259,8 +263,7 @@ func (sl *SkillsLoader) extractFrontmatter(content string) string {
// Support \n (Unix), \r\n (Windows), and \r (classic Mac) line endings for frontmatter blocks // Support \n (Unix), \r\n (Windows), and \r (classic Mac) line endings for frontmatter blocks
// (?s) enables DOTALL so . matches newlines; // (?s) enables DOTALL so . matches newlines;
// ^--- at start, then ... --- at start of line, honoring all three line ending types // ^--- at start, then ... --- at start of line, honoring all three line ending types
re := regexp.MustCompile(`(?s)^---(?:\r\n|\n|\r)(.*?)(?:\r\n|\n|\r)---`) match := reFrontmatterExtract.FindStringSubmatch(content)
match := re.FindStringSubmatch(content)
if len(match) > 1 { if len(match) > 1 {
return match[1] return match[1]
} }
@ -272,8 +275,7 @@ func (sl *SkillsLoader) stripFrontmatter(content string) string {
// (?s) enables DOTALL so . matches newlines; // (?s) enables DOTALL so . matches newlines;
// ^--- at start, then ... --- at start of line, honoring all three line ending types // ^--- at start, then ... --- at start of line, honoring all three line ending types
// Match zero or more trailing line endings after closing --- (handles both with and without blank lines) // Match zero or more trailing line endings after closing --- (handles both with and without blank lines)
re := regexp.MustCompile(`(?s)^---(?:\r\n|\n|\r)(.*?)(?:\r\n|\n|\r)---(?:\r\n|\n|\r)*`) return reFrontmatterStrip.ReplaceAllString(content, "")
return re.ReplaceAllString(content, "")
} }
func escapeXML(s string) string { func escapeXML(s string) string {

5
pkg/tools/shell.go
View file

@ -24,6 +24,8 @@ type ExecTool struct {
restrictToWorkspace bool restrictToWorkspace bool
} }
var rePathPattern = regexp.MustCompile(`[A-Za-z]:\\[^\\\"']+|/[^\s\"']+`)
var defaultDenyPatterns = []*regexp.Regexp{ var defaultDenyPatterns = []*regexp.Regexp{
regexp.MustCompile(`\brm\s+-[rf]{1,2}\b`), regexp.MustCompile(`\brm\s+-[rf]{1,2}\b`),
regexp.MustCompile(`\bdel\s+/[fq]\b`), regexp.MustCompile(`\bdel\s+/[fq]\b`),
@ -288,8 +290,7 @@ func (t *ExecTool) guardCommand(command, cwd string) string {
return "" return ""
} }
pathPattern := regexp.MustCompile(`[A-Za-z]:\\[^\\\"']+|/[^\s\"']+`) matches := rePathPattern.FindAllString(cmd, -1)
matches := pathPattern.FindAllString(cmd, -1)
for _, raw := range matches { for _, raw := range matches {
p, err := filepath.Abs(raw) p, err := filepath.Abs(raw)

36
pkg/tools/web.go
View file

@ -13,6 +13,18 @@ import (
"time" "time"
) )
var (
reDDGLink = regexp.MustCompile(`<a[^>]*class="[^"]*result__a[^"]*"[^>]*href="([^"]+)"[^>]*>([\s\S]*?)</a>`)
reDDGSnippet = regexp.MustCompile(`<a class="result__snippet[^"]*".*?>([\s\S]*?)</a>`)
reStripTags = regexp.MustCompile(`<[^>]+>`)
reExtractScript = regexp.MustCompile(`<script[\s\S]*?</script>`)
reExtractStyle = regexp.MustCompile(`<style[\s\S]*?</style>`)
reExtractTags = regexp.MustCompile(`<[^>]+>`)
reExtractSpaces = regexp.MustCompile(`[^\S\n]+`)
reExtractNewlines = regexp.MustCompile(`\n{3,}`)
)
const ( const (
userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36" userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
) )
@ -251,8 +263,7 @@ func (p *DuckDuckGoSearchProvider) extractResults(html string, count int, query
// Try finding the result links directly first, as they are the most critical // Try finding the result links directly first, as they are the most critical
// Pattern: <a class="result__a" href="...">Title</a> // Pattern: <a class="result__a" href="...">Title</a>
// The previous regex was a bit strict. Let's make it more flexible for attributes order/content // The previous regex was a bit strict. Let's make it more flexible for attributes order/content
reLink := regexp.MustCompile(`<a[^>]*class="[^"]*result__a[^"]*"[^>]*href="([^"]+)"[^>]*>([\s\S]*?)</a>`) matches := reDDGLink.FindAllStringSubmatch(html, count+5)
matches := reLink.FindAllStringSubmatch(html, count+5)
if len(matches) == 0 { if len(matches) == 0 {
return fmt.Sprintf("No results found or extraction failed. Query: %s", query), nil return fmt.Sprintf("No results found or extraction failed. Query: %s", query), nil
@ -269,8 +280,7 @@ func (p *DuckDuckGoSearchProvider) extractResults(html string, count int, query
// A better regex approach: iterate through text and find matches in order // A better regex approach: iterate through text and find matches in order
// But for now, let's grab all snippets too // But for now, let's grab all snippets too
reSnippet := regexp.MustCompile(`<a class="result__snippet[^"]*".*?>([\s\S]*?)</a>`) snippetMatches := reDDGSnippet.FindAllStringSubmatch(html, count+5)
snippetMatches := reSnippet.FindAllStringSubmatch(html, count+5)
maxItems := min(len(matches), count) maxItems := min(len(matches), count)
@ -305,8 +315,7 @@ func (p *DuckDuckGoSearchProvider) extractResults(html string, count int, query
} }
func stripTags(content string) string { func stripTags(content string) string {
re := regexp.MustCompile(`<[^>]+>`) return reStripTags.ReplaceAllString(content, "")
return re.ReplaceAllString(content, "")
} }
type PerplexitySearchProvider struct { type PerplexitySearchProvider struct {
@ -654,19 +663,14 @@ func (t *WebFetchTool) Execute(ctx context.Context, args map[string]any) *ToolRe
} }
func (t *WebFetchTool) extractText(htmlContent string) string { func (t *WebFetchTool) extractText(htmlContent string) string {
re := regexp.MustCompile(`<script[\s\S]*?</script>`) result := reExtractScript.ReplaceAllLiteralString(htmlContent, "")
result := re.ReplaceAllLiteralString(htmlContent, "") result = reExtractStyle.ReplaceAllLiteralString(result, "")
re = regexp.MustCompile(`<style[\s\S]*?</style>`) result = reExtractTags.ReplaceAllLiteralString(result, "")
result = re.ReplaceAllLiteralString(result, "")
re = regexp.MustCompile(`<[^>]+>`)
result = re.ReplaceAllLiteralString(result, "")
result = strings.TrimSpace(result) result = strings.TrimSpace(result)
re = regexp.MustCompile(`[^\S\n]+`) result = reExtractSpaces.ReplaceAllString(result, " ")
result = re.ReplaceAllString(result, " ") result = reExtractNewlines.ReplaceAllString(result, "\n\n")
re = regexp.MustCompile(`\n{3,}`)
result = re.ReplaceAllString(result, "\n\n")
lines := strings.Split(result, "\n") lines := strings.Split(result, "\n")
var cleanLines []string var cleanLines []string