WildDragonLLC/9router
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(grok-cli): display public subscription tier

Browse source 
Map the Grok OAuth access-token tier claim to the public plan label
and prefer it over internal /user entitlement names. Fails open to
existing plan detection for opaque or malformed tokens; upstream
remains authoritative for access and quota enforcement.
This commit is contained in:
ryanngit 2026-08-05 11:43:13 +07:00 committed by decolua
parent 948dd8f89b
commit d0751bcff7
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
open-sse/services/usage/grok-cli.js
View file

@ -91,6 +91,24 @@ function resolvePlan(user, config) {
return "Grok Build"; return "Grok Build";
} }
// Display only; upstream remains authoritative for access and quota enforcement.
function planFromAccessToken(accessToken) {
try {
const payload = JSON.parse(Buffer.from(accessToken.split(".")[1], "base64url"));
return {
0: "Free",
1: "SuperGrok",
2: "X Basic",
3: "X Premium",
4: "X Premium Plus",
5: "SuperGrok Heavy",
6: "SuperGrok Lite",
}[payload.tier] || "";
} catch {
return "";
}
}
function makeQuota({ used, total, resetAt, unlimited = false }) { function makeQuota({ used, total, resetAt, unlimited = false }) {
const safeTotal = Math.max(0, toFiniteNumber(total, 0)); const safeTotal = Math.max(0, toFiniteNumber(total, 0));
const safeUsed = Math.max(0, toFiniteNumber(used, 0)); const safeUsed = Math.max(0, toFiniteNumber(used, 0));
@ -371,6 +389,7 @@ export async function getGrokCliUsage(accessToken, providerSpecificData = null,
} }
const parsed = parseGrokCliBilling(billing, user); const parsed = parseGrokCliBilling(billing, user);
parsed.plan = planFromAccessToken(accessToken) || parsed.plan;
if (!parsed.quotas || Object.keys(parsed.quotas).length === 0) { if (!parsed.quotas || Object.keys(parsed.quotas).length === 0) {
// Paid SuperGrok often returns cap=0 over REST but exposes the shared // Paid SuperGrok often returns cap=0 over REST but exposes the shared

12
tests/unit/grok-cli-usage.test.js
View file

@ -226,6 +226,11 @@ function binaryResponse(buffer, status = 200) {
}); });
} }
function accessTokenWithTier(tier) {
const payload = Buffer.from(JSON.stringify({ tier })).toString("base64url");
return `header.${payload}.signature`;
}
const EMPTY_GRPC_WEB_FRAME = Buffer.from([0, 0, 0, 0, 0]); const EMPTY_GRPC_WEB_FRAME = Buffer.from([0, 0, 0, 0, 0]);
const GRPC_CREDITS_URL = const GRPC_CREDITS_URL =
"https://grok.com/grok_api_v2.GrokBuildBilling/GetGrokCreditsConfig"; "https://grok.com/grok_api_v2.GrokBuildBilling/GetGrokCreditsConfig";
@ -311,6 +316,7 @@ describe("getUsageForProvider(grok-cli)", () => {
}); });
it("falls back to GetGrokCreditsConfig gRPC when paid sub has no REST numeric quota", async () => { it("falls back to GetGrokCreditsConfig gRPC when paid sub has no REST numeric quota", async () => {
const accessToken = accessTokenWithTier(5);
const resetSeconds = 1784825940; const resetSeconds = 1784825940;
const resetNanos = 867850000; const resetNanos = 867850000;
const resetAt = new Date( const resetAt = new Date(
@ -329,11 +335,11 @@ describe("getUsageForProvider(grok-cli)", () => {
const usage = await getUsageForProvider({ const usage = await getUsageForProvider({
provider: "grok-cli", provider: "grok-cli",
accessToken: "test-token", accessToken,
}); });
expect(usage.message).toBeUndefined(); expect(usage.message).toBeUndefined();
expect(usage.plan).toBe("XPremiumPlus"); expect(usage.plan).toBe("SuperGrok Heavy");
expect(usage.quotas["Weekly SuperGrok"]).toMatchObject({ expect(usage.quotas["Weekly SuperGrok"]).toMatchObject({
used: 35, used: 35,
total: 100, total: 100,
@ -345,7 +351,7 @@ describe("getUsageForProvider(grok-cli)", () => {
const grpcCall = proxyAwareFetch.mock.calls[2]; const grpcCall = proxyAwareFetch.mock.calls[2];
expect(grpcCall[0]).toBe(GRPC_CREDITS_URL); expect(grpcCall[0]).toBe(GRPC_CREDITS_URL);
expect(grpcCall[1].method).toBe("POST"); expect(grpcCall[1].method).toBe("POST");
expect(grpcCall[1].headers.Authorization).toBe("Bearer test-token"); expect(grpcCall[1].headers.Authorization).toBe(`Bearer ${accessToken}`);
expect(grpcCall[1].headers["Content-Type"]).toBe("application/grpc-web+proto"); expect(grpcCall[1].headers["Content-Type"]).toBe("application/grpc-web+proto");
expect(grpcCall[1].headers["X-Grpc-Web"]).toBe("1"); expect(grpcCall[1].headers["X-Grpc-Web"]).toBe("1");
// Empty gRPC-web request frame is required (flag 0 + length 0) // Empty gRPC-web request frame is required (flag 0 + length 0)