w-converhp 2.0.4 → 2.0.6

package/test/executeWithU8a.test.mjs

@@ -0,0 +1,185 @@
+import assert from 'assert'
+// import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
+import WConverhpServer from '../src/WConverhpServer.mjs'
+import WConverhpClient from '../src/WConverhpClient.mjs'
+
+
+describe('executeWithU8a', function() {
+
+    let msAll = []
+
+    let runServer = () => {
+
+        let ms = []
+
+        let opt = {
+            port: 8080,
+            apiName: 'api',
+            pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
+            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
+            },
+        }
+
+        //new
+        let wo = new WConverhpServer(opt)
+
+        wo.on('execute', (func, input, pm) => {
+            // 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')
+            }
+
+        })
+        wo.on('error', () => {
+            // console.log(`Server[port:${opt.port}]: error`, err)
+        })
+        wo.on('handler', (data) => {
+            // console.log(`Server[port:${opt.port}]: handler`, data)
+        })
+
+        setTimeout(() => {
+            // console.log('ms', JSON.stringify(ms))
+            msAll.push({ server: ms })
+            wo.stop()
+        }, 2000)
+
+    }
+
+    let runClient = () => {
+
+        let ms = []
+
+        let opt = {
+            FormData,
+            url: 'http://localhost:8080',
+            apiName: 'api',
+            getToken: () => {
+                return 'token-for-test'
+            },
+        }
+
+        //new
+        let wo = new WConverhpClient(opt)
+
+        wo.on('error', () => {
+            // console.log(`error`, err)
+        })
+
+        async function execute(name, u8a) {
+
+            //p
+            let p = {
+                a: 12,
+                b: 34.56,
+                c: 'test中文',
+                d: {
+                    name,
+                    u8a,
+                },
+            }
+            // console.log('p', p)
+            ms.push({ 'execute input': p })
+
+            //execute
+            await wo.execute('add', { p },
+                function ({ prog, p, m }) {
+                    if (m === 'upload') {
+                        // console.log('client web: execute: prog', prog * 0.5, p, m)
+                    }
+                    if (m === 'download') {
+                        // console.log('client web: execute: prog', 50 + prog * 0.5, 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)
+                    ms.push({ 'execute output': r })
+                })
+                .catch(function () {
+                    // console.log('client web: execute: catch', err)
+                })
+
+        }
+
+        function executeWithU8a() {
+            let core = async() => {
+
+                //u8a
+                let u8a = new Uint8Array([66, 97, 115])
+                // console.log('executeWithU8a u8a', u8a)
+
+                //execute
+                await execute('zdata.b1', u8a)
+
+                // console.log('ms', JSON.stringify(ms))
+                msAll.push({ client: ms })
+
+            }
+            core()
+        }
+
+        executeWithU8a()
+
+    }
+
+    let run = () => {
+        let pm = w.genPm()
+        runServer()
+        runClient()
+        setTimeout(() => {
+            // console.log('msAll', JSON.stringify(msAll))
+            // fs.writeFileSync('./test_executeWithU8a.json', JSON.stringify(msAll), 'utf8')
+            pm.resolve(msAll)
+        }, 4000)
+        return pm
+    }
+
+    let res = `[{"client":[{"execute input":{"a":12,"b":34.56,"c":"test中文","d":{"name":"zdata.b1","u8a":{"0":66,"1":97,"2":115}}}},{"execute output":{"_add":46.56,"_data":[11,22.22,"abc",{"x":"21","y":65.43,"z":"test中文"}],"_bin":{"name":"zdata.b2","u8a":{"0":52,"1":66,"2":97,"3":115}}}}]},{"server":[{"input.p.d.u8a":{"0":66,"1":97,"2":115}}]}]`
+    it(`should return ${res} when test`, async function() {
+        let r = await run()
+        r = JSON.stringify(r)
+        let rr = res
+        assert.strict.deepEqual(r, rr)
+    })
+
+})

package/test/uploadLargeFile.test.mjs

