dolphindb 3.1.27 → 3.1.29

package/browser.d.ts

@@ -184,7 +184,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[] | DdbFunctionDefValue | DdbDurationValue | DdbDecimal32Value | DdbDecimal64Value | DdbDecimal32VectorValue | DdbDecimal64VectorValue | DdbSymbolExtendedValue | string[] | DdbExtObjValue | 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;
+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> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | BigInt64Array<ArrayBufferLike> | BigInt128Array | Uint8Array<ArrayBufferLike>[] | DdbObj<DdbValue>[] | IotVectorItemValue | DdbArrayVectorValue | DdbDecimal128VectorValue | DdbDurationVectorValue | DdbMatrixValue | DdbChartValue;
 /** 转换一个向量到 js 原生数组 */
 export declare function converts(type: DdbType, value: DdbVectorValue, rows: number, le: boolean, options?: ConvertOptions): any[] | Uint8Array;
 /** 构造 void 类型，默认为 `DdbVoidType.undefined` */
@@ -369,6 +369,7 @@ export declare enum SqlStandard {
 }
 export interface DdbOptions {
     autologin?: boolean;
+    ticket?: string;
     username?: string;
     password?: string;
     python?: boolean;
@@ -404,6 +405,8 @@ export declare class DDB {
     static le_client: boolean;
     /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin: boolean;
+    /** DolphinDB 登录 ticket，优先级比用户名密码更高，设置后不使用密码登录 */
+    ticket?: string;
     /** DolphinDB 登录用户名  DolphinDB username */
     username: string;
     /** DolphinDB 登录密码  DolphinDB password */
@@ -488,6 +491,10 @@ export declare class DDB {
         2. The session is stateful, and the previous state cannot be restored even after reconnection
         3. After disconnection, all previous ddb.call, ddb.eval should throw a connection error */
     connect(): Promise<void>;
+    /** 使用 ticket 登录
+        - ticket?: `this.ticket` 手动传入时会更新 this.ticket
+        - skip_connection_check? */
+    login_by_ticket(ticket?: string, skip_connection_check?: boolean): Promise<void>;
     get_rpc_options({ urgent, secondary, async: _async, pickle, clear, api, compress, cancellable, priority, parallelism, root_id, limit, }?: {
         urgent?: boolean;
         /** API 提交的任务, secondary 必须为 false */
@@ -562,7 +569,7 @@ export declare class DDB {
                 将这个 flag 设为 true 跳过连接状态检查
                 (internal use) When await ddb.connect() establishes a connection for the first time, you cannot call await this.connect() again to ensure the connection status, which will lead to circular dependencies.
                  Set this flag to true to skip connection status checks */
-    call<TResult extends DdbObj>(func: string, args?: (DdbObj | string | boolean)[], { urgent, node, nodes, add_node_alias, listener, parse_object, skip_connection_check, on_more_messages }?: DdbCallOptions): Promise<TResult>;
+    call<TResult extends DdbObj>(func: string, args?: (DdbObj | string | boolean)[], { urgent: u, node, nodes, add_node_alias, listener, parse_object, skip_connection_check, on_more_messages }?: DdbCallOptions): Promise<TResult>;
     /** 调用 dolphindb 函数，传入 js 原生数组作为参数，返回 js 原生对象或值（调用 DdbObj.data() 后的结果）
         - func: 函数名，或者函数完整实现，会间接调用 define 进行预定义
         - args?: `[ ]` 调用参数，可以是 js 原生数组，参数在中间且想用 server 函数的默认参数值时可以传 null 占位

package/browser.js

@@ -3,7 +3,7 @@ import { blue, cyan, green, grey, magenta } from 'xshell/chalk.browser.js';
 import { concat, assert, Lock, genid, seq, zip_object, decode, check } from 'xshell/utils.browser.js';
 import { connect_websocket } from 'xshell/net.browser.js';
 import { t } from "./i18n/index.js";
-import { ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, generate_array_type, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, time_formatters, number_nulls, nulls, set_big_int_128, uuid2str, get_times_ddbobj, funcdefs, get_number_formatter } from "./common.js";
+import { ddb_tensor_bytes, DdbChartType, DdbDurationUnit, DdbForm, generate_array_type, DdbFunctionType, DdbType, DdbVoidType, dictables, function_definition_patterns, get_big_int_128, get_time_ddbobj, get_duration_unit, get_type_name, int1282str, ipaddr2str, is_decimal_null_value, is_decimal_type, time_formatters, number_nulls, nulls, set_big_int_128, uuid2str, get_times_ddbobj, funcdefs, get_number_formatter, urgent } from "./common.js";
 export * from "./common.js";
 /** 可以表示所有 DolphinDB 数据库中的数据类型  Can represent data types in all DolphinDB databases */
 export class DdbObj {
@@ -2425,6 +2425,8 @@ export class DDB {
     static le_client = Boolean(new Uint8Array(Uint32Array.of(1).buffer)[0]);
     /** 是否在建立连接后自动登录，默认 true  Whether to automatically log in after the connection is established, the default is true */
     autologin = true;
+    /** DolphinDB 登录 ticket，优先级比用户名密码更高，设置后不使用密码登录 */
+    ticket;
     /** DolphinDB 登录用户名  DolphinDB username */
     username = 'admin';
     /** DolphinDB 登录密码  DolphinDB password */
@@ -2499,6 +2501,8 @@ export class DDB {
             this.verbose = options.verbose;
         if (options.autologin !== undefined)
             this.autologin = options.autologin;
+        if (options.ticket)
+            this.ticket = options.ticket;
         if (options.username !== undefined)
             this.username = options.username;
         if (options.password !== undefined)
@@ -2573,6 +2577,8 @@ export class DDB {
             try {
                 assert(this.connected);
                 await this.rpc('connect', { skip_connection_check: true });
+                if (this.autologin && this.ticket)
+                    await this.login_by_ticket(undefined, true);
                 if (this.streaming)
                     await this.subscribe();
                 resolve();
@@ -2583,6 +2589,14 @@ export class DDB {
             }
         });
     }
+    /** 使用 ticket 登录
+        - ticket?: `this.ticket` 手动传入时会更新 this.ticket
+        - skip_connection_check? */
+    async login_by_ticket(ticket, skip_connection_check = false) {
+        if (ticket)
+            this.ticket = ticket;
+        await this.invoke('authenticateByTicket', [this.ticket], { urgent: true, skip_connection_check });
+    }
     get_rpc_options({ urgent = false, secondary = false, async: _async = false, pickle = false, clear = false, api = false, compress = false, cancellable = true, priority = urgent ? 8 : 4, parallelism = 64, root_id = '', limit, } = {}) {
         let flag = 0;
         if (urgent)
@@ -2646,10 +2660,10 @@ export class DDB {
         let error = new DdbDatabaseError('', this.url, type, options, id);
         if (!options.skip_connection_check)
             await this.connect();
-        const { script, func, args: _args = [], vars = [], urgent, listener, on_more_messages, } = options;
+        const { script, func, args: _args = [], vars = [], urgent: u, listener, on_more_messages, } = options;
         if (func === 'pnode_run')
             try {
-                await (this.ppnode_run ??= this.eval(funcdefs.pnode_run[this.language], { urgent: true }));
+                await (this.ppnode_run ??= this.eval(funcdefs.pnode_run[this.language], urgent));
             }
             catch (error) {
                 this.ppnode_run = undefined;
@@ -2701,7 +2715,7 @@ export class DDB {
                     case 'connect':
                         if (this.verbose)
                             console.log('connect()' +
-                                (this.autologin ?
+                                (this.autologin && !this.ticket ?
                                     '\n' +
                                         `login(${this.username.quote()}, ${this.password.quote()})`
                                     :
@@ -2710,7 +2724,7 @@ export class DDB {
                         return 'connect\n' +
                             // 详见 InterProcessIO.cpp#APISocketConsole::parseScript 中的
                             // Util::startWith "connect"
-                            (this.autologin ?
+                            (this.autologin && !this.ticket ?
                                 'login\n' +
                                     this.username + '\n' +
                                     this.password /* encrypted (可选参数) + '\n' + 'false' */
@@ -2758,7 +2772,7 @@ export class DDB {
                         on_more_messages(buffer);
                 };
                 websocket.send(concat([
-                    this.enc.encode(`API2 ${this.sid} ${command.length} / ${this.get_rpc_options({ urgent })}\n`),
+                    this.enc.encode(`API2 ${this.sid} ${command.length} / ${this.get_rpc_options({ urgent: u })}\n`),
                     command,
                     ...args.map(arg => arg.pack())
                 ]));
@@ -2817,12 +2831,12 @@ export class DDB {
                 将这个 flag 设为 true 跳过连接状态检查
                 (internal use) When await ddb.connect() establishes a connection for the first time, you cannot call await this.connect() again to ensure the connection status, which will lead to circular dependencies.
                  Set this flag to true to skip connection status checks */
-    async call(func, args = [], { urgent, node, nodes, add_node_alias, listener, parse_object, skip_connection_check, on_more_messages } = {}) {
+    async call(func, args = [], { urgent: u, node, nodes, add_node_alias, listener, parse_object, skip_connection_check, on_more_messages } = {}) {
         let func_ = func;
         let args_ = args;
         if (node) {
             try {
-                await (this.pjsrpc ??= this.eval(funcdefs.jsrpc[this.language], { urgent: true }));
+                await (this.pjsrpc ??= this.eval(funcdefs.jsrpc[this.language], urgent));
             }
             catch (error) {
                 this.pjsrpc = undefined;
@@ -2853,7 +2867,7 @@ export class DDB {
         return this.rpc('function', {
             func: func_,
             args: args_,
-            urgent,
+            urgent: u,
             listener,
             parse_object,
             skip_connection_check,
@@ -2896,7 +2910,7 @@ export class DDB {
             if (has_ddbobj)
                 throw new Error(t('调用 ddb.invoke 的参数中不能同时有 DdbObj 与复杂 js 原生对象'));
             try {
-                await (this.pinvoke ??= this.eval(funcdefs.invoke[this.language], { urgent: true }));
+                await (this.pinvoke ??= this.eval(funcdefs.invoke[this.language], urgent));
             }
             catch (error) {
                 // invoke 没有正确执行时，重新将 pinvoke 赋值为 undefined
@@ -2929,6 +2943,7 @@ export class DDB {
     async cancel() {
         let ddb = new DDB(this.url, {
             autologin: this.autologin,
+            ticket: this.ticket,
             username: this.username,
             password: this.password,
             verbose: this.verbose
@@ -2937,7 +2952,7 @@ export class DDB {
             // 因为是新建的连接，而且执行完脚本之后马上就关闭了，所以不用考虑变量泄漏的问题
             await ddb.eval(`jobs = exec rootJobId from getConsoleJobs() where sessionId = ${this.sid}\n` +
                 'if (size(jobs))\n' +
-                '    cancelConsoleJob(jobs)\n', { urgent: true });
+                '    cancelConsoleJob(jobs)\n', urgent);
         }
         finally {
             ddb.disconnect();