Advanced sync

munkey/command.ts

@@ -105,7 +105,6 @@ abstract class CommandServer {
 
                 return this.onVaultLink(hostname, portNum, vaultName);
             },
-            "sync": this.onVaultSync.bind(this),
         },
         "link": {
             "up": this.onLinkUp.bind(this),
@@ -229,7 +228,6 @@ abstract class CommandServer {
     abstract onGetVaultEntry(entryKey: string): Promise<void>;
     abstract onListVaults(): Promise<void>;
     abstract onVaultLink(hostname: string, portNum: number, vaultName: string, vaultNickname?: string): Promise<void>;
-    abstract onVaultSync(): Promise<void>;
 
     abstract onLinkUp(): Promise<void>;
     abstract onLinkDown(): Promise<void>;
@@ -257,9 +255,13 @@ class ShellCommandServer extends CommandServer {
             return console.error(`Cannot create vault ${vaultName} (already exists)`);
         }
 
-        const vaultId: string | null = await this.services.vault.createVault(vaultName);
-        vaultId && this.services.vault.subscribeVaultById(vaultId, () =>
-            this.services.vault.syncActiveVaults(vaultId, this.services.connection));
+        try {
+            const vaultId: string | null = await this.services.vault.createVault(vaultName);
+            console.info(`Vault created with ID ${vaultId}`);
+        }
+        catch (err) {
+            console.error(err);
+        }
     }
 
     async onUseVault(vaultName: string): Promise<void> {
@@ -289,7 +291,7 @@ class ShellCommandServer extends CommandServer {
 
         console.info(":: :: Remote  Vaults :: ::");
         for (let [name, url] of this.services.connection.getAllConnections()) {
-            console.info(`   ${url.name} = RemoteVault[${name}]`);
+            console.info(`   ${url} = RemoteVault[${name}]`);
         }
     }
 
@@ -319,7 +321,6 @@ class ShellCommandServer extends CommandServer {
             _rev,
             entries: { ...entries, [entryKey]: data },
         }).catch(err => console.error(err));
-        await this.services.vault.syncActiveVaults(vaultId, this.services.connection);
     }
 
     async onGetVaultEntry(entryKey: string): Promise<void> {
@@ -367,29 +368,22 @@ class ShellCommandServer extends CommandServer {
         // Query the APL to find the vault ID with that nickname.
         let { vaultId = null } = activeDevice?.vaults.find(vault => vault.nickname === vaultName) ?? {};
         if (vaultId) {
-            this.services.connection.publishDatabaseConnection({ hostname, portNum }, vaultName, vaultId);
-            let localVault: PouchDB.Database<DatabaseDocument> | null = this.services.vault.getVaultById(vaultId);
-            // TODO: use the queried vault information to validate the vault.
-            if (!localVault) {
-                // TODO: allow the user to specify their own local nickname.
-                // Relying on the remote database's vault name is subject to collisions.
+            try {
                 vaultId = await this.services.vault.createVault(vaultNickname, vaultId);
-                vaultId && this.services.vault.subscribeVaultById(vaultId, () =>
-                    this.services.vault.syncActiveVaults(vaultId, this.services.connection));
+                let localVault = this.services.vault.getVaultById(vaultId);
+                let remoteConn = this.services.connection
+                    .publishDatabaseConnection({ hostname, portNum }, vaultName, vaultId, localVault);
+                remoteConn.catch(err => console.error(err));
+            }
+            catch (err) {
+                console.error("Failed to create local vault: ", err.message);
             }
         }
         else {
             console.error(`Vault unavailable: ${vaultName}@${hostname}:${portNum}`);
         }
     }
 
-    async onVaultSync(): Promise<void> {
-        const vaultId: string = this.services.vault.getActiveVaultId();
-        if (await this.services.vault.syncActiveVaults(vaultId, this.services.connection) <= 0) {
-            console.error("No remote vaults found");
-        }
-    }
-
     async onLinkUp(): Promise<void> {
         await this.services.web.listen()
             .catch(() => console.error("Failed to open server"));
@@ -418,7 +412,7 @@ class ShellCommandServer extends CommandServer {
     }
 
     async onPeerList(): Promise<void> {
-        for (let [hostname, portNum, identity] of this.services.activity.getAllDevices()) {
+        for (let [{ hostname, portNum }, identity] of this.services.activity.getAllDevices()) {
             console.info(` Peer[${identity.uniqueId}]@${hostname}:${portNum}`);
             for (let vault of identity.vaults) {
                 console.info(`\t* "${vault.nickname}": Vault[${vault.vaultId}]`);

munkey/discovery.ts

@@ -22,6 +22,10 @@ interface DeviceDiscoveryDecl {
     portNum: number;
 }
 
+interface PeerLinkResponse extends PeerIdentityDecl {
+    activePeerList: DeviceDiscoveryDecl[];
+}
+
 function isPeerIdentityDecl(decl: Object): decl is PeerIdentityDecl {
     return decl &&
         ("uniqueId" in decl) &&
@@ -33,11 +37,27 @@ function isPeerIdentityDecl(decl: Object): decl is PeerIdentityDecl {
         ));
 }
 
+function isDeviceDiscoveryDecl(decl: Object): decl is DeviceDiscoveryDecl {
+    return decl &&
+        ("hostname" in decl) &&
+        ("portNum" in decl);
+}
+
+function isPeerLinkResponse(decl: Object): decl is PeerLinkResponse {
+    return isPeerIdentityDecl(decl) &&
+        ("activePeerList" in decl) &&
+        (Array.isArray((decl as PeerLinkResponse).activePeerList)) &&
+        ((decl as PeerLinkResponse).activePeerList.every(peer => isDeviceDiscoveryDecl(peer)));
+}
+
 export {
     PeerVaultDecl,
     PeerIdentityDecl,
     DeviceDiscoveryDecl,
+    PeerLinkResponse,
 
     /* Validation Functions */
     isPeerIdentityDecl,
+    isDeviceDiscoveryDecl,
+    isPeerLinkResponse,
 };

munkey/munkey.ts

@@ -39,16 +39,17 @@ import {
 const uniformPrint = winston.format.printf(function(
     info: winston.Logform.TransformableInfo & { label: string, timestamp: string }): string
 {
-    return `[${info.level}::${info.label}] ${info.message}`;
+    let { level, label, message } = info;
+    return `[${level}::${label}] ${message}`;
 });
 
+
 const addUniformLogger = function(serviceName: string): winston.Logger {
     winston.loggers.add(serviceName, {
         format: winston.format.combine(
             winston.format.splat(),
             winston.format.colorize(),
             winston.format.label({ label: serviceName }),
-            winston.format.timestamp(),
             uniformPrint,
         ),
         transports: [