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

package/src/AuthContext.tsx

@@ -3,23 +3,53 @@
 import React, { createContext, useContext, useEffect, useState, useRef } from 'react'
 import { jwtDecode } from 'jwt-decode'
 
-
-
 import { BasicSync } from './sync'
 import { get, add, update, deleteRecord } from './db'
 
+import { validator, log } from './config'
+
+/*
+schema todo:
+    field types
+    array types
+    relations
+*/
+
+
+// const example = {
+//     project_id: '123',
+//     version: 0,
+//     tables: {
+//         example: {
+//             name: 'example',
+//             type: 'collection',
+//             fields: {
+//                 id: {
+//                     type: 'uuid',
+//                     primary: true,
+//                 },
+//                 value: {
+//                     type: 'string',
+//                     indexed: true,
+//                 },
+//             }
+//         }
+//     }
+// }
+
+
 type BasicSyncType = {
     basic_schema: any;
     connect: (options: { access_token: string }) => void;
     debugeroo: () => void;
     collection: (name: string) => {
-      ref: {
-        toArray: () => Promise<any[]>;
-        count: () => Promise<number>;
-      };
+        ref: {
+            toArray: () => Promise<any[]>;
+            count: () => Promise<number>;
+        };
     };
     [key: string]: any; // For other potential methods and properties
-  };
+};
 
 
 enum DBStatus {
@@ -56,7 +86,7 @@ export const BasicContext = createContext<{
     signin: () => void,
     getToken: () => Promise<string>,
     getSignInLink: () => string,
-    db: any, 
+    db: any,
     dbStatus: DBStatus
 }>({
     unicorn: "🦄",
@@ -103,6 +133,12 @@ function getSyncStatus(statusCode: number): string {
     }
 }
 
+type ErrorObject = {
+    code: string;
+    title: string;
+    message: string;
+}
+
 export function BasicProvider({ children, project_id, schema }: { children: React.ReactNode, project_id: string, schema: any }) {
     const [isLoaded, setIsLoaded] = useState(false)
     const [isSignedIn, setIsSignedIn] = useState(false)
@@ -110,30 +146,53 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     const [authCode, setAuthCode] = useState<string | null>(null)
     const [user, setUser] = useState<User>({})
 
-    const [dbStatus, setDbStatus] = useState<DBStatus>(DBStatus.OFFLINE)
-
+    const [dbStatus, setDbStatus] = useState<DBStatus>(DBStatus.LOADING)
 
     const syncRef = useRef<BasicSync | null>(null);
 
+    const [error, setError] = useState<ErrorObject | null>(null)
+
     useEffect(() => {
-        if (!syncRef.current) {
-            syncRef.current = new BasicSync('basicdb', { schema: schema });
+        function initDb() {
+            if (!validator(schema)) {
+                console.error('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}`)
+                    errorMessage += `${index + 1}: ${error.message} - at ${error.instancePath}\n`
+                })
+                console.groupEnd('Schema Errors')
+                setError({
+                    code: 'schema_invalid',
+                    title: 'Basic Schema is invalid!',
+                    message: errorMessage
+                })
+                return null
+            }
 
-            // console.log('db is open', syncRef.current.isOpen())
-            // syncRef.current.open()
-            // .then(() => {
-            //     console.log("is open now:", syncRef.current.isOpen())
-            // })
 
-            syncRef.current.handleStatusChange((status: number, url: string) => {
-                setDbStatus(getSyncStatus(status))
-            })
+            if (!syncRef.current) {
+                syncRef.current = new BasicSync('basicdb', { schema: schema });
 
-            syncRef.current.syncable.getStatus().then((status) => {
-                console.log('sync status', getSyncStatus(status))
-            })
+                // console.log('db is open', syncRef.current.isOpen())
+                // syncRef.current.open()
+                // .then(() => {
+                //     console.log("is open now:", syncRef.current.isOpen())
+                // })
+
+                syncRef.current.handleStatusChange((status: number, url: string) => {
+                    setDbStatus(getSyncStatus(status))
+                })
+
+                syncRef.current.syncable.getStatus().then((status) => {
+                    console.log('sync status', getSyncStatus(status))
+                })
+            }
 
         }
+
+        initDb()
     }, []);
 
 
@@ -153,7 +212,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
     }
 
     useEffect(() => {
-        if (token) {
+        if (token && syncRef.current) {
             connectToDb()
         }
     }, [token])
@@ -163,8 +222,7 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
 
         const randomState = Math.random().toString(36).substring(7);
 
-        // let baseUrl = "https://api.basic.tech/auth/authorize"
-        let baseUrl = "http://localhost:3003/auth/authorize"
+        let baseUrl = "https://api.basic.tech/auth/authorize"
         baseUrl += `?client_id=${project_id}`
         baseUrl += `&redirect_uri=${encodeURIComponent(window.location.href)}`
         baseUrl += `&response_type=code`
@@ -366,11 +424,39 @@ export function BasicProvider({ children, project_id, schema }: { children: Reac
             db: syncRef.current,
             dbStatus
         }}>
+            {error && <ErrorDisplay error={error} />}
             {syncRef.current ? children : null}
         </BasicContext.Provider>
     )
 }
 
+function ErrorDisplay({ error }: { error: ErrorObject }) {
+    return <div style={{ 
+        position: 'absolute',
+        top: 20, 
+        left: 20,
+        color: 'black',
+        backgroundColor: '#f8d7da',
+        border: '1px solid #f5c6cb',
+        borderRadius: '4px',
+        padding: '20px',
+        maxWidth: '400px',
+        margin: '20px auto',
+        boxShadow: '0 2px 4px rgba(0, 0, 0, 0.1)',
+        fontFamily: 'monospace', 
+     }}>
+        <h3 style={{fontSize: '0.8rem', opacity: 0.8}}>code: {error.code}</h3>
+        <h1 style={{fontSize: '1.2rem', lineHeight: '1.5'}}>{error.title}</h1>
+        <p>{error.message}</p>
+    </div>
+}
+
+/*
+possible errors: 
+- projectid missing / invalid
+- schema missing / invalid
+*/
+
 export function useBasic() {
     return useContext(BasicContext);
 }

package/src/config.ts

@@ -0,0 +1,73 @@
+import Ajv from 'ajv'
+
+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)
+  }
+}
+
+
+const basicJsonSchema = {
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+      "project_id": {
+          "type": "string"
+      },
+      "namespace": {
+          "type": "string",
+      },
+      "version": {
+          "type": "integer",
+          "minimum": 0
+      },
+      "tables": {
+          "type": "object",
+          "patternProperties": {
+              "^[a-zA-Z0-9_]+$": {
+                  "type": "object",
+                  "properties": {
+                      "name": {
+                          "type": "string"
+                      },
+                      "type": {
+                          "type": "string",
+                          "enum": ["collection"]
+                      },
+                      "fields": {
+                          "type": "object",
+                          "patternProperties": {
+                              "^[a-zA-Z0-9_]+$": {
+                                  "type": "object",
+                                  "properties": {
+                                      "type": {
+                                          "type": "string"
+                                      },
+                                      "primary": {
+                                          "type": "boolean"
+                                      },
+                                      "indexed": {
+                                          "type": "boolean"
+                                      }
+                                  },
+                                  "required": ["type"]
+                              }
+                          },
+                          "additionalProperties": true
+                      }
+                  },
+                  "required": ["fields"]
+              }
+          },
+          "additionalProperties": true
+      }
+  },
+  "required": ["project_id", "version", "tables"]
+}
+
+
+const ajv = new Ajv()
+export const validator = ajv.compile(basicJsonSchema)

