w-converhp 2.0.11 → 2.0.13

package/dist/w-converhp-server.umd.js

@@ -1,5 +1,5 @@
 /*!
- * w-converhp-server v2.0.11
+ * w-converhp-server v2.0.13
  * (c) 2018-2021 yuda-lyu(semisphere)
  * Released under the MIT License.
  */

package/docs/WConverhpClient.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line167">line 167</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line163">line 163</a>
     </li></ul></dd>
     
 
@@ -529,7 +529,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 08 2025 09:12:35 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 Tue Apr 08 2025 13:20:50 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -45,9 +45,7 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import path from 'path'
-import fs from 'fs'
-import axios from 'axios'
+            <pre class="prettyprint source linenums"><code>import axios from 'axios'
 import get from 'lodash-es/get.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
@@ -68,8 +66,6 @@ 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'
 
 
 /**
@@ -484,7 +480,7 @@ function WConverhpClient(opt) {
         }
 
         //downloadStream
-        let downloadStream = (res) => {
+        let downloadStream = async (res) => {
             // console.log('res.headers', res.headers)
 
             //pm
@@ -518,45 +514,60 @@ function WConverhpClient(opt) {
             if (env === 'browser') {
 
                 //通過createObjectURL與a元素下載
-                let url = URL.createObjectURL(streamRecv)
-                let a = document.createElement('a')
-                a.href = url
-                a.download = filename // 動態設置檔名
-                document.body.appendChild(a)
-                a.click()
-                a.remove()
-                URL.revokeObjectURL(url)
-
-                pm.resolve(filename)
+                try {
+                    let url = URL.createObjectURL(streamRecv)
+                    let a = document.createElement('a')
+                    a.href = url
+                    a.download = filename // 動態設置檔名
+                    document.body.appendChild(a)
+                    a.click()
+                    a.remove()
+                    URL.revokeObjectURL(url)
+                    pm.resolve(filename)
+                }
+                catch (err) {
+                    console.log(err)
+                    pm.reject(err)
+                }
+
             }
             else {
 
-                //fdDownload, 只有後端下載才使用fdDownload
-                let fdDownload = get(opt, 'fdDownload', '')
-                if (!fsIsFolder(fdDownload)) {
-                    fsCreateFolder(fdDownload)
-                }
-                // console.log('fdDownload', fdDownload)
+                try {
 
-                //fp
-                let fp = path.resolve(fdDownload, filename)
-                // console.log('fp', fp)
+                    //path, fs
+                    let path = await import('path')
+                    let fs = await import('fs')
 
-                //streamWriter
-                let streamWriter = fs.createWriteStream(fp)
+                    //fdDownload, 只有後端下載才使用fdDownload
+                    let fdDownload = get(opt, 'fdDownload', '')
+                    fs.mkdirSync(fdDownload, { recursive: true }) //須使用mkdirSync, 不要用fsIsFolder與fsCreateFolder避免編譯
+                    // console.log('fdDownload', fdDownload)
 
-                //pipe
-                streamRecv.pipe(streamWriter)
+                    //fp
+                    let fp = path.resolve(fdDownload, filename)
+                    // console.log('fp', fp)
 
-                //finish
-                streamWriter.on('finish', () => {
-                    pm.resolve(fp)
-                })
+                    //streamWriter
+                    let streamWriter = fs.createWriteStream(fp)
 
-                //error
-                streamWriter.on('error', (err) => {
+                    //pipe
+                    streamRecv.pipe(streamWriter)
+
+                    //finish
+                    streamWriter.on('finish', () => {
+                        pm.resolve(fp)
+                    })
+
+                    //error
+                    streamWriter.on('error', (err) => {
+                        pm.reject(err)
+                    })
+
+                }
+                catch (err) {
                     pm.reject(err)
-                })
+                }
 
             }
 
@@ -925,7 +936,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 08 2025 09:12:35 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 Tue Apr 08 2025 13:20:50 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -709,7 +709,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 08 2025 09:12:35 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 Tue Apr 08 2025 13:20:50 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -1045,7 +1045,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Tue Apr 08 2025 09:12:35 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 Tue Apr 08 2025 13:20:50 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 Tue Apr 08 2025 09:12:35 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 Tue Apr 08 2025 13:20:50 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.11",
+  "version": "2.0.13",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/scla.mjs

@@ -1,4 +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'

package/sclb.mjs

@@ -1,4 +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'

package/sclc.mjs

@@ -1,4 +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'

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'

package/src/WConverhpClient.mjs

@@ -1,5 +1,3 @@
-import path from 'path'
-import fs from 'fs'
 import axios from 'axios'
 import get from 'lodash-es/get.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
@@ -21,8 +19,6 @@ 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'
 
 
 /**
@@ -437,7 +433,7 @@ function WConverhpClient(opt) {
         }
 
         //downloadStream
-        let downloadStream = (res) => {
+        let downloadStream = async (res) => {
             // console.log('res.headers', res.headers)
 
             //pm
@@ -471,45 +467,60 @@ function WConverhpClient(opt) {
             if (env === 'browser') {
 
                 //通過createObjectURL與a元素下載
-                let url = URL.createObjectURL(streamRecv)
-                let a = document.createElement('a')
-                a.href = url
-                a.download = filename // 動態設置檔名
-                document.body.appendChild(a)
-                a.click()
-                a.remove()
-                URL.revokeObjectURL(url)
-
-                pm.resolve(filename)
+                try {
+                    let url = URL.createObjectURL(streamRecv)
+                    let a = document.createElement('a')
+                    a.href = url
+                    a.download = filename // 動態設置檔名
+                    document.body.appendChild(a)
+                    a.click()
+                    a.remove()
+                    URL.revokeObjectURL(url)
+                    pm.resolve(filename)
+                }
+                catch (err) {
+                    console.log(err)
+                    pm.reject(err)
+                }
+
             }
             else {
 
-                //fdDownload, 只有後端下載才使用fdDownload
-                let fdDownload = get(opt, 'fdDownload', '')
-                if (!fsIsFolder(fdDownload)) {
-                    fsCreateFolder(fdDownload)
-                }
-                // console.log('fdDownload', fdDownload)
+                try {
 
-                //fp
-                let fp = path.resolve(fdDownload, filename)
-                // console.log('fp', fp)
+                    //path, fs
+                    let path = await import('path')
+                    let fs = await import('fs')
 
-                //streamWriter
-                let streamWriter = fs.createWriteStream(fp)
+                    //fdDownload, 只有後端下載才使用fdDownload
+                    let fdDownload = get(opt, 'fdDownload', '')
+                    fs.mkdirSync(fdDownload, { recursive: true }) //須使用mkdirSync, 不要用fsIsFolder與fsCreateFolder避免編譯
+                    // console.log('fdDownload', fdDownload)
 
-                //pipe
-                streamRecv.pipe(streamWriter)
+                    //fp
+                    let fp = path.resolve(fdDownload, filename)
+                    // console.log('fp', fp)
 
-                //finish
-                streamWriter.on('finish', () => {
-                    pm.resolve(fp)
-                })
+                    //streamWriter
+                    let streamWriter = fs.createWriteStream(fp)
 
-                //error
-                streamWriter.on('error', (err) => {
+                    //pipe
+                    streamRecv.pipe(streamWriter)
+
+                    //finish
+                    streamWriter.on('finish', () => {
+                        pm.resolve(fp)
+                    })
+
+                    //error
+                    streamWriter.on('error', (err) => {
+                        pm.reject(err)
+                    })
+
+                }
+                catch (err) {
                     pm.reject(err)
-                })
+                }
 
             }
 

package/srv.mjs

@@ -123,7 +123,7 @@ setTimeout(() => {
     console.log('ms', ms)
     // console.log('ms', JSON.stringify(ms))
     wo.stop()
-}, 1003000)
+}, 1113000)
 
 
 //node --experimental-modules srv.mjs