load entire DB in one message.

3 files changed, 21 insertions, 15 deletions

diff --git a/src/client/DocServer.ts b/src/client/DocServer.ts
index 9683eab45..d936f6e2a 100644
--- a/src/client/DocServer.ts
+++ b/src/client/DocServer.ts
@@ -10,6 +10,7 @@ import MobileInkOverlay from '../mobile/MobileInkOverlay';
 import { runInAction } from 'mobx';
 import { ObjectField } from '../fields/ObjectField';
 import { StrCast } from '../fields/Types';
+import * as rp from 'request-promise';
 
 /**
  * This class encapsulates the transfer and cross-client synchronization of
@@ -34,6 +35,12 @@ export namespace DocServer {
             if (doc instanceof Doc) strings.push(StrCast(doc.author) + " " + StrCast(doc.title) + " " + StrCast(Doc.GetT(doc, "title", "string", true)));
         });
         strings.sort().forEach((str, i) => console.log(i.toString() + " " + str));
+        rp.post(Utils.prepend("/setCacheDocumentIds"), {
+            body: {
+                cacheDocumentIds: Array.from(Object.keys(_cache)).join(";"),
+            },
+            json: true,
+        });
     }
     export let _socket: SocketIOClient.Socket;
     // this client's distinct GUID created at initialization
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 1096b8e5f..d011d7b09 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -31,8 +31,10 @@ import { SearchUtil } from "./SearchUtil";
 import { SelectionManager } from "./SelectionManager";
 import { UndoManager } from "./UndoManager";
 import { SharingPermissions } from "../../fields/util";
+import { Networking } from "../Network";
 
 
+export let resolvedPorts: { server: number, socket: number };
 const headerViewVersion = "0.1";
 export class CurrentUserUtils {
     private static curr_id: string;
@@ -1009,9 +1011,13 @@ export class CurrentUserUtils {
     }
 
     public static async loadCurrentUser() {
-        return rp.get(Utils.prepend("/getCurrentUser")).then(response => {
+        return rp.get(Utils.prepend("/getCurrentUser")).then(async response => {
             if (response) {
-                const result: { id: string, email: string } = JSON.parse(response);
+                const result: { id: string, email: string, cacheDocumentIds: string } = JSON.parse(response);
+                Doc.CurrentUserEmail = result.email;
+                resolvedPorts = JSON.parse(await Networking.FetchFromServer("/resolvedPorts"));
+                DocServer.init(window.location.protocol, window.location.hostname, resolvedPorts.socket, result.email);
+                result.cacheDocumentIds && (await DocServer.GetRefFields(result.cacheDocumentIds.split(";")));
                 return result;
             } else {
                 throw new Error("There should be a user! Why does Dash think there isn't one?");
@@ -1019,9 +1025,8 @@ export class CurrentUserUtils {
         });
     }
 
-    public static async loadUserDocument({ id, email }: { id: string, email: string }) {
+    public static async loadUserDocument(id: string) {
         this.curr_id = id;
-        Doc.CurrentUserEmail = email;
         await rp.get(Utils.prepend("/getUserDocumentIds")).then(ids => {
             const { userDocumentId, sharingDocumentId } = JSON.parse(ids);
             if (userDocumentId !== "guest") {
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx
index 77e37834d..a5352c94a 100644
--- a/src/client/views/Main.tsx
+++ b/src/client/views/Main.tsx
@@ -1,26 +1,20 @@
-import { MainView } from "./MainView";
-import { Docs } from "../documents/Documents";
-import { CurrentUserUtils } from "../util/CurrentUserUtils";
-import * as ReactDOM from 'react-dom';
 import * as React from 'react';
-import { DocServer } from "../DocServer";
+import * as ReactDOM from 'react-dom';
 import { AssignAllExtensions } from "../../extensions/General/Extensions";
-import { Networking } from "../Network";
+import { Docs } from "../documents/Documents";
+import { CurrentUserUtils } from "../util/CurrentUserUtils";
 import { CollectionView } from "./collections/CollectionView";
+import { MainView } from "./MainView";
 
 AssignAllExtensions();
 
-export let resolvedPorts: { server: number, socket: number };
-
 (async () => {
     window.location.search.includes("safe") && CollectionView.SetSafeMode(true);
     const info = await CurrentUserUtils.loadCurrentUser();
-    resolvedPorts = JSON.parse(await Networking.FetchFromServer("/resolvedPorts"));
-    DocServer.init(window.location.protocol, window.location.hostname, resolvedPorts.socket, info.email);
     await Docs.Prototypes.initialize();
     if (info.id !== "__guest__") {
         // a guest will not have an id registered
-        await CurrentUserUtils.loadUserDocument(info);
+        await CurrentUserUtils.loadUserDocument(info.id);
     }
     document.getElementById('root')!.addEventListener('wheel', event => {
         if (event.ctrlKey) {