@basictech/react 0.2.0-beta.5 → 0.2.0-beta.6

package/src/AuthContext.tsx

@@ -139,7 +139,7 @@ type ErrorObject = {
     message: string;
 }
 
-export function BasicProvider({ children, project_id, schema }: { children: React.ReactNode, project_id: string, schema: any }) {
+export function BasicProvider({ children, project_id, schema, debug = false }: { children: React.ReactNode, project_id: string, schema: any, debug?: boolean }) {
     const [isLoaded, setIsLoaded] = useState(false)
     const [isSignedIn, setIsSignedIn] = useState(false)
     const [token, setToken] = useState<Token | null>(null)
@@ -155,11 +155,11 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     useEffect(() => {
         function initDb() {
             if (!validator(schema)) {
-                console.error('Basic Schema is invalid!', validator.errors)
+                log('Basic Schema is invalid!', validator.errors)
                 console.group('Schema Errors')
                 let errorMessage = ''
                 validator.errors.forEach((error, index) => {
-                    console.log(`${index + 1}:`, error.message, ` - at ${error.instancePath}`)
+                    log(`${index + 1}:`, error.message, ` - at ${error.instancePath}`)
                     errorMessage += `${index + 1}: ${error.message} - at ${error.instancePath}\n`
                 })
                 console.groupEnd('Schema Errors')
@@ -175,10 +175,10 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
             if (!syncRef.current) {
                 syncRef.current = new BasicSync('basicdb', { schema: schema });
 
-                // console.log('db is open', syncRef.current.isOpen())
+                // log('db is open', syncRef.current.isOpen())
                 // syncRef.current.open()
                 // .then(() => {
-                //     console.log("is open now:", syncRef.current.isOpen())
+                //     log("is open now:", syncRef.current.isOpen())
                 // })
 
                 syncRef.current.handleStatusChange((status: number, url: string) => {
@@ -186,7 +186,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
                 })
 
                 syncRef.current.syncable.getStatus().then((status) => {
-                    console.log('sync status', getSyncStatus(status))
+                    log('sync status', getSyncStatus(status))
                 })
             }
 
@@ -203,11 +203,11 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
 
         const tok = await getToken()
 
-        console.log('connecting to db...', tok.substring(0, 10))
+        log('connecting to db...', tok.substring(0, 10))
 
         syncRef.current.connect({ access_token: tok })
             .catch((e) => {
-                console.log('error connecting to db', e)
+                log('error connecting to db', e)
             })
     }
 
@@ -218,7 +218,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     }, [token])
 
     const getSignInLink = () => {
-        console.log('getting sign in link...')
+        log('getting sign in link...')
 
         const randomState = Math.random().toString(36).substring(7);
 
@@ -233,14 +233,14 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     }
 
     const signin = () => {
-        console.log('signing in: ', getSignInLink())
+        log('signing in: ', getSignInLink())
         const signInLink = getSignInLink()
         //todo: change to the other thing?
         window.location.href = signInLink;
     }
 
     const signout = () => {
-        console.log('signing out!')
+        log('signing out!')
         setUser({})
         setIsSignedIn(false)
         setToken(null)
@@ -249,10 +249,10 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     }
 
     const getToken = async (): Promise<string> => {
-        console.log('getting token...')
+        log('getting token...')
 
         if (!token) {
-            console.log('no token found')
+            log('no token found')
             throw new Error('no token found')
         }
 
@@ -260,7 +260,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
         const isExpired = decoded.exp && decoded.exp < Date.now() / 1000
 
         if (isExpired) {
-            console.log('token is expired - refreshing ...')
+            log('token is expired - refreshing ...')
             const newToken = await fetchToken(token?.refresh)
             return newToken?.access_token || ''
         }
@@ -292,19 +292,21 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
             body: JSON.stringify({ code: code })
         })
             .then(response => response.json())
-            .catch(error => console.error('Error:', error))
+            .catch(error => log('Error:', error))
 
         if (token.error) {
-            console.log('error fetching token', token.error)
+            log('error fetching token', token.error)
             return
         } else {
-            // console.log('token', token)
+            // log('token', token)
             setToken(token)
         }
         return token
     }
 
     useEffect(() => {
+        localStorage.setItem('basic_debug', debug ? 'true' : 'false')
+
         try {
             let cookie_token = getCookie('basic_token')
             if (cookie_token !== '') {
@@ -313,7 +315,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
 
             if (window.location.search.includes('code')) {
                 let code = window.location?.search?.split('code=')[1].split('&')[0]
-                // console.log('code found', code)
+                // log('code found', code)
 
                 // todo: check state is valid
                 setAuthCode(code) // remove this? dont need to store code?
@@ -325,7 +327,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
                 setIsLoaded(true)
             }
         } catch (e) {
-            console.log('error getting cookie', e)
+            log('error getting cookie', e)
         }
     }, [])
 
@@ -338,14 +340,14 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
                 }
             })
                 .then(response => response.json())
