w-converhp 2.0.45 → 2.0.47

package/docs/WConverhpClient.html

@@ -529,7 +529,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 24 2025 10:55:27 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 16 2025 14:05:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -206,25 +206,22 @@ function WConverhpClient(opt) {
         //urlUse
         let urlUse = ''
         if (type === 'basic') {
-            urlUse = url
-        }
-        else if (type === 'slice') {
-            urlUse = `${url}slc`
+            urlUse = `${url}/main` //bbb
         }
         else if (type === 'upload-controller') {
-            urlUse = `${url}ulctr`
+            urlUse = `${url}/ulctr` //bbb
+        }
+        else if (type === 'slice') {
+            urlUse = `${url}/slc` //bbb
         }
-        // else if (type === 'slice-merge') {
-        //     urlUse = `${url}slcm`
-        // }
         else if (type === 'download-get-filename') {
-            urlUse = `${url}dwgfn`
+            urlUse = `${url}/dwgfn` //bbb
         }
         else if (type === 'download-get') {
-            urlUse = `${url}dwgf`
+            urlUse = `${url}/dwgf` //bbb
         }
         else if (type === 'download') {
-            urlUse = `${url}dw`
+            urlUse = `${url}/dw` //bbb
         }
         else {
             throw new Error(`invalid type[${type}]`)
@@ -485,9 +482,11 @@ function WConverhpClient(opt) {
                 //nodejs通過fs與stream接收檔案, stream出錯只會觸發error事件, 此處try catch為攔截其他非stream程式碼錯誤
                 try {
 
-                    //path, fs, 使用動態import供nodejs使用, 否則會被webpack偵測報錯
-                    let path = await import('path')
-                    let fs = await import('fs')
+                    //path, fs, 使用動態import供nodejs使用, 須用變數字串給予載入套件, 否則用於前端時會被webpack偵測而報錯
+                    let cImPath = 'path'
+                    let cImFs = 'fs'
+                    let path = await import(cImPath)
+                    let fs = await import(cImFs)
 
                     //fdDownload, 只有nodejs下載才使用fdDownload
                     let fdDownload = get(opt, 'fdDownload', '')
@@ -729,17 +728,13 @@ function WConverhpClient(opt) {
         let progWeightSlice = 0.99 //上傳階段進度使用99%
         // let progWeightMerge = 0.01 //合併階段進度使用1%
 
-        //cbProgressSlice
-        let cbProgressSlice = (msg) => {
-            let perc = msg.prog
-            let dir = msg.m
-            if (dir === 'upload' && perc === 100) {
-                progCount++
-                let r = progCount / chunkTotal
-                let prog = r * progWeightSlice * 100
-                let psiz = r * fileTotalSize
-                cbProgress({ prog, p: psiz, m: 'upload' })
-            }
+        //cbProgressSlice, 以累積機制計算進度, 累積片數配合總切片數量即可算出進度, 故不須輸入msg
+        let cbProgressSlice = () => {
+            progCount++
+            let r = progCount / chunkTotal
+            let prog = r * progWeightSlice * 100
+            let psiz = r * fileTotalSize
+            cbProgress({ prog, p: psiz, m: 'upload' })
         }
 
         //cbProgressMerge
@@ -855,7 +850,7 @@ function WConverhpClient(opt) {
             //check
             if (resUpCkt.slks.indexOf(i) >= 0) {
                 // console.log('已有上傳切片檔')
-                cbProgressSlice({ prog: 100, m: 'upload' }) //直接觸發更新進度
+                cbProgressSlice() //直接觸發更新進度
                 continue
             }
 
@@ -868,14 +863,65 @@ function WConverhpClient(opt) {
             //chunk
             let chunk = bb.slice(start, end)
 
-            //send slice
-            let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
-                'chunk-index': i,
-                'chunk-total': chunkTotal,
-                'package-id': packageId,
+            //sendDataSlice
+            let sendDataSlice = async() => {
+
+                //hd
+                let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
+                    'chunk-index': i,
+                    'chunk-total': chunkTotal,
+                    'package-id': packageId,
+                }
+
+                //send slice
+                let resSl = await send('slice', chunk, {
+                    headers: hd,
+                    dataType: 'blob',
+                    cbProgress: (msg) => {
+                        // console.log('cbProgress', msg)
+                        // let perc = msg.prog
+                        // let dir = msg.m
+                        // if (dir === 'upload' && perc === 100) {
+                        // }
+                    }
+                })
+                // console.log('resSl', resSl)
+
+                //cbProgressSlice, 因其內有累加progCount, 實際代表是須成功傳輸後才能計算與回應外部進度, 故不能直接用於send的opt.cbProgress
+                cbProgressSlice()
+
+                return resSl
+            }
+
+            //sendDataSliceRetry
+            let sendDataSliceRetry = async() => {
+
+                //fun
+                let fun = pmConvertResolve(sendDataSlice)
+
+                //sendPkg
+                let r = await fun()
+
+                let n = 0
+                while (r.state === 'error') {
+                    n += 1
+                    if (n > retry) {
+                        break
+                    }
+                    console.log(`retry n=${n}`)
+                    r = await fun()
+                }
+
+                if (r.state === 'success') {
+                    return r.msg
+                }
+                else {
+                    return Promise.reject(r.msg)
+                }
             }
-            await send('slice', chunk, { headers: hd, dataType: 'blob', cbProgress: cbProgressSlice })
-            // console.log('resSl', resSl)
+
+            //sendDataSliceRetry
+            await sendDataSliceRetry()
 
         }
 
@@ -1107,7 +1153,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 24 2025 10:55:27 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 16 2025 14:05:37 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 Thu Apr 24 2025 10:55:27 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 16 2025 14:05:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -495,7 +495,7 @@ function WConverhpServer(opt = {}) {
 
     //apiMain
     let apiMain = {
-        path: `/${apiName}`,
+        path: `/${apiName}/main`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -651,7 +651,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadCheck
     let apiUploadCheck = {
-        path: `/${apiName}ulctr`,
+        path: `/${apiName}/ulctr`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -869,7 +869,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadSlice
     let apiUploadSlice = {
-        path: `/${apiName}slc`,
+        path: `/${apiName}/slc`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -1006,13 +1006,24 @@ function WConverhpServer(opt = {}) {
             let u8aOut = obj2u8arr(out)
             // console.log('u8aOut', u8aOut)
 
+            // //測試失敗重傳
+            // if (Math.random() < 0.9) {
+            //     out = {
+            //         error: 'force error'
+            //     }
+            //     returnType = 'error'
+            //     returnMsg = 'force error'
+            //     // console.log('out', out)
+            //     u8aOut = obj2u8arr(out)
+            // }
+
             return responseU8aStream(res, u8aOut, { returnType, returnMsg })
         },
     }
 
     //apiDownloadGetFilename
     let apiDownloadGetFilename = {
-        path: `/${apiName}dwgfn`,
+        path: `/${apiName}/dwgfn`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -1134,7 +1145,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownloadGetFile
     let apiDownloadGetFile = {
-        path: `/${apiName}dwgf`,
+        path: `/${apiName}/dwgf`, //bbb
         method: 'GET',
         options: {
             timeout: {
@@ -1258,7 +1269,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownload
     let apiDownload = {
-        path: `/${apiName}dw`,
+        path: `/${apiName}/dw`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -1474,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 Thu Apr 24 2025 10:55:27 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 16 2025 14:05:37 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 Thu Apr 24 2025 10:55:27 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 16 2025 14:05:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "w-converhp",
-  "version": "2.0.45",
+  "version": "2.0.47",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",
     "@hapi/inert": "^7.1.0",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.89"
+    "wsemi": "^1.7.90"
   },
   "devDependencies": {
     "form-data": "^4.0.2",
-    "w-package-tools": "^1.0.87"
+    "w-package-tools": "^1.0.90"
   },
   "scripts": {
     "@hapi/hapi": "^20.2.1",

package/src/WConverhpClient.mjs

@@ -159,25 +159,22 @@ function WConverhpClient(opt) {
         //urlUse
         let urlUse = ''
         if (type === 'basic') {
-            urlUse = url
-        }
-        else if (type === 'slice') {
-            urlUse = `${url}slc`
+            urlUse = `${url}/main` //bbb
         }
         else if (type === 'upload-controller') {
-            urlUse = `${url}ulctr`
+            urlUse = `${url}/ulctr` //bbb
+        }
+        else if (type === 'slice') {
+            urlUse = `${url}/slc` //bbb
         }
-        // else if (type === 'slice-merge') {
-        //     urlUse = `${url}slcm`
-        // }
         else if (type === 'download-get-filename') {
-            urlUse = `${url}dwgfn`
+            urlUse = `${url}/dwgfn` //bbb
         }
         else if (type === 'download-get') {
-            urlUse = `${url}dwgf`
+            urlUse = `${url}/dwgf` //bbb
         }
         else if (type === 'download') {
-            urlUse = `${url}dw`
+            urlUse = `${url}/dw` //bbb
         }
         else {
             throw new Error(`invalid type[${type}]`)
@@ -438,9 +435,11 @@ function WConverhpClient(opt) {
                 //nodejs通過fs與stream接收檔案, stream出錯只會觸發error事件, 此處try catch為攔截其他非stream程式碼錯誤
                 try {
 
-                    //path, fs, 使用動態import供nodejs使用, 否則會被webpack偵測報錯
-                    let path = await import('path')
-                    let fs = await import('fs')
+                    //path, fs, 使用動態import供nodejs使用, 須用變數字串給予載入套件, 否則用於前端時會被webpack偵測而報錯
+                    let cImPath = 'path'
+                    let cImFs = 'fs'
+                    let path = await import(cImPath)
+                    let fs = await import(cImFs)
 
                     //fdDownload, 只有nodejs下載才使用fdDownload
                     let fdDownload = get(opt, 'fdDownload', '')
@@ -682,17 +681,13 @@ function WConverhpClient(opt) {
         let progWeightSlice = 0.99 //上傳階段進度使用99%
         // let progWeightMerge = 0.01 //合併階段進度使用1%
 
-        //cbProgressSlice
-        let cbProgressSlice = (msg) => {
-            let perc = msg.prog
-            let dir = msg.m
-            if (dir === 'upload' && perc === 100) {
-                progCount++
-                let r = progCount / chunkTotal
-                let prog = r * progWeightSlice * 100
-                let psiz = r * fileTotalSize
-                cbProgress({ prog, p: psiz, m: 'upload' })
-            }
+        //cbProgressSlice, 以累積機制計算進度, 累積片數配合總切片數量即可算出進度, 故不須輸入msg
+        let cbProgressSlice = () => {
+            progCount++
+            let r = progCount / chunkTotal
+            let prog = r * progWeightSlice * 100
+            let psiz = r * fileTotalSize
+            cbProgress({ prog, p: psiz, m: 'upload' })
         }
 
         //cbProgressMerge
@@ -808,7 +803,7 @@ function WConverhpClient(opt) {
             //check
             if (resUpCkt.slks.indexOf(i) >= 0) {
                 // console.log('已有上傳切片檔')
-                cbProgressSlice({ prog: 100, m: 'upload' }) //直接觸發更新進度
+                cbProgressSlice() //直接觸發更新進度
                 continue
             }
 
@@ -821,14 +816,65 @@ function WConverhpClient(opt) {
             //chunk
             let chunk = bb.slice(start, end)
 
-            //send slice
-            let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
-                'chunk-index': i,
-                'chunk-total': chunkTotal,
-                'package-id': packageId,
+            //sendDataSlice
+            let sendDataSlice = async() => {
+
+                //hd
+                let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
+                    'chunk-index': i,
+                    'chunk-total': chunkTotal,
+                    'package-id': packageId,
+                }
+
+                //send slice
+                let resSl = await send('slice', chunk, {
+                    headers: hd,
+                    dataType: 'blob',
+                    cbProgress: (msg) => {
+                        // console.log('cbProgress', msg)
+                        // let perc = msg.prog
+                        // let dir = msg.m
+                        // if (dir === 'upload' && perc === 100) {
+                        // }
+                    }
+                })
+                // console.log('resSl', resSl)
+
+                //cbProgressSlice, 因其內有累加progCount, 實際代表是須成功傳輸後才能計算與回應外部進度, 故不能直接用於send的opt.cbProgress
+                cbProgressSlice()
+
+                return resSl
+            }
+
+            //sendDataSliceRetry
+            let sendDataSliceRetry = async() => {
+
+                //fun
+                let fun = pmConvertResolve(sendDataSlice)
+
+                //sendPkg
+                let r = await fun()
+
+                let n = 0
+                while (r.state === 'error') {
+                    n += 1
+                    if (n > retry) {
+                        break
+                    }
+                    console.log(`retry n=${n}`)
+                    r = await fun()
+                }
+
+                if (r.state === 'success') {
+                    return r.msg
+                }
+                else {
+                    return Promise.reject(r.msg)
+                }
             }
-            await send('slice', chunk, { headers: hd, dataType: 'blob', cbProgress: cbProgressSlice })
-            // console.log('resSl', resSl)
+
+            //sendDataSliceRetry
+            await sendDataSliceRetry()
 
         }
 

package/src/WConverhpServer.mjs

@@ -448,7 +448,7 @@ function WConverhpServer(opt = {}) {
 
     //apiMain
     let apiMain = {
-        path: `/${apiName}`,
+        path: `/${apiName}/main`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -604,7 +604,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadCheck
     let apiUploadCheck = {
-        path: `/${apiName}ulctr`,
+        path: `/${apiName}/ulctr`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -822,7 +822,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadSlice
     let apiUploadSlice = {
-        path: `/${apiName}slc`,
+        path: `/${apiName}/slc`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -959,13 +959,24 @@ function WConverhpServer(opt = {}) {
             let u8aOut = obj2u8arr(out)
             // console.log('u8aOut', u8aOut)
 
+            // //測試失敗重傳
+            // if (Math.random() < 0.9) {
+            //     out = {
+            //         error: 'force error'
+            //     }
+            //     returnType = 'error'
+            //     returnMsg = 'force error'
+            //     // console.log('out', out)
+            //     u8aOut = obj2u8arr(out)
+            // }
+
             return responseU8aStream(res, u8aOut, { returnType, returnMsg })
         },
     }
 
     //apiDownloadGetFilename
     let apiDownloadGetFilename = {
-        path: `/${apiName}dwgfn`,
+        path: `/${apiName}/dwgfn`, //bbb
         method: 'POST',
         options: {
             payload: {
@@ -1087,7 +1098,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownloadGetFile
     let apiDownloadGetFile = {
-        path: `/${apiName}dwgf`,
+        path: `/${apiName}/dwgf`, //bbb
         method: 'GET',
         options: {
             timeout: {
@@ -1211,7 +1222,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownload
     let apiDownload = {
-        path: `/${apiName}dw`,
+        path: `/${apiName}/dw`, //bbb
         method: 'POST',
         options: {
             payload: {