w-converhp 2.0.4 → 2.0.5

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#line119">line 119</a>
+        <a href="WConverhpServer.mjs.html">WConverhpServer.mjs</a>, <a href="WConverhpServer.mjs.html#line117">line 117</a>
     </li></ul></dd>
     
 
@@ -127,7 +127,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import _ from 'lodash-es'
    port: 8080,
    apiName: 'api',
    pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
    funCheck: () => {
        return true
    },
    // console.log(`Server[port:${opt.port}]: execute`, func, input)
    console.log(`Server[port:${opt.port}]: execute`, func)
    try {
        if (func === 'add') {
            if (_.get(input, 'p.d.u8a', null)) {
                console.log('input.p.d.u8a', input.p.d.u8a)
            }
            let r = {
                _add: input.p.a + input.p.b,
                _data: [11, 22.22, 'abc', { x: '21', y: 65.43, z: 'test中文' }],
                _bin: {
                    name: 'zdata.b2',
                    u8a: new Uint8Array([66, 97, 115]),
                    // name: '100mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\100mb.7z')),
                    // name: '500mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\500mb.7z')),
                    // name: '1000mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\1000mb.7z')),
                },
            }
            pm.resolve(r)
        }
        else {
            console.log('invalid func')
            pm.reject('invalid func')
        }
    }
    catch (err) {
        console.log('execute error', err)
        pm.reject('execute error')
    }
    console.log(`Server[port:${opt.port}]: upload`, input)
    try {
        let output = input
        pm.resolve(output)
    }
    catch (err) {
        console.log('execute error', err)
        pm.reject('execute error')
    }
    // console.log(`Server[port:${opt.port}]: handler`, data)
+    <pre class="prettyprint"><code>import _ from 'lodash-es'
    port: 8080,
    apiName: 'api',
    pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
    funCheck: () => {
        return true
    },
    // console.log(`Server[port:${opt.port}]: execute`, func, input)
    console.log(`Server[port:${opt.port}]: execute`, func)
    try {
        if (func === 'add') {
            if (_.get(input, 'p.d.u8a', null)) {
                console.log('input.p.d.u8a', input.p.d.u8a)
            }
            let r = {
                _add: input.p.a + input.p.b,
                _data: [11, 22.22, 'abc', { x: '21', y: 65.43, z: 'test中文' }],
                _bin: {
                    name: 'zdata.b2',
                    u8a: new Uint8Array([66, 97, 115]),
                    // name: '100mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\100mb.7z')),
                    // name: '500mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\500mb.7z')),
                    // name: '1000mb.7z',
                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\1000mb.7z')),
                },
            }
            pm.resolve(r)
        }
        else {
            console.log('invalid func')
            pm.reject('invalid func')
        }
    }
    catch (err) {
        console.log('execute error', err)
        pm.reject('execute error')
    }
    console.log(`Server[port:${opt.port}]: upload`, input)
    try {
        let output = input
        pm.resolve(output)
    }
    catch (err) {
        console.log('upload error', err)
        pm.reject('upload error')
    }
    // console.log(`Server[port:${opt.port}]: handler`, data)
 
 
 
@@ -709,7 +709,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 21:48:05 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 Mon Mar 31 2025 23:59:37 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -45,11 +45,10 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import path from 'path'
-import fs from 'fs'
+            <pre class="prettyprint source linenums"><code>import fs from 'fs'
+import stream from 'stream'
 import Hapi from '@hapi/hapi'
 import Inert from '@hapi/inert' //提供靜態檔案
-import stream from 'stream'
 import get from 'lodash-es/get.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
