huaweicloud-devkit 1.0.2-dev.9 → 1.0.2-next.10

package/plugins/huaweicloud-core/src/auth/credentials.mjs

@@ -1,95 +1,103 @@
-import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { homedir } from 'node:os';
-
-// Verify a credential file ended up with 0600. On Windows-mounted drives inside WSL
-// (drvfs/9p) chmod is silently ignored, so the file can be world-readable (0777).
-// Native Windows has no POSIX modes (statSync always reports 0666), so skip the check there.
-function ensurePrivateMode(path) {
-  if (process.platform === 'win32') return;
-  try { chmodSync(path, 0o600); } catch {}
-  try {
-    const mode = statSync(path).mode & 0o777;
-    if (mode !== 0o600) {
-      console.warn(`\x1b[33m[WARN]\x1b[0m Could not set 0600 on ${path} (current mode ${mode.toString(8)}). Credentials may be readable by other users.`);
-      console.warn(`\x1b[33m       If running under WSL, move the credential home to the Linux filesystem:\x1b[0m`);
-      console.warn(`\x1b[33m         export HUAWEICLOUD_HOME=$HOME  (then re-run auth init)\x1b[0m`);
-      console.warn(`\x1b[33m       Or skip file storage entirely with HW_ACCESS_KEY/HW_SECRET_KEY environment variables.\x1b[0m`);
-    }
-  } catch {}
-}
-
-function baseHome() {
-  return process.env.HUAWEICLOUD_HOME || homedir();
-}
-
-export function globalCredentialsPath() {
-  return join(baseHome(), '.config', 'huaweicloud', 'credentials.json');
-}
-
-export function obsConfigPath() {
-  return join(baseHome(), '.obsutilconfig');
-}
-
-export function readGlobalCredentials() {
-  const path = globalCredentialsPath();
-  if (!existsSync(path)) return null;
-  try {
-    return JSON.parse(readFileSync(path, 'utf8'));
-  } catch {
-    return null;
-  }
-}
-
-export function writeGlobalCredentials(credentials = {}) {
-  const path = globalCredentialsPath();
-  mkdirSync(dirname(path), { recursive: true });
-  const payload = {
-    ak: String(credentials.ak || ''),
-    sk: String(credentials.sk || ''),
-    securityToken: String(credentials.securityToken || ''),
-    region: String(credentials.region || ''),
-  };
-  writeFileSync(path, JSON.stringify(payload, null, 2), { encoding: 'utf8', mode: 0o600 });
-  ensurePrivateMode(path);
-  return path;
-}
-
-export function writeObsConfig(credentials = {}) {
-  const region = String(credentials.region || '');
-  const ak = String(credentials.ak || '');
-  const sk = String(credentials.sk || '');
-  const securityToken = String(credentials.securityToken || '');
-  if (!region || !ak || !sk) {
-    throw new Error('region, ak, and sk are required to write OBS config');
-  }
-  const path = obsConfigPath();
-  const endpoint = credentials.endpoint || `https://obs.${region}.myhuaweicloud.com`;
-  // Flat key=value format (no [default] section) as written by KooCLI 7.x `hcloud OBS config`.
-  const content = `endpoint=${endpoint}\nak=${ak}\nsk=${sk}${securityToken ? `\ntoken=${securityToken}` : ''}\n`;
-  writeFileSync(path, content, { encoding: 'utf8', mode: 0o600 });
-  ensurePrivateMode(path);
-  return { path, endpoint };
-}
-
-export function resolveCredentials(options = {}) {
-  let ak = process.env.HW_ACCESS_KEY;
-  let sk = process.env.HW_SECRET_KEY;
-  let securityToken = process.env.HW_SECURITY_TOKEN;
-  let region = process.env.HW_REGION || process.env.HUAWEICLOUD_REGION || '';
-
-  const stored = readGlobalCredentials();
-  if (stored) {
-    if (!ak && stored.ak) ak = stored.ak;
-    if (!sk && stored.sk) sk = stored.sk;
-    if (!securityToken && stored.securityToken) securityToken = stored.securityToken;
-    if (!region && stored.region) region = stored.region;
-  }
-
-  if (!ak || !sk) {
-    if (options.allowMissing) return null;
-    throw new Error('Huawei Cloud credentials are not configured. Run "npx huaweicloud-devkit auth init" or set HW_ACCESS_KEY/HW_SECRET_KEY.');
-  }
-
-  return { ak, sk, securityToken, region };
-}
+import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { homedir } from 'node:os';
+
+// Verify a credential file ended up with 0600. On Windows-mounted drives inside WSL
+// (drvfs/9p) chmod is silently ignored, so the file can be world-readable (0777).
+// Native Windows has no POSIX modes (statSync always reports 0666), so skip the check there.
+function ensurePrivateMode(path) {
+  if (process.platform === 'win32') return;
+  try {
+    chmodSync(path, 0o600);
+  } catch {}
+  try {
+    const mode = statSync(path).mode & 0o777;
+    if (mode !== 0o600) {
+      console.warn(
+        `\x1b[33m[WARN]\x1b[0m Could not set 0600 on ${path} (current mode ${mode.toString(8)}). Credentials may be readable by other users.`,
+      );
+      console.warn(`\x1b[33m       If running under WSL, move the credential home to the Linux filesystem:\x1b[0m`);
+      console.warn(`\x1b[33m         export HUAWEICLOUD_HOME=$HOME  (then re-run auth init)\x1b[0m`);
+      console.warn(
+        `\x1b[33m       Or skip file storage entirely with HW_ACCESS_KEY/HW_SECRET_KEY environment variables.\x1b[0m`,
+      );
+    }
+  } catch {}
+}
+
+function baseHome() {
+  return process.env.HUAWEICLOUD_HOME || homedir();
+}
+
+export function globalCredentialsPath() {
+  return join(baseHome(), '.config', 'huaweicloud', 'credentials.json');
+}
+
+export function obsConfigPath() {
+  return join(baseHome(), '.obsutilconfig');
+}
+
+export function readGlobalCredentials() {
+  const path = globalCredentialsPath();
+  if (!existsSync(path)) return null;
+  try {
+    return JSON.parse(readFileSync(path, 'utf8'));
+  } catch {
+    return null;
+  }
+}
+
+export function writeGlobalCredentials(credentials = {}) {
+  const path = globalCredentialsPath();
+  mkdirSync(dirname(path), { recursive: true });
+  const payload = {
+    ak: String(credentials.ak || ''),
+    sk: String(credentials.sk || ''),
+    securityToken: String(credentials.securityToken || ''),
+    region: String(credentials.region || ''),
+  };
+  writeFileSync(path, JSON.stringify(payload, null, 2), { encoding: 'utf8', mode: 0o600 });
+  ensurePrivateMode(path);
+  return path;
+}
+
+export function writeObsConfig(credentials = {}) {
+  const region = String(credentials.region || '');
+  const ak = String(credentials.ak || '');
+  const sk = String(credentials.sk || '');
+  const securityToken = String(credentials.securityToken || '');
+  if (!region || !ak || !sk) {
+    throw new Error('region, ak, and sk are required to write OBS config');
+  }
+  const path = obsConfigPath();
+  const endpoint = credentials.endpoint || `https://obs.${region}.myhuaweicloud.com`;
+  // Flat key=value format (no [default] section) as written by KooCLI 7.x `hcloud OBS config`.
+  const content = `endpoint=${endpoint}\nak=${ak}\nsk=${sk}${securityToken ? `\ntoken=${securityToken}` : ''}\n`;
+  writeFileSync(path, content, { encoding: 'utf8', mode: 0o600 });
+  ensurePrivateMode(path);
+  return { path, endpoint };
+}
+
+export function resolveCredentials(options = {}) {
+  let ak = process.env.HW_ACCESS_KEY;
+  let sk = process.env.HW_SECRET_KEY;
+  let securityToken = process.env.HW_SECURITY_TOKEN;
+  let region = process.env.HW_REGION || process.env.HUAWEICLOUD_REGION || '';
+
+  const stored = readGlobalCredentials();
+  if (stored) {
+    if (!ak && stored.ak) ak = stored.ak;
+    if (!sk && stored.sk) sk = stored.sk;
+    if (!securityToken && stored.securityToken) securityToken = stored.securityToken;
+    if (!region && stored.region) region = stored.region;
+  }
+
+  if (!ak || !sk) {
+    if (options.allowMissing) return null;
+    throw new Error(
+      'Huawei Cloud credentials are not configured. Run "npx huaweicloud-devkit auth init" or set HW_ACCESS_KEY/HW_SECRET_KEY.',
+    );
+  }
+
+  return { ak, sk, securityToken, region };
+}

