remove some unnecessary functions

canvas-ai · May 9, 2024 · 424138c · 424138c
1 parent 08f09b2
commit 424138c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 68 deletions.
diff --git a/_test.js b/_test.js
@@ -17,66 +17,6 @@ function loadTabFromBackend(tabID, cb) {
     });
 }
 
-
-
-
-function compareAndPopulateMaps() {
-    fetchOpenTabs().then(openTabs => {
-        fetchTabsFromCanvas().then(canvasTabs => {
-
-            // Check for tabs that are open but not in Canvas
-            openTabs.forEach((tab, url) => {
-                if (!canvasTabs.has(url)) {
-                    browserToCanvasTabsDelta.set(url, tab);
-                }
-            });
-
-            // Check for tabs that are in Canvas but not open
-            canvasTabs.forEach((canvasTab, url) => {
-                if (!openTabs.has(url)) {
-                    canvasToBrowserTabsDelta.set(url, canvasTab);
-                }
-            });
-
-            console.log('background.js | Tabs not synced to Canvas: ', canvasToBrowserTabsDelta.size);
-            console.log('background.js | Tabs not opened in browser: ', browserToCanvasBlacklist.size);
-
-        }).catch(error => console.error("background.js | Error fetching tabs from Canvas:", error));
-    }).catch(error => console.error("background.js | Error fetching open tabs:", error));
-}
-
-function fetchOpenTabs() {
-    let browserTabsMap = new Map();
-    return new Promise((resolve, reject) => {
-        browser.tabs.query({}).then(tabs => {
-            tabs.forEach(tab => {
-                browserTabsMap.set(tab.url, tab);
-            });
-            resolve(browserTabsMap);
-        }).catch(reject);
-    });
-}
-
-function fetchTabsFromCanvas() {
-    let canvasTabsMap = new Map();
-    return new Promise(async (resolve, reject) => {
-        socket.emit('documents:get', { type: await genFeatureArray() }, (res) => {
-            console.log('background.js | Tabs fetched: ', res);
-            if (!res || res.status === 'error') resolve(canvasTabsMap) // TODO: Handle error
-
-            res.data.forEach(tabData => {
-                canvasTabsMap.set(tabData.url, tabData); // Assuming tabData.url is the SHA1 checksum of the URL
-            });
-            resolve(canvasTabsMap);
-        });
-
-        resolve(canvasTabsMap);
-    });
-}
-
-
-
-
 async function sendTabToCanvas(tab, tagArray) {
     return new Promise((resolve, reject) => {
         socket.emit('sendTabToCanvas', { tab, tagArray }, (response) => {

diff --git a/src/background/canvas.ts b/src/background/canvas.ts
@@ -1,15 +1,15 @@
 import { SOCKET_MESSAGES } from "@/general/constants";
 import { getSocket } from "./socket";
 import index from "./TabIndex";
-import { getCurrentBrowser, genFeatureArray, onContextTabsUpdated } from "./utils";
+import { getCurrentBrowser, onContextTabsUpdated } from "./utils";
 
 
 export function canvasFetchTabsForContext() {
   return new Promise(async (resolve, reject) => {
     const socket = await getSocket();
     socket.emit(
       SOCKET_MESSAGES.DOCUMENT.GET_ARRAY,
-      genFeatureArray(),
+      'data/abstraction/tab',
       (res) => {
         if (res.status === "error") {
           console.error("background.js | Error fetching tabs from Canvas: ", res);
@@ -45,7 +45,7 @@ export function canvasFetchContextUrl(): Promise<string> {
 export function canvasFetchTabSchema() {
   return new Promise(async (resolve, reject) => {
     const socket = await getSocket();
-    socket.emit(SOCKET_MESSAGES.SCHEMAS.GET, { type: genFeatureArray() }, (res) => {
+    socket.emit(SOCKET_MESSAGES.SCHEMAS.GET, { type: 'data/abstraction/tab' }, (res) => {
       console.log("background.js | Tab schema fetched: ", res);
       resolve(res);
     });
@@ -57,7 +57,7 @@ export function canvasFetchTab(docId: number) {
     const socket = await getSocket();
     socket.emit(
       SOCKET_MESSAGES.DOCUMENT.GET,
-      { type: genFeatureArray(), docId },
+      { type: 'data/abstraction/tab', docId },
       (res) => {
         console.log("background.js | Tab fetched: ", res);
         resolve(res);
@@ -158,7 +158,7 @@ export function canvasCheckConnection() {
 export async function formatTabProperties(tab: ICanvasTab): Promise<IFormattedTabProperties> {
   if(!tab.docId) tab.docId = index.getCanvasDocumentIdByTabUrl(tab.url as string);
   const result = {
-    type: genFeatureArray(),
+    type: 'data/abstraction/tab',
     meta: {
       url: tab.url,
       browser: getCurrentBrowser()

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -1,5 +1,5 @@
 import { canvasDeleteTab, canvasDeleteTabs, canvasFetchTabsForContext, canvasInsertTab, canvasInsertTabArray, canvasRemoveTab, canvasRemoveTabs, canvasUpdateTab } from "./canvas";
-import { browserCloseTabArray, browserIsValidTabUrl, browserOpenTabArray, getCurrentBrowser, genFeatureArray, onContextTabsUpdated, sendRuntimeMessage, stripTabProperties } from "./utils";
+import { browserCloseTabArray, browserIsValidTabUrl, browserOpenTabArray, getCurrentBrowser, onContextTabsUpdated, sendRuntimeMessage, stripTabProperties } from "./utils";
 import config from "@/general/config";
 import { getSocket } from "./socket";
 import index from "./TabIndex";
@@ -15,7 +15,7 @@ console.log('background.js | Initializing Canvas Browser Extension background wo
   // Runtime defaults
   let TabDocumentSchema: () => ITabDocumentSchema = () => {
     return {
-      type: genFeatureArray(),
+      type: 'data/abstraction/tab',
       meta: {
         browser: getCurrentBrowser()
       },

diff --git a/src/background/utils.ts b/src/background/utils.ts
@@ -141,7 +141,7 @@ export const filterRemovedPinnedTabs = async (tabsArray: ICanvasTab[]) => {
 }
 
 export const genFeatureArray = () => {
-  const features = ['data/abstraction/tab'];
+  const features = [`custom/app/${getCurrentBrowser()}`];
   const bt = config.browserIdentity.browserTag;
   if(bt.trim().length) {
     features.push(`custom/tag/${bt.trim()}`);