foronce 0.0.6 → 0.0.7

package/dist/base32.cjs

@@ -106,10 +106,8 @@ const toBinary = (char, padLimit = 8) => {
 };
 const chunk = (arr, chunkSize = 1, cache = []) => {
   const tmp = [...arr];
-  if (chunkSize <= 0)
-    return cache;
-  while (tmp.length)
-    cache.push(tmp.splice(0, chunkSize));
+  if (chunkSize <= 0) return cache;
+  while (tmp.length) cache.push(tmp.splice(0, chunkSize));
   return cache;
 };
 

package/dist/base32.mjs

@@ -104,10 +104,8 @@ const toBinary = (char, padLimit = 8) => {
 };
 const chunk = (arr, chunkSize = 1, cache = []) => {
   const tmp = [...arr];
-  if (chunkSize <= 0)
-    return cache;
-  while (tmp.length)
-    cache.push(tmp.splice(0, chunkSize));
+  if (chunkSize <= 0) return cache;
+  while (tmp.length) cache.push(tmp.splice(0, chunkSize));
   return cache;
 };
 

package/dist/index.cjs

@@ -26,8 +26,7 @@ function isTOTPValid(secret, token, options = {}) {
   for (let index = -2; index < 3; index += 1) {
     const fromSys = totp(secret, Date.now() / 1e3 + index, _options);
     const valid = fromSys === token;
-    if (valid)
-      return true;
+    if (valid) return true;
   }
   return false;
 }
@@ -45,7 +44,7 @@ function bigEndian64(hash) {
   return buf;
 }
 function generateTOTPSecret(num = 32) {
-  return base32.encode(node_crypto.randomBytes(num).toString("ascii"));
+  return base32.encode(node_crypto.randomBytes(num).toString("hex"));
 }
 
 exports.generateTOTPSecret = generateTOTPSecret;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { createHmac, randomBytes } from 'node:crypto';
+import { randomBytes, createHmac } from 'node:crypto';
 import { Buffer } from 'buffer';
