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

package/plugins/huaweicloud-core/src/ws-exec/hwlink-terminal-channel.js

@@ -1,3 +1,12 @@
+/*
+ * This file contains code derived from hwlink.
+ *
+ * Source:
+ * https://gitcode.com/huawei-developers/hwlink
+ *
+ * Licensed under the ISC License.
+ */
+
 import {
   OpCode,
   ReserveSource,
@@ -54,13 +63,15 @@ class HwlinkTerminalChannel {
   onopen() {
     if (this.closed || this.opened) return;
     this.opened = true;
-    this.sendRaw(createPacket({
-      operation: OpCode.OpNewCmdTerminal,
-      reserve: ReserveSource.Web,
-      identifier: this.identifier,
-      source: this.mux ? this.mux.source : 0,
-      payload: encoder.encode(this.username),
-    }));
+    this.sendRaw(
+      createPacket({
+        operation: OpCode.OpNewCmdTerminal,
+        reserve: ReserveSource.Web,
+        identifier: this.identifier,
+        source: this.mux ? this.mux.source : 0,
+        payload: encoder.encode(this.username),
+      }),
+    );
     if (this.onReadyCb) this.onReadyCb();
   }
 
@@ -73,13 +84,15 @@ class HwlinkTerminalChannel {
     }
 
     if (isSubStreamPing(packet.operation)) {
-      this.sendRaw(createPacket({
-        operation: OpCode.OpCmdTerminalData | OpCode.OpSubStreamPong,
-        reserve: ReserveSource.Web,
-        identifier: this.identifier,
-        source: this.mux ? this.mux.source : 0,
-        payload: new Uint8Array(0),
-      }));
+      this.sendRaw(
+        createPacket({
+          operation: OpCode.OpCmdTerminalData | OpCode.OpSubStreamPong,
+          reserve: ReserveSource.Web,
+          identifier: this.identifier,
+          source: this.mux ? this.mux.source : 0,
+          payload: new Uint8Array(0),
+        }),
+      );
       return;
     }
 
@@ -105,13 +118,15 @@ class HwlinkTerminalChannel {
   }
 
   sendTerminalData(payload) {
-    this.sendRaw(createPacket({
-      operation: OpCode.OpCmdTerminalData | OpCode.OpSubStreamPong,
-      reserve: ReserveSource.Web,
-      identifier: this.identifier,
-      source: this.mux ? this.mux.source : 0,
-      payload,
-    }));
+    this.sendRaw(
+      createPacket({
+        operation: OpCode.OpCmdTerminalData | OpCode.OpSubStreamPong,
+        reserve: ReserveSource.Web,
+        identifier: this.identifier,
+        source: this.mux ? this.mux.source : 0,
+        payload,
+      }),
+    );
   }
 
   sendText(text) {
@@ -124,13 +139,15 @@ class HwlinkTerminalChannel {
     const view = new DataView(payload.buffer);
     view.setUint16(0, rows, false);
     view.setUint16(2, cols, false);
-    this.sendRaw(createPacket({
-      operation: OpCode.OpCmdTerminalResize,
-      reserve: ReserveSource.Web,
-      identifier: this.identifier,
-      source: this.mux ? this.mux.source : 0,
-      payload,
-    }));
+    this.sendRaw(
+      createPacket({
+        operation: OpCode.OpCmdTerminalResize,
+        reserve: ReserveSource.Web,
+        identifier: this.identifier,
+        source: this.mux ? this.mux.source : 0,
+        payload,
+      }),
+    );
   }
 
   sendRaw(data) {
@@ -153,6 +170,4 @@ class HwlinkTerminalChannel {
   }
 }
 
-export {
-  HwlinkTerminalChannel,
-};
+export { HwlinkTerminalChannel };

package/plugins/huaweicloud-core/src/ws-exec/hwlink-tunnel-channel.mjs

@@ -0,0 +1,268 @@
+/*
+ * This file contains code derived from hwlink.
+ *
+ * Source:
+ * https://gitcode.com/huawei-developers/hwlink
+ *
+ * Licensed under the ISC License.
+ */
+
+import { createServer } from 'node:net';
+
+import {
+  OpCode,
+  ReserveSource,
+  FIXED_HEADER_LEN,
+  MAX_SEND_CHUNK_SIZE,
+  createPacket,
+  isOpTunnelSuccess,
+  isOpTcpTunnelData,
+  isOpFailed,
+  isSubStreamPing,
+  nextIdentifier,
+} from './hwlink-packet.js';
+
+const MAX_TUNNEL_PAYLOAD_SIZE = MAX_SEND_CHUNK_SIZE - FIXED_HEADER_LEN;
+
+class HwlinkTunnelChannel {
+  constructor({ localPort = 0, remotePort, onReady, onClose, onError }) {
+    this.localPort = localPort;
+    this.remotePort = remotePort;
+    this.identifier = nextIdentifier();
+    this.mux = null;
+    this.closed = false;
+    this.opened = false;
+
+    this.subConnections = new Map();
+    this.localServer = null;
+    this.nextSubId = 1;
+
+    this.onReadyCb = onReady || null;
+    this.onCloseCb = onClose || null;
+    this.onErrorCb = onError || null;
+
+    this._readyResolve = null;
+    this._readyReject = null;
+    this.ready = new Promise((resolve, reject) => {
+      this._readyResolve = resolve;
+      this._readyReject = reject;
+    });
+  }
+
+  attach(mux) {
+    this.mux = mux;
+    mux.register(this);
+  }
+
+  onopen() {
+    if (this.closed || this.opened) return;
+    this.opened = true;
+    this.startLocalServer();
+  }
+
+  onmessage(packet) {
+    if (this.closed) return;
+
+    if (isOpFailed(packet.operation)) {
+      const subConn = this.subConnections.get(packet.identifier);
+      if (subConn && subConn.socket && !subConn.socket.destroyed) {
+        try {
+          subConn.socket.end();
+        } catch {}
+      }
+      this.subConnections.delete(packet.identifier);
+      this._unregisterSubId(packet.identifier);
+      return;
+    }
+
+    if (isOpTunnelSuccess(packet.operation)) {
+      const subConn = this.subConnections.get(packet.identifier);
+      if (subConn && !subConn.ready) {
+        subConn.ready = true;
+        if (subConn.readyResolve) subConn.readyResolve();
+      }
+      if (packet.identifier === this.identifier && this._readyResolve) {
+        this._readyResolve();
+        this._readyResolve = null;
+        this._readyReject = null;
+      }
+      return;
+    }
+
+    if (isOpTcpTunnelData(packet.operation)) {
+      const subConn = this.subConnections.get(packet.identifier);
+      if (subConn && subConn.socket && !subConn.socket.destroyed) {
+        subConn.socket.write(packet.data);
+      }
+      return;
+    }
+
+    if (isSubStreamPing(packet.operation)) {
+      this.sendRaw(
+        createPacket({
+          operation: OpCode.OpTcpTunnelData | OpCode.OpSubStreamPong,
+          reserve: ReserveSource.Web,
+          identifier: packet.identifier,
+          source: this.mux ? this.mux.source : 0,
+          payload: new Uint8Array(0),
+        }),
+      );
+      return;
+    }
+
+    if (packet.operation === OpCode.OpDisconnect) {
+      const subConn = this.subConnections.get(packet.identifier);
+      if (subConn && subConn.socket && !subConn.socket.destroyed) {
+        subConn.socket.end();
+      }
+      this.subConnections.delete(packet.identifier);
+      this._unregisterSubId(packet.identifier);
+      return;
+    }
+  }
+
+  onerror(error) {
+    if (this.onErrorCb) this.onErrorCb(error);
+    if (this._readyReject) {
+      this._readyReject(error);
+      this._readyResolve = null;
+      this._readyReject = null;
+    }
+  }
+
+  onclose() {
+    this.close();
+  }
+
+  startLocalServer() {
+    this.localServer = createServer((socket) => {
+      this.onIncomingConnection(socket);
+    });
+
+    this.localServer.listen(this.localPort, '127.0.0.1', () => {
+      this.localPort = this.localServer.address().port;
+      if (this.onReadyCb) this.onReadyCb();
+      if (this._readyResolve) {
+        this._readyResolve();
+        this._readyResolve = null;
+        this._readyReject = null;
+      }
+    });
+
+    this.localServer.on('error', (err) => {
+      if (this.onErrorCb) this.onErrorCb(err);
+      if (this._readyReject) {
+        this._readyReject(err);
+        this._readyResolve = null;
+        this._readyReject = null;
+      }
+    });
+  }
+
+  _registerSubId(subId) {
+    if (this.mux && !this.mux.channels.has(subId)) {
+      this.mux.channels.set(subId, this);
+      this.mux.queue.register({ identifier: subId });
+    }
+  }
+
+  _unregisterSubId(subId) {
+    if (this.mux) {
+      this.mux.channels.delete(subId);
+      this.mux.queue.unregister({ identifier: subId });
+    }
+  }
+
+  onIncomingConnection(socket) {
+    const subId = this.nextSubId;
+    this.nextSubId = ((this.nextSubId + 1) & 0xffffffff) >>> 0;
+
+    let readyResolve;
+    const readyPromise = new Promise((resolve) => {
+      readyResolve = resolve;
+    });
+    const subConn = {
+      identifier: subId,
+      socket,
+      ready: false,
+      readyResolve,
+      readyPromise,
+    };
+
+    this.subConnections.set(subId, subConn);
+    this._registerSubId(subId);
+
+    this.sendRaw(
+      createPacket({
+        operation: OpCode.OpCreateTcpTunnel,
+        reserve: ReserveSource.Web,
+        srcPort: this.localPort,
+        dstPort: this.remotePort,
+        identifier: subId,
+        source: this.mux ? this.mux.source : 0,
+        payload: new Uint8Array(0),
+      }),
+    );
+
+    socket.on('data', (data) => {
+      if (this.closed || socket.destroyed) return;
+      for (let offset = 0; offset < data.length; offset += MAX_TUNNEL_PAYLOAD_SIZE) {
+        const payload = data.subarray(offset, offset + MAX_TUNNEL_PAYLOAD_SIZE);
+        this.sendRaw(
+          createPacket({
+            operation: OpCode.OpTcpTunnelData,
+            reserve: ReserveSource.Web,
+            srcPort: this.localPort,
+            dstPort: this.remotePort,
+            identifier: subId,
+            source: this.mux ? this.mux.source : 0,
+            payload,
+          }),
+        );
+      }
+    });
+
+    socket.on('close', () => {
+      this._unregisterSubId(subId);
+      this.subConnections.delete(subId);
+    });
+
+    socket.on('error', () => {
+      this._unregisterSubId(subId);
+      this.subConnections.delete(subId);
+    });
+  }
+
+  destroySubConnection(subConn, error) {
+    if (subConn.socket && !subConn.socket.destroyed) {
+      if (error) subConn.socket.destroy(error);
+      else subConn.socket.destroy();
+    }
+    this._unregisterSubId(subConn.identifier);
+    this.subConnections.delete(subConn.identifier);
+  }
+
+  sendRaw(data) {
+    if (this.mux) this.mux.sendFairly(this, data);
+  }
+
+  close() {
+    if (this.closed) return;
+    this.closed = true;
+
+    for (const subConn of this.subConnections.values()) {
+      this.destroySubConnection(subConn);
+    }
+    this.subConnections.clear();
+
+    if (this.localServer) {
+      this.localServer.close();
+      this.localServer = null;
+    }
+
+    if (this.mux) this.mux.unregister(this);
+    if (this.onCloseCb) this.onCloseCb();
+  }
+}
+
+export { HwlinkTunnelChannel };

package/plugins/huaweicloud-core/src/ws-exec/index.js

@@ -3,10 +3,12 @@ import * as hwlinkPacket from './hwlink-packet.js';
 import * as wsExec from './ws-exec-client.js';
 import { HwlinkWebSocketMultiplexer } from './hwlink-multiplexer.js';
 import { HwlinkTerminalChannel } from './hwlink-terminal-channel.js';
+import { HwlinkTunnelChannel } from './hwlink-tunnel-channel.mjs';
 
 export * from './ws-exec-client.js';
 export * from './hwlink-exec-client.js';
 export { HwlinkTerminalChannel } from './hwlink-terminal-channel.js';
+export { HwlinkTunnelChannel } from './hwlink-tunnel-channel.mjs';
 export { HwlinkWebSocketMultiplexer } from './hwlink-multiplexer.js';
 export { hwlinkPacket };
 
@@ -14,6 +16,7 @@ export default {
   ...wsExec,
   ...hwlinkExec,
   HwlinkTerminalChannel,
+  HwlinkTunnelChannel,
   HwlinkWebSocketMultiplexer,
   hwlinkPacket,
 };

package/plugins/huaweicloud-core/src/ws-exec/ws-exec-client.js

@@ -38,15 +38,36 @@ function closeQuietly(ws) {
   }
 }
 
-function escapeRegExp(text) {
-  return text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
 function stripEchoedLine(text, line, options = {}) {
-  const escaped = escapeRegExp(line);
-  const stripped = text.replace(new RegExp(`(^|\\r?\\n)${escaped}\\r?\\n?`), '$1');
-  if (!options.allowAttached || stripped !== text) return stripped;
-  return text.replace(new RegExp(`${escaped}(?:\\r?\\n){0,2}$`), '');
+  if (text.startsWith(line)) {
+    text = text.slice(line.length);
+    text = text.replace(/^\r?\n/, '');
+    if (!options.allowAttached) return text;
+  }
+
+  for (const nl of ['\r\n', '\n']) {
+    const idx = text.indexOf(nl + line);
+    if (idx !== -1) {
+      const before = text.slice(0, idx + nl.length);
+      const after = text.slice(idx + nl.length + line.length);
+      text = before + after.replace(/^\r?\n/, '');
+      if (!options.allowAttached) return text;
+      break;
+    }
+  }
+
+  if (options.allowAttached) {
+    for (let trail = 2; trail >= 0; trail--) {
+      for (const nl of ['\r\n', '\n']) {
+        const suffix = nl.repeat(trail);
+        if (text.endsWith(line + suffix)) {
+          return text.slice(0, text.length - line.length - suffix.length);
+        }
+      }
+    }
+  }
+
+  return text;
 }
 
 function buildMarkers(nonce = randomBytes(8).toString('hex')) {
@@ -65,7 +86,6 @@ function buildMarkers(nonce = randomBytes(8).toString('hex')) {
     doneSuffix,
     readyMarker,
     doneMarker,
-    donePattern: new RegExp(`${escapeRegExp(doneMarker)}(\\d+)`),
   };
 }
 
@@ -284,10 +304,17 @@ class WebSocketShellSession {
     const pending = this.pending;
     if (!pending) return;
 
-    const doneMatch = pending.buffer.match(pending.markers.donePattern);
-    if (!doneMatch || doneMatch.index === undefined) return;
+    const doneMarker = pending.markers.doneMarker;
+    const markerIndex = pending.buffer.lastIndexOf(doneMarker);
+    if (markerIndex === -1) return;
+
+    // eslint-disable-next-line unicorn/no-unsafe-buffer-conversion -- pending.buffer is a String, not a Buffer
+    const afterMarker = pending.buffer.slice(markerIndex + doneMarker.length);
+    const exitMatch = afterMarker.match(/^(\d+)/);
+    if (!exitMatch) return;
 
-    const rawOutput = pending.buffer.slice(0, doneMatch.index);
+    // eslint-disable-next-line unicorn/no-unsafe-buffer-conversion -- pending.buffer is a String, not a Buffer
+    const rawOutput = pending.buffer.slice(0, markerIndex);
     const stdout = cleanCommandOutput(rawOutput, {
       inputEchoed: this.inputEchoed,
       command: pending.command,
@@ -298,7 +325,7 @@ class WebSocketShellSession {
     this.pending = null;
     pending.resolve({
       stdout,
-      exitCode: Number(doneMatch[1]),
+      exitCode: Number(exitMatch[1]),
       url: this.url,
       command: pending.command,
     });

package/plugins/huaweicloud-core/skills/huawei-cloud-find-skills/SKILL.md

@@ -1,190 +0,0 @@
----
-name: huawei-cloud-find-skills
-description: |
-  Invoke this skill to search, discover, browse, find and install any Huawei Cloud (华为云) agent skill.Triggers include: "华为云","华为云有什么skill","华为云相关skill","华为云agent skill 市场","华为云skill类目","explore Huawei Cloud skills","show Huawei Cloud skill categories","does a Huawei Cloud skill exist for...","which Huawei Cloud skills exist","搜索华为云技能","有没有管理ECS/OBS/RDS的skill","帮我找 XX 华为云skill","介绍 XX Skill 内容","华为云 XX Skill 具体做什么","安装华为云Skill".
----
-
-> [!IMPORTANT]
-> **For any Huawei Cloud query or management task:**
-> 1. **Search** — use this skill (`huawei-cloud-find-skills`) to find the relevant Skill.
-> 2. **Install** — install the matched Skill (see [Step 3](#step-3-install-skill)).
-> 3. **Execute** — follow the installed Skill's instructions to fulfill the request.
-
-# Huawei Cloud Agent Skills Search and Discovery
-
-This skill enables users to efficiently search, discover, and install Huawei Cloud skills.
-
-## Scenario Description
-
-This skill enables users to:
-
-- **Search Skills**: Find skills by keyword, category, or both (matched against name, description, and triggers)
-- **Browse Categories**: Explore available skill categories
-- **View Skill Details**: Fetch full SKILL.md content from GitHub for specific skills
-- **Install Skills**: Guide users through skill installation via `npx skills add` (GitCode default), `npx clawhub install`, or fallback GitHub method
-
-**Architecture**: GitCode API v5 (`index.json` + `cn-en-map.json`) → HTTP GET (base64 decode) → In-memory search → GitHub raw fetch for details → Install
-
-### Use Cases
-
-- "Find a skill for managing ECS instances"
-- "What Huawei Cloud skills are available for OBS?"
-- "华为云有哪些 VPC 相关的 skill?"
-- "Browse all available Huawei Cloud skills"
-- "Install a skill for RDS management"
-- "帮我找一个华为云网络相关的skill"
-
-## Prerequisites
-
-- **Node.js >= 20** must be installed
-- **Network access** to `gitcode.com` (API v5 for index) and `github.com` / `raw.githubusercontent.com` (for skill details)
-
-### Step 0: Check Python Environment
-
-> **MANDATORY**: Before running any script command, verify Python is available.
-
-```bash
-# Check Python availability
-python --version   # or: python3 --version
-```
-
-If the command fails or returns Python 2.x:
-
-1. **Install Python 3**: Download from [python.org](https://www.python.org/downloads/) or use a package manager:
-   ```bash
-   # macOS
-   brew install python3
-   # Ubuntu/Debian
-   sudo apt-get install python3
-   # Windows — download installer from python.org, check "Add Python to PATH"
-   ```
-2. **Verify after install**: Run `python --version` again to confirm Python 3.6+ is available
-3. **If `python` points to Python 2**: Use `python3` instead of `python` in all commands below
-
-## Repository Info
-
-```
-INDEX_REPO=2501_91318609/skills-for-index
-INDEX_BRANCH=main
-SKILLS_REPO=huaweicloud/huaweicloud-skills
-SKILLS_BRANCH=master
-RAW_BASE=https://raw.githubusercontent.com/$SKILLS_REPO/$SKILLS_BRANCH
-```
-
-## Index Source
-
-The search script fetches the skill index from GitCode API v5 via HTTP GET (base64 auto-decoded):
-
-```
-SKILLS_INDEX_URL=https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/index.json?ref=main
-SKILLS_CN_EN_MAP_URL=https://gitcode.com/api/v5/repos/2501_91318609/skills-for-index/contents/skills-index/cn-en-map.json?ref=main
-```
-
-
-## Core Workflow
-
-### Step 1: Search Skills
-
-> **MANDATORY**: The agent MUST execute the search script to search the skill index. Do NOT read the JSON file directly — always use the script.
-
-Given `keyword` (from AI-understood user intent) and optional `category`, run the search script:
-
-```bash
-node scripts/search-skills.mjs <keyword>
-node scripts/search-skills.mjs <keyword> -c <category>
-node scripts/search-skills.mjs -c <category>
-```
-
-→ [scripts/search-skills.mjs](scripts/search-skills.mjs) (Node.js — cross-platform)
-
-**What the script does**:
-1. Fetches `index.json` and `cn-en-map.json` via HTTP GET from GitCode API v5 (auto-decodes base64 content)
-2. Expands keywords via `cn-en-map.json` (bidirectional CN↔EN, e.g., "ECS" → "ECS, 弹性云服务器, 云服务器")
-3. Scores each skill: name match **+10**, trigger match **+8**, description match **+5**, service match **+3**
-4. Sorts by score descending, outputs formatted results with matched keywords
-
-**Fallback iteration** (if no results): 1) Switch CN↔EN keywords 2) Expand keywords 3) Remove category filter 4) Try synonyms 5) List all skills
-
-The process should persist until the skill is found or its absence is confirmed. In the event of total failure, notify the user of the specific steps that were attempted.
-
-### Step 2: View Skill Details (optional)
-
-Fetch the full SKILL.md content from GitHub for intent validation. Skip this step if the search results from Step 1 are sufficiently informative.
-
-```bash
-# URL pattern — use the skill's category, service, and name from index
-DETAIL_URL="https://raw.githubusercontent.com/huaweicloud/huaweicloud-skills/master/skills/${category}/${service}/${name}/SKILL.md"
-```
-
-The agent can fetch this URL using `curl` or its web-fetch tool, then present the skill's full documentation to the user.
-
-### Step 3: Install Skill
-
-> **MANDATORY**: Use one of the commands below. Option A is the default; Option C is a fallback when Option A is unavailable.
-
-```bash
-# Option A: npx skills add from GitCode (default)
-npx skills add https://gitcode.com/huaweicloud/huaweicloud-skills.git#master --skill <skill-name> -y
-
-# Option B: npx clawhub install (OpenClaw ecosystem)
-npx clawhub install <skill-name> -y
-
-# Option C (fallback): npx skills add from GitHub
-npx skills add huaweicloud/huaweicloud-skills --skill <skill-name> -y
-```
-
-If all installation attempts fail, report the error message to the user. Do NOT attempt any method outside the commands above.
-
-## Parameters
-
-| Parameter | Required/Optional | Description | Default |
-|-----------|-------------------|-------------|---------|
-| `Keyword` | Optional | Search keyword (matched against name, description, triggers, service) | None |
-| `Category` | Optional | Category code for filtering (e.g., "computing", "storage", "network") | None |
-| `skill-name` | Required (Step 3) | Exact skill name for installing | None |
-
-
-## Reference Documentation
-
-| Document | Description |
-|----------|-------------|
-| GitCode API v5 `index.json` | Skill index fetched via HTTP GET (base64 decoded) |
-| GitCode API v5 `cn-en-map.json` | Chinese-English keyword mapping fetched via HTTP GET (base64 decoded) |
-| [scripts/search-skills.py](scripts/search-skills.py) | Search script (Python) — fetches from GitCode API v5, expands keywords, scores, sorts |
-
-## Search Heuristics
-
-> Optional reference for keyword-to-category hints. The agent can infer categories from `index.json` without these.
-
-- Cloud infrastructure keywords (ecs, bms, vpc, obs, rds, ...) → likely `computing`, `network`, `storage`, etc.
-- Tool keywords (cli, terraform, koo) → likely `devtools`
-- Management keywords (monitoring, alarm, log) → likely `monitoring`
-
-## Troubleshooting
-
-### Issue: Script fails with "Failed to fetch index.json"
-
-**Cause**: GitCode API v5 URL unreachable
-**Solution**: Verify network connectivity to `gitcode.com`
-
-### Issue: GitCode API v5 returns 404
-
-**Cause**: File path incorrect or default branch is not `main`
-**Solution**: Verify the skill's `category`, `service`, and `name` from search results
-
-### Issue: Search returns no results
-
-**Cause**: Keywords don't match any skill
-**Solution**:
-1. Try broader keywords
-2. Switch between Chinese and English keywords (e.g., "对象存储" → "obs")
-3. List all skills: `python scripts/search-skills.py -c "computing"`
-
-## Notes
-
-- This skill is **read-only** and does not create any cloud resources
-- **No cache management needed** — index is fetched fresh from GitCode API v5 each run
-- **Network required** — index data is hosted on GitCode, fetched via HTTP GET (base64 decoded)
-- **MUST use script to search** — do not read index.json directly
-- Index repo: `https://gitcode.com/2501_91318609/skills-for-index` (branch: `main`)
-- Skills repo: `https://github.com/huaweicloud/huaweicloud-skills` (branch: `master`)