diff --git a/Network/NetwokNode.js b/Network/NetwokNode.js index 20a2d0fef..c2b1b55a5 100644 --- a/Network/NetwokNode.js +++ b/Network/NetwokNode.js @@ -2,13 +2,17 @@ global.NT = { memory: { - USER_PROFILES_BY_ID: new Map(), // Here we will store the user profiles by User Profile Id. - USER_PROFILES_BY_HANDLE: new Map(), // Here we will store the user profiles by User Profile Handle. - POSTS: new Map(), // This are all the posts we are keeping track of. - EVENTS: new Map(), // This is the registry of all events received that prevents processing them more than once. - TIMELINE: [], // A time ordered list of Posts and Trades. - NETWORK_CLIENTS: [], // These are the Network Clients connected to this Network Node. - NETWORK_PEERS: [], // These are the Network Peers connected to this Network Node. + maps: { + USER_PROFILES_BY_ID: new Map(), // Here we will store the user profiles by User Profile Id. + USER_PROFILES_BY_HANDLE: new Map(), // Here we will store the user profiles by User Profile Handle. + POSTS: new Map(), // This are all the posts we are keeping track of. + EVENTS: new Map(), // This is the registry of all events received that prevents processing them more than once. + }, + arrays: { + EVENTS: [], // A time ordered list of events. + NETWORK_CLIENTS: [], // These are the Network Clients connected to this Network Node ordered by Ranking. + NETWORK_PEERS: [], // These are the Network Peers connected to this Network Node ordered by Ranking. + } }, modules: { USER_PROFILE: require('./UserProfile.js'), @@ -19,6 +23,6 @@ global.NT = { QUERY_PROFILE_STATS: require('./Queries/ProfileStats.js'), QUERY_PROFILE_POSTS: require('./Queries/ProfilePosts.js'), QUERY_POST_REPLIES: require('./Queries/ProfileReplies.js'), - QUERY_TIMELINE_CHUNK: require('./Queries/TimelineChunk.js') + QUERY_EVENTS: require('./Queries/Events.js') } } \ No newline at end of file diff --git a/Network/Queries/PostReplies.js b/Network/Queries/PostReplies.js index 776c7ba22..150d4022e 100644 --- a/Network/Queries/PostReplies.js +++ b/Network/Queries/PostReplies.js @@ -27,7 +27,7 @@ exports.newPostReplies = function newPostReplies() { /* Validate Post */ - thisObject.post = NT.memory.POSTS.get(queryReceived.targetPostHash) + thisObject.post = NT.memory.maps.POSTS.get(queryReceived.targetPostHash) if (thisObject.post === undefined) { throw ('Target Post Not Found.') diff --git a/Network/Queries/ProfilePosts.js b/Network/Queries/ProfilePosts.js index 4558f663e..76fe86b68 100644 --- a/Network/Queries/ProfilePosts.js +++ b/Network/Queries/ProfilePosts.js @@ -28,9 +28,9 @@ exports.newProfilePosts = function newProfilePosts() { Validate User Profile */ if (queryReceived.targetUserProfileId !== undefined) { - thisObject.profile = NT.memory.USER_PROFILES_BY_ID.get(queryReceived.targetUserProfileId) + thisObject.profile = NT.memory.maps.USER_PROFILES_BY_ID.get(queryReceived.targetUserProfileId) } else { - thisObject.profile = NT.memory.USER_PROFILES_BY_HANDLE.get(queryReceived.targetUserProfileHandle) + thisObject.profile = NT.memory.maps.USER_PROFILES_BY_HANDLE.get(queryReceived.targetUserProfileHandle) } if (thisObject.profile === undefined) { @@ -44,7 +44,7 @@ exports.newProfilePosts = function newProfilePosts() { } if (queryReceived.initialPostIndex === INITIAL_POST_INDEX_LAST) { - queryReceived.initialPostIndex = thisObject.profile.posts.length - 1 + queryReceived.initialPostIndex = thisObject.profile.maps.POSTS.length - 1 } if (queryReceived.initialPostIndex === INITIAL_POST_INDEX_FIRST) { @@ -94,14 +94,14 @@ exports.newProfilePosts = function newProfilePosts() { switch (thisObject.direction) { case DIRECTION_FUTURE: { for (let i = thisObject.initialPostIndex; i < thisObject.initialPostIndex + thisObject.amountRequested; i++) { - let post = thisObject.profile.posts[i] + let post = thisObject.profile.maps.POSTS[i] if (post === undefined) { break } addPostToResponse(post) } } case DIRECTION_PAST: { for (let i = thisObject.initialPostIndex; i > thisObject.initialPostIndex - thisObject.amountRequested; i--) { - let post = thisObject.profile.posts[i] + let post = thisObject.profile.maps.POSTS[i] if (post === undefined) { break } addPostToResponse(post) } diff --git a/Network/Queries/ProfileStats.js b/Network/Queries/ProfileStats.js index f4bb73e19..69615657f 100644 --- a/Network/Queries/ProfileStats.js +++ b/Network/Queries/ProfileStats.js @@ -18,9 +18,9 @@ exports.newProfileStats = function newProfileStats() { Validate User Profile */ if (queryReceived.targetUserProfileId !== undefined) { - thisObject.profile = NT.memory.USER_PROFILES_BY_ID.get(queryReceived.targetUserProfileId) + thisObject.profile = NT.memory.maps.USER_PROFILES_BY_ID.get(queryReceived.targetUserProfileId) } else { - thisObject.profile = NT.memory.USER_PROFILES_BY_HANDLE.get(queryReceived.targetUserProfileHandle) + thisObject.profile = NT.memory.maps.USER_PROFILES_BY_HANDLE.get(queryReceived.targetUserProfileHandle) } if (thisObject.profile === undefined) { @@ -42,7 +42,7 @@ exports.newProfileStats = function newProfileStats() { "tradePostsFollowersCount": thisObject.profile.tradePostsFollowersCount, "emitterEventsCount": thisObject.profile.emitterEventsCount, "targetEventsCount": thisObject.profile.targetEventsCount, - "postsCount": thisObject.profile.postsCount, + "postsCount": thisObject.profile.maps.POSTSCount, "botsCount": thisObject.profile.botsCount } } diff --git a/Network/Query.js b/Network/Query.js index aa852b0e6..3c5d24dfd 100644 --- a/Network/Query.js +++ b/Network/Query.js @@ -13,7 +13,7 @@ exports.newQuery = function newQuery() { PROFILE_STATS: 0, PROFILE_POSTS: 1, POST_REPLIES: 2, - TIMELINE_CHUNK: 3 + EVENTS: 3 } @@ -48,8 +48,8 @@ exports.newQuery = function newQuery() { break } - case QUERY_TYPES.TIMELINE_CHUNK: { - thisObject.query = NT.modules.QUERY_TIMELINE_CHUNK.newTimelineChunk() + case QUERY_TYPES.maps.EVENTS: { + thisObject.query = NT.modules.QUERY_EVENTS.newEvents() query.initialize(queryReceived) break } diff --git a/Network/clientsInterface.js b/Network/clientsInterface.js index 9b250073a..27ae8b792 100644 --- a/Network/clientsInterface.js +++ b/Network/clientsInterface.js @@ -36,13 +36,13 @@ exports.newClientInterface = function newClientInterface() { */ let eventReceived = JSON.parse(eventMessage) - if (NT.memory.EVENTS.get(eventReceived.eventId) !== undefined) { + if (NT.memory.maps.EVENTS.get(eventReceived.eventId) !== undefined) { throw ('Event Already Exists.') } let event = NT.modules.EVENT.newEvent() event.initialize(eventReceived) - NT.memory.EVENTS.set(eventReceived.eventId, event) + NT.memory.maps.EVENTS.set(eventReceived.eventId, event) } function queryReceived(queryMessage) { diff --git a/Network/event.js b/Network/event.js index 50988a5c7..8c0ff314e 100644 --- a/Network/event.js +++ b/Network/event.js @@ -58,13 +58,13 @@ exports.newEvent = function newEvent() { function initialize(eventReceived) { - thisObject.emitterUserProfile = NT.memory.USER_PROFILES_BY_ID.get(eventReceived.emitterUserProfileId) + thisObject.emitterUserProfile = NT.memory.maps.USER_PROFILES_BY_ID.get(eventReceived.emitterUserProfileId) if (thisObject.emitterUserProfile === undefined) { throw ('Emitter User Profile Not Found.') } thisObject.emitterUserProfile.emitterEventsCount++ - thisObject.targetUserProfile = NT.memory.USER_PROFILES_BY_ID.get(eventReceived.targetUserProfileId) + thisObject.targetUserProfile = NT.memory.maps.USER_PROFILES_BY_ID.get(eventReceived.targetUserProfileId) if (thisObject.targetUserProfile === undefined) { /* We thow an exception when it does not have a target user profile and is required*/ if ( @@ -172,7 +172,7 @@ exports.newEvent = function newEvent() { eventReceived.eventType === EVENT_TYPES.ADD_REACTION_ANGRY || eventReceived.eventType === EVENT_TYPES.ADD_REACTION_HUG ) { - let targetPost = NT.memory.POSTS.get(eventReceived.targetPostHash) + let targetPost = NT.memory.maps.POSTS.get(eventReceived.targetPostHash) if (targetPost === undefined) { throw ('Target Post Not Found') @@ -190,7 +190,7 @@ exports.newEvent = function newEvent() { eventReceived.eventType === EVENT_TYPES.REMOVE_REACTION_ANGRY || eventReceived.eventType === EVENT_TYPES.REMOVE_REACTION_HUG ) { - let targetPost = NT.memory.POSTS.get(eventReceived.targetPostHash) + let targetPost = NT.memory.maps.POSTS.get(eventReceived.targetPostHash) if (targetPost === undefined) { throw ('Target Post Not Found') diff --git a/Network/post.js b/Network/post.js index 97509e6e3..43a6edb9d 100644 --- a/Network/post.js +++ b/Network/post.js @@ -86,7 +86,7 @@ exports.newPost = function newPost() { event.eventType === POST_TYPES.RE_POST_TRADE || event.eventType === POST_TYPES.QUOTE_REPOST_TRADE ) { - thisObject.targetPost = NT.memory.POSTS.get(thisObject.targetPostHash) + thisObject.targetPost = NT.memory.maps.POSTS.get(thisObject.targetPostHash) if (thisObject.targetPost === undefined) { throw ('Target Post Not Found.') diff --git a/Network/userProfile.js b/Network/userProfile.js index d1f2863e1..b4de58d1e 100644 --- a/Network/userProfile.js +++ b/Network/userProfile.js @@ -46,7 +46,7 @@ exports.newUserProfile = function newUserProfile() { thisObject.tradePostsFollowing = undefined thisObject.tradePostsFollowers = undefined - thisObject.posts = undefined + thisObject.maps.POSTS = undefined thisObject.bots = undefined } @@ -64,10 +64,10 @@ exports.newUserProfile = function newUserProfile() { thisObject.tradePostsFollowersCount = 0 thisObject.emitterEventsCount = 0 thisObject.targetEventsCount = 0 - thisObject.postsCount = 0 + thisObject.maps.POSTSCount = 0 thisObject.botsCount = 0 - thisObject.posts = [] + thisObject.maps.POSTS = [] thisObject.bots = undefined } @@ -78,7 +78,7 @@ exports.newUserProfile = function newUserProfile() { userProfile, timestamp ) { - if (NT.memory.POSTS.get(emitterPostHash) !== undefined) { + if (NT.memory.maps.POSTS.get(emitterPostHash) !== undefined) { throw ('Post Already Exists.') } @@ -91,29 +91,29 @@ exports.newUserProfile = function newUserProfile() { timestamp ) - thisObject.posts.push(post) - NT.memory.POSTS.set(emitterPostHash, post) - thisObject.postsCount++ + thisObject.maps.POSTS.push(post) + NT.memory.maps.POSTS.set(emitterPostHash, post) + thisObject.maps.POSTSCount++ } function removePost( emitterPostHash ) { - if (NT.memory.POSTS.get(emitterPostHash) === undefined) { + if (NT.memory.maps.POSTS.get(emitterPostHash) === undefined) { throw ('Post Does Not Exist.') } - let post = thisObject.posts.get(emitterPostHash) + let post = thisObject.maps.POSTS.get(emitterPostHash) post.finalize() - for (let i = thisObject.posts.length - 1; i >= 0; i-- { - if (thisObject.posts[i].emitterPostHash === emitterPostHash) { - thisObject.posts.splice(i, 1) + for (let i = thisObject.maps.POSTS.length - 1; i >= 0; i--) { + if (thisObject.maps.POSTS[i].emitterPostHash === emitterPostHash) { + thisObject.maps.POSTS.splice(i, 1) break } } - NT.memory.POSTS.delete(emitterPostHash) - thisObject.postsCount-- + NT.memory.maps.POSTS.delete(emitterPostHash) + thisObject.maps.POSTSCount-- } function addMultiMediaPostsFollowing(