xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-14 22:13:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: Usage check failed due to wrong time

Browse Source 
Fixed issue causing Usage queries to fail due to time-related problems
Optimized query logic for both subscribed and non-subscribed accounts
This commit is contained in:
Clarence Dan
2023-04-30 14:33:55 +08:00
committed by GitHub
parent 3d78375204
commit 12048a42e5
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/requests.ts
View File

@@ -98,24 +98,34 @@ export async function requestChat(
export async function requestUsage() { export async function requestUsage() {
const formatDate = (d: Date) => const formatDate = (d: Date) =>
`${d.getFullYear()}-${(d.getMonth() + 1).toString().padStart(2, "0")}-${d `${d.getUTCFullYear()}-${(d.getUTCMonth() + 1).toString().padStart(2, "0")}-${d
.getDate() .getUTCDate()
.toString() .toString()
.padStart(2, "0")}`; .padStart(2, "0")}`;
const ONE_DAY = 2 * 24 * 60 * 60 * 1000; const ONE_DAY = 24 * 60 * 60 * 1000;
const now = new Date(Date.now() + ONE_DAY); const now = new Date(Date.now());
const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1); const startOfMonth = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), 1));
const startDate = formatDate(startOfMonth); const startDate = formatDate(startOfMonth);
const endDate = formatDate(now); const endDate = formatDate(now);
const startOf90Days = new Date(now.getTime() - 90 * ONE_DAY);
const startOf90DaysDate = formatDate(startOf90Days);
const [used, subs] = await Promise.all([ const subs = await requestOpenaiClient("dashboard/billing/subscription")(null, "GET");
requestOpenaiClient( const subscriptionResponse = await subs.json();
const isSubscribed = subscriptionResponse.hard_limit_usd > 20;
let usedResponse;
if (isSubscribed) {
usedResponse = await requestOpenaiClient(
`dashboard/billing/usage?start_date=${startDate}&end_date=${endDate}`, `dashboard/billing/usage?start_date=${startDate}&end_date=${endDate}`,
)(null, "GET"), )(null, "GET");
requestOpenaiClient("dashboard/billing/subscription")(null, "GET"), } else {
]); usedResponse = await requestOpenaiClient(
`dashboard/billing/usage?start_date=${startOf90DaysDate}&end_date=${endDate}`,
)(null, "GET");
}
const response = (await used.json()) as { const response = (await usedResponse.json()) as {
total_usage?: number; total_usage?: number;
error?: { error?: {
type: string; type: string;
@@ -123,7 +133,7 @@ export async function requestUsage() {
}; };
}; };
const total = (await subs.json()) as { const total = subscriptionResponse as {
hard_limit_usd?: number; hard_limit_usd?: number;
}; };
@@ -144,6 +154,7 @@ export async function requestUsage() {
used: response.total_usage, used: response.total_usage,
subscription: total.hard_limit_usd, subscription: total.hard_limit_usd,
}; };
} }
export async function requestChatStream( export async function requestChatStream(