dolphindb 2.0.602 → 2.0.603

package/README.md

@@ -46,6 +46,7 @@ npm install dolphindb
 ```ts
 import { DDB } from 'dolphindb'
 // The import method for existing projects using CommonJS modules is const { DDB } = require('dolphindb')
+// Use in browser: import { DDB } form 'dolphindb/browser.js'
 
 // Create a database object and initialize the WebSocket URL
 let ddb = new DDB('ws://127.0.0.1:8848')

package/browser.d.ts

@@ -121,6 +121,15 @@ export interface DdbChartValue {
     /** 原属性 chartType */
     type: DdbChartType;
     stacking: boolean;
+    /** 直方图 (Histogram), plotHist 函数返回的 chart 可能具有该属性
+        原属性 binStart
+        数值类型的 DdbObj 都有可能？
+    */
+    bin_start?: DdbObj;
+    /** 原属性 binEnd */
+    bin_end?: DdbObj;
+    /** 原属性 binCount */
+    bin_count?: DdbObj;
     titles: {
         chart: string;
         x_axis: string;
@@ -388,9 +397,11 @@ export declare class DDB {
     print_object_buffer: boolean;
     print_message: boolean;
     parse_object: boolean;
+    pnode_run_defined: boolean;
     /** DdbMessage listeners */
     listeners: DdbMessageListener[];
     pconnect: Promise<void>;
+    ppnoderun: Promise<void>;
     presult: Promise<any>;
     get connected(): boolean;
     /**

package/browser.js

@@ -268,7 +268,7 @@ export class DdbObj {
                 if (form === DdbForm.dict)
                     return dict;
                 else {
-                    const { chartType: type, stacking, title: titles, extras, data, ...others } = dict.to_dict();
+                    const { chartType: type, stacking, binStart: bin_start, binEnd: bin_end, binCount: bin_count, title: titles, extras, data, ...others } = dict.to_dict();
                     const [chart, x_axis, y_axis] = titles.value;
                     dict.form = DdbForm.chart;
                     dict.value = {
@@ -279,6 +279,8 @@ export class DdbObj {
                             x_axis,
                             y_axis,
                         },
+                        ...bin_start ? { bin_start, bin_end, } : {},
+                        ...bin_count ? { bin_count } : {},
                         ...extras ? (() => {
                             const { multiYAxes: multi_y_axes = false, ...extras_others } = extras.to_dict({ strip: true });
                             return {
@@ -866,10 +868,17 @@ export class DdbObj {
                         value[1].pack(),
                     ];
                 case DdbForm.chart: {
-                    const { type, stacking, titles: { chart, x_axis, y_axis, }, extras, data } = this.value;
+                    const { type, stacking, bin_start, bin_end, bin_count, titles: { chart, x_axis, y_axis, }, extras, data } = this.value;
                     const { value: [keys, values] } = new DdbDict({
                         chartType: new DdbInt(type),
                         stacking,
+                        ...bin_start ? {
+                            binStart: bin_start,
+                            binEnd: bin_end
+                        } : {},
+                        ...bin_count ? {
+                            binCount: bin_count
+                        } : {},
                         title: new DdbVectorString([chart, x_axis, y_axis]),
                         ...extras ? (() => {
                             const { multi_y_axes, ...extras_other } = extras;
@@ -1101,7 +1110,7 @@ export class DdbObj {
             case DdbForm.table:
                 return `table[${this.rows}r][${this.cols}c]`;
             case DdbForm.dict:
-                return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>`;
+                return `dict<${DdbType[this.value[0].type]}, ${DdbType[this.value[1].type]}>[${this.rows}]`;
             case DdbForm.chart:
                 return `chart<${DdbChartType[this.value.type]}>`;
             case DdbForm.matrix:
@@ -1940,13 +1949,16 @@ export class DDB {
     password = '123456';
     /** python session flag (2048) */
     python = false;
+    // 内部选项, 状态
     print_message_buffer = false;
     print_object_buffer = false;
     print_message = true;
     parse_object = true;
+    pnode_run_defined = false;
     /** DdbMessage listeners */
     listeners = [];
     pconnect = Promise.resolve();
+    ppnoderun = Promise.resolve();
     presult = Promise.resolve(null);
     get connected() {
         return this.websocket?.readyState === WebSocket.OPEN;
@@ -2020,41 +2032,6 @@ export class DDB {
                 this.on_message(event);
             }
         });
-        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 not nargs:\n' +
-                '        return pnodeRun(func, nodes, add_node_alias)\n' +
-                '    \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'
-            :
-                '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 });
@@ -2098,6 +2075,7 @@ export class DDB {
         this.on_message = () => { };
         this.presult = Promise.resolve(null);
         this.pconnect = Promise.resolve();
+        this.pnode_run_defined = false;
     }
     /** rpc through websocket (function/script/variable command)
         - type: API 类型: 'script' | 'function' | 'variable'
@@ -2126,6 +2104,55 @@ export class DDB {
         }
         if (!this.connected)
             throw new Error(`${this.url} is already disconnected`);
+        if (func === 'pnode_run' && !this.pnode_run_defined) {
+            const ptail = this.ppnoderun;
+            let resolve;
+            this.ppnoderun = new Promise((_resolve, _reject) => {
+                resolve = _resolve;
+            });
+            await ptail;
+            try {
+                if (!this.pnode_run_defined)
+                    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 not nargs:\n' +
+                            '        return pnodeRun(func, nodes, add_node_alias)\n' +
+                            '    \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'
+                        :
+                            '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 });
+            }
+            finally {
+                resolve();
+            }
+        }
         // this 上的当前配置需要在 message 到达后使用，先保存起来
         const _handlers = [...this.listeners].reverse();
         // 临界区：保证多个 rpc 并发时形成 promise 链