huaweicloud-devkit 1.1.2-next.0 → 1.1.2-next.2

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 { resolveCredentialsWithRuntime } from '../auth/credentials.mjs';
 import { getProxyDispatcher } from '../proxy/proxy-agent.mjs';
 
 const BASE_URL = process.env.HWLINK_ENDPOINT || 'https://devstation.myhuaweicloud.com';
@@ -14,9 +15,7 @@ function hmacSha256(key, data) {
 
 function urlEncode(str) {
   const hex = (c) => '%' + (c < 16 ? '0' : '') + c.toString(16).toUpperCase();
-  const noEscape = new Set(
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~'.split('')
-  );
+  const noEscape = new Set('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_.~'.split(''));
   let out = '';
   for (const ch of str) {
     const c = ch.codePointAt(0);
@@ -54,9 +53,7 @@ function signRequest(method, path, query, body, ak, sk, securitytoken) {
       .join('/') +
     '/';
 
-  const signedHeaders = securitytoken
-    ? 'host;x-sdk-date;x-security-token'
-    : 'host;x-sdk-date';
+  const signedHeaders = securitytoken ? 'host;x-sdk-date;x-security-token' : 'host;x-sdk-date';
   const canonicalHeaders = securitytoken
     ? `host:${host}\nx-sdk-date:${ts}\nx-security-token:${securitytoken}\n`
     : `host:${host}\nx-sdk-date:${ts}\n`;
@@ -64,14 +61,7 @@ function signRequest(method, path, query, body, ak, sk, securitytoken) {
   const bodyStr = body ? JSON.stringify(body) : '';
   const payloadHash = sha256Hex(bodyStr);
 
-  const canonicalRequest = [
-    method,
-    curi,
-    cqs,
-    canonicalHeaders,
-    signedHeaders,
-    payloadHash,
-  ].join('\n');
+  const canonicalRequest = [method, curi, cqs, canonicalHeaders, signedHeaders, payloadHash].join('\n');
 
   const stringToSign = `SDK-HMAC-SHA256\n${ts}\n${sha256Hex(canonicalRequest)}`;
   const signature = hmacSha256(sk, stringToSign);
@@ -88,7 +78,7 @@ function signRequest(method, path, query, body, ak, sk, securitytoken) {
 }
 
 export function getCredentials() {
-  const credentials = resolveCredentials();
+  const credentials = resolveCredentialsWithRuntime();
   return { ak: credentials.ak, sk: credentials.sk, securitytoken: credentials.securityToken };
 }
 
@@ -100,7 +90,12 @@ async function apiGet(path, query, ak, sk, securitytoken) {
   const url = `${BASE_URL}${fullPath}`;
   const dispatcher = await getProxyDispatcher(url);
   const fetchOpts = { headers };
-  if (dispatcher) fetchOpts.dispatcher = dispatcher;
+  if (dispatcher) {
+    fetchOpts.dispatcher = dispatcher;
+    const { fetch: undiciFetch } = await import('undici');
+    const resp = await undiciFetch(url, fetchOpts);
+    return { status: resp.status, data: await resp.json() };
+  }
   const resp = await fetch(url, fetchOpts);
   return { status: resp.status, data: await resp.json() };
 }
@@ -114,7 +109,12 @@ async function apiPost(path, body, ak, sk, securitytoken) {
     headers: { ...headers, 'Content-Type': 'application/json' },
     body: JSON.stringify(body),
   };
-  if (dispatcher) fetchOpts.dispatcher = dispatcher;
+  if (dispatcher) {
+    fetchOpts.dispatcher = dispatcher;
+    const { fetch: undiciFetch } = await import('undici');
+    const resp = await undiciFetch(url, fetchOpts);
+    return { status: resp.status, data: await resp.json() };
+  }
   const resp = await fetch(url, fetchOpts);
   return { status: resp.status, data: await resp.json() };
 }
@@ -123,7 +123,9 @@ export async function createConnection(envId, ak, sk, securitytoken) {
   const { status, data } = await apiPost(
     `/open-api-public/v1/devenvs/${envId}/connections`,
     { source: 'CLI' },
-    ak, sk, securitytoken
+    ak,
+    sk,
+    securitytoken,
   );
 
   if (status !== 200 || data?.error_code !== '0000' || !data?.result?.connection_id) {
@@ -138,13 +140,12 @@ export async function createConnection(envId, ak, sk, securitytoken) {
     const { data: getData } = await apiGet(
       `/open-api-public/v1/devenvs/${envId}/connections/${connectionId}`,
       {},
-      ak, sk, securitytoken
+      ak,
+      sk,
+      securitytoken,
     );
 
-    if (
-      getData?.result?.connection_info?.url &&
-      getData.result.connection_info.extensions?.source != null
-    ) {
+    if (getData?.result?.connection_info?.url && getData.result.connection_info.extensions?.source != null) {
       const u = new URL(getData.result.connection_info.url);
       u.searchParams.set('source', String(getData.result.connection_info.extensions.source));
       process.stderr.write(`\rConnection ${connectionId} established (${i}s).\n`);
@@ -158,5 +159,3 @@ export async function createConnection(envId, ak, sk, securitytoken) {
 
   throw new Error(`Timed out waiting for connection ${connectionId}`);
 }
-
-

package/plugins/huaweicloud-core/src/sandbox/sandbox-file-server.py

@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+import hashlib, http.server, json, os, sys
+class UploadHandler(http.server.BaseHTTPRequestHandler):
+    def do_POST(self):
+        if self.path != '/upload':
+            self.send_error(404)
+            return
+        target_path = self.headers.get('X-Target-Path', '/workspace/upload.tar.gz')
+        content_length = int(self.headers.get('Content-Length', 0))
+        os.makedirs(os.path.dirname(target_path), exist_ok=True)
+        md5 = hashlib.md5()
+        bytes_written = 0
+        with open(target_path, 'wb') as f:
+            remaining = content_length
+            while remaining > 0:
+                chunk = self.rfile.read(min(remaining, 65536))
+                if not chunk:
+                    break
+                f.write(chunk)
+                md5.update(chunk)
+                bytes_written += len(chunk)
+                remaining -= len(chunk)
+        result = json.dumps({'ok': True, 'path': target_path, 'bytes': bytes_written, 'md5': md5.hexdigest()})
+        self.send_response(200)
+        self.send_header('Content-Type', 'application/json')
+        self.send_header('Content-Length', str(len(result)))
+        self.end_headers()
+        self.wfile.write(result.encode())
+    def do_GET(self):
+        if self.path == '/health':
+            body = b'ok'
+            self.send_response(200)
+            self.send_header('Content-Length', str(len(body)))
+            self.end_headers()
+            self.wfile.write(body)
+        else:
+            self.send_error(404)
+    def log_message(self, format, *args):
+        pass
+if __name__ == '__main__':
+    port = int(sys.argv[1]) if len(sys.argv) > 1 else 8888
+    token = sys.argv[2] if len(sys.argv) > 2 else ''
+    server = http.server.HTTPServer(('127.0.0.1', port), UploadHandler)
+    server.upload_token = token
+    server.serve_forever()