访问与路由
diff --git a/internal/webdemo/fake_data.go b/internal/webdemo/fake_data.go
index b27b4b3..14cfc5f 100644
--- a/internal/webdemo/fake_data.go
+++ b/internal/webdemo/fake_data.go
@@ -30,6 +30,7 @@ type fakeKey struct {
RouteMode string `json:"route_mode"`
UpstreamAccountID string `json:"upstream_account_id"`
AllModels bool `json:"all_models"`
+ ShowInStats bool `json:"show_in_stats"`
Models []string `json:"models"`
Billing map[string]any `json:"billing"`
}
@@ -140,10 +141,10 @@ func fakeKeys(now time.Time) []fakeKey {
monthlyReset := time.Date(now.Year(), now.Month()+1, 1, 0, 0, 0, 0, now.Location())
monthlyStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
return []fakeKey{
- {ID: "key_default", Name: "默认用户", Secret: "demo-default-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "auto", AllModels: true, Billing: fakeBilling("50", "18.427631", "31.572369", "monthly", monthlyReset, 8, 1, monthlyStart)},
- {ID: "key_alice", Name: "Alice", Secret: "demo-alice-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "strict", UpstreamAccountID: "upstream-primary", Models: []string{"deepseek-*", "gpt-5.6-sol"}, Billing: fakeBilling("20", "6.983214", "13.016786", "weekly", now.Add(4*24*time.Hour), 4, 0, now.Add(-3*24*time.Hour))},
- {ID: "key_bob", Name: "Bob", Secret: "demo-bob-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "strict", UpstreamAccountID: "upstream-backup", Models: []string{"deepseek-v4-flash"}, Billing: fakeBilling("10", "9.764502", "0.235498", "none", time.Time{}, 2, 2, now.Add(-18*24*time.Hour))},
- {ID: "key_carol", Name: "Carol", Secret: "demo-carol-000000", MaskedSecret: "de******0000", Status: "disabled", RouteMode: "auto", Models: []string{"gpt-5.6-sol"}, Billing: fakeBilling("15", "2.154800", "12.845200", "monthly", monthlyReset, 4, 0, monthlyStart)},
+ {ID: "key_default", Name: "默认用户", Secret: "demo-default-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "auto", AllModels: true, ShowInStats: true, Billing: fakeBilling("50", "18.427631", "31.572369", "monthly", monthlyReset, 8, 1, monthlyStart)},
+ {ID: "key_alice", Name: "Alice", Secret: "demo-alice-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "strict", UpstreamAccountID: "upstream-primary", ShowInStats: true, Models: []string{"deepseek-*", "gpt-5.6-sol"}, Billing: fakeBilling("20", "6.983214", "13.016786", "weekly", now.Add(4*24*time.Hour), 4, 0, now.Add(-3*24*time.Hour))},
+ {ID: "key_bob", Name: "Bob", Secret: "demo-bob-000000", MaskedSecret: "de******0000", Status: "active", RouteMode: "strict", UpstreamAccountID: "upstream-backup", ShowInStats: true, Models: []string{"deepseek-v4-flash"}, Billing: fakeBilling("10", "9.764502", "0.235498", "none", time.Time{}, 2, 2, now.Add(-18*24*time.Hour))},
+ {ID: "key_carol", Name: "Carol", Secret: "demo-carol-000000", MaskedSecret: "de******0000", Status: "disabled", RouteMode: "auto", ShowInStats: true, Models: []string{"gpt-5.6-sol"}, Billing: fakeBilling("15", "2.154800", "12.845200", "monthly", monthlyReset, 4, 0, monthlyStart)},
}
}
diff --git a/internal/webdemo/fake_handler.go b/internal/webdemo/fake_handler.go
index 66b2fa8..8729d74 100644
--- a/internal/webdemo/fake_handler.go
+++ b/internal/webdemo/fake_handler.go
@@ -106,6 +106,7 @@ func (input *fakeInput) createKey(request *http.Request) (fakeKey, error) {
RouteMode string `json:"route_mode"`
UpstreamAccountID string `json:"upstream_account_id"`
AllModels bool `json:"all_models"`
+ ShowInStats *bool `json:"show_in_stats"`
Models []string `json:"models"`
Billing map[string]any `json:"billing"`
}
@@ -118,7 +119,11 @@ func (input *fakeInput) createKey(request *http.Request) (fakeKey, error) {
if value.Secret == "" {
value.Secret = fmt.Sprintf("demo-generated-%06d", len(input.keys)+1)
}
- key := fakeKey{ID: fmt.Sprintf("key_demo_%d", len(input.keys)+1), Name: value.Name, Secret: value.Secret, MaskedSecret: maskFakeSecret(value.Secret), Status: "active", RouteMode: value.RouteMode, UpstreamAccountID: value.UpstreamAccountID, AllModels: value.AllModels, Models: value.Models, Billing: normalizeFakeBilling(value.Billing, nil)}
+ showInStats := true
+ if value.ShowInStats != nil {
+ showInStats = *value.ShowInStats
+ }
+ key := fakeKey{ID: fmt.Sprintf("key_demo_%d", len(input.keys)+1), Name: value.Name, Secret: value.Secret, MaskedSecret: maskFakeSecret(value.Secret), Status: "active", RouteMode: value.RouteMode, UpstreamAccountID: value.UpstreamAccountID, AllModels: value.AllModels, ShowInStats: showInStats, Models: value.Models, Billing: normalizeFakeBilling(value.Billing, nil)}
input.keys = append(input.keys, key)
return key, nil
}
@@ -146,6 +151,9 @@ func (input *fakeInput) updateKey(request *http.Request) (fakeKey, error) {
if allModels, ok := value["all_models"].(bool); ok {
key.AllModels = allModels
}
+ if showInStats, ok := value["show_in_stats"].(bool); ok {
+ key.ShowInStats = showInStats
+ }
if models, ok := value["models"].([]any); ok {
key.Models = make([]string, 0, len(models))
for _, model := range models {
@@ -289,6 +297,9 @@ func (input *fakeInput) dashboard() map[string]any {
todayRecords := filterUsage(input.usage, func(record fakeUsage) bool { return !record.RequestedAt.Before(today) })
users := make([]map[string]any, 0, len(input.keys))
for _, key := range input.keys {
+ if key.Status == "archived" || !key.ShowInStats {
+ continue
+ }
records := filterUsage(input.usage, func(record fakeUsage) bool { return record.ManagedKeyID == key.ID })
current := filterUsage(records, func(record fakeUsage) bool { return !record.RequestedAt.Before(today) })
userDays := make([]map[string]any, 0, 7)
diff --git a/internal/webdemo/server_test.go b/internal/webdemo/server_test.go
index 49b6489..9b6221c 100644
--- a/internal/webdemo/server_test.go
+++ b/internal/webdemo/server_test.go
@@ -148,6 +148,44 @@ func TestFakeDashboardIncludesSevenDailyCosts(t *testing.T) {
}
}
+func TestFakeDashboardHidesArchivedUsers(t *testing.T) {
+ input := NewFakeInput().(*fakeInput)
+ archivedID := input.keys[0].ID
+ input.keys[0].Status = "archived"
+ dashboard := input.dashboard()
+ users := dashboard["users"].([]map[string]any)
+ if len(users) != len(input.keys)-1 {
+ t.Fatalf("dashboard users = %d, want %d", len(users), len(input.keys)-1)
+ }
+ for _, user := range users {
+ if user["key_id"] == archivedID {
+ t.Fatalf("archived user %q remains in dashboard", archivedID)
+ }
+ }
+ if dashboard["today"].(map[string]any)["requests"].(int) == 0 {
+ t.Fatal("archived user usage should remain in overall totals")
+ }
+}
+
+func TestFakeDashboardHidesOptedOutUsers(t *testing.T) {
+ input := NewFakeInput().(*fakeInput)
+ hiddenID := input.keys[0].ID
+ input.keys[0].ShowInStats = false
+ dashboard := input.dashboard()
+ users := dashboard["users"].([]map[string]any)
+ if len(users) != len(input.keys)-1 {
+ t.Fatalf("dashboard users = %d, want %d", len(users), len(input.keys)-1)
+ }
+ for _, user := range users {
+ if user["key_id"] == hiddenID {
+ t.Fatalf("opted-out user %q remains in dashboard", hiddenID)
+ }
+ }
+ if dashboard["today"].(map[string]any)["requests"].(int) == 0 {
+ t.Fatal("opted-out user usage should remain in overall totals")
+ }
+}
+
func TestDatabaseInputServesStandaloneBillingDatabase(t *testing.T) {
input, err := NewDatabaseInput(t.TempDir() + "/billing.db")
if err != nil {
diff --git a/scripts/package.sh b/scripts/package.sh
index f9e9562..c995df5 100755
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -6,6 +6,7 @@ version="${1:-0.1.0}"
target="linux_amd64"
name="billing_${version}_${target}"
artifact="$root/bin/billing.so"
+cpa_revision="$(git -C "$root/.externals/CLIProxyAPI" rev-parse HEAD)"
if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+([.-][0-9A-Za-z.-]+)?$ ]]; then
echo "Invalid version: $version" >&2
@@ -30,12 +31,12 @@ printf '%s\n' \
"target=linux/amd64" \
"native_abi=1" \
"rpc_schema=4" \
- "cliproxyapi_revision=85d2faddd17e6f4f8675a84ee28b131f702e8eaa+usage-context+usage-identity+request-lifecycle-cancel" \
+ "cliproxyapi_revision=${cpa_revision}+usage-context+usage-identity+request-lifecycle-cancel" \
>"$package_dir/VERSION.txt"
archive="$root/dist/$name.tar.gz"
tar -czf "$archive" -C "$stage" "$name"
-sha256sum "$archive" >"$archive.sha256"
+(cd "$root/dist" && sha256sum "$name.tar.gz" >"$name.tar.gz.sha256")
echo "Packaged: $archive"
echo "Checksum: $archive.sha256"