@@ -0,0 +1,149 @@
+import assert from 'assert'
+import fs from 'fs'
+// import _ from 'lodash-es'
+import w from 'wsemi'
+import WConverhpServer from '../src/WConverhpServer.mjs'
+import WConverhpClient from '../src/WConverhpClient.mjs'
+
+
+describe('uploadLargeFile', function() {
+
+    let msAll = []
+
+    let runServer = () => {
+
+        let ms = []
+
+        let opt = {
+            port: 8082, //8080, //同時test故得要不同port
+            apiName: 'api',
+            pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
+            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
+            },
+        }
+
+        //new
+        let wo = new WConverhpServer(opt)
+
+        wo.on('upload', (input, pm) => {
+            // console.log(`Server[port:${opt.port}]: upload`, input)
+
+            try {
+
+                let b = fs.readFileSync(`./${input.path}`)
+                let u8a = new Uint8Array(b)
+                let t = u8a
+                let ts = [t[0], t[1], t[2]]
+                ms.push({ 'receive and return': ts })
+
+                fs.unlinkSync(`./${input.path}`) //測試完刪除暫存檔
+
+                let output = input
+                pm.resolve(output)
+            }
+            catch (err) {
+                // console.log('upload error', err)
+                pm.reject('upload error')
+            }
+
+        })
+        wo.on('error', () => {
+            // console.log(`Server[port:${opt.port}]: error`, err)
+        })
+        wo.on('handler', (data) => {
+            // console.log(`Server[port:${opt.port}]: handler`, data)
+        })
+
+        setTimeout(() => {
+            // console.log('ms', ms)
+            msAll.push({ server: ms })
+            wo.stop()
+        }, 2000)
+
+    }
+
+    let runClient = () => {
+
+        let ms = []
+
+        let opt = {
+            FormData,
+            url: 'http://localhost:8082', //同時test故得要不同port
+            apiName: 'api',
+            getToken: () => {
+                return 'token-for-test'
+            },
+        }
+
+        //new
+        let wo = new WConverhpClient(opt)
+
+        wo.on('error', () => {
+            // console.log(`error`, err)
+        })
+
+        function uploadLargeFile() {
+            let core = async() => {
+
+                //u8a
+                let u8a = new Uint8Array(fs.readFileSync('./test/1mb.7z')) //使用test內檔案
+                // console.log('u8a.length', u8a.length)
+                // console.log('uploadLargeFile u8a', u8a)
+                let t = u8a
+                let ts = [t[0], t[1], t[2]]
+                ms.push({ 'upload u8a.length': ts })
+
+                await wo.upload('1mb.7z', u8a,
+                    function ({ prog, p, m }) {
+                        // console.log('client web: upload: prog', prog, p, m)
+                        if (m === 'upload') {
+                            // console.log('client web: upload: prog', prog)
+                        }
+                    })
+                    .then(function(res) {
+                        // console.log('client web: upload: then', res)
+                        ms.push({ 'upload output': { filename: res.filename } })
+                    })
+                    .catch(function () {
+                        // console.log('client web: upload: catch', err)
+                    })
+
+                // console.log('ms', ms)
+                msAll.push({ client: ms })
+
+            }
+            core()
+        }
+
+        uploadLargeFile()
+
+    }
+
+    let run = () => {
+        let pm = w.genPm()
+        runServer()
+        runClient()
+        setTimeout(() => {
+            // console.log('msAll', msAll)
+            // fs.writeFileSync('./test_uploadLargeFile.json', JSON.stringify(msAll), 'utf8')
+            pm.resolve(msAll)
+        }, 4000)
+        return pm
+    }
+
+    let res = `[{"client":[{"upload u8a.length":[55,122,188]},{"upload output":{"filename":"1mb.7z"}}]},{"server":[{"receive and return":[55,122,188]}]}]`
+    it(`should return ${res} when test`, async function() {
+        let r = await run()
+        r = JSON.stringify(r)
+        let rr = res
+        assert.strict.deepEqual(r, rr)
+    })
+
+})

