w-converhp 2.0.40 → 2.0.42

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

package/docs/WConverhpClient.mjs.html

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

package/docs/WConverhpServer.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WConverhpServer.mjs.html">WConverhpServer.mjs</a>, <a href="WConverhpServer.mjs.html#line197">line 197</a>
+        <a href="WConverhpServer.mjs.html">WConverhpServer.mjs</a>, <a href="WConverhpServer.mjs.html#line192">line 192</a>
     </li></ul></dd>
     
 
@@ -582,46 +582,6 @@
 
     
 
-        <tr>
-            
-                <td class="name"><code>delayForBasic</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">Integer</span>
-
-
-
-            
-            </td>
-
-            
-                <td class="attributes">
-                
-                    &lt;optional><br>
-                
-
-                
-
-                
-                </td>
-            
-
-            
-                <td class="default">
-                
-                    <code>0</code>
-                
-                </td>
-            
-
-            <td class="description last"><p>輸入基本API用延遲響應時間，單位ms，預設0</p></td>
-        </tr>
-
-    
-
         <tr>
             
                 <td class="name"><code>delayForSlice</code></td>
@@ -789,7 +749,7 @@
 <br class="clear">
 
 <footer>
-    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.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 24 2025 10:08:13 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -70,7 +70,7 @@ import obj2u8arr from 'wsemi/src/obj2u8arr.mjs'
 import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
-import managerMergeSlices from './managerMergeSlices.mjs'
+import mmg from './managerMergeSlices.mjs'
 // import checkTotalHash from './checkTotalHash.mjs'
 import checkTotalHash from './checkTotalHash.wk.umd.js'
 // import checkSlicesHash from './checkSlicesHash.mjs'
@@ -82,10 +82,6 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
 //回傳前端(browser)時, 針對超大檔, 可用POST並用stream回傳但還要處理進度條, 若要交由瀏覽器下載器處理, 只能用GET並用stream回傳, 且前端只能用window.location.href或a.href+a.click()下載
 
 
