dolphindb 2.0.918 → 2.0.919

package/browser.js

@@ -6,7 +6,7 @@ const { fromByteArray: buf2ipaddr } = ipaddrjs;
 import 'xshell/prototype.browser.js';
 import { blue, cyan, green, grey, magenta } from 'xshell/chalk.browser.js';
 import { concat, assert } from 'xshell/utils.browser.js';
-import { connect_websocket } from 'xshell/net.browser.js';
+import { connect_websocket, WebSocketConnectionError } from 'xshell/net.browser.js';
 import { t } from './i18n/index.js';
 export var DdbForm;
 (function (DdbForm) {
@@ -2125,7 +2125,7 @@ export class DdbConnectionError extends Error {
     name = 'DdbConnectionError';
     ddb;
     constructor(ddb, error_options) {
-        super(`${ddb.url} ${t('已断开')}`, error_options);
+        super(`${ddb.url} ${t('已断开')}${error_options?.cause ? `. ${error_options.cause.message}` : ''}`, error_options);
         this.ddb = ddb;
     }
 }
@@ -2223,7 +2223,7 @@ export class DDB {
         if (options.streaming !== undefined)
             this.streaming = options.streaming;
     }
-    on_message(event) {
+    on_message(buffer) {
         // 这里的实现一定会被 connect 中的实现覆盖
     }
     /** 建立实际的 WebSocket 连接到 URL 对应的 DolphinDB  Establish a actual websocket connection to the DolphindB corresponding to the URL
@@ -2240,22 +2240,30 @@ export class DDB {
         await ptail;
         try {
             if (!this.connected) {
-                this.on_message = (event) => {
+                this.on_message = buffer => {
                     assert(false, t('这是在调用 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);
-                    }
-                });
+                try {
+                    this.websocket = await connect_websocket(this.url, {
+                        protocols: (() => {
+                            if (this.streaming)
+                                return 'streaming';
+                            if (this.python)
+                                return 'python';
+                        })(),
+                        on_message: (buffer) => {
+                            this.on_message(buffer);
+                        }
+                    });
+                }
+                catch (error) {
+                    if (error instanceof WebSocketConnectionError)
+                        throw new DdbConnectionError(this, { cause: error });
+                    else
+                        throw error;
+                }
                 if (this.streaming)
                     await this.subscribe();
                 else {
@@ -2392,7 +2400,7 @@ export class DDB {
         }
         catch { }
         // 临界区结束，只有一个 rpc 函数调用运行到这里，可以独占 this.on_message 然后写 WebSocket
-        this.on_message = ({ data: buffer }) => {
+        this.on_message = (buffer) => {
             try {
                 const buf = new Uint8Array(buffer);
                 if (this.print_message_buffer)
@@ -2616,7 +2624,7 @@ export class DDB {
             segments: [],
         };
         // 先准备好收到 websocket message 的 callback
-        this.on_message = ({ data: buffer }) => {
+        this.on_message = buffer => {
             let { streaming } = this;
             try {
                 const dv = new DataView(buffer);