@bsv/sdk 1.3.12 → 1.3.14

package/src/totp/__tests/totp.test.ts

@@ -1,80 +1,81 @@
-import { toArray } from "../../../dist/cjs/src/primitives/utils.js";
-import { TOTP } from "../../../dist/cjs/src/totp/totp.js";
+import { toArray } from '../../primitives/utils'
+import { TOTP } from '../../totp/totp'
 
-const secret = toArray("48656c6c6f21deadbeef", 'hex');
-const period = 30; //sec
-const periodMS = 30 * 1000; //ms
+const secret = toArray('48656c6c6f21deadbeef', 'hex')
+const period = 30 // sec
+const periodMS = 30 * 1000 // ms
 const options = {
   digits: 6,
   period,
-  algorithm: "SHA-1",
-};
+  algorithm: 'SHA-1' as const
+}
 
-describe("totp generation and validation", () => {
-  beforeEach(() => jest.useFakeTimers());
-  afterEach(() => jest.resetAllMocks());
+describe('totp generation and validation', () => {
+  beforeEach(() => jest.useFakeTimers())
+  afterEach(() => jest.resetAllMocks())
 
   test.each([
     {
       time: 0,
-      expected: "282760",
-      description: "should generate token at Unix epoch start",
+      expected: '282760',
+      description: 'should generate token at Unix epoch start'
     },
     {
       time: 1465324707000,
-      expected: "341128",
-      description: "should generate token for a specific timestamp in 2016",
+      expected: '341128',
+      description: 'should generate token for a specific timestamp in 2016'
     },
     {
       time: 1665644340000 + 1,
-      expected: "886842",
-      description: "should generate correct token at the start of the cycle",
+      expected: '886842',
+      description: 'should generate correct token at the start of the cycle'
     },
     {
       time: 1665644340000 - 1,
-      expected: "134996",
-      description: "should generate correct token at the end of the cycle",
+      expected: '134996',
+      description: 'should generate correct token at the end of the cycle'
     },
     {
       time: 1365324707000,
-      expected: "089029",
-      description: "should generate token with a leading zero",
-    },
-  ])("$description", async ({ time, expected }) => {
-    jest.setSystemTime(time);
+      expected: '089029',
+      description: 'should generate token with a leading zero'
+    }
+  ])('$description', async ({ time, expected }) => {
+    jest.setSystemTime(time)
 
-    //check if expected passcode is generated
-    const passcode = TOTP.generate(secret, options);
-    expect(passcode).toEqual(expected);
+    // check if expected passcode is generated
+    const passcode = TOTP.generate(secret, options)
+    expect(passcode).toEqual(expected)
 
-    expect(TOTP.validate(secret, "000000", options)).toEqual(false); //this passcode should not be valid for any of above test cases
+    expect(TOTP.validate(secret, '000000', options)).toEqual(false) // this passcode should not be valid for any of above test cases
 
-    //should not be valid for only a part of passcode
-    expect(TOTP.validate(secret, passcode.slice(1), options)).toEqual(false);
+    // should not be valid for only a part of passcode
+    expect(TOTP.validate(secret, passcode.slice(1), options)).toEqual(false)
 
-    expect(TOTP.validate(secret, passcode, options)).toEqual(true);
+    expect(TOTP.validate(secret, passcode, options)).toEqual(true)
 
     const checkAdjacentWindow = (
       timeOfGeneration: number,
       expected: boolean
-    ) => {
-      jest.setSystemTime(timeOfGeneration);
-      const adjacentTimewindowPasscode = TOTP.generate(secret, options);
+    ): void => {
+      jest.setSystemTime(timeOfGeneration)
+      const adjacentTimewindowPasscode = TOTP.generate(secret, options)
 
-      jest.setSystemTime(time);
+      jest.setSystemTime(time)
       expect(
         TOTP.validate(secret, adjacentTimewindowPasscode, options)
-      ).toEqual(expected);
-    };
+      ).toEqual(expected)
+    }
+
+    // because the 'skew' is '1' by default, the passcode for the next window also should be valid
+    checkAdjacentWindow((time as number) + periodMS, true)
 
-    //because the 'skew' is '1' by default, the passcode for the next window also should be valid
-    checkAdjacentWindow(time + periodMS, true);
-    checkAdjacentWindow(time - periodMS, true);
+    checkAdjacentWindow(time - periodMS, true)
 
-    //for 'skew': 1, other passcodes for further timewindows should not be valid
+    // for 'skew': 1, other passcodes for further timewindows should not be valid
     for (let i = 2; i < 10; i++) {
-      checkAdjacentWindow(time + i * periodMS, false);
-      checkAdjacentWindow(time - i * periodMS, false);
+      checkAdjacentWindow((time as number) + i * periodMS, false)
+      checkAdjacentWindow(time - i * periodMS, false)
     }
-  });
-});
+  })
+})

package/src/totp/totp.ts

@@ -25,6 +25,7 @@ export type TOTPValidateOptions = TOTPOptions & {
   skew?: number
 }
 
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
 export class TOTP {
   /**
    * Generates a Time-based One-Time Password (TOTP).
@@ -54,7 +55,7 @@ export class TOTP {
   ): boolean {
     const _options = this.withDefaultValidateOptions(options)
     passcode = passcode.trim()
-    if (passcode.length != _options.digits) {
+    if (passcode.length !== _options.digits) {
       return false
     }
 
@@ -123,7 +124,7 @@ function calcHMAC (
   secret: number[],
   timePad: number[],
   algorithm: TOTPAlgorithm
-) {
+): SHA1HMAC | SHA256HMAC | SHA512HMAC {
   switch (algorithm) {
     case 'SHA-1':
       return new SHA1HMAC(secret).update(timePad)