w-converhp 2.0.47 → 2.0.48

package/src/WConverhpClient.mjs

@@ -12,12 +12,14 @@ 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 dig from 'wsemi/src/dig.mjs'
 import strright from 'wsemi/src/strright.mjs'
 import b642str from 'wsemi/src/b642str.mjs'
 import blob2u8arr from 'wsemi/src/blob2u8arr.mjs'
 import obj2u8arr from 'wsemi/src/obj2u8arr.mjs'
 import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import pmConvertResolve from 'wsemi/src/pmConvertResolve.mjs'
+import delay from 'wsemi/src/delay.mjs'
 import getFileXxHash from 'wsemi/src/getFileXxHash.mjs'
 
 
@@ -136,7 +138,7 @@ function WConverhpClient(opt) {
     //retry
     let retry = get(opt, 'retry')
     if (!isp0int(retry)) {
-        retry = 3
+        retry = 10
     }
 
     //env
@@ -159,22 +161,22 @@ function WConverhpClient(opt) {
         //urlUse
         let urlUse = ''
         if (type === 'basic') {
-            urlUse = `${url}/main` //bbb
+            urlUse = `${url}/main`
         }
         else if (type === 'upload-controller') {
-            urlUse = `${url}/ulctr` //bbb
+            urlUse = `${url}/ulctr`
         }
         else if (type === 'slice') {
-            urlUse = `${url}/slc` //bbb
+            urlUse = `${url}/slc`
         }
         else if (type === 'download-get-filename') {
-            urlUse = `${url}/dwgfn` //bbb
+            urlUse = `${url}/dwgfn`
         }
         else if (type === 'download-get') {
-            urlUse = `${url}/dwgf` //bbb
+            urlUse = `${url}/dwgf`
         }
         else if (type === 'download') {
-            urlUse = `${url}/dw` //bbb
+            urlUse = `${url}/dw`
         }
         else {
             throw new Error(`invalid type[${type}]`)
@@ -184,7 +186,7 @@ function WConverhpClient(opt) {
     }
 
     //res2u8arr
-    async function res2u8arr(bb) {
+    let res2u8arr = async(bb) => {
         //blob(in browser) or buffer(in nodejs) to u8a
         let u8a
         if (env === 'browser') {
@@ -197,7 +199,7 @@ function WConverhpClient(opt) {
     }
 
     //u8arr2bb
-    function u8arr2bb(u8a) {
+    let u8arr2bb = (u8a) => {
         //u8a to blob(in browser) or buffer(in nodejs)
         let bb
         if (env === 'browser') {
@@ -210,7 +212,7 @@ function WConverhpClient(opt) {
     }
 
     //send
-    async function send(type, pkg, opt = {}) {
+    let send = async(type, pkg, opt = {}) => {
 
         //headers
         let headers = get(opt, 'headers')
@@ -317,54 +319,6 @@ function WConverhpClient(opt) {
             token = await token
         }
 
-        //s
-        let s = {
-            method: 'POST',
-            url: urlUse,
-            data: dd,
-            headers: {
-                Authorization: `${tokenType} ${token}`,
-                ...ct,
-                ...headers,
-            },
-            timeout: 60 * 60 * 1000, //1hr
-            maxContentLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
-            maxBodyLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
-            responseType: rt,
-            onUploadProgress: function(ev) {
-                //console.log('onUploadProgress', ev)
-
-                //r
-                let r = 0
-                let loaded = ev.loaded
-                let total = ev.total
-                if (ispint(total)) {
-                    r = (loaded * 100) / total
-                }
-
-                //cbProgress
-                cbProgress({ prog: Math.floor(r), p: loaded, m: 'upload' })
-
-            },
-            onDownloadProgress: function (ev) {
-                // console.log('onDownloadProgress', ev)
-
-                //r
-                let r = 0
-                let loaded = ev.loaded
-                // let total = ev.srcElement.getResponseHeader('Content-length') //若需要得知下載進度, 需於伺服器回傳時提供Content-length
-                let total = ev.total
-                if (ispint(total)) {
-                    r = (loaded * 100) / total
-                }
-
-                //cbProgress
-                cbProgress({ prog: Math.floor(r), p: loaded, m: 'download' })
-
-            },
-        }
-        // console.log('s', s)
-
         //getFilenameByHeader
         let getFilenameByHeader = (contentDisposition) => {
             let fn = 'unknow'
@@ -378,7 +332,7 @@ function WConverhpClient(opt) {
         }
 
         //downloadStream
-        let downloadStream = async (res) => {
+        let downloadStream = async(res) => {
             // console.log('res.headers', res.headers)
 
             //pm
@@ -476,61 +430,151 @@ function WConverhpClient(opt) {
             return pm
         }
 
-        //axios
-        axios(s)
-            .then(async (res) => {
-                // console.log('axios then', res)
-
-                //check download
-                if (type === 'download') {
-                    await downloadStream(res)
-                        .then((_res) => {
-                            pm.resolve(_res)
-                        })
-                        .catch((_err) => {
-                            pm.reject(_err)
-                        })
-                    return
+        //s
+        let s = {
+            method: 'POST',
+            url: urlUse,
+            data: dd,
+            headers: {
+                Authorization: `${tokenType} ${token}`,
+                ...ct,
+                ...headers,
+            },
+            timeout: 60 * 60 * 1000, //1hr
+            maxContentLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
+            maxBodyLength: Infinity, //1024 * 1024 * 1024, Infinity //axios於nodejs中會限制內容大小故需改為無限
+            responseType: rt,
+            onUploadProgress: function(ev) {
+                //console.log('onUploadProgress', ev)
+
+                //r
+                let r = 0
+                let loaded = ev.loaded
+                let total = ev.total
+                if (ispint(total)) {
+                    r = (loaded * 100) / total
                 }
 
-                //bb
-                let bb = get(res, 'data')
-                // console.log('bb', bb)
+                //cbProgress
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'upload' })
 
-                //res2u8arr
-                let u8a = await res2u8arr(bb)
-                // console.log('u8a', u8a)
+            },
+            onDownloadProgress: function (ev) {
+                // console.log('onDownloadProgress', ev)
 
-                //u8arr2obj
-                let data = u8arr2obj(u8a)
-                // console.log('data', data)
+                //r
+                let r = 0
+                let loaded = ev.loaded
+                // let total = ev.srcElement.getResponseHeader('Content-length') //若需要得知下載進度, 需於伺服器回傳時提供Content-length
+                let total = ev.total
+                if (ispint(total)) {
+                    r = (loaded * 100) / total
+                }
+
+                //cbProgress
+                cbProgress({ prog: Math.floor(r), p: loaded, m: 'download' })
+
+            },
+        }
+        // console.log('s', s)
+
+        //callApiCore, 處理axios成功then時訊息, catch時直接向外傳遞
+        let callApiCore = async() => {
+
+            //axios, catch時直接向外傳遞
+            let res = await axios(s)
+
+            //check, download時直接轉由downloadStream處理res, catch時直接向外傳遞
+            if (type === 'download') {
+                return await downloadStream(res)
+            }
+
+            //bb
+            let bb = get(res, 'data')
+            // console.log('bb', bb)
+
+            //res2u8arr, catch時直接向外傳遞
+            let u8a = await res2u8arr(bb)
+            // console.log('u8a', u8a)
+
+            //u8arr2obj
+            let data = u8arr2obj(u8a)
+            // console.log('data', data)
+
+            //check
+            if (!iseobj(data)) {
+                eeEmit('error', `data is not an effective object`)
+                return Promise.reject(`data is not an effective object`)
+            }
+
+            //分離伺服器資料的success或error
+            if (haskey(data, 'success')) {
+                return Promise.resolve(data.success)
+            }
+            else if (haskey(data, 'error')) {
+                eeEmit('error', data.error)
+                return Promise.reject(data.error)
+            }
+            else {
+                eeEmit('error', `data does not contain success or error`)
+                return Promise.reject(`data does not contain success or error`)
+            }
+
+        }
+
+        //callApi, 處理callApiCore失敗catch時retry
+        let callApi = async() => {
+
+            //pmConvertResolve
+            let fun = pmConvertResolve(callApiCore)
+
+            //fun
+            let r = await fun(s)
+            // console.log('r', r)
+
+            //while
+            let maxRetry = 10
+            let baseDelay = 1000 //初始延遲為1秒
+            let ratio = Math.pow(180000 / baseDelay, 1 / (maxRetry - 1)) //1.888
+            let n = 0
+            while (r.state === 'error') {
+
+                //add
+                n += 1
 
                 //check
-                if (!iseobj(data)) {
-                    // console.log('data is not an effective object', data)
-                    eeEmit('error', `data is not an effective object`)
-                    pm.reject(`data is not an effective object`)
-                    return
+                if (n > retry) {
+                    break
                 }
 
-                //分離伺服器資料的success或error
-                if (haskey(data, 'success')) {
-                    pm.resolve(data.success)
-                }
-                else if (haskey(data, 'error')) {
-                    eeEmit('error', data.error)
-                    pm.reject(data.error)
-                }
-                else {
-                    // console.log('invalid data', data)
-                    eeEmit('error', `invalid data`)
-                    pm.reject(`invalid data`)
-                }
+                //delay
+                let t = Math.round(baseDelay * Math.pow(ratio, n - 1))
+                console.log(`wait ${dig(t / 1000, 1)}(second) to retry...`)
+                await delay(t)
 
+                //retry
+                console.log(`retry n=${n}...`)
+                r = await fun(s)
+                // console.log(`retry n=${n} done`)
+
+            }
+
+            if (r.state === 'success') {
+                return r.msg
+            }
+            else {
+                return Promise.reject(r.msg)
+            }
+        }
+
+        //callApi
+        await callApi()
+            .then((res) => {
+                pm.resolve(res)
             })
-            .catch(async (res) => {
+            .catch(async(res) => {
                 // console.log('axios catch', res.toJSON())
-                //Network Error除可能是網路斷線之外, 可能被瀏覽器外掛封鎖阻擋, 亦可能因硬碟空間不足(<4g)無法下載被瀏覽器拒絕
+                //Network Error除可能是網路斷線之外, 可能被瀏覽器外掛封鎖阻擋, 亦可能因硬碟空間不足無法下載被瀏覽器拒絕
 
                 //data
                 let data = null
@@ -572,7 +616,7 @@ function WConverhpClient(opt) {
     }
 
     //sendPkg
-    async function sendPkg(type, data, cbProgress) {
+    let sendPkg = async(type, data, cbProgress) => {
 
         //bb
         let bb = null
@@ -597,35 +641,8 @@ function WConverhpClient(opt) {
         return res
     }
 
-    //sendData
-    async function sendData(type, data, cbProgress) {
-
-        //fun
-        let fun = pmConvertResolve(sendPkg)
-
-        //sendPkg
-        let r = await fun(type, data, cbProgress)
-
-        let n = 0
-        while (r.state === 'error') {
-            n += 1
-            if (n > retry) {
-                break
-            }
-            console.log(`retry n=${n}`)
-            r = await fun(type, data, cbProgress)
-        }
-
-        if (r.state === 'success') {
-            return r.msg
-        }
-        else {
-            return Promise.reject(r.msg)
-        }
-    }
-
     //calcHash
-    async function calcHash(inp) {
+    let calcHash = async(inp) => {
 
         //bb
         let bb = null
@@ -644,7 +661,7 @@ function WConverhpClient(opt) {
     }
 
     //sendDataSlice
-    async function sendDataSlice(fileTotalName, bb, cbProgress) {
+    let sendDataSlice = async(fileTotalName, bb, cbProgress) => {
 
         //n
         let n = 0
@@ -816,65 +833,29 @@ function WConverhpClient(opt) {
             //chunk
             let chunk = bb.slice(start, end)
 
-            //sendDataSlice
-            let sendDataSlice = async() => {
-
-                //hd
-                let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
-                    'chunk-index': i,
-                    'chunk-total': chunkTotal,
-                    'package-id': packageId,
-                }
-
-                //send slice
-                let resSl = await send('slice', chunk, {
-                    headers: hd,
-                    dataType: 'blob',
-                    cbProgress: (msg) => {
-                        // console.log('cbProgress', msg)
-                        // let perc = msg.prog
-                        // let dir = msg.m
-                        // if (dir === 'upload' && perc === 100) {
-                        // }
-                    }
-                })
-                // console.log('resSl', resSl)
-
-                //cbProgressSlice, 因其內有累加progCount, 實際代表是須成功傳輸後才能計算與回應外部進度, 故不能直接用於send的opt.cbProgress
-                cbProgressSlice()
-
-                return resSl
+            //hd
+            let hd = { //用header傳key與value時, key不分大小寫, 故使用kebabCase
+                'chunk-index': i,
+                'chunk-total': chunkTotal,
+                'package-id': packageId,
             }
 
-            //sendDataSliceRetry
-            let sendDataSliceRetry = async() => {
-
-                //fun
-                let fun = pmConvertResolve(sendDataSlice)
-
-                //sendPkg
-                let r = await fun()
-
-                let n = 0
-                while (r.state === 'error') {
-                    n += 1
-                    if (n > retry) {
-                        break
-                    }
-                    console.log(`retry n=${n}`)
-                    r = await fun()
-                }
-
-                if (r.state === 'success') {
-                    return r.msg
+            //send slice
+            await send('slice', chunk, {
+                headers: hd,
+                dataType: 'blob',
+                cbProgress: (msg) => {
+                    // console.log('cbProgress', msg)
+                    // let perc = msg.prog
+                    // let dir = msg.m
+                    // if (dir === 'upload' && perc === 100) {
+                    // }
                 }
-                else {
-                    return Promise.reject(r.msg)
-                }
-            }
+            })
+            // console.log('resSl', resSl)
 
-            //sendDataSliceRetry
-            await sendDataSliceRetry()
+            //cbProgressSlice, 因其內有累加progCount, 實際代表是須成功傳輸後才能計算與回應外部進度, 故不能直接用於send的opt.cbProgress
+            cbProgressSlice()
 
         }
 
@@ -950,7 +931,7 @@ function WConverhpClient(opt) {
     }
 
     //execute
-    async function execute(func, input, cbProgress) {
+    let execute = async(func, input, cbProgress) => {
 
         //msg
         let msg = {
@@ -960,10 +941,10 @@ function WConverhpClient(opt) {
             input,
         }
 
-        //sendData
+        //sendPkg
         let state = ''
         let res = null
-        await sendData('basic', msg, cbProgress)
+        await sendPkg('basic', msg, cbProgress)
             .then((msg) => {
                 // console.log('msg', msg)
 
@@ -1016,7 +997,7 @@ function WConverhpClient(opt) {
     }
 
     //upload
-    async function upload(filename, input, cbProgress) {
+    let upload = (filename, input, cbProgress) => {
 
         //bb
         let bb = input
@@ -1025,7 +1006,7 @@ function WConverhpClient(opt) {
     }
 
     //downloadNodejs
-    async function downloadNodejs(fileId, cbProgress, opt = {}) {
+    let downloadNodejs = async(fileId, cbProgress, opt = {}) => {
 
         //send download
         let msg = { fileId }
@@ -1036,7 +1017,7 @@ function WConverhpClient(opt) {
     }
 
     //downloadBrowser
-    async function downloadBrowser(fileId, cbProgress, opt = {}) {
+    let downloadBrowser = async(fileId, cbProgress, opt = {}) => {
         //交由瀏覽器下載與管理故無法監聽進度, 不使用cbProgress
 
         //token
@@ -1073,7 +1054,7 @@ function WConverhpClient(opt) {
     }
 
     //download
-    async function download(fileId, cbProgress, opt = {}) {
+    let download = async(fileId, cbProgress, opt = {}) => {
         if (env === 'browser') {
             return downloadBrowser(fileId, cbProgress, opt)
         }

package/src/WConverhpServer.mjs

@@ -448,7 +448,7 @@ function WConverhpServer(opt = {}) {
 
     //apiMain
     let apiMain = {
-        path: `/${apiName}/main`, //bbb
+        path: `/${apiName}/main`,
         method: 'POST',
         options: {
             payload: {
@@ -604,7 +604,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadCheck
     let apiUploadCheck = {
-        path: `/${apiName}/ulctr`, //bbb
+        path: `/${apiName}/ulctr`,
         method: 'POST',
         options: {
             payload: {
@@ -822,7 +822,7 @@ function WConverhpServer(opt = {}) {
 
     //apiUploadSlice
     let apiUploadSlice = {
-        path: `/${apiName}/slc`, //bbb
+        path: `/${apiName}/slc`,
         method: 'POST',
         options: {
             payload: {
@@ -960,7 +960,7 @@ function WConverhpServer(opt = {}) {
             // console.log('u8aOut', u8aOut)
 
             // //測試失敗重傳
-            // if (Math.random() < 0.9) {
+            // if (Math.random() < 0.6) {
             //     out = {
             //         error: 'force error'
             //     }
@@ -976,7 +976,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownloadGetFilename
     let apiDownloadGetFilename = {
-        path: `/${apiName}/dwgfn`, //bbb
+        path: `/${apiName}/dwgfn`,
         method: 'POST',
         options: {
             payload: {
@@ -1098,7 +1098,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownloadGetFile
     let apiDownloadGetFile = {
-        path: `/${apiName}/dwgf`, //bbb
+        path: `/${apiName}/dwgf`,
         method: 'GET',
         options: {
             timeout: {
@@ -1222,7 +1222,7 @@ function WConverhpServer(opt = {}) {
 
     //apiDownload
     let apiDownload = {
-        path: `/${apiName}/dw`, //bbb
+        path: `/${apiName}/dw`,
         method: 'POST',
         options: {
             payload: {

package/srv.mjs

@@ -135,6 +135,6 @@ setTimeout(() => {
     console.log('ms', ms)
     // console.log('ms', JSON.stringify(ms))
     wo.stop()
-}, 11113000)
+}, 3000)
 
 //node srv.mjs