From e185c6d91640d5e5fd80e8d04b98bb8c959a1ac8 Mon Sep 17 00:00:00 2001
From: Egor Manzhula <egor.manzhula@namecheap.com>
Date: Mon, 11 Nov 2024 12:54:35 +0200
Subject: [PATCH] feat: Rewrite generateUID function to use native crypto
 module.

---
 README.md              | 19 ++++---------------
 index.js               | 16 ++++++++++++----
 package-lock.json      | 15 +++++++--------
 package.json           | 16 +++++++---------
 test/unit/serialize.js | 15 ---------------
 5 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index e6523ba..ca80382 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,9 @@
 Serialize JavaScript
 ====================
-
 Serialize JavaScript to a _superset_ of JSON that includes regular expressions, dates and functions.
-
-[![npm Version][npm-badge]][npm]
-[![Dependency Status][david-badge]][david]
-![Test](https://github.com/yahoo/serialize-javascript/workflows/Test/badge.svg)
+This library is a fork of the [serialize-javacript] library that addresses browser compatibility by using the native crypto module.
 
 ## Overview
-
-The code in this package began its life as an internal module to [express-state][]. To expand its usefulness, it now lives as `serialize-javascript` — an independent package on npm.
-
 You're probably wondering: **What about `JSON.stringify()`!?** We've found that sometimes we need to serialize JavaScript **functions**, **regexps**, **dates**, **sets** or **maps**. A great example is a web app that uses client-side URL routing where the route definitions are regexps that need to be shared from the server to the client. But this module is also great for communicating between node processes.
 
 The string returned from this package's single export function is literal JavaScript which can be saved to a `.js` file, or be embedded into an HTML document by making the content of a `<script>` element.
@@ -133,11 +126,7 @@ function deserialize(serializedJavascript){
 This software is free to use under the Yahoo! Inc. BSD license.
 See the [LICENSE file][LICENSE] for license text and copyright information.
 
-
-[npm]: https://www.npmjs.org/package/serialize-javascript
-[npm-badge]: https://img.shields.io/npm/v/serialize-javascript.svg?style=flat-square
-[david]: https://david-dm.org/yahoo/serialize-javascript
-[david-badge]: https://img.shields.io/david/yahoo/serialize-javascript.svg?style=flat-square
-[express-state]: https://github.com/yahoo/express-state
+[serialize-javacript]: https://github.com/yahoo/serialize-javascript
+[npm]: https://www.npmjs.org/package/@namecheap/serialize-javascript
 [JSON.stringify]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
-[LICENSE]: https://github.com/yahoo/serialize-javascript/blob/main/LICENSE
+[LICENSE]: https://github.com/namecheap/serialize-javascript/blob/main/LICENSE
diff --git a/index.js b/index.js
index 156f8f9..1a8b4d3 100644
--- a/index.js
+++ b/index.js
@@ -6,7 +6,7 @@ See the accompanying LICENSE file for terms.
 
 'use strict';
 
-var randomBytes = require('randombytes');
+var crypto = require('crypto');
 
 // Generate an internal UID to make the regexp pattern harder to guess.
 var UID_LENGTH          = 16;
@@ -35,11 +35,19 @@ function escapeUnsafeChars(unsafeChar) {
 }
 
 function generateUID() {
-    var bytes = randomBytes(UID_LENGTH);
-    var result = '';
-    for(var i=0; i<UID_LENGTH; ++i) {
+    if (crypto.randomUUID) {
+        const uuid = crypto.randomUUID();
+        return uuid.replace(/-/g, '');
+    }
+
+    const randomValues = new Uint8Array(UID_LENGTH);
+    const bytes = crypto.getRandomValues(randomValues);
+    let result = '';
+
+    for (let i = 0; i < UID_LENGTH; ++i) {
         result += bytes[i].toString(16);
     }
+
     return result;
 }
 
diff --git a/package-lock.json b/package-lock.json
index dbf0aad..b14e7f0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,13 @@
 {
-  "name": "serialize-javascript",
-  "version": "6.0.2",
+  "name": "@namecheap/serialize-javascript",
+  "version": "6.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "serialize-javascript",
-      "version": "6.0.2",
+      "name": "@namecheap/serialize-javascript",
+      "version": "6.1.0",
       "license": "BSD-3-Clause",
-      "dependencies": {
-        "randombytes": "^2.1.0"
-      },
       "devDependencies": {
         "benchmark": "^2.1.4",
         "chai": "^4.1.0",
@@ -2232,6 +2229,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -2302,7 +2300,8 @@
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/semver": {
       "version": "7.6.2",
diff --git a/package.json b/package.json
index 937dd6a..22a7a7e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "serialize-javascript",
-  "version": "6.0.2",
+  "name": "@namecheap/serialize-javascript",
+  "version": "6.1.0",
   "description": "Serialize JavaScript to a superset of JSON that includes regular expressions and functions.",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/yahoo/serialize-javascript.git"
+    "url": "git+https://github.com/namecheap/serialize-javascript.git"
   },
   "keywords": [
     "serialize",
@@ -18,19 +18,17 @@
     "js",
     "json"
   ],
-  "author": "Eric Ferraiuolo <edf@ericf.me>",
+  "author": "",
   "license": "BSD-3-Clause",
   "bugs": {
-    "url": "https://github.com/yahoo/serialize-javascript/issues"
+    "url": "https://github.com/namecheap/serialize-javascript/issues"
   },
-  "homepage": "https://github.com/yahoo/serialize-javascript",
+  "homepage": "https://github.com/namecheap/serialize-javascript",
   "devDependencies": {
     "benchmark": "^2.1.4",
     "chai": "^4.1.0",
     "mocha": "^10.0.0",
     "nyc": "^17.0.0"
   },
-  "dependencies": {
-    "randombytes": "^2.1.0"
-  }
+  "dependencies": {}
 }
diff --git a/test/unit/serialize.js b/test/unit/serialize.js
index 54167d0..a97718b 100644
--- a/test/unit/serialize.js
+++ b/test/unit/serialize.js
@@ -1,23 +1,9 @@
 /* global describe, it, beforeEach */
 'use strict';
 
-// temporarily monkeypatch `crypto.randomBytes` so we'll have a
-// predictable UID for our tests
-var crypto = require('crypto');
-var oldRandom = crypto.randomBytes;
-crypto.randomBytes = function(len, cb) {
-    var buf = Buffer.alloc(len);
-    buf.fill(0x00);
-    if (cb)
-        cb(null, buf);
-    return buf;
-};
-
 var serialize = require('../../'),
     expect    = require('chai').expect;
 
-crypto.randomBytes = oldRandom;
-
 describe('serialize( obj )', function () {
     it('should be a function', function () {
         expect(serialize).to.be.a('function');
@@ -579,5 +565,4 @@ describe('serialize( obj )', function () {
             expect(obj.foo).to.equal(fakePlaceholder);
         });
     });
-
 });