dolphindb 2.0.505 → 2.0.506

package/browser.d.ts

@@ -271,13 +271,16 @@ export declare class DDB {
     password: string;
     /** python session flag (2048) */
     python: boolean;
+    print_message_buffer: boolean;
+    print_object_buffer: boolean;
+    print_message: boolean;
     parse_object: boolean;
-    /** message handler */
-    on_message({ type, data }: DdbMessage, _this: DDB): void;
+    /** message handlers */
+    handlers: DdbMessageHandler[];
     /** resolver, rejector, promise of last rpc */
-    presolver(message: DdbMessage): void;
+    presolver(ddbobj: DdbObj): void;
     prejector(error: Error): void;
-    presult: Promise<DdbMessage>;
+    presult: Promise<DdbObj<DdbValue>>;
     get connected(): boolean;
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL
@@ -292,7 +295,7 @@ export declare class DDB {
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')
         
-        // 使用 HTTPS 加密
+        // Encrypt with HTTPS
         let ddbsecure = new DDB('wss://dolphindb.com', {
             autologin: true,
             username: 'admin',
@@ -350,31 +353,31 @@ export declare class DDB {
         - options:
             - urgent?: 决定 `行为标识` 那一行字符串的取值（只适用于 script 和 function）
             - vars?: type === 'variable' 时必传，variable 指令中待上传的变量名
-            - on_message?:   在该次 rpc 期间设置 message handler, 结束后恢复原有
-            - parse_object?: 在该次 rpc 期间设置 parse_object, 结束后恢复原有，为 false 时返回的 DdbObj 仅含有 buffer 和 le，
-                不做解析，以便后续转发、序列化
+            - handler?: 处理本次 rpc 期间的消息
+            - parse_object?: 在本次 rpc 期间设置 parse_object, 结束后恢复原有
+                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
     */
-    rpc<T extends DdbObj = DdbObj>(type: 'script' | 'function' | 'variable' | 'connect', { script, func, args, vars, urgent, on_message, parse_object, }: {
+    rpc<T extends DdbObj = DdbObj>(type: 'script' | 'function' | 'variable' | 'connect', { script, func, args, vars, urgent, handler, parse_object, }: {
         script?: string;
         func?: string;
         args?: (DdbObj | string | boolean)[];
         vars?: string[];
         urgent?: boolean;
-        on_message?: DDB['on_message'];
+        handler?: DdbMessageHandler;
         parse_object?: boolean;
     }): Promise<T>;
     /** eval script through websocket (script command)
         - script?: Script to execute
         - options?: execution options
             - urgent?: Urgent flag to ensure that submitted scripts are processed by urgent workers to prevent being blocked by other jobs
-            - on_message?: Set the message handler during this rpc, and restore the original after the end
+            - handler?: Process messages during this rpc
             - parse_object?: Set parse_object during this rpc, and restore the original after the end.
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
                 so as to facilitate subsequent forwarding and serialization
     */
-    eval<T extends DdbObj>(script: string, { urgent, on_message, parse_object, }?: {
+    eval<T extends DdbObj>(script: string, { urgent, handler, parse_object, }?: {
         urgent?: boolean;
-        on_message?: DDB['on_message'];
+        handler?: DdbMessageHandler;
         parse_object?: boolean;
     }): Promise<T>;
     /** call function through websocket (function command)
@@ -386,18 +389,18 @@ export declare class DDB {
             - nodes?: When setting multiple node aliases, send them to the corresponding multiple nodes in the cluster for execution (using the pnodeRun method in DolphinDB)
             - func_type?: It must be passed when setting the node parameter, the function type needs to be specified, and it is not passed in other cases
             - add_node_alias?: Select to pass when setting the nodes parameter, otherwise not pass
-            - on_message?: Set the message handler during this rpc, and restore the original after the end
+            - handler?: Process messages during this rpc
             - parse_object?: Set parse_object during this rpc, and restore the original after the end.
                 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, on_message, parse_object, }?: {
+    call<T extends DdbObj>(func: string, args?: (DdbObj | string | boolean)[], { urgent, node, nodes, func_type, add_node_alias, handler, parse_object, }?: {
         urgent?: boolean;
         node?: string;
         nodes?: string[];
         func_type?: DdbFunctionType;
         add_node_alias?: boolean;
-        on_message?: DDB['on_message'];
+        handler?: DdbMessageHandler;
         parse_object?: boolean;
     }): Promise<T>;
     /** upload variable through websocket (variable command) */
@@ -405,8 +408,8 @@ export declare class DDB {
     /** Uploaded variables' name */
     vars: string[], 
     /** Uploaded variables' value */
-    args: (DdbObj | string | boolean)[], { on_message, parse_object, }?: {
-        on_message?: DDB['on_message'];
+    args: (DdbObj | string | boolean)[], { handler, parse_object, }?: {
+        handler?: DdbMessageHandler;
         parse_object?: boolean;
     }): Promise<DdbObj<DdbValue>>;
     /** 解析服务端响应报文，返回去掉 header 的 data buf */
@@ -416,6 +419,9 @@ export declare class DDB {
     /** 转换 js 数组为 DdbObj[] */
     to_ddbobjs(values: any[]): DdbObj<DdbValue>[];
 }
+export interface DdbMessageHandler {
+    (message: DdbMessage, _this: DDB): any;
+}
 export interface DdbPrintMessage {
     type: 'print';
     data: string;
@@ -424,6 +430,10 @@ export interface DdbObjectMessage {
     type: 'object';
     data: DdbObj;
 }
-export declare type DdbMessage = DdbPrintMessage | DdbObjectMessage;
+export interface DdbErrorMessage {
+    type: 'error';
+    data: Error;
+}
+export declare type DdbMessage = DdbPrintMessage | DdbObjectMessage | DdbErrorMessage;
 export declare let ddb: DDB;
 export default ddb;

package/browser.js

@@ -1342,7 +1342,7 @@ class DDB {
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')
         
-        // 使用 HTTPS 加密
+        // Encrypt with HTTPS
         let ddbsecure = new DDB('wss://dolphindb.com', {
             autologin: true,
             username: 'admin',
@@ -1367,7 +1367,12 @@ class DDB {
         this.password = '123456';
         /** python session flag (2048) */
         this.python = false;
+        this.print_message_buffer = false;
+        this.print_object_buffer = false;
+        this.print_message = true;
         this.parse_object = true;
+        /** message handlers */
+        this.handlers = [];
         this.presult = Promise.resolve(null);
         if (!url) {
             const _url = new URL(location.href);
@@ -1385,16 +1390,8 @@ class DDB {
         if (options.python !== undefined)
             this.python = options.python;
     }
-    /** message handler */
-    on_message({ type, data }, _this) {
-        switch (type) {
-            case 'print':
-                console.log(data);
-                return;
-        }
-    }
     /** resolver, rejector, promise of last rpc */
-    presolver(message) { }
+    presolver(ddbobj) { }
     prejector(error) { }
     get connected() {
         return this.websocket?.readyState === WebSocket.OPEN;
@@ -1427,35 +1424,66 @@ class DDB {
             },
             on_message: event => {
                 const buf = new Uint8Array(event.data);
-                try {
-                    const message = this.parse_message(buf);
-                    this.on_message(message, this);
-                    if (message.type === 'print')
-                        return;
-                    this.presolver(message);
+                if (this.print_message_buffer)
+                    console.log(buf);
+                const message = this.parse_message(buf);
+                if (this.handlers.length) {
+                    const _handlers = [...this.handlers].reverse();
+                    for (const handler of _handlers)
+                        handler(message, this);
                 }
-                catch (error) {
-                    this.prejector(error);
+                const { type, data } = message;
+                switch (type) {
+                    case 'print':
+                        if (this.print_message)
+                            console.log(data);
+                        return;
+                    case 'object':
+                        if (this.print_object_buffer)
+                            console.log(data.buffer);
+                        this.presolver(data);
+                        return;
+                    case 'error':
+                        this.prejector(data);
+                        return;
                 }
             }
         });
-        if (!this.python)
-            await this.eval('def pnode_run (nodes, func_name, args, add_node_alias = true) {\n' +
+        await this.eval(this.python ?
+            'def pnode_run (nodes, func_name, args, add_node_alias):\n' +
                 '    nargs = size(args)\n' +
                 '    func = funcByName(func_name)\n' +
                 '    \n' +
-                '    if (!nargs)\n' +
+                '    if not nargs:\n' +
                 '        return pnodeRun(func, nodes, add_node_alias)\n' +
                 '    \n' +
-                '    args_partial = array(any, 1 + nargs, 1 + nargs)\n' +
-                '    args_partial[0] = func\n' +
-                '    args_partial[1:] = args\n' +
+                '    args_partial = [ ]\n' +
+                '    args_partial.append(func)\n' +
+                '    for a in args:\n' +
+                '        args_partial.append(a)\n' +
+                '    \n' +
                 '    return pnodeRun(\n' +
                 '        unifiedCall(partial, args_partial),\n' +
                 '        nodes,\n' +
                 '        add_node_alias\n' +
-                '    )\n' +
-                '}\n', { urgent: true });
+                '    )\n'
+            :
+                'def pnode_run (nodes, func_name, args, add_node_alias = true) {\n' +
+                    '    nargs = size(args)\n' +
+                    '    func = funcByName(func_name)\n' +
+                    '    \n' +
+                    '    if (!nargs)\n' +
+                    '        return pnodeRun(func, nodes, add_node_alias)\n' +
+                    '    \n' +
+                    '    args_partial = array(any, 1 + nargs, 1 + nargs)\n' +
+                    '    args_partial[0] = func\n' +
+                    '    args_partial[1:] = args\n' +
+                    '    return pnodeRun(\n' +
+                    '        unifiedCall(partial, args_partial),\n' +
+                    '        nodes,\n' +
+                    '        add_node_alias\n' +
+                    '    )\n' +
+                    '}\n', { urgent: true });
         if (this.autologin)
             if (this.python)
                 await this.eval(`login(${this.username.quote('double')}, ${this.password.quote('double')})`, { urgent: true });
@@ -1505,11 +1533,11 @@ class DDB {
         - options:
             - urgent?: 决定 `行为标识` 那一行字符串的取值（只适用于 script 和 function）
             - vars?: type === 'variable' 时必传，variable 指令中待上传的变量名
-            - on_message?:   在该次 rpc 期间设置 message handler, 结束后恢复原有
-            - parse_object?: 在该次 rpc 期间设置 parse_object, 结束后恢复原有，为 false 时返回的 DdbObj 仅含有 buffer 和 le，
-                不做解析，以便后续转发、序列化
+            - handler?: 处理本次 rpc 期间的消息
+            - parse_object?: 在本次 rpc 期间设置 parse_object, 结束后恢复原有
+                为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
     */
-    async rpc(type, { script, func, args = [], vars = [], urgent, on_message, parse_object, }) {
+    async rpc(type, { script, func, args = [], vars = [], urgent, handler, parse_object, }) {
         if (!this.websocket)
             await this.connect();
         if (!this.connected)
@@ -1560,19 +1588,18 @@ class DDB {
             command,
             ...args.map((arg) => arg.pack())
         ]);
-        const _on_message = this.on_message;
         const _parse_object = this.parse_object;
-        if (on_message)
-            this.on_message = on_message;
+        if (handler)
+            this.handlers.push(handler);
         if (parse_object !== undefined)
             this.parse_object = parse_object;
         try {
             this.websocket.send(message);
-            const { data } = (await presult);
-            return data;
+            return (await presult);
         }
         finally {
-            this.on_message = _on_message;
+            if (handler)
+                this.handlers = this.handlers.filter(h => h !== handler);
             this.parse_object = _parse_object;
         }
     }
@@ -1580,13 +1607,13 @@ class DDB {
         - script?: Script to execute
         - options?: execution options
             - urgent?: Urgent flag to ensure that submitted scripts are processed by urgent workers to prevent being blocked by other jobs
-            - on_message?: Set the message handler during this rpc, and restore the original after the end
+            - handler?: Process messages during this rpc
             - parse_object?: Set parse_object during this rpc, and restore the original after the end.
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
                 so as to facilitate subsequent forwarding and serialization
     */
-    async eval(script, { urgent, on_message, parse_object, } = {}) {
-        return this.rpc('script', { script, urgent, on_message, parse_object });
+    async eval(script, { urgent, handler, parse_object, } = {}) {
+        return this.rpc('script', { script, urgent, handler, parse_object });
     }
     /** call function through websocket (function command)
         - func: function name
@@ -1597,14 +1624,12 @@ class DDB {
             - nodes?: When setting multiple node aliases, send them to the corresponding multiple nodes in the cluster for execution (using the pnodeRun method in DolphinDB)
             - func_type?: It must be passed when setting the node parameter, the function type needs to be specified, and it is not passed in other cases
             - add_node_alias?: Select to pass when setting the nodes parameter, otherwise not pass
-            - on_message?: Set the message handler during this rpc, and restore the original after the end
+            - handler?: Process messages during this rpc
             - parse_object?: Set parse_object during this rpc, and restore the original after the end.
                 When it is false, the returned DdbObj only contains buffer and le without parsing,
                 so as to facilitate subsequent forwarding and serialization
     */
-    async call(func, args = [], { urgent, node, nodes, func_type, add_node_alias, on_message, parse_object, } = {}) {
-        if (this.python)
-            throw new Error('call doesn\'t support python session yet');
+    async call(func, args = [], { urgent, node, nodes, func_type, add_node_alias, handler, parse_object, } = {}) {
         if (node) {
             if (typeof func_type === 'undefined')
                 throw new Error('指定 node 时必须设置 func_type');
@@ -1634,7 +1659,7 @@ class DDB {
             func,
             args,
             urgent,
-            on_message,
+            handler,
             parse_object
         });
     }
@@ -1643,10 +1668,10 @@ class DDB {
     /** Uploaded variables' name */
     vars, 
     /** Uploaded variables' value */
-    args, { on_message, parse_object, } = {}) {
+    args, { handler, parse_object, } = {}) {
         if (!args.length || args.length !== vars.length)
             throw new Error('variable 指令参数为空或参数名为空，或数量不匹配');
-        return this.rpc('variable', { vars, args, on_message, parse_object });
+        return this.rpc('variable', { vars, args, handler, parse_object });
     }
     /** 解析服务端响应报文，返回去掉 header 的 data buf */
     parse_message(buf, parse_object = this.parse_object) {
@@ -1679,7 +1704,10 @@ class DDB {
         /** 'OK' 表示成功，其它文本表示失败 */
         const message = this.dec.decode(buf.subarray(i_ls_1, i_lf_1));
         if (message !== 'OK')
-            throw new Error(message);
+            return {
+                type: 'error',
+                data: new Error(message)
+            };
         const buf_obj = buf.subarray(i_lf_1 + 1);
         return {
             type: 'object',