shincloud-cli 1.2.0 → 1.2.2

package/dist/index.js

@@ -567,7 +567,7 @@ function enc(s) {
 }
 
 // ../core/dist/commands/auth/login.js
-import { password } from "@inquirer/prompts";
+import { password, select } from "@inquirer/prompts";
 
 // ../core/dist/lib/config.js
 import fs from "fs";
@@ -772,13 +772,79 @@ function pickDefined(obj) {
   return result;
 }
 
+// ../core/dist/lib/resolve-servername-from-me.js
+function resolveServernameFromMe(meData) {
+  const services = meData.services;
+  const server = services?.server;
+  if (!server) {
+    return { status: "manual", reason: "no_server" };
+  }
+  const targetMode = server.target_mode;
+  const targets = normalizeTargets(server.targets);
+  if (targetMode === "all") {
+    return { status: "manual", reason: "all" };
+  }
+  if (targetMode === "selected") {
+    if (targets.length === 1) {
+      return { status: "auto", servername: targets[0] };
+    }
+    if (targets.length >= 2) {
+      return { status: "choose", targets };
+    }
+    return { status: "manual", reason: "empty_targets" };
+  }
+  return { status: "manual", reason: "empty_targets" };
+}
+function manualServernameMessage(reason) {
+  switch (reason) {
+    case "no_server":
+      return "\u3053\u306EAPI\u30AD\u30FC\u3067\u306F\u30B5\u30FC\u30D0\u30FCAPI\u3092\u5229\u7528\u3067\u304D\u307E\u305B\u3093\uFF08\u30B5\u30FC\u30D0\u30FC\u533A\u5206\u304C\u542B\u307E\u308C\u3066\u3044\u307E\u305B\u3093\uFF09\u3002";
+    case "all":
+      return "\u3053\u306EAPI\u30AD\u30FC\u306F\u5BFE\u8C61\u30B5\u30FC\u30D0\u30FC\u304C\u56FA\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\uFF08\u300C\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D0\u30FC\u300D\u7B49\uFF09\u3002";
+    case "empty_targets":
+      return "\u3053\u306EAPI\u30AD\u30FC\u306E\u30B5\u30FC\u30D0\u30FC\u5BFE\u8C61\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002";
+  }
+}
+function normalizeTargets(targets) {
+  if (!Array.isArray(targets)) {
+    return [];
+  }
+  return targets.filter((t) => typeof t === "string" && t !== "");
+}
+
 // ../core/dist/commands/auth/login.js
 function maskApiKey(apiKey) {
   return `${apiKey.substring(0, 8)}...`;
 }
