w-converhp 2.0.57 → 2.0.58

package/README.md

@@ -221,7 +221,7 @@ downloadLargeFile()
 
 [Necessary] Add script for w-converhp-client.
 ```alias
-<script src="https://cdn.jsdelivr.net/npm/w-converhp@2.0.57/dist/w-converhp-client.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/w-converhp@2.0.58/dist/w-converhp-client.umd.js"></script>
 ```
 
 #### Example for w-converhp-client in browser:

package/dist/w-converhp-client.umd.js

@@ -1,5 +1,5 @@
 /*!
- * w-converhp-client v2.0.57
+ * w-converhp-client v2.0.58
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

package/docs/WConverhpClient.html

@@ -649,7 +649,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sat Jul 05 2025 15:29:19 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 Jul 13 2025 10:18:19 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -1187,7 +1187,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 Jul 05 2025 15:29:19 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 Jul 13 2025 10:18:19 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -127,7 +127,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import fs from 'fs'
    port: 8080,
    apiName: 'api',
    pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
    verifyConn: async ({ apiType, authorization, headers, query }) => {
        console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
        let token = w.strdelleft(authorization, 7) //刪除Bearer
        if (!w.isestr(token)) {
            return false
        }
        // await w.delay(3000)
        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)
                ms.push({ '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([52, 66, 97, 115]),
                },
            }
            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 {
        ms.push({ 'receive and return': input })
        let output = input
        pm.resolve(output)
    }
    catch (err) {
        console.log('upload error', err)
        pm.reject('upload error')
    }
    console.log(`Server[port:${opt.port}]: download`, input)
    let streamRead = null
    try {
        ms.push({ 'download': input })
        //fp
        let fp = `./test/1mb.7z`
        //check, 檔案存在才往下
        //fileSize
        let stats = fs.statSync(fp)
        let fileSize = stats.size
        //streamRead
        streamRead = fs.createReadStream(fp)
        //filename
        let filename = `1mb中文.7z` //測試支援中文
        //fileType
        let fileType = 'application/x-7z-compressed'
        //output
        let output = {
            streamRead,
            filename,
            fileSize,
            fileType,
        }
        pm.resolve(output)
    }
    catch (err) {
        console.log('download error', err)
        // try {
        //     streamRead.destroy() //若fs.createReadStream早於fs.statSync執行, 但fs.statSync發生錯誤時, stream得要destroy
        // }
        // catch (err) {}
        pm.reject('download error')
    }
    console.log(`Server[port:${opt.port}]: error`, err)
    // console.log(`Server[port:${opt.port}]: handler`, data)
    console.log('ms', ms)
    // console.log('ms', JSON.stringify(ms))
    wo.stop()
+    <pre class="prettyprint"><code>import fs from 'fs'
    port: 8080,
    apiName: 'api',
    pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
    verifyConn: async ({ apiType, authorization, query, headers, req }) => {
        console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
        let token = w.strdelleft(authorization, 7) //刪除Bearer
        if (!w.isestr(token)) {
            return false
        }
        // await w.delay(3000)
        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)
                ms.push({ '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([52, 66, 97, 115]),
                },
            }
            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 {
        ms.push({ 'receive and return': input })
        let output = input
        pm.resolve(output)
    }
    catch (err) {
        console.log('upload error', err)
        pm.reject('upload error')
    }
    console.log(`Server[port:${opt.port}]: download`, input)
    let streamRead = null
    try {
        ms.push({ 'download': input })
        //fp
        let fp = `./test/1mb.7z`
        //check, 檔案存在才往下
        //fileSize
        let stats = fs.statSync(fp)
        let fileSize = stats.size
        //streamRead
        streamRead = fs.createReadStream(fp)
        //filename
        let filename = `1mb中文.7z` //測試支援中文
        //fileType
        let fileType = 'application/x-7z-compressed'
        //output
        let output = {
            streamRead,
            filename,
            fileSize,
            fileType,
        }
        pm.resolve(output)
    }
    catch (err) {
        console.log('download error', err)
        // try {
        //     streamRead.destroy() //若fs.createReadStream早於fs.statSync執行, 但fs.statSync發生錯誤時, stream得要destroy
        // }
        // catch (err) {}
        pm.reject('download error')
    }
    console.log(`Server[port:${opt.port}]: error`, err)
    // console.log(`Server[port:${opt.port}]: handler`, data)
    console.log('ms', ms)
    // console.log('ms', JSON.stringify(ms))
    wo.stop()
 
 
 
@@ -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 Jul 05 2025 15:29:19 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 Jul 13 2025 10:18:19 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -112,7 +112,7 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
  *     port: 8080,
  *     apiName: 'api',
  *     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
- *     verifyConn: async ({ apiType, authorization, headers, query }) => {
+ *     verifyConn: async ({ apiType, authorization, query, headers, req }) => {
  *         console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
  *         let token = w.strdelleft(authorization, 7) //刪除Bearer
  *         if (!w.isestr(token)) {
@@ -532,7 +532,7 @@ function WConverhpServer(opt = {}) {
             if (true) {
 
                 //verifyConn
-                let m = verifyConn({ apiType: 'main', authorization, headers, query })
+                let m = verifyConn({ apiType: 'main', authorization, query, headers, req })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -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 Jul 05 2025 15:29:19 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 Jul 13 2025 10:18:19 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 Jul 05 2025 15:29:19 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 Jul 13 2025 10:18:19 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "w-converhp",
-  "version": "2.0.57",
+  "version": "2.0.58",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",
     "@hapi/inert": "^7.1.0",
     "axios": "^1.10.0",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.8.9"
+    "wsemi": "^1.8.14"
   },
   "devDependencies": {
     "form-data": "^4.0.3",

package/src/WConverhpServer.mjs

@@ -65,7 +65,7 @@ import checkSlicesHash from './checkSlicesHash.wk.umd.js'
  *     port: 8080,
  *     apiName: 'api',
  *     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
- *     verifyConn: async ({ apiType, authorization, headers, query }) => {
+ *     verifyConn: async ({ apiType, authorization, query, headers, req }) => {
  *         console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
  *         let token = w.strdelleft(authorization, 7) //刪除Bearer
  *         if (!w.isestr(token)) {
@@ -485,7 +485,7 @@ function WConverhpServer(opt = {}) {
             if (true) {
 
                 //verifyConn
-                let m = verifyConn({ apiType: 'main', authorization, headers, query })
+                let m = verifyConn({ apiType: 'main', authorization, query, headers, req })
                 if (ispm(m)) {
                     m = await m
                 }

package/srv.mjs

@@ -11,7 +11,7 @@ let opt = {
     port: 8080,
     apiName: 'api',
     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-    verifyConn: async ({ apiType, authorization, headers, query }) => {
+    verifyConn: async ({ apiType, authorization, query, headers, req }) => {
         console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
         let token = w.strdelleft(authorization, 7) //刪除Bearer
         if (!w.isestr(token)) {

package/test/downloadLargeFile.test.mjs

@@ -18,7 +18,7 @@ describe('downloadLargeFile', function() {
             port: 8083, //同時test故得要不同port
             apiName: 'api',
             pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-            verifyConn: async ({ apiType, authorization, headers, query }) => {
+            verifyConn: async ({ apiType, authorization, query, headers, req }) => {
                 // console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
                 let token = w.strdelleft(authorization, 7) //刪除Bearer
                 if (!w.isestr(token)) {

package/test/executeWithFile.test.mjs

@@ -18,7 +18,7 @@ describe('executeWithFile', function() {
             port: 8081, //同時test故得要不同port
             apiName: 'api',
             pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-            verifyConn: async ({ apiType, authorization, headers, query }) => {
+            verifyConn: async ({ apiType, authorization, query, headers, req }) => {
                 // console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
                 let token = w.strdelleft(authorization, 7) //刪除Bearer
                 if (!w.isestr(token)) {

package/test/executeWithU8a.test.mjs

@@ -18,7 +18,7 @@ describe('executeWithU8a', function() {
             port: 8080,
             apiName: 'api',
             pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-            verifyConn: async ({ apiType, authorization, headers, query }) => {
+            verifyConn: async ({ apiType, authorization, query, headers, req }) => {
                 // console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
                 let token = w.strdelleft(authorization, 7) //刪除Bearer
                 if (!w.isestr(token)) {

package/test/uploadLargeFile.test.mjs

@@ -18,7 +18,7 @@ describe('uploadLargeFile', function() {
             port: 8082, //同時test故得要不同port
             apiName: 'api',
             pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-            verifyConn: async ({ apiType, authorization, headers, query }) => {
+            verifyConn: async ({ apiType, authorization, query, headers, req }) => {
                 // console.log('verifyConn', `apiType[${apiType}]`, `authorization[${authorization}]`)
                 let token = w.strdelleft(authorization, 7) //刪除Bearer
                 if (!w.isestr(token)) {