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

package/plugins/huaweicloud-core/src/sandbox/session-manager.mjs

@@ -1,105 +1,112 @@
-import { spawn } from 'node:child_process';
-import { join, dirname } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { createConnection, getCredentials } from './hwlink-api.mjs';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-export const WS_EXEC_INDEX_URL = pathToFileURL(join(__dirname, '..', 'ws-exec', 'index.js')).href;
-
-const DEFAULT_WORKSPACE_ID = process.env.HW_WORKSPACE_ID || '0107bd9997aa4287bd2b4890b49af07d';
-
-function resolveEnv() {
-  const env = { ...process.env };
-  env.PATH = `${env.HOME || '/root'}/.huawei/bin:${env.PATH || ''}`;
-  return env;
-}
-
-async function runNodeExec(args, timeoutMs = 30000) {
-  const env = resolveEnv();
-  return new Promise((resolve) => {
-    const proc = spawn('node', args, { env, stdio: ['pipe', 'pipe', 'pipe'] });
-    let stdout = '';
-    let stderr = '';
-    proc.stdout.on('data', (d) => { stdout += d.toString(); });
-    proc.stderr.on('data', (d) => { stderr += d.toString(); });
-
-    const timer = setTimeout(() => {
-      proc.kill();
-      resolve({ error: 'timed out', exitCode: 124 });
-    }, timeoutMs);
-
-    proc.on('close', (code) => {
-      clearTimeout(timer);
-      const out = stdout.trim();
-      if (out) {
-        try {
-          resolve({ ...JSON.parse(out), exitCode: code || 0 });
-          return;
-        } catch {}
-      }
-      if (code && code !== 0 && !out) {
-        resolve({ error: stderr.trim() || `exit code ${code}`, exitCode: code });
-        return;
-      }
-      resolve({ data: out, exitCode: code || 0 });
-    });
-  });
-}
-
-const sessions = new Map();
-
-async function getSession(workspaceId, username, timeoutMs) {
-  const key = `${workspaceId}:${username}`;
-  if (sessions.has(key)) return sessions.get(key);
-
-  const { ak, sk, securitytoken } = getCredentials();
-  const { wsUrl, source } = await createConnection(workspaceId, ak, sk, securitytoken);
-
-  const { connectHwlinkTerminalSession } = await import(WS_EXEC_INDEX_URL);
-  const session = await connectHwlinkTerminalSession({
-    url: wsUrl,
-    source,
-    username,
-    timeoutMs,
-  });
-
-  sessions.set(key, session);
-  return session;
-}
-
-export async function execOneShot(workspaceId, command, username, timeoutMs) {
-  const { ak, sk, securitytoken } = getCredentials();
-  const { wsUrl, source } = await createConnection(workspaceId, ak, sk, securitytoken);
-
-  const { executeHwlinkCommand } = await import(WS_EXEC_INDEX_URL);
-  return await executeHwlinkCommand({
-    url: wsUrl,
-    source,
-    username,
-    command,
-    timeoutMs,
-  });
-}
-
-export async function execWithSession(workspaceId, command, username, timeoutMs) {
-  const session = await getSession(workspaceId, username, timeoutMs);
-  return await session.exec(command, { timeoutMs });
-}
-
-export async function closeSession(workspaceId, username) {
-  const key = `${workspaceId}:${username}`;
-  const session = sessions.get(key);
-  if (!session) return false;
-  sessions.delete(key);
-  try { session.close(); } catch {}
-  return true;
-}
-
-export async function closeAllSessions() {
-  for (const [key, session] of sessions) {
-    sessions.delete(key);
-    try { session.close(); } catch {}
-  }
-}
-
-export { DEFAULT_WORKSPACE_ID, runNodeExec };
+import { spawn } from 'node:child_process';
+import { join, dirname } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createConnection, getCredentials } from './hwlink-api.mjs';
+import { getWebSocketImpl } from '../proxy/proxy-agent.mjs';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+export const WS_EXEC_INDEX_URL = pathToFileURL(join(__dirname, '..', 'ws-exec', 'index.js')).href;
+
+const DEFAULT_WORKSPACE_ID = process.env.HW_WORKSPACE_ID || '0107bd9997aa4287bd2b4890b49af07d';
+
+function resolveEnv() {
+  const env = { ...process.env };
+  env.PATH = `${env.HOME || '/root'}/.huawei/bin:${env.PATH || ''}`;
+  return env;
+}
+
+async function runNodeExec(args, timeoutMs = 30000) {
+  const env = resolveEnv();
+  return new Promise((resolve) => {
+    const proc = spawn('node', args, { env, stdio: ['pipe', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    proc.stdout.on('data', (d) => { stdout += d.toString(); });
+    proc.stderr.on('data', (d) => { stderr += d.toString(); });
+
+    const timer = setTimeout(() => {
+      proc.kill();
+      resolve({ error: 'timed out', exitCode: 124 });
+    }, timeoutMs);
+
+    proc.on('close', (code) => {
+      clearTimeout(timer);
+      const out = stdout.trim();
+      if (out) {
+        try {
+          resolve({ ...JSON.parse(out), exitCode: code || 0 });
+          return;
+        } catch {}
+      }
+      if (code && code !== 0 && !out) {
+        resolve({ error: stderr.trim() || `exit code ${code}`, exitCode: code });
+        return;
+      }
+      resolve({ data: out, exitCode: code || 0 });
+    });
+  });
+}
+
+const sessions = new Map();
+
+async function getSession(workspaceId, username, timeoutMs) {
+  const key = `${workspaceId}:${username}`;
+  if (sessions.has(key)) return sessions.get(key);
+
+  const { ak, sk, securitytoken } = getCredentials();
+  const { wsUrl, source } = await createConnection(workspaceId, ak, sk, securitytoken);
+
+  const WebSocketImpl = getWebSocketImpl(wsUrl);
+
+  const { connectHwlinkTerminalSession } = await import(WS_EXEC_INDEX_URL);
+  const session = await connectHwlinkTerminalSession({
+    url: wsUrl,
+    source,
+    username,
+    timeoutMs,
+    WebSocketImpl,
+  });
+
+  sessions.set(key, session);
+  return session;
+}
+
+export async function execOneShot(workspaceId, command, username, timeoutMs) {
+  const { ak, sk, securitytoken } = getCredentials();
+  const { wsUrl, source } = await createConnection(workspaceId, ak, sk, securitytoken);
+
+  const WebSocketImpl = getWebSocketImpl(wsUrl);
+
+  const { executeHwlinkCommand } = await import(WS_EXEC_INDEX_URL);
+  return await executeHwlinkCommand({
+    url: wsUrl,
+    source,
+    username,
+    command,
+    timeoutMs,
+    WebSocketImpl,
+  });
+}
+
+export async function execWithSession(workspaceId, command, username, timeoutMs) {
+  const session = await getSession(workspaceId, username, timeoutMs);
+  return await session.exec(command, { timeoutMs });
+}
+
+export async function closeSession(workspaceId, username) {
+  const key = `${workspaceId}:${username}`;
+  const session = sessions.get(key);
+  if (!session) return false;
+  sessions.delete(key);
+  try { session.close(); } catch {}
+  return true;
+}
+
+export async function closeAllSessions() {
+  for (const [key, session] of sessions) {
+    sessions.delete(key);
+    try { session.close(); } catch {}
+  }
+}
+
+export { DEFAULT_WORKSPACE_ID, runNodeExec };

package/plugins/huaweicloud-core/src/search-market.mjs

@@ -1,169 +1,174 @@
-const INDEX_URL = 'https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/index.json?ref=main';
-const CN_EN_MAP_URL = 'https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/cn-en-map.json?ref=main';
-const HTTP_TIMEOUT_MS = 10000;
-
-const GENERIC_KEYWORDS = new Set([
-  '华为云', 'huawei', 'huawei cloud', '云', 'cloud',
-  '技能', 'skill', 'skills', '所有', 'all', '全部',
-  '有什么', '有哪些', '相关', '列表', 'list',
-  '查找', '搜索', '发现', '浏览', 'find', 'search',
-  'discover', 'browse', 'show', 'explore',
-  'agent', '市场', 'market', '类目', 'category',
-  '安装', 'install',
-]);
-
-let cachedIndex = null;
-let cachedCnEnMap = null;
-
-async function fetchJson(url, label = '') {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), HTTP_TIMEOUT_MS);
-  try {
-    const resp = await fetch(url, {
-      headers: { 'User-Agent': 'huaweicloud-devkit/1.0' },
-      signal: controller.signal,
-    });
-    const data = await resp.json();
-    if (data && data.encoding === 'base64' && data.content) {
-      const decoded = Buffer.from(data.content, 'base64').toString('utf8');
-      return JSON.parse(decoded);
-    }
-    return data;
-  } catch (e) {
-    throw new Error(`Failed to fetch ${label}: ${e.message}`);
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-async function loadIndex() {
-  if (!cachedIndex) cachedIndex = await fetchJson(INDEX_URL, 'index.json');
-  return cachedIndex;
-}
-
-async function loadCnEnMap() {
-  if (!cachedCnEnMap) cachedCnEnMap = await fetchJson(CN_EN_MAP_URL, 'cn-en-map.json');
-  return cachedCnEnMap;
-}
-
-export function clearMarketCache() {
-  cachedIndex = null;
-  cachedCnEnMap = null;
-}
-
-function isGeneric(kw) {
-  const k = kw.toLowerCase().trim();
-  return GENERIC_KEYWORDS.has(k) || /华为云|huawei/i.test(k);
-}
-
-function expandKeywords(rawKeyword, cnEnMap) {
-  if (!rawKeyword) return [[], []];
-  const parts = rawKeyword.replace(/[,;]/g, ' ').split(/\s+/).filter(Boolean);
-  const expanded = [...parts];
-  for (const p of parts) {
-    const lower = p.toLowerCase();
-    if (cnEnMap[p]) expanded.push(cnEnMap[p]);
-    for (const [cn, en] of Object.entries(cnEnMap)) {
-      if (en === lower) expanded.push(cn);
-    }
-  }
-  const unique = [...new Set(expanded)].sort();
-  const specific = unique.filter((kw) => !isGeneric(kw));
-  const generic = unique.filter((kw) => isGeneric(kw));
-  return [specific, generic];
-}
-
-function scoreSkill(skill, specificKws, genericKws) {
-  if (!specificKws.length && !genericKws.length) return [1, []];
-  let total = 0;
-  const matched = [];
-  const nameLower = (skill.name || '').toLowerCase();
-  const descLower = (skill.description || '').toLowerCase();
-  const serviceLower = (skill.service || '').toLowerCase();
-  const triggers = (skill.triggers || []).map((t) => (t || '').toLowerCase());
-
-  for (const kw of specificKws) {
-    const k = kw.toLowerCase();
-    let s = 0;
-    if (nameLower.includes(k)) s += 10;
-    else if (triggers.some((t) => t.includes(k))) s += 8;
-    else if (descLower.includes(k)) s += 5;
-    else if (serviceLower.includes(k)) s += 3;
-    if (s > 0) { total += s; matched.push(kw); }
-  }
-  for (const kw of genericKws) {
-    const k = kw.toLowerCase();
-    let s = 0;
-    if (nameLower.includes(k)) s += 10;
-    else if (triggers.some((t) => t.includes(k))) s += 4;
-    else if (descLower.includes(k)) s += 2;
-    else if (serviceLower.includes(k)) s += 1;
-    if (s > 0) { total += s; matched.push(kw); }
-  }
-  if (!specificKws.length && total === 0) {
-    total = 1;
-    if (descLower.length > 20) total += 1;
-    if (triggers.length) total += 1;
-  }
-  return [total, matched];
-}
-
-function truncate(desc, limit = 150) {
-  if (!desc) return '';
-  return desc.length > limit ? desc.slice(0, limit) + '...' : desc;
-}
-
-export async function searchMarketplace(query = '', category = '') {
-  const idx = await loadIndex();
-  const cnEnMap = await loadCnEnMap();
-  const [specificKws, genericKws] = expandKeywords(query, cnEnMap);
-  const hasSpecific = specificKws.length > 0;
-
-  const results = [];
-  for (const skill of idx.skills || []) {
-    if (category && skill.category !== category) continue;
-    const [score, matched] = scoreSkill(skill, specificKws, genericKws);
-    if (hasSpecific && score === 0) continue;
-    results.push({
-      score,
-      name: skill.name || '',
-      category: skill.category || '',
-      service: skill.service || '',
-      description: truncate(skill.description),
-      triggers: (skill.triggers || []).slice(0, 5),
-      matched,
-    });
-  }
-  results.sort((a, b) => b.score - a.score);
-
-  if (!results.length) {
-    return {
-      ok: true,
-      query,
-      category,
-      count: 0,
-      results: [],
-      fallback: [
-        'Try broader or alternative keywords',
-        'Remove category filter',
-        'Switch CN<->EN (e.g., obs <-> object storage)',
-        'List all: search with empty keyword and a category',
-      ],
-    };
-  }
-
-  const allKws = [...new Set([...specificKws, ...genericKws])];
-  return {
-    ok: true,
-    query,
-    category,
-    count: results.length,
-    expandedKeywords: allKws.length > 1 ? allKws : undefined,
-    results,
-  };
-}
-
-export async function getMarketplaceCategories() {
-  const idx = await loadIndex();
-  return { ok: true, categories: idx.categories || [] };
-}
+import { getProxyDispatcher } from './proxy/proxy-agent.mjs';
+
+const INDEX_URL = 'https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/index.json?ref=main';
+const CN_EN_MAP_URL = 'https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/cn-en-map.json?ref=main';
+const HTTP_TIMEOUT_MS = 10000;
+
+const GENERIC_KEYWORDS = new Set([
+  '华为云', 'huawei', 'huawei cloud', '云', 'cloud',
+  '技能', 'skill', 'skills', '所有', 'all', '全部',
+  '有什么', '有哪些', '相关', '列表', 'list',
+  '查找', '搜索', '发现', '浏览', 'find', 'search',
+  'discover', 'browse', 'show', 'explore',
+  'agent', '市场', 'market', '类目', 'category',
+  '安装', 'install',
+]);
+
+let cachedIndex = null;
+let cachedCnEnMap = null;
+
+async function fetchJson(url, label = '') {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), HTTP_TIMEOUT_MS);
+  try {
+    const dispatcher = await getProxyDispatcher(url);
+    const fetchOpts = {
+      headers: { 'User-Agent': 'huaweicloud-devkit/1.0' },
+      signal: controller.signal,
+    };
+    if (dispatcher) fetchOpts.dispatcher = dispatcher;
+    const resp = await fetch(url, fetchOpts);
+    const data = await resp.json();
+    if (data && data.encoding === 'base64' && data.content) {
+      const decoded = Buffer.from(data.content, 'base64').toString('utf8');
+      return JSON.parse(decoded);
+    }
+    return data;
+  } catch (e) {
+    throw new Error(`Failed to fetch ${label}: ${e.message}`);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+async function loadIndex() {
+  if (!cachedIndex) cachedIndex = await fetchJson(INDEX_URL, 'index.json');
+  return cachedIndex;
+}
+
+async function loadCnEnMap() {
+  if (!cachedCnEnMap) cachedCnEnMap = await fetchJson(CN_EN_MAP_URL, 'cn-en-map.json');
+  return cachedCnEnMap;
+}
+
+export function clearMarketCache() {
+  cachedIndex = null;
+  cachedCnEnMap = null;
+}
+
+function isGeneric(kw) {
+  const k = kw.toLowerCase().trim();
+  return GENERIC_KEYWORDS.has(k) || /华为云|huawei/i.test(k);
+}
+
+function expandKeywords(rawKeyword, cnEnMap) {
+  if (!rawKeyword) return [[], []];
+  const parts = rawKeyword.replace(/[,;]/g, ' ').split(/\s+/).filter(Boolean);
+  const expanded = [...parts];
+  for (const p of parts) {
+    const lower = p.toLowerCase();
+    if (cnEnMap[p]) expanded.push(cnEnMap[p]);
+    for (const [cn, en] of Object.entries(cnEnMap)) {
+      if (en === lower) expanded.push(cn);
+    }
+  }
+  const unique = [...new Set(expanded)].sort();
+  const specific = unique.filter((kw) => !isGeneric(kw));
+  const generic = unique.filter((kw) => isGeneric(kw));
+  return [specific, generic];
+}
+
+function scoreSkill(skill, specificKws, genericKws) {
+  if (!specificKws.length && !genericKws.length) return [1, []];
+  let total = 0;
+  const matched = [];
+  const nameLower = (skill.name || '').toLowerCase();
+  const descLower = (skill.description || '').toLowerCase();
+  const serviceLower = (skill.service || '').toLowerCase();
+  const triggers = (skill.triggers || []).map((t) => (t || '').toLowerCase());
+
+  for (const kw of specificKws) {
+    const k = kw.toLowerCase();
+    let s = 0;
+    if (nameLower.includes(k)) s += 10;
+    else if (triggers.some((t) => t.includes(k))) s += 8;
+    else if (descLower.includes(k)) s += 5;
+    else if (serviceLower.includes(k)) s += 3;
+    if (s > 0) { total += s; matched.push(kw); }
+  }
+  for (const kw of genericKws) {
+    const k = kw.toLowerCase();
+    let s = 0;
+    if (nameLower.includes(k)) s += 10;
+    else if (triggers.some((t) => t.includes(k))) s += 4;
+    else if (descLower.includes(k)) s += 2;
+    else if (serviceLower.includes(k)) s += 1;
+    if (s > 0) { total += s; matched.push(kw); }
+  }
+  if (!specificKws.length && total === 0) {
+    total = 1;
+    if (descLower.length > 20) total += 1;
+    if (triggers.length) total += 1;
+  }
+  return [total, matched];
+}
+
+function truncate(desc, limit = 150) {
+  if (!desc) return '';
+  return desc.length > limit ? desc.slice(0, limit) + '...' : desc;
+}
+
+export async function searchMarketplace(query = '', category = '') {
+  const idx = await loadIndex();
+  const cnEnMap = await loadCnEnMap();
+  const [specificKws, genericKws] = expandKeywords(query, cnEnMap);
+  const hasSpecific = specificKws.length > 0;
+
+  const results = [];
+  for (const skill of idx.skills || []) {
+    if (category && skill.category !== category) continue;
+    const [score, matched] = scoreSkill(skill, specificKws, genericKws);
+    if (hasSpecific && score === 0) continue;
+    results.push({
+      score,
+      name: skill.name || '',
+      category: skill.category || '',
+      service: skill.service || '',
+      description: truncate(skill.description),
+      triggers: (skill.triggers || []).slice(0, 5),
+      matched,
+    });
+  }
+  results.sort((a, b) => b.score - a.score);
+
+  if (!results.length) {
+    return {
+      ok: true,
+      query,
+      category,
+      count: 0,
+      results: [],
+      fallback: [
+        'Try broader or alternative keywords',
+        'Remove category filter',
+        'Switch CN<->EN (e.g., obs <-> object storage)',
+        'List all: search with empty keyword and a category',
+      ],
+    };
+  }
+
+  const allKws = [...new Set([...specificKws, ...genericKws])];
+  return {
+    ok: true,
+    query,
+    category,
+    count: results.length,
+    expandedKeywords: allKws.length > 1 ? allKws : undefined,
+    results,
+  };
+}
+
+export async function getMarketplaceCategories() {
+  const idx = await loadIndex();
+  return { ok: true, categories: idx.categories || [] };
+}