dolphindb 2.0.800 → 2.0.801

package/index.d.ts

@@ -255,7 +255,7 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     ];
     pack(): Uint8Array;
     static pack_vector_body(value: DdbVectorValue, type: DdbType, length: number): ArrayBufferView[];
-    [inspect.custom](depth: number, options: InspectOptions, _inspect: any): string;
+    [inspect.custom](depth: number, _options: InspectOptions, _inspect: any): string;
     inspect_type(): string;
     /** 自动转换 js string, boolean 为 DdbObj */
     static to_ddbobj(value: DdbObj | string | boolean): DdbObj;
@@ -439,6 +439,10 @@ export interface StreamingData extends StreamingParams {
     };
 }
 export declare const winsize: 40;
+export declare class ConnectionError extends Error {
+    ddb: DDB;
+    constructor(ddb: DDB);
+}
 export declare class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid: string;
@@ -505,23 +509,10 @@ export declare class DDB {
         streaming?: StreamingParams;
     });
     private on_message;
-    /** Establish the actual WebSocket connection to the DolphinDB corresponding to the URL
-        - options?:
-            - url?: DolphinDB WebSocket URL. By default, the WebSocket URL passed in when the instance is initialized is used
-            - autologin?: Whether to log in automatically after establishing a connection, default `true`
-            - username?: DolphinDB username, default `'admin'`
-            - password?: DolphinDB password, default `'123456'`
-            - python?: set python session flag, default `false`
-            - streaming?: When this option is set, the WebSocket connection is only used for streaming data
-    */
-    connect({ url, autologin, username, password, python, streaming }?: {
-        url?: string;
-        autologin?: boolean;
-        username?: string;
-        password?: string;
-        python?: boolean;
-        streaming?: StreamingParams;
-    }): Promise<void>;
+    /** Establish a actual websocket connection to the DolphindB corresponding to the URL
+        It is a power, and after calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
+        this.autologin automatically log in when it is true */
+    connect(): Promise<void>;
     get_rpc_options({ urgent, secondary, async: _async, pickle, clear, api, compress, cancellable, priority, parallelism, root_id, limit, }?: {
         urgent?: boolean;
         /** API 提交的任务, secondary 必须为 false */
@@ -547,6 +538,7 @@ export declare class DDB {
     }): string;
     disconnect(): void;
     /** rpc through websocket (function/script/variable command)
+        When the DDB is not connected, the call will be automatically connected. When the connection is disconnected, the call will throw the Connectionerror
         - type: API 类型: 'script' | 'function' | 'variable'
         - options:
             - urgent?: 决定 `行为标识` 那一行字符串的取值（只适用于 script 和 function）

package/index.js

@@ -1017,7 +1017,8 @@ export class DdbObj {
                 throw new Error(`vector ${DdbType[type]} 暂不支持序列化`);
         }
     }
-    [inspect.custom](depth, options, _inspect) {
+    [inspect.custom](depth, _options, _inspect) {
+        const options = { nullstr: true, quote: true, ..._options };
         const type = this.inspect_type();
         const data = (() => {
             switch (this.form) {
@@ -1217,8 +1218,8 @@ let _decimals = 20;
 let _formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 /** Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export function format(type, value, le, options = {}) {
+    const { decimals } = options;
     const formatter = (() => {
-        const { decimals } = options;
         if (decimals === undefined || decimals === null)
             return default_formatter;
         if (decimals !== _decimals) {
@@ -1272,7 +1273,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        date2str(value).green
+                        date2str(value).magenta
                         :
                             date2str(value);
         case DdbType.month:
@@ -1280,7 +1281,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        month2str(value).green
+                        month2str(value).magenta
                         :
                             month2str(value);
         case DdbType.time:
@@ -1288,7 +1289,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        time2str(value).green
+                        time2str(value).magenta
                         :
                             time2str(value);
         case DdbType.minute:
@@ -1296,7 +1297,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        minute2str(value).green
+                        minute2str(value).magenta
                         :
                             minute2str(value);
         case DdbType.second:
@@ -1304,7 +1305,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        second2str(value).green
+                        second2str(value).magenta
                         :
                             second2str(value);
         case DdbType.datetime:
@@ -1312,7 +1313,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        datetime2str(value).green
+                        datetime2str(value).magenta
                         :
                             datetime2str(value);
         case DdbType.timestamp:
@@ -1320,7 +1321,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        timestamp2str(value).green
+                        timestamp2str(value).magenta
                         :
                             timestamp2str(value);
         case DdbType.nanotime:
@@ -1328,7 +1329,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        nanotime2str(value).green
+                        nanotime2str(value).magenta
                         :
                             nanotime2str(value);
         case DdbType.nanotimestamp:
@@ -1336,7 +1337,7 @@ export function format(type, value, le, options = {}) {
                 inspect(null, options)
                 :
                     options.colors ?
-                        nanotimestamp2str(value).green
+                        nanotimestamp2str(value).magenta
                         :
                             nanotimestamp2str(value);
         case DdbType.float:
@@ -1360,7 +1361,7 @@ export function format(type, value, le, options = {}) {
             return inspect(value, options);
         case DdbType.uuid:
             return options.colors ?
-                uuid2str(value, le).green
+                uuid2str(value, le).cyan
                 :
                     uuid2str(value, le);
         case DdbType.functiondef:
@@ -1374,12 +1375,12 @@ export function format(type, value, le, options = {}) {
                 'null'
                 :
                     options.colors ?
-                        datehour2str(value).green
+                        datehour2str(value).magenta
                         :
                             datehour2str(value);
         case DdbType.ipaddr:
             return options.colors ?
-                ipaddr2str(value, le).green
+                ipaddr2str(value, le).cyan
                 :
                     ipaddr2str(value, le);
         case DdbType.int128:
@@ -1403,7 +1404,7 @@ export function format(type, value, le, options = {}) {
         case DdbType.duration: {
             const { data, unit } = value;
             const str = `${data}${DdbDurationUnit[unit]}`;
-            return options.colors ? str.green : str;
+            return options.colors ? str.magenta : str;
         }
         case DdbType.decimal32:
         case DdbType.decimal64: {
@@ -1455,12 +1456,9 @@ export function formati(obj, index, options = {}) {
         }
     }
     switch (obj.type) {
-        case DdbType.string:
-        case DdbType.symbol:
-            return obj.value[index];
         case DdbType.symbol_extended: {
             const { base, data } = obj.value;
-            return base[data[index]];
+            return format(DdbType.string, base[data[index]], obj.le, options);
         }
         case DdbType.uuid:
         case DdbType.int128:
@@ -2004,6 +2002,13 @@ export function int1282str(buffer, le = true) {
         .padStart(2, '0')).join('');
 }
 export const winsize = 40;
+export class ConnectionError extends Error {
+    ddb;
+    constructor(ddb) {
+        super(`websocket is disconnected: ${ddb.url}`);
+        this.ddb = ddb;
+    }
+}
 export class DDB {
     /** 当前的 session id (http 或 tcp) */
     sid = '0';
@@ -2079,52 +2084,50 @@ export class DDB {
             this.streaming = options.streaming;
     }
     on_message(event) {
-        console.log('This is the default on_message before calling this.rpc, it should not be called unless the server pushes the message first after the connection is established');
-        console.log(event.data);
+        // 这里的实现一定会被 connect 中的实现覆盖
     }
-    /** Establish the actual WebSocket connection to the DolphinDB corresponding to the URL
-        - options?:
-            - url?: DolphinDB WebSocket URL. By default, the WebSocket URL passed in when the instance is initialized is used
-            - autologin?: Whether to log in automatically after establishing a connection, default `true`
-            - username?: DolphinDB username, default `'admin'`
-            - password?: DolphinDB password, default `'123456'`
-            - python?: set python session flag, default `false`
-            - streaming?: When this option is set, the WebSocket connection is only used for streaming data
-    */
-    async connect({ url, autologin, username, password, python, streaming } = {}) {
-        if (url !== undefined)
-            this.url = url;
-        if (autologin !== undefined)
-            this.autologin = autologin;
-        if (username !== undefined)
-            this.username = username;
-        if (password !== undefined)
-            this.password = password;
-        if (python !== undefined)
-            this.python = python;
-        if (streaming !== undefined)
-            this.streaming = streaming;
-        this.disconnect();
-        await connect_websocket(this.url, {
-            protocols: (() => {
-                if (this.streaming)
-                    return 'streaming';
-                if (this.python)
-                    return 'python';
-            })(),
-            on_open: async (event, websocket) => {
-                this.websocket = websocket;
+    /** Establish a actual websocket connection to the DolphindB corresponding to the URL
+        It is a power, and after calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
+        this.autologin automatically log in when it is true */
+    async connect() {
+        if (this.connected)
+            return;
+        const ptail = this.pconnect;
+        let resolve;
+        this.pconnect = new Promise((_resolve, _reject) => {
+            resolve = _resolve;
+        });
+        await ptail;
+        try {
+            if (!this.connected) {
+                this.on_message = (event) => {
+                    assert(false, '这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message');
+                };
+                this.presult = Promise.resolve(null);
+                this.pnode_run_defined = false;
+                this.websocket = await connect_websocket(this.url, {
+                    protocols: (() => {
+                        if (this.streaming)
+                            return 'streaming';
+                        if (this.python)
+                            return 'python';
+                    })(),
+                    on_message: (event) => {
+                        this.on_message(event);
+                    }
+                });
                 if (this.streaming)
                     await this.subscribe();
-                else
+                else {
                     await this.rpc('connect', {});
-            },
-            on_message: (event) => {
-                this.on_message(event);
+                    if (this.autologin)
+                        await this.call('login', [this.username, this.password], { urgent: true });
+                }
             }
-        });
-        if (!this.streaming && this.autologin)
-            await this.call('login', [this.username, this.password], { urgent: true });
+        }
+        finally {
+            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, } = {}) {
         let flag = 0;
@@ -2160,12 +2163,9 @@ export class DDB {
     disconnect() {
         if (this.connected)
             this.websocket.close(1000);
-        this.on_message = () => { };
-        this.presult = Promise.resolve(null);
-        this.pconnect = Promise.resolve();
-        this.pnode_run_defined = false;
     }
     /** rpc through websocket (function/script/variable command)
+        When the DDB is not connected, the call will be automatically connected. When the connection is disconnected, the call will throw the Connectionerror
         - type: API 类型: 'script' | 'function' | 'variable'
         - options:
             - urgent?: 决定 `行为标识` 那一行字符串的取值（只适用于 script 和 function）
@@ -2175,24 +2175,12 @@ export class DDB {
                 为 false 时返回的 DdbObj 仅含有 buffer 和 le，不做解析，以便后续转发、序列化
     */
     async rpc(type, { script, func, args = [], vars = [], urgent, listener, parse_object, }) {
-        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.websocket)
+            await this.connect();
         if (!this.connected)
-            throw new Error(`${this.url} is already disconnected`);
+            throw new ConnectionError(this);
         if (func === 'pnode_run' && !this.pnode_run_defined) {
+            // 保证并发调用 rpc 时只定义一次 pnode_run
             const ptail = this.ppnoderun;
             let resolve;
             this.ppnoderun = new Promise((_resolve, _reject) => {
@@ -2522,7 +2510,7 @@ export class DDB {
                             // 是 column 片段组成的 any vector
                             const data = streaming.data = DdbObj.parse(buf.subarray(i_topic_end + 1), this.le);
                             let { window: win } = streaming;
-                            win.rows += data.rows;
+                            win.rows += data.value[0].rows;
                             win.segments.push(data);
                             if (win.rows >= winsize * 2 && win.segments.length >= 2) {
                                 let winsize_ = 0;