w-converhp 2.0.2 → 2.0.4

package/docs/WConverhpClient.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line133">line 133</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line134">line 134</a>
     </li></ul></dd>
     
 
@@ -127,7 +127,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import WConverhpClient from 'w-converhp/dist/w-converhp-client.umd.js'
    FormData,
    url: 'http://localhost:8080',
    apiName: 'api',
    //p
    let p = {
        a: 12,
        b: 34.56,
        c: 'test中文',
        d: {
            name,
            u8a,
        },
    }
    console.log('p', p)
    //execute
    await wo.execute('add', { p },
        function (prog, p, m) {
            console.log('client web: execute: prog', prog, p, m)
        })
        .then(function(r) {
            console.log('client web: execute: add', r)
            console.log('r._bin.name', r._bin.name, 'r._bin.u8a', r._bin.u8a)
            // w.downloadFileFromU8Arr(r._bin.name, r._bin.u8a)
        })
        .catch(function (err) {
            console.log('client web: execute: catch', err)
        })
    let core = async() => {
        //u8a
        let u8a = new Uint8Array([66, 97, 115])
        console.log('executeWithU8a u8a', u8a)
        //execute
        await execute('zdata.b1', u8a)
    }
    core()
    let core = async() => {
        //u8a
        let u8a = new Uint8Array(fs.readFileSync('../_data/10mb.7z'))
        console.log('executeWithFile u8a', u8a)
        //execute
        await execute('10mb.7z', u8a)
    }
    core()
    let core = async() => {
        //u8a
        let u8a = new Uint8Array(fs.readFileSync('../_data/1000mb.7z'))
        console.log('u8a.length', u8a.length)
        console.log('uploadLargeFile u8a', u8a)
        await wo.upload('1000mb.7z', u8a,
            function (prog, p, m) {
                console.log('client web: upload: prog', prog, p, m)
            })
            .then(function(res) {
                console.log('client web: upload: then', res)
            })
            .catch(function (err) {
                console.log('client web: upload: catch', err)
            })
    }
    core()
+    <pre class="prettyprint"><code>import WConverhpClient from 'w-converhp/dist/w-converhp-client.umd.js'
    FormData,
    url: 'http://localhost:8080',
    apiName: 'api',
    //p
    let p = {
        a: 12,
        b: 34.56,
        c: 'test中文',
        d: {
            name,
            u8a,
        },
    }
    console.log('p', p)
    //execute
    await wo.execute('add', { p },
        function ({ prog, p, m }) {
            console.log('client web: execute: prog', prog, p, m)
        })
        .then(function(r) {
            console.log('client web: execute: add', r)
            console.log('r._bin.name', r._bin.name, 'r._bin.u8a', r._bin.u8a)
            // w.downloadFileFromU8Arr(r._bin.name, r._bin.u8a)
        })
        .catch(function (err) {
            console.log('client web: execute: catch', err)
        })
    let core = async() => {
        //u8a
        let u8a = new Uint8Array([66, 97, 115])
        console.log('executeWithU8a u8a', u8a)
        //execute
        await execute('zdata.b1', u8a)
    }
    core()
    let core = async() => {
        //u8a
        let u8a = new Uint8Array(fs.readFileSync('../_data/10mb.7z'))
        console.log('executeWithFile u8a', u8a)
        //execute
        await execute('10mb.7z', u8a)
    }
    core()
    let core = async() => {
        //u8a
        let u8a = new Uint8Array(fs.readFileSync('../_data/1000mb.7z'))
        console.log('u8a.length', u8a.length)
        console.log('uploadLargeFile u8a', u8a)
        await wo.upload('1000mb.7z', u8a,
            function ({ prog, p, m }) {
                console.log('client web: upload: prog', prog, p, m)
            })
            .then(function(res) {
                console.log('client web: upload: then', res)
            })
            .catch(function (err) {
                console.log('client web: upload: catch', err)
            })
    }
    core()
 
 
 
@@ -322,6 +322,46 @@
 
     
 
+        <tr>
+            
+                <td class="name"><code>tokenType</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">String</span>
+
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    <code>'Bearer'</code>
+                
+                </td>
+            
+
+            <td class="description last"><p>輸入token類型字串，預設'Bearer'</p></td>
+        </tr>
+
+    
+
         <tr>
             
                 <td class="name"><code>sizeSlice</code></td>
@@ -489,7 +529,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 19:42:30 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 Mar 30 2025 21:48:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -76,6 +76,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  * @param {String} [opt.url='http://localhost:8080'] 輸入Hapi伺服器網址，預設為'http://localhost:8080'
  * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
+ * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
@@ -108,7 +109,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  *
  *     //execute
  *     await wo.execute('add', { p },
- *         function (prog, p, m) {
+ *         function ({ prog, p, m }) {
  *             console.log('client web: execute: prog', prog, p, m)
  *         })
  *         .then(function(r) {
@@ -161,7 +162,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  *         console.log('uploadLargeFile u8a', u8a)
  *
  *         await wo.upload('1000mb.7z', u8a,
- *             function (prog, p, m) {
+ *             function ({ prog, p, m }) {
  *                 console.log('client web: upload: prog', prog, p, m)
  *             })
  *             .then(function(res) {
@@ -208,6 +209,12 @@ function WConverhpClient(opt) {
         }
     }
 
+    //tokenType
+    let tokenType = get(opt, 'tokenType')
+    if (!isestr(tokenType)) {
+        tokenType = 'Bearer'
+    }
+
     //sizeSlice
     let sizeSlice = get(opt, 'sizeSlice')
     if (!ispint(sizeSlice)) {
@@ -383,7 +390,7 @@ function WConverhpClient(opt) {
             url: urlUse,
             data: dd,
             headers: {
-                Authorization: `Bearer ${token}`,
+                Authorization: `${tokenType} ${token}`,
                 ...ct,
                 ...headers,
             },
@@ -403,7 +410,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                cbProgress(Math.floor(r), loaded, 'upload')
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'upload' })
 
             },
             onDownloadProgress: function (ev) {
@@ -419,7 +426,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                cbProgress(Math.floor(r), loaded, 'download')
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'download' })
 
             },
         }
@@ -601,20 +608,24 @@ function WConverhpClient(opt) {
         // let progWeightMerge = 0.01 //合併階段進度使用1%
 
         //cbProgressSlice
-        let cbProgressSlice = (perc, _psiz, dir) => {
+        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 * n
-                cbProgress(prog, psiz, 'upload')
+                cbProgress({ prog, p: psiz, m: 'upload' })
             }
         }
 
         //cbProgressMerge
-        let cbProgressMerge = (perc, _psiz, dir) => {
+        let cbProgressMerge = (msg) => {
+            let perc = msg.prog
+            let dir = msg.m
             if (dir === 'download' && perc === 100) {
-                cbProgress(100, n, 'upload')
+                cbProgress({ prog: 100, p: n, m: 'upload' })
             }
         }
 
@@ -755,7 +766,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Sun Mar 30 2025 19:42:30 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 Mar 30 2025 21:48:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -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 19:42:30 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 Mar 30 2025 21:48:05 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -380,14 +380,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'main', token, headers, query })
+                let m = funCheck({ apiType: 'main', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -538,14 +538,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'slice', token, headers, query })
+                let m = funCheck({ apiType: 'slice', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -684,14 +684,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'merge', token, headers, query })
+                let m = funCheck({ apiType: 'merge', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -911,7 +911,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 19:42:30 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 Mar 30 2025 21:48:05 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 19:42:30 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 Mar 30 2025 21:48:05 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.2",
+  "version": "2.0.4",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/scla.mjs

@@ -36,7 +36,7 @@ async function execute(name, u8a) {
 
     //execute
     await wo.execute('add', { p },
-        function (prog, p, m) {
+        function ({ prog, p, m }) {
             if (m === 'upload') {
                 console.log('client web: execute: prog', prog * 0.5, p, m)
             }

package/sclb.mjs

@@ -36,7 +36,7 @@ async function execute(name, u8a) {
 
     //execute
     await wo.execute('add', { p },
-        function (prog, p, m) {
+        function ({ prog, p, m }) {
             if (m === 'upload') {
                 console.log('client web: execute: prog', prog * 0.5, p, m)
             }

package/sclc.mjs

@@ -29,7 +29,7 @@ function uploadLargeFile() {
         console.log('uploadLargeFile u8a', u8a)
 
         await wo.upload('1000mb.7z', u8a,
-            function (prog, p, m) {
+            function ({ prog, p, m }) {
                 // console.log('client web: upload: prog', prog, p, m)
                 if (m === 'upload') {
                     console.log('client web: upload: prog', prog)

package/src/WConverhpClient.mjs

@@ -29,6 +29,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  * @param {String} [opt.url='http://localhost:8080'] 輸入Hapi伺服器網址，預設為'http://localhost:8080'
  * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
  * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
+ * @param {String} [opt.tokenType='Bearer'] 輸入token類型字串，預設'Bearer'
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
  * @returns {Object} 回傳事件物件，可使用函數execute、upload
@@ -61,7 +62,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  *
  *     //execute
  *     await wo.execute('add', { p },
- *         function (prog, p, m) {
+ *         function ({ prog, p, m }) {
  *             console.log('client web: execute: prog', prog, p, m)
  *         })
  *         .then(function(r) {
@@ -114,7 +115,7 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  *         console.log('uploadLargeFile u8a', u8a)
  *
  *         await wo.upload('1000mb.7z', u8a,
- *             function (prog, p, m) {
+ *             function ({ prog, p, m }) {
  *                 console.log('client web: upload: prog', prog, p, m)
  *             })
  *             .then(function(res) {
@@ -161,6 +162,12 @@ function WConverhpClient(opt) {
         }
     }
 
+    //tokenType
+    let tokenType = get(opt, 'tokenType')
+    if (!isestr(tokenType)) {
+        tokenType = 'Bearer'
+    }
+
     //sizeSlice
     let sizeSlice = get(opt, 'sizeSlice')
     if (!ispint(sizeSlice)) {
@@ -336,7 +343,7 @@ function WConverhpClient(opt) {
             url: urlUse,
             data: dd,
             headers: {
-                Authorization: `Bearer ${token}`,
+                Authorization: `${tokenType} ${token}`,
                 ...ct,
                 ...headers,
             },
@@ -356,7 +363,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                cbProgress(Math.floor(r), loaded, 'upload')
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'upload' })
 
             },
             onDownloadProgress: function (ev) {
@@ -372,7 +379,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                cbProgress(Math.floor(r), loaded, 'download')
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'download' })
 
             },
         }
@@ -554,20 +561,24 @@ function WConverhpClient(opt) {
         // let progWeightMerge = 0.01 //合併階段進度使用1%
 
         //cbProgressSlice
-        let cbProgressSlice = (perc, _psiz, dir) => {
+        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 * n
-                cbProgress(prog, psiz, 'upload')
+                cbProgress({ prog, p: psiz, m: 'upload' })
             }
         }
 
         //cbProgressMerge
-        let cbProgressMerge = (perc, _psiz, dir) => {
+        let cbProgressMerge = (msg) => {
+            let perc = msg.prog
+            let dir = msg.m
             if (dir === 'download' && perc === 100) {
-                cbProgress(100, n, 'upload')
+                cbProgress({ prog: 100, p: n, m: 'upload' })
             }
         }
 

package/src/WConverhpServer.mjs

@@ -333,14 +333,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'main', token, headers, query })
+                let m = funCheck({ apiType: 'main', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -491,14 +491,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'slice', token, headers, query })
+                let m = funCheck({ apiType: 'slice', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -637,14 +637,14 @@ function WConverhpServer(opt = {}) {
 
             //token
             // let token = get(query, 'token', '')
-            let token = get(headers, 'authorization', '')
-            token = isestr(token) ? token : ''
+            let authorization = get(headers, 'authorization', '')
+            authorization = isestr(authorization) ? authorization : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ apiType: 'merge', token, headers, query })
+                let m = funCheck({ apiType: 'merge', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }

package/srv.mjs

@@ -1,13 +1,19 @@
 import fs from 'fs'
 import _ from 'lodash-es'
+import w from 'wsemi'
 import WConverhpServer from './src/WConverhpServer.mjs'
 
 let opt = {
     port: 8080,
     apiName: 'api',
     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-    funCheck: ({ apiType, token, headers, query }) => {
-        console.log('funCheck', apiType, token)
+    funCheck: async ({ apiType, authorization, headers, query }) => {
+        console.log('funCheck', `apiType[${apiType}]`, `authorization[${authorization}]`)
+        let token = w.strdelleft(authorization, 7) //刪除Bearer
+        if (!w.isestr(token)) {
+            return false
+        }
+        // await w.delay(3000)
         return true
     },
 }

package/web.html

@@ -50,7 +50,7 @@
 
                 //execute
                 await wo.execute('add', { p },
-                    function (prog, p, m) {
+                    function ({ prog, p, m }) {
                         console.log('client web: execute: prog', prog, p, m)
                     })
                     .then(function(r) {
@@ -132,7 +132,7 @@
 
                     //upload
                     await wo.upload(file.name, file,
-                        function (prog, p, m) {
+                        function ({ prog, p, m }) {
                             console.log('client web: upload: prog', prog, p, m)
                         })
                         .then(function(res) {