w-converhp 2.0.38 → 2.0.40

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 Tue Apr 15 2025 15:27:59 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 Wed Apr 16 2025 15:43:24 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -724,6 +724,33 @@ function WConverhpClient(opt) {
         let chunkTotal = Math.ceil(fileTotalSize / sizeSlice)
         // console.log('chunkTotal', chunkTotal)
 
+        //progCount, progWeightSlice
+        let progCount = 0
+        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' })
+            }
+        }
+
+        //cbProgressMerge
+        let cbProgressMerge = (msg) => {
+            let perc = msg.prog
+            let dir = msg.m
+            if (dir === 'download' && perc === 100) {
+                cbProgress({ prog: 100, p: fileTotalSize, m: 'upload' })
+            }
+        }
+
         //fileTotalHash
         // console.log(`calc hash for fileTotalSize[${fileTotalSize}]...`)
         let fileTotalHash = await calcHash(bb)
@@ -741,20 +768,22 @@ function WConverhpClient(opt) {
         //   bSls: true,
         //   slks: [
         //      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-        //     12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-        //     24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-        //     36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-        //     48, 49, 50, 51, 52, 53
         //   ]
         // }
 
         //check
         if (resUpCkt.bAllHash) {
             // console.log('已有上傳大檔')
+
+            //cbProgressMerge
+            cbProgressMerge({ prog: 100, m: 'download' }) //觸發上傳完畢後之下載回應, 故m須為download
+
+            //resMg, 直接回傳
             let resMg = {
                 filename: fileTotalName,
                 path: resUpCkt.path,
             }
+
             return resMg
         }
 
@@ -819,33 +848,6 @@ function WConverhpClient(opt) {
         let packageId = fileTotalHash
         // console.log('packageId', packageId)
 
-        //progCount, progWeightSlice
-        let progCount = 0
-        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' })
-            }
-        }
-
-        //cbProgressMerge
-        let cbProgressMerge = (msg) => {
-            let perc = msg.prog
-            let dir = msg.m
-            if (dir === 'download' && perc === 100) {
-                cbProgress({ prog: 100, p: fileTotalSize, m: 'upload' })
-            }
-        }
-
         //upload slice
         // console.log(`upload slice...`)
         for (let i = 0; i < chunkTotal; i++) {
@@ -906,22 +908,33 @@ function WConverhpClient(opt) {
                         // }
 
                         //check
-                        if (res.state === 'done') {
+                        if (res.state === 'success') {
+
+                            //clearInterval
+                            clearInterval(t)
 
                             //cbProgressMerge
-                            cbProgressMerge({ prog: 100, m: 'download' })
+                            cbProgressMerge({ prog: 100, m: 'download' }) //觸發上傳完畢後之下載回應, 故m須為download
 
-                            //resolve, 前端偵測state為'done'時提取msg顯示
+                            //resolve, state為'success'時提取msg回傳
+                            pm.resolve(res.msg)
+
+                        }
+                        else if (res.state === 'error') {
+                            console.log('merge-slices-get error', res)
+
+                            //clearInterval
+                            clearInterval(t)
+
+                            //reject, state為'error'時會於msg提供錯誤訊息
                             pm.resolve(res.msg)
 
                         }
 
                     })
                     .catch((err) => {
-                        console.log(err)
-                    })
-                    .finally(() => {
-                        clearInterval(t)
+                        console.log('merge-slices-get catch', err)
+                        //可能發生網路斷訊錯誤, 不clearInterval, 持續輪循測試合併大檔之狀態
                     })
 
             }, 2000)
@@ -930,11 +943,11 @@ function WConverhpClient(opt) {
         }
 
         //checkMerging
-        let resUpMgr = await checkMerging()
-        // console.log('resUpMgr', resUpMgr)
+        let resMg = await checkMerging()
+        // console.log('resMg', resMg)
 
         // console.log(`upload slice done`)
-        return resUpMgr
+        return resMg
     }
 
     //execute
@@ -1094,7 +1107,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 15 2025 15:27:59 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 Wed Apr 16 2025 15:43:24 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

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

package/docs/WConverhpServer.mjs.html

