w-converhp 1.0.39 → 2.0.0

package/srv.mjs

@@ -5,62 +5,31 @@ import WConverhpServer from './src/WConverhpServer.mjs'
 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]),
                     // name: '100mb.7z',
@@ -71,7 +40,9 @@ wo.on('execute', function(func, input, pm) {
                     // u8a: new Uint8Array(fs.readFileSync('D:\\開源-JS-006-2-w-converhp\\_temp\\1000mb.7z')),
                 },
             }
+
             pm.resolve(r)
+
         }
         else {
             console.log('invalid func')
@@ -85,14 +56,21 @@ wo.on('execute', function(func, input, pm) {
     }
 
 })
-wo.on('broadcast', function(data) {
-    console.log(`Server[port:${opt.port}]: broadcast`, data)
-})
-wo.on('deliver', function(data) {
-    console.log(`Server[port:${opt.port}]: deliver`, 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('handler', function(data) {
     // console.log(`Server[port:${opt.port}]: handler`, data)
 })
 
-//node --experimental-modules --es-module-specifier-resolution=node srv.mjs
+//node --experimental-modules srv.mjs

package/web.html

@@ -25,41 +25,16 @@
         <script>
 
             let opt = {
-                // FormData,
+                // 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')
-
-                //uploadU8a
-                uploadU8a()
-                   
-            })
-            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)
-            })
-            
-            function core(name, ab){
+            async function execute(name, u8a){
 
                 //p
                 let p = {
@@ -68,77 +43,107 @@
                     c: 'test中文',
                     d: {
                         name: name,
-                        u8a: ab,
-                    }
+                        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.file.name,r.file.u8a)
+                        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()=>{
 
-            }
+                    //u8a
+                    let u8a = new Uint8Array([66, 97, 115])
+                    console.log('executeWithU8a u8a', u8a)
+               
+                    //execute
+                    await execute('zdata.b1', u8a)
 
-            function uploadU8a() {
-                let u8a = new Uint8Array([66, 97, 115])
-                let bb = new Blob([u8a])
-                wsemi.blob2ab(bb)
-                    .then(function(ab){
-                        console.log('uploadU8a ab',ab)
-                        core('zdata.b1', ab)
-                    })
+                }
+                core()
             }
 
-            function uploadFile() {
+            function executeWithFile() {
+                let core = async()=>{
 
-                wsemi.domShowInputAndGetFiles()
-                    .then(function(msg){
-                        console.log('domShowInputAndGetFiles msg',msg)
+                    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(Object.keys(msg.errs).length > 0){
+                        console.log('errs',msg.errs)
+                        return
+                    }
 
-                        //file
-                        let file = msg.files[0]
-                        console.log('file',file)
+                    //check
+                    if(msg.files.length===0){
+                        return 
+                    }
 
-                        //blob2ab
-                        wsemi.blob2ab(file)
-                            .then(function(ab){
-                                console.log('uploadFile ab',ab)
-                                core(file.name,ab)
-                            })
+                    //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()
             }
 
         </script>
@@ -147,12 +152,24 @@
 
     <body>
  
-        <div>
+        <div style="padding:10px;">
     
-            <button onclick="uploadFile()">upload file</button>
+            <button onclick="executeWithU8a()">execute with u8a</button>
         
         </div>
         
+        <div style="padding:10px;">
+    
+            <button onclick="executeWithFile()">execute with file</button>
+        
+        </div>
+        
+        <div style="padding:10px;">
+    
+            <button onclick="uploadLargeFile()">upload large file</button>
+        
+        </div>
+                    
     </body>
 
 </html>

package/zdata.b1

@@ -1 +0,0 @@
-Bas