-                .catch(error => console.error('Error:', error))
+                .catch(error => log('Error:', error))
 
             if (user.error) {
-                console.log('error fetching user', user.error)
+                log('error fetching user', user.error)
                 // refreshToken()
                 return
             } else {
-                // console.log('user', user)
+                // log('user', user)
                 document.cookie = `basic_token=${JSON.stringify(token)}; Secure; SameSite=Strict`;
                 setUser(user)
                 setIsSignedIn(true)
@@ -355,7 +357,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
 
         async function checkToken() {
             if (!token) {
-                console.log('error: no user token found')
+                log('error: no user token found')
                 return
             }
 
@@ -363,7 +365,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
             const isExpired = decoded.exp && decoded.exp < Date.now() / 1000
 
             if (isExpired) {
-                console.log('token is expired - refreshing ...')
+                log('token is expired - refreshing ...')
                 const newToken = await fetchToken(token?.refresh)
                 fetchUser(newToken.access_token)
             } else {
@@ -459,4 +461,4 @@ possible errors:
 
 export function useBasic() {
     return useContext(BasicContext);
-}
+}

package/src/config.ts

@@ -4,11 +4,27 @@ export const SERVER_URL = "https://api.basic.tech"
 // export const WS_URL = `${SERVER_URL}/ws`
 
 export const log = (...args: any[]) => {
-  if (process.env.NODE_ENV === 'development') {
-    console.log(...args)
-  }
+    try { 
+        if (localStorage.getItem('basic_debug') === 'true') {
+            console.log('[basic]', ...args)
+        }
+    } catch (e) {
+        // console.log('error logging', e)
+    }
 }
 
+// export const log = (message: string, ...args: any[]) => {
+//     try {
+//         if (process.env.NODE_ENV === 'development') {
+//             const stack = new Error().stack;
+//             const caller = stack?.split('\n')[2]?.trim();
+//             console.log(`[basic] ${message}`, ...args);
+//             // console.log(`[stack] ${caller}`);
+//         }
+//     } catch (e) {
+//         console.error('Error in logWithStack:', e);
+//     }
+// }
 
 const basicJsonSchema = {
   "$schema": "http://json-schema.org/draft-07/schema#",

package/src/sync/index.ts

@@ -9,7 +9,7 @@ import 'dexie-syncable';
 import 'dexie-observable';
 
 import { syncProtocol } from './syncProtocol'
-import { SERVER_URL } from '../config'
+import { SERVER_URL, log } from '../config'
 syncProtocol()
 
 
@@ -67,7 +67,7 @@ export class BasicSync extends Dexie {
     
     // Proceed with the WebSocket connection
     
-    console.log('Starting connection...')
+    log('Starting connection...')
     return this.syncable.connect("websocket", WS_URL, { authToken: access_token });
   }
 
@@ -75,7 +75,7 @@ export class BasicSync extends Dexie {
     try {
       const syncNodes = await this.table('_syncNodes').toArray();
       const localSyncNodes = syncNodes.filter(node => node.type === 'local');
-      console.log('Local sync nodes:', localSyncNodes);
+      log('Local sync nodes:', localSyncNodes);
 
       if (localSyncNodes.length > 1) {
 
@@ -84,19 +84,19 @@ export class BasicSync extends Dexie {
         // Check if the largest node is already the master
         const largestNode = localSyncNodes.find(node => node.id === largestNodeId);
         if (largestNode && largestNode.isMaster === 1) {
-          console.log('Largest node is already the master. No changes needed.');
+          log('Largest node is already the master. No changes needed.');
           return; // Exit the function early as no changes are needed
         }
 
 
-        console.log('Largest node id:', largestNodeId);
-        console.error('HEISENBUG: More than one local sync node found.')
+        log('Largest node id:', largestNodeId);
+        log('HEISENBUG: More than one local sync node found.')
 
         for (const node of localSyncNodes) {
-          console.log(`Local sync node keys:`, node.id, node.isMaster);
+          log(`Local sync node keys:`, node.id, node.isMaster);
           await this.table('_syncNodes').update(node.id, { isMaster: node.id === largestNodeId ? 1 : 0 });
 
-          console.log(`HEISENBUG: Setting ${node.id} to ${node.id === largestNodeId ? 'master' : '0'}`);
+          log(`HEISENBUG: Setting ${node.id} to ${node.id === largestNodeId ? 'master' : '0'}`);
         }
 
         // Add a 1 second delay before returning // i dont think this helps?
@@ -104,7 +104,7 @@ export class BasicSync extends Dexie {
 
       }
 
-      console.log('Sync nodes updated');
+      log('Sync nodes updated');
     } catch (error) {
       console.error('Error updating _syncNodes table:', error);
     }
@@ -150,7 +150,7 @@ export class BasicSync extends Dexie {
 
       // --- WRITE ---- // 
       add: (data: any) => {
-        console.log("Adding data to", name, data)
+        log("Adding data to", name, data)
         return this.table(name).add({
           id: uuidv7(),
           ...data

package/src/sync/syncProtocol.js

@@ -1,8 +1,9 @@
 "use client"
 import { Dexie } from "dexie";
+import { log } from "../config";
 
 export const syncProtocol = function () {
-  console.log("Initializing syncProtocol");
+  log("Initializing syncProtocol");
   // Constants:
   var RECONNECT_DELAY = 5000; // Reconnect delay in case of errors such as network down.
 
@@ -31,7 +32,7 @@ export const syncProtocol = function () {
 
       // sendChanges() method:
       function sendChanges(changes, baseRevision, partial, onChangesAccepted) {
-        console.log("sendChanges", changes.length, baseRevision);
+        log("sendChanges", changes.length, baseRevision);
         ++requestId;
         acceptCallbacks[requestId.toString()] = onChangesAccepted;
 
@@ -65,7 +66,7 @@ export const syncProtocol = function () {
         // Initiate this socket connection by sending our clientIdentity. If we dont have a clientIdentity yet,
         // server will call back with a new client identity that we should use in future WebSocket connections.
         
-        console.log("Opening socket - sending clientIdentity", context.clientIdentity);
+        log("Opening socket - sending clientIdentity", context.clientIdentity);
         ws.send(
           JSON.stringify({
             type: "clientIdentity",
@@ -79,7 +80,7 @@ export const syncProtocol = function () {
       // If network down or other error, tell the framework to reconnect again in some time:
       ws.onerror = function (event) {
         ws.close();
-        console.log("ws.onerror", event);
+        log("ws.onerror", event);
         onError(event?.message, RECONNECT_DELAY);
       };
 
@@ -109,7 +110,7 @@ export const syncProtocol = function () {
           //     partial: true if server has additionalChanges to send. False if these changes were the last known. (applicable if type="changes")
           // }
           var requestFromServer = JSON.parse(event.data);
-          console.log("requestFromServer", requestFromServer, { acceptCallback, isFirstRound });
+          log("requestFromServer", requestFromServer, { acceptCallback, isFirstRound });
 
           if (requestFromServer.type == "clientIdentity") {
             context.clientIdentity = requestFromServer.clientIdentity;
@@ -164,7 +165,7 @@ export const syncProtocol = function () {
             ws.close();
             onError(requestFromServer.message, Infinity); // Don't reconnect - an error in application level means we have done something wrong.
           } else {
-            console.log("unknown message", requestFromServer);
+            log("unknown message", requestFromServer);
             ws.close();
             onError("unknown message", Infinity);
           }