dolphindb 2.0.939 → 2.0.943

package/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { InspectOptions as UtilInspectOptions } from 'util';
-import { inspect } from 'xshell';
+import { inspect, type WebSocketConnectionError } from 'xshell';
 export declare enum DdbForm {
     scalar = 0,
     vector = 1,
@@ -183,8 +183,8 @@ DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDeci
 export type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue | DdbDictValue | DdbChartValue;
 export type DdbStringObj = DdbObj<string>;
 export type DdbVectorObj<TValue extends DdbVectorValue = DdbVectorValue> = DdbObj<TValue>;
-export type DdbVectorAnyObj = DdbObj<DdbObj[]>;
-export type DdbVectorStringObj = DdbObj<string[]>;
+export type DdbVectorAnyObj = DdbVectorObj<DdbObj[]>;
+export type DdbVectorStringObj = DdbVectorObj<string[]>;
 export type DdbTableObj<TColumns extends DdbVectorObj[] = DdbVectorObj[]> = DdbObj<TColumns>;
 export type DdbDictObj<TKeys extends DdbVectorObj = DdbVectorObj, TValues extends DdbVectorObj = DdbVectorObj> = DdbObj<[TKeys, TValues]>;
 export type DdbMatrixObj<TValue extends DdbMatrixValue = DdbMatrixValue> = DdbObj<TValue>;
@@ -462,8 +462,9 @@ export interface DdbRpcOptions {
 }
 export declare class DdbConnectionError extends Error {
     name: string;
+    cause?: WebSocketConnectionError;
     ddb: DDB;
-    constructor(ddb: DDB, error_options?: ErrorOptions);
+    constructor(ddb: DDB, error?: WebSocketConnectionError);
 }
 export declare class DdbDatabaseError extends Error {
     name: string;
@@ -538,6 +539,7 @@ export declare class DDB {
         streaming?: StreamingParams;
     });
     private on_message;
+    private on_error;
     /** 建立实际的 WebSocket 连接到 URL 对应的 DolphinDB  Establish a actual websocket connection to the DolphindB corresponding to the URL
         是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  After calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
         this.autologin 为 true 时自动登录  this.autologin automatically log in when it is true */

package/index.js

@@ -4,7 +4,7 @@ import DayjsCustomParseFormat from 'dayjs/plugin/customParseFormat.js';
 dayjs.extend(DayjsCustomParseFormat);
 import ipaddrjs from 'ipaddr.js';
 const { fromByteArray: buf2ipaddr } = ipaddrjs;
-import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, WebSocket, WebSocketConnectionError, defer } from 'xshell';
+import { concat, assert, inspect, typed_array_to_buffer, connect_websocket, WebSocket, defer } from 'xshell';
 import { t } from './i18n/index.js';
 export var DdbForm;
 (function (DdbForm) {
@@ -2134,12 +2134,10 @@ export function int1282str(buffer, le = true) {
 export const winsize = 10_0000;
 export class DdbConnectionError extends Error {
     name = 'DdbConnectionError';
+    cause;
     ddb;
-    constructor(ddb, error_options) {
-        super(error_options?.cause ?
-            error_options.cause.message
-            :
-                `${ddb.url} ${t('连接出错了，可能由于网络原因连接已被关闭，或服务器断开连接')}`, error_options);
+    constructor(ddb, error) {
+        super(error?.message || `${ddb.url} ${t('连接出错了，可能由于网络原因连接已被关闭，或服务器断开连接')}`, { cause: error });
         this.ddb = ddb;
     }
 }
@@ -2234,8 +2232,11 @@ export class DDB {
         if (options.streaming !== undefined)
             this.streaming = options.streaming;
     }
-    on_message(buffer) {
-        // 这里的实现一定会被 connect 中的实现覆盖
+    on_message(buffer, websocket) {
+        // 这里的实现一定会被 connect, rpc 中的实现覆盖
+    }
+    on_error(error, websocket) {
+        // 这里的实现一定会被 connect, rpc 中的实现覆盖
     }
     /** 建立实际的 WebSocket 连接到 URL 对应的 DolphinDB  Establish a actual websocket connection to the DolphindB corresponding to the URL
         是幂等的，调用后会确保已连接到数据库 (确保 websocket.readyState 为 open)，否则报错  After calling, it will ensure that it has been connected to the database (ensure that websocket.ReadyState is open), otherwise an error will be reported
@@ -2248,7 +2249,10 @@ export class DDB {
         await ptail;
         try {
             if (!this.connected) {
-                this.on_message = buffer => {
+                this.on_error = (error, websocket) => {
+                    pconnect.reject(new DdbConnectionError(this, error));
+                };
+                this.on_message = (buffer, websocket) => {
                     assert(false, t('这是在调用 this.rpc 之前默认的 on_message, 不应该被调用到，除非建立连接后 server 先推送了 message'));
                 };
                 this.presult = defer(null);
@@ -2261,16 +2265,16 @@ export class DDB {
                             if (this.python)
                                 return 'python';
                         })(),
-                        on_message: (buffer) => {
-                            this.on_message(buffer);
+                        on_message: (buffer, websocket) => {
+                            this.on_message(buffer, websocket);
+                        },
+                        on_error: (error, websocket) => {
+                            this.on_error(error, websocket);
                         }
                     });
                 }
                 catch (error) {
-                    if (error instanceof WebSocketConnectionError)
-                        throw new DdbConnectionError(this, { cause: error });
-                    else
-                        throw error;
+                    throw new DdbConnectionError(this, error);
                 }
                 if (this.streaming)
                     await this.subscribe();
@@ -2399,6 +2403,13 @@ export class DDB {
         }
         catch { }
         // 临界区结束，只有一个 rpc 函数调用运行到这里，可以独占 this.on_message 然后写 WebSocket
+        if (!this.connected) {
+            presult.reject(new DdbConnectionError(this));
+            return presult;
+        }
+        this.on_error = (error, websocket) => {
+            presult.reject(new DdbConnectionError(this, error));
+        };
         this.on_message = buffer => {
             try {
                 const buf = new Uint8Array(buffer);