From 53ccf31515bfcb90a7e68cecb99ce88714a8c8f7 Mon Sep 17 00:00:00 2001 From: Ezerous Date: Fri, 29 Mar 2019 21:00:06 +0200 Subject: [PATCH] Major improvements (Orbit, Topic.js, LoadingContainer vol.2 --- app/src/components/Topic.js | 2 +- app/src/components/TopicList.js | 7 ++--- app/src/containers/LoadingContainer.js | 16 +++++----- app/src/containers/UsernameFormContainer.js | 33 ++++++++++++++------- app/src/redux/actions/orbitActions.js | 2 -- app/src/redux/reducers/orbitReducer.js | 3 +- app/src/redux/sagas/orbitSaga.js | 26 +++++++++------- app/src/utils/orbitUtils.js | 7 ++--- 8 files changed, 54 insertions(+), 42 deletions(-) diff --git a/app/src/components/Topic.js b/app/src/components/Topic.js index 298f19d..caa7a9c 100644 --- a/app/src/components/Topic.js +++ b/app/src/components/Topic.js @@ -67,7 +67,7 @@ class Topic extends Component { } Topic.propTypes = { - user: PropTypes.object.isRequired, + userAddress: PropTypes.string.isRequired, history: PropTypes.object.isRequired, //TODO: topicData: GetTopicResult.isRequired, orbitDB: PropTypes.object.isRequired, diff --git a/app/src/components/TopicList.js b/app/src/components/TopicList.js index de6165b..de41297 100644 --- a/app/src/components/TopicList.js +++ b/app/src/components/TopicList.js @@ -77,11 +77,10 @@ class TopicList extends Component { ) } - return( -
TODO: Add a loading thingy
- ) + return (
TODO: Loading UI/fetching needs to be changed (?)
); }); + //TODO: Return loading indicator instead of topics when not fully loaded (?) return (
{topics.slice(0).reverse()} @@ -91,7 +90,7 @@ class TopicList extends Component { } TopicList.propTypes = { - topicIDs: PropTypes.arrayOf(PropTypes.string).isRequired, + topicIDs: PropTypes.arrayOf(PropTypes.number).isRequired, contracts: PropTypes.PropTypes.objectOf(PropTypes.object).isRequired, drizzleStatus: PropTypes.object.isRequired }; diff --git a/app/src/containers/LoadingContainer.js b/app/src/containers/LoadingContainer.js index 837f008..f31d64d 100644 --- a/app/src/containers/LoadingContainer.js +++ b/app/src/containers/LoadingContainer.js @@ -18,14 +18,12 @@ class LoadingContainer extends Component {
ethereum_logo

This browser has no connection to the Ethereum network.

-

- Please make sure that: -

    -
  • You use MetaMask or a dedicated Ethereum browser (e.g. Mist or Parity)
    • -
  • They are pointed to the correct network
    • -
  • Your account is unlocked and the app has the rights to access it
    • -
-

+ Please make sure that: +
    +
  • You use MetaMask or a dedicated Ethereum browser (e.g. Mist or Parity)
    • +
  • They are pointed to the correct network
    • +
  • Your account is unlocked and the app has the rights to access it
    • +
@@ -80,7 +78,7 @@ class LoadingContainer extends Component {
orbitdb_logo -

Initializing OrbitDB...

+

Preparing OrbitDB...

diff --git a/app/src/containers/UsernameFormContainer.js b/app/src/containers/UsernameFormContainer.js index 4e8be75..e4d209e 100644 --- a/app/src/containers/UsernameFormContainer.js +++ b/app/src/containers/UsernameFormContainer.js @@ -8,6 +8,8 @@ import { drizzle } from '../index'; import { createDatabases } from '../utils/orbitUtils'; import { updateUsername } from '../redux/actions/transactionsActions'; +import { DATABASES_CREATED, updateDatabases } from '../redux/actions/orbitActions'; + const contract = 'Forum'; const checkUsernameTakenMethod = 'isUserNameTaken'; const signUpMethod = 'signUp'; @@ -77,18 +79,30 @@ class UsernameFormContainer extends Component { this.setState({ signingUp: true }); - const orbitdbInfo = await createDatabases(); + const { + identityId, + identityPublicKey, + identityPrivateKey, + orbitdb, + orbitPublicKey, + orbitPrivateKey, + topicsDB, + postsDB + } = await createDatabases(); + dispatch( + updateDatabases(DATABASES_CREATED, orbitdb, topicsDB, postsDB), + ); this.stackId = drizzle.contracts[contract].methods[signUpMethod].cacheSend( ...[ usernameInput, - orbitdbInfo.identityId, - orbitdbInfo.identityPublicKey, - orbitdbInfo.identityPrivateKey, - orbitdbInfo.orbitId, - orbitdbInfo.orbitPublicKey, - orbitdbInfo.orbitPrivateKey, - orbitdbInfo.topicsDB, - orbitdbInfo.postsDB + identityId, + identityPublicKey, + identityPrivateKey, + orbitdb.id, + orbitPublicKey, + orbitPrivateKey, + topicsDB, + postsDB ], { from: account }, @@ -201,7 +215,6 @@ UsernameFormContainer.propTypes = { transactionStack: PropTypes.array.isRequired, transactions: PropTypes.array.isRequired, contracts: PropTypes.array.isRequired, - hasSignedUp: PropTypes.object.isRequired, user: PropTypes.object.isRequired }; diff --git a/app/src/redux/actions/orbitActions.js b/app/src/redux/actions/orbitActions.js index 283a505..5902aca 100644 --- a/app/src/redux/actions/orbitActions.js +++ b/app/src/redux/actions/orbitActions.js @@ -1,7 +1,6 @@ const IPFS_INITIALIZED = 'IPFS_INITIALIZED'; const DATABASES_CREATED = 'DATABASES_CREATED'; const DATABASES_LOADED = 'DATABASES_LOADED'; -const DATABASES_NOT_READY = 'DATABASES_NOT_READY'; const ADD_PEER_DATABASE = 'ADD_PEER_DATABASE'; const PEER_DATABASE_ADDED = 'PEER_DATABASE_ADDED'; const UPDATE_PEERS = 'UPDATE_PEERS'; @@ -27,7 +26,6 @@ function addPeerDatabase(fullAddress) { export { DATABASES_CREATED, DATABASES_LOADED, - DATABASES_NOT_READY, IPFS_INITIALIZED, UPDATE_PEERS, ADD_PEER_DATABASE, diff --git a/app/src/redux/reducers/orbitReducer.js b/app/src/redux/reducers/orbitReducer.js index 737bb89..86df503 100644 --- a/app/src/redux/reducers/orbitReducer.js +++ b/app/src/redux/reducers/orbitReducer.js @@ -1,7 +1,6 @@ import { DATABASES_CREATED, DATABASES_LOADED, - DATABASES_NOT_READY, IPFS_INITIALIZED, UPDATE_PEERS, PEER_DATABASE_ADDED, ORBIT_INIT } from '../actions/orbitActions'; @@ -42,6 +41,8 @@ const orbitReducer = (state = initialState, action) => { orbitdb: null, topicsDB: null, postsDB: null, + pubsubPeers: {topicsDBPeers:[], postsDBPeers:[]}, + peerDatabases: [], id: null }; case PEER_DATABASE_ADDED: diff --git a/app/src/redux/sagas/orbitSaga.js b/app/src/redux/sagas/orbitSaga.js index 18005cd..8a32e88 100644 --- a/app/src/redux/sagas/orbitSaga.js +++ b/app/src/redux/sagas/orbitSaga.js @@ -19,7 +19,7 @@ import { ACCOUNTS_FETCHED } from '../actions/drizzleActions'; let latestAccount; function* getOrbitDBInfo() { - yield put({ + yield put.resolve({ type: ORBIT_INIT, ...[] }); const account = yield call(getCurrentAccount); @@ -82,18 +82,24 @@ function* addPeerDatabase(action) { } //Keeps track of currently connected pubsub peers in Redux store (for debugging purposes) +//Feel free to disable it anytime function* updatePeersState() { const orbit = yield select(state => state.orbit); if(orbit.ready){ - const topicsDBAddress = orbit.topicsDB.address.toString(); - const postsDBAddress = orbit.postsDB.address.toString(); - const topicsDBPeers = yield call(orbit.ipfs.pubsub.peers, topicsDBAddress); - const postsDBPeers = yield call(orbit.ipfs.pubsub.peers, postsDBAddress); - if(!isEqual(topicsDBPeers.sort(), orbit.pubsubPeers.topicsDBPeers.sort()) || - !isEqual(postsDBPeers.sort(), orbit.pubsubPeers.postsDBPeers.sort())){ - yield put({ - type: UPDATE_PEERS, topicsDBPeers, postsDBPeers - }); + // This try is here to ignore concurrency errors that arise from times to times + try{ + const topicsDBAddress = orbit.topicsDB.address.toString(); + const postsDBAddress = orbit.postsDB.address.toString(); + const topicsDBPeers = yield call(orbit.ipfs.pubsub.peers, topicsDBAddress); + const postsDBPeers = yield call(orbit.ipfs.pubsub.peers, postsDBAddress); + if(!isEqual(topicsDBPeers.sort(), orbit.pubsubPeers.topicsDBPeers.sort()) || + !isEqual(postsDBPeers.sort(), orbit.pubsubPeers.postsDBPeers.sort())){ + yield put({ + type: UPDATE_PEERS, topicsDBPeers, postsDBPeers + }); + } + } catch (e) { + // No need to catch anything } } } diff --git a/app/src/utils/orbitUtils.js b/app/src/utils/orbitUtils.js index 6a1e138..705d46f 100644 --- a/app/src/utils/orbitUtils.js +++ b/app/src/utils/orbitUtils.js @@ -3,7 +3,7 @@ import Keystore from 'orbit-db-keystore'; import path from 'path'; import IPFS from 'ipfs'; import store from '../redux/store'; -import { DATABASES_CREATED, DATABASES_LOADED, IPFS_INITIALIZED, updateDatabases } from '../redux/actions/orbitActions'; +import { DATABASES_LOADED, IPFS_INITIALIZED, updateDatabases } from '../redux/actions/orbitActions'; import ipfsOptions from '../config/ipfsOptions'; function initIPFS() { @@ -36,9 +36,6 @@ async function createDatabases() { const orbitdb = new OrbitDB(ipfs); const topicsDB = await orbitdb.keyvalue('topics'); const postsDB = await orbitdb.keyvalue('posts'); - store.dispatch( - updateDatabases(DATABASES_CREATED, orbitdb, topicsDB, postsDB), - ); const orbitKey = orbitdb.keystore.getKey(orbitdb.id); @@ -46,7 +43,7 @@ async function createDatabases() { identityId: 'Tempus', identityPublicKey: 'edax', identityPrivateKey: 'rerum', - orbitId: orbitdb.id, + orbitdb: orbitdb, orbitPublicKey: orbitKey.getPublic('hex'), orbitPrivateKey: orbitKey.getPrivate('hex'), topicsDB: topicsDB.address.root,