{ user ?
: null }
{ currentUser && !user ?
: null }
- { maps.models.map(map =>
) }
+ { maps.models.map(map =>
) }
{!moreToLoad ? null : [
,
@@ -70,6 +70,7 @@ class Maps extends Component {
Maps.propTypes = {
section: PropTypes.string.isRequired,
maps: PropTypes.object.isRequired,
+ juntoState: PropTypes.object.isRequired,
moreToLoad: PropTypes.bool.isRequired,
user: PropTypes.object,
currentUser: PropTypes.object,
diff --git a/package.json b/package.json
index c43b7599..8dca7615 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
"react": "15.3.2",
"react-dom": "15.3.2",
"react-dropzone": "3.6.0",
+ "redux": "^3.6.0",
"simplewebrtc": "2.2.0",
"socket.io": "1.3.7",
"underscore": "1.4.4",
diff --git a/realtime/global.js b/realtime/global.js
index 8e4d0c97..1df9d8ea 100644
--- a/realtime/global.js
+++ b/realtime/global.js
@@ -1,17 +1,15 @@
-
-import {
+const {
// server sendable, client receivable
TOPIC_UPDATED,
TOPIC_DELETED,
SYNAPSE_UPDATED,
SYNAPSE_DELETED,
- LIVE_MAPS_RECEIVED,
- MAP_WENT_LIVE,
- MAP_CEASED_LIVE,
MAP_UPDATED,
+ JUNTO_UPDATED,
// server receivable, client sendable
- REQUEST_LIVE_MAPS,
+ JOIN_CALL,
+ LEAVE_CALL,
JOIN_MAP,
LEAVE_MAP,
UPDATE_TOPIC,
@@ -19,43 +17,23 @@ import {
UPDATE_SYNAPSE,
DELETE_SYNAPSE,
UPDATE_MAP
-} from '../frontend/src/Metamaps/Realtime/events'
+} = require('../frontend/src/Metamaps/Realtime/events')
-const adjustAndBroadcast = (io, socket, state, event, data) => {
- if (event === JOIN_MAP) {
- if (!state.liveMaps[data.mapid]) {
- state.liveMaps[data.mapid] = data.map // { name: '', desc: '', numTopics: '' }
- state.liveMaps[data.mapid].mapper_count = 1
- io.sockets.emit(MAP_WENT_LIVE, state.liveMaps[data.mapid])
- }
- else {
- state.liveMaps[data.mapid].mapper_count++
- }
- }
- else if (event === LEAVE_MAP) {
- const mapid = socket.mapid
- if (state.liveMaps[mapid] && state.liveMaps[mapid].mapper_count == 1) {
- delete state.liveMaps[mapid]
- io.sockets.emit(MAP_CEASED_LIVE, { id: mapid })
- }
- else if (state.liveMaps[mapid]) {
- state.liveMaps[mapid].mapper_count--
- }
- }
-}
+module.exports = function (io, store) {
+ store.subscribe(() => {
+ console.log(store.getState())
+ io.sockets.emit(JUNTO_UPDATED, store.getState())
+ })
-module.exports = function (io, state) {
io.on('connection', function (socket) {
- socket.on(REQUEST_LIVE_MAPS, function (activeUser) {
- //constrain response to maps visible to user
- var maps = Object.keys(state.liveMaps).map(function(key) { return state.liveMaps[key] })
- socket.emit(LIVE_MAPS_RECEIVED, maps)
- })
+ io.sockets.emit(JUNTO_UPDATED, store.getState())
- socket.on(JOIN_MAP, data => adjustAndBroadcast(io, socket, state, JOIN_MAP, data))
- socket.on(LEAVE_MAP, () => adjustAndBroadcast(io, socket, state, LEAVE_MAP))
- socket.on('disconnect', () => adjustAndBroadcast(io, socket, state, LEAVE_MAP))
+ socket.on(JOIN_MAP, data => store.dispatch({ type: JOIN_MAP, payload: data }))
+ socket.on(LEAVE_MAP, () => store.dispatch({ type: LEAVE_MAP, payload: socket }))
+ socket.on(JOIN_CALL, data => store.dispatch({ type: JOIN_CALL, payload: data }))
+ socket.on(LEAVE_CALL, () => store.dispatch({ type: LEAVE_CALL, payload: socket }))
+ socket.on('disconnect', () => store.dispatch({ type: 'DISCONNECT', payload: socket }))
socket.on(UPDATE_TOPIC, function (data) {
socket.broadcast.emit(TOPIC_UPDATED, data)
diff --git a/realtime/junto.js b/realtime/junto.js
index aa7f6152..f97efdbc 100644
--- a/realtime/junto.js
+++ b/realtime/junto.js
@@ -1,4 +1,4 @@
-import {
+const {
INVITED_TO_CALL,
INVITED_TO_JOIN,
CALL_ACCEPTED,
@@ -17,11 +17,11 @@ import {
INVITE_A_CALL,
JOIN_CALL,
LEAVE_CALL
-} from '../frontend/src/Metamaps/Realtime/events'
+} = require('../frontend/src/Metamaps/Realtime/events')
const { mapRoom, userMapRoom } = require('./rooms')
-module.exports = function (io, state) {
+module.exports = function (io, store) {
io.on('connection', function (socket) {
socket.on(CHECK_FOR_CALL, function (data) {
@@ -39,6 +39,8 @@ module.exports = function (io, state) {
socket.on(ACCEPT_CALL, function (data) {
socket.broadcast.in(userMapRoom(data.inviter, data.mapid)).emit(CALL_ACCEPTED, data.invited)
+ // convert this so that it broadcasts to all sockets and includes the map id
+ // and who's participating
socket.broadcast.in(mapRoom(data.mapid)).emit(CALL_STARTED)
})
@@ -51,12 +53,15 @@ module.exports = function (io, state) {
})
socket.on(JOIN_CALL, function (data) {
+ // convert this so that it broadcasts to all sockets and includes the map id
+ // and info about who joined
socket.broadcast.in(mapRoom(data.mapid)).emit(MAPPER_JOINED_CALL, data.id)
})
socket.on(LEAVE_CALL, function (data) {
+ // convert this so that it broadcasts to all sockets and includes the map id
+ // and info about who joined
socket.broadcast.in(mapRoom(data.mapid)).emit(MAPPER_LEFT_CALL, data.id)
})
})
}
-
diff --git a/realtime/map.js b/realtime/map.js
index d0c85a10..5e153209 100644
--- a/realtime/map.js
+++ b/realtime/map.js
@@ -1,5 +1,4 @@
-
-import {
+const {
MAPPER_LIST_UPDATED,
NEW_MAPPER,
LOST_MAPPER,
@@ -13,19 +12,19 @@ import {
JOIN_MAP,
LEAVE_MAP,
- SEND_MAPPER_INFO,
SEND_COORDS,
+ SEND_MAPPER_INFO,
CREATE_MESSAGE,
DRAG_TOPIC,
CREATE_TOPIC,
REMOVE_TOPIC,
CREATE_SYNAPSE,
REMOVE_SYNAPSE
-} from '../frontend/src/Metamaps/Realtime/events'
+} = require('../frontend/src/Metamaps/Realtime/events')
const { mapRoom, userMapRoom } = require('./rooms')
-module.exports = function (io, state) {
+module.exports = function (io, store) {
io.on('connection', function (socket) {
// this will ping everyone on a map that there's a person just joined the map
@@ -33,11 +32,11 @@ module.exports = function (io, state) {
socket.mapid = data.mapid
socket.userid = data.userid
socket.username = data.username
- socket.userimage = data.userimage
+ socket.avatar = data.avatar
var newUser = {
userid: data.userid,
username: data.username,
- userimage: data.userimage
+ avatar: data.avatar
}
socket.join(mapRoom(data.mapid))
socket.join(userMapRoom(data.userid, data.mapid))
@@ -63,7 +62,7 @@ module.exports = function (io, state) {
userid: data.userid,
username: data.username,
userinconversation: data.userinconversation,
- userimage: data.userimage
+ avatar: data.avatar
}
socket.broadcast.in(userMapRoom(data.userToNotify, data.mapid)).emit(MAPPER_LIST_UPDATED, existingUser)
})
diff --git a/realtime/realtime-server.js b/realtime/realtime-server.js
index 7cdcd6bf..c52b67ab 100644
--- a/realtime/realtime-server.js
+++ b/realtime/realtime-server.js
@@ -6,13 +6,14 @@ map = require('./map'),
global = require('./global'),
stunservers = [{"url": "stun:stun.l.google.com:19302"}]
-var state = {
- connectedPeople: {},
- liveMaps: {}
-}
-signalling(io, stunservers, state)
-junto(io, state)
-map(io, state)
-global(io, state)
-io.listen(5001)
+const { createStore } = require('redux')
+const { reducer } = require('./reducer')
+let store = createStore(reducer)
+
+global(io, store)
+signalling(io, stunservers, store)
+junto(io, store)
+map(io, store)
+
+io.listen(5001)
diff --git a/realtime/reducer.js b/realtime/reducer.js
new file mode 100644
index 00000000..57178733
--- /dev/null
+++ b/realtime/reducer.js
@@ -0,0 +1,75 @@
+const { omit, omitBy, isNil, mapValues } = require('lodash')
+const {
+ JOIN_MAP,
+ LEAVE_MAP,
+ JOIN_CALL,
+ LEAVE_CALL
+} = require('../frontend/src/Metamaps/Realtime/events')
+
+const NOT_IN_CONVERSATION = 0
+const IN_CONVERSATION = 1
+
+const addMapperToMap = (map, userId) => { return { ...map, [userId]: NOT_IN_CONVERSATION }}
+
+const reducer = (state = { connectedPeople: {}, liveMaps: {} }, action) => {
+ const { type, payload } = action
+ const { connectedPeople, liveMaps } = state
+ const map = payload && liveMaps[payload.mapid]
+ const mapWillEmpty = map && Object.keys(map).length === 1
+ const callWillFinish = map && (type === LEAVE_CALL || type === 'DISCONNECT') && Object.keys(map).length === 2
+
+ switch (type) {
+ case JOIN_MAP:
+ return Object.assign({}, state, {
+ connectedPeople: Object.assign({}, connectedPeople, {
+ [payload.userid]: {
+ id: payload.userid,
+ username: payload.username,
+ avatar: payload.avatar
+ }
+ }),
+ liveMaps: Object.assign({}, liveMaps, {
+ [payload.mapid]: addMapperToMap(map || {}, payload.userid)
+ })
+ })
+ case LEAVE_MAP:
+ // if the map will empty, remove it from liveMaps, if the map will not empty, just remove the mapper
+ const newLiveMaps = mapWillEmpty
+ ? omit(liveMaps, payload.mapid)
+ : Object.assign({}, liveMaps, { [payload.mapid]: omit(map, payload.userid) })
+
+ return {
+ connectedPeople: omit(connectedPeople, payload.userid),
+ liveMaps: omitBy(newLiveMaps, isNil)
+ }
+ case JOIN_CALL:
+ // update the user (payload.id is user id) in the given map to be marked in the conversation
+ return Object.assign({}, state, {
+ liveMaps: Object.assign({}, liveMaps, {
+ [payload.mapid]: Object.assign({}, map, {
+ [payload.id]: IN_CONVERSATION
+ })
+ })
+ })
+ case LEAVE_CALL:
+ const newMap = callWillFinish
+ ? mapValues(map, () => NOT_IN_CONVERSATION)
+ : Object.assign({}, map, { [payload.userid]: NOT_IN_CONVERSATION })
+
+ return Object.assign({}, state, {
+ liveMaps: Object.assign({}, liveMaps, { map: newMap })
+ })
+ case 'DISCONNECT':
+ const mapWithoutUser = omit(map, payload.userid)
+ const newMap = callWillFinish ? mapValues(mapWithoutUser, () => NOT_IN_CONVERSATION) : mapWithoutUser
+ const newLiveMaps = mapWillEmpty ? omit(liveMaps, payload.mapid) : Object.assign({}, liveMaps, { [payload.mapid]: newMap })
+ return {
+ connectedPeople: omit(connectedPeople, payload.userid),
+ liveMaps: omitBy(newLiveMaps, isNil)
+ }
+ default:
+ return state
+ }
+}
+
+module.exports = reducer
diff --git a/realtime/rooms.js b/realtime/rooms.js
index 6276e3f9..30d56d1b 100644
--- a/realtime/rooms.js
+++ b/realtime/rooms.js
@@ -1,4 +1,3 @@
-
module.exports = {
mapRoom: mapId => `maps/${mapId}`,
userMapRoom: (mapperId, mapId) => `mappers/${mapperId}/maps/${mapId}`,
diff --git a/realtime/signal.js b/realtime/signal.js
index c14ce392..39283709 100644
--- a/realtime/signal.js
+++ b/realtime/signal.js
@@ -1,4 +1,4 @@
-var uuid = require('node-uuid')
+const uuid = require('node-uuid')
// based off of https://github.com/andyet/signalmaster
// since it was updated to socket.io 1.3.7
@@ -12,7 +12,6 @@ function safeCb(cb) {
}
module.exports = function(io, stunservers, state) {
-
io.on('connection', function (socket) {
socket.resources = {
screen: false,
'
+ var notifyText = '