@opensumi/ide-extension 3.7.2-next-1739945875.0 → 3.7.2-next-1740016705.0

package/lib/worker-host.js

@@ -50894,9 +50894,10 @@ exports["default"] = warningOnce;
  * Where possible, operations execute without creating a new Buffer and copying everything over.
  */
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Cursor = exports.Buffers = exports.emptyBuffer = void 0;
+exports.Cursor = exports.Buffers = exports.buffer4Capacity = exports.emptyBuffer = void 0;
 exports.copy = copy;
 exports.emptyBuffer = new Uint8Array(0);
+exports.buffer4Capacity = new Uint8Array(4);
 function copy(source, target, targetStart, sourceStart, sourceEnd) {
     target.set(source.subarray(sourceStart, sourceEnd), targetStart);
 }
@@ -50946,6 +50947,31 @@ class Buffers {
         }
         return target;
     }
+    slice4(start) {
+        let end = start + 4;
+        const buffers = this.buffers;
+        if (end > this.size) {
+            end = this.size;
+        }
+        if (start >= end) {
+            return exports.emptyBuffer;
+        }
+        let startBytes = 0;
+        let si = 0;
+        for (; si < buffers.length && startBytes + buffers[si].length <= start; si++) {
+            startBytes += buffers[si].length;
+        }
+        const target = exports.buffer4Capacity;
+        let ti = 0;
+        for (let ii = si; ti < end - start && ii < buffers.length; ii++) {
+            const len = buffers[ii].length;
+            const _start = ti === 0 ? start - startBytes : 0;
+            const _end = ti + len >= end - start ? Math.min(_start + (end - start) - ti, len) : len;
+            copy(buffers[ii], target, ti, _start, _end);
+            ti += _end - _start;
+        }
+        return target;
+    }
     pos(i) {
         if (i < 0 || i >= this.size) {
             throw new Error(`out of range, ${i} not in [0, ${this.size})`);
@@ -51117,6 +51143,11 @@ class Cursor {
         this.skip(n);
         return buffers;
     }
+    read4() {
+        const buffers = this.buffers.slice4(this.offset);
+        this.skip(4);
+        return buffers;
+    }
     skip(n) {
         let count = 0;
         while (this.chunkIndex < this.buffers.buffers.length) {
@@ -51419,6 +51450,7 @@ exports.BaseConnection = BaseConnection;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.LengthFieldBasedFrameDecoder = exports.indicator = void 0;
+/* eslint-disable no-console */
 const writer_1 = __webpack_require__(/*! @furyjs/fury/dist/lib/writer */ "../../node_modules/@furyjs/fury/dist/lib/writer.js");
 const ide_core_common_1 = __webpack_require__(/*! @opensumi/ide-core-common */ "../core-common/lib/index.js");
 const buffers_1 = __webpack_require__(/*! ../../buffers/buffers */ "../connection/lib/common/buffers/buffers.js");
@@ -51426,26 +51458,33 @@ const buffers_1 = __webpack_require__(/*! ../../buffers/buffers */ "../connectio
  * You can use `Buffer.from('\r\n\r\n')` to get this indicator.
  */
 exports.indicator = new Uint8Array([0x0d, 0x0a, 0x0d, 0x0a]);
+/**
+ * The number of bytes in the length field.
+ *
+ * How many bytes are used to represent data length.
+ *
+ * For example, if the length field is 4 bytes, then the maximum length of the data is 2^32 = 4GB
+ */
+const lengthFieldLength = 4;
 /**
  * sticky packet unpacking problems are generally problems at the transport layer.
  * we use a length field to represent the length of the data, and then read the data according to the length
  */
 class LengthFieldBasedFrameDecoder {
     constructor() {
-        this.dataEmitter = new ide_core_common_1.Emitter();
-        this.onData = this.dataEmitter.event;
         this.buffers = new buffers_1.Buffers();
         this.cursor = this.buffers.cursor();
+        this.processingPromise = null;
         this.contentLength = -1;
         this.state = 0;
-        /**
-         * The number of bytes in the length field.
-         *
-         * How many bytes are used to represent data length.
-         *
-         * For example, if the length field is 4 bytes, then the maximum length of the data is 2^32 = 4GB
-         */
-        this.lengthFieldLength = 4;
+    }
+    onData(listener) {
+        this._onDataListener = listener;
+        return {
+            dispose: () => {
+                this._onDataListener = null;
+            },
+        };
     }
     reset() {
         this.contentLength = -1;
@@ -51454,30 +51493,70 @@ class LengthFieldBasedFrameDecoder {
     }
     push(chunk) {
         this.buffers.push(chunk);
-        let done = false;
-        while (!done) {
-            done = this.readFrame();
+        // 确保同一时间只有一个处理过程
+        if (!this.processingPromise) {
+            this.processingPromise = this.processBuffers().finally(() => {
+                this.processingPromise = null;
+            });
         }
     }
-    readFrame() {
-        const found = this.readLengthField();
-        if (found) {
+    async processBuffers() {
+        let iterations = 0;
+        let hasMoreData = false;
+        do {
+            hasMoreData = false;
+            while (iterations < LengthFieldBasedFrameDecoder.MAX_ITERATIONS) {
+                if (this.buffers.byteLength === 0) {
+                    break;
+                }
+                const result = await this.readFrame();
+                if (result === true) {
+                    break;
+                }
+                iterations++;
+                if (iterations % 10 === 0) {
+                    await new Promise((resolve) => setTimeout(resolve, 0));
+                }
+            }
+            // 检查剩余数据
+            if (this.buffers.byteLength > 0) {
+                hasMoreData = true;
+                // 异步继续处理，避免阻塞
+                await new Promise((resolve) => setImmediate(resolve));
+                iterations = 0; // 重置迭代计数器
+            }
+        } while (hasMoreData);
+    }
+    async readFrame() {
+        try {
+            const found = this.readLengthField();
+            if (!found) {
+                return true;
+            }
             const start = this.cursor.offset;
             const end = start + this.contentLength;
-            const binary = this.buffers.slice(start, end);
-            this.dataEmitter.fire(binary);
-            if (this.buffers.byteLength > end) {
-                this.contentLength = -1;
-                this.state = 0;
-                this.cursor.moveTo(end);
-                // has more data, continue to parse
-                return false;
+            if (end > this.buffers.byteLength) {
+                return true;
             }
-            // delete used buffers
+            const binary = this.buffers.slice(start, end);
+            // 立即清理已处理的数据
             this.buffers.splice(0, end);
             this.reset();
+            if (this._onDataListener) {
+                try {
+                    await Promise.resolve().then(() => { var _a; return (_a = this._onDataListener) === null || _a === void 0 ? void 0 : _a.call(this, binary); });
+                }
+                catch (error) {
+                    console.error('[Frame Decoder] Error in data listener:', error);
+                }
+            }
+            return false;
+        }
+        catch (error) {
+            console.error('[Frame Decoder] Error processing frame:', error);
+            this.reset();
+            return true;
         }
-        return true;
     }
     readLengthField() {
         const bufferLength = this.buffers.byteLength;
@@ -51493,12 +51572,12 @@ class LengthFieldBasedFrameDecoder {
             return false;
         }
         if (this.contentLength === -1) {
-            if (this.cursor.offset + this.lengthFieldLength > bufferLength) {
+            if (this.cursor.offset + lengthFieldLength > bufferLength) {
                 // Not enough data yet, wait for more data
                 return false;
             }
             // read the content length
-            const buf = this.cursor.read(this.lengthFieldLength);
+            const buf = this.cursor.read4();
             // fury writer use little endian
             this.contentLength = (0, ide_core_common_1.readUInt32LE)(buf, 0);
         }
@@ -51513,12 +51592,12 @@ class LengthFieldBasedFrameDecoder {
         let result = iter.next();
         while (!result.done) {
             switch (result.value) {
-                case 0x0d:
+                case 0x0d: // \r
                     switch (this.state) {
                         case 0:
                             this.state = 1;
                             break;
-                        case 2:
+                        case 2: // 第二个 \r
                             this.state = 3;
                             break;
                         default:
@@ -51526,12 +51605,12 @@ class LengthFieldBasedFrameDecoder {
                             break;
                     }
                     break;
-                case 0x0a:
+                case 0x0a: // \n
                     switch (this.state) {
                         case 1:
                             this.state = 2;
                             break;
-                        case 3:
+                        case 3: // 第二个 \n
                             this.state = 4;
                             iter.return();
                             break;
@@ -51548,19 +51627,27 @@ class LengthFieldBasedFrameDecoder {
         }
     }
     dispose() {
-        this.dataEmitter.dispose();
+        this._onDataListener = null;
         this.buffers.dispose();
+        this.reset();
     }
     static construct(content) {
-        LengthFieldBasedFrameDecoder.writer.reset();
-        LengthFieldBasedFrameDecoder.writer.buffer(exports.indicator);
-        LengthFieldBasedFrameDecoder.writer.uint32(content.byteLength);
-        LengthFieldBasedFrameDecoder.writer.buffer(content);
-        return LengthFieldBasedFrameDecoder.writer.dump();
+        // 每次都创建新的 writer，避免所有权问题
+        const writer = (0, writer_1.BinaryWriter)({});
+        try {
+            writer.buffer(exports.indicator);
+            writer.uint32(content.byteLength);
+            writer.buffer(content);
+            return writer;
+        }
+        catch (error) {
+            console.warn('[Frame Decoder] Error constructing frame:', error);
+            throw error;
+        }
     }
 }
 exports.LengthFieldBasedFrameDecoder = LengthFieldBasedFrameDecoder;
-LengthFieldBasedFrameDecoder.writer = (0, writer_1.BinaryWriter)({});
+LengthFieldBasedFrameDecoder.MAX_ITERATIONS = 50;
 //# sourceMappingURL=frame-decoder.js.map
 
 /***/ }),
@@ -51739,10 +51826,17 @@ class StreamConnection extends base_1.BaseConnection {
         });
     }
     send(data) {
-        const result = frame_decoder_1.LengthFieldBasedFrameDecoder.construct(data);
-        this.writable.write(result, () => {
-            // TODO: logger error
-        });
+        const handle = frame_decoder_1.LengthFieldBasedFrameDecoder.construct(data).dumpAndOwn();
+        try {
+            this.writable.write(handle.get(), (error) => {
+                if (error) {
+                    console.error('Failed to write data:', error);
+                }
+            });
+        }
+        finally {
+            handle.dispose();
+        }
     }
     onMessage(cb) {
         return this.decoder.onData(cb);
@@ -51811,22 +51905,84 @@ exports.StreamConnection = StreamConnection;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.WSWebSocketConnection = void 0;
+const constants_1 = __webpack_require__(/*! ../../constants */ "../connection/lib/common/constants.js");
 const base_1 = __webpack_require__(/*! ./base */ "../connection/lib/common/connection/drivers/base.js");
+const frame_decoder_1 = __webpack_require__(/*! ./frame-decoder */ "../connection/lib/common/connection/drivers/frame-decoder.js");
 class WSWebSocketConnection extends base_1.BaseConnection {
     constructor(socket) {
         super();
         this.socket = socket;
+        this.decoder = new frame_decoder_1.LengthFieldBasedFrameDecoder();
+        this.sendQueue = [];
+        this.pendingSize = 0;
+        this.sending = false;
+        this.socket.on('message', (data) => {
+            this.decoder.push(data);
+        });
+    }
+    async processSendQueue() {
+        if (this.sending) {
+            return;
+        }
+        this.sending = true;
+        while (this.sendQueue.length > 0) {
+            const { data, resolve, reject } = this.sendQueue[0];
+            let handle = null;
+            try {
+                handle = frame_decoder_1.LengthFieldBasedFrameDecoder.construct(data).dumpAndOwn();
+                const packet = handle.get();
+                for (let i = 0; i < packet.byteLength; i += constants_1.chunkSize) {
+                    if (!this.isOpen()) {
+                        throw new Error('Connection closed while sending');
+                    }
+                    await new Promise((resolve, reject) => {
+                        const chunk = packet.subarray(i, Math.min(i + constants_1.chunkSize, packet.byteLength));
+                        this.socket.send(chunk, { binary: true }, (error) => {
+                            if (error) {
+                                reject(error);
+                            }
+                            else {
+                                resolve();
+                            }
+                        });
+                    });
+                }
+                resolve();
+            }
+            catch (error) {
+                reject(error instanceof Error ? error : new Error(String(error)));
+            }
+            finally {
+                if (handle) {
+                    try {
+                        handle.dispose();
+                    }
+                    catch (error) {
+                        console.warn('[WSWebSocket] Error disposing handle:', error);
+                    }
+                }
+                this.pendingSize -= this.sendQueue[0].data.byteLength;
+                this.sendQueue.shift();
+            }
+        }
+        this.sending = false;
     }
     send(data) {
-        this.socket.send(data);
+        return new Promise((resolve, reject) => {
+            // 检查队列大小限制
+            if (this.sendQueue.length >= WSWebSocketConnection.MAX_QUEUE_SIZE) {
+                reject(new Error('Send queue full'));
+                return;
+            }
+            this.pendingSize += data.byteLength;
+            this.sendQueue.push({ data, resolve, reject });
+            this.processSendQueue().catch((error) => {
+                console.error('[WSWebSocket] Error processing queue:', error);
+            });
+        });
     }
     onMessage(cb) {
-        this.socket.on('message', cb);
-        return {
-            dispose: () => {
-                this.socket.off('message', cb);
-            },
-        };
+        return this.decoder.onData(cb);
     }
     onceClose(cb) {
         this.socket.once('close', cb);
@@ -51841,9 +51997,17 @@ class WSWebSocketConnection extends base_1.BaseConnection {
     }
     dispose() {
         this.socket.removeAllListeners();
+        // 拒绝所有待发送的消息
+        while (this.sendQueue.length > 0) {
+            const { reject } = this.sendQueue.shift();
+            reject(new Error('Connection disposed'));
+        }
+        this.pendingSize = 0;
+        this.sending = false;
     }
 }
 exports.WSWebSocketConnection = WSWebSocketConnection;
+WSWebSocketConnection.MAX_QUEUE_SIZE = 1000; // 限制队列长度
 //# sourceMappingURL=ws-websocket.js.map
 
 /***/ }),
@@ -51872,8 +52036,12 @@ tslib_1.__exportStar(__webpack_require__(/*! ./drivers */ "../connection/lib/com
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.METHOD_NOT_REGISTERED = void 0;
+exports.chunkSize = exports.METHOD_NOT_REGISTERED = void 0;
 exports.METHOD_NOT_REGISTERED = '$$METHOD_NOT_REGISTERED';
+/**
+ * 分片大小, 1MB
+ */
+exports.chunkSize = 1 * 1024 * 1024;
 //# sourceMappingURL=constants.js.map
 
 /***/ }),
@@ -52130,6 +52298,9 @@ const oneOf = (schemas, context) => {
             case 7:
                 v = serializers[7].read();
                 break;
+            default: {
+                throw new Error('unknown index: ' + idx);
+            }
         }
         v.kind = kinds[idx];
         return v;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-extension",
-  "version": "3.7.2-next-1739945875.0",
+  "version": "3.7.2-next-1740016705.0",
   "files": [
     "lib",
     "hosted"
@@ -23,18 +23,18 @@
   },
   "dependencies": {
     "@opensumi/events": "^1.0.0",
-    "@opensumi/ide-connection": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-core-browser": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-core-node": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-debug": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-file-search": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-file-service": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-logs": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-markdown": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-task": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-terminal-next": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-utils": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-webview": "3.7.2-next-1739945875.0",
+    "@opensumi/ide-connection": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-core-browser": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-core-node": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-debug": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-file-search": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-file-service": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-logs": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-markdown": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-task": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-terminal-next": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-utils": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-webview": "3.7.2-next-1740016705.0",
     "address": "^1.1.2",
     "glob-to-regexp": "0.4.1",
     "is-running": "^2.1.0",
@@ -45,28 +45,28 @@
     "v8-inspect-profiler": "^0.1.1"
   },
   "devDependencies": {
-    "@opensumi/ide-ai-native": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-comments": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-components": "3.7.2-next-1739945875.0",
+    "@opensumi/ide-ai-native": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-comments": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-components": "3.7.2-next-1740016705.0",
     "@opensumi/ide-core-browser": "workspace:*",
-    "@opensumi/ide-core-common": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-decoration": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-dev-tool": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-editor": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-extension-storage": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-file-tree-next": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-i18n": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-main-layout": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-monaco": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-output": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-overlay": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-quick-open": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-scm": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-testing": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-theme": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-toolbar": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-workspace": "3.7.2-next-1739945875.0",
-    "@opensumi/ide-workspace-edit": "3.7.2-next-1739945875.0"
+    "@opensumi/ide-core-common": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-decoration": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-dev-tool": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-editor": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-extension-storage": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-file-tree-next": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-i18n": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-main-layout": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-monaco": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-output": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-overlay": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-quick-open": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-scm": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-testing": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-theme": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-toolbar": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-workspace": "3.7.2-next-1740016705.0",
+    "@opensumi/ide-workspace-edit": "3.7.2-next-1740016705.0"
   },
-  "gitHead": "e491fa42318a9b37cfedf17b812c905c000c9aff"
+  "gitHead": "7c37a4e83a01dd8978ba55fc4b69e9ebb1f0b1f3"
 }