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

package/plugins/huaweicloud-core/src/sandbox/hwlink-api.mjs

@@ -1,5 +1,6 @@
 import crypto from 'node:crypto';
 import { resolveCredentials } from '../auth/credentials.mjs';
+import { getProxyDispatcher } from '../proxy/proxy-agent.mjs';
 
 const BASE_URL = process.env.HWLINK_ENDPOINT || 'https://devstation.myhuaweicloud.com';
 
@@ -96,17 +97,25 @@ async function apiGet(path, query, ak, sk, securitytoken) {
   const qs = sortedQs(query);
   const fullPath = qs ? `${path}?${qs}` : path;
   const headers = signRequest('GET', path, query, undefined, ak, sk, securitytoken);
-  const resp = await fetch(`${BASE_URL}${fullPath}`, { headers });
+  const url = `${BASE_URL}${fullPath}`;
+  const dispatcher = await getProxyDispatcher(url);
+  const fetchOpts = { headers };
+  if (dispatcher) fetchOpts.dispatcher = dispatcher;
+  const resp = await fetch(url, fetchOpts);
   return { status: resp.status, data: await resp.json() };
 }
 
 async function apiPost(path, body, ak, sk, securitytoken) {
   const headers = signRequest('POST', path, {}, body, ak, sk, securitytoken);
-  const resp = await fetch(`${BASE_URL}${path}`, {
+  const url = `${BASE_URL}${path}`;
+  const dispatcher = await getProxyDispatcher(url);
+  const fetchOpts = {
     method: 'POST',
     headers: { ...headers, 'Content-Type': 'application/json' },
     body: JSON.stringify(body),
-  });
+  };
+  if (dispatcher) fetchOpts.dispatcher = dispatcher;
+  const resp = await fetch(url, fetchOpts);
   return { status: resp.status, data: await resp.json() };
 }
 

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

@@ -2,6 +2,7 @@ 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;
@@ -55,12 +56,15 @@ async function getSession(workspaceId, username, timeoutMs) {
   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);
@@ -71,6 +75,8 @@ 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,
@@ -78,6 +84,7 @@ export async function execOneShot(workspaceId, command, username, timeoutMs) {
     username,
     command,
     timeoutMs,
+    WebSocketImpl,
   });
 }
 

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');