refactor - handle cloud listeners

packages/api/src/controllers/cloud.js

@@ -59,6 +59,7 @@ module.exports = {
   async putContent({ folid, cntid, content, name, type }) {
     const resp = await putCloudContent(folid, cntid, content, name, type);
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return resp;
   },
 
@@ -66,6 +67,7 @@ module.exports = {
   async createFolder({ name }) {
     const resp = await callCloudApiPost(`folders/create`, { name });
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return resp;
   },
 
@@ -80,6 +82,7 @@ module.exports = {
 
     const resp = await callCloudApiPost(`folders/grant/${mode}`, { invite });
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return resp;
   },
 
@@ -87,6 +90,7 @@ module.exports = {
   async renameFolder({ folid, name }) {
     const resp = await callCloudApiPost(`folders/rename`, { folid, name });
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return resp;
   },
 
@@ -94,6 +98,7 @@ module.exports = {
   async deleteFolder({ folid }) {
     const resp = await callCloudApiPost(`folders/delete`, { folid });
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return resp;
   },
 
@@ -106,6 +111,7 @@ module.exports = {
   refreshContent_meta: true,
   async refreshContent() {
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return {
       status: 'ok',
     };
@@ -156,6 +162,7 @@ module.exports = {
     removeCloudCachedConnection(folid, resp.cntid);
     cntid = resp.cntid;
     socket.emitChanged('cloud-content-changed');
+    socket.emit('cloud-content-updated');
     return {
       ...recryptedConn,
       _id: `cloud://${folid}/${cntid}`,

packages/api/src/utility/cloudIntf.js

@@ -320,6 +320,7 @@ async function putCloudContent(folid, cntid, content, name, type) {
     signinHolder
   );
   socket.emitChanged('cloud-content-changed');
+  socket.emit('cloud-content-updated');
   return resp;
 }
 

packages/web/src/App.svelte

@@ -28,6 +28,7 @@
   import { handleAuthOnStartup } from './clientAuth';
   import { initializeAppUpdates } from './utility/appUpdate';
   import { _t } from './translations';
+  import { installCloudListeners } from './utility/cloudListeners';
 
   export let isAdminPage = false;
 
@@ -58,6 +59,7 @@
         installNewVolatileConnectionListener();
         installNewCloudTokenListener();
         initializeAppUpdates();
+        installCloudListeners();
       }
 
       refreshPublicCloudFiles();

packages/web/src/stores.ts

@@ -457,4 +457,10 @@ focusedTreeDbKey.subscribe(value => {
 });
 export const getFocusedTreeDbKey = () => focusedTreeDbKeyValue;
 
+let cloudConnectionsStoreValue = {};
+cloudConnectionsStore.subscribe(value => {
+  cloudConnectionsStoreValue = value;
+});
+export const getCloudConnectionsStore = () => cloudConnectionsStoreValue;
+
 window['__changeCurrentTheme'] = theme => currentTheme.set(theme);

packages/web/src/utility/cloudListeners.ts

@@ -0,0 +1,48 @@
+import { derived } from 'svelte/store';
+import {
+  cloudConnectionsStore,
+  currentDatabase,
+  getCloudConnectionsStore,
+  openedConnections,
+  openedSingleDatabaseConnections,
+} from '../stores';
+import { apiCall, apiOn } from './api';
+import _ from 'lodash';
+
+export const possibleCloudConnectionSources = derived(
+  [currentDatabase, openedSingleDatabaseConnections, openedConnections],
+  ([$currentDatabase, $openedSingleDatabaseConnections, $openedConnections]) => {
+    const conids = new Set<string>();
+    if ($currentDatabase?.connection?._id) {
+      conids.add($currentDatabase.connection._id);
+    }
+    $openedSingleDatabaseConnections.forEach(x => conids.add(x));
+    $openedConnections.forEach(x => conids.add(x));
+    return Array.from(conids).filter(x => x?.startsWith('cloud://'));
+  }
+);
+
+async function loadCloudConnection(conid) {
+  const conn = await apiCall('connections/get', { conid });
+  cloudConnectionsStore.update(store => ({
+    ...store,
+    [conid]: conn,
+  }));
+}
+
+function ensureCloudConnectionsLoaded(...conids) {
+  const conns = getCloudConnectionsStore();
+  _.uniq(conids).forEach(conid => {
+    if (!conns[conid]) {
+      loadCloudConnection(conid);
+    }
+  });
+}
+
+export function installCloudListeners() {
+  possibleCloudConnectionSources.subscribe(conids => {
+    ensureCloudConnectionsLoaded(...conids);
+  });
+
+  apiOn('cloud-content-updated', () => cloudConnectionsStore.set({}));
+}

packages/web/src/widgets/PrivateCloudWidget.svelte

@@ -67,27 +67,27 @@
     await apiCall('cloud/refresh-content');
   }
 
-  async function loadCloudConnection(conid) {
+  // async function loadCloudConnection(conid) {
-    const conn = await apiCall('connections/get', { conid });
+  //   const conn = await apiCall('connections/get', { conid });
-    $cloudConnectionsStore = {
+  //   $cloudConnectionsStore = {
-      ...$cloudConnectionsStore,
+  //     ...$cloudConnectionsStore,
-      [conid]: conn,
+  //     [conid]: conn,
-    };
+  //   };
-  }
+  // }
 
-  function ensureCloudConnectionsLoaded(...conids) {
+  // function ensureCloudConnectionsLoaded(...conids) {
-    _.uniq(conids).forEach(conid => {
+  //   _.uniq(conids).forEach(conid => {
-      if (conid?.startsWith('cloud://') && !$cloudConnectionsStore[conid]) {
+  //     if (conid?.startsWith('cloud://') && !$cloudConnectionsStore[conid]) {
-        loadCloudConnection(conid);
+  //       loadCloudConnection(conid);
-      }
+  //     }
-    });
+  //   });
-  }
+  // }
 
-  $: ensureCloudConnectionsLoaded(
+  // $: ensureCloudConnectionsLoaded(
-    $currentDatabase?.connection?._id,
+  //   $currentDatabase?.connection?._id,
-    ...$openedSingleDatabaseConnections,
+  //   ...$openedSingleDatabaseConnections,
-    ...$openedConnections
+  //   ...$openedConnections
-  );
+  // );
 
   // onMount(() => {
   //   const currentConid = $currentDatabase?.connection?._id;