w-converhp 2.0.52 → 2.0.54

package/docs/WConverhpClient.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line97">line 97</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line100">line 100</a>
     </li></ul></dd>
     
 
@@ -444,7 +444,47 @@
 
         <tr>
             
-                <td class="name"><code>retry</code></td>
+                <td class="name"><code>retryMain</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">Integer</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>3</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入主要控制器傳輸失敗重試次數整數，預設為3</p></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>retryUpload</code></td>
             
 
             <td class="type">
@@ -477,7 +517,47 @@
                 </td>
             
 
-            <td class="description last"><p>輸入傳輸失敗重試次數整數，預設為10</p></td>
+            <td class="description last"><p>輸入切片上傳檔案傳輸失敗重試次數整數，預設為10</p></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>retryDownload</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">Integer</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>2</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入下載檔案傳輸失敗重試次數整數，預設為2</p></td>
         </tr>
 
     
@@ -569,7 +649,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 18 2025 13:25:20 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri May 30 2025 11:51:17 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -58,6 +58,7 @@ import isp0int from 'wsemi/src/isp0int.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import isobj from 'wsemi/src/isobj.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
+import isbol from 'wsemi/src/isbol.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import dig from 'wsemi/src/dig.mjs'
@@ -82,7 +83,9 @@ import getFileXxHash from 'wsemi/src/getFileXxHash.mjs'
  * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Integer} [opt.timeout=5*60*1000] 輸入最長等待時間整數，單位ms，預設為5*60*1000、為5分鐘
- * @param {Integer} [opt.retry=10] 輸入傳輸失敗重試次數整數，預設為10
+ * @param {Integer} [opt.retryMain=3] 輸入主要控制器傳輸失敗重試次數整數，預設為3
+ * @param {Integer} [opt.retryUpload=10] 輸入切片上傳檔案傳輸失敗重試次數整數，預設為10
+ * @param {Integer} [opt.retryDownload=2] 輸入下載檔案傳輸失敗重試次數整數，預設為2
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
  * @example
  *
@@ -190,10 +193,22 @@ function WConverhpClient(opt) {
         timeout = 5 * 60 * 1000 //5min
     }
 
