huaweicloud-devkit 1.0.2-next.2 → 1.0.2-next.21

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

@@ -65,7 +65,6 @@ function buildMarkers(nonce = randomBytes(8).toString('hex')) {
     doneSuffix,
     readyMarker,
     doneMarker,
-    donePattern: new RegExp(`${escapeRegExp(doneMarker)}(\\d+)`),
   };
 }
 
@@ -284,10 +283,15 @@ 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;
 
-    const rawOutput = pending.buffer.slice(0, doneMatch.index);
+    const afterMarker = pending.buffer.slice(markerIndex + doneMarker.length);
+    const exitMatch = afterMarker.match(/^(\d+)/);
+    if (!exitMatch) return;
+
+    const rawOutput = pending.buffer.slice(0, markerIndex);
     const stdout = cleanCommandOutput(rawOutput, {
       inputEchoed: this.inputEchoed,
       command: pending.command,
@@ -298,7 +302,7 @@ class WebSocketShellSession {
     this.pending = null;
     pending.resolve({
       stdout,
-      exitCode: Number(doneMatch[1]),
+      exitCode: Number(exitMatch[1]),
       url: this.url,
       command: pending.command,
     });