opencode-glm-quota 1.1.0 → 1.2.0

package/dist/api/client.js

@@ -2,7 +2,7 @@
  * HTTP client module
  * Makes HTTPS requests to Z.ai API endpoints
  */
-import * as https from 'https';
+import * as https from 'node:https';
 /**
  * Make HTTPS request to API endpoint
  * @param options - Request options

package/dist/index.js

@@ -13,6 +13,7 @@ import { getEndpoints } from "./api/endpoints.js";
 import { queryEndpoint } from "./api/client.js";
 import { getTimeWindow, getTimeWindowQueryParams } from "./utils/time-window.js";
 import { formatProgressLine } from "./utils/progress-bar.js";
+import { formatTimeUntilReset } from "./utils/reset-timer.js";
 // ============================================================================
 // CONSTANTS
 // ============================================================================
@@ -128,7 +129,8 @@ function processQuotaLimit(data) {
                 if (limit.type === 'TOKENS_LIMIT') {
                     return {
                         type: 'Token usage(5 Hour)',
-                        percentage: typeof limit.percentage === 'number' ? limit.percentage : 0
+                        percentage: typeof limit.percentage === 'number' ? limit.percentage : 0,
+                        nextResetTime: limit.nextResetTime
                     };
                 }
                 if (limit.type === 'TIME_LIMIT') {
@@ -156,38 +158,55 @@ function formatNumber(num) {
     return num.toLocaleString('en-US');
 }
 /**
- * Format model usage data as readable lines
+ * Get token limit information from quota data
  */
