w-converhp 1.0.39 → 2.0.0

package/.github/workflows/ci-test.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20.x]
 
     steps:
     - uses: actions/checkout@v2

package/README.md

@@ -4,7 +4,6 @@ An operator for hapi in nodejs and browser.
 ![language](https://img.shields.io/badge/language-JavaScript-orange.svg) 
 [![npm version](http://img.shields.io/npm/v/w-converhp.svg?style=flat)](https://npmjs.org/package/w-converhp) 
 [![license](https://img.shields.io/npm/l/w-converhp.svg?style=flat)](https://npmjs.org/package/w-converhp) 
-[![gzip file size](http://img.badgesize.io/yuda-lyu/w-converhp/master/dist/w-converhp-server.umd.js.svg?compression=gzip)](https://github.com/yuda-lyu/w-converhp)
 [![npm download](https://img.shields.io/npm/dt/w-converhp.svg)](https://npmjs.org/package/w-converhp) 
 [![npm download](https://img.shields.io/npm/dm/w-converhp.svg)](https://npmjs.org/package/w-converhp)
 [![jsdelivr download](https://img.shields.io/jsdelivr/npm/hm/w-converhp.svg)](https://www.jsdelivr.com/package/npm/w-converhp)
@@ -34,68 +33,44 @@ import WConverhpServer from 'w-converhp/dist/w-converhp-server.umd.js'
 let opt = {
     port: 8080,
     apiName: 'api',
+    pathStaticFiles: '.', //要存取專案資料夾下web.html, 故不能給dist
+    funCheck: () => {
+        return true
+    },
 }
 
 //new
 let wo = new WConverhpServer(opt)
 
-wo.on('open', function() {
-    console.log(`Server[port:${opt.port}]: open`)
-
-    //broadcast
-    let n = 0
-    setInterval(() => {
-        n += 1
-        let o = {
-            text: `server broadcast hi(${n})`,
-            data: new Uint8Array([66, 97, 115]), //support Uint8Array data
-        }
-        wo.broadcast(o, function (prog) {
-            console.log('broadcast prog', prog)
-        })
-    }, 1000)
-
-})
-wo.on('error', function(err) {
-    console.log(`Server[port:${opt.port}]: error`, err)
-})
-wo.on('clientChange', function(num) {
-    console.log(`Server[port:${opt.port}]: now clients: ${num}`)
-})
-wo.on('clientEnter', function(clientId, data) {
-    console.log(`Server[port:${opt.port}]: client enter: ${clientId}`)
-
-    //deliver
-    wo.deliver(clientId, `server deliver hi(${clientId})`)
-
-})
-wo.on('clientLeave', function(clientId, data) {
-    console.log(`Server[port:${opt.port}]: client leave: ${clientId}`)
-})
 wo.on('execute', function(func, input, pm) {
-    //console.log(`Server[port:${opt.port}]: execute`, func, input)
+    // console.log(`Server[port:${opt.port}]: execute`, func, input)
     console.log(`Server[port:${opt.port}]: execute`, func)
 
     try {
 
         if (func === 'add') {
 
-            //save
             if (_.get(input, 'p.d.u8a', null)) {
-                // fs.writeFileSync(input.p.d.name, Buffer.from(input.p.d.u8a))
-                // console.log('writeFileSync input.p.d.name', input.p.d.name)
+                console.log('input.p.d.u8a', input.p.d.u8a)
             }
 
             let r = {
-                ab: input.p.a + input.p.b,
-                v: [11, 22.22, 'abc', { x: '21', y: 65.43, z: 'test中文' }],
-                file: {
+                _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([66, 97, 115]),
-                    //u8a: new Uint8Array(fs.readFileSync('C:\\Users\\Administrator\\Desktop\\z500mb.7z')),
+                    // name: '100mb.7z',
+                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\100mb.7z')),
+                    // name: '500mb.7z',
+                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\500mb.7z')),
+                    // name: '1000mb.7z',
+                    // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\1000mb.7z')),
                 },
             }
+
             pm.resolve(r)
+
         }
         else {
             console.log('invalid func')
@@ -109,27 +84,23 @@ wo.on('execute', function(func, input, pm) {
     }
 
 })
-wo.on('broadcast', function(data) {
-    console.log(`Server[port:${opt.port}]: broadcast`, data)
+wo.on('upload', function(input, pm) {
+    console.log(`Server[port:${opt.port}]: upload`, input)
+
+    try {
+        let output = input
+        pm.resolve(output)
+    }
+    catch (err) {
+        console.log('execute error', err)
+        pm.reject('execute error')
+    }
+
 })
-wo.on('deliver', function(data) {
-    console.log(`Server[port:${opt.port}]: deliver`, data)
+wo.on('handler', function(data) {
+    // console.log(`Server[port:${opt.port}]: handler`, data)
 })
 
-// Server running at: http://localhost:8080
-// Server[port:8080]: open
-// Server[port:8080]: execute add
-// Server[port:8080]: broadcast client nodejs[port:8080] broadcast hi
-// Server[port:8080]: deliver client nodejs[port:8080] deliver hi
-// Server[port:8080]: client enter: [random key]
-// Server[port:8080]: now clients: 1
-// broadcast prog 100
-// Server[port:8080]: execute add
-// Server[port:8080]: broadcast client web broadcast hi
-// Server[port:8080]: deliver client web deliver hi
-// Server[port:8080]: client enter: [random key]
-// Server[port:8080]: now clients: 2
-// broadcast prog 100
 ```
 #### Example for w-converhp-client:
 > **Link:** [[dev source code](https://github.com/yuda-lyu/w-converhp/blob/master/scla.mjs)]
@@ -137,6 +108,7 @@ wo.on('deliver', function(data) {
 import WConverhpClient from 'w-converhp/dist/w-converhp-client.umd.js'
 
 let opt = {
+    FormData,
     url: 'http://localhost:8080',
     apiName: 'api',
 }
@@ -144,80 +116,90 @@ let opt = {
 //new
 let wo = new WConverhpClient(opt)
 
-wo.on('open', function() {
-    console.log('client nodejs[port:8080]: open')
-})
-wo.on('openOnce', function() {
-    console.log('client nodejs[port:8080]: openOnce')
+async function execute(name, u8a) {
 
     //p
-    let name = 'zdata.b1'
     let p = {
         a: 12,
         b: 34.56,
         c: 'test中文',
         d: {
-            name: name,
-            u8a: new Uint8Array([66, 97, 115]),
-            //u8a: new Uint8Array(fs.readFileSync('C:\\Users\\Administrator\\Desktop\\'+name)),
-        }
+            name,
+            u8a,
+        },
     }
+    console.log('p', p)
 
     //execute
-    wo.execute('add', { p },
+    await wo.execute('add', { p },
         function (prog, p, m) {
-            console.log('client nodejs[port:8080]: execute: prog', prog, p, m)
+            console.log('client web: execute: prog', prog, p, m)
         })
         .then(function(r) {
-            console.log('client nodejs[port:8080]: execute: add', 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 nodejs[port:8080]: execute: catch', err)
+        .catch(function (err) {
+            console.log('client web: execute: catch', err)
         })
 
-    //broadcast
-    wo.broadcast('client nodejs[port:8080] broadcast hi', function (prog) {
-        console.log('client nodejs[port:8080]: broadcast: prog', prog)
-    })
-        .catch(function(err) {
-            console.log('client nodejs[port:8080]: broadcast: catch', err)
-        })
+}
 
-    //deliver
-    wo.deliver('client nodejs[port:8080] deliver hi', function (prog) {
-        console.log('client nodejs[port:8080]: deliver: prog', prog)
-    })
-        .catch(function(err) {
-            console.log('client nodejs[port:8080]: deliver: catch', err)
-        })
+function executeWithU8a() {
+    let core = async() => {
 
-})
-wo.on('close', function() {
-    console.log('client nodejs[port:8080]: close')
-})
-wo.on('error', function(err) {
-    console.log('client nodejs[port:8080]: error', err)
-})
-wo.on('reconn', function() {
-    console.log('client nodejs[port:8080]: reconn')
-})
-wo.on('broadcast', function(data) {
-    console.log('client nodejs[port:8080]: broadcast', data)
-})
-wo.on('deliver', function(data) { 
-    console.log('client nodejs[port:8080]: deliver', data)
-})
+        //u8a
+        let u8a = new Uint8Array([66, 97, 115])
+        console.log('executeWithU8a u8a', u8a)
+
+        //execute
+        await execute('zdata.b1', u8a)
+
+    }
+    core()
+}
+executeWithU8a()
+
+function executeWithFile() {
+    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()
+}
+executeWithFile()
+
+function uploadLargeFile() {
+    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()
+}
+uploadLargeFile()
 
-// client nodejs[port:8080]: open
-// client nodejs[port:8080]: openOnce
-// client nodejs[port:8080]: execute: add {
-//   ab: 46.56,
-//   v: [ 11, 22.22, 'abc', { x: '21', y: 65.43, z: 'test中文' } ],
-//   file: { name: 'zdata.b2', u8a: Uint8Array [ 66, 97, 115 ] }
-// }
-// client nodejs[port:8080]: deliver { mode: 'deliver', data: 'server deliver hi([random key])' }
-// client nodejs[port:8080]: broadcast { text: 'server broadcast hi(1)', data: Uint8Array [ 66, 97, 115 ] }
-// client nodejs[port:8080]: broadcast { text: 'server broadcast hi(2)', data: Uint8Array [ 66, 97, 115 ] }
 ```
 
 ### In a browser(UMD module):
@@ -225,95 +207,132 @@ wo.on('deliver', function(data) {
 
 [Necessary] Add script for w-converhp-client.
 ```alias
-<script src="https://cdn.jsdelivr.net/npm/w-converhp@1.0.39/dist/w-converhp-client.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/w-converhp@2.0.0/dist/w-converhp-client.umd.js"></script>
 ```
 #### Example for w-converhp-client:
 > **Link:** [[dev source code](https://github.com/yuda-lyu/w-converhp/blob/master/web.html)]
 ```alias
 
 let opt = {
+    // FormData, //使用瀏覽器內建FormData, 非後端不須另外提供
     url: 'http://localhost:8080',
+    apiName: 'api',
 }
 
 //new
 let WConverhpClient=window['w-converhp-client']
 let wo = new WConverhpClient(opt)
 
-wo.on('open', function() {
-    console.log('client web: open')
-})
-wo.on('openOnce', function() {
-    console.log('client web: openOnce')
+async function execute(name, u8a){
 
     //p
-    let name = 'zdata.b1'
     let p = {
         a: 12,
         b: 34.56,
         c: 'test中文',
         d: {
             name: name,
-            u8a: new Uint8Array([66, 97, 115]),
-            //u8a: new Uint8Array(fs.readFileSync('C:\\Users\\Administrator\\Desktop\\'+name)),
-        }
+            u8a,
+        },
     }
+    console.log('p',p)
 
     //execute
-    wo.execute('add', { p:p },
+    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)
+            wsemi.downloadFileFromU8Arr(r._bin.name,r._bin.u8a)
         })
         .catch(function (err) {
             console.log('client web: execute: catch', err)
         })
 
-    //broadcast
-    wo.broadcast('client web broadcast hi', function (prog) {
-        console.log('client web: broadcast: prog', prog)
-    })
-        .catch(function (err) {
-            console.log('client web: broadcast: catch', err)
-        })
+}
 
-    //deliver
-    wo.deliver('client web deliver hi', function (prog) {
-        console.log('client web: deliver: prog', prog)
-    })
-        .catch(function (err) {
-            console.log('client web: deliver: catch', err)
-        })
+function executeWithU8a() {
+    let core = async()=>{
 
-})
-wo.on('close', function() {
-    console.log('client web: close')
-})
-wo.on('error', function(err) {
-    console.log('client web: error', err)
-})
-wo.on('reconn', function() {
-    console.log('client web: reconn')
-})
-wo.on('broadcast', function(data) {
-    console.log('client web: broadcast', data)
-})
-wo.on('deliver', function(data) { 
-    console.log('client web: deliver', data)
-})
-wo.on('handler', function(data) {
-    // console.log(`Server[port:${opt.port}]: handler`, data)
-})
+        //u8a
+        let u8a = new Uint8Array([66, 97, 115])
+        console.log('executeWithU8a u8a', u8a)
+    
+        //execute
+        await execute('zdata.b1', u8a)
+
+    }
+    core()
+}
+
+function executeWithFile() {
+    let core = async()=>{
+
+        let msg = await wsemi.domShowInputAndGetFiles({ sizeMbLimit: 100*1000 }) //100g
+        console.log('domShowInputAndGetFiles msg',msg)
+
+        //check
+        if(Object.keys(msg.errs).length > 0){
+            console.log('errs',msg.errs)
+            return
+        }
+
+        //check
+        if(msg.files.length===0){
+            return 
+        }
+
+        //file
+        let file = msg.files[0]
+        console.log('file',file)
+
+        //blob2u8arr
+        let u8a = await wsemi.blob2u8arr(file)
+        console.log('executeWithFile u8a',u8a)
+        
+        //execute
+        await execute(file.name,u8a)
+
+    }
+    core()
+}
+
+function uploadLargeFile(){
+    let core = async()=>{
+
+        let msg = await wsemi.domShowInputAndGetFiles({ sizeMbLimit: 100*1000 }) //100g
+        console.log('domShowInputAndGetFiles msg',msg)
+
+        //check
+        if(Object.keys(msg.errs).length > 0){
+            console.log('errs',msg.errs)
+            return
+        }
+
+        //check
+        if(msg.files.length===0){
+            return 
+        }
+
+        //file
+        let file = msg.files[0]
+        console.log('file',file)
+
+        //upload
+        await wo.upload(file.name, file,
+            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()
+}
 
-// client web: open
-// client web: openOnce
-// client web: execute: add {
-//   ab: 46.56,
-//   v: [ 11, 22.22, 'abc', { x: '21', y: 65.43, z: 'test中文' } ],
-//   file: { name: 'zdata.b2', u8a: Uint8Array [ 66, 97, 115 ] }
-// }
-// client web: deliver { mode: 'deliver', data: 'server deliver hi([random key])' }
-// client web: broadcast { text: 'server broadcast hi(1)', data: Uint8Array [ 66, 97, 115 ] }
-// client web: broadcast { text: 'server broadcast hi(2)', data: Uint8Array [ 66, 97, 115 ] }
 ```