diff --git a/bin/server.js b/bin/server.js index 4ff8fda..b2797b8 100644 --- a/bin/server.js +++ b/bin/server.js @@ -98,6 +98,12 @@ class Server { await controllers.attachControllers(app) } + // Display configuration settings + console.log('\nConfiguration:') + console.log(`Circuit Relay: ${config.isCircuitRelay}`) + console.log(`IPFS TCP port: ${config.ipfsTcpPort}`) + console.log(`IPFS WS port: ${config.ipfsWsPort}\n`) + return app } catch (err) { console.error('Could not start server. Error: ', err) diff --git a/config/env/common.js b/config/env/common.js index 0daf6c6..444ba96 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -85,5 +85,7 @@ module.exports = { ipfsHost: process.env.IPFS_HOST ? process.env.IPFS_HOST : 'localhost', ipfsApiPort: process.env.IPFS_API_PORT ? parseInt(process.env.IPFS_API_PORT) - : 5001 + : 5001, + + chatPubSubChan: 'psf-ipfs-chat-001' } diff --git a/src/adapters/ipfs/index.js b/src/adapters/ipfs/index.js index df12983..13050d1 100644 --- a/src/adapters/ipfs/index.js +++ b/src/adapters/ipfs/index.js @@ -2,6 +2,7 @@ top-level IPFS library that combines the individual IPFS-based libraries. */ +// Local libraries const IpfsAdapter = require('./ipfs') const IpfsCoordAdapter = require('./ipfs-coord') @@ -36,6 +37,9 @@ class IPFS { await this.ipfsCoordAdapter.start() console.log('ipfs-coord is ready.') + // Subscribe to the chat pubsub channel + await this.ipfsCoordAdapter.subscribeToChat() + return true } catch (err) { console.error('Error in adapters/ipfs/index.js/start()') diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js index 3832f2d..990a98c 100644 --- a/src/adapters/ipfs/ipfs-coord.js +++ b/src/adapters/ipfs/ipfs-coord.js @@ -97,6 +97,20 @@ class IpfsCoordAdapter { throw err } } + + // Subscribe to the chat pubsub channel + async subscribeToChat () { + try { + await this.ipfsCoord.adapters.pubsub.subscribeToPubsubChannel( + this.config.chatPubSubChan, + console.log, + this.ipfsCoord.thisNode + ) + } catch (err) { + console.error('Error in subscribeToChat') + throw err + } + } } module.exports = IpfsCoordAdapter diff --git a/test/unit/mocks/ipfs-coord-mock.js b/test/unit/mocks/ipfs-coord-mock.js index b1924a1..3ced0b4 100644 --- a/test/unit/mocks/ipfs-coord-mock.js +++ b/test/unit/mocks/ipfs-coord-mock.js @@ -8,6 +8,8 @@ class IPFSCoord { } async start () {} + + async subscribeToChat() {} } module.exports = IPFSCoord