-function formatModelUsage(data, quotaData) {
-    const lines = [];
-    const totalUsage = data.totalUsage;
-    // Find token limit info from quota
+function getTokenLimitInfo(quotaData) {
     let tokenLimit = 40000000; // Default 40M
     let tokenPct = 0;
-    if (quotaData?.limits) {
-        for (const limit of quotaData.limits) {
-            if (limit.type === 'Token usage(5 Hour)') {
-                tokenPct = typeof limit.percentage === 'number' ? limit.percentage : 0;
-                tokenLimit = limit.total || 40000000;
-                break;
-            }
+    if (!quotaData?.limits)
+        return { tokenLimit, tokenPct };
+    for (const limit of quotaData.limits) {
+        if (limit.type === 'Token usage(5 Hour)') {
+            tokenPct = typeof limit.percentage === 'number' ? limit.percentage : 0;
+            tokenLimit = limit.total || 40000000;
+            break;
         }
     }
-    if (totalUsage) {
-        const calls = totalUsage.totalModelCallCount;
-        const tokens = totalUsage.totalTokensUsage;
-        if (tokens !== undefined) {
-            // Show 24h tokens and percentage relative to 5h limit
-            const pct24h = Math.round((tokens / tokenLimit) * 100);
-            lines.push(`  Total Tokens (24h): ${formatNumber(tokens)} (${pct24h}% of 5h limit)`);
-            lines.push(`  5h Window Usage: ${tokenPct}% of ${formatNumber(tokenLimit)}`);
-        }
-        if (calls !== undefined) {
-            lines.push(`  Total Calls: ${formatNumber(calls)}`);
-        }
+    return { tokenLimit, tokenPct };
+}
+/**
+ * Format MCP tool details as readable lines
+ */
+function formatMcpToolLines(details) {
+    const lines = [];
+    const mcpTotal = details.reduce((sum, d) => sum + (d.usage || 0), 0);
+    for (const d of details) {
+        const pct = mcpTotal > 0 ? Math.round((d.usage / mcpTotal) * 100) : 0;
+        lines.push(`    - ${d.modelCode}: ${d.usage} (${pct}%)`);
     }
-    else {
+    return lines;
+}
+/**
+ * Format model usage data as readable lines
+ */
+function formatModelUsage(data, quotaData) {
+    const lines = [];
+    const totalUsage = data.totalUsage;
+    // Get token limit info from quota
+    const { tokenLimit, tokenPct } = getTokenLimitInfo(quotaData);
+    if (!totalUsage) {
         lines.push('  No usage data');
+        return lines;
+    }
+    const calls = totalUsage.totalModelCallCount;
+    const tokens = totalUsage.totalTokensUsage;
+    if (tokens !== undefined) {
+        // Show 24h tokens and percentage relative to 5h limit
+        const pct24h = Math.round((tokens / tokenLimit) * 100);
+        lines.push(`  Total Tokens (24h): ${formatNumber(tokens)} (${pct24h}% of 5h limit)`, `  5h Window Usage: ${tokenPct}% of ${formatNumber(tokenLimit)}`);
+    }
+    if (calls !== undefined) {
+        lines.push(`  Total Calls: ${formatNumber(calls)}`);
     }
     return lines;
 }
@@ -202,24 +221,15 @@ function formatToolUsage(data, quotaData) {
         const search = totalUsage.totalNetworkSearchCount;
         const webRead = totalUsage.totalWebReadMcpCount;
         const zread = totalUsage.totalZreadMcpCount;
-        if (search !== undefined)
-            lines.push(`  Network Searches: ${formatNumber(search)}`);
-        if (webRead !== undefined)
-            lines.push(`  Web Reads: ${formatNumber(webRead)}`);
-        if (zread !== undefined)
-            lines.push(`  ZRead Calls: ${formatNumber(zread)}`);
+        lines.push(...(search !== undefined ? [`  Network Searches: ${formatNumber(search)}`] : []), ...(webRead !== undefined ? [`  Web Reads: ${formatNumber(webRead)}`] : []), ...(zread !== undefined ? [`  ZRead Calls: ${formatNumber(zread)}`] : []));
     }
     // Show MCP usage details from quota if available
     if (quotaData?.limits) {
         for (const limit of quotaData.limits) {
             if (limit.type === 'MCP usage(1 Month)' && limit.usageDetails) {
-                const details = limit.usageDetails;
                 lines.push('  MCP Tool Details:');
-                const mcpTotal = details.reduce((sum, d) => sum + (d.usage || 0), 0);
-                for (const d of details) {
-                    const pct = mcpTotal > 0 ? Math.round((d.usage / mcpTotal) * 100) : 0;
-                    lines.push(`    - ${d.modelCode}: ${d.usage} (${pct}%)`);
-                }
+                const details = limit.usageDetails;
+                lines.push(...formatMcpToolLines(details));
                 break;
             }
         }
@@ -229,46 +239,65 @@ function formatToolUsage(data, quotaData) {
     }
     return lines;
 }
+// ============================================================================
+// HELPER FUNCTIONS FOR OUTPUT FORMATTING
+// ============================================================================
 /**
- * Format usage statistics as ASCII table
- * @param platform - Platform name
+ * Format a single line with box characters
+ * @param content - Content to display (without padding)
+ * @param lineIndent - Total line width after padding
+ * @returns Formatted line with box characters
+ */
+function formatBoxLine(content, lineIndent) {
+    return '║  ' + content.padEnd(lineIndent) + '║';
+}
+/**
+ * Format header section
+ * @param platformName - Platform name
  * @param startTime - Start time string
  * @param endTime - End time string
- * @param quotaData - Quota limit data
- * @param modelData - Model usage data
- * @param toolData - Tool usage data
- * @returns Formatted output string
+ * @returns Array of header lines
  */
-function formatOutput(platform, startTime, endTime, quotaData, modelData, toolData) {
+function formatHeader(platformName, startTime, endTime) {
     const lines = [];
-    const platformName = getPlatformName(platform);
-    // Constants for line width (total 60 chars)
     const LINE_WIDTH = 60;
-    const LINE_CONTENT = 58; // Between ║ and ║
-    const LINE_INDENT = 56; // After "║  "
-    // Header
     lines.push('╔' + '═'.repeat(58) + '╗');
     lines.push('║' + ' '.repeat(58) + '║');
     lines.push('║' + ' Z.ai GLM Coding Plan Usage Statistics '.padStart(35).padEnd(58) + '║');
     lines.push('║' + ' '.repeat(58) + '║');
     lines.push('╠' + '═'.repeat(58) + '╣');
-    // Platform line: "║  Platform: " (13 chars) + name + padding + "║"
     lines.push('║  Platform: ' + platformName.padEnd(LINE_WIDTH - 13 - 1) + '║');
-    // Period line: "║  Period:   " (14 chars) + start + " → " + end + "║"
     const periodLine = '║  Period:   ' + startTime + ' → ' + endTime;
     lines.push(periodLine.padEnd(LINE_WIDTH) + '║');
     lines.push('╠' + '═'.repeat(58) + '╣');
-    // Quota Limits
+    return lines;
+}
+/**
+ * Format quota limits section
+ * @param quotaData - Quota limit data
+ * @returns Array of quota lines
+ */
+function formatQuotaLimits(quotaData) {
+    const lines = [];
+    const LINE_CONTENT = 58;
+    const LINE_INDENT = 56;
     lines.push('║  📊 QUOTA LIMITS' + ' '.repeat(LINE_CONTENT - 14) + '║');
     lines.push('╟' + '─'.repeat(58) + '╢');
-    if (quotaData?.limits && Array.isArray(quotaData.limits)) {
-        for (const limit of quotaData.limits) {
+    const limits = quotaData?.limits;
+    if (limits && Array.isArray(limits)) {
+        for (const limit of limits) {
             const pct = typeof limit.percentage === 'number' ? limit.percentage : 0;
             const line = formatProgressLine(limit.type || 'Unknown', pct);
-            lines.push('║  ' + line.padEnd(LINE_INDENT) + '║');
+            lines.push(formatBoxLine(line, LINE_INDENT));
+            if (limit.nextResetTime !== undefined) {
+                const resetMsg = formatTimeUntilReset(limit.nextResetTime);
+                if (resetMsg) {
+                    lines.push(formatBoxLine(resetMsg, LINE_INDENT));
+                }
+            }
             if (limit.currentValue !== undefined && limit.total !== undefined) {
                 const usageStr = '       Used: ' + limit.currentValue + '/' + limit.total;
-                lines.push('║  ' + usageStr.padEnd(LINE_INDENT) + '║');
+                lines.push(formatBoxLine(usageStr, LINE_INDENT));
             }
         }
     }
@@ -276,33 +305,60 @@ function formatOutput(platform, startTime, endTime, quotaData, modelData, toolDa
         lines.push('║  No quota data available' + ' '.repeat(LINE_INDENT - 21) + '║');
     }
     lines.push('╠' + '═'.repeat(58) + '╣');
-    // Model Usage
-    lines.push('║  🤖 MODEL USAGE (24h)' + ' '.repeat(LINE_INDENT - 17) + '║');
+    return lines;
+}
+/**
+ * Format data section with optional data
+ * @param title - Section title
+ * @param data - Data object or null
+ * @param formatter - Function to format data if present
+ * @param noDataMessage - Message to show if no data
+ * @param LINE_INDENT - Line indent width
+ * @returns Array of section lines
+ */
+function formatDataSection(title, data, formatter, quotaData, noDataMessage, LINE_INDENT) {
+    const lines = [];
+    const LINE_CONTENT = 58;
+    lines.push('║  ' + title + ' '.repeat(LINE_CONTENT - title.length) + '║');
     lines.push('╟' + '─'.repeat(58) + '╢');
-    if (modelData) {
-        const modelLines = formatModelUsage(modelData, quotaData);
-        for (const line of modelLines) {
-            lines.push('║  ' + line.padEnd(LINE_INDENT) + '║');
+    if (data) {
+        const formattedLines = formatter(data, quotaData);
+        for (const line of formattedLines) {
+            lines.push(formatBoxLine(line, LINE_INDENT));
         }
     }
     else {
-        lines.push('║  No model usage data available' + ' '.repeat(LINE_INDENT - 25) + '║');
+        lines.push('║  ' + noDataMessage + ' '.repeat(LINE_INDENT - noDataMessage.length) + '║');
     }
     lines.push('╠' + '═'.repeat(58) + '╣');
-    // Tool Usage
-    lines.push('║  🔧 TOOL/MCP USAGE (24h)' + ' '.repeat(LINE_INDENT - 20) + '║');
-    lines.push('╟' + '─'.repeat(58) + '╢');
-    if (toolData) {
-        const toolLines = formatToolUsage(toolData, quotaData);
-        for (const line of toolLines) {
-            lines.push('║  ' + line.padEnd(LINE_INDENT) + '║');
-        }
-    }
-    else {
-        lines.push('║  No tool usage data available' + ' '.repeat(LINE_INDENT - 24) + '║');
-    }
-    // Footer
-    lines.push('╚' + '═'.repeat(58) + '╝');
+    return lines;
+}
+/**
+ * Format footer section
+ * @returns Footer lines
+ */
+function formatFooter() {
+    return ['╚' + '═'.repeat(58) + '╝'];
+}
+/**
+ * Format usage statistics as ASCII table
+ * @param platform - Platform name
+ * @param startTime - Start time string
+ * @param endTime - End time string
+ * @param quotaData - Quota limit data
+ * @param modelData - Model usage data
+ * @param toolData - Tool usage data
+ * @returns Formatted output string
+ */
+function formatOutput(platform, startTime, endTime, quotaData, modelData, toolData) {
+    const lines = [];
+    const platformName = getPlatformName(platform);
+    const LINE_INDENT = 56;
+    lines.push(...formatHeader(platformName, startTime, endTime));
+    lines.push(...formatQuotaLimits(quotaData));
+    lines.push(...formatDataSection('🤖 MODEL USAGE (24h)', modelData, formatModelUsage, quotaData, 'No model usage data available', LINE_INDENT));
+    lines.push(...formatDataSection('🔧 TOOL/MCP USAGE (24h)', toolData, formatToolUsage, quotaData, 'No tool usage data available', LINE_INDENT));
+    lines.push(...formatFooter());
     return lines.join('\n');
 }
 // ============================================================================

package/dist/utils/date-formatter.js

@@ -22,10 +22,11 @@ export function formatDateTime(date) {
  * @returns Date object
  */
 export function parseDateTime(dateTime) {
-    const match = dateTime.match(/^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
+    const dateTimeRegex = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/;
+    const match = dateTimeRegex.exec(dateTime);
     if (!match) {
         throw new Error(`Invalid datetime format: ${dateTime}`);
     }
     const [, year, month, day, hours, minutes, seconds] = match;
-    return new Date(parseInt(year), parseInt(month) - 1, parseInt(day), parseInt(hours), parseInt(minutes), parseInt(seconds));
+    return new Date(Number.parseInt(year), Number.parseInt(month) - 1, Number.parseInt(day), Number.parseInt(hours), Number.parseInt(minutes), Number.parseInt(seconds));
 }

package/dist/utils/reset-timer.js

@@ -0,0 +1,31 @@
+/**
+ * Reset timer utility module
+ * Formats Unix timestamps to human-readable countdown strings
+ */
+/**
+ * Format time until reset as "X hours Y minutes"
+ * @param resetTime - Unix timestamp in milliseconds (from API's nextResetTime field)
+ * @returns Human-readable countdown string or empty string if invalid/past
+ */
+export function formatTimeUntilReset(resetTime) {
+    // Validate input
+    if (resetTime === null || resetTime === undefined) {
+        return '';
+    }
+    // Check if valid number
+    if (typeof resetTime !== 'number' || Number.isNaN(resetTime) || resetTime < 0) {
+        return '';
+    }
+    // Calculate time difference
+    const now = Date.now();
+    const diffMs = resetTime - now;
+    // Return empty for past timestamps
+    if (diffMs <= 0) {
+        return '';
+    }
+    // Convert to hours and minutes
+    const totalMinutes = Math.floor(diffMs / (1000 * 60));
+    const hours = Math.floor(totalMinutes / 60);
+    const minutes = totalMinutes % 60;
+    return `Resets in ${hours} hours ${minutes} minutes`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-glm-quota",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "description": "OpenCode plugin to query Z.ai GLM Coding Plan usage statistics including quota limits, model usage, and MCP tool usage",
   "main": "dist/index.js",
@@ -14,7 +14,8 @@
     "build": "tsc",
     "clean": "rm -rf dist",
     "prepublishOnly": "npm run clean && npm run build",
-    "test": "tsx --test",
+    "test": "tsx --test $(find tests -name '*.test.ts' -type f)",
+    "test:coverage": "c8 --reporter=lcov --reporter=text -- npm test",
     "lint": "eslint src/"
   },
   "keywords": [
@@ -49,10 +50,12 @@
   "devDependencies": {
     "@opencode-ai/plugin": "latest",
     "@types/node": "^20.0.0",
-    "tsx": "^4.0.0",
-    "typescript": "^5.0.0",
-    "eslint": "^8.0.0",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0"
+    "@typescript-eslint/parser": "^6.0.0",
+    "baseline-browser-mapping": "^2.9.17",
+    "c8": "^10.1.3",
+    "eslint": "^8.0.0",
+    "tsx": "^4.0.0",
+    "typescript": "^5.0.0"
   }
 }