3.1.2

Author: seiya-git

app/app-uploader.js

@@ -265,35 +265,32 @@ async function uploadDir(localDir, remoteDir){
 
                     console.log(':: Checking created file...');
                     const rmeta = await app.getFileMeta([upload_info.path]);
+                    const fmeta = rmeta.info[0];
 
-                    // hash check
-                    
-                    let hashmatch;
-                    if(data.hash.chunks.length > 1){
-                        const hashStr = JSON.stringify(data.hash.chunks);
-                        const tbServerHash = crypto.createHash('md5').update(hashStr).digest('hex');
-                        hashmatch = tbServerHash == upload_info.md5;
-                    }
-                    else{
-                        hashmatch = data.hash.file == upload_info.md5;
-                    }
+                    // build weak etag
+                    const chunksJSON = JSON.stringify(data.hash.chunks);
+                    const chunksETAG = crypto.createHash('md5').update(chunksJSON).digest('hex');
+                    const weakEtag = data.hash.chunks.length > 1 ? chunksETAG : data.hash.file;
 
-                    const hashMatchMsg = hashmatch ? 'MATCH' : 'MISMATCH';
-                    const logHashMatch = hashmatch ? console.log : console.error;
-                    logHashMatch(':: HASH:', upload_info.md5, `(${hashMatchMsg})`);
-                    
-                    // file size check
-                    
-                    const fsizeMatchMsg = data.size == rmeta.info[0].size ? 'MATCH' : 'MISMATCH';
-                    const logFSize = data.size == rmeta.info[0].size ? console.log : console.error;
-                    logFSize(':: SIZE:', rmeta.info[0].size, `(${fsizeMatchMsg})`);
+                    // hash check
+                    const hashMatch = weakEtag === fmeta.md5;
+                    const hashMatchMsg = hashMatch ? 'MATCH' : 'MISMATCH';
+                    const logHashMatch = hashMatch ? console.log : console.error;
+                    logHashMatch(':: HASH:', fmeta.md5, `(${hashMatchMsg})`);
 
-                    // skip deleting tbtemp file...
+                    // size check
+                    const sizeMatch = data.size === fmeta.size;
+                    const sizeMatchMsg = sizeMatch ? 'MATCH' : 'MISMATCH';
+                    const logSizeMatch = sizeMatch ? console.log : console.error;
+                    logSizeMatch(':: SIZE:', fmeta.size, `(${sizeMatchMsg})`);
 
-                    if(data.size != rmeta.info[0].size || !hashmatch){
+                    // skip deleting tbtemp file if mismatch...
+                    if(!sizeMatch || !hashMatch){
+                        console.error(':: File is BAD!');
                         continue;
                     }
 
+                    // remove tbtemp file if everything is ok
                     console.log(':: File is OK!');
                     removeTbTemp(tbtempfile);
                     continue;

package.json

@@ -1,7 +1,7 @@
 {
     "name": "terabox-node",
     "name_ext": "TeraBox node",
-    "version": "3.1.1",
+    "version": "3.1.2",
     "type": "module",
     "bin": {
         "tb-check": "app/app-check.js",
@@ -25,7 +25,7 @@
         "dateformat": "^5.0.3",
         "filesize": "^10.1.6",
         "qrcode-terminal": "^0.12.0",
-        "terabox-api": "^1.3.8",
+        "terabox-api": "^1.3.10",
         "tough-cookie": "^5.1.2",
         "undici": "^7.10.0",
         "yaml": "^2.8.0",