huaweicloud-devkit 1.0.2-dev.1 → 1.0.2-dev.12

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

@@ -0,0 +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';
+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,3 +1,5 @@
+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;
@@ -19,10 +21,13 @@ async function fetchJson(url, label = '') {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), HTTP_TIMEOUT_MS);
   try {
-    const resp = await fetch(url, {
+    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');