dolphindb 2.0.1019 → 2.0.1020

package/browser.d.ts

@@ -376,15 +376,16 @@ export interface DdbRpcOptions {
 export declare class DdbConnectionError extends Error {
     name: string;
     cause?: WebSocketConnectionError;
-    ddb: DDB;
-    constructor(ddb: DDB, error?: WebSocketConnectionError);
+    url: string;
+    constructor(url: string, error?: WebSocketConnectionError);
 }
 export declare class DdbDatabaseError extends Error {
     name: string;
-    ddb: DDB;
+    url: string;
+    id: number;
     type: DdbRpcType;
     options: DdbRpcOptions;
-    constructor(message: string, ddb: DDB, type: DdbRpcType, options: DdbRpcOptions);
+    constructor(message: string, url: string, type: DdbRpcType, options: DdbRpcOptions, id: number);
 }
 /** SQL Standrd 标准类型 */
 export declare enum SqlStandard {

package/browser.js

@@ -2097,24 +2097,28 @@ export const winsize = 10_0000;
 export class DdbConnectionError extends Error {
     name = 'DdbConnectionError';
     cause;
-    ddb;
-    constructor(ddb, error) {
-        super(error?.message || `${ddb.url} ${t('连接出错了，可能由于网络原因连接已被关闭，或服务器断开连接')}`, { cause: error });
+    url;
+    // 这里不保留 ddb 的引用，会导致无法序列化
+    constructor(url, error) {
+        super(error?.message || `${url} ${t('连接出错了，可能由于网络原因连接已被关闭，或服务器断开连接')}`, { cause: error });
+        this.url = url;
         if (error)
             this.cause = error;
-        this.ddb = ddb;
     }
 }
 export class DdbDatabaseError extends Error {
     name = 'DdbDatabaseError';
-    ddb;
+    url;
+    // 这里不保留 ddb 的引用，会导致无法序列化
+    id;
     type;
     options;
-    constructor(message, ddb, type, options) {
+    constructor(message, url, type, options, id) {
         super(message);
-        this.ddb = ddb;
+        this.url = url;
         this.type = type;
         this.options = options;
+        this.id = id;
     }
 }
 /** SQL Standrd 标准类型 */
@@ -2242,7 +2246,7 @@ export class DDB {
             throw this.error;
         const { resource: websocket } = this.lwebsocket;
         if (websocket && (websocket.readyState === WebSocket.CLOSING || websocket.readyState === WebSocket.CLOSED))
-            throw this.error = new DdbConnectionError(this);
+            throw this.error = new DdbConnectionError(this.url);
         return this.pconnect ??= new Promise(async (resolve, reject) => {
             this.on_error = () => {
                 reject(this.error /* 一定有，不需要再 || new DdbConnectionError(this)  */);
@@ -2250,23 +2254,18 @@ export class DDB {
             try {
                 // 连接建立之前应该不会有别的调用占用 this.lwebsocket
                 this.lwebsocket.resource = await connect_websocket(this.url, {
-                    protocols: (() => {
-                        if (this.streaming)
-                            return 'streaming';
-                        if (this.python)
-                            return 'python';
-                    })(),
+                    protocols: this.streaming ? ['streaming'] : this.python ? ['python'] : undefined,
                     on_message: (buffer, websocket) => {
                         this.on_message(buffer, websocket);
                     },
                     on_error: error => {
-                        this.error ??= new DdbConnectionError(this, error);
+                        this.error ??= new DdbConnectionError(this.url, error);
                         this.on_error();
                     }
                 });
             }
             catch (error) {
-                this.error ??= new DdbConnectionError(this, error);
+                this.error ??= new DdbConnectionError(this.url, error);
                 reject(this.error);
                 return;
             }
@@ -2339,7 +2338,8 @@ export class DDB {
                 将这个 flag 设为 true 跳过连接状态检查 */
     async rpc(type, options) {
         // 保留调用栈信息
-        let error = new DdbDatabaseError('', this, type, options);
+        const id = genid() % 1000;
+        let error = new DdbDatabaseError('', this.url, type, options, id);
         if (!options.skip_connection_check)
             await this.connect();
         const { script, func, args: _args = [], vars = [], urgent, listener, } = options;
@@ -2398,7 +2398,6 @@ export class DDB {
             if (this.error)
                 throw this.error;
             const args = DdbObj.to_ddbobjs(_args);
-            const id = genid() % 1000;
             const rpc_id = ` (id = ${id})`;
             const command = this.enc.encode((() => {
                 switch (type) {