dolphindb 3.0.208 → 3.0.210

package/README.md

@@ -607,6 +607,11 @@ export interface StreamingMessage <TRows = any> extends StreamingParams {
 }
 ```
 
+To close streaming data subscription, use the following two methods to disconnect:
+- Automatically disconnect by closing the browser page
+- Manually disconnect by calling `sddb.disconnect()`
+
+
 ## Development Method
 
 ```shell

package/README.zh.md

@@ -589,6 +589,10 @@ export interface StreamingMessage <TRows = any> extends StreamingParams {
 }
 ```
 
+关闭流数据订阅使用下面两种断开连接的方法
+- 关闭浏览器页面自动断开连接
+- 调用 `sddb.disconnect()` 手动断开连接
+
 
 ### 开发方法
 

package/browser.d.ts

@@ -281,6 +281,7 @@ export interface DdbMatrixData {
 }
 export type IotVectorItemValue = [number | string | bigint | boolean][];
 export type DdbIotAnyVector = DdbObj<IotVectorItemValue>;
+export type JsSimpleType = DdbObj | string | boolean | null | undefined;
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     static dec: TextDecoder;
@@ -357,10 +358,10 @@ export declare class DdbObj<TValue extends DdbValue = DdbValue> {
     }, limit?: number): TensorData;
     toString(options?: InspectOptions): string;
     inspect_type(): string;
-    /** 自动转换 js string, boolean 为 DdbObj */
-    static to_ddbobj(value: DdbObj | string | boolean): DdbObj;
+    /** 自动转换 JsSimpleType 为 DdbObj */
+    static to_ddbobj(value: JsSimpleType): DdbObj;
     /** 转换 js 数组为 DdbObj[] */
-    static to_ddbobjs(values: (DdbObj | string | boolean)[]): DdbObj<DdbValue>[];
+    static to_ddbobjs(values: JsSimpleType[]): DdbObj<DdbValue>[];
     /** @deprecated 用 data() */
     to_cols(): {
         title: string;
@@ -421,6 +422,7 @@ export interface ConvertOptions {
 export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | number[] | Uint8Array<ArrayBufferLike> | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | string[] | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbArrayVectorValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue | DdbTensorValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
+/** 构造 void 类型，默认为 `DdbVoidType.undefined` */
 export declare class DdbVoid extends DdbObj<undefined> {
     constructor(value?: DdbVoidType);
 }

package/browser.js

@@ -1549,10 +1549,14 @@ export class DdbObj {
                 return `${DdbForm[this.form]} ${tname}`;
         }
     }
-    /** 自动转换 js string, boolean 为 DdbObj */
+    /** 自动转换 JsSimpleType 为 DdbObj */
     static to_ddbobj(value) {
         if (value && value instanceof DdbObj)
             return value;
+        if (value === undefined)
+            return new DdbVoid();
+        if (value === null)
+            return new DdbVoid(DdbVoidType.null);
         const type = typeof value;
         switch (type) {
             case 'string':
@@ -2148,6 +2152,7 @@ export function converts(type, value, rows, le, options) {
         }).flat();
     }
 }
+/** 构造 void 类型，默认为 `DdbVoidType.undefined` */
 export class DdbVoid extends DdbObj {
     constructor(value = DdbVoidType.undefined) {
         super({
@@ -2581,7 +2586,7 @@ export function datetime2ms(datetime) {
     if (datetime === null || datetime === nulls.int32)
         return null;
     const date = new Date(1000 * datetime);
-    return new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
+    return new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf();
 }
 export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === nulls.int32) ?
@@ -2594,7 +2599,7 @@ export function timestamp2ms(timestamp) {
     if (timestamp === null || timestamp === nulls.int64)
         return null;
     const date = new Date(Number(timestamp));
-    return new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
+    return new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf();
 }
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -2656,7 +2661,7 @@ export function nanotimestamp2ns(nanotimestamp) {
     if (nanotimestamp === null || nanotimestamp === nulls.int64)
         return null;
     const date = new Date(Number(nanotimestamp / 1000000n));
-    return BigInt(new Date(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
+    return BigInt(new Date(`${_datetime_formatter.format(date)}.${String(date.getUTCMilliseconds()).padStart(3, '0')}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
 }
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
@@ -3301,9 +3306,12 @@ export class DDB {
             for (const arg of args)
                 if (arg && arg instanceof DdbObj)
                     has_ddbobj = true;
+                else if (arg === undefined || arg === null) {
+                    // simple
+                }
                 else {
                     const type = typeof arg;
-                    if (type === 'string' || type === 'boolean') { }
+                    if (type === 'string' || type === 'boolean') { } // simple
                     else
                         simple = false;
                 }
@@ -3396,15 +3404,10 @@ export class DDB {
         /** index of line feed 0 */
         const ilf0 = buf.indexOf(0x0a); // '\n'
         const parts = this.dec.decode(buf.subarray(0, ilf0)).split(' ');
-        /** session id */
-        const sid = parts[0];
-        if (sid !== this.sid) {
-            console.log(t('session id 从 {{sid}} 变为 {{sid_}}', { sid: this.sid, sid_: sid }));
-            this.sid = sid;
-        }
-        /** 返回对象的数量 */
-        const nobj = Number(parts[1]);
-        /** 大小端: 协议中大端为 0, 小端为 1 */
+        this.sid = parts[0];
+        // 返回对象的数量
+        // const nobj = Number(parts[1])
+        // 大小端: 协议中大端为 0, 小端为 1
         this.le = Number(parts[2]) !== 0;
         const ils1 = ilf0 + 1;
         const ilf1 = buf.indexOf(0x0a, ils1); // '\n'