w-converhp 2.0.27 → 2.0.29

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

@@ -1,5 +1,5 @@
 /*!
- * w-converhp-server v2.0.27
+ * w-converhp-server v2.0.29
  * (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#line96">line 96</a>
+        <a href="WConverhpClient.mjs.html">WConverhpClient.mjs</a>, <a href="WConverhpClient.mjs.html#line94">line 94</a>
     </li></ul></dd>
     
 
@@ -127,7 +127,7 @@
 
     <h5 class="h5-examples">Example</h5>
     
-    <pre class="prettyprint"><code>import path from 'path'
    FormData,
    url: 'http://localhost:8080',
    apiName: 'api',
    getToken: () => {
        return 'token-for-test'
    },
    console.log(`error`, err)
    let core = async() => {
        await wo.download('id-for-file',
            function ({ prog, p, m }) {
                // console.log('client web: download: prog', prog, p, m)
                if (m === 'download') {
                    console.log('client web: download: prog', prog)
                }
            },
            {
                fdDownload: './', //於後端nodejs環境才能提供
            })
            .then(function(res) {
                console.log('client web: download: then', res)
                ms.push({ 'download output': res })
            })
            .catch(function (err) {
                console.log('client web: download: catch', err)
            })
        console.log('ms', ms)
    }
    core()
+    <pre class="prettyprint"><code>import path from 'path'
    FormData,
    url: 'http://localhost:8080',
    apiName: 'api',
    getToken: () => {
        return 'token-for-test'
    },
    console.log(`error`, err)
    let core = async() => {
        await wo.download('id-for-file',
            function ({ prog, p, m }) {
                // console.log('client web: download: prog', prog, p, m)
                if (m === 'download') {
                    console.log('client web: download: prog', prog)
                }
            },
            {
                fdDownload: './', //於nodejs環境才能提供
            })
            .then(function(res) {
                console.log('client web: download: then', res)
                ms.push({ 'download output': res })
            })
            .catch(function (err) {
                console.log('client web: download: catch', err)
            })
        console.log('ms', ms)
    }
    core()
 
 
 
@@ -529,7 +529,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 22:27:22 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 23:50:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpClient.mjs.html

@@ -45,14 +45,12 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import crypto from 'crypto'
-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 getGlobal from 'wsemi/src/getGlobal.mjs'
 import evem from 'wsemi/src/evem.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
-// import genID from 'wsemi/src/genID.mjs'
-// import now2strp from 'wsemi/src/now2strp.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
@@ -121,7 +119,7 @@ import pmConvertResolve from 'wsemi/src/pmConvertResolve.mjs'
  *                 }
  *             },
  *             {
- *                 fdDownload: './', //於後端nodejs環境才能提供
+ *                 fdDownload: './', //於nodejs環境才能提供
  *             })
  *             .then(function(res) {
  *                 console.log('client web: download: then', res)
@@ -488,11 +486,11 @@ function WConverhpClient(opt) {
                 //nodejs通過fs與stream接收檔案, stream出錯只會觸發error事件, 此處try catch為攔截其他非stream程式碼錯誤
                 try {
 
-                    //path, fs
+                    //path, fs, 使用動態import供nodejs使用, 否則會被webpack偵測報錯
                     let path = await import('path')
                     let fs = await import('fs')
 
-                    //fdDownload, 只有後端下載才使用fdDownload
+                    //fdDownload, 只有nodejs下載才使用fdDownload
                     let fdDownload = get(opt, 'fdDownload', '')
                     fs.mkdirSync(fdDownload, { recursive: true }) //須使用mkdirSync, 不要用fsIsFolder與fsCreateFolder避免編譯
                     // console.log('fdDownload', fdDownload)
@@ -679,18 +677,32 @@ function WConverhpClient(opt) {
     async function calcHash(inp) {
         let pm = genPm()
         if (env === 'browser') {
-            //前端browser時, 因是給予blob或file上傳, 且使用非同步async版計算hash, 可支援大檔
+            //於browser時, 因是給予blob或file上傳, 且使用非同步async版計算hash, 可支援大檔
+
+            //crypto, 須通過global取得crypto, 否則會被舊版webpack偵測報錯
+            let g = getGlobal()
+            let crypto = get(g, 'crypto')
+
+            //hashHex
             let ab = await inp.arrayBuffer()
             let hashBuffer = await crypto.subtle.digest('SHA-256', ab)
             let hashArray = Array.from(new Uint8Array(hashBuffer))
             let hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
+
             pm.resolve(hashHex)
         }
         else {
-            //前端nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 同步sync版無法支援大檔
+            //於nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 同步sync版無法支援大檔
+
+            //crypto, 使用動態import供nodejs使用, 且須用變數給予crypto, 否則會被舊版webpack偵測報錯
+            let key = 'crypto'
+            let crypto = await import(key)
+
+            //hashHex
             let hash = crypto.createHash('sha256')
             hash.update(inp, 'utf8')
             let hashHex = hash.digest('hex')
+
             pm.resolve(hashHex)
         }
         return pm
@@ -710,7 +722,7 @@ function WConverhpClient(opt) {
         }
         if (n === 0) {
             try {
-                n = bb.length //for Uint8Array //後端用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
+                n = bb.length //for Uint8Array //nodejs用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
                 n = cint(n)
             }
             catch (err) {}
@@ -997,7 +1009,7 @@ export default WConverhpClient
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 22:27:22 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 23:50:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.html

@@ -749,7 +749,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 22:27:22 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 23:50:30 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -1507,7 +1507,7 @@ export default WConverhpServer
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 4.0.2</a> on Thu Apr 10 2025 22:27:22 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 23:50:30 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 Thu Apr 10 2025 22:27:22 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 23:50:30 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.27",
+  "version": "2.0.29",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",

package/src/WConverhpClient.mjs

@@ -1,11 +1,9 @@
-import crypto from 'crypto'
 import axios from 'axios'
 import get from 'lodash-es/get.js'
 import isWindow from 'wsemi/src/isWindow.mjs'
+import getGlobal from 'wsemi/src/getGlobal.mjs'
 import evem from 'wsemi/src/evem.mjs'
 import genPm from 'wsemi/src/genPm.mjs'
-// import genID from 'wsemi/src/genID.mjs'
-// import now2strp from 'wsemi/src/now2strp.mjs'
 import haskey from 'wsemi/src/haskey.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
@@ -74,7 +72,7 @@ import pmConvertResolve from 'wsemi/src/pmConvertResolve.mjs'
  *                 }
  *             },
  *             {
- *                 fdDownload: './', //於後端nodejs環境才能提供
+ *                 fdDownload: './', //於nodejs環境才能提供
  *             })
  *             .then(function(res) {
  *                 console.log('client web: download: then', res)
@@ -441,11 +439,11 @@ function WConverhpClient(opt) {
                 //nodejs通過fs與stream接收檔案, stream出錯只會觸發error事件, 此處try catch為攔截其他非stream程式碼錯誤
                 try {
 
-                    //path, fs
+                    //path, fs, 使用動態import供nodejs使用, 否則會被webpack偵測報錯
                     let path = await import('path')
                     let fs = await import('fs')
 
-                    //fdDownload, 只有後端下載才使用fdDownload
+                    //fdDownload, 只有nodejs下載才使用fdDownload
                     let fdDownload = get(opt, 'fdDownload', '')
                     fs.mkdirSync(fdDownload, { recursive: true }) //須使用mkdirSync, 不要用fsIsFolder與fsCreateFolder避免編譯
                     // console.log('fdDownload', fdDownload)
@@ -632,18 +630,32 @@ function WConverhpClient(opt) {
     async function calcHash(inp) {
         let pm = genPm()
         if (env === 'browser') {
-            //前端browser時, 因是給予blob或file上傳, 且使用非同步async版計算hash, 可支援大檔
+            //於browser時, 因是給予blob或file上傳, 且使用非同步async版計算hash, 可支援大檔
+
+            //crypto, 須通過global取得crypto, 否則會被舊版webpack偵測報錯
+            let g = getGlobal()
+            let crypto = get(g, 'crypto')
+
+            //hashHex
             let ab = await inp.arrayBuffer()
             let hashBuffer = await crypto.subtle.digest('SHA-256', ab)
             let hashArray = Array.from(new Uint8Array(hashBuffer))
             let hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('')
+
             pm.resolve(hashHex)
         }
         else {
-            //前端nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 同步sync版無法支援大檔
+            //於nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 同步sync版無法支援大檔
+
+            //crypto, 使用動態import供nodejs使用, 且須用變數給予crypto, 否則會被舊版webpack偵測報錯
+            let key = 'crypto'
+            let crypto = await import(key)
+
+            //hashHex
             let hash = crypto.createHash('sha256')
             hash.update(inp, 'utf8')
             let hashHex = hash.digest('hex')
+
             pm.resolve(hashHex)
         }
         return pm
@@ -663,7 +675,7 @@ function WConverhpClient(opt) {
         }
         if (n === 0) {
             try {
-                n = bb.length //for Uint8Array //後端用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
+                n = bb.length //for Uint8Array //nodejs用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
                 n = cint(n)
             }
             catch (err) {}

package/srv.mjs

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