jimeng-cli 0.3.2 → 0.3.3

package/dist/cli/index.js

@@ -11,13 +11,14 @@ import {
   getTaskResponse,
   getTokenLiveStatus,
   logger_default,
+  maskToken,
   parseRegionCode,
   receiveCredit,
   refreshAllTokenModels,
   session_pool_default,
   upscaleImage,
   waitForTaskResponse
-} from "../chunk-FAXTAAQO.js";
+} from "../chunk-ZMTQQZFH.js";
 
 // src/cli/app.ts
 import process2 from "process";
@@ -27,10 +28,6 @@ import { constants as fsConstants } from "fs";
 import path from "path";
 import { access, readFile } from "fs/promises";
 import minimist from "minimist";
-function maskToken(token) {
-  if (token.length <= 10) return "***";
-  return `${token.slice(0, 4)}...${token.slice(-4)}`;
-}
 function formatUnixMs(value) {
   if (typeof value !== "number" || !Number.isFinite(value) || value <= 0) return "-";
   return new Date(value).toISOString();
@@ -132,29 +129,28 @@ function createTokenSubcommands(deps) {
     if (!args.json) {
       console.log(`Checking ${pairs.length} token(s)`);
     }
-    let invalid = 0;
-    let requestErrors = 0;
-    const results = [];
-    for (const { token, region } of pairs) {
-      const masked = maskToken(token);
-      try {
-        const live = await getTokenLiveStatus(token, buildRegionInfo(region));
-        await session_pool_default.syncTokenCheckResult(token, live);
-        if (live) {
-          if (!args.json) console.log(`[OK]   ${masked} (${region}) live=true`);
-          results.push({ token_masked: masked, region, live: true });
-        } else {
-          invalid += 1;
-          if (!args.json) console.log(`[FAIL] ${masked} (${region}) live=false`);
-          results.push({ token_masked: masked, region, live: false });
+    const results = await Promise.all(
+      pairs.map(async ({ token, region }) => {
+        const masked = maskToken(token);
+        try {
+          const live = await getTokenLiveStatus(token, buildRegionInfo(region));
+          await session_pool_default.syncTokenCheckResult(token, live);
+          if (live) {
+            if (!args.json) console.log(`[OK]   ${masked} (${region}) live=true`);
+            return { token_masked: masked, region, live: true };
+          } else {
+            if (!args.json) console.log(`[FAIL] ${masked} (${region}) live=false`);
+            return { token_masked: masked, region, live: false };
+          }
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          if (!args.json) console.log(`[ERROR] ${masked} (${region}) ${message}`);
+          return { token_masked: masked, region, error: message };
         }
-      } catch (error) {
-        requestErrors += 1;
-        const message = error instanceof Error ? error.message : String(error);
-        if (!args.json) console.log(`[ERROR] ${masked} (${region}) ${message}`);
-        results.push({ token_masked: masked, region, error: message });
-      }
-    }
+      })
+    );
+    const invalid = results.filter((r) => r.live === false).length;
+    const requestErrors = results.filter((r) => r.error).length;
     if (args.json) {
       deps.printCommandJson("token.check", results, {
         total: pairs.length,
@@ -202,27 +198,37 @@ function createTokenSubcommands(deps) {
     await deps.ensureTokenPoolReady();
     const explicitTokens = await collectTokensFromArgs(args, usage, deps, false);
     const pairs = resolveTokenRegionPairs(explicitTokens, regionCode, deps);
-    const payload = action === "points" ? await Promise.all(
-      pairs.map(async ({ token, region }) => ({
-        token,
-        points: await getCredit(token, buildRegionInfo(region))
-      }))
-    ) : await Promise.all(
-      pairs.map(async ({ token, region }) => {
-        const regionInfo = buildRegionInfo(region);
+    const toErrorResult = (token, region, error) => ({
+      token_masked: maskToken(token),
+      region,
+      error: error instanceof Error ? error.message : String(error)
+    });
+    const fetchPoints = async ({ token, region }) => {
+      try {
+        return { token_masked: maskToken(token), region, points: await getCredit(token, buildRegionInfo(region)) };
+      } catch (error) {
+        return toErrorResult(token, region, error);
+      }
+    };
+    const processReceive = async ({ token, region }) => {
+      const regionInfo = buildRegionInfo(region);
+      try {
         const currentCredit = await getCredit(token, regionInfo);
-        if (currentCredit.totalCredit <= 0) {
-          try {
-            await receiveCredit(token, regionInfo);
-            const updatedCredit = await getCredit(token, regionInfo);
-            return { token, credits: updatedCredit, received: true };
-          } catch (error) {
-            return { token, credits: currentCredit, received: false, error: (error == null ? void 0 : error.message) || String(error) };
-          }
+        if (currentCredit.totalCredit > 0) {
+          return { token_masked: maskToken(token), region, credits: currentCredit, received: false };
         }
-        return { token, credits: currentCredit, received: false };
-      })
-    );
+        try {
+          await receiveCredit(token, regionInfo);
+          const updatedCredit = await getCredit(token, regionInfo);
+          return { token_masked: maskToken(token), region, credits: updatedCredit, received: true };
+        } catch (error) {
+          return { token_masked: maskToken(token), region, credits: currentCredit, received: false, ...toErrorResult(token, region, error) };
+        }
+      } catch (error) {
+        return toErrorResult(token, region, error);
+      }
+    };
+    const payload = action === "points" ? await Promise.all(pairs.map(fetchPoints)) : await Promise.all(pairs.map(processReceive));
     if (args.json) {
       deps.printCommandJson(`token.${action}`, payload);
       return;
@@ -310,10 +316,13 @@ function createTokenSubcommands(deps) {
       return;
     }
     await deps.ensureTokenPoolReady();
-    const payload = action === "pool-check" ? { ...await session_pool_default.runHealthCheck(), summary: session_pool_default.getSummary() } : (() => {
+    let payload;
+    if (action === "pool-check") {
+      payload = { ...await session_pool_default.runHealthCheck(), summary: session_pool_default.getSummary() };
+    } else {
       session_pool_default.reloadFromDisk();
-      return { reloaded: true, summary: session_pool_default.getSummary(), items: buildTokenPoolSnapshot().items };
-    })();
+      payload = { reloaded: true, summary: session_pool_default.getSummary(), items: buildTokenPoolSnapshot().items };
+    }
     if (args.json) {
       deps.printCommandJson(`token.${action}`, deps.unwrapBody(payload));
       return;
@@ -534,7 +543,6 @@ function printModelIds(models) {
   }
 }
 function printModelVerbose(models) {
-  console.log("id	type	desc	capabilities");
   for (const item of models) {
     if (!item || typeof item !== "object") continue;
     const m = item;
@@ -543,7 +551,17 @@ function printModelVerbose(models) {
     const type = typeof m.model_type === "string" ? m.model_type : "-";
     const desc = typeof m.description === "string" ? m.description : "-";
     const caps = Array.isArray(m.capabilities) ? m.capabilities.filter((c) => typeof c === "string").join(",") : "-";
-    console.log(`${id}	type=${type}	desc=${desc}	capabilities=${caps}`);
+    console.log(`${id}  [${type}]  ${desc}`);
+    console.log(`  capabilities: ${caps}`);
+    const params = m.params;
+    if (params && typeof params === "object") {
+      for (const [key, vals] of Object.entries(params)) {
+        if (Array.isArray(vals)) {
+          console.log(`  ${key}: ${vals.join(", ")}`);
+        }
+      }
+    }
+    console.log("");
   }
 }
 function createQueryCommandHandlers(deps) {
@@ -594,20 +612,22 @@ function createQueryCommandHandlers(deps) {
       if (entries.length === 0) {
         deps.fail("No enabled+live tokens with region found in pool.");
       }
-      const results = [];
-      for (const entry of entries) {
-        const masked = entry.token.length <= 10 ? "***" : `${entry.token.slice(0, 4)}...${entry.token.slice(-4)}`;
-        try {
-          const direct2 = await getLiveModels(`Bearer ${entry.token}`, entry.region);
-          results.push({
-            token: masked,
-            region: entry.region,
-            models: direct2.data.map((m) => m.id)
-          });
-        } catch (error) {
-          results.push({ token: masked, region: entry.region, error: error.message });
-        }
-      }
+      const results = await Promise.all(
+        entries.map(async (entry) => {
+          const masked = maskToken(entry.token);
+          try {
+            const direct2 = await getLiveModels(`Bearer ${entry.token}`, entry.region);
+            return {
+              token: masked,
+              region: entry.region,
+              source: direct2.source,
+              models: isVerbose ? direct2.data : direct2.data.map((m) => m.id)
+            };
+          } catch (error) {
+            return { token: masked, region: entry.region, error: error instanceof Error ? error.message : String(error) };
+          }
+        })
+      );
       if (isJson) {
         deps.printCommandJson("models.list", results);
         return;
@@ -616,6 +636,8 @@ function createQueryCommandHandlers(deps) {
         console.log(`[${r.region}] ${r.token}`);
         if (r.error) {
           console.log(`  error: ${r.error}`);
+        } else if (isVerbose) {
+          printModelVerbose(r.models);
         } else {
           for (const id of r.models) console.log(`  ${id}`);
         }