w-converhp 2.0.51 → 2.0.53

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#line96">line 96</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line99">line 99</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:23:47 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 Thu May 29 2025 22:33:21 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -47,6 +47,7 @@
         <article>
             <pre class="prettyprint source linenums"><code>import axios from 'axios'
 import get from 'lodash-es/get.js'
+import size from 'lodash-es/size.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
 import evem from 'wsemi/src/evem.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
@@ -81,7 +82,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
  *
@@ -189,10 +192,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
@@ -288,6 +303,12 @@ function WConverhpClient(opt) {
             cbProgress = () => {}
         }
 
+        //retry
+        let retry = get(opt, 'retry')
+        if (!isp0int(retry)) {
+            retry = 1
+        }
+
         //urlUse
         let urlUse = getUrlUse(type)
 
@@ -671,6 +692,7 @@ function WConverhpClient(opt) {
 
     //sendPkg
     let sendPkg = async(type, data, cbProgress) => {
+        //主要為中心化控制器使用, 通過execute進行上下傳數據
 
         //bb
         let bb = null
@@ -690,7 +712,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 }) //bbb
 
         return res
     }
@@ -777,7 +799,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 }) //bbb
         // console.log('resUpCkt', resUpCkt)
         // resUpCkt {
         //   path: 'uploadTemp\\2429b7ef08ce6ba9',
@@ -807,14 +829,14 @@ function WConverhpClient(opt) {
         }
 
         //針對伺服器上已有切片檔案計算hash與比對
-        if (resUpCkt.bSls > 0) {
+        if (resUpCkt.bSls) {
             // console.log('receive slks...', resUpCkt.slks[0], size(resUpCkt.slks))
 
             //fileSliceHashs
             let fileSliceHashs = []
             // let n = Math.max(resUpCkt.slks.length, 1)
             // let nr = Math.floor(n / 100)
-            for (let k = 0; k &lt; resUpCkt.slks.length; k++) {
+            for (let k = 0; k &lt; size(resUpCkt.slks); k++) {
                 // if (k % nr === 0) {
                 //     console.log(`calc hash for slices`, round(k / resUpCkt.slks.length * 100, 1), '%')
                 // }
@@ -846,7 +868,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 }) //bbb
             // console.log('resUpCks', resUpCks)
             // resUpCks {
             //   slks: [
@@ -904,7 +926,8 @@ function WConverhpClient(opt) {
                     // let dir = msg.m
                     // if (dir === 'upload' &amp;&amp; perc === 100) {
                     // }
-                }
+                },
+                retry: retryUpload, //bbb
             })
             // console.log('resSl', resSl)
 
@@ -915,7 +938,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 }) //bbb
         // console.log('resUpMgp', resUpMgp)
 
         //checkMerging
@@ -930,7 +953,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 }) //bbb
                     .then((res) => {
                         // console.log('res', res)
                         // res => {
@@ -1064,7 +1087,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 }) //bbb
         // console.log('resMg', resMg)
 
         return resMg
@@ -1083,7 +1106,7 @@ function WConverhpClient(opt) {
 
         //send download-get-filename
         let msg = { fileId }
-        let resMg = await send('download-get-filename', msg, { dataType: 'json' })
+        let resMg = await send('download-get-filename', msg, { dataType: 'json', retry: retryDownload }) //bbb
         // console.log('resMg', resMg)
 
         //filename
@@ -1141,7 +1164,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:23:47 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 Thu May 29 2025 22:33:21 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:23:47 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 Thu May 29 2025 22:33:21 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:23:47 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 Thu May 29 2025 22:33:21 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:23:47 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 Thu May 29 2025 22:33:21 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.51",
+  "version": "2.0.53",
   "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",

package/src/WConverhpClient.mjs

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import get from 'lodash-es/get.js'
+import size from 'lodash-es/size.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
 import evem from 'wsemi/src/evem.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
@@ -34,7 +35,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
  *
@@ -142,10 +145,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
@@ -241,6 +256,12 @@ function WConverhpClient(opt) {
             cbProgress = () => {}
         }
 
+        //retry
+        let retry = get(opt, 'retry')
+        if (!isp0int(retry)) {
+            retry = 1
+        }
+
         //urlUse
         let urlUse = getUrlUse(type)
 
@@ -624,6 +645,7 @@ function WConverhpClient(opt) {
 
     //sendPkg
     let sendPkg = async(type, data, cbProgress) => {
+        //主要為中心化控制器使用, 通過execute進行上下傳數據
 
         //bb
         let bb = null
@@ -643,7 +665,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 }) //bbb
 
         return res
     }
