split-hash 0.3.2 → 0.3.4

package/lib/nodejs/split-hash-validator.d.ts

@@ -5,13 +5,13 @@ import { CustomError } from '@blackglory/errors';
 import { ProgressiveHashFactory } from './types.js';
 export declare class SplitHashValidator<T> extends Transform {
     private digests;
-    private blockSize;
+    private blockSizeBytes;
     private createHash;
     private equals;
     private hash;
-    private accu;
+    private currentBlockBytes;
     private digestIndex;
-    constructor(digests: T[], blockSize: number, createHash: ProgressiveHashFactory<T>, equals?: (a: T, b: T) => boolean);
+    constructor(digests: T[], blockSizeBytes: number, createHash: ProgressiveHashFactory<T>, equals?: (a: T, b: T) => boolean);
     _transform(chunk: Buffer, encoding: BufferEncoding, callback: TransformCallback): void;
     _flush(callback: TransformCallback): void;
 }

package/lib/nodejs/split-hash-validator.js

@@ -1,40 +1,44 @@
 import { Transform } from 'stream';
-import { CustomError } from '@blackglory/errors';
+import { assert, CustomError } from '@blackglory/errors';
+import { isUndefined } from 'extra-utils';
 export class SplitHashValidator extends Transform {
-    constructor(digests, blockSize, createHash, equals = Object.is) {
+    constructor(digests, blockSizeBytes, createHash, equals = Object.is) {
+        assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero');
         super();
         this.digests = digests;
-        this.blockSize = blockSize;
+        this.blockSizeBytes = blockSizeBytes;
         this.createHash = createHash;
         this.equals = equals;
         this.hash = this.createHash();
-        this.accu = 0;
+        this.currentBlockBytes = 0;
         this.digestIndex = 0;
     }
     _transform(chunk, encoding, callback) {
-        if (this.accu + chunk.length < this.blockSize) {
+        if (this.currentBlockBytes + chunk.length < this.blockSizeBytes) {
             this.hash.update(chunk);
-            this.accu += chunk.length;
+            this.currentBlockBytes += chunk.length;
         }
         else {
             let offset = 0;
             while (true) {
-                const needed = this.blockSize - this.accu;
-                const slice = chunk.slice(offset, offset + needed);
-                if (slice.length === needed) {
+                const remainingBlockBytes = this.blockSizeBytes - this.currentBlockBytes;
+                const slice = chunk.slice(offset, offset + remainingBlockBytes);
+                if (slice.length === remainingBlockBytes) {
                     this.hash.update(slice);
-                    const digest = this.hash.digest();
-                    if (!this.equals(this.digests[this.digestIndex], digest)) {
+                    const currentBlockBytes = this.hash.digest();
+                    const correctDigest = this.digests[this.digestIndex];
+                    if (isUndefined(correctDigest) ||
+                        !this.equals(correctDigest, currentBlockBytes)) {
                         return callback(new NotMatchedError());
                     }
                     this.digestIndex++;
                     this.hash = this.createHash();
-                    this.accu = 0;
+                    this.currentBlockBytes = 0;
                     offset += slice.length;
                 }
                 else {
                     this.hash.update(slice);
-                    this.accu += slice.length;
+                    this.currentBlockBytes += slice.length;
                     break;
                 }
             }
@@ -42,9 +46,11 @@ export class SplitHashValidator extends Transform {
         callback(null, chunk);
     }
     _flush(callback) {
-        if (this.accu > 0) {
-            const digest = this.hash.digest();
-            if (!this.equals(this.digests[this.digestIndex], digest)) {
+        if (this.currentBlockBytes > 0) {
+            const currentBlockDigest = this.hash.digest();
+            const correctDigest = this.digests[this.digestIndex];
+            if (isUndefined(correctDigest) ||
+                !this.equals(correctDigest, currentBlockDigest)) {
                 return callback(new NotMatchedError());
             }
             this.digestIndex++;

package/lib/nodejs/split-hash-validator.js.map

@@ -1 +1 @@
-{"version":3,"file":"split-hash-validator.js","sourceRoot":"","sources":["../../src/nodejs/split-hash-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAqB,MAAM,QAAQ,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,OAAO,kBAAsB,SAAQ,SAAS;IAKlD,YACU,OAAY,EACZ,SAAiB,EACjB,UAAqC,EACrC,SAAkC,MAAM,CAAC,EAAE;QAEnD,KAAK,EAAE,CAAA;QALC,YAAO,GAAP,OAAO,CAAK;QACZ,cAAS,GAAT,SAAS,CAAQ;QACjB,eAAU,GAAV,UAAU,CAA2B;QACrC,WAAM,GAAN,MAAM,CAAqC;QAR7C,SAAI,GAAwB,IAAI,CAAC,UAAU,EAAE,CAAA;QAC7C,SAAI,GAAG,CAAC,CAAA;QACR,gBAAW,GAAG,CAAC,CAAA;IASvB,CAAC;IAED,UAAU,CACR,KAAa,EACb,QAAwB,EACxB,QAA2B;QAI3B,IAAI,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE;YAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACvB,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;SAC1B;aAAM;YACL,IAAI,MAAM,GAAG,CAAC,CAAA;YACd,OAAO,IAAI,EAAE;gBACX,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI,CAAA;gBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;gBAClD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE;oBAC3B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACvB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAA;oBACjC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,EAAE;wBACxD,OAAO,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;qBACvC;oBACD,IAAI,CAAC,WAAW,EAAE,CAAA;oBAElB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;oBAC7B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;oBACb,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;iBACvB;qBAAM;oBAEL,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACvB,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;oBACzB,MAAK;iBACN;aACF;SACF;QAED,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACvB,CAAC;IAED,MAAM,CAAC,QAA2B;QAChC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,EAAE;YACjB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAA;YACjC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,EAAE;gBACxD,OAAO,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;aACvC;YACD,IAAI,CAAC,WAAW,EAAE,CAAA;SACnB;QAED,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC5C,OAAO,QAAQ,CAAC,IAAI,eAAe,EAAE,CAAC,CAAA;SACvC;QAED,QAAQ,EAAE,CAAA;IACZ,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC9C;QACE,KAAK,CAAC,qBAAqB,CAAC,CAAA;IAC9B,CAAC;CACF"}
+{"version":3,"file":"split-hash-validator.js","sourceRoot":"","sources":["../../src/nodejs/split-hash-validator.ts"],"names":[],"mappings":"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"}

package/lib/nodejs/split-hash.js

@@ -1,36 +1,37 @@
-import { CustomError } from '@blackglory/errors';
+import { assert, CustomError } from '@blackglory/errors';
 export async function* splitHash(stream, blockSizeBytes, createHash) {
+    assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero');
     let hash = createHash();
-    let accu = 0;
+    let currentBlockBytes = 0;
     for await (const chunk of stream) {
         if (!Buffer.isBuffer(chunk))
             throw new StreamEncodingError();
-        if (accu + chunk.length < blockSizeBytes) {
+        if (currentBlockBytes + chunk.length < blockSizeBytes) {
             hash.update(chunk);
-            accu += chunk.length;
+            currentBlockBytes += chunk.length;
         }
         else {
             let offset = 0;
             while (true) {
-                const needed = blockSizeBytes - accu;
-                const slice = chunk.slice(offset, offset + needed);
-                if (slice.length === needed) {
+                const remainingBlockBytes = blockSizeBytes - currentBlockBytes;
+                const slice = chunk.slice(offset, offset + remainingBlockBytes);
+                if (slice.length === remainingBlockBytes) {
                     hash.update(slice);
                     const digest = hash.digest();
                     yield digest;
                     hash = createHash();
-                    accu = 0;
+                    currentBlockBytes = 0;
                     offset += slice.length;
                 }
                 else {
                     hash.update(slice);
-                    accu += slice.length;
+                    currentBlockBytes += slice.length;
                     break;
                 }
             }
         }
     }
-    if (accu > 0)
+    if (currentBlockBytes > 0)
         yield hash.digest();
 }
 export class StreamEncodingError extends CustomError {

package/lib/nodejs/split-hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"split-hash.js","sourceRoot":"","sources":["../../src/nodejs/split-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGhD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC9B,MAA6B,EAC7B,cAAsB,EACtB,UAAqC;IAErC,IAAI,IAAI,GAAG,UAAU,EAAE,CAAA;IACvB,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,mBAAmB,EAAE,CAAA;QAC5D,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,cAAc,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAClB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;SACrB;aAAM;YACL,IAAI,MAAM,GAAG,CAAC,CAAA;YACd,OAAO,IAAI,EAAE;gBACX,MAAM,MAAM,GAAG,cAAc,GAAG,IAAI,CAAA;gBACpC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;gBAClD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE;oBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;oBAC5B,MAAM,MAAM,CAAA;oBAEZ,IAAI,GAAG,UAAU,EAAE,CAAA;oBACnB,IAAI,GAAG,CAAC,CAAA;oBACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;iBACvB;qBAAM;oBAEL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;oBACpB,MAAK;iBACN;aACF;SACF;KACF;IAED,IAAI,IAAI,GAAG,CAAC;QAAE,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;AACnC,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAClD;QACE,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAC1C,CAAC;CACF"}
+{"version":3,"file":"split-hash.js","sourceRoot":"","sources":["../../src/nodejs/split-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAGxD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC9B,MAA6B,EAC7B,cAAsB,EACtB,UAAqC;IAErC,MAAM,CAAC,cAAc,GAAG,CAAC,EAAE,wDAAwD,CAAC,CAAA;IAEpF,IAAI,IAAI,GAAG,UAAU,EAAE,CAAA;IACvB,IAAI,iBAAiB,GAAG,CAAC,CAAA;IACzB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE;QAChC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,mBAAmB,EAAE,CAAA;QAE5D,IAAI,iBAAiB,GAAG,KAAK,CAAC,MAAM,GAAG,cAAc,EAAE;YACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAClB,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAA;SAClC;aAAM;YACL,IAAI,MAAM,GAAG,CAAC,CAAA;YACd,OAAO,IAAI,EAAE;gBACX,MAAM,mBAAmB,GAAG,cAAc,GAAG,iBAAiB,CAAA;gBAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAA;gBAC/D,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;oBAC5B,MAAM,MAAM,CAAA;oBAEZ,IAAI,GAAG,UAAU,EAAE,CAAA;oBACnB,iBAAiB,GAAG,CAAC,CAAA;oBACrB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;iBACvB;qBAAM;oBAEL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAA;oBACjC,MAAK;iBACN;aACF;SACF;KACF;IAED,IAAI,iBAAiB,GAAG,CAAC;QAAE,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;AAChD,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAClD;QACE,KAAK,CAAC,iCAAiC,CAAC,CAAA;IAC1C,CAAC;CACF"}

package/lib/whatwg/split-hash.js

@@ -1,34 +1,36 @@
 import { toAsyncIterableIterator } from 'extra-stream';
+import { assert } from '@blackglory/errors';
 export async function* splitHash(stream, blockSizeBytes, createHash) {
+    assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero');
     let hash = createHash();
-    let accu = 0;
+    let currentBlockBytes = 0;
     for await (const chunk of toAsyncIterableIterator(stream)) {
-        if (accu + chunk.length < blockSizeBytes) {
+        if (currentBlockBytes + chunk.length < blockSizeBytes) {
             hash.update(chunk);
-            accu += chunk.length;
+            currentBlockBytes += chunk.length;
         }
         else {
             let offset = 0;
             while (true) {
-                const needed = blockSizeBytes - accu;
-                const slice = chunk.slice(offset, offset + needed);
-                if (slice.length === needed) {
+                const remainingBlockBytes = blockSizeBytes - currentBlockBytes;
+                const slice = chunk.slice(offset, offset + remainingBlockBytes);
+                if (slice.length === remainingBlockBytes) {
                     hash.update(slice);
                     const digest = await hash.digest();
                     yield digest;
                     hash = createHash();
-                    accu = 0;
+                    currentBlockBytes = 0;
                     offset += slice.length;
                 }
                 else {
                     hash.update(slice);
-                    accu += slice.length;
+                    currentBlockBytes += slice.length;
                     break;
                 }
             }
         }
     }
-    if (accu > 0)
+    if (currentBlockBytes > 0)
         yield await hash.digest();
 }
 //# sourceMappingURL=split-hash.js.map

package/lib/whatwg/split-hash.js.map

@@ -1 +1 @@
-{"version":3,"file":"split-hash.js","sourceRoot":"","sources":["../../src/whatwg/split-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AAGtD,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC9B,MAAsB,EACtB,cAAsB,EACtB,UAAqC;IAErC,IAAI,IAAI,GAAG,UAAU,EAAE,CAAA;IACvB,IAAI,IAAI,GAAG,CAAC,CAAA;IACZ,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE;QACzD,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,cAAc,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAClB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;SACrB;aAAM;YACL,IAAI,MAAM,GAAG,CAAC,CAAA;YACd,OAAO,IAAI,EAAE;gBACX,MAAM,MAAM,GAAG,cAAc,GAAG,IAAI,CAAA;gBACpC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAA;gBAClD,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE;oBAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;oBAClC,MAAM,MAAM,CAAA;oBAEZ,IAAI,GAAG,UAAU,EAAE,CAAA;oBACnB,IAAI,GAAG,CAAC,CAAA;oBACR,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;iBACvB;qBAAM;oBAGL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,IAAI,IAAI,KAAK,CAAC,MAAM,CAAA;oBACpB,MAAK;iBACN;aACF;SACF;KACF;IAED,IAAI,IAAI,GAAG,CAAC;QAAE,MAAM,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;AACzC,CAAC"}
+{"version":3,"file":"split-hash.js","sourceRoot":"","sources":["../../src/whatwg/split-hash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAG3C,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC9B,MAAsB,EACtB,cAAsB,EACtB,UAAqC;IAErC,MAAM,CAAC,cAAc,GAAG,CAAC,EAAE,wDAAwD,CAAC,CAAA;IAEpF,IAAI,IAAI,GAAG,UAAU,EAAE,CAAA;IACvB,IAAI,iBAAiB,GAAG,CAAC,CAAA;IACzB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,uBAAuB,CAAC,MAAM,CAAC,EAAE;QACzD,IAAI,iBAAiB,GAAG,KAAK,CAAC,MAAM,GAAG,cAAc,EAAE;YACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAClB,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAA;SAClC;aAAM;YACL,IAAI,MAAM,GAAG,CAAC,CAAA;YACd,OAAO,IAAI,EAAE;gBACX,MAAM,mBAAmB,GAAG,cAAc,GAAG,iBAAiB,CAAA;gBAC9D,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,mBAAmB,CAAC,CAAA;gBAC/D,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE;oBACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;oBAClC,MAAM,MAAM,CAAA;oBAEZ,IAAI,GAAG,UAAU,EAAE,CAAA;oBACnB,iBAAiB,GAAG,CAAC,CAAA;oBACrB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAA;iBACvB;qBAAM;oBAGL,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBAClB,iBAAiB,IAAI,KAAK,CAAC,MAAM,CAAA;oBACjC,MAAK;iBACN;aACF;SACF;KACF;IAED,IAAI,iBAAiB,GAAG,CAAC;QAAE,MAAM,MAAM,IAAI,CAAC,MAAM,EAAE,CAAA;AACtD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "split-hash",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Split the stream based on bytes and get digests from each part.",
   "keywords": [
     "split",
@@ -70,6 +70,7 @@
   },
   "dependencies": {
     "@blackglory/errors": "^3.0.0",
-    "extra-stream": "^0.2.0"
+    "extra-stream": "^0.2.0",
+    "extra-utils": "^5.21.0"
   }
 }

package/src/nodejs/split-hash-validator.ts

@@ -1,51 +1,62 @@
 import { Transform, TransformCallback } from 'stream'
-import { CustomError } from '@blackglory/errors'
+import { assert, CustomError } from '@blackglory/errors'
 import { ProgressiveHashFactory, IProgressiveHash } from './types.js'
+import { isUndefined } from 'extra-utils'
 
 export class SplitHashValidator<T> extends Transform {
   private hash: IProgressiveHash<T> = this.createHash()
-  private accu = 0
+  private currentBlockBytes = 0
   private digestIndex = 0
 
   constructor(
     private digests: T[]
-  , private blockSize: number
+  , private blockSizeBytes: number
   , private createHash: ProgressiveHashFactory<T>
   , private equals: (a: T, b: T) => boolean = Object.is
   ) {
+    assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero')
+
     super()
   }
 
   _transform(
+    // 总是Buffer
     chunk: Buffer
+    // 总是"buffer".
   , encoding: BufferEncoding
   , callback: TransformCallback
   ): void {
-    // chunk is always Buffer, encoding is always 'buffer', so there is no need to check
+    // 由于接收到的chunk总是Buffer, 且encoding总是"buffer", 无法在此处检测chunk是否经过编码.
 
-    if (this.accu + chunk.length < this.blockSize) {
+    if (this.currentBlockBytes + chunk.length < this.blockSizeBytes) {
       this.hash.update(chunk)
-      this.accu += chunk.length
+      this.currentBlockBytes += chunk.length
     } else {
       let offset = 0
       while (true) {
-        const needed = this.blockSize - this.accu
-        const slice = chunk.slice(offset, offset + needed)
-        if (slice.length === needed) {
+        const remainingBlockBytes = this.blockSizeBytes - this.currentBlockBytes
+        const slice = chunk.slice(offset, offset + remainingBlockBytes)
+        if (slice.length === remainingBlockBytes) {
           this.hash.update(slice)
-          const digest = this.hash.digest()
-          if (!this.equals(this.digests[this.digestIndex], digest)) {
+          const currentBlockBytes = this.hash.digest()
+          const correctDigest = this.digests[this.digestIndex]
+          if (
+            isUndefined(correctDigest) ||
+            !this.equals(correctDigest, currentBlockBytes)
+          ) {
             return callback(new NotMatchedError())
           }
+
           this.digestIndex++
+
           // prepare for the next round
           this.hash = this.createHash()
-          this.accu = 0
+          this.currentBlockBytes = 0
           offset += slice.length
         } else {
           // if the length does not match, the remaining data is not long enough, update the remaining data and exit the loop.
           this.hash.update(slice)
-          this.accu += slice.length
+          this.currentBlockBytes += slice.length
           break
         }
       }
@@ -55,9 +66,13 @@ export class SplitHashValidator<T> extends Transform {
   }
 
   _flush(callback: TransformCallback): void {
-    if (this.accu > 0) {
-      const digest = this.hash.digest()
-      if (!this.equals(this.digests[this.digestIndex], digest)) {
+    if (this.currentBlockBytes > 0) {
+      const currentBlockDigest = this.hash.digest()
+      const correctDigest = this.digests[this.digestIndex]
+      if (
+        isUndefined(correctDigest) ||
+        !this.equals(correctDigest, currentBlockDigest)
+      ) {
         return callback(new NotMatchedError())
       }
       this.digestIndex++

package/src/nodejs/split-hash.ts

@@ -1,4 +1,4 @@
-import { CustomError } from '@blackglory/errors'
+import { assert, CustomError } from '@blackglory/errors'
 import { ProgressiveHashFactory } from './types.js'
 
 export async function* splitHash<T>(
@@ -6,37 +6,40 @@ export async function* splitHash<T>(
 , blockSizeBytes: number
 , createHash: ProgressiveHashFactory<T>
 ): AsyncIterableIterator<T> {
+  assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero')
+
   let hash = createHash()
-  let accu = 0
+  let currentBlockBytes = 0
   for await (const chunk of stream) {
     if (!Buffer.isBuffer(chunk)) throw new StreamEncodingError()
-    if (accu + chunk.length < blockSizeBytes) {
+
+    if (currentBlockBytes + chunk.length < blockSizeBytes) {
       hash.update(chunk)
-      accu += chunk.length
+      currentBlockBytes += chunk.length
     } else {
       let offset = 0
       while (true) {
-        const needed = blockSizeBytes - accu
-        const slice = chunk.slice(offset, offset + needed)
-        if (slice.length === needed) {
+        const remainingBlockBytes = blockSizeBytes - currentBlockBytes
+        const slice = chunk.slice(offset, offset + remainingBlockBytes)
+        if (slice.length === remainingBlockBytes) {
           hash.update(slice)
           const digest = hash.digest()
           yield digest
           // prepare for the next round
           hash = createHash()
-          accu = 0
+          currentBlockBytes = 0
           offset += slice.length
         } else {
           // if the length does not match, the remaining data is not long enough, update the remaining data and exit the loop.
           hash.update(slice)
-          accu += slice.length
+          currentBlockBytes += slice.length
           break
         }
       }
     }
   }
   // digest remaining data if it exists
-  if (accu > 0) yield hash.digest()
+  if (currentBlockBytes > 0) yield hash.digest()
 }
 
 export class StreamEncodingError extends CustomError {

package/src/whatwg/split-hash.ts

@@ -1,4 +1,5 @@
 import { toAsyncIterableIterator } from 'extra-stream'
+import { assert } from '@blackglory/errors'
 import { ProgressiveHashFactory } from './types.js'
 
 export async function* splitHash<T>(
@@ -6,35 +7,37 @@ export async function* splitHash<T>(
 , blockSizeBytes: number
 , createHash: ProgressiveHashFactory<T>
 ): AsyncIterableIterator<T> {
+  assert(blockSizeBytes > 0, 'The parameter blockSizeBytes must be greater than zero')
+
   let hash = createHash()
-  let accu = 0
+  let currentBlockBytes = 0
   for await (const chunk of toAsyncIterableIterator(stream)) {
-    if (accu + chunk.length < blockSizeBytes) {
+    if (currentBlockBytes + chunk.length < blockSizeBytes) {
       hash.update(chunk)
-      accu += chunk.length
+      currentBlockBytes += chunk.length
     } else {
       let offset = 0
       while (true) {
-        const needed = blockSizeBytes - accu
-        const slice = chunk.slice(offset, offset + needed)
-        if (slice.length === needed) {
+        const remainingBlockBytes = blockSizeBytes - currentBlockBytes
+        const slice = chunk.slice(offset, offset + remainingBlockBytes)
+        if (slice.length === remainingBlockBytes) {
           hash.update(slice)
           const digest = await hash.digest()
           yield digest
           // prepare for the next round
           hash = createHash()
-          accu = 0
+          currentBlockBytes = 0
           offset += slice.length
         } else {
           // if the length does not match,
           // the remaining data is not long enough, update the remaining data and exit the loop.
           hash.update(slice)
-          accu += slice.length
+          currentBlockBytes += slice.length
           break
         }
       }
     }
   }
   // digest remaining data if it exists
-  if (accu > 0) yield await hash.digest()
+  if (currentBlockBytes > 0) yield await hash.digest()
 }