Merge pull request #59 from FleekHQ/add-txl-subscribe-integration

Added TxlSubscribe integration

Author: gpuente

public/client/space.proto

@@ -10,6 +10,7 @@ service SpaceApi {
   rpc GenerateKeyPair(GenerateKeyPairRequest) returns (GenerateKeyPairResponse) {}
   rpc GenerateKeyPairWithForce(GenerateKeyPairRequest) returns (GenerateKeyPairResponse) {}
   rpc Subscribe(google.protobuf.Empty) returns (stream FileEventResponse) {}
+  rpc TxlSubscribe(google.protobuf.Empty) returns (stream TextileEventResponse) {}
   rpc OpenFile(OpenFileRequest) returns (OpenFileResponse) {}
   rpc AddItems(AddItemsRequest) returns (AddItemsResponse) {}
   rpc CreateFolder(CreateFolderRequest) returns (CreateFolderResponse) {}
@@ -40,37 +41,60 @@ message ConfigInfoResponse {
   string port = 2;
   string appPath = 3;
 }
+
 message GenerateKeyPairRequest {}
 
 message GenerateKeyPairResponse {
   string publicKey = 1;
   string privateKey = 2;
 }
+
 enum EventType {
   ENTRY_ADDED = 0;
   ENTRY_DELETED = 1;
   ENTRY_UPDATED = 2;
 }
+
 message FileEventResponse {
   EventType type = 1;
   ListDirectoryEntry entry = 2;
 }
+
+message TextileEventResponse {
+  string bucket = 1;
+}
+
 message OpenFileRequest {
   string path = 1;
 }
+
 message OpenFileResponse {
   string location = 1;
 }
+
 message AddItemsRequest {
   repeated string sourcePaths = 1; // full paths to file or Folder on FS. Needs to be a location available to the daemon
   string targetPath = 2; // target path in bucket.
 }
-// not sure we need to return anything other than an error if we failed
+
+message AddItemResult {
+  string sourcePath= 1;
+  string bucketPath = 2;
+}
+
+message AddItemError {
+  string sourcePath = 1;
+  string error = 2;
+}
+
 message AddItemsResponse {
+  repeated AddItemResult results = 1;
+  repeated AddItemError errors = 2;
 }
+
 message CreateFolderRequest {
   string path = 1; // target path in bucket to add new empty folder
 }
 // not sure we need to return anything other than an error if we failed
 message CreateFolderResponse {
-}
+}

public/events/add-items.js

@@ -1,7 +1,6 @@
 const { ipcMain } = require('electron');
 
 const client = require('../client');
-const { listDirectories } = require('./objects');
 
 const EVENT_PREFIX = 'upload';
 const START_EVENT = `${EVENT_PREFIX}:start`;
@@ -18,7 +17,6 @@ const registerAddItemsEvents = (mainWindow) => {
         return;
       }
 
-      listDirectories(mainWindow);
       mainWindow.webContents.send(SUCCESS_EVENT, res);
     });
   });

public/events/index.js

@@ -4,17 +4,22 @@ const registerPathInfoEvents = require('./path-info');
 const registerObjectsEvents = require('./objects').default;
 const registerGenerateKeyPairEvents = require('./generate-key-pair');
 const registerAddItemsEvents = require('./add-items');
+const registerTxlSubscribe = require('./txl-subscribe');
 
 const registerEvents = (mainWindow) => {
   const stream = registerEventStream(mainWindow);
+  const txlStream = registerTxlSubscribe(mainWindow);
 
   registerConfigEvents(mainWindow);
   registerObjectsEvents(mainWindow);
   registerPathInfoEvents(mainWindow);
   registerGenerateKeyPairEvents(mainWindow);
   registerAddItemsEvents(mainWindow);
 
-  return () => stream.destroy();
+  return () => {
+    stream.destroy();
+    txlStream.destroy();
+  };
 };
 
 module.exports = registerEvents;

public/events/txl-subscribe.js

@@ -0,0 +1,20 @@
+const client = require('../client');
+const { listDirectories } = require('./objects');
+
+const EVENT_PREFIX = 'txlSuscribe';
+
+const registerTxlSubscribe = (mainWindow) => {
+  const eventStream = client.TxlSubscribe();
+
+  eventStream.on('data', (event) => {
+    listDirectories(mainWindow);
+  });
+
+  eventStream.on('error', (error) => {
+    mainWindow.webContents.send(`${EVENT_PREFIX}:error`, error);
+  });
+
+  return eventStream;
+};
+
+module.exports = registerTxlSubscribe;

src/events/index.js

@@ -5,6 +5,7 @@ import registerObjectsEvents from './objects';
 import registerPathInfoEvents from './path-info';
 import registerGenerateKeyPairEvents from './generate-key-pair';
 import registerAddItemsEvents from './add-items';
+import registerTxlSubscribeEvents from './txl-subscribe';
 
 const registerEvents = () => {
   registerShortcuts();
@@ -14,6 +15,7 @@ const registerEvents = () => {
   registerPathInfoEvents();
   registerGenerateKeyPairEvents();
   registerAddItemsEvents();
+  registerTxlSubscribeEvents();
 };
 
 export default registerEvents;

src/events/txl-subscribe.js

@@ -0,0 +1,14 @@
+import { ipcRenderer } from 'electron';
+
+const EVENT_PREFIX = 'txlSuscribe';
+const ERROR_EVENT = `${EVENT_PREFIX}:error`;
+
+/* eslint-disable no-console */
+const registerTxlSubscribeEvents = () => {
+  ipcRenderer.on(ERROR_EVENT, (event, payload) => {
+    // DO Something with the response (dispatch to redux)
+    console.log(ERROR_EVENT, event, payload);
+  });
+};
+
+export default registerTxlSubscribeEvents;