feat: remove default drives info from connect + add default drives to…

… reactor config

package.json

@@ -94,7 +94,7 @@
         "@sentry/vite-plugin": "^2.22.2",
         "@tanstack/react-virtual": "^3.8.1",
         "did-key-creator": "^1.2.0",
-        "document-drive": "^1.0.0-alpha.88",
+        "document-drive": "1.0.0-alpha.89",
         "document-model": "1.7.0",
         "document-model-libs": "^1.83.0",
         "electron-is-dev": "^3.0.1",

src/app/document-drive.ts

@@ -17,6 +17,7 @@ import {
 import { IpcMain, webContents } from 'electron';
 import { join } from 'path';
 import { logger } from 'src/services/logger';
+import { getReactorDefaultDrivesConfig } from 'src/utils/reactor';
 
 export default (
     documentModels: DocumentModel[],
@@ -28,6 +29,7 @@ export default (
         new FilesystemStorage(join(path, 'Document Drives')),
         new InMemoryCache(),
         new BaseQueueManager(1, 10),
+        { ...getReactorDefaultDrivesConfig() },
     );
 
     const promise = documentDrive

src/components/modal/modals/SettingsModal.tsx

@@ -71,17 +71,6 @@ export const SettingsModal: React.FC<SettingsModalProps> = props => {
             onContinue: () => {
                 clearStorage()
                     .then(() => {
-                        // resets the default drive to unloaded if it is defined
-                        setConfig(conf => ({
-                            ...conf,
-                            defaultDrives: conf.defaultDrives
-                                ? conf.defaultDrives.map(drive => ({
-                                      ...drive,
-                                      loaded: false,
-                                  }))
-                                : undefined,
-                        }));
-
                         // refreshes the page to reload default drive
                         onRefresh();
                     })

src/hooks/useFeatureFlags/default-config.ts

@@ -4,27 +4,16 @@ const ENABLED_EDITORS = import.meta.env.VITE_ENABLED_EDITORS || undefined;
 const enabledEditors = ENABLED_EDITORS?.split(',');
 
 const DISABLED_EDITORS = import.meta.env.VITE_DISABLED_EDITORS || undefined;
-const DEFAULT_DRIVES_URL = import.meta.env.VITE_DEFAULT_DRIVES_URL || undefined;
 const disabledEditors = DISABLED_EDITORS?.split(',');
 
 export interface FeatureFlag {
-    defaultDrives?: {
-        url: string;
-        loaded: boolean;
-    }[];
     editors: {
         enabledEditors?: '*' | string[];
         disabledEditors?: '*' | string[];
     };
 }
 
 const defaultConfig: FeatureFlag = {
-    defaultDrives: DEFAULT_DRIVES_URL
-        ? DEFAULT_DRIVES_URL.split(',').map(url => ({
-              url,
-              loaded: false,
-          }))
-        : undefined,
     editors: {
         enabledEditors: ENABLED_EDITORS === '*' ? '*' : enabledEditors,
         disabledEditors: DISABLED_EDITORS === '*' ? '*' : disabledEditors,

src/hooks/useLoadInitialData.tsx

@@ -15,7 +15,6 @@ import { useUiNodes } from 'src/hooks/useUiNodes';
 import { DefaultDocumentDriveServer as server } from 'src/utils/document-drive-server';
 import { useClientErrorHandler } from './useClientErrorHandler';
 import { useDocumentDrives } from './useDocumentDrives';
-import { useLoadDefaultDrives } from './useLoadDefaultDrives';
 import { isLatestVersion } from './utils';
 
 export const useLoadInitialData = () => {
@@ -32,8 +31,6 @@ export const useLoadInitialData = () => {
     const [, , serverSubscribeUpdates] = useDocumentDrives(server);
     const clientErrorHandler = useClientErrorHandler();
 
-    useLoadDefaultDrives();
-
     async function checkLatestVersion() {
         const result = await isLatestVersion();
         if (result === null) return;

src/hooks/useUiNodes.ts

@@ -84,6 +84,11 @@ export function useUiNodes() {
             ) as SharingType;
             const driveSyncStatus = await getSyncStatus(id, sharingType);
 
+            const normalizedDriveSyncStatus =
+                driveSyncStatus === 'INITIAL_SYNC'
+                    ? 'SYNCING'
+                    : driveSyncStatus;
+
             const driveNode: UiDriveNode = {
                 id,
                 name,
@@ -92,7 +97,7 @@ export function useUiNodes() {
                 children: [],
                 nodeMap: {},
                 sharingType,
-                syncStatus: driveSyncStatus,
+                syncStatus: normalizedDriveSyncStatus,
                 availableOffline,
                 icon,
                 parentFolder: null,
@@ -106,7 +111,7 @@ export function useUiNodes() {
                     driveId: id,
                     parentFolder: n.parentFolder || id,
                     kind: n.kind.toUpperCase(),
-                    syncStatus: driveSyncStatus,
+                    syncStatus: normalizedDriveSyncStatus,
                     sharingType,
                 };
 
@@ -130,10 +135,16 @@ export function useUiNodes() {
 
             for await (const node of nodes) {
                 if (node.kind === FILE) {
-                    node.syncStatus = await getSyncStatus(
+                    const fileSyncStatus = await getSyncStatus(
                         node.synchronizationUnits[0].syncId,
                         sharingType,
                     );
+                    const normalizedFileSyncStatus =
+                        fileSyncStatus === 'INITIAL_SYNC'
+                            ? 'SYNCING'
+                            : fileSyncStatus;
+
+                    node.syncStatus = normalizedFileSyncStatus;
                 }
 
                 if (node.parentFolder === id) {

src/utils/browser-document-drive.ts

@@ -6,12 +6,14 @@ import { BrowserStorage } from 'document-drive/storage/browser';
 import { utils } from 'document-model/document';
 import { logger } from 'src/services/logger';
 import { documentModels } from 'src/store/document-model';
+import { getReactorDefaultDrivesConfig } from './reactor';
 
 export const BrowserDocumentDriveServer = new DocumentDriveServer(
     documentModels,
     new BrowserStorage(connectConfig.routerBasename),
     new InMemoryCache(),
     new BaseQueueManager(1, 10),
+    { ...getReactorDefaultDrivesConfig() },
 );
 
 async function init() {

src/utils/reactor.ts

@@ -0,0 +1,47 @@
+import { DocumentDriveServerOptions } from 'document-drive/server';
+
+const DEFAULT_DRIVES_URL = import.meta.env.VITE_DEFAULT_DRIVES_URL || undefined;
+const defaultDrivesUrl = DEFAULT_DRIVES_URL?.split(',');
+
+export const getReactorDefaultDrivesConfig = (): Pick<
+    DocumentDriveServerOptions,
+    'defaultRemoteDrives' | 'removeOldRemoteDrives'
+> => {
+    const defaultDrives: DocumentDriveServerOptions['defaultRemoteDrives'] =
+        defaultDrivesUrl?.map(driveUrl => ({
+            url: driveUrl,
+            options: {
+                sharingType: 'PUBLIC',
+                availableOffline: true,
+                listeners: [
+                    {
+                        block: true,
+                        callInfo: {
+                            data: driveUrl,
+                            name: 'switchboard-push',
+                            transmitterType: 'SwitchboardPush',
+                        },
+                        filter: {
+                            branch: ['main'],
+                            documentId: ['*'],
+                            documentType: ['*'],
+                            scope: ['global'],
+                        },
+                        label: 'Switchboard Sync',
+                        listenerId: '1',
+                        system: true,
+                    },
+                ],
+                triggers: [],
+                pullInterval: 3000,
+            },
+        }));
+
+    return {
+        defaultRemoteDrives: defaultDrives,
+        removeOldRemoteDrives: {
+            strategy: 'preserve-by-url',
+            urls: defaultDrivesUrl || [],
+        },
+    };
+};