satyamark-react 0.0.13 → 0.0.15

package/README.md

@@ -93,8 +93,12 @@ function PostCard({ post }) {
   const ref = useRef(null);
 
   useEffect(() => {
-    if (!ref.current) return;
-    process(ref.current, post.id);
+    if (!cardRef.current) return;
+    try {
+      process(cardRef.current, postData.id);
+    } catch (error) {
+      console.log(error);
+    }
   }, [post.id]);
 
   return (
@@ -145,6 +149,10 @@ SatyaMark consists of three core modules that work together:
 
 All retries, result handling, and UI updates are managed internally.
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/DhirajKarangale/SatyaMark/main/Assets/NpmCover/NpmCover_1.png" alt="SatyaMark Architecture" width="100%" />
+</p>
+
 ------------------------------------------------------------------------
 
 ## API Reference
@@ -241,8 +249,12 @@ SatyaMark displays different marks based on verification results:
 
   **Solution:** Check ref exists before processing:
   ```tsx
-  if (!contentRef.current) return;
-  process(contentRef.current, post.id);
+  if (!cardRef.current) return;
+  try {
+    process(cardRef.current, postData.id);
+  } catch (error) {
+    console.log(error);
+  }
   ```
 
 ### 2. No valid text or image found

package/dist/index.js

@@ -42,7 +42,7 @@ var SocketClient = class {
   }
   send(payload) {
     if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
-      throw new Error("Socket not ready");
+      throw new Error("notready");
     }
     this.socket.send(JSON.stringify(payload));
   }
@@ -58,13 +58,10 @@ var SocketClient = class {
 };
 
 // src/utils/generateIds.ts
-function generateTimestamp() {
-  const now = /* @__PURE__ */ new Date();
-  return now.getFullYear().toString() + String(now.getMonth() + 1).padStart(2, "0") + String(now.getDate()).padStart(2, "0") + String(now.getHours()).padStart(2, "0") + String(now.getMinutes()).padStart(2, "0") + String(now.getSeconds()).padStart(2, "0") + String(now.getMilliseconds()).padStart(3, "0") + Math.floor(Math.random() * 1e3).toString().padStart(3, "0");
-}
 function generateJobId(app_id, user_id, dataId) {
-  const timestamp = generateTimestamp();
-  const jobId = `${app_id}_${user_id}_${dataId}_${timestamp}`;
+  const timestamp = Date.now().toString(36);
+  const random = crypto.getRandomValues(new Uint32Array(1))[0].toString(36);
+  const jobId = `${app_id}_${user_id}_${dataId}_${timestamp}_${random}`;
   return jobId;
 }
 
@@ -197,7 +194,7 @@ function clearSession() {
 }
 
 // src/core/connectionManager.ts
-var isDev = false;
+var isDev = true;
 var context = null;
 var socketClient = null;
 var isConnecting = false;
@@ -215,37 +212,31 @@ async function resolveWsUrl() {
   const data = await res.json();
   const wsUrl = data.wsUrl;
   if (!wsUrl)
-    throw new Error("WebSocket URL resolution failed");
+    throw new Error("Satyamark: WebSocket URL resolution failed");
   return wsUrl;
 }
 async function init(newContext) {
-  if (!(newContext == null ? void 0 : newContext.app_id) || !(newContext == null ? void 0 : newContext.user_id)) {
-    throw new Error("init() requires valid app_id and user_id");
-  }
-  if (isConnecting || isConnected)
-    return;
   context = newContext;
   await connect();
 }
 async function connect() {
-  if (!context)
-    return;
   if (isConnecting || isConnected)
     return;
   isConnecting = true;
   const url = await resolveWsUrl();
   socketClient = new SocketClient(url, {
     onOpen: async () => {
+      const ctx = getContext();
       const sessionId = await getSessionId();
       socketClient == null ? void 0 : socketClient.send({
         type: "handshake",
-        clientId: context == null ? void 0 : context.user_id,
-        app_id: context == null ? void 0 : context.app_id,
+        clientId: ctx.user_id,
+        app_id: ctx.app_id,
         sessionId
       });
       isConnected = true;
       isConnecting = false;
-      emitConnection(context);
+      emitConnection(ctx);
     },
     onMessage: async (data) => {
       if (data.type === "session_created" && data.sessionId) {
@@ -285,19 +276,18 @@ function scheduleReconnect() {
     connect();
   }, 2e3);
 }
-async function sendJob(text, imageUrl, dataId) {
-  if (!context)
-    throw new Error("Satyamark is not ready Call init() first");
-  if (!text && !imageUrl) {
-    throw new Error("Provide text or imageUrl");
-  }
-  if (text && text.trim().length < 3) {
-    throw new Error("Text must be at least 3 characters");
+function getContext() {
+  if (!(context == null ? void 0 : context.app_id) || !(context == null ? void 0 : context.user_id)) {
+    throw new Error("Satyamark: Invalid app_id and user_id in init()");
   }
-  const jobId = generateJobId(context.app_id, context.user_id, dataId);
+  return context;
+}
+async function sendJob(text, imageUrl, dataId) {
+  const ctx = getContext();
+  const jobId = generateJobId(ctx.app_id, ctx.user_id, dataId);
   const sessionId = await getSessionId();
   socketClient == null ? void 0 : socketClient.send({
-    clientId: context.user_id,
+    clientId: ctx.user_id,
     sessionId,
     jobId,
     text,
@@ -409,7 +399,7 @@ function updateIcon(containerRef, data) {
 }
 
 // src/utils/process_data.ts
-var mergeText = (texts) => texts.join(", ");
+var mergeText = (texts) => texts.join(" |#| ");
 var isValidImageUrl = (url) => {
   return new Promise((resolve) => {
     const img = new Image();
@@ -439,20 +429,20 @@ var extractFromDiv = (root) => {
   return { text, images };
 };
 async function process_data(divRef, dataId) {
-  if (!divRef) {
-    throw new Error("Invalid root element");
-  }
   if (!dataId) {
-    throw new Error("dataId is required");
+    throw new Error("Satyamark: Invalid dataId");
+  }
+  if (!divRef) {
+    throw new Error("Satyamark: Invalid root element");
   }
   const { text, images } = extractFromDiv(divRef);
   const mergedText = mergeText(text);
   const validImage = await getFirstValidImage(images);
   if (!mergedText && !validImage) {
-    throw new Error("No valid text or image found in the element");
+    throw new Error("Satyamark: No valid text or image found in the element");
   }
   if (mergedText && mergedText.length < 3) {
-    throw new Error("Extracted text is too short");
+    throw new Error("Satyamark: Extracted text is too short");
   }
   const image_url = validImage ? validImage : "";
   return { text: mergedText, image_url };
@@ -464,9 +454,20 @@ var isSendingJobs = false;
 var jobMap = /* @__PURE__ */ new Map();
 var process_queue = [];
 function process(containerRef, dataId) {
+  validateStatusContainer(containerRef);
   process_queue.push({ containerRef, dataId });
   void sendJobs();
 }
+function validateStatusContainer(containerRef) {
+  const statusContainer = containerRef.querySelector(
+    "[data-satyamark-status-container]"
+  );
+  if (!statusContainer) {
+    throw new Error(
+      'Satyamark: Missing element with attribute "data-satyamark-status-container" inside containerRef.'
+    );
+  }
+}
 async function sendJobs() {
   if (isSendingJobs || !isConnected2)
     return;
@@ -483,11 +484,14 @@ async function sendJobs() {
       process_queue.shift();
       updateIcon(containerRef, null);
     } catch (error) {
-      isSendingJobs = false;
-      setTimeout(() => {
-        void sendJobs();
-      }, 1e3);
-      return;
+      if (error instanceof Error && error.message === "notready") {
+        isSendingJobs = false;
+        setTimeout(() => {
+          void sendJobs();
+        }, 1e3);
+        return;
+      }
+      throw error;
     }
   }
   isSendingJobs = false;

package/dist/index.mjs

@@ -14,7 +14,7 @@ var SocketClient = class {
   }
   send(payload) {
     if (!this.socket || this.socket.readyState !== WebSocket.OPEN) {
-      throw new Error("Socket not ready");
+      throw new Error("notready");
     }
     this.socket.send(JSON.stringify(payload));
   }
@@ -30,13 +30,10 @@ var SocketClient = class {
 };
 
 // src/utils/generateIds.ts
-function generateTimestamp() {
-  const now = /* @__PURE__ */ new Date();
-  return now.getFullYear().toString() + String(now.getMonth() + 1).padStart(2, "0") + String(now.getDate()).padStart(2, "0") + String(now.getHours()).padStart(2, "0") + String(now.getMinutes()).padStart(2, "0") + String(now.getSeconds()).padStart(2, "0") + String(now.getMilliseconds()).padStart(3, "0") + Math.floor(Math.random() * 1e3).toString().padStart(3, "0");
-}
 function generateJobId(app_id, user_id, dataId) {
-  const timestamp = generateTimestamp();
-  const jobId = `${app_id}_${user_id}_${dataId}_${timestamp}`;
+  const timestamp = Date.now().toString(36);
+  const random = crypto.getRandomValues(new Uint32Array(1))[0].toString(36);
+  const jobId = `${app_id}_${user_id}_${dataId}_${timestamp}_${random}`;
   return jobId;
 }
 
@@ -169,7 +166,7 @@ function clearSession() {
 }
 
 // src/core/connectionManager.ts
-var isDev = false;
+var isDev = true;
 var context = null;
 var socketClient = null;
 var isConnecting = false;
@@ -187,37 +184,31 @@ async function resolveWsUrl() {
   const data = await res.json();
   const wsUrl = data.wsUrl;
   if (!wsUrl)
-    throw new Error("WebSocket URL resolution failed");
+    throw new Error("Satyamark: WebSocket URL resolution failed");
   return wsUrl;
 }
 async function init(newContext) {
-  if (!(newContext == null ? void 0 : newContext.app_id) || !(newContext == null ? void 0 : newContext.user_id)) {
-    throw new Error("init() requires valid app_id and user_id");
-  }
-  if (isConnecting || isConnected)
-    return;
   context = newContext;
   await connect();
 }
 async function connect() {
-  if (!context)
-    return;
   if (isConnecting || isConnected)
     return;
   isConnecting = true;
   const url = await resolveWsUrl();
   socketClient = new SocketClient(url, {
     onOpen: async () => {
+      const ctx = getContext();
       const sessionId = await getSessionId();
       socketClient == null ? void 0 : socketClient.send({
         type: "handshake",
-        clientId: context == null ? void 0 : context.user_id,
-        app_id: context == null ? void 0 : context.app_id,
+        clientId: ctx.user_id,
+        app_id: ctx.app_id,
         sessionId
       });
       isConnected = true;
       isConnecting = false;
-      emitConnection(context);
+      emitConnection(ctx);
     },
     onMessage: async (data) => {
       if (data.type === "session_created" && data.sessionId) {
@@ -257,19 +248,18 @@ function scheduleReconnect() {
     connect();
   }, 2e3);
 }
-async function sendJob(text, imageUrl, dataId) {
-  if (!context)
-    throw new Error("Satyamark is not ready Call init() first");
-  if (!text && !imageUrl) {
-    throw new Error("Provide text or imageUrl");
-  }
-  if (text && text.trim().length < 3) {
-    throw new Error("Text must be at least 3 characters");
+function getContext() {
+  if (!(context == null ? void 0 : context.app_id) || !(context == null ? void 0 : context.user_id)) {
+    throw new Error("Satyamark: Invalid app_id and user_id in init()");
   }
-  const jobId = generateJobId(context.app_id, context.user_id, dataId);
+  return context;
+}
+async function sendJob(text, imageUrl, dataId) {
+  const ctx = getContext();
+  const jobId = generateJobId(ctx.app_id, ctx.user_id, dataId);
   const sessionId = await getSessionId();
   socketClient == null ? void 0 : socketClient.send({
-    clientId: context.user_id,
+    clientId: ctx.user_id,
     sessionId,
     jobId,
     text,
@@ -381,7 +371,7 @@ function updateIcon(containerRef, data) {
 }
 
 // src/utils/process_data.ts
-var mergeText = (texts) => texts.join(", ");
+var mergeText = (texts) => texts.join(" |#| ");
 var isValidImageUrl = (url) => {
   return new Promise((resolve) => {
     const img = new Image();
@@ -411,20 +401,20 @@ var extractFromDiv = (root) => {
   return { text, images };
 };
 async function process_data(divRef, dataId) {
-  if (!divRef) {
-    throw new Error("Invalid root element");
-  }
   if (!dataId) {
-    throw new Error("dataId is required");
+    throw new Error("Satyamark: Invalid dataId");
+  }
+  if (!divRef) {
+    throw new Error("Satyamark: Invalid root element");
   }
   const { text, images } = extractFromDiv(divRef);
   const mergedText = mergeText(text);
   const validImage = await getFirstValidImage(images);
   if (!mergedText && !validImage) {
-    throw new Error("No valid text or image found in the element");
+    throw new Error("Satyamark: No valid text or image found in the element");
   }
   if (mergedText && mergedText.length < 3) {
-    throw new Error("Extracted text is too short");
+    throw new Error("Satyamark: Extracted text is too short");
   }
   const image_url = validImage ? validImage : "";
   return { text: mergedText, image_url };
@@ -436,9 +426,20 @@ var isSendingJobs = false;
 var jobMap = /* @__PURE__ */ new Map();
 var process_queue = [];
 function process(containerRef, dataId) {
+  validateStatusContainer(containerRef);
   process_queue.push({ containerRef, dataId });
   void sendJobs();
 }
+function validateStatusContainer(containerRef) {
+  const statusContainer = containerRef.querySelector(
+    "[data-satyamark-status-container]"
+  );
+  if (!statusContainer) {
+    throw new Error(
+      'Satyamark: Missing element with attribute "data-satyamark-status-container" inside containerRef.'
+    );
+  }
+}
 async function sendJobs() {
   if (isSendingJobs || !isConnected2)
     return;
@@ -455,11 +456,14 @@ async function sendJobs() {
       process_queue.shift();
       updateIcon(containerRef, null);
     } catch (error) {
-      isSendingJobs = false;
-      setTimeout(() => {
-        void sendJobs();
-      }, 1e3);
-      return;
+      if (error instanceof Error && error.message === "notready") {
+        isSendingJobs = false;
+        setTimeout(() => {
+          void sendJobs();
+        }, 1e3);
+        return;
+      }
+      throw error;
     }
   }
   isSendingJobs = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "satyamark-react",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "Official React SDK for SatyaMark — a lightweight UI library to embed transparent content verification marks, confidence indicators, and trust signals into React applications.",
   "license": "MIT",
   "author": "DK",