@jcbuisson/express-x-client 1.5.5 → 1.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jcbuisson/express-x-client",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "type": "module",
   "description": "Client library for ExpressX framework",
   "main": "src/index.mjs",

package/src/index.mjs

@@ -1,6 +1,15 @@
 
-import { v4 } from 'uuid'
+function generateUID(length) {
+   const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+   let uid = '';
 
+   for (let i = 0; i < length; i++) {
+     const randomIndex = Math.floor(Math.random() * characters.length)
+     uid += characters.charAt(randomIndex)
+   }
+   return uid
+}
+ 
 export default function expressXClient(socket, options={}) {
    if (options.debug === undefined) options.debug = false
 
@@ -19,12 +28,12 @@ export default function expressXClient(socket, options={}) {
    }
 
    function _getCnxId() {
-      if (typeof window !== 'undefined') return sessionStorage.getItem('expressx-cnx-id')
+      if (typeof sessionStorage !== 'undefined') return sessionStorage.getItem('expressx-cnx-id')
       return nodeCnxId
    }
 
    function _setCnxId(id) {
-      if (typeof window !== 'undefined') {
+      if (typeof sessionStorage !== 'undefined') {
          sessionStorage.setItem('expressx-cnx-id', id)
       } else {
          nodeCnxId = id
@@ -79,7 +88,7 @@ export default function expressXClient(socket, options={}) {
    })
 
    // disconnection due to a page reload
-   if (typeof window !== 'undefined') {
+   if (typeof window !== 'undefined' && 'addEventListener' in window) {
       window.addEventListener('unload', () => {
          const id = _getCnxId()
          if (id > 0) {
@@ -127,7 +136,7 @@ export default function expressXClient(socket, options={}) {
       if (retries === 0) throw new Error(`Timeout waiting for reconnection`)
 
       // create a promise which will resolve or reject by an event 'client-response'
-      const uid = v4()
+      const uid = generateUID(20)
       const promise = new Promise((resolve, reject) => {
          waitingPromisesByUid[uid] = [resolve, reject]
          // a 5s timeout may also reject the promise