dolphindb 3.1.1 → 3.1.3

package/browser.d.ts

@@ -2,7 +2,7 @@ import type { Dayjs } from 'dayjs';
 import 'xshell/prototype.browser.js';
 import { Lock } from 'xshell/utils.browser.js';
 import { type WebSocketConnectionError } from 'xshell/net.browser.js';
-import { DdbChartType, DdbForm, DdbFunctionType, DdbType, DdbVoidType, type ConvertOptions, type DdbDecimal32Value, type DdbDecimal32VectorValue, type DdbDecimal64Value, type DdbDecimal64VectorValue, type DdbDurationValue, type DdbDurationVectorValue, type DdbFunctionDefValue, type DdbRpcType, type DdbScalarValue, type DdbSymbolExtendedValue, type DdbTableData, type DdbTensorValue, type IotVectorItemValue, type TensorData } from './common.ts';
+import { DdbChartType, DdbForm, DdbFunctionType, DdbType, DdbVoidType, type ConvertOptions, type DdbDecimal32Value, type DdbDecimal32VectorValue, type DdbDecimal64Value, type DdbDecimal64VectorValue, type DdbDurationValue, type DdbDurationVectorValue, type DdbFunctionDefValue, type DdbRpcType, type DdbScalarValue, type DdbSymbolExtendedValue, type DdbTableData, type DdbTensorValue, type IotVectorItemValue, type TensorData, type DdbExtObjValue } from './common.ts';
 export * from './common.ts';
 export interface DdbDecimal128VectorValue {
     scale: number;
@@ -51,7 +51,7 @@ export interface DdbChartValue {
     };
     data: DdbMatrixObj;
 }
-export type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue | DdbDictValue | DdbChartValue | DdbTensorValue;
+export type DdbValue = DdbScalarValue | DdbVectorValue | DdbMatrixValue | DdbDictValue | DdbChartValue | DdbTensorValue | DdbExtObjValue;
 export type DdbStringObj = DdbObj<string>;
 export type DdbVectorObj<TValue extends DdbVectorValue = DdbVectorValue> = DdbObj<TValue>;
 export type DdbVectorAnyObj = DdbVectorObj<DdbObj[]>;
@@ -185,7 +185,7 @@ export interface InspectOptions {
 export declare function format(type: DdbType, value: DdbValue, le: boolean, options?: InspectOptions): string;
 /** 格式化向量、集合中的第 index 项为字符串，空值返回 'null' 字符串  formatted vector, the index-th item in the collection is a string, a null value returns a 'null' string */
 export declare function formati(obj: DdbVectorObj, index: number, options?: InspectOptions): string;
-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;
+export declare function convert(type: DdbType, value: DdbValue, le: boolean, { blob, char, timestamp }?: ConvertOptions): string | number | bigint | boolean | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | string[] | DdbExtObjValue | number[] | DdbTensorValue | Uint8Array<ArrayBufferLike> | DdbDecimal128VectorValue | BigInt128Array | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | IotVectorItemValue | DdbArrayVectorValue | DdbDurationVectorValue | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */

package/browser.js

@@ -283,6 +283,23 @@ export class DdbObj {
                     }
                 });
             }
+            case DdbForm.extobj: {
+                const dv = new DataView(buf_data.buffer, buf_data.byteOffset, buf_data.byteLength);
+                const version_and_size = dv.getUint32(4, le);
+                const length = version_and_size & 0x00ffffff;
+                return new this({
+                    le,
+                    form,
+                    type,
+                    // 低 24 位为 size
+                    length: i_data + 8 + length,
+                    value: {
+                        type: buf_data.subarray(0, 4),
+                        version: (version_and_size >>> 24) & 0xff,
+                        data: buf_data.subarray(8, 8 + length)
+                    }
+                });
+            }
             default:
                 return new this({
                     le,
@@ -989,8 +1006,14 @@ export class DdbObj {
                     uint8Array.set(data, dataStart);
                     return [uint8Array];
                 }
+                case DdbForm.extobj: {
+                    const { data, type: exttype, version } = value;
+                    let version_and_size = new Uint8Array(4);
+                    version_and_size.dataview.setUint32(0, (version << 24) | data.length, this.le);
+                    return [exttype, version_and_size, data];
+                }
                 default:
-                    throw new Error(t('vector {{type}} 暂不支持序列化', { type: get_type_name(type) }));
+                    throw new Error(t('{{form}} 暂不支持序列化', { form: DdbForm[form] || `form ${form}` }));
             }
         })();
         if (!body)
@@ -1148,7 +1171,7 @@ export class DdbObj {
             case DdbForm.tensor: {
                 const { data_type, tensor_type, device_type, tensor_flags, dimensions, shape, strides, preserve_value, elem_count, data, } = this.value;
                 const dataByte = ddb_tensor_bytes[data_type];
-                const returnData = {
+                return {
                     data_type,
                     tensor_type,
                     device_type,
@@ -1160,10 +1183,12 @@ export class DdbObj {
                     elem_count,
                     data: DdbObj.parse_tensor({ currentDim: 0, dimensions, rawData: data, le: this.le, dataByte, dataType: data_type, shape, strides })
                 };
-                return returnData;
             }
+            case DdbForm.extobj:
+                // return (this.value as DdbExtObjValue).data as TResult
+                return `ExtObj<${get_type_name(type)}>`;
             default:
-                throw new Error(t('{{form}} {{type}} 暂不支持 data()', { form, type: get_type_name(type) }));
+                throw new Error(t('{{form}} {{type}} 暂不支持 data()', { form: DdbForm[form] || form, type: get_type_name(type) }));
         }
     }
     /** 构建 Tensor
@@ -2957,7 +2982,7 @@ export class DDB {
                 }
         let result;
         if (function_definition_pattern.test(func))
-            func = await this.define(func);
+            func = await this.define(func, { urgent: options?.urgent });
         if (convertable)
             result = await this.call(func, args, options);
         else {