@@ -730,7 +752,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 }) //bbb
         // console.log('resUpCkt', resUpCkt)
         // resUpCkt {
         //   path: 'uploadTemp\\2429b7ef08ce6ba9',
@@ -760,14 +782,14 @@ function WConverhpClient(opt) {
         }
 
         //針對伺服器上已有切片檔案計算hash與比對
-        if (resUpCkt.bSls > 0) {
+        if (resUpCkt.bSls) {
             // console.log('receive slks...', resUpCkt.slks[0], size(resUpCkt.slks))
 
             //fileSliceHashs
             let fileSliceHashs = []
             // let n = Math.max(resUpCkt.slks.length, 1)
             // let nr = Math.floor(n / 100)
-            for (let k = 0; k < resUpCkt.slks.length; k++) {
+            for (let k = 0; k < size(resUpCkt.slks); k++) {
                 // if (k % nr === 0) {
                 //     console.log(`calc hash for slices`, round(k / resUpCkt.slks.length * 100, 1), '%')
                 // }
@@ -799,7 +821,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 }) //bbb
             // console.log('resUpCks', resUpCks)
             // resUpCks {
             //   slks: [
@@ -857,7 +879,8 @@ function WConverhpClient(opt) {
                     // let dir = msg.m
                     // if (dir === 'upload' && perc === 100) {
                     // }
-                }
+                },
+                retry: retryUpload, //bbb
             })
             // console.log('resSl', resSl)
 
@@ -868,7 +891,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 }) //bbb
         // console.log('resUpMgp', resUpMgp)
 
         //checkMerging
@@ -883,7 +906,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 }) //bbb
                     .then((res) => {
                         // console.log('res', res)
                         // res => {
@@ -1017,7 +1040,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 }) //bbb
         // console.log('resMg', resMg)
 
         return resMg
@@ -1036,7 +1059,7 @@ function WConverhpClient(opt) {
 
         //send download-get-filename
         let msg = { fileId }
-        let resMg = await send('download-get-filename', msg, { dataType: 'json' })
+        let resMg = await send('download-get-filename', msg, { dataType: 'json', retry: retryDownload }) //bbb
         // console.log('resMg', resMg)
 
         //filename

package/src/checkTotalHash.mjs

@@ -49,7 +49,8 @@ let checkTotalHash = async (fileSize, sizeSlice, fileHash, pathUploadTemp) => {
             _fileSize = stats.size
         }
         catch (err) {
-            // console.log(err)
+            //若是有檔案被佔用或鎖定、移動、被刪除等, 可能觸發EPERM: operation not permitted
+            console.log(`check total file size: fs.statSync(pathFile)`, pathFile, err)
         }
 
         //bAllSize
@@ -97,7 +98,8 @@ let checkTotalHash = async (fileSize, sizeSlice, fileHash, pathUploadTemp) => {
                 b2 = stats.size === sizeSlice
             }
             catch (err) {
-                console.log(err)
+                //若是有檔案被佔用或鎖定、移動、被刪除等, 可能觸發EPERM: operation not permitted
+                console.log(`check each file size: fs.statSync(pathFile)`, v.path, err)
             }
 
             //b