w-converhp 2.0.1 → 2.0.2

package/src/WConverhpClient.mjs

@@ -1,6 +1,4 @@
 import axios from 'axios'
-// import * as FormData from 'form-data/lib/form_data.js'
-// import FormData from 'form-data'
 import get from 'lodash-es/get.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
@@ -12,6 +10,7 @@ import isp0int from 'wsemi/src/isp0int.mjs'
 import isestr from 'wsemi/src/isestr.mjs'
 import isobj from 'wsemi/src/isobj.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
+import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import strright from 'wsemi/src/strright.mjs'
 import evem from 'wsemi/src/evem.mjs'
@@ -29,9 +28,10 @@ import now2strp from 'wsemi/src/now2strp.mjs'
  * @param {Object} opt 輸入設定參數物件
  * @param {String} [opt.url='http://localhost:8080'] 輸入Hapi伺服器網址，預設為'http://localhost:8080'
  * @param {String} [opt.apiName='api'] 輸入API名稱字串，預設'api'
+ * @param {Function} [opt.getToken=()=>''] 輸入取得使用者token的回調函數，預設()=>''
  * @param {Integer} [opt.sizeSlice=1024*1024] 輸入切片上傳檔案之切片檔案大小整數，單位為Byte，預設為1024*1024
  * @param {Integer} [opt.retry=3] 輸入傳輸失敗重試次數整數，預設為3
- * @returns {Object} 回傳通訊物件，可使用函數execute、upload
+ * @returns {Object} 回傳事件物件，可使用函數execute、upload
  * @example
  *
  * import WConverhpClient from 'w-converhp/dist/w-converhp-client.umd.js'
@@ -153,6 +153,14 @@ function WConverhpClient(opt) {
         url = _url + '/' + apiName
     }
 
