dolphindb 2.0.956 → 2.0.958

package/index.js

@@ -2313,8 +2313,6 @@ class DDB {
             try {
                 assert(this.connected);
                 await this.rpc('connect', { skip_connection_check: true });
-                if (this.autologin)
-                    await this.call('login', [this.username, this.password], { urgent: true, skip_connection_check: true });
                 if (this.streaming)
                     await this.subscribe();
                 resolve();
@@ -2357,9 +2355,13 @@ class DDB {
         return options.join('_');
     }
     disconnect() {
-        if (this.connected)
-            // 这里不获取 lock，直接关闭连接
-            this.lwebsocket.resource.close(1000);
+        const { resource } = this.lwebsocket;
+        if (resource) {
+            const { readyState } = resource;
+            if (readyState !== WebSocket.CLOSED && readyState !== WebSocket.CLOSING)
+                // 这里不获取 lock，直接关闭连接
+                resource.close(1000);
+        }
     }
     /** (内部使用的方法) rpc through websocket (function/script/variable command)
         未连接到 DDB 时调用会自动连接，连接断开时调用会抛出 DdbConnectionError
@@ -2492,8 +2494,21 @@ class DDB {
                                 `${Number(DDB.le_client)}\n`;
                         case 'connect':
                             if (this.verbose)
-                                console.log('connect()');
-                            return 'connect\n';
+                                console.log('connect()' +
+                                    (this.autologin ?
+                                        '\n' +
+                                            `login(${this.username.quote()}, ${this.password.quote()})`
+                                        :
+                                            ''));
+                            return 'connect\n' +
+                                // 详见 InterProcessIO.cpp#APISocketConsole::parseScript 中的
+                                // Util::startWith "connect"
+                                (this.autologin ?
+                                    'login\n' +
+                                        this.username + '\n' +
+                                        this.password /* encrypted (可选参数) + '\n' + 'false' */
+                                    :
+                                        '');
                     }
                 })());
                 websocket.send(concat([