@@ -811,14 +811,15 @@ function WConverhpServer(opt = {}) {
 
                     //out
                     out = {
-                        queueId,
                         state: r.state,
+                        msg: r.msg, //state為'error'時會於msg提供錯誤訊息
+                        queueId,
                         filename,
                         path: r.path,
                     }
 
                     //check
-                    if (r.state === 'done') {
+                    if (r.state === 'success') {
 
                         //ri
                         let ri = {
@@ -831,9 +832,9 @@ function WConverhpServer(opt = {}) {
                         let ro = await procUpload(ri)
                         // console.log('procUpload done', ro)
 
-                        //out merge, ro須附加至msg, 才供前端偵測state為'done'時提取msg顯示
+                        //out merge, ro須附加至msg, 才供前端偵測state為'success'時提取msg顯示
                         out = {
-                            ...out,
+                            ...out, //state為'success'時msg為空字串, 直接被ro複寫至msg即可
                             msg: ro,
                         }
 
@@ -1477,7 +1478,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 15 2025 15:27:59 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 Wed Apr 16 2025 15:43:24 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 Tue Apr 15 2025 15:27:59 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 Wed Apr 16 2025 15:43:24 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.38",
+  "version": "2.0.40",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/scla.mjs

@@ -5,6 +5,7 @@ import w from 'wsemi'
 import FormData from 'form-data'
 import WConverhpClient from './src/WConverhpClient.mjs'
 
+
 let ms = []
 
 let opt = {

package/src/WConverhpClient.mjs

@@ -677,6 +677,33 @@ function WConverhpClient(opt) {
         let chunkTotal = Math.ceil(fileTotalSize / sizeSlice)
         // console.log('chunkTotal', chunkTotal)
 
+        //progCount, progWeightSlice
+        let progCount = 0
+        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' })
+            }
+        }
+
+        //cbProgressMerge
+        let cbProgressMerge = (msg) => {
+            let perc = msg.prog
+            let dir = msg.m
+            if (dir === 'download' && perc === 100) {
+                cbProgress({ prog: 100, p: fileTotalSize, m: 'upload' })
+            }
+        }
+
         //fileTotalHash
         // console.log(`calc hash for fileTotalSize[${fileTotalSize}]...`)
         let fileTotalHash = await calcHash(bb)
@@ -694,20 +721,22 @@ function WConverhpClient(opt) {
         //   bSls: true,
         //   slks: [
         //      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11,
-        //     12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
-        //     24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
-        //     36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-        //     48, 49, 50, 51, 52, 53
         //   ]
         // }
 
         //check
         if (resUpCkt.bAllHash) {
             // console.log('已有上傳大檔')
+
+            //cbProgressMerge
+            cbProgressMerge({ prog: 100, m: 'download' }) //觸發上傳完畢後之下載回應, 故m須為download
+
+            //resMg, 直接回傳
             let resMg = {
                 filename: fileTotalName,
                 path: resUpCkt.path,
             }
+
             return resMg
         }
 
@@ -772,33 +801,6 @@ function WConverhpClient(opt) {
         let packageId = fileTotalHash
         // console.log('packageId', packageId)
 
-        //progCount, progWeightSlice
-        let progCount = 0
-        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' })
-            }
-        }
-
-        //cbProgressMerge
-        let cbProgressMerge = (msg) => {
-            let perc = msg.prog
-            let dir = msg.m
-            if (dir === 'download' && perc === 100) {
-                cbProgress({ prog: 100, p: fileTotalSize, m: 'upload' })
-            }
-        }
-
         //upload slice
         // console.log(`upload slice...`)
         for (let i = 0; i < chunkTotal; i++) {
@@ -859,22 +861,33 @@ function WConverhpClient(opt) {
                         // }
 
                         //check
-                        if (res.state === 'done') {
+                        if (res.state === 'success') {
+
+                            //clearInterval
+                            clearInterval(t)
 
                             //cbProgressMerge
-                            cbProgressMerge({ prog: 100, m: 'download' })
+                            cbProgressMerge({ prog: 100, m: 'download' }) //觸發上傳完畢後之下載回應, 故m須為download
 
-                            //resolve, 前端偵測state為'done'時提取msg顯示
+                            //resolve, state為'success'時提取msg回傳
+                            pm.resolve(res.msg)
+
+                        }
+                        else if (res.state === 'error') {
+                            console.log('merge-slices-get error', res)
+
+                            //clearInterval
+                            clearInterval(t)
+
+                            //reject, state為'error'時會於msg提供錯誤訊息
                             pm.resolve(res.msg)
 
                         }
 
                     })
                     .catch((err) => {
-                        console.log(err)
-                    })
-                    .finally(() => {
-                        clearInterval(t)
+                        console.log('merge-slices-get catch', err)
+                        //可能發生網路斷訊錯誤, 不clearInterval, 持續輪循測試合併大檔之狀態
                     })
 
             }, 2000)
@@ -883,11 +896,11 @@ function WConverhpClient(opt) {
         }
 
         //checkMerging
-        let resUpMgr = await checkMerging()
-        // console.log('resUpMgr', resUpMgr)
+        let resMg = await checkMerging()
+        // console.log('resMg', resMg)
 
         // console.log(`upload slice done`)
-        return resUpMgr
+        return resMg
     }
 
     //execute

package/src/WConverhpServer.mjs

@@ -764,14 +764,15 @@ function WConverhpServer(opt = {}) {
 
                     //out
                     out = {
-                        queueId,
                         state: r.state,
+                        msg: r.msg, //state為'error'時會於msg提供錯誤訊息
+                        queueId,
                         filename,
                         path: r.path,
                     }
 
                     //check
-                    if (r.state === 'done') {
+                    if (r.state === 'success') {
 
                         //ri
                         let ri = {
@@ -784,9 +785,9 @@ function WConverhpServer(opt = {}) {
                         let ro = await procUpload(ri)
                         // console.log('procUpload done', ro)
 
-                        //out merge, ro須附加至msg, 才供前端偵測state為'done'時提取msg顯示
+                        //out merge, ro須附加至msg, 才供前端偵測state為'success'時提取msg顯示
                         out = {
-                            ...out,
+                            ...out, //state為'success'時msg為空字串, 直接被ro複寫至msg即可
                             msg: ro,
                         }
 

package/src/checkSlicesHash.mjs

@@ -40,8 +40,8 @@ let checkSlicesHash = async(fileSliceHashs, fileHash, pathUploadTemp) => {
                 _fileHash = res
             })
             .catch((err) => {
-                console.log(err)
                 console.log(`fsIsFile(_pathFile)`, _pathFile, fsIsFile(_pathFile))
+                console.log(err)
             })
         // console.log('_fileHash', _fileHash)