dolphindb 3.1.30 → 3.1.33

package/i18n/dict.json

@@ -121,5 +121,8 @@
     },
     "value 不能转换为 {{typename}}": {
         "en": "value cannot be converted to {{typename}}"
+    },
+    "ddb.cancel 无 ticket，尝试通过密码 login 失败": {
+        "en": "ddb.cancel has no ticket, attempt to login using password failed"
     }
 }

package/index.d.ts

@@ -174,7 +174,7 @@ export interface InspectOptions extends UtilInspectOptions {
 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[] | string[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | DdbExtObjValue | DdbTensorValue | Uint8Array<ArrayBufferLike> | IotVectorItemValue | DdbDurationVectorValue | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbMatrixValue | DdbChartValue;
+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 | string[] | IotVectorItemValue | DdbSymbolExtendedValue | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbDurationVectorValue | DdbTensorValue | DdbExtObjValue | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */
@@ -607,6 +607,9 @@ export declare class DDB {
     define(definition: string, { urgent }?: {
         urgent?: boolean;
     }): Promise<string>;
+    /** 在 undef all, 或运行 test 函数之后，由于函数定义在 server 侧被清空，需要同步清空 api 侧缓存，
+        使得下次调用 invoke, define 能够重新定义函数 */
+    reset_definitions(): void;
 }
 export interface DdbMessageListener {
     (message: DdbMessage, _this: DDB): any;

package/index.js

@@ -2908,13 +2908,21 @@ export class DDB {
     /** 取消当前 session id 对应的所有 console jobs  Cancel all console jobs corresponding to the current session id */
     async cancel() {
         let ddb = new DDB(this.url, {
-            autologin: this.autologin,
+            // 如果有 ticket，则认为能够自动登录，并启用，否则禁用，尝试一下用户名密码登录
+            autologin: Boolean(this.ticket),
             ticket: this.ticket,
             username: this.username,
             password: this.password,
             proxy: this.proxy,
             verbose: this.verbose
         });
+        if (!this.ticket)
+            try {
+                await this.invoke('login', [this.username, this.password]);
+            }
+            catch (error) {
+                console.log(t('ddb.cancel 无 ticket，尝试通过密码 login 失败'));
+            }
         try {
             // 因为是新建的连接，而且执行完脚本之后马上就关闭了，所以不用考虑变量泄漏的问题
             await ddb.eval(`jobs = exec rootJobId from getConsoleJobs() where sessionId = ${this.sid}\n` +
@@ -3099,6 +3107,12 @@ export class DDB {
         this.pdefinitions.delete(func_name);
         return func_name;
     }
+    /** 在 undef all, 或运行 test 函数之后，由于函数定义在 server 侧被清空，需要同步清空 api 侧缓存，
+        使得下次调用 invoke, define 能够重新定义函数 */
+    reset_definitions() {
+        this.definitions.clear();
+        this.pdefinitions.clear();
+    }
 }
 export class BigInt128Array {
     static of(...items) {