w-converhp 2.0.48 → 2.0.50

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#line95">line 95</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line96">line 96</a>
     </li></ul></dd>
     
 
@@ -402,6 +402,46 @@
 
     
 
+        <tr>
+            
+                <td class="name"><code>timeout</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">Integer</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>5*60*1000</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入最長等待時間整數，單位ms，預設為5<em>60</em>1000、為5分鐘</p></td>
+        </tr>
+
+    
+
         <tr>
             
                 <td class="name"><code>retry</code></td>
@@ -432,12 +472,12 @@
             
                 <td class="default">
                 
-                    <code>3</code>
+                    <code>10</code>
                 
                 </td>
             
 
-            <td class="description last"><p>輸入傳輸失敗重試次數整數，預設為3</p></td>
+            <td class="description last"><p>輸入傳輸失敗重試次數整數，預設為10</p></td>
         </tr>
 
     
@@ -529,7 +569,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat May 17 2025 20:54:14 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 Sun May 18 2025 13:09:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -80,7 +80,8 @@ import getFileXxHash from 'wsemi/src/getFileXxHash.mjs'
  * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
  * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
- * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
+ * @param {Integer} [opt.timeout=5*60*1000] 輸入最長等待時間整數，單位ms，預設為5*60*1000、為5分鐘
+ * @param {Integer} [opt.retry=10] 輸入傳輸失敗重試次數整數，預設為10
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
  * @example
  *
@@ -182,6 +183,12 @@ function WConverhpClient(opt) {
         sizeSlice = 1024 * 1024 //1m
     }
 
