w-converhp 2.0.13 → 2.0.15

package/test/downloadLargeFile.test.mjs

@@ -1,6 +1,6 @@
 import assert from 'assert'
 import fs from 'fs'
-// import _ from 'lodash-es'
+import _ from 'lodash-es'
 import w from 'wsemi'
 import WConverhpServer from '../src/WConverhpServer.mjs'
 import WConverhpClient from '../src/WConverhpClient.mjs'
@@ -8,11 +8,11 @@ import WConverhpClient from '../src/WConverhpClient.mjs'
 
 describe('downloadLargeFile', function() {
 
-    let msAll = []
+    let ms = []
 
     let runServer = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             port: 8083, //同時test故得要不同port
@@ -36,9 +36,8 @@ describe('downloadLargeFile', function() {
             // console.log(`Server[port:${opt.port}]: download`, input)
 
             try {
-                ms.push({ 'download': input })
+                ms.push({ 'server receive input': input })
                 // console.log('ms', ms)
-                msAll.push({ server: ms })
 
                 //fp
                 let fp = `./test/1mb.7z`
@@ -47,7 +46,7 @@ describe('downloadLargeFile', function() {
                 let streamRead = fs.createReadStream(fp) //createReadStream得指定使用test內檔案
 
                 //fileName
-                let fileName = `1mb.7z`
+                let fileName = `1mb.7z` //測試支援中文
 
                 //fileSize
                 let stats = fs.statSync(fp)
@@ -87,7 +86,7 @@ describe('downloadLargeFile', function() {
 
     let runClient = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             FormData,
@@ -108,6 +107,7 @@ describe('downloadLargeFile', function() {
         function downloadLargeFile() {
             let core = async() => {
 
+                ms.push({ 'client download input': 'id-for-file' })
                 await wo.download('id-for-file',
                     function ({ prog, p, m }) {
                         // console.log('client web: download: prog', prog, p, m)
@@ -123,7 +123,7 @@ describe('downloadLargeFile', function() {
 
                         //getFileName
                         res = w.getFileName(res)
-                        ms.push({ 'download output': res })
+                        ms.push({ 'client download done': res })
 
                         fs.unlinkSync(res) //測試完刪除臨時檔
 
@@ -133,7 +133,6 @@ describe('downloadLargeFile', function() {
                     })
 
                 // console.log('ms', ms)
-                msAll.push({ client: ms })
 
             }
             core()
@@ -148,14 +147,14 @@ describe('downloadLargeFile', function() {
         runServer()
         runClient()
         setTimeout(() => {
-            // console.log('msAll', msAll)
-            // fs.writeFileSync('./test_downloadLargeFile.json', JSON.stringify(msAll), 'utf8')
-            pm.resolve(msAll)
+            // console.log('ms', ms)
+            // fs.writeFileSync('./test_downloadLargeFile.json', JSON.stringify(ms), 'utf8')
+            pm.resolve(ms)
         }, 4000)
         return pm
     }
 
-    let res = `[{"server":[{"download":{"fileId":"id-for-file"}}]},{"client":[{"download output":"1mb.7z"}]}]`
+    let res = `[{"client download input":"id-for-file"},{"server receive input":{"fileId":"id-for-file"}},{"client download done":"1mb.7z"}]`
     it(`should return ${res} when test`, async function() {
         let r = await run()
         r = JSON.stringify(r)

package/test/executeWithFile.test.mjs

@@ -8,11 +8,11 @@ import WConverhpClient from '../src/WConverhpClient.mjs'
 
 describe('executeWithFile', function() {
 
-    let msAll = []
+    let ms = []
 
     let runServer = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             port: 8081, //同時test故得要不同port
@@ -44,7 +44,7 @@ describe('executeWithFile', function() {
                         // console.log('input.p.d.u8a', input.p.d.u8a)
                         let t = input.p.d.u8a
                         let ts = [t[0], t[1], t[2]]
-                        ms.push({ 'input.p.d.u8a': ts })
+                        ms.push({ 'server receive input.p.d.u8a': ts })
                     }
 
                     let r = {
@@ -80,7 +80,6 @@ describe('executeWithFile', function() {
 
         setTimeout(() => {
             // console.log('ms', JSON.stringify(ms))
-            msAll.push({ server: ms })
             wo.stop()
         }, 2000)
 
@@ -88,7 +87,7 @@ describe('executeWithFile', function() {
 
     let runClient = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             FormData,
@@ -121,7 +120,7 @@ describe('executeWithFile', function() {
             // console.log('p', p)
             let t = p.d.u8a
             let ts = [t[0], t[1], t[2]]
-            ms.push({ 'execute input': ts })
+            ms.push({ 'client execute input': ts })
 
             //execute
             await wo.execute('add', { p },
@@ -139,7 +138,7 @@ describe('executeWithFile', function() {
                     // w.downloadFileFromU8Arr(r._bin.name, r._bin.u8a)
                     let t = r._bin.u8a
                     let ts = [t[0], t[1], t[2]]
-                    ms.push({ 'execute output': ts })
+                    ms.push({ 'client execute done': ts })
                 })
                 .catch(function () {
                     // console.log('client web: execute: catch', err)
@@ -158,7 +157,6 @@ describe('executeWithFile', function() {
                 await execute('1mb.7z', u8a)
 
                 // console.log('ms', ms)
-                msAll.push({ client: ms })
 
             }
             core()
@@ -173,14 +171,14 @@ describe('executeWithFile', function() {
         runServer()
         runClient()
         setTimeout(() => {
-            // console.log('msAll', JSON.stringify(msAll))
-            // fs.writeFileSync('./test_executeWithFile.json', JSON.stringify(msAll), 'utf8')
-            pm.resolve(msAll)
+            // console.log('ms', JSON.stringify(ms))
+            // fs.writeFileSync('./test_executeWithFile.json', JSON.stringify(ms), 'utf8')
+            pm.resolve(ms)
         }, 4000)
         return pm
     }
 
-    let res = `[{"client":[{"execute input":[55,122,188]},{"execute output":[52,66,97]}]},{"server":[{"input.p.d.u8a":[55,122,188]}]}]`
+    let res = `[{"client execute input":[55,122,188]},{"server receive input.p.d.u8a":[55,122,188]},{"client execute done":[52,66,97]}]`
     it(`should return ${res} when test`, async function() {
         let r = await run()
         r = JSON.stringify(r)

package/test/executeWithU8a.test.mjs

@@ -1,5 +1,5 @@
 import assert from 'assert'
-// import fs from 'fs'
+import fs from 'fs'
 import _ from 'lodash-es'
 import w from 'wsemi'
 import WConverhpServer from '../src/WConverhpServer.mjs'
@@ -8,11 +8,11 @@ import WConverhpClient from '../src/WConverhpClient.mjs'
 
 describe('executeWithU8a', function() {
 
-    let msAll = []
+    let ms = []
 
     let runServer = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             port: 8080,
@@ -42,7 +42,7 @@ describe('executeWithU8a', function() {
 
                     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 })
+                        ms.push({ 'server receive input.p.d.u8a': input.p.d.u8a })
                     }
 
                     let r = {
@@ -78,7 +78,6 @@ describe('executeWithU8a', function() {
 
         setTimeout(() => {
             // console.log('ms', JSON.stringify(ms))
-            msAll.push({ server: ms })
             wo.stop()
         }, 2000)
 
@@ -86,7 +85,7 @@ describe('executeWithU8a', function() {
 
     let runClient = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             FormData,
@@ -117,7 +116,7 @@ describe('executeWithU8a', function() {
                 },
             }
             // console.log('p', p)
-            ms.push({ 'execute input': p })
+            ms.push({ 'client execute input': p })
 
             //execute
             await wo.execute('add', { p },
@@ -133,7 +132,7 @@ describe('executeWithU8a', function() {
                     // 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 })
+                    ms.push({ 'client execute done': r })
                 })
                 .catch(function () {
                     // console.log('client web: execute: catch', err)
@@ -152,7 +151,6 @@ describe('executeWithU8a', function() {
                 await execute('zdata.b1', u8a)
 
                 // console.log('ms', JSON.stringify(ms))
-                msAll.push({ client: ms })
 
             }
             core()
@@ -167,14 +165,14 @@ describe('executeWithU8a', function() {
         runServer()
         runClient()
         setTimeout(() => {
-            // console.log('msAll', JSON.stringify(msAll))
-            // fs.writeFileSync('./test_executeWithU8a.json', JSON.stringify(msAll), 'utf8')
-            pm.resolve(msAll)
+            // console.log('ms', JSON.stringify(ms))
+            // fs.writeFileSync('./test_executeWithU8a.json', JSON.stringify(ms), 'utf8')
+            pm.resolve(ms)
         }, 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}}]}]`
+    let res = `[{"client execute input":{"a":12,"b":34.56,"c":"test中文","d":{"name":"zdata.b1","u8a":{"0":66,"1":97,"2":115}}}},{"server receive input.p.d.u8a":{"0":66,"1":97,"2":115}},{"client execute done":{"_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}}}}]`
     it(`should return ${res} when test`, async function() {
         let r = await run()
         r = JSON.stringify(r)

package/test/uploadLargeFile.test.mjs

@@ -1,6 +1,6 @@
 import assert from 'assert'
 import fs from 'fs'
-// import _ from 'lodash-es'
+import _ from 'lodash-es'
 import w from 'wsemi'
 import WConverhpServer from '../src/WConverhpServer.mjs'
 import WConverhpClient from '../src/WConverhpClient.mjs'
@@ -8,11 +8,11 @@ import WConverhpClient from '../src/WConverhpClient.mjs'
 
 describe('uploadLargeFile', function() {
 
-    let msAll = []
+    let ms = []
 
     let runServer = () => {
 
-        let ms = []
+        // let ms = []
 
         let opt = {
             port: 8082, //同時test故得要不同port
@@ -41,7 +41,7 @@ describe('uploadLargeFile', function() {
                 let u8a = new Uint8Array(b)
                 let t = u8a
                 let ts = [t[0], t[1], t[2]]
-                ms.push({ 'receive and return': ts })
+                ms.push({ 'server receive': ts })
 
                 fs.unlinkSync(`./${input.path}`) //測試完刪除臨時檔
 
@@ -63,7 +63,6 @@ describe('uploadLargeFile', function() {
 
         setTimeout(() => {
             // console.log('ms', ms)
-            msAll.push({ server: ms })
             wo.stop()
         }, 2000)
 
@@ -71,8 +70,6 @@ describe('uploadLargeFile', function() {
 
     let runClient = () => {
 
-        let ms = []
-
         let opt = {
             FormData,
             url: 'http://localhost:8082', //同時test故得要不同port
@@ -98,7 +95,7 @@ describe('uploadLargeFile', function() {
                 // console.log('uploadLargeFile u8a', u8a)
                 let t = u8a
                 let ts = [t[0], t[1], t[2]]
-                ms.push({ 'upload u8a.length': ts })
+                ms.push({ 'client upload start': `u8a.length[${ts}]` })
 
                 await wo.upload('./1mb.7z', u8a,
                     function ({ prog, p, m }) {
@@ -109,14 +106,13 @@ describe('uploadLargeFile', function() {
                     })
                     .then(function(res) {
                         // console.log('client web: upload: then', res)
-                        ms.push({ 'upload output': { filename: res.filename } })
+                        ms.push({ 'client upload done': { filename: res.filename } })
                     })
                     .catch(function () {
                         // console.log('client web: upload: catch', err)
                     })
 
                 // console.log('ms', ms)
-                msAll.push({ client: ms })
 
             }
             core()
@@ -131,14 +127,14 @@ describe('uploadLargeFile', function() {
         runServer()
         runClient()
         setTimeout(() => {
-            // console.log('msAll', msAll)
-            // fs.writeFileSync('./test_uploadLargeFile.json', JSON.stringify(msAll), 'utf8')
-            pm.resolve(msAll)
+            // console.log('ms', ms)
+            // fs.writeFileSync('./test_uploadLargeFile.json', JSON.stringify(ms), 'utf8')
+            pm.resolve(ms)
         }, 4000)
         return pm
     }
 
-    let res = `[{"client":[{"upload u8a.length":[55,122,188]},{"upload output":{"filename":"./1mb.7z"}}]},{"server":[{"receive and return":[55,122,188]}]}]`
+    let res = `[{"client upload start":"u8a.length[55,122,188]"},{"server receive":[55,122,188]},{"client upload done":{"filename":"./1mb.7z"}}]`
     it(`should return ${res} when test`, async function() {
         let r = await run()
         r = JSON.stringify(r)