-    //retry
-    let retry = get(opt, 'retry')
-    if (!isp0int(retry)) {
-        retry = 10
+    //retryMain
+    let retryMain = get(opt, 'retryMain')
+    if (!isp0int(retryMain)) {
+        retryMain = 3
+    }
+
+    //retryUpload
+    let retryUpload = get(opt, 'retryUpload')
+    if (!isp0int(retryUpload)) {
+        retryUpload = 10
+    }
+
+    //retryDownload
+    let retryDownload = get(opt, 'retryDownload')
+    if (!isp0int(retryDownload)) {
+        retryDownload = 2
     }
 
     //env
@@ -289,6 +304,12 @@ function WConverhpClient(opt) {
             cbProgress = () => {}
         }
 
+        //retry
+        let retry = get(opt, 'retry')
+        if (!isp0int(retry)) {
+            retry = 1
+        }
+
         //urlUse
         let urlUse = getUrlUse(type)
 
@@ -359,12 +380,22 @@ function WConverhpClient(opt) {
         // console.log('dd', dd)
 
         //rt
-        let rt = 'blob'
+        let rt = null
         if (env === 'nodejs') {
-            rt = 'arraybuffer' //nodejs下沒有blob, 只能設定'json', 'arraybuffer', 'document', 'json', 'text', 'stream'
             if (type === 'download') {
                 rt = 'stream' //nodejs download模式採用stream接收
             }
+            else {
+                rt = 'arraybuffer' //nodejs下沒有blob, 只能設定'json', 'arraybuffer', 'document', 'json', 'text', 'stream'
+            }
+        }
+        else {
+            if (type === 'download') {
+                rt = 'blob' //瀏覽器使用blob下載
+            }
+            else {
+                rt = 'blob' //瀏覽器使用blob取得資料
+            }
         }
         // console.log('rt', rt)
 
@@ -418,25 +449,15 @@ function WConverhpClient(opt) {
 
             //streamRecv
             let streamRecv = get(res, 'data')
+            // console.log(env, 'streamRecv', streamRecv)
 
             if (env === 'browser') {
 
-                //browser通過createObjectURL接收stream與a.href+a.click()接收檔案
-                try {
-                    let url = URL.createObjectURL(streamRecv)
-                    let a = document.createElement('a')
-                    a.href = url
-                    a.download = filename // 動態設置檔名
-                    document.body.appendChild(a)
-                    a.click()
-                    a.remove()
-                    URL.revokeObjectURL(url)
-                    pm.resolve(filename)
-                }
-                catch (err) {
-                    console.log(err)
-                    pm.reject(err)
-                }
+                //browser通過axios使用blob接收時會自動把串流接收並組合成blob, 此時streamRecv已是blob
+                pm.resolve({
+                    filename,
+                    bb: streamRecv,
+                })
 
             }
             else {
@@ -672,6 +693,7 @@ function WConverhpClient(opt) {
 
     //sendPkg
     let sendPkg = async(type, data, cbProgress) => {
+        //主要為中心化控制器使用, 通過execute進行上下傳數據
 
         //bb
         let bb = null
@@ -691,7 +713,7 @@ function WConverhpClient(opt) {
         }
 
         //send
-        let res = await send(type, bb, { dataType: 'blob', cbProgress })
+        let res = await send(type, bb, { dataType: 'blob', retry: retryMain, cbProgress })
 
         return res
     }
@@ -778,7 +800,7 @@ function WConverhpClient(opt) {
 
         //send check-total-hash
         // console.log(`send check-total-hash...`)
-        let resUpCkt = await send('upload-controller', { mode: 'check-total-hash', fileHash: fileTotalHash, filename: fileTotalName, fileSize: fileTotalSize }, { dataType: 'json' })
+        let resUpCkt = await send('upload-controller', { mode: 'check-total-hash', fileHash: fileTotalHash, filename: fileTotalName, fileSize: fileTotalSize }, { dataType: 'json', retry: retryUpload })
         // console.log('resUpCkt', resUpCkt)
         // resUpCkt {
         //   path: 'uploadTemp\\2429b7ef08ce6ba9',
@@ -847,7 +869,7 @@ function WConverhpClient(opt) {
 
             //send check-slices-hash
             // console.log(`send check-slices-hash...`)
-            let resUpCks = await send('upload-controller', { mode: 'check-slices-hash', fileHash: fileTotalHash, fileSliceHashs }, { dataType: 'json' })
+            let resUpCks = await send('upload-controller', { mode: 'check-slices-hash', fileHash: fileTotalHash, fileSliceHashs }, { dataType: 'json', retry: retryUpload })
             // console.log('resUpCks', resUpCks)
             // resUpCks {
             //   slks: [
@@ -905,7 +927,8 @@ function WConverhpClient(opt) {
                     // let dir = msg.m
                     // if (dir === 'upload' && perc === 100) {
                     // }
-                }
+                },
+                retry: retryUpload,
             })
             // console.log('resSl', resSl)
 
@@ -916,7 +939,7 @@ function WConverhpClient(opt) {
 
         //send merge-slices-push
         // console.log(`send merge-slices-push...`)
-        let resUpMgp = await send('upload-controller', { mode: 'merge-slices-push', fileHash: fileTotalHash, chunkTotal }, { dataType: 'json' })
+        let resUpMgp = await send('upload-controller', { mode: 'merge-slices-push', fileHash: fileTotalHash, chunkTotal }, { dataType: 'json', retry: retryUpload })
         // console.log('resUpMgp', resUpMgp)
 
         //checkMerging
@@ -931,7 +954,7 @@ function WConverhpClient(opt) {
 
                 //send merge-slices-get
                 // console.log(`send merge-slices-get...`)
-                send('upload-controller', { mode: 'merge-slices-get', fileHash: fileTotalHash, filename: fileTotalName, queueId }, { dataType: 'json' })
+                send('upload-controller', { mode: 'merge-slices-get', fileHash: fileTotalHash, filename: fileTotalName, queueId }, { dataType: 'json', retry: retryUpload })
                     .then((res) => {
                         // console.log('res', res)
                         // res => {
@@ -1065,7 +1088,7 @@ function WConverhpClient(opt) {
 
         //send download
         let msg = { fileId }
-        let resMg = await send('download', msg, { ...opt, dataType: 'json', cbProgress })
+        let resMg = await send('download', msg, { ...opt, dataType: 'json', retry: retryDownload, cbProgress })
         // console.log('resMg', resMg)
 
         return resMg
@@ -1075,37 +1098,59 @@ function WConverhpClient(opt) {
     let downloadBrowser = async(fileId, cbProgress, opt = {}) => {
         //交由瀏覽器下載與管理故無法監聽進度, 不使用cbProgress
 
-        //token
-        let token = getToken()
-        if (ispm(token)) {
-            token = await token
+        //downloadByManager
+        let downloadByManager = get(opt, 'downloadByManager')
+        if (!isbol(downloadByManager)) {
+            downloadByManager = true
         }
-        // console.log('token', token)
+        // console.log('downloadByManager', downloadByManager)
 
-        //send download-get-filename
-        let msg = { fileId }
-        let resMg = await send('download-get-filename', msg, { dataType: 'json' })
-        // console.log('resMg', resMg)
+        if (downloadByManager) {
+            //由瀏覽器的下載管理器下載, 使用get+stream
 
-        //filename
-        let filename = get(resMg, 'filename', '')
-        // console.log('filename', filename)
+            //token
+            let token = getToken()
+            if (ispm(token)) {
+                token = await token
+            }
+            // console.log('token', token)
 
-        //urlUse
-        let urlUse = getUrlUse('download-get')
-        // console.log('urlUse', urlUse)
+            //send download-get-filename
+            let msg = { fileId }
+            let resMg = await send('download-get-filename', msg, { dataType: 'json', retry: retryDownload })
+            // console.log('resMg', resMg)
+
+            //filename
+            let filename = get(resMg, 'filename', '')
+            // console.log('filename', filename)
+
+            //urlUse
+            let urlUse = getUrlUse('download-get')
+            // console.log('urlUse', urlUse)
+
+            //url
+            let url = `${urlUse}?fileId=${fileId}&token=${token}`
+            // console.log('url', url)
+
+            //透過a元素打url下載, 讓瀏覽器認定為直接下載模式, 由瀏覽器展示下載進度與排入正在下載清單
+            let a = document.createElement('a')
+            a.href = url
+            a.download = filename
+            a.click()
 
-        //url
-        let url = `${urlUse}?fileId=${fileId}&token=${token}`
-        // console.log('url', url)
+            return filename
+        }
+        else {
+            //通過axios下載得到blob, 回傳檔案名稱與blob供後續處理
+
+            //send download
+            let msg = { fileId }
+            let resMg = await send('download', msg, { ...opt, dataType: 'json', retry: retryDownload, cbProgress })
+            // console.log('resMg', resMg)
 
-        //透過a元素打url下載, 讓瀏覽器認定為直接下載模式, 由瀏覽器展示下載進度與排入正在下載清單
-        let a = document.createElement('a')
-        a.href = url
-        a.download = filename
-        a.click()
+            return resMg
+        }
 
-        return filename
     }
 
     //download
@@ -1142,7 +1187,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 18 2025 13:25:20 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri May 30 2025 11:51:17 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -749,7 +749,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 18 2025 13:25:20 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri May 30 2025 11:51:17 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -1485,7 +1485,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 18 2025 13:25:20 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri May 30 2025 11:51:17 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun May 18 2025 13:25:20 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Fri May 30 2025 11:51:17 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "w-converhp",
-  "version": "2.0.52",
+  "version": "2.0.54",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",
     "@hapi/inert": "^7.1.0",
     "axios": "^1.9.0",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.90"
+    "wsemi": "^1.7.92"
   },
   "devDependencies": {
     "form-data": "^4.0.2",