+    //timeout
+    let timeout = get(opt, 'timeout')
+    if (!isp0int(timeout)) {
+        timeout = 5 * 60 * 1000 //5min
+    }
+
     //retry
     let retry = get(opt, 'retry')
     if (!isp0int(retry)) {
@@ -487,7 +494,7 @@ function WConverhpClient(opt) {
                 ...ct,
                 ...headers,
             },
-            timeout: 60 * 60 * 1000, //1hr
+            timeout,
             maxContentLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
             maxBodyLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
             responseType: rt,
@@ -800,7 +807,7 @@ function WConverhpClient(opt) {
         }
 
         //針對伺服器上已有切片檔案計算hash與比對
-        if (resUpCkt.slks.length > 0) {
+        if (resUpCkt.bSls > 0) {
             // console.log('receive slks...', resUpCkt.slks[0], size(resUpCkt.slks))
 
             //fileSliceHashs
@@ -1134,7 +1141,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat May 17 2025 20:54:14 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 Sun May 18 2025 13:09:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -344,7 +344,7 @@
 
         <tr>
             
-                <td class="name"><code>apiName</code></td>
+                <td class="name"><code>pathUploadTemp</code></td>
             
 
             <td class="type">
@@ -372,19 +372,19 @@
             
                 <td class="default">
                 
-                    <code>'api'</code>
+                    <code>'./uploadTemp'</code>
                 
                 </td>
             
 
-            <td class="description last"><p>輸入API名稱字串，預設'api'</p></td>
+            <td class="description last"><p>輸入暫時存放切片上傳檔案資料夾字串，預設'./uploadTemp'</p></td>
         </tr>
 
     
 
         <tr>
             
-                <td class="name"><code>pathUploadTemp</code></td>
+                <td class="name"><code>apiName</code></td>
             
 
             <td class="type">
@@ -412,12 +412,12 @@
             
                 <td class="default">
                 
-                    <code>'./uploadTemp'</code>
+                    <code>'api'</code>
                 
                 </td>
             
 
-            <td class="description last"><p>輸入暫時存放切片上傳檔案資料夾字串，預設'./uploadTemp'</p></td>
+            <td class="description last"><p>輸入API名稱字串，預設'api'</p></td>
         </tr>
 
     
@@ -749,7 +749,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat May 17 2025 20:54:14 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 Sun May 18 2025 13:09:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -90,8 +90,8 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
  * @param {Integer} [opt.port=8080] 輸入Hapi伺服器所在port正整數，預設8080
  * @param {Boolean} [opt.useInert=true] 輸入是否提供瀏覽pathStaticFiles資料夾內檔案之布林值，預設true
  * @param {String} [opt.pathStaticFiles='dist'] 輸入當useInert=true時提供瀏覽資料夾字串，預設'dist'
- * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {String} [opt.pathUploadTemp='./uploadTemp'] 輸入暫時存放切片上傳檔案資料夾字串，預設'./uploadTemp'
+ * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Function} [opt.verifyConn=()=>{return true}] 輸入呼叫API時檢測函數，預設()=>{return true}
@@ -256,12 +256,6 @@ function WConverhpServer(opt = {}) {
         pathStaticFiles = 'dist'
     }
 
-    //apiName
-    let apiName = get(opt, 'apiName')
-    if (!isestr(apiName)) {
-        apiName = 'api'
-    }
-
     //pathUploadTemp
     let pathUploadTemp = get(opt, 'pathUploadTemp')
     if (!isestr(pathUploadTemp)) {
@@ -271,6 +265,12 @@ function WConverhpServer(opt = {}) {
         fsCreateFolder(pathUploadTemp)
     }
 
+    //apiName
+    let apiName = get(opt, 'apiName')
+    if (!isestr(apiName)) {
+        apiName = 'api'
+    }
+
     //tokenType
     let tokenType = get(opt, 'tokenType')
     if (!isestr(tokenType)) {
@@ -604,9 +604,9 @@ function WConverhpServer(opt = {}) {
 
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`req.payload error`, err)
-                    eeEmit('error', `receive payload err`)
-                    pm.reject(err.message)
+                    console.log(`apiMain req.payload err`, err) //使用err.message會過於簡化, 另外要開啟顯示err供debug
+                    eeEmit('error', `receive payload error: ${err.message}`)
+                    pm.reject(`receive payload error: ${err.message}`)
                 })
 
                 return pm
@@ -969,16 +969,16 @@ function WConverhpServer(opt = {}) {
 
                     //setTimeout, 切片上傳添加延遲處理, 避免佔滿伺服器CPU與流量
                     setTimeout(() => {
-                        pm.resolve(`chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] done`)
+                        pm.resolve(`chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] done`)
                     }, delayForSlice)
 
                 })
 
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err)
-                    eeEmit('error', `receive chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
-                    pm.reject(`apiUploadSlice receive error: ${err.message}`)
+                    console.log(`apiUploadSlice req.payload chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err) //使用err.message會過於簡化, 另外要開啟顯示err供debug
+                    eeEmit('error', `receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] error: ${err.message}`)
+                    pm.reject(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] error: ${err.message}`)
                 })
 
                 return pm
@@ -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 Sat May 17 2025 20:54:14 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 Sun May 18 2025 13:09:34 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 Sat May 17 2025 20:54:14 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 Sun May 18 2025 13:09:34 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-converhp",
-  "version": "2.0.48",
+  "version": "2.0.50",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "form-data": "^4.0.2",
-    "w-package-tools": "^1.0.90"
+    "w-package-tools": "^1.1.0"
   },
   "scripts": {
     "@hapi/hapi": "^20.2.1",

package/src/WConverhpClient.mjs

@@ -33,7 +33,8 @@ import getFileXxHash from 'wsemi/src/getFileXxHash.mjs'
  * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
  * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
- * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
+ * @param {Integer} [opt.timeout=5*60*1000] 輸入最長等待時間整數，單位ms，預設為5*60*1000、為5分鐘
+ * @param {Integer} [opt.retry=10] 輸入傳輸失敗重試次數整數，預設為10
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
  * @example
  *
@@ -135,6 +136,12 @@ function WConverhpClient(opt) {
         sizeSlice = 1024 * 1024 //1m
     }
 
+    //timeout
+    let timeout = get(opt, 'timeout')
+    if (!isp0int(timeout)) {
+        timeout = 5 * 60 * 1000 //5min
+    }
+
     //retry
     let retry = get(opt, 'retry')
     if (!isp0int(retry)) {
@@ -440,7 +447,7 @@ function WConverhpClient(opt) {
                 ...ct,
                 ...headers,
             },
-            timeout: 60 * 60 * 1000, //1hr
+            timeout,
             maxContentLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
             maxBodyLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
             responseType: rt,
@@ -753,7 +760,7 @@ function WConverhpClient(opt) {
         }
 
         //針對伺服器上已有切片檔案計算hash與比對
-        if (resUpCkt.slks.length > 0) {
+        if (resUpCkt.bSls > 0) {
             // console.log('receive slks...', resUpCkt.slks[0], size(resUpCkt.slks))
 
             //fileSliceHashs

package/src/WConverhpServer.mjs

@@ -43,8 +43,8 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
  * @param {Integer} [opt.port=8080] 輸入Hapi伺服器所在port正整數，預設8080
  * @param {Boolean} [opt.useInert=true] 輸入是否提供瀏覽pathStaticFiles資料夾內檔案之布林值，預設true
  * @param {String} [opt.pathStaticFiles='dist'] 輸入當useInert=true時提供瀏覽資料夾字串，預設'dist'
- * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {String} [opt.pathUploadTemp='./uploadTemp'] 輸入暫時存放切片上傳檔案資料夾字串，預設'./uploadTemp'
+ * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Function} [opt.verifyConn=()=>{return true}] 輸入呼叫API時檢測函數，預設()=>{return true}
@@ -209,12 +209,6 @@ function WConverhpServer(opt = {}) {
         pathStaticFiles = 'dist'
     }
 
-    //apiName
-    let apiName = get(opt, 'apiName')
-    if (!isestr(apiName)) {
-        apiName = 'api'
-    }
-
     //pathUploadTemp
     let pathUploadTemp = get(opt, 'pathUploadTemp')
     if (!isestr(pathUploadTemp)) {
@@ -224,6 +218,12 @@ function WConverhpServer(opt = {}) {
         fsCreateFolder(pathUploadTemp)
     }
 
+    //apiName
+    let apiName = get(opt, 'apiName')
+    if (!isestr(apiName)) {
+        apiName = 'api'
+    }
+
     //tokenType
     let tokenType = get(opt, 'tokenType')
     if (!isestr(tokenType)) {
@@ -557,9 +557,9 @@ function WConverhpServer(opt = {}) {
 
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`req.payload error`, err)
-                    eeEmit('error', `receive payload err`)
-                    pm.reject(err.message)
+                    console.log(`apiMain req.payload err`, err) //使用err.message會過於簡化, 另外要開啟顯示err供debug
+                    eeEmit('error', `receive payload error: ${err.message}`)
+                    pm.reject(`receive payload error: ${err.message}`)
                 })
 
                 return pm
@@ -922,16 +922,16 @@ function WConverhpServer(opt = {}) {
 
                     //setTimeout, 切片上傳添加延遲處理, 避免佔滿伺服器CPU與流量
                     setTimeout(() => {
-                        pm.resolve(`chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] done`)
+                        pm.resolve(`chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] done`)
                     }, delayForSlice)
 
                 })
 
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err)
-                    eeEmit('error', `receive chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
-                    pm.reject(`apiUploadSlice receive error: ${err.message}`)
+                    console.log(`apiUploadSlice req.payload chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err) //使用err.message會過於簡化, 另外要開啟顯示err供debug
+                    eeEmit('error', `receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] error: ${err.message}`)
+                    pm.reject(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] error: ${err.message}`)
                 })
 
                 return pm