dolphindb 2.0.1001 → 2.0.1003

package/README.md

@@ -43,6 +43,7 @@ npm install dolphindb
 
 ## Usage
 ### 0. Initialize and connect to DolphinDB
+#### NPM
 ```ts
 import { DDB } from 'dolphindb'
 // The import method for existing projects using CommonJS modules is const { DDB } = await import('dolphindb')
@@ -58,6 +59,19 @@ let ddb = new DDB('ws://127.0.0.1:8848')
 await ddb.connect()
 ```
 
+#### CDN
+```html
+<script src="https://cdn.dolphindb.cn/assets/api.umd.js"></script>
+<script>
+    let ddb = new dolphindb.DDB('ws://127.0.0.1:8848')
+    console.log(ddb)
+</script>
+```
+
+Code completion, function prompt data:
+https://cdn.dolphindb.cn/assets/docs.zh.json
+https://cdn.dolphindb.cn/assets/docs.en.json
+
 #### DDB options
 ```ts
 let ddb = new DDB('ws://127.0.0.1:8848')

package/README.zh.md

@@ -43,6 +43,7 @@ npm install dolphindb
 
 ## 用法
 ### 0. 初始化并连接到 DolphinDB
+#### NPM
 ```ts
 import { DDB } from 'dolphindb'
 // 已有的使用 CommonJS 模块的项目的导入方法为 const { DDB } = await import('dolphindb')
@@ -58,6 +59,20 @@ let ddb = new DDB('ws://127.0.0.1:8848')
 await ddb.connect()
 ```
 
+#### CDN
+```html
+<script src="https://cdn.dolphindb.cn/assets/api.umd.js"></script>
+<script>
+    let ddb = new dolphindb.DDB('ws://127.0.0.1:8848')
+    console.log(ddb)
+</script>
+```
+
+代码补全、函数提示数据:
+https://cdn.dolphindb.cn/assets/docs.zh.json
+https://cdn.dolphindb.cn/assets/docs.en.json
+
+
 #### DDB 选项
 ```ts
 let ddb = new DDB('ws://127.0.0.1:8848', {

package/browser.js

@@ -1217,10 +1217,12 @@ export class DdbObj {
     }
 }
 /** 整数一定用这个 number formatter, InspectOptions.decimals 不传也用这个  Integer must use this number formatter, InspectOptions.decimals also use this if not passed */
-let default_formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+let default_formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
 let _decimals = 20;
 /** 缓存，为了优化性能，通常 options.decimals 都是不变的  Cache, in order to optimize performance, usually options.decimals are unchanged */
-let _formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+let _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: 20 });
+/** 用来处理时差  To deal with jet lag */
+let _datetime_formatter = new Intl.DateTimeFormat('zh-CN', { dateStyle: 'short', timeStyle: 'medium', timeZone: 'UTC' });
 /** 根据 DdbType 格式化单个元素 (value) 为字符串  Formats a single element (value) as a string according to DdbType, null returns a 'null' string */
 export function format(type, value, le, options = {}) {
     const { decimals, nullstr = false, colors = false, quote = false } = options;
@@ -1229,7 +1231,7 @@ export function format(type, value, le, options = {}) {
             return default_formatter;
         if (decimals !== _decimals) {
             _decimals = decimals;
-            _formatter = Intl.NumberFormat('en-US', { maximumFractionDigits: decimals, minimumFractionDigits: decimals });
+            _formatter = new Intl.NumberFormat('en-US', { maximumFractionDigits: decimals, minimumFractionDigits: decimals });
         }
         return _formatter;
     })();
@@ -1927,8 +1929,8 @@ export function second2str(second, format = 'HH:mm:ss') {
 export function datetime2ms(datetime) {
     if (datetime === null || datetime === nulls.int32)
         return null;
-    const ms = 1000 * datetime;
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    const date = new Date(1000 * datetime);
+    return dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
 }
 export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
     return (datetime === null || datetime === nulls.int32) ?
@@ -1939,8 +1941,8 @@ export function datetime2str(datetime, format = 'YYYY.MM.DD HH:mm:ss') {
 export function timestamp2ms(timestamp) {
     if (timestamp === null || timestamp === nulls.int64)
         return null;
-    const ms = Number(timestamp);
-    return 1000 * 60 * new Date(ms).getTimezoneOffset() + ms;
+    const date = new Date(Number(timestamp));
+    return dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf();
 }
 /** format timestamp (bigint) to string
     - timestamp: bigint value
@@ -2003,8 +2005,8 @@ export function nanotime2str(nanotime, format = 'HH:mm:ss.SSSSSSSSS') {
 export function nanotimestamp2ns(nanotimestamp) {
     if (nanotimestamp === null || nanotimestamp === nulls.int64)
         return null;
-    const ms = Number(nanotimestamp / 1000000n);
-    return BigInt(1000 * 60 * new Date(ms).getTimezoneOffset()) * 1000000n + nanotimestamp;
+    const date = new Date(Number(nanotimestamp / 1000000n));
+    return BigInt(dayjs(`${_datetime_formatter.format(date)}.${date.getUTCMilliseconds()}`).valueOf()) * 1000000n + nanotimestamp % 1000000n;
 }
 /** format nanotimestamp value (bigint) to string
     - nanotimestamp: bigint value
@@ -2030,9 +2032,7 @@ export function nanotimestamp2str(nanotimestamp, format = 'YYYY.MM.DD HH:mm:ss.S
     const remainder = nanotimestamp % 1000000000n;
     const borrow = remainder < 0n;
     const ms = Number(nanotimestamp / 1000000n);
-    return (dayjs(1000 * 60 * new Date(ms).getTimezoneOffset() +
-        // 去掉 9 位的纳秒部分，转化为毫秒
-        Number((nanotimestamp - remainder + (borrow ? -1000000000n : 0n)) / 1000000n)).format(format.slice(0, i_second_end)) +
+    return (dayjs(_datetime_formatter.format(new Date(ms))).format(format.slice(0, i_second_end)) +
         format.slice(i_second_end, i_nanosecond_start) +
         String(borrow ?
             (remainder + 1000000000n) % 1000000000n