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

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);
     }
@@ -136,7 +136,6 @@ export class BasicSync extends Dexie {
     return this.syncable
   }
 
-
   collection(name: string) {
     // TODO: check against schema
 
@@ -150,7 +149,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
@@ -175,12 +174,12 @@ export class BasicSync extends Dexie {
 
       // --- READ ---- // 
 
-      get: (id: string) => {
-        return this.table(name).get(id)
+      get: async (id: string) => {
+        return this.table(name).get(id) 
       },
 
-      getAll: () => {
-        return this.table(name).toArray()
+      getAll: async () => {
+        return this.table(name).toArray();
       },
 
       // --- QUERY ---- // 
@@ -193,3 +192,7 @@ export class BasicSync extends Dexie {
     }
   }
 }
+
+class QueryMethod { 
+
+}

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);
           }