npm - zevairouter - Versions diffs - 1.0.90 → 1.0.92 - Mend

zevairouter 1.0.90 → 1.0.92

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (564) hide show

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+Minimal PTY bridge for ZevaiRouter web terminal.
+stdin  -> PTY master (keystrokes)
+stdout <- PTY master (shell output), raw binary
+stderr  = control / errors (utf-8 text lines)
+Optional control on a side channel is not needed: resize arrives as
+OSC-like escape on stdin:  \\x1b]9999;<cols>;<rows>\\x07
+"""
+from __future__ import annotations
+import errno
+import fcntl
+import os
+import select
+import signal
+import struct
+import sys
+import termios
+def set_winsize(fd: int, rows: int, cols: int) -> None:
+    try:
+        packed = struct.pack("HHHH", max(5, rows), max(20, cols), 0, 0)
+        fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
+    except Exception:
+        pass
+def main() -> int:
+    cols = int(sys.argv[1]) if len(sys.argv) > 1 else 120
+    rows = int(sys.argv[2]) if len(sys.argv) > 2 else 40
+    shell = os.environ.get("SHELL") or ("/bin/bash" if os.path.exists("/bin/bash") else "/bin/sh")
+    cwd = os.path.expanduser("~")
+    pid, master = pty_fork = _fork_pty()
+    if pid == 0:
+        # child
+        try:
+            os.chdir(cwd)
+        except Exception:
+            pass
+        os.environ.setdefault("TERM", "xterm-256color")
+        os.environ.setdefault("COLORTERM", "truecolor")
+        os.environ.setdefault("FORCE_COLOR", "1")
+        try:
+            os.execv(shell, [shell, "-il"])
+        except Exception:
+            os.execv("/bin/sh", ["/bin/sh", "-i"])
+        return 1
+    set_winsize(master, rows, cols)
+    # Non-blocking master + stdin
+    for fd in (master, sys.stdin.fileno()):
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+    # Binary stdout
+    stdout = sys.stdout.buffer
+    stdin = sys.stdin.buffer
+    resize_buf = b""
+    def handle_resize_escape(chunk: bytes) -> bytes:
+        """Strip and apply embedded resize escapes, return remaining bytes."""
+        nonlocal resize_buf
+        data = resize_buf + chunk
+        out = bytearray()
+        i = 0
+        while i < len(data):
+            # ESC ] 9999 ; cols ; rows BEL
+            if data[i] == 0x1B and data[i : i + 6] == b"\x1b]9999;":
+                end = data.find(b"\x07", i + 6)
+                if end < 0:
+                    resize_buf = data[i:]
+                    return bytes(out)
+                payload = data[i + 6 : end].decode("ascii", "ignore")
+                try:
+                    c_s, r_s = payload.split(";", 1)
+                    set_winsize(master, int(r_s), int(c_s))
+                except Exception:
+                    pass
+                i = end + 1
+                resize_buf = b""
+                continue
+            out.append(data[i])
+            i += 1
+        resize_buf = b""
+        return bytes(out)
+    alive = True
+    def on_chld(signum, frame):  # noqa: ARG001
+        nonlocal alive
+        alive = False
+    signal.signal(signal.SIGCHLD, on_chld)
+    try:
+        while alive:
+            try:
+                r, _, _ = select.select([master, sys.stdin.fileno()], [], [], 0.25)
+            except InterruptedError:
+                continue
+            if master in r:
+                try:
+                    data = os.read(master, 8192)
+                except OSError as e:
+                    if e.errno in (errno.EIO, errno.EAGAIN, errno.EWOULDBLOCK):
+                        data = b""
+                    else:
+                        break
+                if not data:
+                    # EIO often means child exited
+                    if not alive:
+                        break
+                else:
+                    stdout.write(data)
+                    stdout.flush()
+            if sys.stdin.fileno() in r:
+                try:
+                    data = stdin.read(8192)
+                except Exception:
+                    data = b""
+                if data is None:
+                    data = b""
+                if data == b"" and not alive:
+                    break
+                if data:
+                    cleaned = handle_resize_escape(data)
+                    if cleaned:
+                        try:
+                            os.write(master, cleaned)
+                        except OSError:
+                            break
+    finally:
+        try:
+            os.close(master)
+        except Exception:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except Exception:
+            pass
+    return 0
+def _fork_pty():
+    import pty
+    return pty.fork()
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        raise SystemExit(0)

@@ -0,0 +1,163 @@
+#!/usr/bin/env python3
+"""
+Minimal PTY bridge for ZevaiRouter web terminal.
+stdin  -> PTY master (keystrokes)
+stdout <- PTY master (shell output), raw binary
+stderr  = control / errors (utf-8 text lines)
+Optional control on a side channel is not needed: resize arrives as
+OSC-like escape on stdin:  \\x1b]9999;<cols>;<rows>\\x07
+"""
+from __future__ import annotations
+import errno
+import fcntl
+import os
+import select
+import signal
+import struct
+import sys
+import termios
+def set_winsize(fd: int, rows: int, cols: int) -> None:
+    try:
+        packed = struct.pack("HHHH", max(5, rows), max(20, cols), 0, 0)
+        fcntl.ioctl(fd, termios.TIOCSWINSZ, packed)
+    except Exception:
+        pass
+def main() -> int:
+    cols = int(sys.argv[1]) if len(sys.argv) > 1 else 120
+    rows = int(sys.argv[2]) if len(sys.argv) > 2 else 40
+    shell = os.environ.get("SHELL") or ("/bin/bash" if os.path.exists("/bin/bash") else "/bin/sh")
+    cwd = os.path.expanduser("~")
+    pid, master = pty_fork = _fork_pty()
+    if pid == 0:
+        # child
+        try:
+            os.chdir(cwd)
+        except Exception:
+            pass
+        os.environ.setdefault("TERM", "xterm-256color")
+        os.environ.setdefault("COLORTERM", "truecolor")
+        os.environ.setdefault("FORCE_COLOR", "1")
+        try:
+            os.execv(shell, [shell, "-il"])
+        except Exception:
+            os.execv("/bin/sh", ["/bin/sh", "-i"])
+        return 1
+    set_winsize(master, rows, cols)
+    # Non-blocking master + stdin
+    for fd in (master, sys.stdin.fileno()):
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+    # Binary stdout
+    stdout = sys.stdout.buffer
+    stdin = sys.stdin.buffer
+    resize_buf = b""
+    def handle_resize_escape(chunk: bytes) -> bytes:
+        """Strip and apply embedded resize escapes, return remaining bytes."""
+        nonlocal resize_buf
+        data = resize_buf + chunk
+        out = bytearray()
+        i = 0
+        while i < len(data):
+            # ESC ] 9999 ; cols ; rows BEL
+            if data[i] == 0x1B and data[i : i + 6] == b"\x1b]9999;":
+                end = data.find(b"\x07", i + 6)
+                if end < 0:
+                    resize_buf = data[i:]
+                    return bytes(out)
+                payload = data[i + 6 : end].decode("ascii", "ignore")
+                try:
+                    c_s, r_s = payload.split(";", 1)
+                    set_winsize(master, int(r_s), int(c_s))
+                except Exception:
+                    pass
+                i = end + 1
+                resize_buf = b""
+                continue
+            out.append(data[i])
+            i += 1
+        resize_buf = b""
+        return bytes(out)
+    alive = True
+    def on_chld(signum, frame):  # noqa: ARG001
+        nonlocal alive
+        alive = False
+    signal.signal(signal.SIGCHLD, on_chld)
+    try:
+        while alive:
+            try:
+                r, _, _ = select.select([master, sys.stdin.fileno()], [], [], 0.25)
+            except InterruptedError:
+                continue
+            if master in r:
+                try:
+                    data = os.read(master, 8192)
+                except OSError as e:
+                    if e.errno in (errno.EIO, errno.EAGAIN, errno.EWOULDBLOCK):
+                        data = b""
+                    else:
+                        break
+                if not data:
+                    # EIO often means child exited
+                    if not alive:
+                        break
+                else:
+                    stdout.write(data)
+                    stdout.flush()
+            if sys.stdin.fileno() in r:
+                try:
+                    data = stdin.read(8192)
+                except Exception:
+                    data = b""
+                if data is None:
+                    data = b""
+                if data == b"" and not alive:
+                    break
+                if data:
+                    cleaned = handle_resize_escape(data)
+                    if cleaned:
+                        try:
+                            os.write(master, cleaned)
+                        except OSError:
+                            break
+    finally:
+        try:
+            os.close(master)
+        except Exception:
+            pass
+        try:
+            os.waitpid(pid, 0)
+        except Exception:
+            pass
+    return 0
+def _fork_pty():
+    import pty
+    return pty.fork()
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except KeyboardInterrupt:
+        raise SystemExit(0)

package/cli/app/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"

package/cli/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter-cli",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "ZevaiRouter CLI - Start and manage ZevaiRouter server",
   "bin": {
     "zevai": "./cli.js"

package/open-sse/services/usage.js CHANGED Viewed

@@ -131,6 +131,8 @@ export async function getUsageForProvider(connection, proxyOptions = null) {
       return await getMiniMaxUsage(apiKey, provider, proxyOptions);
     case "grok-cli":
       return await getGrokCliUsage(accessToken, providerSpecificData, proxyOptions);
+    case "cloudflare-ai":
+      return await getCloudflareAiUsage(apiKey || accessToken, providerSpecificData, proxyOptions);
     case "xai":
       return await getXaiUsage(accessToken || apiKey, providerSpecificData, proxyOptions);
     case "cline":
@@ -1814,6 +1816,94 @@ async function getAutoclawUsage(accessToken, proxyOptions = null, connection = n
   }
 }
+// ─── Cloudflare Workers AI ──────────────────────────────────────────────────
+/**
+ * Cloudflare does not expose remaining free-tier "neurons" via a public API.
+ * Verify the token + account and surface a clear "Workers AI free tier" row so
+ * the quota page is not blank for cloudflare-ai connections.
+ */
+export async function getCloudflareAiUsage(apiKey, providerSpecificData = null, proxyOptions = null) {
+  const token = String(apiKey || "").trim();
+  const accountId = String(providerSpecificData?.accountId || "").trim();
+  if (!token) {
+    return { message: "Cloudflare API token not available." };
+  }
+  if (!accountId) {
+    return { message: "Cloudflare account ID missing. Re-import or edit the connection." };
+  }
+  try {
+    const verifyRes = await proxyAwareFetch(
+      "https://api.cloudflare.com/client/v4/user/tokens/verify",
+      {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          Accept: "application/json",
+        },
+      },
+      proxyOptions,
+    );
+    if (verifyRes.status === 401 || verifyRes.status === 403) {
+      return { message: "Cloudflare API token invalid or expired. Re-import the account." };
+    }
+    if (!verifyRes.ok) {
+      const errText = await verifyRes.text().catch(() => "");
+      return {
+        message: `Cloudflare token verify failed (${verifyRes.status})${errText ? `: ${errText.slice(0, 160)}` : ""}`,
+      };
+    }
+    const verifyBody = await verifyRes.json().catch(() => null);
+    const status = verifyBody?.result?.status || (verifyBody?.success ? "active" : "unknown");
+    // Light account touch — confirms accountId + Workers AI scope without spending neurons.
+    const acctRes = await proxyAwareFetch(
+      `https://api.cloudflare.com/client/v4/accounts/${encodeURIComponent(accountId)}`,
+      {
+        method: "GET",
+        headers: {
+          Authorization: `Bearer ${token}`,
+          Accept: "application/json",
+        },
+      },
+      proxyOptions,
+    ).catch(() => null);
+    let accountName = providerSpecificData?.accountName || "";
+    if (acctRes?.ok) {
+      const acctBody = await acctRes.json().catch(() => null);
+      accountName = acctBody?.result?.name || accountName;
+    } else if (acctRes && (acctRes.status === 401 || acctRes.status === 403)) {
+      return {
+        message: "Cloudflare token cannot access this account. Check accountId / token permissions.",
+      };
+    }
+    return {
+      plan: accountName ? `Workers AI · ${accountName}` : "Workers AI Free Tier",
+      quotas: {
+        "Workers AI": {
+          used: 0,
+          total: 0,
+          remainingPercentage: 100,
+          resetAt: null,
+          unlimited: true,
+        },
+      },
+      message:
+        status && status !== "active"
+          ? `Token status: ${status}. Cloudflare does not publish remaining free-tier neurons via API.`
+          : "Cloudflare does not publish remaining free-tier neurons via API. Token is valid — per-model rate limits still apply.",
+    };
+  } catch (error) {
+    return { message: `Cloudflare usage error: ${error.message}` };
+  }
+}
 // ─── Grok CLI / Grok Build usage (cli-chat-proxy.grok.com) ─────────────────
 function unwrapGrokCliVal(value, fallback = 0) {
@@ -1931,8 +2021,21 @@ export function parseGrokCliBilling(billing, user = null) {
   const hasIncludedAccess =
     user?.hasGrokCodeAccess === true || config?.isUnifiedBillingUser === true;
-  if (Object.keys(quotas).length === 0 && hasIncludedAccess) {
-    // Soft "included" pool so UI shows green / usable, not red 0%.
+  // Always surface Grok Code / included access when the account still has it —
+  // even if On-demand/Prepaid rows also exist. Previously we only added this
+  // when quotas was empty, so free Grok Code looked like "no quota data".
+  if (hasIncludedAccess) {
+    quotas["Grok Code"] = {
+      used: 0,
+      total: 0,
+      remainingPercentage: 100,
+      resetAt: periodEnd,
+      unlimited: true,
+    };
+  }
+  // Soft fallback when billing returns nothing usable (no caps, no access flags).
+  if (Object.keys(quotas).length === 0) {
     quotas["Included"] = {
       used: 0,
       total: 0,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zevairouter",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "description": "Self-hosted AI router: many providers, one OpenAI-compatible /v1 endpoint and dashboard",
   "bin": {
     "zevai": "./cli/cli.js"

package/src/app/(dashboard)/dashboard/usage/components/ProviderLimits/ProviderLimitCard.js CHANGED Viewed

@@ -5,7 +5,7 @@ import Card from "@/shared/components/Card";
 import ProviderIcon from "@/shared/components/ProviderIcon";
 import Badge from "@/shared/components/Badge";
 import QuotaProgressBar from "./QuotaProgressBar";
-import { calculatePercentage } from "./utils";
+import { getRemainingPercentage } from "./utils";
 const planVariants = {
   free: "default",
@@ -145,16 +145,14 @@ export default function ProviderLimitCard({
         </div>
       )}
-      {/* Quota Progress Bars */}
-      {!loading && !error && !message && quotas?.length > 0 && (
+      {/* Quota Progress Bars — show even when a soft info message is present */}
+      {!loading && !error && quotas?.length > 0 && (
         <div className="space-y-4">
           {quotas.map((quota, index) => {
-            // For Antigravity, use remainingPercentage if available, otherwise calculate
-            const percentage =
-              quota.remainingPercentage !== undefined
-                ? Math.round(((quota.total - quota.used) / quota.total) * 100)
-                : calculatePercentage(quota.used, quota.total);
-            const unlimited = quota.total === 0 || quota.total === null;
+            const unlimited =
+              quota.unlimited === true || quota.total === 0 || quota.total === null;
+            // Never recompute from used/total when total is 0 (NaN) — use remainingPercentage.
+            const percentage = getRemainingPercentage(quota);
             return (
               <QuotaProgressBar
@@ -162,7 +160,7 @@ export default function ProviderLimitCard({
                 label={quota.name}
                 used={quota.used}
                 total={quota.total}
-                percentage={percentage}
+                percentage={Number.isFinite(percentage) ? percentage : unlimited ? 100 : 0}
                 unlimited={unlimited}
                 resetTime={quota.resetAt}
               />
@@ -172,7 +170,7 @@ export default function ProviderLimitCard({
       )}
       {/* Empty State */}
-      {!loading && !error && !message && quotas?.length === 0 && (
+      {!loading && !error && !message && (!quotas || quotas.length === 0) && (
         <div className="text-center py-8 text-text-muted">
           <span className="material-symbols-outlined text-[48px] opacity-20">
             data_usage

package/src/app/(dashboard)/dashboard/usage/components/ProviderLimits/QuotaProgressBar.js CHANGED Viewed

@@ -93,20 +93,20 @@ export default function QuotaProgressBar({
         </div>
       </div>
-      {/* Progress bar */}
-      {!unlimited && (
-        <div className={cn("h-2 rounded-full overflow-hidden", colors.bgLight)}>
-          <div
-            className={cn("h-full transition-all duration-300", colors.bg)}
-            style={{ width: `${Math.min(remaining, 100)}%` }}
-          />
-        </div>
-      )}
+      {/* Progress bar — unlimited pools still show a full green bar so quota is visible */}
+      <div className={cn("h-2 rounded-full overflow-hidden", colors.bgLight)}>
+        <div
+          className={cn("h-full transition-all duration-300", colors.bg)}
+          style={{ width: `${Math.min(Math.max(remaining, unlimited ? 100 : 0), 100)}%` }}
+        />
+      </div>
       {/* Usage details and countdown */}
       <div className="flex items-center justify-between text-xs text-text-muted">
         <span>
-          {used.toLocaleString()} / {total.toLocaleString()} requests
+          {unlimited
+            ? "Included / unlimited"
+            : `${used.toLocaleString()} / ${total > 0 ? total.toLocaleString() : "∞"}`}
         </span>
         {countdown !== "-" && (
           <div className="flex items-center gap-1">

package/src/app/(dashboard)/dashboard/usage/components/ProviderLimits/QuotaTable.js CHANGED Viewed

@@ -181,10 +181,12 @@ export default function QuotaTable({
                       <div className={`flex items-center justify-between ${compact ? "text-[10px]" : "text-xs"}`}>
                         <span className="text-text-muted">
-                          {quota.used.toLocaleString()} / {quota.total > 0 ? quota.total.toLocaleString() : "∞"}
+                          {quota.unlimited === true || !(quota.total > 0)
+                            ? (quota.unlimited === true ? "Included / ∞" : `${quota.used.toLocaleString()} / ∞`)
+                            : `${quota.used.toLocaleString()} / ${quota.total.toLocaleString()}`}
                         </span>
                         <span className={`font-medium ${colors.text}`}>
-                          {quota.remaining}%
+                          {Number.isFinite(quota.remaining) ? `${quota.remaining}%` : "—"}
                         </span>
                       </div>
                     </div>

package/src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.js CHANGED Viewed

@@ -38,10 +38,20 @@ function mergeQuotaRows(rows = []) {
       used: 0,
       total: 0,
       resetAt: quota.resetAt || null,
+      remainingPercentage: null,
+      unlimited: false,
+      _pctSum: 0,
+      _pctCount: 0,
     };
     current.used += Number(quota.used) || 0;
     current.total += Number(quota.total) || 0;
+    if (quota.unlimited === true) current.unlimited = true;
+    if (quota.remainingPercentage != null && Number.isFinite(Number(quota.remainingPercentage))) {
+      current._pctSum += Number(quota.remainingPercentage);
+      current._pctCount += 1;
+    }
     if (quota.resetAt) {
       if (!current.resetAt || new Date(quota.resetAt).getTime() < new Date(current.resetAt).getTime()) {
@@ -52,7 +62,20 @@ function mergeQuotaRows(rows = []) {
     merged.set(quota.name, current);
   });
-  return [...merged.values()];
+  return [...merged.values()].map((row) => {
+    const { _pctSum, _pctCount, ...rest } = row;
+    if (rest.unlimited) {
+      rest.remainingPercentage = 100;
+      rest.total = 0;
+    } else if (rest.total > 0) {
+      rest.remainingPercentage = ((rest.total - rest.used) / rest.total) * 100;
+    } else if (_pctCount > 0) {
+      rest.remainingPercentage = _pctSum / _pctCount;
+    } else {
+      rest.remainingPercentage = 0;
+    }
+    return rest;
+  });
 }
 function getProviderDisplayName(provider) {
@@ -1311,19 +1334,28 @@ export default function ProviderLimits() {
                     </span>
                     <p className="mt-1.5 text-xs text-text-muted">{error}</p>
                   </div>
+                ) : (quota?.quotas?.length > 0) ? (
+                  <div className="space-y-2">
+                    <QuotaTable
+                      quotas={quota.quotas}
+                      compact
+                      sortMode="default"
+                      showSortLabel={
+                        conn.provider === "codex" && quotaSortMode !== "default"
+                      }
+                    />
+                    {quota?.message ? (
+                      <p className="px-1 text-[10px] text-text-muted">{quota.message}</p>
+                    ) : null}
+                  </div>
                 ) : quota?.message ? (
                   <div className="text-center py-5">
                     <p className="text-xs text-text-muted">{quota.message}</p>
                   </div>
                 ) : (
-                  <QuotaTable
-                    quotas={quota?.quotas}
-                    compact
-                    sortMode="default"
-                    showSortLabel={
-                      conn.provider === "codex" && quotaSortMode !== "default"
-                    }
-                  />
+                  <div className="text-center py-5 text-text-muted">
+                    <p className="text-xs">No quota data available</p>
+                  </div>
                 )}
               </div>
             </Card>