-//mmg
-let mmg = managerMergeSlices()
-
-
 /**
  * 建立Hapi伺服器
  *
@@ -100,7 +96,6 @@ let mmg = managerMergeSlices()
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Function} [opt.verifyConn=()=>{return true}] 輸入呼叫API時檢測函數，預設()=>{return true}
  * @param {Array} [opt.corsOrigins=['*']] 輸入允許跨域網域陣列，若給予['*']代表允許全部，預設['*']
- * @param {Integer} [opt.delayForBasic=0] 輸入基本API用延遲響應時間，單位ms，預設0
  * @param {Integer} [opt.delayForSlice=100] 輸入切片上傳檔案API用延遲響應時間，單位ms，預設100
  * @param {Boolean} [opt.serverHapi=null] 輸入外部提供Hapi伺服器物件，預設null
  * @returns {Object} 回傳事件物件，可監聽事件execute、upload、handler
@@ -302,13 +297,6 @@ function WConverhpServer(opt = {}) {
         corsOrigins = ['*']
     }
 
-    //delayForBasic
-    let delayForBasic = get(opt, 'delayForBasic', '')
-    if (!isp0int(delayForBasic)) {
-        delayForBasic = 0
-    }
-    delayForBasic = cint(delayForBasic)
-
     //delayForSlice
     let delayForSlice = get(opt, 'delayForSlice', '')
     if (!isp0int(delayForSlice)) {
@@ -573,26 +561,29 @@ function WConverhpServer(opt = {}) {
                 let chunks = []
                 let smw = new stream.Writable({
                     write(chunk, encoding, cb) {
-                        // console.log('receive payload', chunk)
+                        // console.log('smw receive payload', chunk)
 
                         //push
                         chunks.push(chunk)
                         // console.log('chunk.length', chunk.length)
 
-                        //setTimeout, 延遲觸發cb
-                        setTimeout(() => {
-                            cb()
-                        }, delayForBasic)
+                        //cb
+                        cb()
 
                     }
                 })
 
+                //finish
+                smw.on('finish', () => {
+                    // console.log(`smw finish`)
+                })
+
                 //pipe
                 req.payload.pipe(smw)
 
                 //end
                 req.payload.on('end', () => {
-                    // console.log(`receive payload done`)
+                    // console.log(`req.payload end`)
 
                     //bb
                     let bb = Buffer.concat(chunks)
@@ -606,9 +597,14 @@ function WConverhpServer(opt = {}) {
 
                 })
 
+                //close
+                req.payload.on('close', () => {
+                    // console.log(`req.payload close`)
+                })
+
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`receive payload err`, err)
+                    // console.log(`req.payload error`, err)
                     eeEmit('error', `receive payload err`)
                     pm.reject(err.message)
                 })
@@ -1478,7 +1474,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    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.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 24 2025 10:08:13 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 Wed Apr 16 2025 15:43:24 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 Apr 24 2025 10:08:13 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.40",
+  "version": "2.0.42",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/src/WConverhpServer.mjs

@@ -23,7 +23,7 @@ import obj2u8arr from 'wsemi/src/obj2u8arr.mjs'
 import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
-import managerMergeSlices from './managerMergeSlices.mjs'
+import mmg from './managerMergeSlices.mjs'
 // import checkTotalHash from './checkTotalHash.mjs'
 import checkTotalHash from './checkTotalHash.wk.umd.js'
 // import checkSlicesHash from './checkSlicesHash.mjs'
@@ -35,10 +35,6 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
 //回傳前端(browser)時, 針對超大檔, 可用POST並用stream回傳但還要處理進度條, 若要交由瀏覽器下載器處理, 只能用GET並用stream回傳, 且前端只能用window.location.href或a.href+a.click()下載
 
 
-//mmg
-let mmg = managerMergeSlices()
-
-
 /**
  * 建立Hapi伺服器
  *
@@ -53,7 +49,6 @@ let mmg = managerMergeSlices()
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Function} [opt.verifyConn=()=>{return true}] 輸入呼叫API時檢測函數，預設()=>{return true}
  * @param {Array} [opt.corsOrigins=['*']] 輸入允許跨域網域陣列，若給予['*']代表允許全部，預設['*']
- * @param {Integer} [opt.delayForBasic=0] 輸入基本API用延遲響應時間，單位ms，預設0
  * @param {Integer} [opt.delayForSlice=100] 輸入切片上傳檔案API用延遲響應時間，單位ms，預設100
  * @param {Boolean} [opt.serverHapi=null] 輸入外部提供Hapi伺服器物件，預設null
  * @returns {Object} 回傳事件物件，可監聽事件execute、upload、handler
@@ -255,13 +250,6 @@ function WConverhpServer(opt = {}) {
         corsOrigins = ['*']
     }
 
-    //delayForBasic
-    let delayForBasic = get(opt, 'delayForBasic', '')
-    if (!isp0int(delayForBasic)) {
-        delayForBasic = 0
-    }
-    delayForBasic = cint(delayForBasic)
-
     //delayForSlice
     let delayForSlice = get(opt, 'delayForSlice', '')
     if (!isp0int(delayForSlice)) {
@@ -526,26 +514,29 @@ function WConverhpServer(opt = {}) {
                 let chunks = []
                 let smw = new stream.Writable({
                     write(chunk, encoding, cb) {
-                        // console.log('receive payload', chunk)
+                        // console.log('smw receive payload', chunk)
 
                         //push
                         chunks.push(chunk)
                         // console.log('chunk.length', chunk.length)
 
-                        //setTimeout, 延遲觸發cb
-                        setTimeout(() => {
-                            cb()
-                        }, delayForBasic)
+                        //cb
+                        cb()
 
                     }
                 })
 
+                //finish
+                smw.on('finish', () => {
+                    // console.log(`smw finish`)
+                })
+
                 //pipe
                 req.payload.pipe(smw)
 
                 //end
                 req.payload.on('end', () => {
-                    // console.log(`receive payload done`)
+                    // console.log(`req.payload end`)
 
                     //bb
                     let bb = Buffer.concat(chunks)
@@ -559,9 +550,14 @@ function WConverhpServer(opt = {}) {
 
                 })
 
+                //close
+                req.payload.on('close', () => {
+                    // console.log(`req.payload close`)
+                })
+
                 //error
                 req.payload.on('error', (err) => {
-                    // console.log(`receive payload err`, err)
+                    // console.log(`req.payload error`, err)
                     eeEmit('error', `receive payload err`)
                     pm.reject(err.message)
                 })

package/src/managerMergeSlices.mjs

@@ -10,92 +10,85 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
 import mergeSlices from './mergeSlices.wk.umd.js'
 
 
-//managerMergeSlices
-let managerMergeSlices = () => {
+//qPush
+let qPush = (fileHash, chunkTotal, pathUploadTemp) => {
 
-    //qPush
-    let qPush = (fileHash, chunkTotal, pathUploadTemp) => {
+    //id, 使用fileHash代表不用佇列儲存, 通過id即可解析反查
+    let id = `${now2strp()}|${genID(6)}|${fileHash}`
 
-        //id, 使用fileHash代表不用佇列儲存, 通過id即可解析反查
-        let id = `${now2strp()}|${genID(6)}|${fileHash}`
+    //setTimeout, 脫勾觸發
+    setTimeout(() => {
+        mergeSlices(fileHash, chunkTotal, pathUploadTemp)
+            .catch((err) => {
+                console.log(err)
+            })
+    }, 1)
 
-        //setTimeout, 脫勾觸發
-        setTimeout(() => {
-            mergeSlices(fileHash, chunkTotal, pathUploadTemp)
-                .catch((err) => {
-                    console.log(err)
-                })
-        }, 1)
+    return id
+}
 
-        return id
-    }
+//qGet
+let qGet = (id, pathUploadTemp) => {
+    let errTemp = ''
 
-    //qGet
-    let qGet = (id, pathUploadTemp) => {
-        let errTemp = ''
-
-        //check
-        if (!isestr(id)) {
-            errTemp = `invalid id[${id}]`
-            console.log(errTemp)
-            return {
-                state: 'error',
-                msg: errTemp,
-                path: '',
-            }
+    //check
+    if (!isestr(id)) {
+        errTemp = `invalid id[${id}]`
+        console.log(errTemp)
+        return {
+            state: 'error',
+            msg: errTemp,
+            path: '',
         }
+    }
 
-        //fileHash
-        let s = sep(id, '|')
-        let fileHash = get(s, 2, '')
-        if (!isestr(fileHash)) {
-            errTemp = `can not find fileHash in id[${id}]`
-            console.log(errTemp)
-            return {
-                state: 'error',
-                msg: errTemp,
-                path: '',
-            }
+    //fileHash
+    let s = sep(id, '|')
+    let fileHash = get(s, 2, '')
+    if (!isestr(fileHash)) {
+        errTemp = `can not find fileHash in id[${id}]`
+        console.log(errTemp)
+        return {
+            state: 'error',
+            msg: errTemp,
+            path: '',
         }
+    }
 
-        //fp
-        let fp = path.resolve(pathUploadTemp, fileHash)
-        // console.log('fp', fp)
+    //fp
+    let fp = path.resolve(pathUploadTemp, fileHash)
+    // console.log('fp', fp)
 
-        //fpd
-        let fpd = path.resolve(pathUploadTemp, `${fileHash}.done`)
-        // console.log('fpd', fpd)
+    //fpd
+    let fpd = path.resolve(pathUploadTemp, `${fileHash}.done`)
+    // console.log('fpd', fpd)
 
-        //bfp, bfpd, b
-        let bfp = fsIsFile(fp)
-        let bfpd = fsIsFile(fpd)
-        let b = bfp && bfpd //記得要同時偵測fp與fpd, 否則有些已經移動fp但fpd忘記刪, 就會造成誤判
+    //bfp, bfpd, b
+    let bfp = fsIsFile(fp)
+    let bfpd = fsIsFile(fpd)
+    let b = bfp && bfpd //記得要同時偵測fp與fpd, 否則有些已經移動fp但fpd忘記刪, 就會造成誤判
 
-        //check, 若有.done檔但沒合併檔, 就代表合併檔已被處理或移動, .done檔須自動刪除
-        if (!bfp && bfpd) {
-            fsDeleteFile(fpd)
-        }
-
-        //check, 若已經完成任務, 且外部調用get取得完成訊息, 則可自動刪除.done檔, 但因不能保證合併後有完成再處理動作, 例如移動至處理資料夾再處理, 故保留.done檔
-        if (b) {
-            // fsDeleteFile(fpd)
-        }
+    //check, 若有.done檔但沒合併檔, 就代表合併檔已被處理或移動, .done檔須自動刪除
+    if (!bfp && bfpd) {
+        fsDeleteFile(fpd)
+    }
 
-        return {
-            state: b ? 'success' : 'merging',
-            msg: '',
-            path: fp,
-        }
+    //check, 若已經完成任務, 且外部調用get取得完成訊息, 則可自動刪除.done檔, 但因不能保證合併後有完成再處理動作, 例如移動至處理資料夾再處理, 故保留.done檔
+    if (b) {
+        // fsDeleteFile(fpd)
     }
 
-    //r
-    let r = {
-        push: qPush,
-        get: qGet,
+    return {
+        state: b ? 'success' : 'merging',
+        msg: '',
+        path: fp,
     }
+}
 
-    return r
+let r = {
+    push: qPush,
+    get: qGet,
 }
 
 
-export default managerMergeSlices
+export default r