package/plugins/huaweicloud-core/src/auth/service.mjs

@@ -1,63 +1,63 @@
-import { existsSync } from 'node:fs';
-import { spawnSync } from 'node:child_process';
-import { getAgentRegistrationStatuses } from './agent-registration.mjs';
-import { globalCredentialsPath, obsConfigPath, readGlobalCredentials, writeObsConfig } from './credentials.mjs';
-
-function hcloudInstalled() {
-  const bin = process.env.HCLOUD_BIN || 'hcloud';
-  try {
-    const r = spawnSync(`"${bin}" version`, [], {
-      shell: true,
-      windowsHide: true,
-      stdio: 'pipe',
-      timeout: 5000,
-    });
-    const out = `${r.stdout || ''}${r.stderr || ''}`;
-    return r.status === 0 && /KooCLI|Current.*version|当前KooCLI/i.test(out);
-  } catch {
-    return false;
-  }
-}
-
-export function getAuthStatus(target = 'all') {
-  const credentials = readGlobalCredentials();
-  return {
-    target,
-    credentialsConfigured: Boolean(credentials?.ak && credentials?.sk),
-    credentialsPath: globalCredentialsPath(),
-    obsConfigured: existsSync(obsConfigPath()),
-    obsConfigPath: obsConfigPath(),
-    kooCliInstalled: hcloudInstalled(),
-    agents: getAgentRegistrationStatuses(target).agents,
-  };
-}
-
-export function syncAuth(target = 'all') {
-  const credentials = readGlobalCredentials();
-  if (!credentials?.ak || !credentials?.sk) {
-    return {
-      ok: false,
-      error: 'Global credentials are not configured.',
-      nextStep: 'Run "npx huaweicloud-devkit auth init" first.',
-    };
-  }
-
-  let obs = null;
-  try {
-    obs = writeObsConfig(credentials);
-  } catch (error) {
-    return {
-      ok: false,
-      error: error.message,
-      nextStep: 'Run "npx huaweicloud-devkit auth init" to refresh credentials and region.',
-    };
-  }
-
-  return {
-    ok: true,
-    obs: { configured: true, path: obs.path, endpoint: obs.endpoint },
-    credentialsConfigured: true,
-    agents: getAgentRegistrationStatuses(target).agents,
-    note: 'OBS credentials were synced from the global credential vault. Agent MCP registration is managed by "npx huaweicloud-devkit install --target <agent>".',
-  };
-}
+import { existsSync } from 'node:fs';
+import { spawnSync } from 'node:child_process';
+import { getAgentRegistrationStatuses } from './agent-registration.mjs';
+import { globalCredentialsPath, obsConfigPath, readGlobalCredentials, writeObsConfig } from './credentials.mjs';
+
+function hcloudInstalled() {
+  const bin = process.env.HCLOUD_BIN || 'hcloud';
+  try {
+    const r = spawnSync(`"${bin}" version`, [], {
+      shell: true,
+      windowsHide: true,
+      stdio: 'pipe',
+      timeout: 5000,
+    });
+    const out = `${r.stdout || ''}${r.stderr || ''}`;
+    return r.status === 0 && /KooCLI|Current.*version|当前KooCLI/i.test(out);
+  } catch {
+    return false;
+  }
+}
+
+export function getAuthStatus(target = 'all') {
+  const credentials = readGlobalCredentials();
+  return {
+    target,
+    credentialsConfigured: Boolean(credentials?.ak && credentials?.sk),
+    credentialsPath: globalCredentialsPath(),
+    obsConfigured: existsSync(obsConfigPath()),
+    obsConfigPath: obsConfigPath(),
+    kooCliInstalled: hcloudInstalled(),
+    agents: getAgentRegistrationStatuses(target).agents,
+  };
+}
+
+export function syncAuth(target = 'all') {
+  const credentials = readGlobalCredentials();
+  if (!credentials?.ak || !credentials?.sk) {
+    return {
+      ok: false,
+      error: 'Global credentials are not configured.',
+      nextStep: 'Run "npx huaweicloud-devkit auth init" first.',
+    };
+  }
+
+  let obs;
+  try {
+    obs = writeObsConfig(credentials);
+  } catch (error) {
+    return {
+      ok: false,
+      error: error.message,
+      nextStep: 'Run "npx huaweicloud-devkit auth init" to refresh credentials and region.',
+    };
+  }
+
+  return {
+    ok: true,
+    obs: { configured: true, path: obs.path, endpoint: obs.endpoint },
+    credentialsConfigured: true,
+    agents: getAgentRegistrationStatuses(target).agents,
+    note: 'OBS credentials were synced from the global credential vault. Agent MCP registration is managed by "npx huaweicloud-devkit install --target <agent>".',
+  };
+}