@@ -66,8 +65,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 fsIsFile from 'wsemi/src/fsIsFile.mjs'
-import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
+import mergeFiles from './mergeFiles.wk.umd.js'
 
 
 /**
@@ -103,7 +101,7 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  * //new
  * let wo = new WConverhpServer(opt)
  *
- * wo.on('execute', function(func, input, pm) {
+ * wo.on('execute', (func, input, pm) => {
  *     // console.log(`Server[port:${opt.port}]: execute`, func, input)
  *     console.log(`Server[port:${opt.port}]: execute`, func)
  *
@@ -145,7 +143,7 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  *     }
  *
  * })
- * wo.on('upload', function(input, pm) {
+ * wo.on('upload', (input, pm) => {
  *     console.log(`Server[port:${opt.port}]: upload`, input)
  *
  *     try {
@@ -153,12 +151,12 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  *         pm.resolve(output)
  *     }
  *     catch (err) {
- *         console.log('execute error', err)
- *         pm.reject('execute error')
+ *         console.log('upload error', err)
+ *         pm.reject('upload error')
  *     }
  *
  * })
- * wo.on('handler', function(data) {
+ * wo.on('handler', (data) => {
  *     // console.log(`Server[port:${opt.port}]: handler`, data)
  * })
  *
@@ -244,6 +242,10 @@ function WConverhpServer(opt = {}) {
             //host: 'localhost',
             port,
             routes: {
+                timeout: {
+                    server: false, //關閉伺服器超時
+                    socket: false, //關閉socket超時
+                },
                 cors: {
                     origin: corsOrigins, //Access-Control-Allow-Origin
                     credentials: false, //Access-Control-Allow-Credentials
@@ -360,8 +362,8 @@ function WConverhpServer(opt = {}) {
                 parse: false,
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -518,8 +520,8 @@ function WConverhpServer(opt = {}) {
                 parse: false,
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -664,8 +666,8 @@ function WConverhpServer(opt = {}) {
                 parse: true, //前端送obj過來
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -739,78 +741,13 @@ function WConverhpServer(opt = {}) {
                 return res.response({ error: 'invalid packageId in payload' }).code(400)
             }
 
-            //merge
-            let merge = async () => {
-                let errTemp = ''
-
-                //pathFileMerge
-                let pathFileMerge = path.join(pathUploadTemp, `${packageId}`)
-                // console.log('pathFileMerge', pathFileMerge)
-
-                //fileStream
-                let fileStream = fs.createWriteStream(pathFileMerge)
-                // console.log(`merge filename[${filename}] start`)
-
-                //使用try catch攔截，使stream能完整創造與結束
-                try {
-                    for (let i = 0; i &lt; chunkTotal; i++) {
-                        // console.log(`merge ${i + 1}/${chunkTotal}`)
-
-                        //chunkIndex
-                        let chunkIndex = i
-
-                        //pathFileChunk
-                        let pathFileChunk = path.join(pathUploadTemp, `${packageId}_${chunkIndex}`)
-
-                        //check
-                        if (!fsIsFile(pathFileChunk)) {
-                            // console.log(`pathFileChunk[${pathFileChunk}] is not a file`)
-                            throw new Error(`Missing chunk ${i} of filename[${filename}]`)
-                        }
-
-                        // console.log(`merging chunk[${chunkIndex + 1}/${chunkTotal}]...`)
-
-                        //chunkData
-                        let chunkData = fs.readFileSync(pathFileChunk)
-
-                        //write
-                        fileStream.write(chunkData)
-
-                        //fsDeleteFile
-                        fsDeleteFile(pathFileChunk)
-
-                        // console.log(`merge chunk[${chunkIndex + 1}/${chunkTotal}] done`)
-                    }
-                }
-                catch (err) {
-                    errTemp = err.message
-                }
-
-                //end
-                fileStream.end()
-                // console.log(`merge filename[${filename}] done`)
-
-                //check
-                if (isestr(errTemp)) {
-                    return Promise.reject(errTemp)
-                }
-
-                //r
-                let r = {
-                    // message: `Merged filename[${filename}] successfully`,
-                    filename,
-                    path: pathFileMerge,
-                }
-
-                return r
-            }
-
             //core
             let core = async() => {
 
                 //merge
                 // console.log('merge start')
-                let r = await merge()
+                // let r = await merge()
+                let r = await mergeFiles(pathUploadTemp, packageId, chunkTotal, filename)
                 // console.log('merge done', r)
 
                 //procUpload
@@ -886,7 +823,8 @@ function WConverhpServer(opt = {}) {
 
     //start
     if (get(opt, 'serverHapi')) {
-        opt.serverHapi.route([apiMain, apiSlice, apiSliceMerge])
+        // opt.serverHapi.route([apiMain, apiSlice, apiSliceMerge])
+        server.route([apiMain, apiSlice, apiSliceMerge])
     }
     else {
         startServer()
@@ -911,7 +849,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 Mar 30 2025 21:48:05 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 Mon Mar 31 2025 23:59: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 Sun Mar 30 2025 21:48:05 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 Mon Mar 31 2025 23:59:37 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.4",
+  "version": "2.0.5",
   "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.82"
+    "w-package-tools": "^1.0.85"
   },
   "scripts": {
     "@hapi/hapi": "^20.2.1",

package/scla.mjs

@@ -16,7 +16,7 @@ let opt = {
 //new
 let wo = new WConverhpClient(opt)
 
-wo.on('error', function(err) {
+wo.on('error', (err) => {
     console.log(`error`, err)
 })
 

package/sclb.mjs

@@ -16,7 +16,7 @@ let opt = {
 //new
 let wo = new WConverhpClient(opt)
 
-wo.on('error', function(err) {
+wo.on('error', (err) => {
     console.log(`error`, err)
 })
 

package/sclc.mjs

@@ -16,7 +16,7 @@ let opt = {
 //new
 let wo = new WConverhpClient(opt)
 
-wo.on('error', function(err) {
+wo.on('error', (err) => {
     console.log(`error`, err)
 })
 

package/src/WConverhpClient.mjs

@@ -542,8 +542,8 @@ function WConverhpClient(opt) {
             catch (err) {}
         }
         if (n === 0) {
-            eeEmit('error', `Can not get size of bb`)
-            return Promise.reject(`Can not get size of bb`)
+            eeEmit('error', `can not get size of bb`)
+            return Promise.reject(`can not get size of bb`)
         }
         // console.log('n', n)
 
@@ -609,7 +609,7 @@ function WConverhpClient(opt) {
         }
 
         //send merge
-        console.log(`merging tempId[${tempId}]...`)
+        // console.log(`merging tempId[${tempId}]...`)
         let msg = {
             'filename': tempId,
             'chunk-total': chunkTotal,

package/src/WConverhpServer.mjs

@@ -1,8 +1,7 @@
-import path from 'path'
 import fs from 'fs'
+import stream from 'stream'
 import Hapi from '@hapi/hapi'
 import Inert from '@hapi/inert' //提供靜態檔案
-import stream from 'stream'
 import get from 'lodash-es/get.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
@@ -19,8 +18,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 fsIsFile from 'wsemi/src/fsIsFile.mjs'
-import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
+import mergeFiles from './mergeFiles.wk.umd.js'
 
 
 /**
@@ -56,7 +54,7 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  * //new
  * let wo = new WConverhpServer(opt)
  *
- * wo.on('execute', function(func, input, pm) {
+ * wo.on('execute', (func, input, pm) => {
  *     // console.log(`Server[port:${opt.port}]: execute`, func, input)
  *     console.log(`Server[port:${opt.port}]: execute`, func)
  *
@@ -98,7 +96,7 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  *     }
  *
  * })
- * wo.on('upload', function(input, pm) {
+ * wo.on('upload', (input, pm) => {
  *     console.log(`Server[port:${opt.port}]: upload`, input)
  *
  *     try {
@@ -106,12 +104,12 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  *         pm.resolve(output)
  *     }
  *     catch (err) {
- *         console.log('execute error', err)
- *         pm.reject('execute error')
+ *         console.log('upload error', err)
+ *         pm.reject('upload error')
  *     }
  *
  * })
- * wo.on('handler', function(data) {
+ * wo.on('handler', (data) => {
  *     // console.log(`Server[port:${opt.port}]: handler`, data)
  * })
  *
@@ -197,6 +195,10 @@ function WConverhpServer(opt = {}) {
             //host: 'localhost',
             port,
             routes: {
+                timeout: {
+                    server: false, //關閉伺服器超時
+                    socket: false, //關閉socket超時
+                },
                 cors: {
                     origin: corsOrigins, //Access-Control-Allow-Origin
                     credentials: false, //Access-Control-Allow-Credentials
@@ -313,8 +315,8 @@ function WConverhpServer(opt = {}) {
                 parse: false,
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -471,8 +473,8 @@ function WConverhpServer(opt = {}) {
                 parse: false,
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -617,8 +619,8 @@ function WConverhpServer(opt = {}) {
                 parse: true, //前端送obj過來
             },
             timeout: {
-                socket: false, //避免socket自動關閉
-                server: false,
+                server: false, //關閉伺服器超時
+                socket: false, //關閉socket超時
             },
         },
         handler: async function (req, res) {
@@ -692,78 +694,13 @@ function WConverhpServer(opt = {}) {
                 return res.response({ error: 'invalid packageId in payload' }).code(400)
             }
 
-            //merge
-            let merge = async () => {
-                let errTemp = ''
-
-                //pathFileMerge
-                let pathFileMerge = path.join(pathUploadTemp, `${packageId}`)
-                // console.log('pathFileMerge', pathFileMerge)
-
-                //fileStream
-                let fileStream = fs.createWriteStream(pathFileMerge)
-                // console.log(`merge filename[${filename}] start`)
-
-                //使用try catch攔截，使stream能完整創造與結束
-                try {
-                    for (let i = 0; i < chunkTotal; i++) {
-                        // console.log(`merge ${i + 1}/${chunkTotal}`)
-
-                        //chunkIndex
-                        let chunkIndex = i
-
-                        //pathFileChunk
-                        let pathFileChunk = path.join(pathUploadTemp, `${packageId}_${chunkIndex}`)
-
-                        //check
-                        if (!fsIsFile(pathFileChunk)) {
-                            // console.log(`pathFileChunk[${pathFileChunk}] is not a file`)
-                            throw new Error(`Missing chunk ${i} of filename[${filename}]`)
-                        }
-
-                        // console.log(`merging chunk[${chunkIndex + 1}/${chunkTotal}]...`)
-
-                        //chunkData
-                        let chunkData = fs.readFileSync(pathFileChunk)
-
-                        //write
-                        fileStream.write(chunkData)
-
-                        //fsDeleteFile
-                        fsDeleteFile(pathFileChunk)
-
-                        // console.log(`merge chunk[${chunkIndex + 1}/${chunkTotal}] done`)
-                    }
-                }
-                catch (err) {
-                    errTemp = err.message
-                }
-
-                //end
-                fileStream.end()
-                // console.log(`merge filename[${filename}] done`)
-
-                //check
-                if (isestr(errTemp)) {
-                    return Promise.reject(errTemp)
-                }
-
-                //r
-                let r = {
-                    // message: `Merged filename[${filename}] successfully`,
-                    filename,
-                    path: pathFileMerge,
-                }
-
-                return r
-            }
-
             //core
             let core = async() => {
 
                 //merge
                 // console.log('merge start')
-                let r = await merge()
+                // let r = await merge()
+                let r = await mergeFiles(pathUploadTemp, packageId, chunkTotal, filename)
                 // console.log('merge done', r)
 
                 //procUpload
@@ -839,7 +776,8 @@ function WConverhpServer(opt = {}) {
 
     //start
     if (get(opt, 'serverHapi')) {
-        opt.serverHapi.route([apiMain, apiSlice, apiSliceMerge])
+        // opt.serverHapi.route([apiMain, apiSlice, apiSliceMerge])
+        server.route([apiMain, apiSlice, apiSliceMerge])
     }
     else {
         startServer()

package/src/mergeFiles.mjs

@@ -0,0 +1,73 @@
+import path from 'path' //native lib要用動態import加載
+import fs from 'fs' //native lib要用動態import加載
+import isestr from 'wsemi/src/isestr.mjs'
+import fsIsFile from 'wsemi/src/fsIsFile.mjs'
+import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
+
+
+let mergeFiles = async (pathUploadTemp, packageId, chunkTotal, filename) => {
+    let errTemp = ''
+
+    //pathFileMerge
+    let pathFileMerge = path.join(pathUploadTemp, packageId)
+    // console.log('pathFileMerge', pathFileMerge)
+
+    //fileStream
+    let fileStream = fs.createWriteStream(pathFileMerge)
+    // console.log(`merge filename[${filename}] start`)
+
+    //使用try catch攔截，使stream能完整創造與結束
+    try {
+        for (let i = 0; i < chunkTotal; i++) {
+            // console.log(`merge ${i + 1}/${chunkTotal}`)
+
+            //chunkIndex
+            let chunkIndex = i
+
+            //pathFileChunk
+            let pathFileChunk = path.join(pathUploadTemp, `${packageId}_${chunkIndex}`)
+
+            //check
+            if (!fsIsFile(pathFileChunk)) {
+                // console.log(`pathFileChunk[${pathFileChunk}] is not a file`)
+                throw new Error(`missing chunk ${i} of filename[${filename}]`)
+            }
+
+            // console.log(`merging chunk[${chunkIndex + 1}/${chunkTotal}]...`)
+
+            //chunkData
+            let chunkData = fs.readFileSync(pathFileChunk)
+
+            //write
+            fileStream.write(chunkData)
+
+            //fsDeleteFile
+            fsDeleteFile(pathFileChunk)
+
+            // console.log(`merge chunk[${chunkIndex + 1}/${chunkTotal}] done`)
+        }
+    }
+    catch (err) {
+        errTemp = err.message
+    }
+
+    //end
+    fileStream.end()
+    // console.log(`merge filename[${filename}] done`)
+
+    //check
+    if (isestr(errTemp)) {
+        return Promise.reject(errTemp)
+    }
+
+    //r
+    let r = {
+        // message: `Merged filename[${filename}] successfully`,
+        filename,
+        path: pathFileMerge,
+    }
+
+    return r
+}
+
+export default mergeFiles