dolphindb 2.0.929 → 2.0.931

package/browser.d.ts

@@ -507,9 +507,9 @@ export declare class DDB {
     pnode_run_defined: boolean;
     /** DdbMessage listeners */
     listeners: DdbMessageListener[];
-    pconnect: Promise<void>;
-    ppnoderun: Promise<void>;
-    presult: Promise<any>;
+    pconnect: import("xshell/utils.browser.js").Deferred<void>;
+    ppnoderun: import("xshell/utils.browser.js").Deferred<void>;
+    presult: import("xshell/utils.browser.js").Deferred<DdbObj<DdbValue>>;
     get connected(): boolean;
     /**
         使用 WebSocket URL 初始化连接到 DolphinDB 的实例（不建立实际的网络连接）
@@ -579,9 +579,8 @@ export declare class DDB {
             - vars?: type === 'variable' 时必传，variable 指令中待上传的变量名
             - listener?: 处理本次 rpc 期间的消息 (DdbMessage)
             - parse_object?: 在本次 rpc 期间设置 parse_object, 结束后恢复原有
-                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
-    */
-    rpc<T extends DdbObj = DdbObj>(type: DdbRpcType, options: DdbRpcOptions): Promise<T>;
+                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化 */
+    rpc<TResult extends DdbObj = DdbObj>(type: DdbRpcType, options: DdbRpcOptions): Promise<TResult>;
     /** eval script through websocket (script command)
         - script?: 执行的脚本  Script to execute
         - options?: 执行选项  execution options
@@ -622,7 +621,7 @@ export declare class DDB {
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
                 so as to facilitate subsequent forwarding and serialization
     */
-    call<T extends DdbObj>(func: string, args?: (DdbObj | string | boolean)[], { urgent, node, nodes, func_type, add_node_alias, listener, parse_object, }?: {
+    call<TResult extends DdbObj>(func: string, args?: (DdbObj | string | boolean)[], { urgent, node, nodes, func_type, add_node_alias, listener, parse_object, }?: {
         urgent?: boolean;
         node?: string;
         nodes?: string[];
@@ -630,7 +629,7 @@ export declare class DDB {
         add_node_alias?: boolean;
         listener?: DdbMessageListener;
         parse_object?: boolean;
-    }): Promise<T>;
+    }): Promise<TResult>;
     /** upload variable through websocket (variable command) */
     upload(
     /** 上传的变量名  Uploaded variables' name */

package/browser.js

@@ -5,7 +5,7 @@ import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
 import 'xshell/prototype.browser.js';
 import { blue, cyan, green, grey, magenta } from 'xshell/chalk.browser.js';
-import { concat, assert } from 'xshell/utils.browser.js';
+import { concat, assert, defer } from 'xshell/utils.browser.js';
 import { connect_websocket, WebSocketConnectionError } from 'xshell/net.browser.js';
 import { t } from './i18n/index.js';
 export var DdbForm;
@@ -2177,9 +2177,9 @@ export class DDB {
     pnode_run_defined = false;
     /** DdbMessage listeners */
     listeners = [];
-    pconnect = Promise.resolve();
-    ppnoderun = Promise.resolve();
-    presult = Promise.resolve(null);
+    pconnect = defer(null);
+    ppnoderun = defer(null);
+    presult = defer(null);
     get connected() {
         return this.websocket?.readyState === WebSocket.OPEN;
     }
@@ -2236,17 +2236,14 @@ export class DDB {
         if (this.connected)
             return;
         const ptail = this.pconnect;
-        let resolve;
-        this.pconnect = new Promise((_resolve, _reject) => {
-            resolve = _resolve;
-        });
+        const pconnect = this.pconnect = defer();
         await ptail;
         try {
             if (!this.connected) {
                 this.on_message = buffer => {
                     assert(false, t('这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message'));
                 };
-                this.presult = Promise.resolve(null);
+                this.presult = defer(null);
                 this.pnode_run_defined = false;
                 try {
                     this.websocket = await connect_websocket(this.url, {
@@ -2277,7 +2274,7 @@ export class DDB {
             }
         }
         finally {
-            resolve();
+            pconnect.resolve();
         }
     }
     get_rpc_options({ urgent = false, secondary = false, async: _async = false, pickle = false, clear = false, api = false, compress = false, cancellable = true, priority = urgent ? 8 : 4, parallelism = 8, root_id = '', limit, } = {}) {
@@ -2324,8 +2321,7 @@ export class DDB {
             - vars?: type === 'variable' 时必传，variable 指令中待上传的变量名
             - listener?: 处理本次 rpc 期间的消息 (DdbMessage)
             - parse_object?: 在本次 rpc 期间设置 parse_object, 结束后恢复原有
-                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
-    */
+                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化 */
     async rpc(type, options) {
         if (!this.websocket)
             await this.connect();
@@ -2336,10 +2332,7 @@ export class DDB {
         if (func === 'pnode_run' && !this.pnode_run_defined) {
             // 保证并发调用 rpc 时只定义一次 pnode_run
             const ptail = this.ppnoderun;
-            let resolve;
-            this.ppnoderun = new Promise((_resolve, _reject) => {
-                resolve = _resolve;
-            });
+            const ppnoderun = this.ppnoderun = defer();
             await ptail;
             try {
                 if (!this.pnode_run_defined)
@@ -2380,7 +2373,7 @@ export class DDB {
                                 '}\n', { urgent: true });
             }
             finally {
-                resolve();
+                ppnoderun.resolve();
             }
         }
         // this 上的当前配置需要在 message 到达后使用，先保存起来
@@ -2392,18 +2385,13 @@ export class DDB {
         // 1. 并发多个请求只返回第一个结果（阻塞，需后续请求疏通）
         // 2. windows 下 ddb server 返回多个相同的结果
         const ptail = this.presult;
-        let resolve;
-        let reject;
-        const presult = this.presult = new Promise((_resolve, _reject) => {
-            resolve = _resolve;
-            reject = _reject;
-        });
+        const presult = this.presult = defer();
         try {
             await ptail;
         }
         catch { }
         // 临界区结束，只有一个 rpc 函数调用运行到这里，可以独占 this.on_message 然后写 WebSocket
-        this.on_message = (buffer) => {
+        this.on_message = buffer => {
             try {
                 const buf = new Uint8Array(buffer);
                 if (this.print_message_buffer)
@@ -2419,15 +2407,15 @@ export class DDB {
                             console.log(data);
                         return;
                     case 'object':
-                        resolve(data);
+                        presult.resolve(data);
                         return;
                     case 'error':
-                        reject(data);
+                        presult.reject(data);
                         return;
                 }
             }
             catch (error) {
-                reject(error);
+                presult.reject(error);
             }
         };
         args = DdbObj.to_ddbobjs(args);