remove buffer-dep, replace with bufferFrom

package.json

@@ -52,32 +52,31 @@
   },
   "homepage": "https://github.com/SkynetLabs/skynet-js",
   "dependencies": {
+    "@skynetlabs/tus-js-client": "^2.3.1",
     "async-mutex": "^0.3.2",
     "axios": "^0.27.2",
     "base32-decode": "^1.0.0",
     "base32-encode": "^1.1.1",
     "base64-js": "^1.3.1",
     "blakejs": "^1.1.0",
-    "buffer": "^6.0.1",
+    "buffer-from": "^1.1.2",
     "mime": "^3.0.0",
     "path-browserify": "^1.0.1",
+    "pbkdf2": "^3.1.2",
     "post-me": "^0.4.5",
-    "randombytes": "^2.1.0",
-    "sjcl": "^1.0.8",
     "skynet-mysky-utils": "^0.3.0",
-    "@skynetlabs/tus-js-client": "^2.3.0",
     "tweetnacl": "^1.0.3",
     "url-join": "^4.0.1",
     "url-parse": "^1.5.1"
   },
   "devDependencies": {
     "@types/base64-js": "^1.3.0",
+    "@types/buffer-from": "^1.1.0",
     "@types/jest": "^27.0.1",
     "@types/mime": "^2.0.3",
     "@types/minimist": "^1.2.2",
     "@types/node": "^15.0.1",
-    "@types/randombytes": "^2.0.0",
-    "@types/sjcl": "^1.0.29",
+    "@types/pbkdf2": "^3.1.0",
     "@types/url-join": "^4.0.0",
     "@types/url-parse": "^1.4.3",
     "@typescript-eslint/eslint-plugin": "^4.3.0",

src/crypto.ts

@@ -1,8 +1,7 @@
-import { misc, codec } from "sjcl";
-import { Buffer } from "buffer";
 import { blake2bFinal, blake2bInit, blake2bUpdate } from "blakejs";
-import randomBytes from "randombytes";
-import { hash, sign } from "tweetnacl";
+import { hash, sign, randomBytes } from "tweetnacl";
+import bufferFrom from "buffer-from";
+import { pbkdf2Sync } from "pbkdf2";
 
 import { RegistryEntry } from "./registry";
 import { hexToUint8Array, stringToUint8ArrayUtf8, toHexString } from "./utils/string";
@@ -87,9 +86,8 @@ export function genKeyPairFromSeed(seed: string): KeyPair {
   validateString("seed", seed, "parameter");
 
   // Get a 32-byte key.
-  const derivedKey = misc.pbkdf2(seed, "", 1000, 32 * 8);
-  const derivedKeyHex = codec.hex.fromBits(derivedKey);
-  const { publicKey, secretKey } = sign.keyPair.fromSeed(hexToUint8Array(derivedKeyHex));
+  const derivedKey = pbkdf2Sync(seed, "", 1000, 32, "sha256");
+  const { publicKey, secretKey } = sign.keyPair.fromSeed(Uint8Array.from(derivedKey));
 
   return { publicKey: toHexString(publicKey), privateKey: toHexString(secretKey) };
 }
@@ -160,6 +158,6 @@ export function sha512(message: Uint8Array | string): Uint8Array {
 function genRandomSeed(length: number): string {
   // Cryptographically-secure random number generator. It should use the
   // built-in crypto.getRandomValues in the browser.
-  const array = randomBytes(length);
+  const array = bufferFrom(randomBytes(length));
   return toHexString(array);
 }

src/mysky/encrypted_files.ts

@@ -1,6 +1,5 @@
-import randomBytes from "randombytes";
 import { sanitizePath } from "skynet-mysky-utils";
-import { secretbox } from "tweetnacl";
+import { secretbox, randomBytes } from "tweetnacl";
 
 import { HASH_LENGTH, sha512 } from "../crypto";
 import { hexToUint8Array, stringToUint8ArrayUtf8, toHexString, uint8ArrayToStringUtf8 } from "../utils/string";
@@ -154,7 +153,7 @@ export function encryptJSONFile(json: JsonData, metadata: EncryptedFileMetadata,
   data = new Uint8Array([...data, ...new Uint8Array(finalSize - data.length)]);
 
   // Generate a random nonce.
-  const nonce = new Uint8Array(randomBytes(ENCRYPTION_NONCE_LENGTH));
+  const nonce = randomBytes(ENCRYPTION_NONCE_LENGTH);
 
   // Encrypt the data.
   const encryptedBytes = secretbox(data, nonce, key);

src/registry.ts

@@ -1,5 +1,5 @@
 import type { AxiosResponse } from "axios";
-import { Buffer } from "buffer";
+import bufferFrom from "buffer-from";
 import { sign } from "tweetnacl";
 
 import { SkynetClient } from "./client";
@@ -203,7 +203,7 @@ export async function getEntry(
 
   // Convert the revision from a string to bigint.
   const revision = BigInt(response.data.revision);
-  const signature = Buffer.from(hexToUint8Array(response.data.signature));
+  const signature = bufferFrom(hexToUint8Array(response.data.signature));
   // Use empty array if the data is empty.
   let data = new Uint8Array([]);
   if (response.data.data) {

src/utils/string.ts

@@ -1,4 +1,4 @@
-import { Buffer } from "buffer";
+import bufferFrom from "buffer-from";
 
 import { validateHexString, validateString, validationError } from "./validation";
 
@@ -103,7 +103,7 @@ export function trimUriPrefix(str: string, prefix: string): string {
 export function stringToUint8ArrayUtf8(str: string): Uint8Array {
   validateString("str", str, "parameter");
 
-  return Uint8Array.from(Buffer.from(str, "utf-8"));
+  return Uint8Array.from(bufferFrom(str, "utf-8"));
 }
 
 /**
@@ -113,7 +113,7 @@ export function stringToUint8ArrayUtf8(str: string): Uint8Array {
  * @returns - The string.
  */
 export function uint8ArrayToStringUtf8(array: Uint8Array): string {
-  return Buffer.from(array).toString("utf-8");
+  return bufferFrom(array).toString("utf-8");
 }
 
 /**