wsemi 1.9.21 → 1.9.23

package/src/getFileType.mjs

@@ -705,7 +705,7 @@ let fts = [
     {
         name: 'heic',
         group: 'image',
-        acp: 'image/heif',
+        acp: 'image/heic',
         exec: 'imageviwer'
     },
     {
@@ -1051,17 +1051,149 @@ let fts = [
         group: 'video',
         acp: 'video/x-matroska',
         exec: 'videoplayer'
+    },
+    {
+        name: 'jpeg',
+        group: 'image',
+        acp: 'image/jpeg',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'jpe',
+        group: 'image',
+        acp: 'image/jpeg',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'jfif',
+        group: 'image',
+        acp: 'image/jpeg',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'tiff',
+        group: 'image',
+        acp: 'image/tiff',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'svg',
+        group: 'image',
+        acp: 'image/svg+xml',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'heif',
+        group: 'image',
+        acp: 'image/heif',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'md',
+        group: 'data',
+        acp: 'text/markdown',
+        exec: 'textviwer'
+    },
+    {
+        name: 'markdown',
+        group: 'data',
+        acp: 'text/markdown',
+        exec: 'textviwer'
+    },
+    {
+        name: 'yaml',
+        group: 'data',
+        acp: 'application/yaml',
+        exec: 'textviwer'
+    },
+    {
+        name: 'yml',
+        group: 'data',
+        acp: 'application/yaml',
+        exec: 'textviwer'
+    },
+    {
+        name: 'log',
+        group: 'data',
+        acp: 'text/plain',
+        exec: 'textviwer'
+    },
+    {
+        name: 'ini',
+        group: 'data',
+        acp: 'text/plain',
+        exec: 'textviwer'
+    },
+    {
+        name: 'tsv',
+        group: 'data',
+        acp: 'text/tab-separated-values',
+        exec: 'excel'
+    },
+    {
+        name: 'kml',
+        group: 'data',
+        acp: 'application/vnd.google-earth.kml+xml',
+        exec: 'textviwer'
+    },
+    {
+        name: 'kmz',
+        group: '',
+        acp: 'application/vnd.google-earth.kmz',
+        exec: ''
+    },
+    {
+        name: 'gpx',
+        group: 'data',
+        acp: 'application/gpx+xml',
+        exec: 'textviwer',
+        msg: 'gpx無IANA登錄，application/gpx+xml為通行用法'
+    },
+    {
+        name: 'dxf',
+        group: 'image',
+        acp: 'image/vnd.dxf',
+        exec: 'imageviwer'
+    },
+    {
+        name: 'las',
+        group: '',
+        acp: 'application/vnd.las',
+        exec: '',
+        msg: 'las亦為井測資料(Log ASCII Standard)副檔名，此處依光達點雲(LASer)'
+    },
+    {
+        name: 'laz',
+        group: '',
+        acp: 'application/vnd.laszip',
+        exec: ''
+    },
+    {
+        name: 'obj',
+        group: '',
+        acp: 'model/obj',
+        exec: '',
+        msg: 'obj亦為編譯目的檔副檔名，此處依3D模型(Wavefront OBJ)'
+    },
+    {
+        name: 'gltf',
+        group: '',
+        acp: 'model/gltf+json',
+        exec: ''
     }
 ]
 
 
 /**
  * 取得檔案類型資訊
+ * 副檔名不含點，比對不分大小寫(回傳列之name維持表內原樣，如'z'回傳name為'Z'之列)
+ * 若副檔名多義或無IANA登錄，該列會附msg欄位說明(如gpx、las、obj)
+ * heic之acp為image/heic，heif之acp為image/heif
  *
  * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/getFileType.test.mjs Github}
  * @memberOf wsemi
- * @param {string} [name=''] 輸入過濾副檔名字串，預設''
- * @returns {Object|Array} 回傳檔案關聯性資訊物件或陣列
+ * @param {string} [name=''] 輸入過濾副檔名字串(不含點，不分大小寫)，預設''
+ * @returns {Object|Array|null} 回傳檔案關聯性資訊物件，未收錄之副檔名回傳null，未給予有效字串則回傳全部資訊陣列
  * @example
  *
  * let r
@@ -1074,12 +1206,25 @@ let fts = [
  * console.log('name=mp4', r)
  * // => name=mp4 { name: 'mp4', group: 'video', acp: 'video/mp4', exec: 'videoplayer' }
  *
+ * r = getFileType('SVG')
+ * console.log('name=SVG', r)
+ * // => name=SVG { name: 'svg', group: 'image', acp: 'image/svg+xml', exec: 'imageviwer' }
+ *
+ * r = getFileType('heic')
+ * console.log('name=heic', r)
+ * // => name=heic { name: 'heic', group: 'image', acp: 'image/heic', exec: 'imageviwer' }
+ *
+ * r = getFileType('xyz')
+ * console.log('name=xyz', r)
+ * // => name=xyz null
+ *
  */
 function getFileType(name = '') {
 
     let r = null
     if (isestr(name)) {
-        r = find(fts, { name })
+        let n = name.toLowerCase()
+        r = find(fts, (v) => v.name.toLowerCase() === n)
         if (!iseobj(r)) {
             r = null
         }

package/src/getltdtkeys.mjs

@@ -1,11 +1,11 @@
-import each from 'lodash-es/each.js'
-import keys from 'lodash-es/keys.js'
-import uniq from 'lodash-es/uniq.js'
+import each from 'lodash-es/each.js'
+import keys from 'lodash-es/keys.js'
+import uniq from 'lodash-es/uniq.js'
 import isearr from './isearr.mjs'
 
 
 /**
- * 由ltdt提取不重複keys
+ * 由ltdt提取不重複keys，各列物件只依自有可列舉鍵(length視為一般鍵)
  *
  * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/getltdtkeys.test.mjs Github}
  * @memberOf wsemi
@@ -27,7 +27,8 @@ function getltdtkeys(ltdt) {
     //ks
     let ks = []
     each(ltdt, function(v) {
-        let kst = keys(v)
+        //列物件只依自有可列舉鍵(lodash keys對不可寫偽稱Arguments之物件會依length走索引, R-OBJ-ITER-01), 列為真陣列者沿用keys(含空洞索引), Object(null)與Object(undefined)為{}
+        let kst = Array.isArray(v) ? keys(v) : Object.keys(Object(v))
         ks = [...ks, ...kst]
         ks = uniq(ks)
     })

package/src/treeObj.mjs

@@ -61,17 +61,17 @@ function traverseObj(data, f, keepSymbols = false) {
     let nowKey = []
 
     //check
-    if (!isarr(data) && !isobj(data)) {
+    if (!Array.isArray(data) && !isarr(data) && !isobj(data)) { //真陣列(含帶其他Symbol.toStringTag者)與巢狀位置一致
         data = f(data, null, [])
         return data
     }
 
     function getKeys(obj) {
-        if (isarr(obj)) {
+        if (Array.isArray(obj)) { //真陣列依索引; 以Symbol.toStringTag偽稱Array者(isarr為真)視為物件, 不依其length迭代(R-OBJ-ITER-01)
             //return keys(obj)
             return range(size(obj))
         }
-        if (isobj(obj)) {
+        if (isobj(obj) || isarr(obj)) {
             let v1 = Object.getOwnPropertyNames(obj)
             // console.log('v1', v1)
             let v2 = null
@@ -92,7 +92,7 @@ function traverseObj(data, f, keepSymbols = false) {
 
     function traverse(vs, _k) {
         //console.log('vs', vs)
-        if (isarr(vs)) {
+        if (Array.isArray(vs)) {
             let ks = getKeys(vs)
             return ks.map((k) => {
                 let v = vs[k]
@@ -105,7 +105,7 @@ function traverseObj(data, f, keepSymbols = false) {
                 return v
             })
         }
-        else if (isobj(vs)) {
+        else if (isobj(vs) || isarr(vs)) {
             let ks = getKeys(vs)
             let o = {}
             ks.map((k) => {
@@ -237,7 +237,7 @@ function traverseObj(data, f, keepSymbols = false) {
 
 
 /**
- * 遍歷物件並回傳複製物件，類似JSON.stringify，但不會序列化成為字串
+ * 遍歷物件並回傳複製物件，類似JSON.stringify，但不會序列化成為字串。真陣列(含帶其他Symbol.toStringTag者)依索引遍歷，物件依自有鍵遍歷(length視為一般鍵)，以Symbol.toStringTag偽稱Array之物件視為物件
  *
  * Unit Test: {@link https://github.com/yuda-lyu/wsemi/blob/master/test/treeObj.test.mjs Github}
  * @memberOf wsemi

package/src/u8arr2obj.mjs

@@ -8,6 +8,16 @@ import u8arr2str from './u8arr2str.mjs'
 import stru8arr2obj from './stru8arr2obj.mjs'
 
 
+//checkLenHead, 檢查封包標頭記載之分塊資訊區長度, 回傳不符原因字串, 符合則回傳空字串
+//取自封包標頭(網路/檔案來源, 不可信), 須為非負整數且不逾封包資料區之位元組數: 小數與負數經slice被靜默截斷或自尾端算而得同一分割(非正規編碼), NaN與Infinity亦然
+function checkLenHead(lenHead, size) {
+    if (!Number.isInteger(lenHead) || lenHead < 0 || lenHead > size) {
+        return 'head length must be a non-negative integer not exceeding the packet'
+    }
+    return ''
+}
+
+
 //checkPks, 檢查分塊資訊, 回傳不符原因字串, 全符合則回傳空字串
 //分塊資訊取自封包標頭(網路/檔案來源, 不可信), 須在迭代與配置記憶體前驗證(R-OBJ-ITER-01規則6), 否則偽造{"length":N}會使迭代依N次並逐次配置Uint8Array
 //  1. 須為真陣列(Array.isArray), 帶length鍵之物件或字串等不得依其length迭代
@@ -63,7 +73,7 @@ function sliceU8arr(u8a, inds) {
  * @param {Uint8Array} u8a 輸入Uint8Array
  * @param {Object} [opt={}] 輸入設定物件，預設{}
  * @param {Boolean} [opt.returnWithStateAndMsg=false] 輸入是否回傳含狀態與訊息物件布林值，若為true則回傳{ state, msg }物件，state為'success'或'error'，msg於success時為回傳結果、於error時為錯誤訊息字串，預設false
- * @returns {Object|Array} 回傳物件或陣列資料，其內二進位數據依標記所記之原型別還原，Uint8Array、Uint16Array、ArrayBuffer皆原型別原數值返回；輸入非Uint8Array或封包損毀時回傳空物件，封包標頭內分塊資訊非真陣列、含非負有限整數以外之項、、總量逾封包長度、或分塊數量逾主區塊可容納之二進位標記數(每個分塊在主區塊內至少有一個25位元組之標記)亦視為損毀(msg為'invalid pks, <原因>')；同一二進位索引被引用多次亦視為損毀；若opt.returnWithStateAndMsg為true則回傳{ state, msg }物件
+ * @returns {Object|Array} 回傳物件或陣列資料，其內二進位數據依標記所記之原型別還原，Uint8Array、Uint16Array、ArrayBuffer皆原型別原數值返回；輸入非Uint8Array或封包損毀時回傳空物件，封包標頭記載之分塊資訊區長度非非負整數或逾封包資料區長度(含封包短於8位元組)、分塊資訊非真陣列、含非負有限整數以外之項、總量逾封包長度、或分塊數量逾主區塊可容納之二進位標記數(每個分塊在主區塊內至少有一個25位元組之標記)亦視為損毀(msg為'invalid pks, <原因>')；同一二進位索引被引用多次亦視為損毀；若opt.returnWithStateAndMsg為true則回傳{ state, msg }物件
  * @example
  *
  * let u8a = new Uint8Array([
@@ -82,7 +92,7 @@ function sliceU8arr(u8a, inds) {
  * console.log(u8arr2obj(new Uint8Array([1, 2, 3]), { returnWithStateAndMsg: true }))
  * // => {
  * //     state: 'error',
- * //     msg: 'SyntaxError: Unexpected end of JSON input'
+ * //     msg: 'invalid pks, head length must be a non-negative integer not exceeding the packet'
  * // }
  *
  */
@@ -122,6 +132,10 @@ function u8arr2obj(u8a, opt = {}) {
 
         //lenHead
         let lenHead = bufReadDbl(bHead) //讀取分塊資訊區長度
+        let errHead = checkLenHead(lenHead, getBufferSize(bOthers)) //來自封包(不可信), 須先驗證才可用於切分
+        if (errHead !== '') {
+            return retError(`invalid pks, ${errHead}`)
+        }
         let bvPks = bOthers.slice(0, lenHead) //分塊資訊區之二進位數據(Uint8Array)
         let bbPks = bOthers.slice(lenHead, getBufferSize(bOthers)) //各分塊區之二進位數據(Uint8Array)