refactor: create a safe client id

Author: wallace-sf

app/examples/Basic/Basic.tsx

@@ -4,6 +4,7 @@ import { Provider } from 'react-redux';
 import { WorkflowManager, WorkflowManagerConfig } from '../../../dist';
 import { Child } from './Child';
 import { store } from './store';
+import { createClientId } from './utils';
 
 WorkflowManagerConfig.setStore(store);
 
@@ -13,7 +14,7 @@ export const Basic: React.FC = () => {
       <WorkflowManager
         brokerUrl="ws://broker.mqttdashboard.com:8000/mqtt"
         options={{
-          clientId: `clientId-${Math.random().toString(36).substring(2, 9)}`,
+          clientId: createClientId(),
           keepalive: 60,
         }}
       >

app/examples/Basic/utils.ts

@@ -0,0 +1,9 @@
+export const createClientId = () => {
+  const array = new Uint8Array(20);
+
+  window.crypto.getRandomValues(array);
+
+  return Array.from(array, (dec) =>
+    ('0' + dec.toString(16)).substring(-2),
+  ).join('');
+};

src/WorkflowManagerConfig.ts

@@ -95,7 +95,7 @@ class WorkflowManagerConfig implements WorkflowManagerConfigProps {
     const client = this.getMqttClient();
     const store = WorkflowManagerConfig._store;
 
-    const shouldSubscribe = shouldSubscribeOrUnsubscribe(topic, store, client);
+    const shouldSubscribe = shouldSubscribeOrUnsubscribe(store, client);
 
     if (!shouldSubscribe) return;
 
@@ -126,7 +126,7 @@ class WorkflowManagerConfig implements WorkflowManagerConfigProps {
     const client = this.getMqttClient();
     const store = WorkflowManagerConfig._store;
 
-    const unsubscribe = shouldSubscribeOrUnsubscribe(topic, store, client);
+    const unsubscribe = shouldSubscribeOrUnsubscribe(store, client);
 
     if (!unsubscribe) return;
 

src/utils/constants.util.ts

@@ -1,6 +1,3 @@
-export const VALID_TOPIC_PATTERN =
-  /^(([\\+#]{1}|[^\\+#]*)\/)?(([\\+#]{1}|[^\\+#]*)\/{1})*(([\\+#]{1}|[^\\+#]*))$/;
-
 export const ERROR_MESSAGES = {
   NO_WRAPPER:
     'No context found. Did you forget to wrap your app with WorkflowManager component?',

src/utils/index.ts

@@ -1,4 +1,3 @@
 export * from './constants.util';
-export * from './isValidTopic.util';
 export * from './isValidJSON.util';
 export * from './shouldSubscribeOrUnsubscribe.util';