diff --git a/CHANGELOG.md b/CHANGELOG.md index df65a63..78077d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,23 @@ # CHANGELOG -## v1.5.1 (2026-06-08) -- **JS 对齐**: HTTP/RPC 方法名统一更正为全大写(`GET`, `POST`, `PUT`, `DELETE`),且 Headers 参数从变长字符串改为 `map[string]string` 对象。 +## v1.5.3 (2026-06-21) +- **错误堆栈重构**: + - 重构 `js_export.go`,将匿名函数改写为包级具名函数。 + - 在 `wrapResult` 中使用 `jsmod.MakeError` 包装返回的错误。 +- **依赖对齐**: + - 升级依赖 `jsmod` 至 `v1.5.3`, `timer` (`v1.5.0`), `cast` 至 `v1.5.3`, `rand` 至 `v1.5.3`, `encoding` 至 `v1.5.4`, `shell` 至 `v1.5.3`, `safe` 至 `v1.5.2`, `id` 至 `v1.5.4`, `crypto` 至 `v1.5.3`, `file` 至 `v1.5.5`, `config` 至 `v1.5.3`, `log` 至 `v1.5.8`, `http` 至 `v1.5.3`, `redis` 至 `v1.5.6`。 + +## v1.5.2 (2026-06-11) +- **依赖对齐**: + - 对齐基础设施依赖到 v1.5.x。 + +## v1.5.1 (2026-06-10) +- **JS 对齐**: + - HTTP/RPC 方法名统一更正为全大写(`GET`, `POST`, `PUT`, `DELETE`),且 Headers 参数从变长字符串改为 `map[string]string` 对象。 + +## v1.5.0 (2026-06-03) +- **依赖对齐**: + - 对齐 Tag v1.5.0。 ## v1.3.4 (2026-05-31) - **重构**: 精简 JS API 导出。移除所有管理类 API(`setNode`, `setLoadBalancer` 等)及 Header 常量。 diff --git a/TEST.md b/TEST.md index ba8a5f4..1a8fe2b 100644 --- a/TEST.md +++ b/TEST.md @@ -15,5 +15,5 @@ ## Benchmarks - **BenchmarkDiscover**: ~500 ns/op (Core node selection and load balancing logic) -> Date: 2026-05-05 +> Date: 2026-06-21 > Environment: Darwin / Intel(R) Core(TM) i9-9980HK CPU @ 2.40GHz diff --git a/go.mod b/go.mod index 1c80462..5d0199e 100644 --- a/go.mod +++ b/go.mod @@ -3,24 +3,24 @@ module apigo.cc/go/discover go 1.25.0 require ( - apigo.cc/go/cast v1.5.2 - apigo.cc/go/http v1.5.2 - apigo.cc/go/id v1.5.3 - apigo.cc/go/jsmod v1.5.2 - apigo.cc/go/log v1.5.6 - apigo.cc/go/redis v1.5.4 - apigo.cc/go/safe v1.5.1 + apigo.cc/go/cast v1.5.3 + apigo.cc/go/http v1.5.3 + apigo.cc/go/id v1.5.4 + apigo.cc/go/jsmod v1.5.3 + apigo.cc/go/log v1.5.8 + apigo.cc/go/redis v1.5.6 + apigo.cc/go/safe v1.5.2 apigo.cc/go/timer v1.5.0 github.com/gorilla/websocket v1.5.3 ) require ( - apigo.cc/go/config v1.5.2 // indirect - apigo.cc/go/crypto v1.5.2 // indirect - apigo.cc/go/encoding v1.5.3 // indirect - apigo.cc/go/file v1.5.4 // indirect - apigo.cc/go/rand v1.5.2 // indirect - apigo.cc/go/shell v1.5.2 // indirect + apigo.cc/go/config v1.5.3 // indirect + apigo.cc/go/crypto v1.5.3 // indirect + apigo.cc/go/encoding v1.5.4 // indirect + apigo.cc/go/file v1.5.5 // indirect + apigo.cc/go/rand v1.5.3 // indirect + apigo.cc/go/shell v1.5.3 // indirect github.com/gomodule/redigo v2.0.0+incompatible // indirect golang.org/x/crypto v0.52.0 // indirect golang.org/x/net v0.54.0 // indirect diff --git a/go.sum b/go.sum index e4c1260..e690304 100644 --- a/go.sum +++ b/go.sum @@ -1,29 +1,29 @@ -apigo.cc/go/cast v1.5.0 h1:UBGJtFQ8eJPMQXs37cUgqd7YQo1zI9opuSDBDmn2/pE= -apigo.cc/go/cast v1.5.0/go.mod h1:z2GW5p5WCZGEqVVIJUdhl232vRbLf2Qu4EDlEakX/D8= -apigo.cc/go/config v1.5.0 h1:Yuz9QEb11XXG4XkhDi/ueT2M1T3Q9PElE5tiakvjehs= -apigo.cc/go/config v1.5.0/go.mod h1:jdMiDLPa9gzB8/FFZvm9jOopUqdxb7XSX+0OeWcZZUM= -apigo.cc/go/crypto v1.5.0 h1:Nxz7a6VKCdvaF258IU0NkjQyureOLxfR308Sy2iftUI= -apigo.cc/go/crypto v1.5.0/go.mod h1:F9M6nXv+5328r1ZwbTvI6fcr8VdgqHVzALOcsdv6ntE= -apigo.cc/go/encoding v1.5.0 h1:EJNdRVDOMoI2DAvZwQNQTbYuqB/6zsEzvg7lS5pQI+I= -apigo.cc/go/encoding v1.5.0/go.mod h1:8++NfZj3hWig0qh2g7GQRw/4LpSvCYMWUZ+8J+x58cA= -apigo.cc/go/file v1.5.0 h1:Fh1NSDBqaxjuXYJ71yPHPXVJ8BFEv/AGS3l+jkLi5uw= -apigo.cc/go/file v1.5.0/go.mod h1:4YhOGgBINTpmmmgws3H8LAyXQQBGzBp44hYUoCS+kr0= -apigo.cc/go/http v1.5.0 h1:GGIu0dhMjTiYygxH9NWOzz6AY+WZjfyTL1qZ8G9vI1U= -apigo.cc/go/http v1.5.0/go.mod h1:CIIH7HS6wdicLpSgkEVozdDcHlM9W9ygmmzJvzhAKWg= -apigo.cc/go/id v1.5.0 h1:MjNWPhBhDsoXaLeJDv/0wfJmVMU9EvOs8pWYfsTQ6e8= -apigo.cc/go/id v1.5.0/go.mod h1:qhu4a1/KLc/XcBpcsRu+mXZt7U7Wvd9zMcPs4VspuPA= -apigo.cc/go/jsmod v1.5.0 h1:JgQtJNiJWy1NOP9AzE8NX5VXJkpO/x3GqLsCCSny5Ec= -apigo.cc/go/jsmod v1.5.0/go.mod h1:bmyeZtOAP/j5am+YRnaiM89smysK24K7ebk0koFtsSw= -apigo.cc/go/log v1.5.0 h1:kQuLLtbt33mEuc/xJVcy8NODXkso/QKSZWNclKrSpsI= -apigo.cc/go/log v1.5.0/go.mod h1:Djy+I5aLhGB/EjwRz4KHqkVEz584IAD55FAFiIfInuo= -apigo.cc/go/rand v1.5.0 h1:1o8hh8fhdBuk1/h02IvugvamuT3dkWbVJrqEJVQKB2E= -apigo.cc/go/rand v1.5.0/go.mod h1:Lh98S2dm9UY0X+M+kNQQEKyXHG5pcCKSFPyXN0QCGdk= -apigo.cc/go/redis v1.5.0 h1:VXNDqzKj87BchF7ubDEH+T6lp8NrjeK0izU4ooo7u1A= -apigo.cc/go/redis v1.5.0/go.mod h1:/olsrHndkUNezUX1KbBBt8b4Got7SX7E8EJzcb1PknM= -apigo.cc/go/safe v1.5.0 h1:W1NblmcU8cex1f9Y5z8mNLUJOzZTE1s6fszb3FbhGnk= -apigo.cc/go/safe v1.5.0/go.mod h1:OfQ5d6COePSGEuPvMeOk6KagX2sezw7nvKh7exj9SeM= -apigo.cc/go/shell v1.5.0 h1:WLDMMqUU0INeaBDmQsTPr0h/NfB2RknAtiJ5NL467+Q= -apigo.cc/go/shell v1.5.0/go.mod h1:rYHA77d5hEsQHcJrbAWf1pHy0sxayeJ0gU55LA/JWQk= +apigo.cc/go/cast v1.5.3 h1:jk6VX0rGFhjKtfPhsaV6IKYpiGmORRk9qPTtuNS53tw= +apigo.cc/go/cast v1.5.3/go.mod h1:GMjjrYn93tWat1U409G7h1jR3ejfLLI7r0efBo9Sbd4= +apigo.cc/go/config v1.5.3 h1:peq1FM2xO+vzPHJf8Dwg3DXm8PtFQMfTFKQj6fpoG7A= +apigo.cc/go/config v1.5.3/go.mod h1:ZiOAjWa1mQIzszaJZN+kO6YU4GXreng+NxkcK/TAkqQ= +apigo.cc/go/crypto v1.5.3 h1:2JUHC2cgR2zrnn36EzwkUAdxmmTXAA/8yTNo+2X1mPE= +apigo.cc/go/crypto v1.5.3/go.mod h1:PheYKHEXmoEFI1AK5PpY1borQWcRlkkSaWncT3cWbhE= +apigo.cc/go/encoding v1.5.4 h1:Fk8TrveZATyy8SHukC4ZiqdTSp+QIfsRHtt55xmMK7w= +apigo.cc/go/encoding v1.5.4/go.mod h1:dShEsZ3gKqBINz7TSOYf4e7/fBCqCY9VzlenoGUQUFM= +apigo.cc/go/file v1.5.5 h1:/+HmDumLu6Qk2KuQL63M9lpgzHTDL+QJ8dStOl7e9gs= +apigo.cc/go/file v1.5.5/go.mod h1:xRVNhctvqOKeBemmcRW/BQfgkc3B+vT/UZVdSc7duUo= +apigo.cc/go/http v1.5.3 h1:nvJh9bqPPcPRv6p8WEw7bJAd0UC+r2zvQA8/QioVLTQ= +apigo.cc/go/http v1.5.3/go.mod h1:cFrPK61y9f1PrsNSJscZT/QVOgkT15o9OP7O8cuMb8Q= +apigo.cc/go/id v1.5.4 h1:D1Zx9gEZhOgdTgZ4SdmPImhpc9xGiOA33Y+j2MkstzQ= +apigo.cc/go/id v1.5.4/go.mod h1:hCTQq+KC1ALWe1FpPERf+W4B6FSulg9FAgOUJDDySiY= +apigo.cc/go/jsmod v1.5.3 h1:S3W317bH0QV2NMeRO1E0v6ySIBOfMWYv/NuQJbvqKWU= +apigo.cc/go/jsmod v1.5.3/go.mod h1:bmyeZtOAP/j5am+YRnaiM89smysK24K7ebk0koFtsSw= +apigo.cc/go/log v1.5.8 h1:/IYtGPWhRjT3OayylDIphkWZIQbpLjqVeSnFEiD3Dy0= +apigo.cc/go/log v1.5.8/go.mod h1:HfFPANMYxJx197SSTXB21Pgxcz/gGqPP8nlSErgd5WE= +apigo.cc/go/rand v1.5.3 h1:O4bPIwyaOWEBCr0nL9A4G4qG48AqiGTCzfPeckm3Ius= +apigo.cc/go/rand v1.5.3/go.mod h1:q1BTFkY/cXE229dDD5Q22lF7T0DoKPV6xAu+6bCrDH4= +apigo.cc/go/redis v1.5.6 h1:Lzo8M2binfqdQdVVp31Z/Max4qT8D82QdZjLlLQsrIY= +apigo.cc/go/redis v1.5.6/go.mod h1:HmqSh2Ll7/b2zFXDi2Ap13YOuMCVniuZNbwtxkbIYII= +apigo.cc/go/safe v1.5.2 h1:EnuEOW/SGwf/5A0nw9LnqfKJE071+TIc6ez8HI9R9Lg= +apigo.cc/go/safe v1.5.2/go.mod h1:2GqCCLLGex4OAhdET3iBWm1R+LIYtmTrvHP8W0iESSw= +apigo.cc/go/shell v1.5.3 h1:pI+u12sy6upoygq+1XXqUlvUboBfH4Q52jRpoJFv56A= +apigo.cc/go/shell v1.5.3/go.mod h1:FdZWUrcXHGJXo725oSyHqAeFoX0E9yY3PDhrz9hujgY= apigo.cc/go/timer v1.5.0 h1:iPo/IQn+iuhBRI1/MR1txwZnamef/RBBfOiIlBiqkgk= apigo.cc/go/timer v1.5.0/go.mod h1:kOnqTTX+zA4AH7SfC+LpUm4ZvS+DVyWWMqul/V5QWJs= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= @@ -37,9 +37,11 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= +golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= golang.org/x/net v0.54.0 h1:2zJIZAxAHV/OHCDTCOHAYehQzLfSXuf/5SoL/Dv6w/w= golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/js_export.go b/js_export.go index fd8b413..5495028 100644 --- a/js_export.go +++ b/js_export.go @@ -10,26 +10,36 @@ import ( func init() { jsmod.Register("discover", map[string]any{ // RPC 调用 (全大写对齐 HTTP) - "GET": func(app, path string, headers map[string]string) *jsResult { - return wrapResult(Get(app, path, flattenHeaders(headers)...)) - }, - "POST": func(app, path string, data any, headers map[string]string) *jsResult { - return wrapResult(Post(app, path, data, flattenHeaders(headers)...)) - }, - "PUT": func(app, path string, data any, headers map[string]string) *jsResult { - return wrapResult(DefaultDiscoverer.Put(app, path, data, flattenHeaders(headers)...)) - }, - "DELETE": func(app, path string, data any, headers map[string]string) *jsResult { - return wrapResult(DefaultDiscoverer.Delete(app, path, data, flattenHeaders(headers)...)) - }, + "GET": jsGet, + "POST": jsPost, + "PUT": jsPut, + "DELETE": jsDelete, // 链路透传 - "From": func(r *http.Request) *jsCaller { - return &jsCaller{c: DefaultDiscoverer.From(r)} - }, + "From": jsFrom, }) } +func jsGet(app, path string, headers map[string]string) *jsResult { + return wrapResult(Get(app, path, flattenHeaders(headers)...)) +} + +func jsPost(app, path string, data any, headers map[string]string) *jsResult { + return wrapResult(Post(app, path, data, flattenHeaders(headers)...)) +} + +func jsPut(app, path string, data any, headers map[string]string) *jsResult { + return wrapResult(DefaultDiscoverer.Put(app, path, data, flattenHeaders(headers)...)) +} + +func jsDelete(app, path string, data any, headers map[string]string) *jsResult { + return wrapResult(DefaultDiscoverer.Delete(app, path, data, flattenHeaders(headers)...)) +} + +func jsFrom(r *http.Request) *jsCaller { + return &jsCaller{c: DefaultDiscoverer.From(r)} +} + func flattenHeaders(m map[string]string) []string { if len(m) == 0 { return nil @@ -47,6 +57,9 @@ type jsResult struct { } func wrapResult(r *gohttp.Result) *jsResult { + if r != nil && r.Error != nil { + r.Error = jsmod.MakeError(r.Error) + } return &jsResult{r: r} }