package/toolg/gDistRollup.mjs

@@ -1,54 +1,63 @@
+import path from 'path'
 import rollupFiles from 'w-package-tools/src/rollupFiles.mjs'
-import getFiles from 'w-package-tools/src/getFiles.mjs'
-import w from 'wsemi'
+import rollupWorker from 'w-package-tools/src/rollupWorker.mjs'
 
 
 let fdSrc = './src'
 let fdTar = './dist'
-let fns = getFiles(fdSrc)
-fns = fns.filter((v) => {
-    return w.strleft(v, 1) === 'W'
-})
 
-rollupFiles({
-    fns,
-    fdSrc,
-    fdTar,
-    nameDistType: 'kebabCase',
-    globals: {
-        '@hapi/hapi': '@hapi/hapi',
-        '@hapi/inert': '@hapi/inert',
-        'events': 'events',
-        'stream': 'stream',
-        // 'form-data': 'FormData',
-        'crypto': 'crypto', //因crypto-js修改使用內建crypto方式, 會偵測nodejs並使用require內建的crypto, 故需剔除
-        // 'combined-stream': 'combined-stream',
-        // 'util': 'util',
-        // 'fs': 'fs',
-        // 'path': 'path',
-        // 'http': 'http',
-        // 'https': 'https',
-        // 'url': 'url',
-        // 'mime-types': 'mime-types',
-        // 'asynckit': 'asynckit',
-    },
-    external: [
-        '@hapi/hapi',
-        '@hapi/inert',
-        'events',
-        'stream',
-        // 'form-data',
-        'crypto',
-        // 'combined-stream',
-        // 'util',
-        // 'path',
-        // 'http',
-        // 'https',
-        // 'url',
-        // 'fs',
-        // 'stream',
-        // 'mime-types',
-        // 'asynckit',
-    ],
-})
 
+async function core() {
+
+    //因為WConverhpServer會import mergeFiles.wk.umd.js故得先編譯
+    await rollupWorker({
+        name: 'mergeFiles', //原模組名稱, 將來會掛於winodw下或於node引入使用
+        type: 'function', //原模組輸出為函數, 可傳入參數初始化
+        // execFunctionByInstance: true, //default, 原模組為計算函數回傳結果
+        fpSrc: path.resolve(fdSrc, 'mergeFiles.mjs'), //原始檔案路徑
+        fpTar: path.resolve(fdSrc, 'mergeFiles.wk.umd.js'), //檔案輸出路徑
+        formatOut: 'umd',
+        // bMinify: false,
+        globals: {
+            'path': 'path',
+            'fs': 'fs',
+        },
+        external: [
+            'path',
+            'fs',
+        ],
+    })
+        .catch((err) => {
+            console.log(err)
+        })
+
+    await rollupFiles({
+        fns: ['WConverhpServer.mjs', 'WConverhpClient.mjs'],
+        fdSrc,
+        fdTar,
+        nameDistType: 'kebabCase',
+        globals: {
+            'path': 'path',
+            'fs': 'fs',
+            'stream': 'stream',
+            'crypto': 'crypto', //因crypto-js修改使用內建crypto方式, 會偵測nodejs並使用require內建的crypto, 故需剔除
+            '@hapi/hapi': '@hapi/hapi',
+            '@hapi/inert': '@hapi/inert',
+            // 'form-data': 'FormData',
+        },
+        external: [
+            'path',
+            'fs',
+            'stream',
+            'crypto',
+            '@hapi/hapi',
+            '@hapi/inert',
+            // 'form-data',
+        ],
+    })
+
+}
+core()
+    .catch((err) => {
+        console.log(err)
+    })

package/test/all.test.mjs

@@ -1,10 +0,0 @@
-import assert from 'assert'
-
-
-describe('all', function() {
-
-    it('test in localhost', function() {
-        assert.strict.deepEqual(1, 1)
-    })
-
-})