dolphindb 2.0.525 → 2.0.526

package/browser.d.ts

@@ -383,7 +383,8 @@ export declare class DDB {
     parse_object: boolean;
     /** DdbMessage listeners */
     listeners: DdbMessageListener[];
-    promise: Promise<any>;
+    pconnect: Promise<void>;
+    presult: Promise<any>;
     get connected(): boolean;
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL

package/browser.js

@@ -1914,7 +1914,8 @@ class DDB {
         this.parse_object = true;
         /** DdbMessage listeners */
         this.listeners = [];
-        this.promise = Promise.resolve(null);
+        this.pconnect = Promise.resolve();
+        this.presult = Promise.resolve(null);
         if (!url) {
             const _url = new URL(location.href);
             const hostname = _url.searchParams.get('hostname') || location.hostname;
@@ -2041,7 +2042,8 @@ class DDB {
         if (this.connected)
             this.websocket.close(1000);
         this.on_message = () => { };
-        this.promise = Promise.resolve(null);
+        this.presult = Promise.resolve(null);
+        this.pconnect = Promise.resolve();
     }
     /** rpc through websocket (function/script/variable command)
         - type: API 类型: 'script' | 'function' | 'variable'
@@ -2053,8 +2055,21 @@ class DDB {
                 为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
     */
     async rpc(type, { script, func, args = [], vars = [], urgent, listener, parse_object, }) {
-        if (!this.websocket)
-            await this.connect();
+        if (!this.websocket) {
+            const ptail = this.pconnect;
+            let resolve;
+            this.pconnect = new Promise((_resolve, _reject) => {
+                resolve = _resolve;
+            });
+            await ptail;
+            try {
+                if (!this.websocket)
+                    await this.connect();
+            }
+            finally {
+                resolve();
+            }
+        }
         if (!this.connected)
             throw new Error(`${this.url} is already disconnected`);
         // this 上的当前配置需要在 message 到达后使用，先保存起来
@@ -2064,10 +2079,10 @@ class DDB {
         // 违反世界观可能造成:  
         // 1. 并发多个请求只返回第一个结果（阻塞，需后续请求疏通）
         // 2. windows 下 ddb server 返回多个相同的结果
-        const ptail = this.promise;
+        const ptail = this.presult;
         let resolve;
         let reject;
-        const promise = this.promise = new Promise((_resolve, _reject) => {
+        const presult = this.presult = new Promise((_resolve, _reject) => {
             resolve = _resolve;
             reject = _reject;
         });
@@ -2128,7 +2143,7 @@ class DDB {
             command,
             ...args.map((arg) => arg.pack())
         ]));
-        return promise;
+        return presult;
     }
     /** eval script through websocket (script command)
         - script?: Script to execute