-import { decode, encode } from './base32.mjs';
+import { encode, decode } from './base32.mjs';
 
 /*!
  * base-32.js
@@ -24,8 +24,7 @@ function isTOTPValid(secret, token, options = {}) {
   for (let index = -2; index < 3; index += 1) {
     const fromSys = totp(secret, Date.now() / 1e3 + index, _options);
     const valid = fromSys === token;
-    if (valid)
-      return true;
+    if (valid) return true;
   }
   return false;
 }
@@ -43,7 +42,7 @@ function bigEndian64(hash) {
   return buf;
 }
 function generateTOTPSecret(num = 32) {
-  return encode(randomBytes(num).toString("ascii"));
+  return encode(randomBytes(num).toString("hex"));
 }
 
 export { generateTOTPSecret, generateTOTPURL, isTOTPValid, totp };

package/dist/universal/universal.cjs

@@ -15,10 +15,11 @@ const algoMap = {
   sha512: "SHA-512"
 };
 async function createHmac(algorithm, secret, data) {
+  const secretBuffer = !Buffer.isBuffer(secret) ? Buffer.from(secret, "utf-8") : secret;
   const key = await uncrypto.subtle.importKey(
     "raw",
     // raw format of the key - should be Uint8Array
-    secret,
+    secretBuffer,
     {
       // algorithm details
       name: "HMAC",

package/dist/universal/universal.mjs

@@ -1,5 +1,5 @@
 import { subtle, getRandomValues } from 'uncrypto';
-import { decode, encode } from '../base32.mjs';
+import { encode, decode } from '../base32.mjs';
 
 function bigEndian64(hash) {
   const buf = Buffer.allocUnsafe(64 / 8);
@@ -13,10 +13,11 @@ const algoMap = {
   sha512: "SHA-512"
 };
 async function createHmac(algorithm, secret, data) {
+  const secretBuffer = !Buffer.isBuffer(secret) ? Buffer.from(secret, "utf-8") : secret;
   const key = await subtle.importKey(
     "raw",
     // raw format of the key - should be Uint8Array
-    secret,
+    secretBuffer,
     {
       // algorithm details
       name: "HMAC",

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "foronce",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "The OTP Library",
-  "repository": "git@github.com:dumbjs/foronce.git",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/dumbjs/foronce.git"
+  },
   "license": "MIT",
   "author": "Reaper <ahoy@barelyhuman.dev>",
   "type": "module",
@@ -43,11 +46,10 @@
   "scripts": {
     "build": "unbuild",
     "fix": "prettier --write .",
-    "next": "bumpp",
     "prepare": "husky install",
     "size": "sizesnap",
-    "test": "uvu -r tsm tests",
-    "test:ci": "c8 uvu -r tsm tests "
+    "test": "tsc -p ./tsconfig.spec.json && uvu dist-tests",
+    "test:ci": "tsc -p ./tsconfig.spec.json && c8 uvu dist-tests"
   },
   "keywords": [
     "otp",
@@ -63,29 +65,18 @@
     "@barelyhuman/prettier-config": "^1.0.0",
     "@types/node": "^20.10.8",
     "buffer": "^6.0.3",
-    "bumpp": "^9.2.0",
     "c8": "^8.0.1",
     "esm": "^3.2.25",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^16.3.1",
     "prettier": "^2.7.1",
     "publint": "^0.2.7",
-    "sizesnap": "^0.2.1",
-    "tsm": "^2.3.0",
-    "unbuild": "^2.0.0",
+    "unbuild": "^3.6.1",
     "uvu": "^0.5.6"
   },
   "publishConfig": {
     "access": "public"
   },
-  "sizesnap": {
-    "files": [
-      "dist/*.dts",
-      "dist/*.ts",
-      "dist/*.js",
-      "dist/*.cjs"
-    ]
-  },
   "dependencies": {
     "uncrypto": "^0.1.3"
   }

package/src/index.js

@@ -31,6 +31,7 @@ export function totp(secret, when = floor(Date.now() / 1000), options = {}) {
   const now = floor(when / _options.period)
   const key = decode(secret)
   const buff = bigEndian64(BigInt(now))
+  // @ts-expect-error buffers are allowed
   const hmac = createHmac(_options.algorithm, key).update(buff).digest()
   const offset = hmac[hmac.length - 1] & 0xf
   const truncatedHash = hmac.subarray(offset, offset + 4)
@@ -88,5 +89,5 @@ function bigEndian64(hash) {
 }
 
 export function generateTOTPSecret(num = 32) {
-  return encode(randomBytes(num).toString('ascii'))
+  return encode(randomBytes(num).toString('hex'))
 }

package/src/lib/crypto.js

@@ -7,17 +7,12 @@ const algoMap = {
 }
 
 export async function createHmac(algorithm, secret, data) {
-  // let enc
-  // if (TextEncoder.constructor.length == 1) {
-  //   // @ts-ignore
-  //   enc = new TextEncoder('utf-8')
-  // } else {
-  //   enc = new TextEncoder()
-  // }
-
+  let secretBuffer = !Buffer.isBuffer(secret)
+    ? Buffer.from(secret, 'utf-8')
+    : secret
   const key = await subtle.importKey(
     'raw', // raw format of the key - should be Uint8Array
-    secret,
+    secretBuffer,
     {
       // algorithm details
       name: 'HMAC',

package/src/universal/hmac.ts

@@ -13,9 +13,10 @@ export async function createHmac(
   secret: string,
   data: Buffer
 ) {
+  const secretBuffer = !Buffer.isBuffer(secret) ? Buffer.from(secret, 'utf-8') : secret;
   const key = await subtle.importKey(
     'raw', // raw format of the key - should be Uint8Array
-    secret,
+    secretBuffer,
     {
       // algorithm details
       name: 'HMAC',