package/src/sync/index.ts

@@ -1,21 +1,27 @@
+"use client"
+
 import { v7 as uuidv7 } from 'uuid';
 import { Dexie, PromiseExtended } from 'dexie';
-import 'dexie-observable';
+// if (typeof window !== 'undefined') {
+//   import('dexie-observable');
+// }
 import 'dexie-syncable';
+import 'dexie-observable';
 
 import { syncProtocol } from './syncProtocol'
-
+import { SERVER_URL } from '../config'
 syncProtocol()
 
 
-const DexieSyncStatus = {
-  "-1": "ERROR",
-  "0": "OFFLINE",
-  "1": "CONNECTING",
-  "2": "ONLINE",
-  "3": "SYNCING",
-  "4": "ERROR_WILL_RETRY"
-}
+// const DexieSyncStatus = {
+//   "-1": "ERROR",
+//   "0": "OFFLINE",
+//   "1": "CONNECTING",
+//   "2": "ONLINE",
+//   "3": "SYNCING",
+//   "4": "ERROR_WILL_RETRY"
+// }
+
 
 
 
@@ -52,7 +58,8 @@ export class BasicSync extends Dexie {
   }
 
   async connect({ access_token }: { access_token: string }) {
-    const WS_URL = "ws://localhost:3003/ws"
+    // const WS_URL = "ws://localhost:3003/ws"
+    const WS_URL = `${SERVER_URL}/ws`
 
     
     // Update sync nodes