dolphindb 2.0.500 → 2.0.503

package/README.md

@@ -330,14 +330,15 @@ async upload (
 ```
 
 
-### Others
+### Some Examples
 ```ts
-import { nulls, DdbInt, timestamp2str, DdbVectorSymbol } from 'dolphindb'
+import { nulls, DdbInt, timestamp2str, DdbVectorSymbol, DdbTable, DdbVectorDouble } from 'dolphindb'
 
 // Format timestamp in DolphinDB as string
 timestamp2str(
     (
-        await ddb.call<DdbObj<bigint>>('now', [false])
+        await ddb.call('now', [false])
+        // TypeScript: await ddb.call<DdbObj<bigint>>('now', [false])
     ).value
 ) === '2022.02.23 17:23:13.494'
 
@@ -353,5 +354,14 @@ av[0] = 0.1
 av[1] = nulls.double
 av[2] = 0.3
 new DdbVectorDouble(av)
+
+// create DdbTable
+new DdbTable(
+    [
+        new DdbVectorDouble([0.1, 0.2, null], 'col0'),
+        new DdbVectorSymbol(['a', 'b', 'c'], 'col1')
+    ],
+    'mytable'
+)
 ```
 

package/README.zh.md

@@ -331,14 +331,15 @@ async upload (
 ```
 
 
-### 其它
+### 一些例子
 ```ts
-import { nulls, DdbInt, timestamp2str, DdbVectorSymbol } from 'dolphindb'
+import { nulls, DdbInt, timestamp2str, DdbVectorSymbol, DdbTable, DdbVectorDouble } from 'dolphindb'
 
 // 将 DolphinDB 中的 timestamp 格式化为 string
 timestamp2str(
     (
-        await ddb.call<DdbObj<bigint>>('now', [false])
+        await ddb.call('now', [false])
+        // TypeScript: await ddb.call<DdbObj<bigint>>('now', [false])
     ).value
 ) === '2022.02.23 17:23:13.494'
 
@@ -354,4 +355,13 @@ av[0] = 0.1
 av[1] = nulls.double
 av[2] = 0.3
 new DdbVectorDouble(av)
+
+// 创建 DdbTable
+new DdbTable(
+    [
+        new DdbVectorDouble([0.1, 0.2, null], 'col0'),
+        new DdbVectorSymbol(['a', 'b', 'c'], 'col1')
+    ],
+    'mytable'
+)
 ```

package/browser.d.ts

@@ -93,7 +93,9 @@ export declare const timezone_offset: number;
 export declare class DdbObj<T extends DdbValue = DdbValue> {
     static dec: TextDecoder;
     static enc: TextEncoder;
-    /** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base */
+    /** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base ？
+        只是暂存，如果一张表有多个 symbol 列，可能这个 symbol base 会被复用，不同的对象之间 symbol base 一般不复用
+    */
     static symbol_bases: Record<number, string[]>;
     /** little endian (client) */
     static le_client: boolean;
@@ -180,26 +182,29 @@ export declare class DdbTimeStamp extends DdbObj<bigint> {
 export declare class DdbNanoTimeStamp extends DdbObj<bigint> {
     constructor(value: bigint | null);
 }
+export declare class DdbPair extends DdbObj<Int32Array> {
+    constructor(l: number | null, r?: number | null);
+}
+export declare class DdbFunction extends DdbObj<DdbFunctionDefValue> {
+    constructor(name: string, type: DdbFunctionType);
+}
 export declare class DdbVectorInt extends DdbObj<Int32Array> {
-    constructor(value: (number | null)[] | Int32Array, name?: string);
+    constructor(ints: (number | null)[] | Int32Array, name?: string);
 }
 export declare class DdbVectorString extends DdbObj<string[]> {
-    constructor(value: string[], name?: string);
+    constructor(strings: string[], name?: string);
 }
 export declare class DdbVectorDouble extends DdbObj<Float64Array> {
-    constructor(value: (number | null)[] | Float64Array, name?: string);
+    constructor(doubles: (number | null)[] | Float64Array, name?: string);
 }
 export declare class DdbVectorAny extends DdbObj {
-    constructor(value: DdbObj<DdbValue>[], name?: string);
+    constructor(objs: DdbObj<DdbValue>[], name?: string);
 }
 export declare class DdbVectorSymbol extends DdbObj<DdbSymbolExtendedValue> {
-    constructor(value: string[], name?: string);
+    constructor(strings: string[], name?: string);
 }
-export declare class DdbPair extends DdbObj<Int32Array> {
-    constructor(l: number | null, r?: number | null);
-}
-export declare class DdbFunction extends DdbObj<DdbFunctionDefValue> {
-    constructor(name: string, type: DdbFunctionType);
+export declare class DdbTable extends DdbObj<DdbObj[]> {
+    constructor(columns: DdbObj[], name?: string);
 }
 export declare function date2str(date: number, format?: string): string;
 export declare function datetime2str(datetime: number, format?: string): string;
@@ -248,6 +253,12 @@ export declare class DDB {
     le: boolean;
     /** little endian (client) */
     static le_client: boolean;
+    /** Whether to automatically log in after the connection is established, the default is true */
+    autologin: boolean;
+    /** DolphinDB username */
+    username: string;
+    /** DolphinDB password */
+    password: string;
     /** python session flag (2048) */
     python: boolean;
     message_hook: (message: Uint8Array) => any;
@@ -261,22 +272,41 @@ export declare class DDB {
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL
         (without establishing an actual network connection)
+        - url?: DolphinDB WebSocket URL. e.g.：`ws://127.0.0.1:8848`, Defaults to the current page URL
+        - options?:
+            - 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`
+        
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')
-        let ddb_secure = new DDB('wss://dolphindb.com')
+        let ddbsecure = new DDB('wss://dolphindb.com', {
+            autologin: true,
+            username: 'admin',
+            password: '123456',
+            python: false
+        })
+    */
+    constructor(url?: string, options?: {
+        autologin?: boolean;
+        username?: string;
+        password?: string;
+        python?: boolean;
+    });
+    /** 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`
     */
-    constructor(url?: string);
-    /** Establish the actual WebSocket connection to the DolphinDB corresponding to the URL */
-    connect({ url, login, username, password, python, }?: {
-        /** By default, the WebSocket URL passed in when the instance is initialized is used */
+    connect(options?: {
         url?: string;
-        /** Whether to automatically log in after the connection is established, the default is true */
-        login?: boolean;
-        /** DolphinDB username */
+        autologin?: boolean;
         username?: string;
-        /** DolphinDB password */
         password?: string;
-        /** set python session flag */
         python?: boolean;
     }): Promise<void>;
     get_rpc_options({ urgent, secondary, async: _async, pickle, clear, api, compress, cancellable, priority, parallelism, root_id, limit, }?: {

package/browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbFunction = exports.DdbPair = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
+exports.ddb = exports.DDB = exports.str2nanotimestamp = exports.nanotimestamp2str = exports.str2timestamp = exports.timestamp2str = exports.datetime2str = exports.date2str = exports.DdbTable = exports.DdbVectorSymbol = exports.DdbVectorAny = exports.DdbVectorDouble = exports.DdbVectorString = exports.DdbVectorInt = exports.DdbFunction = exports.DdbPair = exports.DdbNanoTimeStamp = exports.DdbTimeStamp = exports.DdbDateTime = exports.DdbDouble = exports.DdbLong = exports.DdbString = exports.DdbInt = exports.DdbChar = exports.DdbBool = exports.DdbVoid = exports.DdbObj = exports.timezone_offset = exports.nulls = exports.DdbFunctionType = exports.DdbType = exports.DdbForm = void 0;
 const tslib_1 = require("tslib");
 const dayjs_1 = tslib_1.__importDefault(require("dayjs"));
 const customParseFormat_js_1 = tslib_1.__importDefault(require("dayjs/plugin/customParseFormat.js"));
@@ -709,15 +709,12 @@ class DdbObj {
                 case DdbForm.table:
                     return [
                         Uint32Array.of(this.rows, this.cols),
-                        DdbObj.enc.encode(this.name),
+                        DdbObj.enc.encode(this.name || ''),
+                        // column names
                         Uint8Array.of(0),
-                        ...DdbObj.pack_vector_body(this.value.map(col => col.name), DdbType.string, this.cols),
-                        ...(() => {
-                            let cols = new Array(this.cols);
-                            for (let i = 0; i < cols.length; i++)
-                                cols[i] = this.value[i].pack();
-                            return cols;
-                        })()
+                        ...DdbObj.pack_vector_body(this.value.map((col, i) => col.name || `col${i}`), DdbType.string, this.cols),
+                        // column vectors
+                        ...this.value.map(col => col.pack())
                     ];
                 case DdbForm.dict:
                     return [
@@ -918,7 +915,9 @@ class DdbObj {
 exports.DdbObj = DdbObj;
 DdbObj.dec = new TextDecoder('utf-8');
 DdbObj.enc = new TextEncoder();
-/** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base */
+/** 维护已解析的 symbol base，比如流数据中后续的 symbol 向量可能只发送一个 base.id, base.size == 0, 依赖之前发送的 symbol base ？
+    只是暂存，如果一张表有多个 symbol 列，可能这个 symbol base 会被复用，不同的对象之间 symbol base 一般不复用
+*/
 DdbObj.symbol_bases = {};
 /** little endian (client) */
 DdbObj.le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
@@ -1032,18 +1031,42 @@ class DdbNanoTimeStamp extends DdbObj {
     }
 }
 exports.DdbNanoTimeStamp = DdbNanoTimeStamp;
+class DdbPair extends DdbObj {
+    constructor(l, r = null) {
+        super({
+            form: DdbForm.pair,
+            type: DdbType.int,
+            length: 0,
+            rows: 2,
+            cols: 1,
+            value: Int32Array.of(l === null ? exports.nulls.int32 : l, r === null ? exports.nulls.int32 : r)
+        });
+    }
+}
+exports.DdbPair = DdbPair;
+class DdbFunction extends DdbObj {
+    constructor(name, type) {
+        super({
+            form: DdbForm.scalar,
+            type: DdbType.functiondef,
+            length: 0,
+            value: { type, name }
+        });
+    }
+}
+exports.DdbFunction = DdbFunction;
 class DdbVectorInt extends DdbObj {
-    constructor(value, name) {
+    constructor(ints, name) {
         super({
             form: DdbForm.vector,
             type: DdbType.int,
             length: 0,
-            rows: value.length,
+            rows: ints.length,
             cols: 1,
-            value: value instanceof Int32Array ?
-                value
+            value: ints instanceof Int32Array ?
+                ints
                 :
-                    Int32Array.from(value, v => v === null ?
+                    Int32Array.from(ints, v => v === null ?
                         exports.nulls.int32
                         :
                             v),
@@ -1053,31 +1076,31 @@ class DdbVectorInt extends DdbObj {
 }
 exports.DdbVectorInt = DdbVectorInt;
 class DdbVectorString extends DdbObj {
-    constructor(value, name) {
+    constructor(strings, name) {
         super({
             form: DdbForm.vector,
             type: DdbType.string,
             length: 0,
-            rows: value.length,
+            rows: strings.length,
             cols: 1,
-            value,
+            value: strings,
             name,
         });
     }
 }
 exports.DdbVectorString = DdbVectorString;
 class DdbVectorDouble extends DdbObj {
-    constructor(value, name) {
+    constructor(doubles, name) {
         super({
             form: DdbForm.vector,
             type: DdbType.double,
             length: 0,
-            rows: value.length,
+            rows: doubles.length,
             cols: 1,
-            value: value instanceof Float64Array ?
-                value
+            value: doubles instanceof Float64Array ?
+                doubles
                 :
-                    Float64Array.from(value, v => v === null ?
+                    Float64Array.from(doubles, v => v === null ?
                         exports.nulls.double
                         :
                             v),
@@ -1087,27 +1110,27 @@ class DdbVectorDouble extends DdbObj {
 }
 exports.DdbVectorDouble = DdbVectorDouble;
 class DdbVectorAny extends DdbObj {
-    constructor(value, name) {
+    constructor(objs, name) {
         super({
             form: DdbForm.vector,
             type: DdbType.any,
             length: 0,
-            rows: value.length,
+            rows: objs.length,
             cols: 1,
-            value,
+            value: objs,
             name,
         });
     }
 }
 exports.DdbVectorAny = DdbVectorAny;
 class DdbVectorSymbol extends DdbObj {
-    constructor(value, name) {
+    constructor(strings, name) {
         let map = new Map([
             ['', 0]
         ]);
-        let data = new Uint32Array(value.length);
-        for (let i = 0; i < value.length; i++) {
-            const x = value[i];
+        let data = new Uint32Array(strings.length);
+        for (let i = 0; i < strings.length; i++) {
+            const x = strings[i];
             let index = map.get(x);
             if (index === undefined) {
                 index = map.size;
@@ -1119,7 +1142,7 @@ class DdbVectorSymbol extends DdbObj {
             form: DdbForm.vector,
             type: DdbType.symbol_extended,
             length: 0,
-            rows: value.length,
+            rows: strings.length,
             cols: 1,
             value: {
                 base: [...map.keys()],
@@ -1131,30 +1154,20 @@ class DdbVectorSymbol extends DdbObj {
     }
 }
 exports.DdbVectorSymbol = DdbVectorSymbol;
-class DdbPair extends DdbObj {
-    constructor(l, r = null) {
+class DdbTable extends DdbObj {
+    constructor(columns, name = '') {
         super({
-            form: DdbForm.pair,
-            type: DdbType.int,
-            length: 0,
-            rows: 2,
-            cols: 1,
-            value: Int32Array.of(l === null ? exports.nulls.int32 : l, r === null ? exports.nulls.int32 : r)
-        });
-    }
-}
-exports.DdbPair = DdbPair;
-class DdbFunction extends DdbObj {
-    constructor(name, type) {
-        super({
-            form: DdbForm.scalar,
-            type: DdbType.functiondef,
+            form: DdbForm.table,
+            type: DdbType.void,
             length: 0,
-            value: { type, name }
+            rows: columns[0].rows,
+            cols: columns.length,
+            name,
+            value: columns,
         });
     }
 }
-exports.DdbFunction = DdbFunction;
+exports.DdbTable = DdbTable;
 function date2str(date, format = 'YYYY.MM.DD') {
     return date === exports.nulls.int32 ?
         ''
@@ -1248,11 +1261,23 @@ class DDB {
     /**
         Initialize an instance of DolphinDB Client using the WebSocket URL
         (without establishing an actual network connection)
+        - url?: DolphinDB WebSocket URL. e.g.：`ws://127.0.0.1:8848`, Defaults to the current page URL
+        - options?:
+            - 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`
+        
         @example
         let ddb = new DDB('ws://127.0.0.1:8848')
-        let ddb_secure = new DDB('wss://dolphindb.com')
+        let ddbsecure = new DDB('wss://dolphindb.com', {
+            autologin: true,
+            username: 'admin',
+            password: '123456',
+            python: false
+        })
     */
-    constructor(url) {
+    constructor(url, options = {}) {
         /** 当前的 session id (http 或 tcp) */
         this.sid = '0';
         /** utf-8 text decoder */
@@ -1261,6 +1286,12 @@ class DDB {
         this.websocket = null;
         /** little endian (server) */
         this.le = true;
+        /** Whether to automatically log in after the connection is established, the default is true */
+        this.autologin = true;
+        /** DolphinDB username */
+        this.username = 'admin';
+        /** DolphinDB password */
+        this.password = '123456';
         /** python session flag (2048) */
         this.python = false;
         this.message_hook = null;
@@ -1272,6 +1303,14 @@ class DDB {
             url = `${location.protocol === 'https:' ? 'wss' : 'ws'}://${hostname}${port ? `:${port}` : ''}/`;
         }
         this.url = url;
+        if (options.autologin !== undefined)
+            this.autologin = options.autologin;
+        if (options.username !== undefined)
+            this.username = options.username;
+        if (options.password !== undefined)
+            this.password = options.password;
+        if (options.python !== undefined)
+            this.python = options.python;
     }
     /** print message handler */
     printer(message) {
@@ -1283,12 +1322,27 @@ class DDB {
     get connected() {
         return this.websocket?.readyState === WebSocket.OPEN;
     }
-    /** Establish the actual WebSocket connection to the DolphinDB corresponding to the URL */
-    async connect({ url = this.url, login = true, username = 'admin', password = '123456', python = false, } = {}) {
-        this.url = url;
-        this.python = python;
+    /** 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`
+    */
+    async connect(options = {}) {
+        if (options.url !== undefined)
+            this.url = options.url;
+        if (options.autologin !== undefined)
+            this.autologin = options.autologin;
+        if (options.username !== undefined)
+            this.username = options.username;
+        if (options.password !== undefined)
+            this.password = options.password;
+        if (options.python !== undefined)
+            this.python = options.python;
         this.disconnect();
-        let websocket = new WebSocket(url, python ? ['python'] : []);
+        let websocket = new WebSocket(this.url, this.python ? ['python'] : []);
         // https://stackoverflow.com/questions/11821096/what-is-the-difference-between-an-arraybuffer-and-a-blob/39951543
         websocket.binaryType = 'arraybuffer';
         this.websocket = websocket;
@@ -1340,11 +1394,11 @@ class DDB {
                 '        add_node_alias\n' +
                 '    )\n' +
                 '}\n', { urgent: true });
-        if (login)
+        if (this.autologin)
             if (this.python)
-                await this.eval(`login(${username.quote('double')}, ${password.quote('double')})`, { urgent: true });
+                await this.eval(`login(${this.username.quote('double')}, ${this.password.quote('double')})`, { urgent: true });
             else
-                await this.call('login', [username, password], { urgent: true });
+                await this.call('login', [this.username, this.password], { urgent: true });
     }
     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;