Merge pull request #371 from openchatai/widget/minor-fixes

.github/workflows/build-widget.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "copilot-widget/**"
 jobs:
-  build-and-publish:
+  build-and-upload-script:
     runs-on: ubuntu-latest
 
     steps:
@@ -18,7 +18,7 @@ jobs:
         run: cd copilot-widget/ && npm install
 
       - name: Build copilot-widget
-        run: cd copilot-widget/ && npm run build
+        run: cd copilot-widget/ && npm run build:embed
 
       - name: Upload embed as artifact.
         uses: actions/upload-artifact@v3

copilot-widget/lib/contexts/axiosInstance.tsx

@@ -30,7 +30,7 @@ const AxiosContext = createContext<AxiosInstanceProps | undefined>(undefined);
 // prefred it separated for the future.
 export function AxiosProvider({ children }: { children: ReactNode }) {
   const config = useConfigData();
-  const { sessionId } = useSessionId();
+  const { sessionId } = useSessionId(config?.token || 'defaultToken');
   const axiosInstance: AxiosInstance = createAxiosInstance(config?.apiUrl, sessionId, config?.token);
 
   return (

copilot-widget/lib/hooks/useSessionId.ts

@@ -1,20 +1,14 @@
-import { useLayoutEffect, useState } from "react";
+import { useEffect, useState } from "react";
 
-export const SESSION_ID_KEY = "@openchatai:session_id";
-function gtSessionId() {
-  return sessionStorage.getItem(SESSION_ID_KEY);
+// the session id will be copilotId:uniqueId
+function randomString(length: number = 10) {
+  return Math.random().toString(36).substring(2, length + 2);
 }
-export function useSessionId() {
-  const [sessionId, setSessionId] = useState<string | undefined | null>(gtSessionId);
-  useLayoutEffect(() => {
-    const $sessionId = sessionStorage.getItem(SESSION_ID_KEY);
-    if ($sessionId) {
-      setSessionId(sessionId);
-    } else {
-      const newSessionId = Math.random().toString(36).substring(2, 15);
-      sessionStorage.setItem(SESSION_ID_KEY, newSessionId);
-      setSessionId(newSessionId);
-    }
-  }, []);
+
+export function useSessionId(copilotToken: string) {
+  const [sessionId, setSessionId] = useState<string>(sessionStorage.getItem(copilotToken) || randomString());
+  useEffect(() => {
+    sessionStorage.setItem(copilotToken, sessionId);
+  }, [sessionId, copilotToken]);
   return { sessionId, setSessionId };
 }

copilot-widget/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openchatai/copilot-widget",
   "private": false,
-  "version": "1.3.1",
+  "version": "1.4.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

dashboard/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@hookform/resolvers": "^3.3.1",
-    "@openchatai/copilot-widget": "^1.3.1",
+    "@openchatai/copilot-widget": "^1.4.0",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-avatar": "^1.0.4",