+    //getToken
+    let getToken = get(opt, 'getToken', null)
+    if (!isfun(getToken)) {
+        getToken = () => {
+            return ''
+        }
+    }
+
     //sizeSlice
     let sizeSlice = get(opt, 'sizeSlice')
     if (!ispint(sizeSlice)) {
@@ -173,7 +181,7 @@ function WConverhpClient(opt) {
     let ee = evem() //new events.EventEmitter()
 
     //eeEmit
-    function eeEmit(name, ...args) {
+    let eeEmit = (name, ...args) => {
         setTimeout(() => {
             ee.emit(name, ...args)
         }, 1)
@@ -206,7 +214,7 @@ function WConverhpClient(opt) {
     }
 
     //send
-    function send(type, pkg, opt = {}) {
+    async function send(type, pkg, opt = {}) {
 
         //headers
         let headers = get(opt, 'headers')
@@ -217,13 +225,16 @@ function WConverhpClient(opt) {
 
         //dataType
         let dataType = get(opt, 'dataType', '')
-        if (dataType !== 'blob' && dataType !== 'obj' && dataType !== 'fmd' && dataType !== 'json') {
+        if (dataType !== 'blob' && dataType !== 'fmd' && dataType !== 'json') {
             dataType = 'blob'
         }
         // console.log('dataType', dataType)
 
         //cbProgress
         let cbProgress = get(opt, 'cbProgress')
+        if (!isfun(cbProgress)) {
+            cbProgress = () => {}
+        }
 
         //urlUse
         let urlUse = ''
@@ -239,7 +250,6 @@ function WConverhpClient(opt) {
         else {
             throw new Error(`invalid type[${type}]`)
         }
-        // console.log('urlUse', urlUse)
 
         //pm
         let pm = genPm()
@@ -287,17 +297,24 @@ function WConverhpClient(opt) {
                 }
                 // console.log('ct', ct)
             }
+            else {
+                //browser會自動根據fmd的邊界boundary來設定
+            }
 
             //set dd
             dd = fmd
 
         }
         else if (dataType === 'json') {
+            //axios預設會將物件自動轉換為JSON, 此處指定Content-Type且強制轉, 避免可能問題
+
+            //set ct
+            ct = {
+                'Content-Type': 'application/json',
+            }
+
             dd = JSON.stringify(pkg)
         }
-        else if (dataType === 'obj') {
-            dd = pkg
-        }
         // console.log('dd', dd)
 
         //rt
@@ -307,12 +324,19 @@ function WConverhpClient(opt) {
         }
         // console.log('rt', rt)
 
+        //token
+        let token = getToken()
+        if (ispm(token)) {
+            token = await token
+        }
+
         //s
         let s = {
             method: 'POST',
             url: urlUse,
             data: dd,
             headers: {
+                Authorization: `Bearer ${token}`,
                 ...ct,
                 ...headers,
             },
@@ -332,9 +356,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                if (isfun(cbProgress)) {
-                    cbProgress(Math.floor(r), loaded, 'upload')
-                }
+                cbProgress(Math.floor(r), loaded, 'upload')
 
             },
             onDownloadProgress: function (ev) {
@@ -350,9 +372,7 @@ function WConverhpClient(opt) {
                 }
 
                 //cbProgress
-                if (isfun(cbProgress)) {
-                    cbProgress(Math.floor(r), loaded, 'donwload')
-                }
+                cbProgress(Math.floor(r), loaded, 'download')
 
             },
         }
@@ -388,7 +408,8 @@ function WConverhpClient(opt) {
                     pm.resolve(data.success)
                 }
                 else if (haskey(data, 'error')) {
-                    pm.resolve(data.error)
+                    eeEmit('error', data.error)
+                    pm.reject(data.error)
                 }
                 else {
                     // console.log('invalid data', data)
@@ -407,6 +428,10 @@ function WConverhpClient(opt) {
                 //statusText, err
                 let statusText = get(res, 'response.statusText') || get(res, 'message')
                 let err = get(res, 'response.data') || get(res, 'stack')
+                // console.log(`get(res, 'response.statusText')`, get(res, 'response.statusText'))
+                // console.log(`get(res, 'message')`, get(res, 'message'))
+                // console.log(`get(res, 'response.data')`, get(res, 'response.data'))
+                // console.log(`get(res, 'stack')`, get(res, 'stack'))
 
                 if (statusText) {
                     // console.log('statusText', statusText)
@@ -479,7 +504,7 @@ function WConverhpClient(opt) {
                 break
             }
             console.log(`retry n=${n}`)
-            r = await fun(data, cbProgress)
+            r = await fun(type, data, cbProgress)
         }
 
         if (r.state === 'success') {
@@ -523,6 +548,29 @@ function WConverhpClient(opt) {
         let packageId = `${now2strp()}-${genID()}`
         // console.log('packageId', packageId)
 
+        //progCount, progWeightSlice
+        let progCount = 0
+        let progWeightSlice = 0.99 //上傳階段進度使用99%
+        // let progWeightMerge = 0.01 //合併階段進度使用1%
+
+        //cbProgressSlice
+        let cbProgressSlice = (perc, _psiz, dir) => {
+            if (dir === 'upload' && perc === 100) {
+                progCount++
+                let r = progCount / chunkTotal
+                let prog = r * progWeightSlice * 100
+                let psiz = r * n
+                cbProgress(prog, psiz, 'upload')
+            }
+        }
+
+        //cbProgressMerge
+        let cbProgressMerge = (perc, _psiz, dir) => {
+            if (dir === 'download' && perc === 100) {
+                cbProgress(100, n, 'upload')
+            }
+        }
+
         //upload slice
         for (let i = 0; i < chunkTotal; i++) {
 
@@ -544,19 +592,19 @@ function WConverhpClient(opt) {
 
             //send slice
             // console.log(`uploading chunk[${i + 1}/${chunkTotal}] of packageId[${packageId}]...`)
-            await send('slice', chunk, { headers: hd, dataType: 'blob', cbProgress })
+            await send('slice', chunk, { headers: hd, dataType: 'blob', cbProgress: cbProgressSlice })
             // console.log(`upload chunk[${i + 1}/${chunkTotal}] of packageId[${packageId}] done`, res)
 
         }
 
         //send merge
-        // console.log(`merging tempId[${tempId}]...`)
+        console.log(`merging tempId[${tempId}]...`)
         let msg = {
             'filename': tempId,
             'chunk-total': chunkTotal,
             'package-id': packageId,
         }
-        let resMg = await send('slicemerge', msg, { dataType: 'obj', cbProgress })
+        let resMg = await send('slicemerge', msg, { dataType: 'json', cbProgress: cbProgressMerge })
         // console.log(`merge tempId[${tempId}] done`, resMg)
 
         return resMg
@@ -580,7 +628,14 @@ function WConverhpClient(opt) {
             .then((msg) => {
                 // console.log('msg', msg)
 
-                //check
+                //check, 若為字串為錯誤訊息
+                if (isestr(msg)) {
+                    state = 'error'
+                    res = msg
+                    return
+                }
+
+                //check, 若為非物件為非預期錯誤
                 if (!iseobj(msg)) {
                     console.log('msg is not an effective object', msg)
                     state = 'error'
@@ -588,7 +643,7 @@ function WConverhpClient(opt) {
                     return
                 }
 
-                //check, 預期msg格式為{func,input,output}, 但input會刪除
+                //check, 若不存在output為非預期錯誤, msg格式為{func,input,output}但input會刪除
                 if (!haskey(msg, 'output')) {
                     console.log('invalid msg.output', msg)
                     state = 'error'
@@ -604,13 +659,6 @@ function WConverhpClient(opt) {
                 res = msg
             })
 
-        //r
-        let r = {
-            state,
-            msg: res,
-        }
-        // console.log('sendData r', r)
-
         //check
         if (state === '') {
             // console.log('invalid state', r)
@@ -621,11 +669,11 @@ function WConverhpClient(opt) {
         //check
         if (state === 'error') {
             // console.log('send data error', r)
-            eeEmit('error', `send data error`)
-            return Promise.reject('send data error')
+            // eeEmit('error', res) //一般錯誤會嘗試n次, 每次也都會emit, 故此處不再基於已知state='error'時再emit
+            return Promise.reject(res)
         }
 
-        return r.msg
+        return res
     }
 
     //upload

package/src/WConverhpServer.mjs

@@ -38,7 +38,7 @@ import fsDeleteFile from 'wsemi/src/fsDeleteFile.mjs'
  * @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
+ * @returns {Object} 回傳事件物件，可監聽事件execute、upload、handler
  * @example
  *
  * import _ from 'lodash-es'
@@ -194,8 +194,8 @@ function WConverhpServer(opt = {}) {
 
         //create server
         server = Hapi.server({
-            port,
             //host: 'localhost',
+            port,
             routes: {
                 cors: {
                     origin: corsOrigins, //Access-Control-Allow-Origin
@@ -210,7 +210,7 @@ function WConverhpServer(opt = {}) {
     let ee = evem() //new events.EventEmitter()
 
     //eeEmit
-    function eeEmit(name, ...args) {
+    let eeEmit = (name, ...args) => {
         setTimeout(() => {
             ee.emit(name, ...args)
         }, 1)
@@ -309,7 +309,7 @@ function WConverhpServer(opt = {}) {
                 maxBytes: 1024 * 1024 * 1024 * 1024, //預設為1mb, 調整至1tb, 也就是給予3次方
                 maxParts: 1000 * 1000 * 1000, //預設為1000, 給予3次方
                 timeout: false, //避免請求未完成時中斷
-                output: 'stream',
+                output: 'stream', //前端用blob與application/octet-stream傳
                 parse: false,
             },
             timeout: {
@@ -332,20 +332,31 @@ function WConverhpServer(opt = {}) {
             // console.log('query', query)
 
             //token
-            let token = get(query, 'token', '')
+            // let token = get(query, 'token', '')
+            let token = get(headers, 'authorization', '')
+            token = isestr(token) ? token : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ token, headers, query })
+                let m = funCheck({ apiType: 'main', token, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
 
                 //check
                 if (m !== true) {
-                    return res.response({ error: 'permission denied' }).code(400)
+
+                    //u8aOut
+                    let out = {
+                        error: 'permission denied',
+                    }
+                    let u8aOut = obj2u8arr(out)
+                    // console.log('main u8aOut', u8aOut)
+
+                    // console.log('main return permission denied')
+                    return responseU8aStream(res, u8aOut)
                 }
 
             }
@@ -456,7 +467,7 @@ function WConverhpServer(opt = {}) {
                 maxBytes: 1024 * 1024 * 1024 * 1024, //預設為1mb, 調整至1tb, 也就是給予3次方
                 maxParts: 1000 * 1000 * 1000, //預設為1000, 給予3次方
                 timeout: false, //避免請求未完成時中斷
-                output: 'stream',
+                output: 'stream', //前端用blob與application/octet-stream傳
                 parse: false,
             },
             timeout: {
@@ -479,20 +490,31 @@ function WConverhpServer(opt = {}) {
             // console.log('query', query)
 
             //token
-            let token = get(query, 'token', '')
+            // let token = get(query, 'token', '')
+            let token = get(headers, 'authorization', '')
+            token = isestr(token) ? token : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ token, headers, query })
+                let m = funCheck({ apiType: 'slice', token, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
 
                 //check
                 if (m !== true) {
-                    return res.response({ error: 'permission denied' }).code(400)
+
+                    //u8aOut
+                    let out = {
+                        error: 'permission denied',
+                    }
+                    let u8aOut = obj2u8arr(out)
+                    // console.log('slice u8aOut', u8aOut)
+
+                    // console.log('slice return permission denied')
+                    return responseU8aStream(res, u8aOut)
                 }
 
             }
@@ -591,7 +613,8 @@ function WConverhpServer(opt = {}) {
                 maxBytes: 1024 * 1024 * 1024 * 1024, //預設為1mb, 調整至1tb, 也就是給予3次方
                 maxParts: 1000 * 1000 * 1000, //預設為1000, 給予3次方
                 timeout: false, //避免請求未完成時中斷
-                parse: true,
+                // output: 'stream',
+                parse: true, //前端送obj過來
             },
             timeout: {
                 socket: false, //避免socket自動關閉
@@ -613,20 +636,31 @@ function WConverhpServer(opt = {}) {
             // console.log('query', query)
 
             //token
-            let token = get(query, 'token', '')
+            // let token = get(query, 'token', '')
+            let token = get(headers, 'authorization', '')
+            token = isestr(token) ? token : ''
 
             //check
             if (true) {
 
                 //funCheck
-                let m = funCheck({ token, headers, query })
+                let m = funCheck({ apiType: 'merge', token, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
 
                 //check
                 if (m !== true) {
-                    return res.response({ error: 'permission denied' }).code(400)
+
+                    //u8aOut
+                    let out = {
+                        error: 'permission denied',
+                    }
+                    let u8aOut = obj2u8arr(out)
+                    // console.log('mergeu8aOut', u8aOut)
+
+                    // console.log('merge return permission denied')
+                    return responseU8aStream(res, u8aOut)
                 }
 
             }
@@ -684,7 +718,6 @@ function WConverhpServer(opt = {}) {
                         //check
                         if (!fsIsFile(pathFileChunk)) {
                             // console.log(`pathFileChunk[${pathFileChunk}] is not a file`)
-                            // return res.response({ error: `Missing chunk ${i} of filename[${filename}]` }).code(400)
                             throw new Error(`Missing chunk ${i} of filename[${filename}]`)
                         }
 

package/srv.mjs

@@ -6,7 +6,8 @@ let opt = {
     port: 8080,
     apiName: 'api',
     pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
-    funCheck: () => {
+    funCheck: ({ apiType, token, headers, query }) => {
+        console.log('funCheck', apiType, token)
         return true
     },
 }
@@ -69,6 +70,9 @@ wo.on('upload', function(input, pm) {
     }
 
 })
+wo.on('error', function(err) {
+    console.log(`Server[port:${opt.port}]: error`, err)
+})
 wo.on('handler', function(data) {
     // console.log(`Server[port:${opt.port}]: handler`, data)
 })

package/toolg/gDistRollup.mjs

@@ -11,7 +11,7 @@ fns = fns.filter((v) => {
 })
 
 rollupFiles({
-    fns: fns,
+    fns,
     fdSrc,
     fdTar,
     nameDistType: 'kebabCase',