w-converhp 2.0.12 → 2.0.14

package/scld.mjs

@@ -1,3 +1,6 @@
+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'
@@ -32,7 +35,7 @@ function downloadLargeFile() {
                 }
             },
             {
-                fdDownload: './',
+                fdDownload: './', //於後端nodejs環境才能提供
             })
             .then(function(res) {
                 console.log('client web: download: then', res)

package/src/WConverhpClient.mjs

@@ -1,6 +1,7 @@
 import axios from 'axios'
 import get from 'lodash-es/get.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
+import evem from 'wsemi/src/evem.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
 import genID from 'wsemi/src/genID.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
@@ -13,14 +14,12 @@ import iseobj from 'wsemi/src/iseobj.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
 import strright from 'wsemi/src/strright.mjs'
-import evem from 'wsemi/src/evem.mjs'
+import b642str from 'wsemi/src/b642str.mjs'
 import blob2u8arr from 'wsemi/src/blob2u8arr.mjs'
 import obj2u8arr from 'wsemi/src/obj2u8arr.mjs'
 import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import pmConvertResolve from 'wsemi/src/pmConvertResolve.mjs'
 import now2strp from 'wsemi/src/now2strp.mjs'
-import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
-import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
 
 
 /**
@@ -461,6 +460,7 @@ function WConverhpClient(opt) {
 
             //filename
             let filename = getFilenameByHeader(contentDisposition)
+            filename = b642str(filename) //headers內對中文支援度不佳須用base64傳, 此處解析提取後須反轉
             // console.log('filename', filename)
 
             //streamRecv
@@ -496,9 +496,7 @@ function WConverhpClient(opt) {
 
                     //fdDownload, 只有後端下載才使用fdDownload
                     let fdDownload = get(opt, 'fdDownload', '')
-                    if (!fsIsFolder(fdDownload)) {
-                        fsCreateFolder(fdDownload)
-                    }
+                    fs.mkdirSync(fdDownload, { recursive: true }) //須使用mkdirSync, 不要用fsIsFolder與fsCreateFolder避免編譯
                     // console.log('fdDownload', fdDownload)
 
                     //fp

package/src/WConverhpServer.mjs

@@ -3,6 +3,7 @@ import stream from 'stream'
 import Hapi from '@hapi/hapi'
 import Inert from '@hapi/inert' //提供靜態檔案
 import get from 'lodash-es/get.js'
+import isNumber from 'lodash-es/isNumber.js'
 import genPm from 'wsemi/src/genPm.mjs'
 import evem from 'wsemi/src/evem.mjs'
 import iseobj from 'wsemi/src/iseobj.mjs'
@@ -12,9 +13,10 @@ import ispint from 'wsemi/src/ispint.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
-import isnum from 'wsemi/src/isnum.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
+import cstr from 'wsemi/src/cstr.mjs'
+import str2b64 from 'wsemi/src/str2b64.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import obj2u8arr from 'wsemi/src/obj2u8arr.mjs'
 import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
@@ -387,12 +389,22 @@ function WConverhpServer(opt = {}) {
     //responseU8aStreamWithError
     function responseU8aStreamWithError(res, msg) {
 
+        //check
+        if (!isestr(msg)) {
+            console.log('msg', msg)
+            console.log(`msg is not an effective string, set msg=''`)
+            msg = ''
+        }
+
         //u8aOut
         let u8aOut = obj2u8arr({
             error: msg,
         })
         // console.log('download u8aOut', u8aOut)
 
+        //str2b64
+        // msg = str2b64(msg) //預期程式內調用皆為英文, 不須轉base64來支援中文
+
         return responseU8aStream(res, u8aOut, { returnType: 'error', returnMsg: msg })
     }
 
@@ -891,24 +903,35 @@ function WConverhpServer(opt = {}) {
             //return
             if (haskey(out, 'error')) {
                 // console.log('out.error', out.error)
-                return responseU8aStreamWithError(res, `can not get file from fileId[${fileId}]`)
+                return responseU8aStreamWithError(res, `can not get file from fileId`)
             }
 
-            //streamRead, fileName, fileSize, fileType
+            //r
             let r = get(out, 'success')
+
+            //streamRead
             let streamRead = get(r, 'streamRead')
+
+            //fileName
             let fileName = get(r, 'fileName')
             if (!isestr(fileName)) {
-                return res.response({ error: `invalid fileName` }).code(400)
+                return responseU8aStreamWithError(res, 'invalid fileName')
             }
+            fileName = str2b64(fileName) //headers內對中文支援度不佳須用base64傳
+
+            //fileSize
             let fileSize = get(r, 'fileSize')
-            if (!isnum(fileSize)) {
-                return res.response({ error: `invalid fileSize` }).code(400)
+            if (!isNumber(fileSize)) {
+                return responseU8aStreamWithError(res, 'invalid fileSize')
             }
+            // fileSize = cstr(fileSize)
+
+            //fileType
             let fileType = get(r, 'fileType')
             if (!isestr(fileType)) {
-                return res.response({ error: `invalid fileType` }).code(400)
+                return responseU8aStreamWithError(res, 'invalid fileType')
             }
+            fileType = cstr(fileType)
 
             return res.response(streamRead)
                 .type(fileType)

package/srv.mjs

@@ -87,7 +87,7 @@ wo.on('download', (input, pm) => {
         let streamRead = fs.createReadStream(fp)
 
         //fileName
-        let fileName = `1mb.7z`
+        let fileName = `1mb中文.7z` //測試支援中文
 
         //fileSize
         let stats = fs.statSync(fp)
@@ -123,7 +123,7 @@ setTimeout(() => {
     console.log('ms', ms)
     // console.log('ms', JSON.stringify(ms))
     wo.stop()
-}, 3000)
+}, 1113000)
 
 
 //node --experimental-modules srv.mjs

package/test/downloadLargeFile.test.mjs

@@ -47,7 +47,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)