w-converhp 2.0.16 → 2.0.18

package/docs/WConverhpServer.mjs.html

@@ -380,7 +380,7 @@ function WConverhpServer(opt = {}) {
 
     //procUpload
     async function procUpload(input) {
-        //console.log('procUpload', input)
+        // console.log('procUpload', input)
 
         //pm, pmm
         let pm = genPm()
@@ -572,15 +572,15 @@ function WConverhpServer(opt = {}) {
                 req.payload.on('end', () => {
                     // console.log(`receive payload done`)
 
-                    //fileBuffer
-                    let fileBuffer = Buffer.concat(chunks)
-                    // console.log('fileBuffer', fileBuffer, fileBuffer.length)
+                    //bb
+                    let bb = Buffer.concat(chunks)
+                    // console.log('bb', bb, bb.length)
 
                     //clear, 釋放記憶體
                     chunks = []
 
                     //resolve
-                    pm.resolve(fileBuffer)
+                    pm.resolve(bb)
 
                 })
 
@@ -611,13 +611,13 @@ function WConverhpServer(opt = {}) {
             let returnType = ''
             let returnMsg = ''
             await procDeal(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
                 })
@@ -739,10 +739,10 @@ function WConverhpServer(opt = {}) {
                 })
 
                 //error
-                req.payload.on('error', () => {
-                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] err`, err)
-                    eeEmit('error', `receive chunk[${chunkIndex + 1}/${chunkTotal}] err`)
-                    pm.reject(`chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
+                req.payload.on('error', (err) => {
+                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err)
+                    eeEmit('error', `receive chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
+                    pm.reject(`apiUploadSlice receive error: ${err.message}`)
                 })
 
                 return pm
@@ -753,15 +753,16 @@ function WConverhpServer(opt = {}) {
             let returnType = ''
             let returnMsg = ''
             await receive()
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
+                    eeEmit('error', err)
                 })
             // console.log('out', out)
 
@@ -851,12 +852,11 @@ function WConverhpServer(opt = {}) {
                 return res.response({ error: 'invalid packageId in payload' }).code(400)
             }
 
-            //core
-            let core = async() => {
+            //mergeAndPorc
+            let mergeAndPorc = async() => {
 
                 //merge
                 // console.log('merge start')
-                // let r = await merge()
                 let r = await mergeFiles(pathUploadTemp, packageId, chunkTotal, filename)
                 // console.log('merge done', r)
 
@@ -868,20 +868,21 @@ function WConverhpServer(opt = {}) {
                 return rr
             }
 
-            //core
+            //mergeAndPorc
             let out = {}
             let returnType = ''
             let returnMsg = ''
-            await core()
-                .then(function(msg) {
-                    out.success = msg
+            await mergeAndPorc()
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
+                    eeEmit('error', `${err.message}`)
                 })
             // console.log('out', out)
 
@@ -964,18 +965,18 @@ function WConverhpServer(opt = {}) {
             //inp
             let inp = { fileId }
 
-            //procDownloadGetFilename
+            //procDownload
             let out = {}
             let returnType = ''
             let returnMsg = ''
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
                 })
@@ -1090,11 +1091,11 @@ function WConverhpServer(opt = {}) {
             //procDownload
             let out = {}
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                 })
             // console.log('out', out)
 
@@ -1221,11 +1222,11 @@ function WConverhpServer(opt = {}) {
             //procDownload
             let out = {}
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                 })
             // console.log('out', out)
 
@@ -1363,7 +1364,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 09 2025 14:36:52 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 11:13:26 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/index.html

@@ -71,7 +71,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Wed Apr 09 2025 14:36:52 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 11:13:26 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-converhp",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/scld.mjs

@@ -1,7 +1,7 @@
-// import path from 'path'
-// import fs from 'fs'
-// import _ from 'lodash-es'
-// import w from 'wsemi'
+import path from 'path'
+import fs from 'fs'
+import _ from 'lodash-es'
+import w from 'wsemi'
 import FormData from 'form-data'
 import WConverhpClient from './src/WConverhpClient.mjs'
 

package/src/WConverhpClient.mjs

@@ -812,24 +812,24 @@ function WConverhpClient(opt) {
         if (ispm(token)) {
             token = await token
         }
-        console.log('token', token)
+        // console.log('token', token)
 
         //send download-get-filename
         let msg = { fileId }
         let resMg = await send('download-get-filename', msg, { dataType: 'json' })
-        console.log('resMg', resMg)
+        // console.log('resMg', resMg)
 
         //filename
         let filename = get(resMg, 'filename', '')
-        console.log('filename', filename)
+        // console.log('filename', filename)
 
         //urlUse
         let urlUse = getUrlUse('download-get')
-        console.log('urlUse', urlUse)
+        // console.log('urlUse', urlUse)
 
         //url
         let url = `${urlUse}?fileId=${fileId}&token=${token}`
-        console.log('url', url)
+        // console.log('url', url)
 
         //透過a元素打url下載, 讓瀏覽器認定為直接下載模式, 由瀏覽器展示下載進度與排入正在下載清單
         let a = document.createElement('a')

package/src/WConverhpServer.mjs

@@ -333,7 +333,7 @@ function WConverhpServer(opt = {}) {
 
     //procUpload
     async function procUpload(input) {
-        //console.log('procUpload', input)
+        // console.log('procUpload', input)
 
         //pm, pmm
         let pm = genPm()
@@ -525,15 +525,15 @@ function WConverhpServer(opt = {}) {
                 req.payload.on('end', () => {
                     // console.log(`receive payload done`)
 
-                    //fileBuffer
-                    let fileBuffer = Buffer.concat(chunks)
-                    // console.log('fileBuffer', fileBuffer, fileBuffer.length)
+                    //bb
+                    let bb = Buffer.concat(chunks)
+                    // console.log('bb', bb, bb.length)
 
                     //clear, 釋放記憶體
                     chunks = []
 
                     //resolve
-                    pm.resolve(fileBuffer)
+                    pm.resolve(bb)
 
                 })
 
@@ -564,13 +564,13 @@ function WConverhpServer(opt = {}) {
             let returnType = ''
             let returnMsg = ''
             await procDeal(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
                 })
@@ -692,10 +692,10 @@ function WConverhpServer(opt = {}) {
                 })
 
                 //error
-                req.payload.on('error', () => {
-                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] err`, err)
-                    eeEmit('error', `receive chunk[${chunkIndex + 1}/${chunkTotal}] err`)
-                    pm.reject(`chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
+                req.payload.on('error', (err) => {
+                    // console.log(`receive chunk[${chunkIndex + 1}/${chunkTotal}] of packageId[${packageId}] err`, err)
+                    eeEmit('error', `receive chunk[${chunkIndex}/${chunkTotal}] of packageId[${packageId}] err`)
+                    pm.reject(`apiUploadSlice receive error: ${err.message}`)
                 })
 
                 return pm
@@ -706,15 +706,16 @@ function WConverhpServer(opt = {}) {
             let returnType = ''
             let returnMsg = ''
             await receive()
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
+                    eeEmit('error', err)
                 })
             // console.log('out', out)
 
@@ -804,12 +805,11 @@ function WConverhpServer(opt = {}) {
                 return res.response({ error: 'invalid packageId in payload' }).code(400)
             }
 
-            //core
-            let core = async() => {
+            //mergeAndPorc
+            let mergeAndPorc = async() => {
 
                 //merge
                 // console.log('merge start')
-                // let r = await merge()
                 let r = await mergeFiles(pathUploadTemp, packageId, chunkTotal, filename)
                 // console.log('merge done', r)
 
@@ -821,20 +821,21 @@ function WConverhpServer(opt = {}) {
                 return rr
             }
 
-            //core
+            //mergeAndPorc
             let out = {}
             let returnType = ''
             let returnMsg = ''
-            await core()
-                .then(function(msg) {
-                    out.success = msg
+            await mergeAndPorc()
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
+                    eeEmit('error', `${err.message}`)
                 })
             // console.log('out', out)
 
@@ -917,18 +918,18 @@ function WConverhpServer(opt = {}) {
             //inp
             let inp = { fileId }
 
-            //procDownloadGetFilename
+            //procDownload
             let out = {}
             let returnType = ''
             let returnMsg = ''
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                     returnType = 'success'
                     returnMsg = 'need to parse'
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                     returnType = 'error'
                     returnMsg = 'need to parse'
                 })
@@ -1043,11 +1044,11 @@ function WConverhpServer(opt = {}) {
             //procDownload
             let out = {}
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                 })
             // console.log('out', out)
 
@@ -1174,11 +1175,11 @@ function WConverhpServer(opt = {}) {
             //procDownload
             let out = {}
             await procDownload(inp)
-                .then(function(msg) {
-                    out.success = msg
+                .then((res) => {
+                    out.success = res
                 })
-                .catch(function(msg) {
-                    out.error = msg
+                .catch((err) => {
+                    out.error = err
                 })
             // console.log('out', out)
 

package/srv.mjs

@@ -16,6 +16,9 @@ let opt = {
         if (!w.isestr(token)) {
             return false
         }
+        if (token !== 'token-for-test') {
+            return false
+        }
         // await w.delay(3000)
         return true
     },