mirror of
https://github.com/zgs225/cliproxy-plugin-commandcode.git
synced 2026-09-26 03:32:50 +08:00
Compare commits
7
Commits
4ce221c22a
...
v0.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
61c50280b1 | ||
|
|
43c09885e5 | ||
|
|
016929f9a7 | ||
|
|
680a40ebc8 | ||
|
|
4adda19b72 | ||
|
|
dc6c2d18b3 | ||
|
|
688a7f395f |
@@ -15,3 +15,11 @@ coverage.txt
|
||||
.idea/
|
||||
.vscode/
|
||||
*.swp
|
||||
|
||||
# Release artifacts (attached to GitHub Releases, not tracked in git)
|
||||
*.zip
|
||||
checksums.txt
|
||||
dist/
|
||||
|
||||
# Internal planning docs (not for public repo)
|
||||
docs/
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
[](https://help.router-for.me/plugin/development.html)
|
||||
[](LICENSE)
|
||||
|
||||
[CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) 动态 C ABI 插件,用于提供 **Command Code** 凭据认证、上游配额与窗口限额查询、以及嵌入式配额监控仪表盘卡片(QuotaCard)。
|
||||
[CLIProxyAPI](https://github.com/router-for-me/CLIProxyAPI) 动态 C ABI 插件,用于提供 **Command Code** 与 **OpenCode Go** 两个上游的配额与窗口限额查询、以及嵌入式配额监控仪表盘卡片(QuotaCard,Tab: Command Code / OpenCode Go / All)。
|
||||
|
||||
---
|
||||
|
||||
@@ -16,11 +16,12 @@
|
||||
- [构建插件](#构建插件)
|
||||
- [安装与目录结构](#安装与目录结构)
|
||||
- [宿主配置 (`config.yaml`)](#宿主配置-configyaml)
|
||||
- [凭据文件配置](#凭据文件配置)
|
||||
- [管理端点与资源页](#管理端点与资源页)
|
||||
- [1. 浏览器资源页 (`QuotaCard`)](#1-浏览器资源页-quotacard)
|
||||
- [2. 管理 API: 查询用量 (`GET`)](#2-管理-api-查询用量-get)
|
||||
- [3. 管理 API: 测试用量 (`POST`)](#3-管理-api-测试用量-post)
|
||||
- [4. 管理 API: OpenCode Go 用量 (`opencode/usage`)](#4-管理-api-opencode-go-用量-opencodeusage)
|
||||
- [5. 管理 API: 聚合查询 (`all`)](#5-管理-api-聚合查询-all)
|
||||
- [用量数据结构说明](#用量数据结构说明)
|
||||
- [开发与测试](#开发与测试)
|
||||
- [许可证](#许可证)
|
||||
@@ -32,12 +33,12 @@
|
||||
1. **标准 C ABI 兼容**:
|
||||
- 导出 `cliproxy_plugin_init`、`cliproxyPluginCall`、`cliproxyPluginFree`、`cliproxyPluginShutdown`。
|
||||
- 遵照 CLIProxyAPI 官方 JSON Envelope 规范(`ok`, `result`, `error`)。
|
||||
2. **双核心能力声明**:
|
||||
- `auth_provider`: 参与凭据识别、加载、解析与刷新。
|
||||
- `management_api`: 注册插件自有的管理端点与浏览器资源页面。
|
||||
3. **凭据自动解析 (`auth.parse`)**:
|
||||
- 自动识别 `commandcode-*.json` 凭据文件、`type: "commandcode"` 配置或包含 `session_token` / Cookie 的凭据。
|
||||
- 提取并规范化 `__Secure-commandcode_prod_.session_token`,存入宿主持久化凭据库。
|
||||
2. **纯粹的管理监控能力 (`management_api`)**:
|
||||
- 注册插件自有的用量管理端点与浏览器嵌入式仪表盘资源页面。
|
||||
- 无多余的 OAuth 提供商注册,不污染 CLIProxyAPI 后台的 OAuth 授权列表。
|
||||
3. **Session Token 灵活提取与支持**:
|
||||
- 支持在 `config.yaml` 配置或在配额页面上直接输入。
|
||||
- 支持纯 token 或完整 Cookie 字符串(自动提取 `__Secure-commandcode_prod_.session_token`)。
|
||||
4. **精确用量与双滑动窗口限额解析**:
|
||||
- 上游接口:`GET https://api.commandcode.ai/internal/billing/credits`。
|
||||
- 请求优先走宿主提供的 `host.http.do` 回调(复用宿主代理、日志与鉴权管道),离线或未注入宿主时自动无缝降级至 Go 标准 `net/http`。
|
||||
@@ -46,6 +47,11 @@
|
||||
- 页面挂载于 `/v0/resource/plugins/commandcode/quota`。
|
||||
- 零外部 CDN 依赖,纯内置 HTML + CSS + JS,深色/浅色模式自适应。
|
||||
- 具有进度条颜色变化、5小时/周限额卡片、秒级动态重置倒计时、同源 `localStorage` 鉴权与一键刷新。
|
||||
- Tab 切换:Command Code / OpenCode Go / All(`#opencode` / `#all` hash 记忆状态)。
|
||||
6. **OpenCode Go 用量查询 (v0.3.0+)**:
|
||||
- 上游接口:`GET https://opencode.ai/zen/go/v1/usage`,`Authorization: Bearer` 认证(同样走 `host.http.do` 优先 + `net/http` 兜底)。
|
||||
- 解析 rolling(5h)/ weekly / monthly 三个窗口的 `status`/`percent`/`resetsAt`,容忍未知 status 值。
|
||||
- 聚合端点 `/plugins/commandcode/all` 一次返回两个 provider,部分失败不拖死另一 provider。
|
||||
|
||||
---
|
||||
|
||||
@@ -55,16 +61,15 @@
|
||||
┌────────────────────────────────────────────────────────┐
|
||||
│ CLIProxyAPI │
|
||||
│ │
|
||||
│ ┌─────────────────────────┐ ┌─────────────────────┐ │
|
||||
│ │ Auth Management │ │ Management Center │ │
|
||||
│ │ (reads auths/*.json) │ │ (/v0/management) │ │
|
||||
│ └───────────┬─────────────┘ └──────────┬──────────┘ │
|
||||
│ │ C ABI │ C ABI │
|
||||
│ ▼ ▼ │
|
||||
│ ┌─────────────────────┐ │
|
||||
│ │ Management Center │ │
|
||||
│ │ (/v0/management) │ │
|
||||
│ └──────────┬──────────┘ │
|
||||
│ │ C ABI │
|
||||
│ ▼ │
|
||||
│ ┌──────────────────────────────────────────────────┐ │
|
||||
│ │ cliproxy-plugin-commandcode.dylib/.so │ │
|
||||
│ │ │ │
|
||||
│ │ • auth.identifier / auth.parse │ │
|
||||
│ │ • management.register / management.handle │ │
|
||||
│ │ • Usage Parser & Window Limits Formatter │ │
|
||||
│ │ • Embedded Single-file HTML/CSS/JS QuotaCard │ │
|
||||
@@ -79,6 +84,7 @@
|
||||
│ Upstream HTTPS
|
||||
▼
|
||||
https://api.commandcode.ai/internal/billing/credits
|
||||
https://opencode.ai/zen/go/v1/usage (v0.3.0+)
|
||||
```
|
||||
|
||||
---
|
||||
@@ -126,34 +132,12 @@ plugins:
|
||||
commandcode:
|
||||
enabled: true
|
||||
priority: 1
|
||||
session_token: "YOUR_COMMANDCODE_SESSION_TOKEN"
|
||||
session_token: "YOUR_COMMANDCODE_SESSION_TOKEN" # 支持纯 token 或完整 Cookie 字符串
|
||||
api_base: "https://api.commandcode.ai" # 可选,默认为官方接口
|
||||
opencode_api_key: "sk-YOUR_OPENCODE_GO_API_KEY" # v0.3.0+ 可选,OpenCode Go 用量查询
|
||||
opencode_api_base: "https://opencode.ai/zen/go/v1" # v0.3.0+ 可选,默认为官方接口
|
||||
```
|
||||
|
||||
### 凭据文件配置
|
||||
|
||||
除了在 `config.yaml` 中全局配置,你也可以在 CLIProxyAPI 的 `auths/` 凭据目录下创建凭据文件(如 `auths/commandcode-main.json`):
|
||||
|
||||
```json
|
||||
{
|
||||
"type": "commandcode",
|
||||
"session_token": "YOUR_COMMANDCODE_SESSION_TOKEN",
|
||||
"email": "user@example.com",
|
||||
"label": "Command Code Pro"
|
||||
}
|
||||
```
|
||||
|
||||
或者直接放入浏览器 Cookie:
|
||||
|
||||
```json
|
||||
{
|
||||
"type": "commandcode",
|
||||
"cookie": "__Secure-commandcode_prod_.session_token=YOUR_COMMANDCODE_SESSION_TOKEN; Path=/;"
|
||||
}
|
||||
```
|
||||
|
||||
插件的 `auth.parse` 会自动拦截并完成凭据加载。
|
||||
|
||||
---
|
||||
|
||||
## 管理端点与资源页
|
||||
@@ -161,11 +145,11 @@ plugins:
|
||||
### 1. 浏览器资源页 (`QuotaCard`)
|
||||
|
||||
- **访问路径**:`GET http://<cpa-host>:8317/v0/resource/plugins/commandcode/quota`
|
||||
- **菜单名**:`Command Code 配额`
|
||||
- **菜单名**:`用量配额`
|
||||
- **说明**:
|
||||
- 资源请求本身无需经过管理认证,可在浏览器中直接打开或嵌入仪表盘。
|
||||
- 在同源模式下,页面 JavaScript 会自动读取 `localStorage` 中的管理密钥向 `/v0/management/plugins/commandcode/usage` 请求数据。
|
||||
- 若在独立或跨域测试环境下打开,页面提供内置的诊断面板,可手动输入 Management Key 或测试 Session Token。
|
||||
- 在同源模式下,页面 JavaScript 会自动读取 `localStorage` 中的管理密钥向 `/v0/management/plugins/commandcode/all` 请求数据(一次获取 Command Code + OpenCode Go)。
|
||||
- 若在独立或跨域测试环境下打开,页面提供内置的诊断面板,可手动输入 Management Key、测试 Session Token 或 OpenCode API Key(仅当次请求生效,不持久化)。
|
||||
|
||||
### 2. 管理 API: 查询用量 (`GET`)
|
||||
|
||||
@@ -224,6 +208,55 @@ plugins:
|
||||
}
|
||||
```
|
||||
|
||||
### 4. 管理 API: OpenCode Go 用量 (`opencode/usage`)
|
||||
|
||||
- **端点**:`GET /v0/management/plugins/commandcode/opencode/usage`(认证同上,仅读插件配置;凭据覆盖走 POST)
|
||||
- **端点**:`POST /v0/management/plugins/commandcode/opencode/usage`
|
||||
- **POST 请求体**:
|
||||
|
||||
```json
|
||||
{ "opencode_api_key": "sk-YOUR_TEMPORARY_KEY" }
|
||||
```
|
||||
|
||||
- **响应示例**:
|
||||
|
||||
```json
|
||||
{
|
||||
"ok": true,
|
||||
"provider": "opencode_go",
|
||||
"windows": {
|
||||
"rolling": { "status": "ok", "percent": 4, "exceeded": false,
|
||||
"reset_at": "2026-09-17T06:58:53Z", "reset_in_seconds": 2520 },
|
||||
"weekly": { "status": "ok", "percent": 46, "exceeded": false,
|
||||
"reset_at": "2026-09-21T00:00:00Z", "reset_in_seconds": 259200 },
|
||||
"monthly": { "status": "ok", "percent": 23, "exceeded": false,
|
||||
"reset_at": "2026-10-14T09:13:49Z", "reset_in_seconds": 1728000 }
|
||||
},
|
||||
"updated_at": "2026-09-16T12:00:00Z"
|
||||
}
|
||||
```
|
||||
|
||||
### 5. 管理 API: 聚合查询 (`all`)
|
||||
|
||||
- **端点**:`GET /v0/management/plugins/commandcode/all`(仅读插件配置)
|
||||
- **端点**:`POST /v0/management/plugins/commandcode/all`
|
||||
- **POST 请求体**(可只带其一):
|
||||
|
||||
```json
|
||||
{ "session_token": "...", "opencode_api_key": "sk-..." }
|
||||
```
|
||||
|
||||
- **部分失败语义**:HTTP 200 表示至少一个 provider 成功;失败 provider 记入 `errors`,其响应字段(`commandcode`/`opencode`)整个省略;全失败且为本地凭据缺失 → 400,全失败且为上游错误 → 502。
|
||||
|
||||
```json
|
||||
{
|
||||
"ok": true,
|
||||
"commandcode": { "ok": true, "plan": {...}, "credits": {...}, "window_limits": {...}, "updated_at": "..." },
|
||||
"opencode": { "ok": true, "provider": "opencode_go", "windows": {...}, "updated_at": "..." },
|
||||
"updated_at": "2026-09-16T12:00:00Z"
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 用量数据结构说明
|
||||
@@ -241,6 +274,10 @@ plugins:
|
||||
| `window_limits.five_hour.reset_at` | `string` | 5小时窗口重置时间的 RFC3339 字符串 |
|
||||
| `window_limits.five_hour.reset_in_seconds`| `int64` | 距离 5 小时窗口重置的剩余秒数 |
|
||||
| `window_limits.weekly.*` | - | 每周限额对应指标(结构同 5 小时窗口) |
|
||||
| `windows.<rolling\|weekly\|monthly>.status` | `string` | OpenCode Go 窗口状态(`"ok"`/上游其他值,未知值不报错) |
|
||||
| `windows.<...>.percent` | `float64` | OpenCode Go 窗口使用百分比(0-100,钳制) |
|
||||
| `windows.<...>.exceeded` | `bool` | `percent >= 100` 或上游 `status == "exceeded"` |
|
||||
| `windows.<...>.reset_at` / `reset_in_seconds` | `string` / `int64` | OpenCode Go 窗口重置时间(解析失败优雅降级为空/0) |
|
||||
|
||||
---
|
||||
|
||||
|
||||
-129
@@ -1,31 +1,12 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
var cookieRegex = regexp.MustCompile(`(?:^|;\s*)__Secure-commandcode_prod_\.session_token=([^;]+)`)
|
||||
|
||||
// RawAuthContent represents possible structures inside a commandcode credential JSON file.
|
||||
type RawAuthContent struct {
|
||||
Type string `json:"type"`
|
||||
Provider string `json:"provider"`
|
||||
ID string `json:"id"`
|
||||
Label string `json:"label"`
|
||||
Name string `json:"name"`
|
||||
Email string `json:"email"`
|
||||
SessionToken string `json:"session_token"`
|
||||
CommandCodeSession string `json:"commandcode_session_token"`
|
||||
Cookie string `json:"cookie"`
|
||||
Token string `json:"token"`
|
||||
UpstreamBase string `json:"api_base"`
|
||||
}
|
||||
|
||||
// ExtractSessionToken extracts the clean session token from a raw string or cookie string.
|
||||
func ExtractSessionToken(raw string) string {
|
||||
raw = strings.TrimSpace(raw)
|
||||
@@ -54,113 +35,3 @@ func FormatSessionCookie(token string) string {
|
||||
return "__Secure-commandcode_prod_.session_token=" + clean
|
||||
}
|
||||
|
||||
// ParseAuth handles auth.parse requests for Command Code credentials.
|
||||
func ParseAuth(req AuthParseRequest) (AuthParseResponse, error) {
|
||||
lowerFileName := strings.ToLower(req.FileName)
|
||||
isCommandCodeFile := strings.HasPrefix(lowerFileName, "commandcode") && strings.HasSuffix(lowerFileName, ".json")
|
||||
isCommandCodeProvider := strings.EqualFold(req.Provider, PluginID)
|
||||
|
||||
var content RawAuthContent
|
||||
var rawMap map[string]any
|
||||
if len(req.RawJSON) > 0 {
|
||||
if err := json.Unmarshal(req.RawJSON, &content); err == nil {
|
||||
_ = json.Unmarshal(req.RawJSON, &rawMap)
|
||||
}
|
||||
}
|
||||
|
||||
isExplicitCommandCode := strings.EqualFold(content.Type, PluginID) ||
|
||||
strings.EqualFold(content.Provider, PluginID) ||
|
||||
content.SessionToken != "" ||
|
||||
content.CommandCodeSession != "" ||
|
||||
strings.Contains(content.Cookie, "__Secure-commandcode_prod_.session_token")
|
||||
|
||||
if !isCommandCodeFile && !isCommandCodeProvider && !isExplicitCommandCode {
|
||||
return AuthParseResponse{Handled: false}, nil
|
||||
}
|
||||
|
||||
// Extract session token
|
||||
token := content.SessionToken
|
||||
if token == "" {
|
||||
token = content.CommandCodeSession
|
||||
}
|
||||
if token == "" && content.Cookie != "" {
|
||||
token = ExtractSessionToken(content.Cookie)
|
||||
}
|
||||
if token == "" && (isCommandCodeFile || isCommandCodeProvider || isExplicitCommandCode) {
|
||||
token = content.Token
|
||||
}
|
||||
token = ExtractSessionToken(token)
|
||||
|
||||
// Determine ID
|
||||
authID := content.ID
|
||||
if authID == "" && req.FileName != "" {
|
||||
base := filepath.Base(req.FileName)
|
||||
authID = strings.TrimSuffix(base, filepath.Ext(base))
|
||||
}
|
||||
if authID == "" {
|
||||
authID = "commandcode-default"
|
||||
}
|
||||
|
||||
// Determine Label
|
||||
label := content.Label
|
||||
if label == "" {
|
||||
label = content.Name
|
||||
}
|
||||
if label == "" && content.Email != "" {
|
||||
label = fmt.Sprintf("Command Code (%s)", content.Email)
|
||||
}
|
||||
if label == "" {
|
||||
label = fmt.Sprintf("Command Code (%s)", authID)
|
||||
}
|
||||
|
||||
// Build clean StorageJSON
|
||||
storageMap := map[string]any{
|
||||
"type": PluginID,
|
||||
"provider": PluginID,
|
||||
"session_token": token,
|
||||
}
|
||||
if content.Email != "" {
|
||||
storageMap["email"] = content.Email
|
||||
}
|
||||
if content.Label != "" {
|
||||
storageMap["label"] = content.Label
|
||||
}
|
||||
if content.UpstreamBase != "" {
|
||||
storageMap["api_base"] = content.UpstreamBase
|
||||
}
|
||||
for k, v := range rawMap {
|
||||
if _, exists := storageMap[k]; !exists {
|
||||
storageMap[k] = v
|
||||
}
|
||||
}
|
||||
storageJSON, _ := json.Marshal(storageMap)
|
||||
|
||||
metadata := map[string]any{
|
||||
"type": PluginID,
|
||||
"session_token": token,
|
||||
}
|
||||
if content.Email != "" {
|
||||
metadata["email"] = content.Email
|
||||
}
|
||||
|
||||
attributes := map[string]string{
|
||||
"provider": PluginID,
|
||||
}
|
||||
|
||||
authData := AuthData{
|
||||
Provider: PluginID,
|
||||
ID: authID,
|
||||
FileName: req.FileName,
|
||||
Label: label,
|
||||
Disabled: false,
|
||||
StorageJSON: storageJSON,
|
||||
Metadata: metadata,
|
||||
Attributes: attributes,
|
||||
NextRefreshAfter: time.Now().Add(24 * time.Hour).UTC(),
|
||||
}
|
||||
|
||||
return AuthParseResponse{
|
||||
Handled: true,
|
||||
Auth: authData,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -60,107 +59,3 @@ func TestFormatSessionCookie(t *testing.T) {
|
||||
t.Errorf("FormatSessionCookie() from cookie = %q, want %q", gotCookie, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseAuth_ExplicitJSON(t *testing.T) {
|
||||
raw := []byte(`{
|
||||
"type": "commandcode",
|
||||
"session_token": "test-session-token-xyz",
|
||||
"email": "user@example.com",
|
||||
"label": "My Command Code Auth"
|
||||
}`)
|
||||
|
||||
resp, err := ParseAuth(AuthParseRequest{
|
||||
FileName: "custom.json",
|
||||
RawJSON: raw,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAuth error: %v", err)
|
||||
}
|
||||
if !resp.Handled {
|
||||
t.Fatal("expected Handled=true for explicit commandcode type")
|
||||
}
|
||||
|
||||
auth := resp.Auth
|
||||
if auth.Provider != PluginID {
|
||||
t.Errorf("Provider = %q, want %q", auth.Provider, PluginID)
|
||||
}
|
||||
if auth.ID != "custom" {
|
||||
t.Errorf("ID = %q, want %q", auth.ID, "custom")
|
||||
}
|
||||
if auth.Label != "My Command Code Auth" {
|
||||
t.Errorf("Label = %q, want %q", auth.Label, "My Command Code Auth")
|
||||
}
|
||||
|
||||
var storage map[string]any
|
||||
if err := json.Unmarshal(auth.StorageJSON, &storage); err != nil {
|
||||
t.Fatalf("failed to unmarshal StorageJSON: %v", err)
|
||||
}
|
||||
if storage["session_token"] != "test-session-token-xyz" {
|
||||
t.Errorf("StorageJSON session_token = %v, want test-session-token-xyz", storage["session_token"])
|
||||
}
|
||||
|
||||
if auth.Metadata["session_token"] != "test-session-token-xyz" {
|
||||
t.Errorf("Metadata session_token = %v, want test-session-token-xyz", auth.Metadata["session_token"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseAuth_FileNameMatch(t *testing.T) {
|
||||
raw := []byte(`{
|
||||
"token": "tok_987654"
|
||||
}`)
|
||||
|
||||
resp, err := ParseAuth(AuthParseRequest{
|
||||
FileName: "commandcode-work.json",
|
||||
RawJSON: raw,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAuth error: %v", err)
|
||||
}
|
||||
if !resp.Handled {
|
||||
t.Fatal("expected Handled=true for commandcode-*.json filename")
|
||||
}
|
||||
if resp.Auth.ID != "commandcode-work" {
|
||||
t.Errorf("ID = %q, want commandcode-work", resp.Auth.ID)
|
||||
}
|
||||
if resp.Auth.Metadata["session_token"] != "tok_987654" {
|
||||
t.Errorf("session_token = %v, want tok_987654", resp.Auth.Metadata["session_token"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseAuth_CookieFormat(t *testing.T) {
|
||||
raw := []byte(`{
|
||||
"cookie": "__Secure-commandcode_prod_.session_token=cookie_tok_456; Path=/"
|
||||
}`)
|
||||
|
||||
resp, err := ParseAuth(AuthParseRequest{
|
||||
FileName: "any.json",
|
||||
RawJSON: raw,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAuth error: %v", err)
|
||||
}
|
||||
if !resp.Handled {
|
||||
t.Fatal("expected Handled=true for cookie with __Secure-commandcode_prod_.session_token")
|
||||
}
|
||||
if resp.Auth.Metadata["session_token"] != "cookie_tok_456" {
|
||||
t.Errorf("session_token = %v, want cookie_tok_456", resp.Auth.Metadata["session_token"])
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseAuth_UnrelatedFile(t *testing.T) {
|
||||
raw := []byte(`{
|
||||
"type": "openai",
|
||||
"api_key": "sk-123456"
|
||||
}`)
|
||||
|
||||
resp, err := ParseAuth(AuthParseRequest{
|
||||
FileName: "openai-test.json",
|
||||
RawJSON: raw,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAuth error: %v", err)
|
||||
}
|
||||
if resp.Handled {
|
||||
t.Fatal("expected Handled=false for unrelated credential file")
|
||||
}
|
||||
}
|
||||
|
||||
+312
-4
@@ -3,6 +3,7 @@ package plugin
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -22,12 +23,32 @@ func RegisterManagement() (ManagementRegistrationResponse, error) {
|
||||
Path: "/plugins/commandcode/usage",
|
||||
Description: "Query Command Code credits and window limits usage with custom session_token",
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/plugins/commandcode/opencode/usage",
|
||||
Description: "Query OpenCode Go usage windows (rolling/weekly/monthly)",
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/plugins/commandcode/opencode/usage",
|
||||
Description: "Query OpenCode Go usage windows with custom opencode_api_key",
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/plugins/commandcode/all",
|
||||
Description: "Query both Command Code and OpenCode Go usage (aggregated, partial failures reported in errors map)",
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/plugins/commandcode/all",
|
||||
Description: "Query both providers with custom credentials in request body",
|
||||
},
|
||||
},
|
||||
Resources: []ResourceRoute{
|
||||
{
|
||||
Path: "/quota",
|
||||
Menu: "Command Code 配额",
|
||||
Description: "Command Code 用量与限额卡片",
|
||||
Menu: "用量配额",
|
||||
Description: "Command Code + OpenCode Go 用量与限额卡片",
|
||||
},
|
||||
},
|
||||
}, nil
|
||||
@@ -49,7 +70,42 @@ func HandleManagement(ctx context.Context, req ManagementRequest, cfg *PluginCon
|
||||
}, nil
|
||||
}
|
||||
|
||||
// 2. Serve Usage API (GET / POST)
|
||||
// 2. OpenCode Go usage API — MUST be matched before the generic /usage
|
||||
// suffix match below, otherwise "/plugins/commandcode/opencode/usage"
|
||||
// would be swallowed by the Command Code handler.
|
||||
if strings.HasSuffix(path, "/plugins/commandcode/opencode/usage") {
|
||||
switch method {
|
||||
case http.MethodGet, http.MethodPost:
|
||||
return handleOpenCodeUsage(ctx, req, cfg)
|
||||
default:
|
||||
return ManagementResponse{
|
||||
StatusCode: http.StatusMethodNotAllowed,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: []byte(`{"ok":false,"error":"method not allowed"}`),
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Aggregated usage API (both providers) — does not end with "/usage",
|
||||
// but registered before the generic match for clarity and future safety.
|
||||
if strings.HasSuffix(path, "/plugins/commandcode/all") {
|
||||
switch method {
|
||||
case http.MethodGet, http.MethodPost:
|
||||
return handleAllUsage(ctx, req, cfg)
|
||||
default:
|
||||
return ManagementResponse{
|
||||
StatusCode: http.StatusMethodNotAllowed,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: []byte(`{"ok":false,"error":"method not allowed"}`),
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Command Code usage API (GET / POST) — generic suffix match kept as-is.
|
||||
if strings.HasSuffix(path, "/plugins/commandcode/usage") || strings.HasSuffix(path, "/usage") {
|
||||
switch method {
|
||||
case http.MethodGet:
|
||||
@@ -182,7 +238,16 @@ func executeUsageQuery(ctx context.Context, apiBase, sessionToken, hostCallbackI
|
||||
}, nil
|
||||
}
|
||||
|
||||
usage, errParse := ParseAndFormatUsage(raw, time.Now().UTC())
|
||||
// Fetch billing-period (monthly) usage totals; non-fatal if unavailable.
|
||||
var summary *UpstreamUsageSummaryResponse
|
||||
if sumRaw, sumStatus, sumErr := FetchUsageSummaryRaw(ctx, apiBase, sessionToken, hostCallbackID); sumErr == nil && sumStatus == http.StatusOK {
|
||||
var parsed UpstreamUsageSummaryResponse
|
||||
if errSum := json.Unmarshal(sumRaw, &parsed); errSum == nil && parsed.TotalMonthlyCredits > 0 {
|
||||
summary = &parsed
|
||||
}
|
||||
}
|
||||
|
||||
usage, errParse := ParseAndFormatUsage(raw, summary, time.Now().UTC())
|
||||
if errParse != nil {
|
||||
resBytes, _ := json.Marshal(map[string]any{
|
||||
"ok": false,
|
||||
@@ -206,3 +271,246 @@ func executeUsageQuery(ctx context.Context, apiBase, sessionToken, hostCallbackI
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// handleOpenCodeUsage serves GET/POST /plugins/commandcode/opencode/usage.
|
||||
// Credentials can be overridden via POST body only (opencode_api_key / api_key);
|
||||
// GET queries are read-only against the plugin config — query parameter
|
||||
// overrides are intentionally not supported to keep secrets out of URLs.
|
||||
func handleOpenCodeUsage(ctx context.Context, req ManagementRequest, cfg *PluginConfig) (ManagementResponse, error) {
|
||||
apiKey := ""
|
||||
apiBase := ""
|
||||
|
||||
if strings.EqualFold(strings.ToUpper(strings.TrimSpace(req.Method)), http.MethodPost) && len(req.Body) > 0 {
|
||||
var body struct {
|
||||
OpenCodeAPIKey string `json:"opencode_api_key"`
|
||||
APIKey string `json:"api_key"`
|
||||
OpenCodeAPIBase string `json:"opencode_api_base"`
|
||||
}
|
||||
_ = json.Unmarshal(req.Body, &body)
|
||||
apiKey = body.OpenCodeAPIKey
|
||||
if apiKey == "" {
|
||||
apiKey = body.APIKey
|
||||
}
|
||||
apiBase = body.OpenCodeAPIBase
|
||||
}
|
||||
|
||||
// Fallback to plugin config
|
||||
if apiKey == "" && cfg != nil {
|
||||
apiKey = cfg.GetOpenCodeAPIKey()
|
||||
}
|
||||
if apiBase == "" && cfg != nil {
|
||||
apiBase = cfg.GetOpenCodeAPIBase()
|
||||
}
|
||||
|
||||
return handleOpenCodeUsageWithKey(ctx, apiBase, apiKey, req.HostCallbackID)
|
||||
}
|
||||
|
||||
// handleAllUsage serves GET/POST /plugins/commandcode/all: it queries both
|
||||
// providers sequentially (no goroutines — the host.http.do bridge's host-side
|
||||
// concurrency safety cannot be verified and shared maps would race under -race).
|
||||
// Partial failure: OK=true as long as at least one provider succeeds; failures
|
||||
// land in the Errors map and successful fields are omitted when absent.
|
||||
// HTTP status: any success → 200; all failed due to missing local credentials → 400;
|
||||
// all failed due to upstream errors → 502.
|
||||
func handleAllUsage(ctx context.Context, req ManagementRequest, cfg *PluginConfig) (ManagementResponse, error) {
|
||||
sessionToken := ""
|
||||
opencodeKey := ""
|
||||
|
||||
if strings.EqualFold(strings.ToUpper(strings.TrimSpace(req.Method)), http.MethodPost) && len(req.Body) > 0 {
|
||||
var body struct {
|
||||
SessionToken string `json:"session_token"`
|
||||
OpencodeAPIKey string `json:"opencode_api_key"`
|
||||
}
|
||||
_ = json.Unmarshal(req.Body, &body)
|
||||
sessionToken = body.SessionToken
|
||||
opencodeKey = body.OpencodeAPIKey
|
||||
}
|
||||
|
||||
// Fallback to plugin config
|
||||
if sessionToken == "" && cfg != nil {
|
||||
sessionToken = cfg.GetSessionToken()
|
||||
}
|
||||
if opencodeKey == "" && cfg != nil {
|
||||
opencodeKey = cfg.GetOpenCodeAPIKey()
|
||||
}
|
||||
apiBase := ""
|
||||
if cfg != nil {
|
||||
apiBase = cfg.GetAPIBase()
|
||||
}
|
||||
ocAPIBase := ""
|
||||
if cfg != nil {
|
||||
ocAPIBase = cfg.GetOpenCodeAPIBase()
|
||||
}
|
||||
|
||||
now := time.Now().UTC()
|
||||
resp := AllUsageResponse{OK: false, UpdatedAt: now.Format(time.RFC3339)}
|
||||
errs := make(map[string]string)
|
||||
localMissing := 0
|
||||
upstreamFailed := 0
|
||||
succeeded := 0
|
||||
|
||||
// Provider 1: Command Code (reuses executeUsageQuery).
|
||||
ccResp, _ := executeUsageQuery(ctx, apiBase, sessionToken, req.HostCallbackID)
|
||||
if ccResp.StatusCode == http.StatusOK {
|
||||
resp.CommandCode = ccResp.Body
|
||||
succeeded++
|
||||
} else {
|
||||
ccErr := extractErrorResponseMessage(ccResp.Body)
|
||||
errs["commandcode"] = ccErr
|
||||
if isLocalCredentialError(ccErr) {
|
||||
localMissing++
|
||||
} else {
|
||||
upstreamFailed++
|
||||
}
|
||||
}
|
||||
|
||||
// Provider 2: OpenCode Go (same classification via isLocalCredentialError,
|
||||
// not by HTTP 400 alone: upstream 4xx may be passed through and must not
|
||||
// be misclassified as a local configuration problem).
|
||||
if strings.TrimSpace(opencodeKey) != "" {
|
||||
ocResp, _ := handleOpenCodeUsageWithKey(ctx, ocAPIBase, opencodeKey, req.HostCallbackID)
|
||||
if ocResp.StatusCode == http.StatusOK {
|
||||
resp.OpenCode = ocResp.Body
|
||||
succeeded++
|
||||
} else {
|
||||
ocErr := extractErrorResponseMessage(ocResp.Body)
|
||||
errs["opencode"] = ocErr
|
||||
if isLocalCredentialError(ocErr) {
|
||||
localMissing++
|
||||
} else {
|
||||
upstreamFailed++
|
||||
}
|
||||
}
|
||||
} else {
|
||||
errs["opencode"] = "missing opencode_api_key: configure opencode_api_key in plugin config or pass it in the request body"
|
||||
localMissing++
|
||||
}
|
||||
|
||||
if len(errs) > 0 {
|
||||
resp.Errors = errs
|
||||
}
|
||||
resp.OK = succeeded > 0
|
||||
|
||||
statusCode := http.StatusOK
|
||||
if !resp.OK {
|
||||
if upstreamFailed == 0 && localMissing == len(errs) {
|
||||
statusCode = http.StatusBadRequest
|
||||
} else {
|
||||
statusCode = http.StatusBadGateway
|
||||
}
|
||||
}
|
||||
|
||||
resBytes, _ := json.Marshal(resp)
|
||||
return ManagementResponse{
|
||||
StatusCode: statusCode,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// isLocalCredentialError reports whether an /all provider error is a local
|
||||
// configuration problem (missing credential in plugin config), as opposed to
|
||||
// an upstream failure. Local-credential errors carry fixed message prefixes;
|
||||
// upstream 4xx/5xx never match them, so the /all 400-vs-502 classification
|
||||
// does not rely on the HTTP status alone.
|
||||
func isLocalCredentialError(msg string) bool {
|
||||
for _, prefix := range []string{
|
||||
"session_token is required",
|
||||
"opencode_api_key is required",
|
||||
} {
|
||||
if strings.HasPrefix(msg, prefix) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// handleOpenCodeUsageWithKey runs the OpenCode usage query with an explicit
|
||||
// credential, shared by handleOpenCodeUsage and handleAllUsage.
|
||||
func handleOpenCodeUsageWithKey(ctx context.Context, apiBase, apiKey, hostCallbackID string) (ManagementResponse, error) {
|
||||
if strings.TrimSpace(apiKey) == "" {
|
||||
resBytes, _ := json.Marshal(map[string]any{
|
||||
"ok": false,
|
||||
"error": "opencode_api_key is required. Configure opencode_api_key in plugin config or pass it in the request body",
|
||||
})
|
||||
return ManagementResponse{
|
||||
StatusCode: http.StatusBadRequest,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
raw, statusCode, errFetch := FetchOpenCodeUsageRaw(ctx, apiBase, apiKey, hostCallbackID)
|
||||
if errFetch != nil {
|
||||
errMsg := fmt.Sprintf("opencode upstream request failed: %s", errFetch.Error())
|
||||
resBytes, _ := json.Marshal(map[string]any{
|
||||
"ok": false,
|
||||
"status_code": statusCode,
|
||||
"error": errMsg,
|
||||
})
|
||||
if statusCode == 0 || statusCode == http.StatusOK {
|
||||
statusCode = http.StatusBadGateway
|
||||
}
|
||||
return ManagementResponse{
|
||||
StatusCode: statusCode,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
if statusCode != http.StatusOK {
|
||||
resBytes, _ := json.Marshal(map[string]any{
|
||||
"ok": false,
|
||||
"status_code": statusCode,
|
||||
"error": fmt.Sprintf("opencode upstream returned %d: check opencode_api_key", statusCode),
|
||||
})
|
||||
return ManagementResponse{
|
||||
StatusCode: statusCode,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
usage, errParse := ParseOpenCodeUsage(raw, time.Now().UTC())
|
||||
if errParse != nil {
|
||||
resBytes, _ := json.Marshal(map[string]any{
|
||||
"ok": false,
|
||||
"error": "failed to parse opencode upstream usage: " + errParse.Error(),
|
||||
})
|
||||
return ManagementResponse{
|
||||
StatusCode: http.StatusBadGateway,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
resBytes, _ := json.Marshal(usage)
|
||||
return ManagementResponse{
|
||||
StatusCode: http.StatusOK,
|
||||
Headers: map[string][]string{
|
||||
"Content-Type": {"application/json"},
|
||||
},
|
||||
Body: resBytes,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// extractErrorResponseMessage pulls the "error" field out of a JSON error body.
|
||||
func extractErrorResponseMessage(body []byte) string {
|
||||
var parsed struct {
|
||||
Error string `json:"error"`
|
||||
}
|
||||
if err := json.Unmarshal(body, &parsed); err == nil && parsed.Error != "" {
|
||||
return parsed.Error
|
||||
}
|
||||
return "unknown error"
|
||||
}
|
||||
|
||||
+319
-5
@@ -7,6 +7,7 @@ import (
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestRegisterManagement(t *testing.T) {
|
||||
@@ -15,8 +16,8 @@ func TestRegisterManagement(t *testing.T) {
|
||||
t.Fatalf("RegisterManagement error: %v", err)
|
||||
}
|
||||
|
||||
if len(resp.Routes) != 2 {
|
||||
t.Fatalf("len(Routes) = %d, want 2", len(resp.Routes))
|
||||
if len(resp.Routes) != 6 {
|
||||
t.Fatalf("len(Routes) = %d, want 6", len(resp.Routes))
|
||||
}
|
||||
if resp.Routes[0].Method != http.MethodGet || resp.Routes[0].Path != "/plugins/commandcode/usage" {
|
||||
t.Errorf("Route 0 mismatch: %+v", resp.Routes[0])
|
||||
@@ -24,13 +25,27 @@ func TestRegisterManagement(t *testing.T) {
|
||||
if resp.Routes[1].Method != http.MethodPost || resp.Routes[1].Path != "/plugins/commandcode/usage" {
|
||||
t.Errorf("Route 1 mismatch: %+v", resp.Routes[1])
|
||||
}
|
||||
wantOpencode := []struct{ method, path string }{
|
||||
{http.MethodGet, "/plugins/commandcode/opencode/usage"},
|
||||
{http.MethodPost, "/plugins/commandcode/opencode/usage"},
|
||||
{http.MethodGet, "/plugins/commandcode/all"},
|
||||
{http.MethodPost, "/plugins/commandcode/all"},
|
||||
}
|
||||
for i, w := range wantOpencode {
|
||||
if resp.Routes[2+i].Method != w.method || resp.Routes[2+i].Path != w.path {
|
||||
t.Errorf("Route %d mismatch: got %+v, want %s %s", 2+i, resp.Routes[2+i], w.method, w.path)
|
||||
}
|
||||
}
|
||||
|
||||
if len(resp.Resources) != 1 {
|
||||
t.Fatalf("len(Resources) = %d, want 1", len(resp.Resources))
|
||||
}
|
||||
if resp.Resources[0].Path != "/quota" || resp.Resources[0].Menu != "Command Code 配额" {
|
||||
if resp.Resources[0].Path != "/quota" || resp.Resources[0].Menu != "用量配额" {
|
||||
t.Errorf("Resource 0 mismatch: %+v", resp.Resources[0])
|
||||
}
|
||||
if resp.Resources[0].Description != "Command Code + OpenCode Go 用量与限额卡片" {
|
||||
t.Errorf("Resource Description mismatch: %+v", resp.Resources[0])
|
||||
}
|
||||
}
|
||||
|
||||
func TestHandleManagement_QuotaResource(t *testing.T) {
|
||||
@@ -56,8 +71,8 @@ func TestHandleManagement_QuotaResource(t *testing.T) {
|
||||
t.Errorf("Content-Type = %v, want text/html", ct)
|
||||
}
|
||||
bodyStr := string(resp.Body)
|
||||
if !strings.Contains(bodyStr, "Command Code 配额") {
|
||||
t.Errorf("Body does not contain expected title")
|
||||
if !strings.Contains(bodyStr, "用量配额") {
|
||||
t.Errorf("Body does not contain expected menu text 用量配额")
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -150,3 +165,302 @@ func TestHandleManagement_PostUsage(t *testing.T) {
|
||||
t.Errorf("MonthlyCredits = %v, want 666", usage.Credits.MonthlyCredits)
|
||||
}
|
||||
}
|
||||
|
||||
const mockOpencodeUsageJSON = `{"usage":{
|
||||
"rolling": {"status":"ok","percent":4, "resetsAt":"2026-09-17T06:58:53.171Z"},
|
||||
"weekly": {"status":"ok","percent":46,"resetsAt":"2026-09-21T00:00:00.000Z"},
|
||||
"monthly": {"status":"ok","percent":23,"resetsAt":"2026-10-14T09:13:49.000Z"}
|
||||
}}`
|
||||
|
||||
// Verifies that /plugins/commandcode/opencode/usage is matched by the dedicated
|
||||
// OpenCode handler and NOT swallowed by the generic "/usage" suffix match
|
||||
// (which would route it to the Command Code handler).
|
||||
func TestHandleManagement_OpencodeUsageRoute(t *testing.T) {
|
||||
var sawAuthHeader bool
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/usage" {
|
||||
t.Errorf("unexpected path %s, want /usage (Command Code handler must not be hit)", r.URL.Path)
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if got := r.Header.Get("Authorization"); got != "Bearer sk-opencode-override" {
|
||||
t.Errorf("Authorization = %q, want Bearer sk-opencode-override", got)
|
||||
}
|
||||
if r.Header.Get("Cookie") != "" {
|
||||
t.Errorf("unexpected Cookie header on opencode request: %q", r.Header.Get("Cookie"))
|
||||
}
|
||||
sawAuthHeader = true
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_, _ = w.Write([]byte(mockOpencodeUsageJSON))
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
reqBody, _ := json.Marshal(map[string]string{
|
||||
"opencode_api_key": "sk-opencode-override",
|
||||
"opencode_api_base": ts.URL,
|
||||
})
|
||||
|
||||
for _, tc := range []struct {
|
||||
method string
|
||||
body []byte
|
||||
}{
|
||||
{http.MethodPost, reqBody},
|
||||
// GET with configured plugin config (no query override by design).
|
||||
} {
|
||||
t.Run(tc.method, func(t *testing.T) {
|
||||
cfg := &PluginConfig{
|
||||
OpenCodeAPIKey: "sk-configured",
|
||||
OpenCodeAPIBase: ts.URL,
|
||||
}
|
||||
req := ManagementRequest{
|
||||
Method: tc.method,
|
||||
Path: "/v0/management/plugins/commandcode/opencode/usage",
|
||||
Body: tc.body,
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, cfg)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Fatalf("StatusCode = %d, want 200, body=%s", resp.StatusCode, string(resp.Body))
|
||||
}
|
||||
var usage OpenCodeFormattedUsageResponse
|
||||
if err := json.Unmarshal(resp.Body, &usage); err != nil {
|
||||
t.Fatalf("unmarshal body error: %v", err)
|
||||
}
|
||||
if !usage.OK || usage.Provider != "opencode_go" {
|
||||
t.Fatalf("unexpected response: ok=%v provider=%q", usage.OK, usage.Provider)
|
||||
}
|
||||
if usage.Windows.Rolling.Percent != 4 || usage.Windows.Weekly.Percent != 46 || usage.Windows.Monthly.Percent != 23 {
|
||||
t.Errorf("windows percents = %v/%v/%v, want 4/46/23",
|
||||
usage.Windows.Rolling.Percent, usage.Windows.Weekly.Percent, usage.Windows.Monthly.Percent)
|
||||
}
|
||||
if usage.Windows.Weekly.ResetInSeconds <= 0 {
|
||||
t.Errorf("weekly reset_in_seconds = %d, want > 0", usage.Windows.Weekly.ResetInSeconds)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
if !sawAuthHeader {
|
||||
t.Fatal("upstream never received Authorization header")
|
||||
}
|
||||
}
|
||||
|
||||
// Regression: /plugins/commandcode/all must not be swallowed by the generic
|
||||
// "/usage" suffix match nor miss its dedicated handler.
|
||||
func TestHandleManagement_AllRoute_BothProvidersOK(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch {
|
||||
case r.URL.Path == "/usage" && r.Header.Get("Authorization") != "":
|
||||
_, _ = w.Write([]byte(mockOpencodeUsageJSON))
|
||||
case r.URL.Path == "/internal/billing/credits":
|
||||
_, _ = w.Write([]byte(`{"credits":{"monthlyCredits":888},"windowLimits":{"fiveHour":{"used":2,"cap":20}}}`))
|
||||
case r.URL.Path == "/internal/usage/summary":
|
||||
_, _ = w.Write([]byte(`{"totalMonthlyCredits": 100}`))
|
||||
default:
|
||||
t.Errorf("unexpected upstream request: %s %s", r.Method, r.URL.Path)
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
cfg := &PluginConfig{
|
||||
SessionToken: "configured-token",
|
||||
APIBase: ts.URL,
|
||||
OpenCodeAPIKey: "sk-configured",
|
||||
OpenCodeAPIBase: ts.URL,
|
||||
}
|
||||
|
||||
req := ManagementRequest{
|
||||
Method: http.MethodGet,
|
||||
Path: "/v0/management/plugins/commandcode/all",
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, cfg)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Fatalf("StatusCode = %d, want 200, body=%s", resp.StatusCode, string(resp.Body))
|
||||
}
|
||||
|
||||
var all AllUsageResponse
|
||||
if err := json.Unmarshal(resp.Body, &all); err != nil {
|
||||
t.Fatalf("unmarshal body error: %v", err)
|
||||
}
|
||||
if !all.OK {
|
||||
t.Fatal("expected ok=true when both providers succeed")
|
||||
}
|
||||
if len(all.CommandCode) == 0 || len(all.OpenCode) == 0 {
|
||||
t.Fatalf("expected both provider payloads, got commandcode=%d bytes opencode=%d bytes",
|
||||
len(all.CommandCode), len(all.OpenCode))
|
||||
}
|
||||
if len(all.Errors) != 0 {
|
||||
t.Errorf("expected empty errors map, got %v", all.Errors)
|
||||
}
|
||||
|
||||
var ccUsage FormattedUsageResponse
|
||||
if err := json.Unmarshal(all.CommandCode, &ccUsage); err != nil || !ccUsage.OK {
|
||||
t.Errorf("commandcode payload invalid: err=%v usage=%+v", err, ccUsage)
|
||||
}
|
||||
var ocUsage OpenCodeFormattedUsageResponse
|
||||
if err := json.Unmarshal(all.OpenCode, &ocUsage); err != nil || !ocUsage.OK {
|
||||
t.Errorf("opencode payload invalid: err=%v usage=%+v", err, ocUsage)
|
||||
}
|
||||
}
|
||||
|
||||
// Partial failure: one provider fails upstream → ok stays true, the failed
|
||||
// provider's field is omitted and the error lands in the errors map.
|
||||
func TestHandleManagement_AllUsage_PartialFailure(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch {
|
||||
case r.URL.Path == "/usage" && r.Header.Get("Authorization") != "":
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
_, _ = w.Write([]byte(`{"error":"upstream exploded"}`))
|
||||
case r.URL.Path == "/internal/billing/credits":
|
||||
_, _ = w.Write([]byte(`{"credits":{"monthlyCredits":888},"windowLimits":{"fiveHour":{"used":2,"cap":20}}}`))
|
||||
case r.URL.Path == "/internal/usage/summary":
|
||||
_, _ = w.Write([]byte(`{"totalMonthlyCredits": 100}`))
|
||||
default:
|
||||
t.Errorf("unexpected upstream request: %s %s", r.Method, r.URL.Path)
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
cfg := &PluginConfig{
|
||||
SessionToken: "configured-token",
|
||||
APIBase: ts.URL,
|
||||
OpenCodeAPIKey: "sk-configured",
|
||||
OpenCodeAPIBase: ts.URL,
|
||||
}
|
||||
|
||||
req := ManagementRequest{
|
||||
Method: http.MethodPost,
|
||||
Path: "/plugins/commandcode/all",
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, cfg)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
t.Fatalf("StatusCode = %d, want 200 (partial failure), body=%s", resp.StatusCode, string(resp.Body))
|
||||
}
|
||||
|
||||
var all AllUsageResponse
|
||||
if err := json.Unmarshal(resp.Body, &all); err != nil {
|
||||
t.Fatalf("unmarshal body error: %v", err)
|
||||
}
|
||||
if !all.OK {
|
||||
t.Error("expected ok=true despite one provider failing")
|
||||
}
|
||||
if len(all.CommandCode) == 0 {
|
||||
t.Error("expected successful commandcode payload to be present")
|
||||
}
|
||||
if _, present := all.Errors["opencode"]; !present {
|
||||
t.Errorf("expected errors[opencode] to be set, got %v", all.Errors)
|
||||
}
|
||||
if !strings.Contains(all.Errors["opencode"], "opencode upstream returned 500") {
|
||||
t.Errorf("errors[opencode] = %q, want it to mention 'opencode upstream returned 500'", all.Errors["opencode"])
|
||||
}
|
||||
// opencode field must be omitted (omitempty), not serialized as "null".
|
||||
if strings.Contains(string(resp.Body), `"opencode":null`) {
|
||||
t.Errorf("opencode field serialized as null: %s", string(resp.Body))
|
||||
}
|
||||
}
|
||||
|
||||
// All providers fail because credentials are missing → 400.
|
||||
func TestHandleManagement_AllUsage_AllMissingConfig(t *testing.T) {
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
|
||||
req := ManagementRequest{
|
||||
Method: http.MethodGet,
|
||||
Path: "/v0/management/plugins/commandcode/all",
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusBadRequest {
|
||||
t.Fatalf("StatusCode = %d, want 400, body=%s", resp.StatusCode, string(resp.Body))
|
||||
}
|
||||
|
||||
var all AllUsageResponse
|
||||
if err := json.Unmarshal(resp.Body, &all); err != nil {
|
||||
t.Fatalf("unmarshal body error: %v", err)
|
||||
}
|
||||
if all.OK {
|
||||
t.Error("expected ok=false")
|
||||
}
|
||||
if _, present := all.Errors["commandcode"]; !present {
|
||||
t.Errorf("expected errors[commandcode], got %v", all.Errors)
|
||||
}
|
||||
if _, present := all.Errors["opencode"]; !present {
|
||||
t.Errorf("expected errors[opencode], got %v", all.Errors)
|
||||
}
|
||||
}
|
||||
|
||||
// Regression for the acceptance review finding: an upstream 400 passed
|
||||
// through by executeUsageQuery must NOT be classified as a local
|
||||
// configuration problem — all-upstream-failure must yield 502, not 400.
|
||||
func TestHandleManagement_AllUsage_Upstream400NotMisclassified(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
_, _ = w.Write([]byte(`{"error":"bad request from upstream"}`))
|
||||
}))
|
||||
defer ts.Close()
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
|
||||
cfgYAML := []byte("session_token: testtoken\napi_base: " + ts.URL + "\nopencode_api_key: sk-test\nopencode_api_base: " + ts.URL + "\n")
|
||||
cfg := NewPlugin()
|
||||
if err := cfg.config.UpdateFromYAML(cfgYAML); err != nil {
|
||||
t.Fatalf("UpdateFromYAML: %v", err)
|
||||
}
|
||||
|
||||
req := ManagementRequest{
|
||||
Method: http.MethodGet,
|
||||
Path: "/v0/management/plugins/commandcode/all",
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, cfg.config)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusBadGateway {
|
||||
t.Fatalf("StatusCode = %d, want 502 (upstream 400 must not be misread as local missing config), body=%s", resp.StatusCode, string(resp.Body))
|
||||
}
|
||||
}
|
||||
|
||||
// Unknown path after the new routes still 404s.
|
||||
func TestHandleManagement_UnknownPath(t *testing.T) {
|
||||
req := ManagementRequest{
|
||||
Method: http.MethodGet,
|
||||
Path: "/v0/management/plugins/commandcode/nonsense",
|
||||
}
|
||||
resp, err := HandleManagement(context.Background(), req, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("HandleManagement error: %v", err)
|
||||
}
|
||||
if resp.StatusCode != http.StatusNotFound {
|
||||
t.Fatalf("StatusCode = %d, want 404", resp.StatusCode)
|
||||
}
|
||||
}
|
||||
|
||||
+41
-75
@@ -6,7 +6,6 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
@@ -14,7 +13,7 @@ import (
|
||||
const (
|
||||
PluginID = "commandcode"
|
||||
PluginName = "commandcode"
|
||||
PluginVersion = "0.1.0"
|
||||
PluginVersion = "0.3.0"
|
||||
PluginAuthor = "zgs225"
|
||||
PluginRepo = "https://github.com/zgs225/cliproxy-plugin-commandcode"
|
||||
PluginLogo = "https://raw.githubusercontent.com/zgs225/cliproxy-plugin-commandcode/main/assets/logo.svg"
|
||||
@@ -26,6 +25,8 @@ type PluginConfig struct {
|
||||
mu sync.RWMutex
|
||||
SessionToken string `yaml:"session_token" json:"session_token"`
|
||||
APIBase string `yaml:"api_base" json:"api_base"`
|
||||
OpenCodeAPIKey string `yaml:"opencode_api_key" json:"opencode_api_key"`
|
||||
OpenCodeAPIBase string `yaml:"opencode_api_base" json:"opencode_api_base"`
|
||||
}
|
||||
|
||||
// UpdateFromYAML updates the configuration from raw YAML bytes.
|
||||
@@ -36,6 +37,8 @@ func (c *PluginConfig) UpdateFromYAML(raw []byte) error {
|
||||
var tmp struct {
|
||||
SessionToken string `yaml:"session_token"`
|
||||
APIBase string `yaml:"api_base"`
|
||||
OpenCodeAPIKey string `yaml:"opencode_api_key"`
|
||||
OpenCodeAPIBase string `yaml:"opencode_api_base"`
|
||||
}
|
||||
if err := yaml.Unmarshal(raw, &tmp); err != nil {
|
||||
return fmt.Errorf("unmarshal config_yaml: %w", err)
|
||||
@@ -50,6 +53,14 @@ func (c *PluginConfig) UpdateFromYAML(raw []byte) error {
|
||||
if tmp.APIBase != "" {
|
||||
c.APIBase = strings.TrimRight(tmp.APIBase, "/")
|
||||
}
|
||||
if tmp.OpenCodeAPIKey != "" {
|
||||
// OpenCode API key is a plain Bearer token; do not run it through
|
||||
// ExtractSessionToken (that is Command Code cookie specific).
|
||||
c.OpenCodeAPIKey = strings.TrimSpace(tmp.OpenCodeAPIKey)
|
||||
}
|
||||
if tmp.OpenCodeAPIBase != "" {
|
||||
c.OpenCodeAPIBase = strings.TrimRight(tmp.OpenCodeAPIBase, "/")
|
||||
}
|
||||
if c.APIBase == "" {
|
||||
c.APIBase = DefaultAPIBase
|
||||
}
|
||||
@@ -80,6 +91,24 @@ func (c *PluginConfig) GetAPIBase() string {
|
||||
return c.APIBase
|
||||
}
|
||||
|
||||
// GetOpenCodeAPIKey safely returns the OpenCode Go API key.
|
||||
func (c *PluginConfig) GetOpenCodeAPIKey() string {
|
||||
c.mu.RLock()
|
||||
defer c.mu.RUnlock()
|
||||
return c.OpenCodeAPIKey
|
||||
}
|
||||
|
||||
// GetOpenCodeAPIBase safely returns the OpenCode Go API base URL,
|
||||
// falling back to DefaultOpenCodeAPIBase when unset.
|
||||
func (c *PluginConfig) GetOpenCodeAPIBase() string {
|
||||
c.mu.RLock()
|
||||
defer c.mu.RUnlock()
|
||||
if c.OpenCodeAPIBase == "" {
|
||||
return DefaultOpenCodeAPIBase
|
||||
}
|
||||
return c.OpenCodeAPIBase
|
||||
}
|
||||
|
||||
// Plugin encapsulates the Command Code plugin instance.
|
||||
type Plugin struct {
|
||||
config *PluginConfig
|
||||
@@ -113,17 +142,6 @@ func (p *Plugin) HandleMethod(method string, requestBytes []byte) ([]byte, error
|
||||
case "plugin.quiesce", "plugin.shutdown":
|
||||
return OkEnvelope(map[string]any{"shutdown": true})
|
||||
|
||||
case "auth.identifier":
|
||||
return OkEnvelope(IdentifierResponse{Identifier: PluginID})
|
||||
case "auth.parse":
|
||||
return p.handleAuthParse(requestBytes)
|
||||
case "auth.login.start":
|
||||
return p.handleAuthLoginStart()
|
||||
case "auth.login.poll":
|
||||
return p.handleAuthLoginPoll()
|
||||
case "auth.refresh":
|
||||
return p.handleAuthRefresh(requestBytes)
|
||||
|
||||
case "management.register":
|
||||
return p.handleManagementRegister()
|
||||
case "management.handle":
|
||||
@@ -160,10 +178,19 @@ func (p *Plugin) handleRegister(raw []byte) ([]byte, error) {
|
||||
Type: "string",
|
||||
Description: "Command Code API base URL (default: https://api.commandcode.ai)",
|
||||
},
|
||||
{
|
||||
Name: "opencode_api_key",
|
||||
Type: "string",
|
||||
Description: "OpenCode Go API key (Bearer token used for https://opencode.ai/zen/go/v1/usage)",
|
||||
},
|
||||
{
|
||||
Name: "opencode_api_base",
|
||||
Type: "string",
|
||||
Description: "OpenCode Go API base URL (default: https://opencode.ai/zen/go/v1)",
|
||||
},
|
||||
},
|
||||
},
|
||||
Capabilities: RegistrationCapability{
|
||||
AuthProvider: true,
|
||||
ManagementAPI: true,
|
||||
},
|
||||
})
|
||||
@@ -179,67 +206,6 @@ func (p *Plugin) handleReconfigure(raw []byte) ([]byte, error) {
|
||||
return p.handleRegister(raw)
|
||||
}
|
||||
|
||||
func (p *Plugin) handleAuthParse(raw []byte) ([]byte, error) {
|
||||
var req AuthParseRequest
|
||||
if len(raw) > 0 {
|
||||
if err := json.Unmarshal(raw, &req); err != nil {
|
||||
return ErrorEnvelope("invalid_request", "failed to parse AuthParseRequest: "+err.Error()), nil
|
||||
}
|
||||
}
|
||||
|
||||
resp, err := ParseAuth(req)
|
||||
if err != nil {
|
||||
return ErrorEnvelope("auth_parse_error", err.Error()), nil
|
||||
}
|
||||
|
||||
// Cache token in config if config doesn't have one yet
|
||||
if resp.Handled && resp.Auth.Metadata != nil {
|
||||
if tok, ok := resp.Auth.Metadata["session_token"].(string); ok && tok != "" {
|
||||
if p.config.GetSessionToken() == "" {
|
||||
p.config.SetSessionToken(tok)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return OkEnvelope(resp)
|
||||
}
|
||||
|
||||
func (p *Plugin) handleAuthLoginStart() ([]byte, error) {
|
||||
return OkEnvelope(map[string]any{
|
||||
"Provider": PluginID,
|
||||
"URL": "https://commandcode.ai",
|
||||
"State": "manual",
|
||||
"ExpiresAt": time.Now().Add(5 * time.Minute).UTC(),
|
||||
})
|
||||
}
|
||||
|
||||
func (p *Plugin) handleAuthLoginPoll() ([]byte, error) {
|
||||
return OkEnvelope(map[string]any{
|
||||
"Status": "error",
|
||||
"Message": "Command Code interactive login is not supported; please configure session_token or provide a commandcode-*.json credential file",
|
||||
})
|
||||
}
|
||||
|
||||
func (p *Plugin) handleAuthRefresh(raw []byte) ([]byte, error) {
|
||||
var req AuthRefreshRequest
|
||||
if len(raw) > 0 {
|
||||
_ = json.Unmarshal(raw, &req)
|
||||
}
|
||||
|
||||
authData := AuthData{
|
||||
Provider: PluginID,
|
||||
ID: req.AuthID,
|
||||
StorageJSON: req.StorageJSON,
|
||||
Metadata: req.Metadata,
|
||||
Attributes: req.Attributes,
|
||||
NextRefreshAfter: time.Now().Add(24 * time.Hour).UTC(),
|
||||
}
|
||||
return OkEnvelope(AuthRefreshResponse{
|
||||
Auth: authData,
|
||||
NextRefreshAfter: authData.NextRefreshAfter,
|
||||
})
|
||||
}
|
||||
|
||||
func (p *Plugin) handleManagementRegister() ([]byte, error) {
|
||||
resp, err := RegisterManagement()
|
||||
if err != nil {
|
||||
|
||||
+48
-15
@@ -39,23 +39,23 @@ api_base: "https://custom-api.commandcode.ai"
|
||||
if reg.Metadata.Version != PluginVersion {
|
||||
t.Errorf("Metadata.Version = %q, want %q", reg.Metadata.Version, PluginVersion)
|
||||
}
|
||||
if !reg.Capabilities.AuthProvider {
|
||||
t.Errorf("Capabilities.AuthProvider = false, want true")
|
||||
if reg.Capabilities.AuthProvider {
|
||||
t.Errorf("Capabilities.AuthProvider = true, want false")
|
||||
}
|
||||
if !reg.Capabilities.ManagementAPI {
|
||||
t.Errorf("Capabilities.ManagementAPI = false, want true")
|
||||
}
|
||||
|
||||
// Verify config fields
|
||||
if len(reg.Metadata.ConfigFields) != 2 {
|
||||
t.Fatalf("ConfigFields len = %d, want 2", len(reg.Metadata.ConfigFields))
|
||||
if len(reg.Metadata.ConfigFields) != 4 {
|
||||
t.Fatalf("ConfigFields len = %d, want 4", len(reg.Metadata.ConfigFields))
|
||||
}
|
||||
fieldNames := map[string]bool{}
|
||||
for _, f := range reg.Metadata.ConfigFields {
|
||||
fieldNames[f.Name] = true
|
||||
}
|
||||
if !fieldNames["session_token"] || !fieldNames["api_base"] {
|
||||
t.Errorf("ConfigFields missing session_token or api_base: %+v", reg.Metadata.ConfigFields)
|
||||
if !fieldNames["session_token"] || !fieldNames["api_base"] || !fieldNames["opencode_api_key"] || !fieldNames["opencode_api_base"] {
|
||||
t.Errorf("ConfigFields missing expected fields: %+v", reg.Metadata.ConfigFields)
|
||||
}
|
||||
|
||||
// Verify config parsed
|
||||
@@ -65,7 +65,6 @@ api_base: "https://custom-api.commandcode.ai"
|
||||
if p.config.GetAPIBase() != "https://custom-api.commandcode.ai" {
|
||||
t.Errorf("APIBase = %q, want https://custom-api.commandcode.ai", p.config.GetAPIBase())
|
||||
}
|
||||
|
||||
// Test plugin.reconfigure
|
||||
reconfYAML := []byte(`
|
||||
session_token: "new-token-abc"
|
||||
@@ -84,7 +83,7 @@ session_token: "new-token-abc"
|
||||
}
|
||||
}
|
||||
|
||||
func TestPluginAuthIdentifier(t *testing.T) {
|
||||
func TestPluginAuthIdentifier_NotHandled(t *testing.T) {
|
||||
p := NewPlugin()
|
||||
raw, err := p.HandleMethod("auth.identifier", nil)
|
||||
if err != nil {
|
||||
@@ -92,16 +91,14 @@ func TestPluginAuthIdentifier(t *testing.T) {
|
||||
}
|
||||
|
||||
var env Envelope
|
||||
if err := json.Unmarshal(raw, &env); err != nil || !env.OK {
|
||||
if err := json.Unmarshal(raw, &env); err != nil {
|
||||
t.Fatalf("envelope error: %+v", env)
|
||||
}
|
||||
|
||||
var idResp IdentifierResponse
|
||||
if err := json.Unmarshal(env.Result, &idResp); err != nil {
|
||||
t.Fatalf("unmarshal idResp error: %v", err)
|
||||
if env.OK {
|
||||
t.Fatal("expected env.OK=false for auth.identifier")
|
||||
}
|
||||
if idResp.Identifier != PluginID {
|
||||
t.Errorf("Identifier = %q, want %q", idResp.Identifier, PluginID)
|
||||
if env.Error == nil || env.Error.Code != "unknown_method" {
|
||||
t.Errorf("Error = %+v, want code=unknown_method", env.Error)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,3 +134,39 @@ func TestEnvelopeError(t *testing.T) {
|
||||
t.Errorf("env.Error = %+v", env.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPluginConfig_OpenCode(t *testing.T) {
|
||||
p := NewPlugin()
|
||||
configYAML := []byte("opencode_api_key: \" sk-opencode-123 \"\nopencode_api_base: \"https://custom.oc.example/v1/\"\n")
|
||||
lifecycleReq, _ := json.Marshal(LifecycleRequest{ConfigYAML: configYAML})
|
||||
|
||||
if _, err := p.HandleMethod("plugin.register", lifecycleReq); err != nil {
|
||||
t.Fatalf("handleMethod(plugin.register) error: %v", err)
|
||||
}
|
||||
|
||||
if got := p.config.GetOpenCodeAPIKey(); got != "sk-opencode-123" {
|
||||
t.Errorf("OpenCodeAPIKey = %q, want sk-opencode-123", got)
|
||||
}
|
||||
if got := p.config.GetOpenCodeAPIBase(); got != "https://custom.oc.example/v1" {
|
||||
t.Errorf("OpenCodeAPIBase = %q, want https://custom.oc.example/v1 (trailing slash trimmed)", got)
|
||||
}
|
||||
|
||||
// A Command Code cookie string must NOT be run through ExtractSessionToken.
|
||||
cookieLike := []byte("opencode_api_key: \"sk-raw-bearer-value\"\n")
|
||||
req2, _ := json.Marshal(LifecycleRequest{ConfigYAML: cookieLike})
|
||||
if _, err := p.HandleMethod("plugin.reconfigure", req2); err != nil {
|
||||
t.Fatalf("handleMethod(plugin.reconfigure) error: %v", err)
|
||||
}
|
||||
if got := p.config.GetOpenCodeAPIKey(); got != "sk-raw-bearer-value" {
|
||||
t.Errorf("OpenCodeAPIKey = %q, want sk-raw-bearer-value (raw, no cookie extraction)", got)
|
||||
}
|
||||
|
||||
// Empty config falls back to the default base.
|
||||
empty := NewPlugin()
|
||||
if got := empty.config.GetOpenCodeAPIBase(); got != DefaultOpenCodeAPIBase {
|
||||
t.Errorf("default OpenCodeAPIBase = %q, want %q", got, DefaultOpenCodeAPIBase)
|
||||
}
|
||||
if got := empty.config.GetOpenCodeAPIKey(); got != "" {
|
||||
t.Errorf("default OpenCodeAPIKey = %q, want empty", got)
|
||||
}
|
||||
}
|
||||
|
||||
+883
-52
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,79 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// ThemeStorageState represents the zustand-persisted theme state from CLIProxyAPI Management Center.
|
||||
type ThemeStorageState struct {
|
||||
State struct {
|
||||
Theme string `json:"theme"`
|
||||
ResolvedTheme string `json:"resolvedTheme"`
|
||||
} `json:"state"`
|
||||
Version int `json:"version"`
|
||||
}
|
||||
|
||||
// ResolveThemeFromStorage extracts theme configuration from the 'cli-proxy-theme' localStorage JSON.
|
||||
// Returns the user-selected theme setting ("auto", "white", "light", "dark") and the resolved theme ("dark" or "light"/"white").
|
||||
func ResolveThemeFromStorage(storageJSON string) (theme string, resolved string) {
|
||||
theme = "auto"
|
||||
resolved = "light"
|
||||
|
||||
s := strings.TrimSpace(storageJSON)
|
||||
if s == "" {
|
||||
return theme, resolved
|
||||
}
|
||||
|
||||
// 1. Try zustand persist format
|
||||
var zustandState ThemeStorageState
|
||||
if err := json.Unmarshal([]byte(s), &zustandState); err == nil && (zustandState.State.Theme != "" || zustandState.State.ResolvedTheme != "") {
|
||||
if zustandState.State.Theme != "" {
|
||||
theme = zustandState.State.Theme
|
||||
}
|
||||
if zustandState.State.ResolvedTheme != "" {
|
||||
resolved = zustandState.State.ResolvedTheme
|
||||
} else {
|
||||
switch theme {
|
||||
case "dark":
|
||||
resolved = "dark"
|
||||
case "white", "light":
|
||||
resolved = "light"
|
||||
default:
|
||||
resolved = "light"
|
||||
}
|
||||
}
|
||||
return theme, resolved
|
||||
}
|
||||
|
||||
// 2. Try simple map {"theme": "..."}
|
||||
var simpleMap map[string]any
|
||||
if err := json.Unmarshal([]byte(s), &simpleMap); err == nil {
|
||||
if t, ok := simpleMap["theme"].(string); ok && t != "" {
|
||||
theme = t
|
||||
if r, ok2 := simpleMap["resolvedTheme"].(string); ok2 && r != "" {
|
||||
resolved = r
|
||||
} else if theme == "dark" {
|
||||
resolved = "dark"
|
||||
} else {
|
||||
resolved = "light"
|
||||
}
|
||||
return theme, resolved
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Fallback for raw string literals like `"dark"` or `dark`
|
||||
clean := strings.ToLower(strings.Trim(s, "\" \t\r\n"))
|
||||
switch clean {
|
||||
case "dark":
|
||||
return "dark", "dark"
|
||||
case "white":
|
||||
return "white", "white"
|
||||
case "light":
|
||||
return "light", "light"
|
||||
case "auto":
|
||||
return "auto", "light"
|
||||
}
|
||||
|
||||
return theme, resolved
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package plugin
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestResolveThemeFromStorage(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
storageJSON string
|
||||
wantTheme string
|
||||
wantResolved string
|
||||
}{
|
||||
{
|
||||
name: "zustand dark theme",
|
||||
storageJSON: `{"state":{"theme":"dark","resolvedTheme":"dark"},"version":0}`,
|
||||
wantTheme: "dark",
|
||||
wantResolved: "dark",
|
||||
},
|
||||
{
|
||||
name: "zustand white theme",
|
||||
storageJSON: `{"state":{"theme":"white","resolvedTheme":"light"},"version":0}`,
|
||||
wantTheme: "white",
|
||||
wantResolved: "light",
|
||||
},
|
||||
{
|
||||
name: "zustand light theme",
|
||||
storageJSON: `{"state":{"theme":"light","resolvedTheme":"light"},"version":0}`,
|
||||
wantTheme: "light",
|
||||
wantResolved: "light",
|
||||
},
|
||||
{
|
||||
name: "zustand auto theme with resolved dark",
|
||||
storageJSON: `{"state":{"theme":"auto","resolvedTheme":"dark"},"version":0}`,
|
||||
wantTheme: "auto",
|
||||
wantResolved: "dark",
|
||||
},
|
||||
{
|
||||
name: "zustand auto theme with resolved light",
|
||||
storageJSON: `{"state":{"theme":"auto","resolvedTheme":"light"},"version":0}`,
|
||||
wantTheme: "auto",
|
||||
wantResolved: "light",
|
||||
},
|
||||
{
|
||||
name: "simple json dark",
|
||||
storageJSON: `{"theme":"dark"}`,
|
||||
wantTheme: "dark",
|
||||
wantResolved: "dark",
|
||||
},
|
||||
{
|
||||
name: "simple json white",
|
||||
storageJSON: `{"theme":"white"}`,
|
||||
wantTheme: "white",
|
||||
wantResolved: "light",
|
||||
},
|
||||
{
|
||||
name: "raw string dark",
|
||||
storageJSON: `"dark"`,
|
||||
wantTheme: "dark",
|
||||
wantResolved: "dark",
|
||||
},
|
||||
{
|
||||
name: "raw string white",
|
||||
storageJSON: `white`,
|
||||
wantTheme: "white",
|
||||
wantResolved: "white",
|
||||
},
|
||||
{
|
||||
name: "empty string defaults to auto/light",
|
||||
storageJSON: "",
|
||||
wantTheme: "auto",
|
||||
wantResolved: "light",
|
||||
},
|
||||
{
|
||||
name: "invalid json defaults to auto/light",
|
||||
storageJSON: `{not-valid-json`,
|
||||
wantTheme: "auto",
|
||||
wantResolved: "light",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
gotTheme, gotResolved := ResolveThemeFromStorage(tt.storageJSON)
|
||||
if gotTheme != tt.wantTheme {
|
||||
t.Errorf("theme = %q, want %q", gotTheme, tt.wantTheme)
|
||||
}
|
||||
if gotResolved != tt.wantResolved {
|
||||
t.Errorf("resolved = %q, want %q", gotResolved, tt.wantResolved)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
+80
-53
@@ -55,59 +55,8 @@ type ConfigField struct {
|
||||
|
||||
// RegistrationCapability declares the capabilities implemented by this plugin.
|
||||
type RegistrationCapability struct {
|
||||
AuthProvider bool `json:"auth_provider"`
|
||||
ManagementAPI bool `json:"management_api"`
|
||||
}
|
||||
|
||||
// IdentifierResponse is returned by auth.identifier.
|
||||
type IdentifierResponse struct {
|
||||
Identifier string `json:"identifier"`
|
||||
}
|
||||
|
||||
// AuthData describes a credential record.
|
||||
type AuthData struct {
|
||||
Provider string `json:"Provider"`
|
||||
ID string `json:"ID"`
|
||||
FileName string `json:"FileName"`
|
||||
Label string `json:"Label"`
|
||||
Prefix string `json:"Prefix,omitempty"`
|
||||
ProxyURL string `json:"ProxyURL,omitempty"`
|
||||
Disabled bool `json:"Disabled,omitempty"`
|
||||
StorageJSON []byte `json:"StorageJSON"`
|
||||
Metadata map[string]any `json:"Metadata,omitempty"`
|
||||
Attributes map[string]string `json:"Attributes,omitempty"`
|
||||
NextRefreshAfter time.Time `json:"NextRefreshAfter,omitempty"`
|
||||
}
|
||||
|
||||
// AuthParseRequest is passed to auth.parse.
|
||||
type AuthParseRequest struct {
|
||||
Provider string `json:"Provider"`
|
||||
Path string `json:"Path"`
|
||||
FileName string `json:"FileName"`
|
||||
RawJSON []byte `json:"RawJSON"`
|
||||
Host map[string]any `json:"Host,omitempty"`
|
||||
}
|
||||
|
||||
// AuthParseResponse is returned by auth.parse.
|
||||
type AuthParseResponse struct {
|
||||
Handled bool `json:"Handled"`
|
||||
Auth AuthData `json:"Auth"`
|
||||
Auths []AuthData `json:"Auths,omitempty"`
|
||||
}
|
||||
|
||||
// AuthRefreshRequest is passed to auth.refresh.
|
||||
type AuthRefreshRequest struct {
|
||||
AuthID string `json:"AuthID"`
|
||||
AuthProvider string `json:"AuthProvider"`
|
||||
StorageJSON []byte `json:"StorageJSON"`
|
||||
Metadata map[string]any `json:"Metadata,omitempty"`
|
||||
Attributes map[string]string `json:"Attributes,omitempty"`
|
||||
}
|
||||
|
||||
// AuthRefreshResponse is returned by auth.refresh.
|
||||
type AuthRefreshResponse struct {
|
||||
Auth AuthData `json:"Auth"`
|
||||
NextRefreshAfter time.Time `json:"NextRefreshAfter,omitempty"`
|
||||
AuthProvider bool `json:"auth_provider,omitempty"`
|
||||
ManagementAPI bool `json:"management_api,omitempty"`
|
||||
}
|
||||
|
||||
// ManagementRegistrationResponse is returned by management.register.
|
||||
@@ -225,6 +174,7 @@ type UpstreamCreditsResponse struct {
|
||||
|
||||
// UpstreamWindowLimits carries fiveHour and weekly window metrics.
|
||||
type UpstreamWindowLimits struct {
|
||||
Limited *bool `json:"limited,omitempty"`
|
||||
FiveHour UpstreamWindowLimit `json:"fiveHour"`
|
||||
Weekly UpstreamWindowLimit `json:"weekly"`
|
||||
}
|
||||
@@ -256,14 +206,33 @@ type UsageWindowLimitData struct {
|
||||
ResetInSeconds int64 `json:"reset_in_seconds"`
|
||||
}
|
||||
|
||||
// UpstreamUsageSummaryResponse reflects Command Code's /internal/usage/summary payload,
|
||||
// which aggregates usage over the current billing period (monthly).
|
||||
type UpstreamUsageSummaryResponse struct {
|
||||
TotalCount int64 `json:"totalCount"`
|
||||
TotalCost float64 `json:"totalCost"`
|
||||
TotalCredits float64 `json:"totalCredits"`
|
||||
TotalMonthlyCredits float64 `json:"totalMonthlyCredits"`
|
||||
TotalPurchasedCredits float64 `json:"totalPurchasedCredits"`
|
||||
PeriodBasis string `json:"periodBasis"`
|
||||
}
|
||||
|
||||
// UsageWindowLimitsData contains both windows.
|
||||
type UsageWindowLimitsData struct {
|
||||
Monthly UsageWindowLimitData `json:"monthly"`
|
||||
FiveHour UsageWindowLimitData `json:"five_hour"`
|
||||
Weekly UsageWindowLimitData `json:"weekly"`
|
||||
}
|
||||
|
||||
// PlanInfo represents inferred Command Code subscription plan details.
|
||||
type PlanInfo struct {
|
||||
Name string `json:"name"`
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
// FormattedUsageData is the complete formatted usage payload.
|
||||
type FormattedUsageData struct {
|
||||
Plan PlanInfo `json:"plan"`
|
||||
Credits UsageCreditsData `json:"credits"`
|
||||
WindowLimits UsageWindowLimitsData `json:"window_limits"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
@@ -272,9 +241,67 @@ type FormattedUsageData struct {
|
||||
// FormattedUsageResponse is returned by GET /plugins/commandcode/usage and POST /plugins/commandcode/usage.
|
||||
type FormattedUsageResponse struct {
|
||||
OK bool `json:"ok"`
|
||||
Plan PlanInfo `json:"plan"`
|
||||
Data FormattedUsageData `json:"data"`
|
||||
Credits UsageCreditsData `json:"credits"`
|
||||
WindowLimits UsageWindowLimitsData `json:"window_limits"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// OpenCodeUsageResponse reflects GET {opencode_api_base}/usage from OpenCode Go.
|
||||
type OpenCodeUsageResponse struct {
|
||||
Usage OpenCodeUsageWindows `json:"usage"`
|
||||
}
|
||||
|
||||
// OpenCodeUsageWindows carries the three usage windows returned by OpenCode Go.
|
||||
type OpenCodeUsageWindows struct {
|
||||
Rolling OpenCodeUsageWindow `json:"rolling"`
|
||||
Weekly OpenCodeUsageWindow `json:"weekly"`
|
||||
Monthly OpenCodeUsageWindow `json:"monthly"`
|
||||
}
|
||||
|
||||
// OpenCodeUsageWindow represents one quota window from OpenCode Go.
|
||||
// Percent is int in the observed upstream payload but parsed as float64 for tolerance.
|
||||
type OpenCodeUsageWindow struct {
|
||||
Status string `json:"status"`
|
||||
Percent float64 `json:"percent"`
|
||||
ResetsAt string `json:"resetsAt"` // RFC3339 UTC
|
||||
}
|
||||
|
||||
// OpenCodeFormattedWindows is the formatted OpenCode Go window section.
|
||||
type OpenCodeFormattedWindows struct {
|
||||
Rolling OpenCodeFormattedWindow `json:"rolling"`
|
||||
Weekly OpenCodeFormattedWindow `json:"weekly"`
|
||||
Monthly OpenCodeFormattedWindow `json:"monthly"`
|
||||
}
|
||||
|
||||
// OpenCodeFormattedWindow is one formatted OpenCode Go window.
|
||||
type OpenCodeFormattedWindow struct {
|
||||
Status string `json:"status"`
|
||||
Percent float64 `json:"percent"`
|
||||
Exceeded bool `json:"exceeded"`
|
||||
ResetAt string `json:"reset_at"`
|
||||
ResetInSeconds int64 `json:"reset_in_seconds"`
|
||||
}
|
||||
|
||||
// OpenCodeFormattedUsageResponse is the formatted OpenCode Go usage payload.
|
||||
type OpenCodeFormattedUsageResponse struct {
|
||||
OK bool `json:"ok"`
|
||||
Provider string `json:"provider"` // "opencode_go"
|
||||
Windows OpenCodeFormattedWindows `json:"windows"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
Error string `json:"error,omitempty"`
|
||||
}
|
||||
|
||||
// AllUsageResponse aggregates both providers for /plugins/commandcode/all.
|
||||
// Partial failure semantics: each provider's payload is present only on success;
|
||||
// failures are reported in Errors. CommandCode/OpenCode carry the raw JSON of the
|
||||
// respective FormattedUsageResponse / OpenCodeFormattedUsageResponse.
|
||||
type AllUsageResponse struct {
|
||||
OK bool `json:"ok"` // at least one provider succeeded
|
||||
CommandCode json.RawMessage `json:"commandcode,omitempty"`
|
||||
OpenCode json.RawMessage `json:"opencode,omitempty"`
|
||||
Errors map[string]string `json:"errors,omitempty"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
+223
-14
@@ -15,6 +15,7 @@ import (
|
||||
|
||||
const (
|
||||
DefaultAPIBase = "https://api.commandcode.ai"
|
||||
DefaultOpenCodeAPIBase = "https://opencode.ai/zen/go/v1"
|
||||
)
|
||||
|
||||
// HTTPDoer abstracts HTTP requests for testing and fallback.
|
||||
@@ -42,8 +43,9 @@ func SetDefaultHTTPClient(client HTTPDoer) {
|
||||
}
|
||||
}
|
||||
|
||||
// FetchCreditsRaw fetches raw upstream credit data via host.http.do or net/http fallback.
|
||||
func FetchCreditsRaw(ctx context.Context, apiBase, sessionToken string, hostCallbackID string) ([]byte, int, error) {
|
||||
// fetchUpstream performs a GET on an internal Command Code endpoint, reusing
|
||||
// the host.http.do bridge when available, else falling back to net/http.
|
||||
func fetchUpstream(ctx context.Context, apiBase, endpoint, sessionToken, hostCallbackID string) ([]byte, int, error) {
|
||||
cleanToken := ExtractSessionToken(sessionToken)
|
||||
if cleanToken == "" {
|
||||
return nil, http.StatusBadRequest, errors.New("missing session_token: please provide a valid Command Code session token")
|
||||
@@ -52,19 +54,27 @@ func FetchCreditsRaw(ctx context.Context, apiBase, sessionToken string, hostCall
|
||||
if apiBase == "" {
|
||||
apiBase = DefaultAPIBase
|
||||
}
|
||||
url := fmt.Sprintf("%s/internal/billing/credits", strings.TrimRight(apiBase, "/"))
|
||||
url := fmt.Sprintf("%s/%s", strings.TrimRight(apiBase, "/"), strings.TrimLeft(endpoint, "/"))
|
||||
cookieValue := FormatSessionCookie(cleanToken)
|
||||
|
||||
headers := map[string][]string{
|
||||
"Cookie": {cookieValue},
|
||||
"Accept": {"application/json"},
|
||||
"User-Agent": {fmt.Sprintf("cliproxy-plugin-commandcode/%s", PluginVersion)},
|
||||
}
|
||||
return doUpstreamRequest(ctx, http.MethodGet, url, headers, hostCallbackID)
|
||||
}
|
||||
|
||||
// doUpstreamRequest is the shared transport layer: it tries the host.http.do
|
||||
// bridge first (when a host caller is registered) and falls back to net/http.
|
||||
// Request semantics (method, URL, headers) are fully controlled by the caller.
|
||||
func doUpstreamRequest(ctx context.Context, method, url string, headers map[string][]string, hostCallbackID string) ([]byte, int, error) {
|
||||
// 1. Try host.http.do if hostCaller is configured
|
||||
if hostCaller != nil {
|
||||
reqPayload := HostHTTPRequest{
|
||||
Method: http.MethodGet,
|
||||
Method: method,
|
||||
URL: url,
|
||||
Headers: map[string][]string{
|
||||
"Cookie": {cookieValue},
|
||||
"Accept": {"application/json"},
|
||||
"User-Agent": {"cliproxy-plugin-commandcode/0.1.0"},
|
||||
},
|
||||
Headers: headers,
|
||||
HostCallbackID: hostCallbackID,
|
||||
}
|
||||
rawReq, errMarshal := json.Marshal(reqPayload)
|
||||
@@ -96,13 +106,15 @@ func FetchCreditsRaw(ctx context.Context, apiBase, sessionToken string, hostCall
|
||||
}
|
||||
|
||||
// 2. Fallback to Go net/http client
|
||||
httpReq, errNew := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||
httpReq, errNew := http.NewRequestWithContext(ctx, method, url, nil)
|
||||
if errNew != nil {
|
||||
return nil, http.StatusInternalServerError, fmt.Errorf("create HTTP request: %w", errNew)
|
||||
}
|
||||
httpReq.Header.Set("Cookie", cookieValue)
|
||||
httpReq.Header.Set("Accept", "application/json")
|
||||
httpReq.Header.Set("User-Agent", "cliproxy-plugin-commandcode/0.1.0")
|
||||
for key, values := range headers {
|
||||
for _, value := range values {
|
||||
httpReq.Header.Add(key, value)
|
||||
}
|
||||
}
|
||||
|
||||
res, errDo := defaultHTTPClient.Do(httpReq)
|
||||
if errDo != nil {
|
||||
@@ -120,8 +132,101 @@ func FetchCreditsRaw(ctx context.Context, apiBase, sessionToken string, hostCall
|
||||
return body, res.StatusCode, nil
|
||||
}
|
||||
|
||||
// FetchCreditsRaw fetches raw upstream credit data via host.http.do or net/http fallback.
|
||||
func FetchCreditsRaw(ctx context.Context, apiBase, sessionToken string, hostCallbackID string) ([]byte, int, error) {
|
||||
return fetchUpstream(ctx, apiBase, "internal/billing/credits", sessionToken, hostCallbackID)
|
||||
}
|
||||
|
||||
// FetchUsageSummaryRaw fetches the billing-period (monthly) usage totals.
|
||||
func FetchUsageSummaryRaw(ctx context.Context, apiBase, sessionToken string, hostCallbackID string) ([]byte, int, error) {
|
||||
return fetchUpstream(ctx, apiBase, "internal/usage/summary", sessionToken, hostCallbackID)
|
||||
}
|
||||
|
||||
// FetchOpenCodeUsageRaw fetches raw OpenCode Go usage data from
|
||||
// {apiBase}/usage with Bearer auth, via host.http.do or net/http fallback.
|
||||
func FetchOpenCodeUsageRaw(ctx context.Context, apiBase, apiKey, hostCallbackID string) ([]byte, int, error) {
|
||||
apiKey = strings.TrimSpace(apiKey)
|
||||
if apiKey == "" {
|
||||
return nil, http.StatusBadRequest, errors.New("missing opencode_api_key: configure opencode_api_key in plugin config or pass it in the request")
|
||||
}
|
||||
|
||||
if apiBase == "" {
|
||||
apiBase = DefaultOpenCodeAPIBase
|
||||
}
|
||||
url := strings.TrimRight(apiBase, "/") + "/usage"
|
||||
|
||||
headers := map[string][]string{
|
||||
"Authorization": {"Bearer " + apiKey},
|
||||
"Accept": {"application/json"},
|
||||
"User-Agent": {fmt.Sprintf("cliproxy-plugin-commandcode/%s", PluginVersion)},
|
||||
}
|
||||
return doUpstreamRequest(ctx, http.MethodGet, url, headers, hostCallbackID)
|
||||
}
|
||||
|
||||
// ParseOpenCodeUsage parses OpenCode Go usage JSON into the formatted response.
|
||||
// Unknown status values are tolerated; a resetsAt that fails to parse is not
|
||||
// fatal (ResetAt stays empty and ResetInSeconds stays 0).
|
||||
func ParseOpenCodeUsage(raw []byte, now time.Time) (*OpenCodeFormattedUsageResponse, error) {
|
||||
if len(raw) == 0 {
|
||||
return nil, errors.New("empty response body from upstream")
|
||||
}
|
||||
|
||||
var upstream OpenCodeUsageResponse
|
||||
if err := json.Unmarshal(raw, &upstream); err != nil {
|
||||
return nil, fmt.Errorf("unmarshal opencode usage response: %w", err)
|
||||
}
|
||||
|
||||
if now.IsZero() {
|
||||
now = time.Now().UTC()
|
||||
}
|
||||
|
||||
return &OpenCodeFormattedUsageResponse{
|
||||
OK: true,
|
||||
Provider: "opencode_go",
|
||||
Windows: OpenCodeFormattedWindows{
|
||||
Rolling: formatOpenCodeWindow(upstream.Usage.Rolling, now),
|
||||
Weekly: formatOpenCodeWindow(upstream.Usage.Weekly, now),
|
||||
Monthly: formatOpenCodeWindow(upstream.Usage.Monthly, now),
|
||||
},
|
||||
UpdatedAt: now.Format(time.RFC3339),
|
||||
}, nil
|
||||
}
|
||||
|
||||
// formatOpenCodeWindow formats a single OpenCode Go usage window.
|
||||
func formatOpenCodeWindow(w OpenCodeUsageWindow, now time.Time) OpenCodeFormattedWindow {
|
||||
percent := clampOpenCodePercent(w.Percent)
|
||||
out := OpenCodeFormattedWindow{
|
||||
Status: w.Status,
|
||||
Percent: percent,
|
||||
Exceeded: percent >= 100 || w.Status == "exceeded",
|
||||
}
|
||||
|
||||
if w.ResetsAt != "" {
|
||||
if t, err := time.Parse(time.RFC3339, w.ResetsAt); err == nil {
|
||||
out.ResetAt = t.UTC().Format(time.RFC3339)
|
||||
if diff := t.UTC().Sub(now); diff > 0 {
|
||||
out.ResetInSeconds = int64(diff.Seconds())
|
||||
}
|
||||
}
|
||||
// Parse failure is not fatal: ResetAt stays empty, ResetInSeconds stays 0.
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// clampOpenCodePercent clamps a percentage to [0, 100] with 2-decimal rounding.
|
||||
func clampOpenCodePercent(p float64) float64 {
|
||||
if p < 0 {
|
||||
p = 0
|
||||
}
|
||||
if p > 100 {
|
||||
p = 100
|
||||
}
|
||||
return math.Round(p*100) / 100
|
||||
}
|
||||
|
||||
// ParseAndFormatUsage parses upstream credits JSON into structured usage metrics.
|
||||
func ParseAndFormatUsage(raw []byte, now time.Time) (*FormattedUsageResponse, error) {
|
||||
// summary (optional) carries the billing-period usage totals used to derive the monthly window.
|
||||
func ParseAndFormatUsage(raw []byte, summary *UpstreamUsageSummaryResponse, now time.Time) (*FormattedUsageResponse, error) {
|
||||
if len(raw) == 0 {
|
||||
return nil, errors.New("empty response body from upstream")
|
||||
}
|
||||
@@ -149,9 +254,14 @@ func ParseAndFormatUsage(raw []byte, now time.Time) (*FormattedUsageResponse, er
|
||||
|
||||
// Format window limits
|
||||
windowLimitsData := formatWindowLimits(upstream.WindowLimits, now)
|
||||
windowLimitsData.Monthly = formatMonthlyWindow(upstream.Credits, summary, now)
|
||||
|
||||
// Inferred subscription plan
|
||||
planInfo := PlanFromWindowLimits(upstream.WindowLimits.FiveHour.Cap, upstream.WindowLimits.Weekly.Cap, upstream.WindowLimits.Limited)
|
||||
|
||||
nowRFC := now.Format(time.RFC3339)
|
||||
data := FormattedUsageData{
|
||||
Plan: planInfo,
|
||||
Credits: creditsData,
|
||||
WindowLimits: windowLimitsData,
|
||||
UpdatedAt: nowRFC,
|
||||
@@ -159,6 +269,7 @@ func ParseAndFormatUsage(raw []byte, now time.Time) (*FormattedUsageResponse, er
|
||||
|
||||
return &FormattedUsageResponse{
|
||||
OK: true,
|
||||
Plan: planInfo,
|
||||
Data: data,
|
||||
Credits: creditsData,
|
||||
WindowLimits: windowLimitsData,
|
||||
@@ -166,6 +277,69 @@ func ParseAndFormatUsage(raw []byte, now time.Time) (*FormattedUsageResponse, er
|
||||
}, nil
|
||||
}
|
||||
|
||||
// PlanFromWindowLimits infers the Command Code subscription plan based on window limit caps.
|
||||
//
|
||||
// Rules:
|
||||
// - windowLimits.limited == false -> Provider plan (pay-as-you-go)
|
||||
// - 5h cap=14 && weekly cap=35 -> GOAT plan
|
||||
// - 5h cap=16 && weekly cap=40 -> Pro plan
|
||||
// - 5h cap=90 && weekly cap=180 -> Max 20× plan
|
||||
// - 5h cap=45 && weekly cap=90 -> Max 10× plan
|
||||
// - 5h cap=3 && weekly cap=6 -> Go plan
|
||||
// - Otherwise -> Unknown
|
||||
func PlanFromWindowLimits(fiveHourCap, weeklyCap float64, limited *bool) PlanInfo {
|
||||
if limited != nil && !*limited {
|
||||
return PlanInfo{
|
||||
Name: "Provider",
|
||||
Code: "provider",
|
||||
}
|
||||
}
|
||||
|
||||
match := func(capVal, target float64) bool {
|
||||
return math.Abs(capVal-target) < 0.01
|
||||
}
|
||||
|
||||
if match(fiveHourCap, 14) && match(weeklyCap, 35) {
|
||||
return PlanInfo{
|
||||
Name: "GOAT",
|
||||
Code: "goat",
|
||||
}
|
||||
}
|
||||
|
||||
if match(fiveHourCap, 16) && match(weeklyCap, 40) {
|
||||
return PlanInfo{
|
||||
Name: "Pro",
|
||||
Code: "pro",
|
||||
}
|
||||
}
|
||||
|
||||
if match(fiveHourCap, 90) && match(weeklyCap, 180) {
|
||||
return PlanInfo{
|
||||
Name: "Max 20×",
|
||||
Code: "max_20x",
|
||||
}
|
||||
}
|
||||
|
||||
if match(fiveHourCap, 45) && match(weeklyCap, 90) {
|
||||
return PlanInfo{
|
||||
Name: "Max 10×",
|
||||
Code: "max_10x",
|
||||
}
|
||||
}
|
||||
|
||||
if match(fiveHourCap, 3) && match(weeklyCap, 6) {
|
||||
return PlanInfo{
|
||||
Name: "Go",
|
||||
Code: "go",
|
||||
}
|
||||
}
|
||||
|
||||
return PlanInfo{
|
||||
Name: "Unknown",
|
||||
Code: "unknown",
|
||||
}
|
||||
}
|
||||
|
||||
func formatCredits(credits map[string]any) UsageCreditsData {
|
||||
data := UsageCreditsData{
|
||||
Details: credits,
|
||||
@@ -188,6 +362,41 @@ func formatWindowLimits(upstream UpstreamWindowLimits, now time.Time) UsageWindo
|
||||
}
|
||||
}
|
||||
|
||||
// formatMonthlyWindow derives the monthly (billing period) window from the
|
||||
// billing/credits response (remaining monthlyCredits) and the
|
||||
// /internal/usage/summary response (totalMonthlyCredits consumed this period).
|
||||
// cap = consumed + remaining, used = consumed, remaining = monthlyCredits.
|
||||
// Returns a zero window when the summary (consumed totals) is unavailable,
|
||||
// because a monthly window cannot be derived from remaining credits alone.
|
||||
func formatMonthlyWindow(credits map[string]any, summary *UpstreamUsageSummaryResponse, now time.Time) UsageWindowLimitData {
|
||||
out := UsageWindowLimitData{}
|
||||
if summary == nil || summary.TotalMonthlyCredits <= 0 {
|
||||
return out
|
||||
}
|
||||
|
||||
remaining := getFloatFromMap(credits, "monthlyCredits", "monthly_credits")
|
||||
used := summary.TotalMonthlyCredits
|
||||
|
||||
capTotal := used + remaining
|
||||
if capTotal > 0 {
|
||||
percentage := (used / capTotal) * 100.0
|
||||
if percentage > 100.0 {
|
||||
percentage = 100.0
|
||||
}
|
||||
out.Percentage = math.Round(percentage*100) / 100
|
||||
}
|
||||
|
||||
out.Used = used
|
||||
out.Cap = capTotal
|
||||
out.Remaining = remaining
|
||||
if out.Remaining < 0 {
|
||||
out.Remaining = 0
|
||||
}
|
||||
out.ResetAt = "" // 账单周期重置时间上游未提供
|
||||
out.ResetInSeconds = 0
|
||||
return out
|
||||
}
|
||||
|
||||
func formatSingleWindow(w UpstreamWindowLimit, now time.Time) UsageWindowLimitData {
|
||||
var remaining float64
|
||||
var percentage float64
|
||||
|
||||
+468
-2
@@ -3,8 +3,10 @@ package plugin
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"math"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
@@ -81,7 +83,44 @@ func TestParseAndFormatUsage(t *testing.T) {
|
||||
}`)
|
||||
|
||||
now := time.Date(2025, 3, 4, 12, 0, 0, 0, time.UTC)
|
||||
usage, err := ParseAndFormatUsage(raw, now)
|
||||
|
||||
t.Run("without summary monthly defaults empty", func(t *testing.T) {
|
||||
usage, err := ParseAndFormatUsage(raw, nil, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAndFormatUsage error: %v", err)
|
||||
}
|
||||
if !usage.OK {
|
||||
t.Fatal("expected OK=true")
|
||||
}
|
||||
if usage.WindowLimits.Monthly.Used != 0 || usage.WindowLimits.Monthly.Cap != 0 {
|
||||
t.Errorf("expected empty monthly without summary, got %+v", usage.WindowLimits.Monthly)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("monthly window derived from summary + remaining credits", func(t *testing.T) {
|
||||
summary := &UpstreamUsageSummaryResponse{TotalMonthlyCredits: 30.0}
|
||||
// monthlyCredits in raw = 1000 remaining, so cap = 1030
|
||||
usage, err := ParseAndFormatUsage(raw, summary, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAndFormatUsage error: %v", err)
|
||||
}
|
||||
m := usage.WindowLimits.Monthly
|
||||
if m.Used != 30.0 {
|
||||
t.Errorf("monthly used = %v, want 30", m.Used)
|
||||
}
|
||||
if m.Cap != 1030.0 {
|
||||
t.Errorf("monthly cap = %v, want 1030", m.Cap)
|
||||
}
|
||||
if m.Remaining != 1000.0 {
|
||||
t.Errorf("monthly remaining = %v, want 1000", m.Remaining)
|
||||
}
|
||||
wantPct := math.Round((30.0/1030.0)*10000) / 100
|
||||
if m.Percentage != wantPct {
|
||||
t.Errorf("monthly percentage = %v, want %v", m.Percentage, wantPct)
|
||||
}
|
||||
})
|
||||
|
||||
usage, err := ParseAndFormatUsage(raw, nil, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseAndFormatUsage error: %v", err)
|
||||
}
|
||||
@@ -136,6 +175,27 @@ func TestParseAndFormatUsage(t *testing.T) {
|
||||
if weekly.ResetAt != "2025-03-10T12:00:00Z" {
|
||||
t.Errorf("Weekly ResetAt = %v, want 2025-03-10T12:00:00Z", weekly.ResetAt)
|
||||
}
|
||||
|
||||
// Verify inferred plan (cap 25 / 100 is unknown)
|
||||
if usage.Plan.Name != "Unknown" || usage.Plan.Code != "unknown" {
|
||||
t.Errorf("Plan = %+v, want Unknown", usage.Plan)
|
||||
}
|
||||
|
||||
// Verify plan inference for GOAT
|
||||
rawGOAT := []byte(`{
|
||||
"credits": {"monthlyCredits": 100},
|
||||
"windowLimits": {
|
||||
"fiveHour": {"used": 2, "cap": 14},
|
||||
"weekly": {"used": 10, "cap": 35}
|
||||
}
|
||||
}`)
|
||||
usageGOAT, errGOAT := ParseAndFormatUsage(rawGOAT, nil, now)
|
||||
if errGOAT != nil {
|
||||
t.Fatalf("ParseAndFormatUsage GOAT error: %v", errGOAT)
|
||||
}
|
||||
if usageGOAT.Plan.Name != "GOAT" || usageGOAT.Plan.Code != "goat" {
|
||||
t.Errorf("GOAT Plan = %+v, want name=GOAT code=goat", usageGOAT.Plan)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchCreditsRaw_FallbackHTTP(t *testing.T) {
|
||||
@@ -174,7 +234,7 @@ func TestFetchCreditsRaw_FallbackHTTP(t *testing.T) {
|
||||
t.Fatal("expected non-empty body")
|
||||
}
|
||||
|
||||
usage, errParse := ParseAndFormatUsage(body, time.Time{})
|
||||
usage, errParse := ParseAndFormatUsage(body, nil, time.Time{})
|
||||
if errParse != nil {
|
||||
t.Fatalf("ParseAndFormatUsage error: %v", errParse)
|
||||
}
|
||||
@@ -220,3 +280,409 @@ func TestFetchCreditsRaw_HostCaller(t *testing.T) {
|
||||
t.Errorf("body = %s, want %s", string(body), string(mockResponsePayload))
|
||||
}
|
||||
}
|
||||
|
||||
func TestPlanFromWindowLimits(t *testing.T) {
|
||||
trueVal := true
|
||||
falseVal := false
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
fiveHourCap float64
|
||||
weeklyCap float64
|
||||
limited *bool
|
||||
wantName string
|
||||
wantCode string
|
||||
}{
|
||||
{
|
||||
name: "GOAT plan",
|
||||
fiveHourCap: 14,
|
||||
weeklyCap: 35,
|
||||
limited: &trueVal,
|
||||
wantName: "GOAT",
|
||||
wantCode: "goat",
|
||||
},
|
||||
{
|
||||
name: "Pro plan",
|
||||
fiveHourCap: 16,
|
||||
weeklyCap: 40,
|
||||
limited: nil,
|
||||
wantName: "Pro",
|
||||
wantCode: "pro",
|
||||
},
|
||||
{
|
||||
name: "Max 20x plan",
|
||||
fiveHourCap: 90,
|
||||
weeklyCap: 180,
|
||||
limited: &trueVal,
|
||||
wantName: "Max 20×",
|
||||
wantCode: "max_20x",
|
||||
},
|
||||
{
|
||||
name: "Max 10x plan",
|
||||
fiveHourCap: 45,
|
||||
weeklyCap: 90,
|
||||
limited: nil,
|
||||
wantName: "Max 10×",
|
||||
wantCode: "max_10x",
|
||||
},
|
||||
{
|
||||
name: "Go plan",
|
||||
fiveHourCap: 3,
|
||||
weeklyCap: 6,
|
||||
limited: nil,
|
||||
wantName: "Go",
|
||||
wantCode: "go",
|
||||
},
|
||||
{
|
||||
name: "Provider pay-as-you-go plan",
|
||||
fiveHourCap: 0,
|
||||
weeklyCap: 0,
|
||||
limited: &falseVal,
|
||||
wantName: "Provider",
|
||||
wantCode: "provider",
|
||||
},
|
||||
{
|
||||
name: "Provider plan with caps set but limited=false",
|
||||
fiveHourCap: 14,
|
||||
weeklyCap: 35,
|
||||
limited: &falseVal,
|
||||
wantName: "Provider",
|
||||
wantCode: "provider",
|
||||
},
|
||||
{
|
||||
name: "Float tolerance test",
|
||||
fiveHourCap: 13.999,
|
||||
weeklyCap: 35.001,
|
||||
limited: nil,
|
||||
wantName: "GOAT",
|
||||
wantCode: "goat",
|
||||
},
|
||||
{
|
||||
name: "Unknown caps",
|
||||
fiveHourCap: 10,
|
||||
weeklyCap: 20,
|
||||
limited: nil,
|
||||
wantName: "Unknown",
|
||||
wantCode: "unknown",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := PlanFromWindowLimits(tt.fiveHourCap, tt.weeklyCap, tt.limited)
|
||||
if got.Name != tt.wantName || got.Code != tt.wantCode {
|
||||
t.Errorf("PlanFromWindowLimits(%v, %v, %v) = %+v, want name=%q code=%q",
|
||||
tt.fiveHourCap, tt.weeklyCap, tt.limited, got, tt.wantName, tt.wantCode)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseOpenCodeUsage(t *testing.T) {
|
||||
now := time.Date(2026, 9, 16, 12, 0, 0, 0, time.UTC)
|
||||
|
||||
t.Run("normal payload from real upstream shape", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{
|
||||
"rolling": {"status":"ok","percent":4, "resetsAt":"2026-09-17T06:58:53.171Z"},
|
||||
"weekly": {"status":"ok","percent":46,"resetsAt":"2026-09-21T00:00:00.000Z"},
|
||||
"monthly": {"status":"ok","percent":23,"resetsAt":"2026-10-14T09:13:49.000Z"}
|
||||
}}`)
|
||||
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if !usage.OK || usage.Provider != "opencode_go" {
|
||||
t.Fatalf("unexpected header: ok=%v provider=%q", usage.OK, usage.Provider)
|
||||
}
|
||||
if usage.UpdatedAt != "2026-09-16T12:00:00Z" {
|
||||
t.Errorf("UpdatedAt = %q", usage.UpdatedAt)
|
||||
}
|
||||
|
||||
rolling := usage.Windows.Rolling
|
||||
if rolling.Percent != 4 || rolling.Status != "ok" || rolling.Exceeded {
|
||||
t.Errorf("rolling = %+v", rolling)
|
||||
}
|
||||
if rolling.ResetAt != "2026-09-17T06:58:53Z" {
|
||||
t.Errorf("rolling reset_at = %q", rolling.ResetAt)
|
||||
}
|
||||
if rolling.ResetInSeconds != 68333 {
|
||||
t.Errorf("rolling reset_in_seconds = %d, want 68333", rolling.ResetInSeconds)
|
||||
}
|
||||
|
||||
weekly := usage.Windows.Weekly
|
||||
if weekly.Percent != 46 {
|
||||
t.Errorf("weekly percent = %v, want 46", weekly.Percent)
|
||||
}
|
||||
if weekly.ResetAt != "2026-09-21T00:00:00Z" {
|
||||
t.Errorf("weekly reset_at = %q, want 2026-09-21T00:00:00Z (.000Z tolerated)", weekly.ResetAt)
|
||||
}
|
||||
|
||||
monthly := usage.Windows.Monthly
|
||||
if monthly.Percent != 23 {
|
||||
t.Errorf("monthly percent = %v, want 23", monthly.Percent)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("float percent", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"ok","percent":12.345,"resetsAt":"2026-09-17T06:58:53Z"}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if got := usage.Windows.Rolling.Percent; got != 12.35 { // Round(x*100)/100
|
||||
t.Errorf("percent = %v, want 12.35", got)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("unknown status tolerated", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"weird-status","percent":50,"resetsAt":"2026-09-17T06:58:53Z"}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if got := usage.Windows.Rolling; got.Status != "weird-status" || got.Exceeded {
|
||||
t.Errorf("rolling = %+v, want status kept and not exceeded", got)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("exceeded status", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"exceeded","percent":99,"resetsAt":"2026-09-17T06:58:53Z"}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if !usage.Windows.Rolling.Exceeded {
|
||||
t.Error("expected Exceeded=true for status=exceeded")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("percent 100 exceeded", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"ok","percent":100,"resetsAt":""}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if !usage.Windows.Rolling.Exceeded {
|
||||
t.Error("expected Exceeded=true for percent=100")
|
||||
}
|
||||
if usage.Windows.Rolling.ResetAt != "" || usage.Windows.Rolling.ResetInSeconds != 0 {
|
||||
t.Errorf("expected empty reset fields, got %+v", usage.Windows.Rolling)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("percent above 100 clamped", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"ok","percent":150.5,"resetsAt":""}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if got := usage.Windows.Rolling.Percent; got != 100 {
|
||||
t.Errorf("percent = %v, want 100 (clamped)", got)
|
||||
}
|
||||
if !usage.Windows.Rolling.Exceeded {
|
||||
t.Error("expected Exceeded=true when clamped to 100")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("malformed resetsAt not fatal", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{"rolling":{"status":"ok","percent":5,"resetsAt":"not-a-timestamp"}}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage must not fail on bad resetsAt: %v", err)
|
||||
}
|
||||
if got := usage.Windows.Rolling; got.ResetAt != "" || got.ResetInSeconds != 0 {
|
||||
t.Errorf("expected zero reset fields on parse failure, got %+v", got)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("missing windows tolerated as zero values", func(t *testing.T) {
|
||||
raw := []byte(`{"usage":{}}`)
|
||||
usage, err := ParseOpenCodeUsage(raw, now)
|
||||
if err != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", err)
|
||||
}
|
||||
if usage.Windows.Rolling.Percent != 0 {
|
||||
t.Errorf("rolling percent = %v, want 0", usage.Windows.Rolling.Percent)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("empty body", func(t *testing.T) {
|
||||
if _, err := ParseOpenCodeUsage(nil, now); err == nil {
|
||||
t.Fatal("expected error for empty body")
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("invalid JSON", func(t *testing.T) {
|
||||
if _, err := ParseOpenCodeUsage([]byte(`not-json`), now); err == nil {
|
||||
t.Fatal("expected error for invalid JSON")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_FallbackHTTP(t *testing.T) {
|
||||
var sawAuth, sawUA, sawAccept string
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.URL.Path != "/usage" {
|
||||
t.Errorf("unexpected path: %s", r.URL.Path)
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
sawAuth = r.Header.Get("Authorization")
|
||||
sawUA = r.Header.Get("User-Agent")
|
||||
sawAccept = r.Header.Get("Accept")
|
||||
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_, _ = w.Write([]byte(`{"usage":{"rolling":{"status":"ok","percent":4,"resetsAt":"2026-09-17T06:58:53.171Z"}}}`))
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
body, status, err := FetchOpenCodeUsageRaw(context.Background(), ts.URL, "sk-test-key", "")
|
||||
if err != nil {
|
||||
t.Fatalf("FetchOpenCodeUsageRaw error: %v", err)
|
||||
}
|
||||
if status != http.StatusOK {
|
||||
t.Errorf("status = %d, want 200", status)
|
||||
}
|
||||
if len(body) == 0 {
|
||||
t.Fatal("expected non-empty body")
|
||||
}
|
||||
if sawAuth != "Bearer sk-test-key" {
|
||||
t.Errorf("Authorization = %q, want Bearer sk-test-key", sawAuth)
|
||||
}
|
||||
if sawAccept != "application/json" {
|
||||
t.Errorf("Accept = %q, want application/json", sawAccept)
|
||||
}
|
||||
if !strings.Contains(sawUA, "cliproxy-plugin-commandcode/") {
|
||||
t.Errorf("User-Agent = %q, want cliproxy-plugin-commandcode/<version>", sawUA)
|
||||
}
|
||||
|
||||
usage, errParse := ParseOpenCodeUsage(body, time.Time{})
|
||||
if errParse != nil {
|
||||
t.Fatalf("ParseOpenCodeUsage error: %v", errParse)
|
||||
}
|
||||
if usage.Windows.Rolling.Percent != 4 {
|
||||
t.Errorf("rolling percent = %v, want 4", usage.Windows.Rolling.Percent)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_BaseTrailingSlash(t *testing.T) {
|
||||
requests := 0
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
requests++
|
||||
if r.URL.Path != "/usage" {
|
||||
t.Errorf("path = %q, want /usage (trailing slash trimmed)", r.URL.Path)
|
||||
}
|
||||
_, _ = w.Write([]byte(`{"usage":{"rolling":{"status":"ok","percent":1,"resetsAt":""}}}`))
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
if _, _, err := FetchOpenCodeUsageRaw(context.Background(), ts.URL+"/", "sk-key", ""); err != nil {
|
||||
t.Fatalf("error: %v", err)
|
||||
}
|
||||
if requests != 1 {
|
||||
t.Fatalf("requests = %d, want 1", requests)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_MissingKey(t *testing.T) {
|
||||
_, status, err := FetchOpenCodeUsageRaw(context.Background(), "", "", "")
|
||||
if err == nil {
|
||||
t.Fatal("expected error for missing key")
|
||||
}
|
||||
if status != http.StatusBadRequest {
|
||||
t.Errorf("status = %d, want 400", status)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_EmptyKeyAfterTrim(t *testing.T) {
|
||||
_, status, err := FetchOpenCodeUsageRaw(context.Background(), "", " ", "")
|
||||
if err == nil {
|
||||
t.Fatal("expected error for whitespace-only key")
|
||||
}
|
||||
if status != http.StatusBadRequest {
|
||||
t.Errorf("status = %d, want 400", status)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_UpstreamNon200(t *testing.T) {
|
||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusUnauthorized)
|
||||
_, _ = w.Write([]byte(`{"error":"invalid api key"}`))
|
||||
}))
|
||||
defer ts.Close()
|
||||
|
||||
SetHostCaller(nil)
|
||||
SetDefaultHTTPClient(ts.Client())
|
||||
defer func() {
|
||||
SetDefaultHTTPClient(&http.Client{Timeout: 15 * time.Second})
|
||||
}()
|
||||
|
||||
body, status, err := FetchOpenCodeUsageRaw(context.Background(), ts.URL, "sk-bad", "")
|
||||
if err != nil {
|
||||
t.Fatalf("expected nil transport error for non-200 upstream, got %v", err)
|
||||
}
|
||||
if status != http.StatusUnauthorized {
|
||||
t.Errorf("status = %d, want 401", status)
|
||||
}
|
||||
if string(body) != `{"error":"invalid api key"}` {
|
||||
t.Errorf("body = %q", string(body))
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchOpenCodeUsageRaw_HostCaller(t *testing.T) {
|
||||
mockResponsePayload := []byte(`{"usage":{"rolling":{"status":"ok","percent":7,"resetsAt":"2026-09-17T06:58:53Z"}}}`)
|
||||
|
||||
var sawMethod, sawURL string
|
||||
var sawHeaders map[string][]string
|
||||
SetHostCaller(func(method string, payload []byte) ([]byte, error) {
|
||||
if method != "host.http.do" {
|
||||
t.Errorf("method = %s, want host.http.do", method)
|
||||
}
|
||||
var req HostHTTPRequest
|
||||
if err := json.Unmarshal(payload, &req); err != nil {
|
||||
t.Fatalf("unmarshal HostHTTPRequest error: %v", err)
|
||||
}
|
||||
sawMethod, sawURL, sawHeaders = req.Method, req.URL, req.Headers
|
||||
hostResp := HostHTTPResponse{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: mockResponsePayload,
|
||||
}
|
||||
respJSON, _ := json.Marshal(hostResp)
|
||||
return json.Marshal(Envelope{OK: true, Result: respJSON})
|
||||
})
|
||||
defer SetHostCaller(nil)
|
||||
|
||||
body, status, err := FetchOpenCodeUsageRaw(context.Background(), "https://opencode.example/v1", "sk-host-key", "cb-123")
|
||||
if err != nil {
|
||||
t.Fatalf("FetchOpenCodeUsageRaw with hostCaller error: %v", err)
|
||||
}
|
||||
if status != http.StatusOK {
|
||||
t.Errorf("status = %d, want 200", status)
|
||||
}
|
||||
if string(body) != string(mockResponsePayload) {
|
||||
t.Errorf("body = %s, want %s", string(body), string(mockResponsePayload))
|
||||
}
|
||||
if sawMethod != http.MethodGet {
|
||||
t.Errorf("host request method = %s, want GET", sawMethod)
|
||||
}
|
||||
if sawURL != "https://opencode.example/v1/usage" {
|
||||
t.Errorf("host request url = %s, want https://opencode.example/v1/usage", sawURL)
|
||||
}
|
||||
auth := sawHeaders["Authorization"]
|
||||
if len(auth) == 0 || auth[0] != "Bearer sk-host-key" {
|
||||
t.Errorf("host request Authorization = %v, want Bearer sk-host-key", auth)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user