dolphindb 2.0.502 → 2.0.503

package/index.d.ts

@@ -252,6 +252,12 @@ export declare class DDB {
     le: boolean;
     /** little endian (client) */
     static le_client: boolean;
+    /** 是否在建立连接后自动登录，默认 true */
+    autologin: boolean;
+    /** DolphinDB 登录用户名 */
+    username: string;
+    /** DolphinDB 登录密码 */
+    password: string;
     /** python session flag (2048) */
     python: boolean;
     message_hook: (message: Uint8Array) => any;
@@ -265,22 +271,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`
+        - 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);
-    /** 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 */
+    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`
+    */
+    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/index.js

@@ -1280,11 +1280,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`
+        - 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 */
@@ -1294,11 +1306,25 @@ class DDB {
         this.websocket = null;
         /** little endian (server) */
         this.le = true;
+        /** 是否在建立连接后自动登录，默认 true */
+        this.autologin = true;
+        /** DolphinDB 登录用户名 */
+        this.username = 'admin';
+        /** DolphinDB 登录密码 */
+        this.password = '123456';
         /** python session flag (2048) */
         this.python = false;
         this.message_hook = null;
         this.presult = Promise.resolve(null);
         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) {
@@ -1310,12 +1336,27 @@ class DDB {
     get connected() {
         return this.websocket?.readyState === ws_1.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 ws_1.WebSocket(url, python ? ['python'] : [], {
+        let websocket = new ws_1.WebSocket(this.url, this.python ? ['python'] : [], {
             maxPayload: 2 ** 33 // 8 GB
         });
         // https://stackoverflow.com/questions/11821096/what-is-the-difference-between-an-arraybuffer-and-a-blob/39951543
@@ -1369,11 +1410,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;