+async function resolveLoginServername(meData, brand) {
+  const outcome = resolveServernameFromMe(meData);
+  if (outcome.status === "auto") {
+    console.error(`  \u30B5\u30FC\u30D0\u30FC\u540D\u3092\u81EA\u52D5\u691C\u51FA\u3057\u307E\u3057\u305F: ${outcome.servername}`);
+    return outcome.servername;
+  }
+  if (outcome.status === "choose") {
+    if (process.stdin.isTTY) {
+      const chosen = await select({
+        message: "\u5BFE\u8C61\u30B5\u30FC\u30D0\u30FC\u3092\u9078\u629E:",
+        choices: outcome.targets.map((target) => ({ value: target, name: target }))
+      });
+      console.error(`  \u30B5\u30FC\u30D0\u30FC\u540D: ${chosen}`);
+      return chosen;
+    }
+    console.error("  \u5BFE\u8C61\u30B5\u30FC\u30D0\u30FC\u304C\u8907\u6570\u3042\u308B\u305F\u3081\u81EA\u52D5\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3002--servername \u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+    console.error(`  \u5019\u88DC: ${outcome.targets.join(", ")}`);
+    console.error("  \u30B5\u30FC\u30D0\u30FC\u7CFB\u30B3\u30DE\u30F3\u30C9\u3067\u306F --servername \u3067\u5BFE\u8C61\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+    console.error(`  \u4F8B: ${brand.commandName} server --servername <\u30B5\u30FC\u30D0\u30FCID> info`);
+    return void 0;
+  }
+  console.error(`  ${manualServernameMessage(outcome.reason)}`);
+  console.error("  \u30B5\u30FC\u30D0\u30FC\u7CFB\u30B3\u30DE\u30F3\u30C9\u3067\u306F --servername \u3067\u5BFE\u8C61\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
+  console.error(`  \u4F8B: ${brand.commandName} server --servername <\u30B5\u30FC\u30D0\u30FCID> info`);
+  return void 0;
+}
 function registerAuthCommands(program, brand) {
   const auth = program.command("auth").description("\u8A8D\u8A3C\u8A2D\u5B9A");
-  auth.command("login").description("API\u30AD\u30FC\u3092\u8A2D\u5B9A\uFF08\u30B5\u30FC\u30D0\u30FC\u540D\u306F\u81EA\u52D5\u691C\u51FA\uFF09").option("--api-key <key>", "API\u30AD\u30FC").option("--servername <name>", "\u30B5\u30FC\u30D0\u30FC\u540D\uFF08\u81EA\u52D5\u691C\u51FA\u3092\u4E0A\u66F8\u304D\uFF09").action(async (opts, cmd) => {
+  auth.command("login").description("API\u30AD\u30FC\u3092\u8A2D\u5B9A\uFF08\u5BFE\u8C61\u30B5\u30FC\u30D0\u30FC\u304C1\u53F0\u306E\u30AD\u30FC\u306F\u30B5\u30FC\u30D0\u30FC\u540D\u3092\u81EA\u52D5\u691C\u51FA\uFF09").option("--api-key <key>", "API\u30AD\u30FC").option("--servername <name>", "\u30B5\u30FC\u30D0\u30FC\u540D\uFF08\u81EA\u52D5\u691C\u51FA\u3092\u4E0A\u66F8\u304D\uFF09").action(async (opts, cmd) => {
     const profileName = cmd.optsWithGlobals().profile ?? "default";
     let apiKey = opts.apiKey;
     let servername = opts.servername;
@@ -802,9 +868,8 @@ function registerAuthCommands(program, brand) {
       throw err;
     }
     console.error("\u2713 \u8A8D\u8A3C\u306B\u6210\u529F\u3057\u307E\u3057\u305F");
-    if (!servername && meData.servername) {
-      servername = meData.servername;
-      console.error(`  \u30B5\u30FC\u30D0\u30FC\u540D\u3092\u81EA\u52D5\u691C\u51FA\u3057\u307E\u3057\u305F: ${servername}`);
+    if (!servername) {
+      servername = await resolveLoginServername(meData, brand);
     }
     const config = loadConfig(brand);
     config.profiles[profileName] = {
@@ -850,6 +915,8 @@ function registerAuthCommands(program, brand) {
     console.log(`API\u30AD\u30FC:     ${maskApiKey(profile.apiKey)}`);
     if (profile.servername) {
       console.log(`\u30B5\u30FC\u30D0\u30FC\u540D:   ${profile.servername}`);
+    } else {
+      console.log("\u30B5\u30FC\u30D0\u30FC\u540D:   \u672A\u56FA\u5B9A\uFF08\u30B5\u30FC\u30D0\u30FC\u7CFB\u30B3\u30DE\u30F3\u30C9\u3067\u306F --servername \u3067\u6307\u5B9A\uFF09");
     }
     console.log(`API\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8: ${brand.apiBase}`);
   });
@@ -890,7 +957,7 @@ function registerAuthCommands(program, brand) {
       const marker = name === config.defaultProfile ? " (default)" : "";
       const p = config.profiles[name];
       const key = maskApiKey(p.apiKey);
-      const sv = p.servername ? ` servername=${p.servername}` : "";
+      const sv = p.servername ? ` servername=${p.servername}` : " servername=(\u672A\u56FA\u5B9A)";
       console.log(`${name}${marker}: key=${key}${sv}`);
     }
   });
@@ -2182,7 +2249,7 @@ function run(brand, version = "0.0.0") {
 // package.json
 var package_default = {
   name: "shincloud-cli",
-  version: "1.2.0",
+  version: "1.2.2",
   description: "Official CLI for Shincloud API \u2014 manage your Shincloud hosting from the terminal",
   type: "module",
   bin: {