w-converhp 2.0.29 → 2.0.31

package/docs/WConverhpServer.html

@@ -80,7 +80,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="WConverhpServer.mjs.html">WConverhpServer.mjs</a>, <a href="WConverhpServer.mjs.html#line191">line 191</a>
+        <a href="WConverhpServer.mjs.html">WConverhpServer.mjs</a>, <a href="WConverhpServer.mjs.html#line192">line 192</a>
     </li></ul></dd>
     
 
@@ -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 23:50:30 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 Sat Apr 12 2025 22:14:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/docs/WConverhpServer.mjs.html

@@ -60,6 +60,7 @@ import isp0int from 'wsemi/src/isp0int.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
@@ -71,7 +72,7 @@ import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
-import fsGetFileHash from 'wsemi/src/fsGetFileHash.mjs'
+import fsGetFileXxHash from 'wsemi/src/fsGetFileXxHash.mjs'
 import mergeFiles from './mergeFiles.wk.umd.js'
 // import mergeFiles from './mergeFiles.mjs'
 
@@ -647,9 +648,9 @@ function WConverhpServer(opt = {}) {
         },
     }
 
-    //apiUploadCheckHash
-    let apiUploadCheckHash = {
-        path: `/${apiName}ulckh`,
+    //apiUploadCheck
+    let apiUploadCheck = {
+        path: `/${apiName}ulck`,
         method: 'POST',
         options: {
             payload: {
@@ -686,7 +687,7 @@ function WConverhpServer(opt = {}) {
             if (true) {
 
                 //verifyConn
-                let m = verifyConn({ apiType: 'upload-check-slice-hash', authorization, headers, query })
+                let m = verifyConn({ apiType: 'upload-check', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -700,15 +701,17 @@ function WConverhpServer(opt = {}) {
 
             //eeEmit
             eeEmit('handler', {
-                api: 'apiUploadCheckHash',
+                api: 'apiUploadCheck',
                 headers,
                 query,
             })
 
-            //filename, fileHash, 從payload接收
+            //filename, fileSize, fileHash, 從payload接收
             let filename = get(req, 'payload.filename', '')
+            let fileSize = get(req, 'payload.fileSize', '')
             let fileHash = get(req, 'payload.fileHash', '')
             // console.log('filename', filename)
+            // console.log('fileSize', fileSize)
             // console.log('fileHash', fileHash)
 
             //check
@@ -717,6 +720,12 @@ function WConverhpServer(opt = {}) {
                 return responseU8aStreamWithError(res, 'invalid filename in payload')
             }
 
+            //check
+            if (!isnum(fileSize)) {
+                // console.log('invalid fileSize in payload')
+                return responseU8aStreamWithError(res, 'invalid fileSize in payload')
+            }
+
             //check
             if (!isestr(fileHash)) {
                 // console.log('invalid fileHash in payload')
@@ -739,19 +748,35 @@ function WConverhpServer(opt = {}) {
                 return responseU8aStream(res, u8aOut, { returnType: 'success', returnMsg: 'need to parse' })
             }
 
-            //hash, fsGetFileHash要用非同步stream模式才能支援大檔
-            let hash = await fsGetFileHash(pathFile, { useSync: false, type: 'sha256' })
+            //_fileSize
+            let stats = fs.statSync(pathFile)
+            let _fileSize = stats.size
+
+            //check
+            if (fileSize !== _fileSize) {
+                let out = {
+                    success: {
+                        existed: false,
+                        msg: 'not equal size',
+                    },
+                }
+                let u8aOut = obj2u8arr(out)
+                return responseU8aStream(res, u8aOut, { returnType: 'success', returnMsg: 'need to parse' })
+            }
+
+            //_fileHash
+            let _fileHash = await fsGetFileXxHash(pathFile)
             // console.log('path', pathFile)
             // console.log('hash(front)', fileHash)
-            // console.log('hash(backend)', hash)
+            // console.log('hash(backend)', _fileHash)
             // console.log('')
 
             //check
-            if (fileHash !== hash) {
+            if (fileHash !== _fileHash) {
                 let out = {
                     success: {
                         existed: false,
-                        msg: 'not equal',
+                        msg: 'not equal hash',
                     },
                 }
                 let u8aOut = obj2u8arr(out)
@@ -1453,7 +1478,7 @@ function WConverhpServer(opt = {}) {
             apiRoutes = [
                 ...apiRoutes,
                 apiMain,
-                apiUploadCheckHash,
+                apiUploadCheck,
                 apiUploadSlice,
                 apiUploadSliceMerge,
                 apiDownloadGetFilename,
@@ -1474,7 +1499,7 @@ function WConverhpServer(opt = {}) {
 
     //start
     if (get(opt, 'serverHapi')) {
-        server.route([apiMain, apiUploadCheckHash, apiUploadSlice, apiUploadSliceMerge, apiDownloadGetFilename, apiDownloadGetFile, apiDownload])
+        server.route([apiMain, apiUploadCheck, apiUploadSlice, apiUploadSliceMerge, apiDownloadGetFilename, apiDownloadGetFile, apiDownload])
     }
     else {
         startServer()
@@ -1507,7 +1532,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 23:50:30 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 Sat Apr 12 2025 22:14:41 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 23:50:30 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 Sat Apr 12 2025 22:14:41 GMT+0800 (台北標準時間) using the <a href="https://github.com/clenemt/docdash">docdash</a> theme.
 </footer>
 
 <script>prettyPrint();</script>

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "w-converhp",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "main": "dist/w-converhp-server.umd.js",
   "dependencies": {
     "@hapi/hapi": "^21.4.0",
     "@hapi/inert": "^7.1.0",
     "axios": "^1.8.4",
     "lodash-es": "^4.17.21",
-    "wsemi": "^1.7.80"
+    "wsemi": "^1.7.87"
   },
   "devDependencies": {
     "form-data": "^4.0.2",

package/sclc.mjs

@@ -27,10 +27,10 @@ wo.on('error', (err) => {
 function uploadLargeFile() {
     let core = async() => {
 
-        let fsz = '10mb' //0mb 10mb 100mb 1000mb
+        let fsz = '1000mb' //0mb 10mb 100mb 1000mb
 
         //u8a
-        let u8a = new Uint8Array(fs.readFileSync(`../_data/${fsz}.7z`)) //後端並無blob格式, 用fs讀有檔案大小上限
+        let u8a = fs.readFileSync(`../_data/${fsz}.7z`) //用fs讀有檔案大小上限
         console.log('u8a.length', u8a.length)
         // console.log('uploadLargeFile u8a', u8a)
         ms.push({ 'upload u8a.length': u8a.length })

package/src/WConverhpClient.mjs

@@ -1,7 +1,6 @@
 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 haskey from 'wsemi/src/haskey.mjs'
@@ -19,7 +18,7 @@ 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 getFileHash from 'wsemi/src/getFileHash.mjs'
+import getFileXxHash from 'wsemi/src/getFileXxHash.mjs'
 
 
 /**
@@ -165,8 +164,8 @@ function WConverhpClient(opt) {
         else if (type === 'slice') {
             urlUse = `${url}slc`
         }
-        else if (type === 'upload-check-slice-hash') {
-            urlUse = `${url}ulckh`
+        else if (type === 'upload-check') {
+            urlUse = `${url}ulck`
         }
         else if (type === 'slice-merge') {
             urlUse = `${url}slcm`
@@ -628,37 +627,21 @@ function WConverhpClient(opt) {
 
     //calcHash
     async function calcHash(inp) {
-        let pm = genPm()
-        if (env === 'browser') {
-            //於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)
+        //bb
+        let bb = null
+        if (env === 'browser') {
+            bb = inp
         }
         else {
-            //於nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 同步sync版無法支援大檔
-
-            //crypto, 使用動態import供nodejs使用, 且須用變數給予crypto, 否則會被舊版webpack偵測報錯
-            let key = 'crypto'
-            let crypto = await import(key)
+            //於nodejs時, 因尚無法提供檔名上傳, 故會是readFileSync讀入的buffer, 再轉成new Blob([buffer]), 供getFileXxHash使用
+            bb = new Blob([inp])
+        }
 
-            //hashHex
-            let hash = crypto.createHash('sha256')
-            hash.update(inp, 'utf8')
-            let hashHex = hash.digest('hex')
+        //hash
+        let hash = await getFileXxHash(bb)
 
-            pm.resolve(hashHex)
-        }
-        return pm
+        return hash
     }
 
     //sendDataSlice
@@ -675,7 +658,7 @@ function WConverhpClient(opt) {
         }
         if (n === 0) {
             try {
-                n = bb.length //for Uint8Array //nodejs用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
+                n = bb.length //for ArrayBuffer //nodejs用fs讀有檔案大小上限, 除非改傳入檔名用stream讀, 否則無法支援超大檔
                 n = cint(n)
             }
             catch (err) {}
@@ -687,27 +670,30 @@ function WConverhpClient(opt) {
         }
         // console.log('n', n)
 
-        //getFileHash
+        //fileTotalSize
+        let fileTotalSize = n
+
+        //fileTotalHash
         let fileTotalHash = await calcHash(bb)
         // console.log('fileTotalHash', fileTotalHash)
 
         //ckh
-        let ckh = async({ filename, fileHash }) => {
+        let ckh = async({ filename, fileSize, fileHash }) => {
 
-            //send upload-check-slice-hash
-            let resCk = await send('upload-check-slice-hash', { filename, fileHash }, { dataType: 'json' })
+            //send upload-check
+            let resCk = await send('upload-check', { filename, fileSize, fileHash }, { dataType: 'json' })
             // console.log('resCk', resCk)
 
             return resCk
         }
 
         //rAll
-        let rAll = await ckh({ filename: fileTotalHash, fileHash: fileTotalHash })
+        let rAll = await ckh({ filename: fileTotalHash, fileSize: fileTotalSize, fileHash: fileTotalHash })
         // console.log('rAll', rAll)
 
         //check
         if (rAll.existed) {
-            //已有上傳大檔
+            // console.log('已有上傳大檔')
             let resMg = {
                 filename: fileTotalName,
                 path: rAll.path,
@@ -771,7 +757,7 @@ function WConverhpClient(opt) {
             // console.log('fileSliceHash', fileSliceHash)
 
             //rChunk
-            let rChunk = await ckh({ filename: fileSliceName, fileHash: fileSliceHash })
+            let rChunk = await ckh({ filename: fileSliceName, fileSize: sizeSlice, fileHash: fileSliceHash })
             // console.log('fileSliceName', fileSliceName)
             // console.log('fileSliceHash', fileSliceHash)
             // console.log('rChunk', rChunk)
@@ -779,7 +765,8 @@ function WConverhpClient(opt) {
 
             //check
             if (rChunk.existed) {
-                //已有上傳切片檔
+                // console.log('已有上傳切片檔')
+                cbProgressSlice({ prog: 100, m: 'upload' }) //直接觸發更新進度
                 continue
             }
 

package/src/WConverhpServer.mjs

@@ -13,6 +13,7 @@ import isp0int from 'wsemi/src/isp0int.mjs'
 import ispint from 'wsemi/src/ispint.mjs'
 import isearr from 'wsemi/src/isearr.mjs'
 import isbol from 'wsemi/src/isbol.mjs'
+import isnum from 'wsemi/src/isnum.mjs'
 import isfun from 'wsemi/src/isfun.mjs'
 import ispm from 'wsemi/src/ispm.mjs'
 import cint from 'wsemi/src/cint.mjs'
@@ -24,7 +25,7 @@ import u8arr2obj from 'wsemi/src/u8arr2obj.mjs'
 import fsIsFile from 'wsemi/src/fsIsFile.mjs'
 import fsIsFolder from 'wsemi/src/fsIsFolder.mjs'
 import fsCreateFolder from 'wsemi/src/fsCreateFolder.mjs'
-import fsGetFileHash from 'wsemi/src/fsGetFileHash.mjs'
+import fsGetFileXxHash from 'wsemi/src/fsGetFileXxHash.mjs'
 import mergeFiles from './mergeFiles.wk.umd.js'
 // import mergeFiles from './mergeFiles.mjs'
 
@@ -600,9 +601,9 @@ function WConverhpServer(opt = {}) {
         },
     }
 
-    //apiUploadCheckHash
-    let apiUploadCheckHash = {
-        path: `/${apiName}ulckh`,
+    //apiUploadCheck
+    let apiUploadCheck = {
+        path: `/${apiName}ulck`,
         method: 'POST',
         options: {
             payload: {
@@ -639,7 +640,7 @@ function WConverhpServer(opt = {}) {
             if (true) {
 
                 //verifyConn
-                let m = verifyConn({ apiType: 'upload-check-slice-hash', authorization, headers, query })
+                let m = verifyConn({ apiType: 'upload-check', authorization, headers, query })
                 if (ispm(m)) {
                     m = await m
                 }
@@ -653,15 +654,17 @@ function WConverhpServer(opt = {}) {
 
             //eeEmit
             eeEmit('handler', {
-                api: 'apiUploadCheckHash',
+                api: 'apiUploadCheck',
                 headers,
                 query,
             })
 
-            //filename, fileHash, 從payload接收
+            //filename, fileSize, fileHash, 從payload接收
             let filename = get(req, 'payload.filename', '')
+            let fileSize = get(req, 'payload.fileSize', '')
             let fileHash = get(req, 'payload.fileHash', '')
             // console.log('filename', filename)
+            // console.log('fileSize', fileSize)
             // console.log('fileHash', fileHash)
 
             //check
@@ -670,6 +673,12 @@ function WConverhpServer(opt = {}) {
                 return responseU8aStreamWithError(res, 'invalid filename in payload')
             }
 
+            //check
+            if (!isnum(fileSize)) {
+                // console.log('invalid fileSize in payload')
+                return responseU8aStreamWithError(res, 'invalid fileSize in payload')
+            }
+
             //check
             if (!isestr(fileHash)) {
                 // console.log('invalid fileHash in payload')
@@ -692,19 +701,35 @@ function WConverhpServer(opt = {}) {
                 return responseU8aStream(res, u8aOut, { returnType: 'success', returnMsg: 'need to parse' })
             }
 
-            //hash, fsGetFileHash要用非同步stream模式才能支援大檔
-            let hash = await fsGetFileHash(pathFile, { useSync: false, type: 'sha256' })
+            //_fileSize
+            let stats = fs.statSync(pathFile)
+            let _fileSize = stats.size
+
+            //check
+            if (fileSize !== _fileSize) {
+                let out = {
+                    success: {
+                        existed: false,
+                        msg: 'not equal size',
+                    },
+                }
+                let u8aOut = obj2u8arr(out)
+                return responseU8aStream(res, u8aOut, { returnType: 'success', returnMsg: 'need to parse' })
+            }
+
+            //_fileHash
+            let _fileHash = await fsGetFileXxHash(pathFile)
             // console.log('path', pathFile)
             // console.log('hash(front)', fileHash)
-            // console.log('hash(backend)', hash)
+            // console.log('hash(backend)', _fileHash)
             // console.log('')
 
             //check
-            if (fileHash !== hash) {
+            if (fileHash !== _fileHash) {
                 let out = {
                     success: {
                         existed: false,
-                        msg: 'not equal',
+                        msg: 'not equal hash',
                     },
                 }
                 let u8aOut = obj2u8arr(out)
@@ -1406,7 +1431,7 @@ function WConverhpServer(opt = {}) {
             apiRoutes = [
                 ...apiRoutes,
                 apiMain,
-                apiUploadCheckHash,
+                apiUploadCheck,
                 apiUploadSlice,
                 apiUploadSliceMerge,
                 apiDownloadGetFilename,
@@ -1427,7 +1452,7 @@ function WConverhpServer(opt = {}) {
 
     //start
     if (get(opt, 'serverHapi')) {
-        server.route([apiMain, apiUploadCheckHash, apiUploadSlice, apiUploadSliceMerge, apiDownloadGetFilename, apiDownloadGetFile, apiDownload])
+        server.route([apiMain, apiUploadCheck, apiUploadSlice, apiUploadSliceMerge, apiDownloadGetFilename, apiDownloadGetFile, apiDownload])
     }
     else {
         startServer()