diff --git a/app/web/app.js b/app/web/app.js index 298b36c..20ba838 100644 --- a/app/web/app.js +++ b/app/web/app.js @@ -111,7 +111,7 @@ var encrypt = { var senderPublicKeyString = {}; senderDerivedKey = this.deriveSharedKeySender( receiverCompressedPublicKey, senderECKeyData.privateKey); - console.log("senderDerivedKey", senderDerivedKey); + //console.log("senderDerivedKey", senderDerivedKey); let senderKey = senderDerivedKey.XValue + senderDerivedKey.YValue; let secret = Crypto.AES.encrypt(data, senderKey); return { @@ -136,7 +136,7 @@ var encrypt = { receiverDerivedKey = this.deriveReceiverSharedKey(senderPublicKeyString, receiverECKeyData.privateKey); - console.log("receiverDerivedKey", receiverDerivedKey); + //console.log("receiverDerivedKey", receiverDerivedKey); let receiverKey = receiverDerivedKey.XValue + receiverDerivedKey.YValue; let decryptMsg = Crypto.AES.decrypt(secret, receiverKey); @@ -199,7 +199,34 @@ var encrypt = { privateKeyDecimal: privateKeyDecimal, privateKeyHex: privateKeyHex } - } + }, + createShamirsSecretShares: function (str, total_shares, threshold_limit) { + if (str.length > 0) { + // convert the text into a hex string + var strHex = shamirSecretShare.str2hex(str); + // split into total_shares shares, with a threshold of threshold_limit + var shares = shamirSecretShare.share(strHex, total_shares, threshold_limit); + return shares; + } + return false; + }, + verifyShamirsSecret: function (sharesArray, str) { + // combine sharesArray: + var comb = shamirSecretShare.combine(sharesArray); + //convert back to UTF string: + comb = shamirSecretShare.hex2str(comb); + return comb === str; + }, + retrieveShamirSecret: function (sharesArray) { + if (sharesArray.length > 0) { + // combine sharesArray: + var comb = shamirSecretShare.combine(sharesArray.slice(0, sharesArray.length)); + //convert back to UTF string: + comb = shamirSecretShare.hex2str(comb); + return comb; + } + return false; + } } function convertStringToInt(string){ @@ -231,18 +258,742 @@ function logout(){ location.reload(); } -function listProfiles(){ - console.log("listProfiles"); - var profileList = document.getElementById("profileList"); - profileList.innerHTML = ""; - for (p in profiles){ - var element = document.createElement("div"); - element.setAttribute("class", "media"); - element.innerHTML = `
-
${profiles[p].name}
- @${p} -
` - profileList.appendChild(element); - } - //document.getElementById("profileInfo").style.display = "none"; -} \ No newline at end of file +var supernodeKBucket; +var superNodeList; +/*Kademlia DHT K-bucket implementation as a binary tree.*/ + + if (typeof reactor == "undefined" || !reactor) { + (function () { + + function Event(name) { + this.name = name; + this.callbacks = []; + } + Event.prototype.registerCallback = function (callback) { + this.callbacks.push(callback); + }; + + function Reactor() { + this.events = {}; + } + + Reactor.prototype.registerEvent = function (eventName) { + var event = new Event(eventName); + this.events[eventName] = event; + }; + + Reactor.prototype.dispatchEvent = function (eventName, eventArgs) { + this.events[eventName].callbacks.forEach(function (callback) { + callback(eventArgs); + }); + }; + + Reactor.prototype.addEventListener = function (eventName, callback) { + this.events[eventName].registerCallback(callback); + }; + + window.reactor = new Reactor(); + + })(); +} + +reactor.registerEvent('added'); +reactor.addEventListener('added', function (someObject) { + console.log('Added fired with data ' + someObject); +}); + +reactor.registerEvent('removed'); +reactor.addEventListener('removed', function (someObject) { + console.log('Removed fired with data ' + someObject); +}); + +reactor.registerEvent('updated'); +reactor.addEventListener('updated', function (someObject) { + console.log('Updated fired with data ' + someObject); +}); + +reactor.registerEvent('bucket_full'); +reactor.addEventListener('bucket_full', function (someObject) { + console.log('Bucket full ' + someObject); +}); + +/* +//Sample Usage +//Creating and defining the event +reactor.registerEvent('big bang'); +reactor.addEventListener('big bang', function(someObject){ +console.log('This is big bang listener yo!'+ someObject.a); +}); + +//Firing the event +reactor.dispatchEvent('big bang'); +reactor.dispatchEvent('big bang',{a:1}); +reactor.dispatchEvent('big bang',{a:55}); + +*/ + + +//Checking if existing NodeID can be used +//This first block of if will initialize the configuration of KBucket +//Add Events, Messaging between different K-Buckets, and attach relevant distributed data + + /** + * @param {Uint8Array} array1 + * @param {Uint8Array} array2 + * @return {Boolean} + */ + function arrayEquals(array1, array2) { + if (array1 === array2) { + return true + } + if (array1.length !== array2.length) { + return false + } + for (let i = 0, length = array1.length; i < length; ++i) { + if (array1[i] !== array2[i]) { + return false + } + } + return true + } + + function createNode() { + return { + contacts: [], + dontSplit: false, + left: null, + right: null + } + } + + function ensureInt8(name, val) { + if (!(val instanceof Uint8Array)) { + throw new TypeError(name + ' is not a Uint8Array') + } + } + + /** + * Implementation of a Kademlia DHT k-bucket used for storing + * contact (peer node) information. + * + * @extends EventEmitter + */ + function BuildKBucket(options = {}) { + /** + * `options`: + * `distance`: Function + * `function (firstId, secondId) { return distance }` An optional + * `distance` function that gets two `id` Uint8Arrays + * and return distance (as number) between them. + * `arbiter`: Function (Default: vectorClock arbiter) + * `function (incumbent, candidate) { return contact; }` An optional + * `arbiter` function that givent two `contact` objects with the same `id` + * returns the desired object to be used for updating the k-bucket. For + * more details, see [arbiter function](#arbiter-function). + * `localNodeId`: Uint8Array An optional Uint8Array representing the local node id. + * If not provided, a local node id will be created via `randomBytes(20)`. + * `metadata`: Object (Default: {}) Optional satellite data to include + * with the k-bucket. `metadata` property is guaranteed not be altered by, + * it is provided as an explicit container for users of k-bucket to store + * implementation-specific data. + * `numberOfNodesPerKBucket`: Integer (Default: 20) The number of nodes + * that a k-bucket can contain before being full or split. + * `numberOfNodesToPing`: Integer (Default: 3) The number of nodes to + * ping when a bucket that should not be split becomes full. KBucket will + * emit a `ping` event that contains `numberOfNodesToPing` nodes that have + * not been contacted the longest. + * + * @param {Object=} options optional + */ + + this.localNodeId = options.localNodeId || window.crypto.getRandomValues(new Uint8Array(20)) + this.numberOfNodesPerKBucket = options.numberOfNodesPerKBucket || 20 + this.numberOfNodesToPing = options.numberOfNodesToPing || 3 + this.distance = options.distance || this.distance + // use an arbiter from options or vectorClock arbiter by default + this.arbiter = options.arbiter || this.arbiter + this.metadata = Object.assign({}, options.metadata) + + ensureInt8('option.localNodeId as parameter 1', this.localNodeId) + + this.root = createNode() + + + /** + * Default arbiter function for contacts with the same id. Uses + * contact.vectorClock to select which contact to update the k-bucket with. + * Contact with larger vectorClock field will be selected. If vectorClock is + * the same, candidat will be selected. + * + * @param {Object} incumbent Contact currently stored in the k-bucket. + * @param {Object} candidate Contact being added to the k-bucket. + * @return {Object} Contact to updated the k-bucket with. + */ + this.arbiter = function (incumbent, candidate) { + return incumbent.vectorClock > candidate.vectorClock ? incumbent : candidate + } + + /** + * Default distance function. Finds the XOR + * distance between firstId and secondId. + * + * @param {Uint8Array} firstId Uint8Array containing first id. + * @param {Uint8Array} secondId Uint8Array containing second id. + * @return {Number} Integer The XOR distance between firstId + * and secondId. + */ + this.distance = function (firstId, secondId) { + let distance = 0 + let i = 0 + const min = Math.min(firstId.length, secondId.length) + const max = Math.max(firstId.length, secondId.length) + for (; i < min; ++i) { + distance = distance * 256 + (firstId[i] ^ secondId[i]) + } + for (; i < max; ++i) distance = distance * 256 + 255 + return distance + } + + /** + * Adds a contact to the k-bucket. + * + * @param {Object} contact the contact object to add + */ + this.add = function (contact) { + ensureInt8('contact.id', (contact || {}).id) + + let bitIndex = 0 + let node = this.root + + while (node.contacts === null) { + // this is not a leaf node but an inner node with 'low' and 'high' + // branches; we will check the appropriate bit of the identifier and + // delegate to the appropriate node for further processing + node = this._determineNode(node, contact.id, bitIndex++) + } + + // check if the contact already exists + const index = this._indexOf(node, contact.id) + if (index >= 0) { + this._update(node, index, contact) + return this + } + + if (node.contacts.length < this.numberOfNodesPerKBucket) { + node.contacts.push(contact) + reactor.dispatchEvent('added', contact) + return this + } + + // the bucket is full + if (node.dontSplit) { + // we are not allowed to split the bucket + // we need to ping the first this.numberOfNodesToPing + // in order to determine if they are alive + // only if one of the pinged nodes does not respond, can the new contact + // be added (this prevents DoS flodding with new invalid contacts) + reactor.dispatchEvent('bucket_full', {1: node.contacts.slice(0, this.numberOfNodesToPing),2: contact}) + return this + } + + this._split(node, bitIndex) + return this.add(contact) + } + + /** + * Get the n closest contacts to the provided node id. "Closest" here means: + * closest according to the XOR metric of the contact node id. + * + * @param {Uint8Array} id Contact node id + * @param {Number=} n Integer (Default: Infinity) The maximum number of + * closest contacts to return + * @return {Array} Array Maximum of n closest contacts to the node id + */ + this.closest = function (id, n = Infinity) { + ensureInt8('id', id) + + if ((!Number.isInteger(n) && n !== Infinity) || n <= 0) { + throw new TypeError('n is not positive number') + } + + let contacts = [] + + for (let nodes = [this.root], bitIndex = 0; nodes.length > 0 && contacts.length < n;) { + const node = nodes.pop() + if (node.contacts === null) { + const detNode = this._determineNode(node, id, bitIndex++) + nodes.push(node.left === detNode ? node.right : node.left) + nodes.push(detNode) + } else { + contacts = contacts.concat(node.contacts) + } + } + + return contacts + .map(a => [this.distance(a.id, id), a]) + .sort((a, b) => a[0] - b[0]) + .slice(0, n) + .map(a => a[1]) + } + + /** + * Counts the total number of contacts in the tree. + * + * @return {Number} The number of contacts held in the tree + */ + this.count = function () { + // return this.toArray().length + let count = 0 + for (const nodes = [this.root]; nodes.length > 0;) { + const node = nodes.pop() + if (node.contacts === null) nodes.push(node.right, node.left) + else count += node.contacts.length + } + return count + } + + /** + * Determines whether the id at the bitIndex is 0 or 1. + * Return left leaf if `id` at `bitIndex` is 0, right leaf otherwise + * + * @param {Object} node internal object that has 2 leafs: left and right + * @param {Uint8Array} id Id to compare localNodeId with. + * @param {Number} bitIndex Integer (Default: 0) The bit index to which bit + * to check in the id Uint8Array. + * @return {Object} left leaf if id at bitIndex is 0, right leaf otherwise. + */ + this._determineNode = function (node, id, bitIndex) { + // *NOTE* remember that id is a Uint8Array and has granularity of + // bytes (8 bits), whereas the bitIndex is the bit index (not byte) + + // id's that are too short are put in low bucket (1 byte = 8 bits) + // (bitIndex >> 3) finds how many bytes the bitIndex describes + // bitIndex % 8 checks if we have extra bits beyond byte multiples + // if number of bytes is <= no. of bytes described by bitIndex and there + // are extra bits to consider, this means id has less bits than what + // bitIndex describes, id therefore is too short, and will be put in low + // bucket + const bytesDescribedByBitIndex = bitIndex >> 3 + const bitIndexWithinByte = bitIndex % 8 + if ((id.length <= bytesDescribedByBitIndex) && (bitIndexWithinByte !== 0)) { + return node.left + } + + const byteUnderConsideration = id[bytesDescribedByBitIndex] + + // byteUnderConsideration is an integer from 0 to 255 represented by 8 bits + // where 255 is 11111111 and 0 is 00000000 + // in order to find out whether the bit at bitIndexWithinByte is set + // we construct (1 << (7 - bitIndexWithinByte)) which will consist + // of all bits being 0, with only one bit set to 1 + // for example, if bitIndexWithinByte is 3, we will construct 00010000 by + // (1 << (7 - 3)) -> (1 << 4) -> 16 + if (byteUnderConsideration & (1 << (7 - bitIndexWithinByte))) { + return node.right + } + + return node.left + } + + /** + * Get a contact by its exact ID. + * If this is a leaf, loop through the bucket contents and return the correct + * contact if we have it or null if not. If this is an inner node, determine + * which branch of the tree to traverse and repeat. + * + * @param {Uint8Array} id The ID of the contact to fetch. + * @return {Object|Null} The contact if available, otherwise null + */ + this.get = function (id) { + ensureInt8('id', id) + + let bitIndex = 0 + + let node = this.root + while (node.contacts === null) { + node = this._determineNode(node, id, bitIndex++) + } + + // index of uses contact id for matching + const index = this._indexOf(node, id) + return index >= 0 ? node.contacts[index] : null + } + + /** + * Returns the index of the contact with provided + * id if it exists, returns -1 otherwise. + * + * @param {Object} node internal object that has 2 leafs: left and right + * @param {Uint8Array} id Contact node id. + * @return {Number} Integer Index of contact with provided id if it + * exists, -1 otherwise. + */ + this._indexOf = function (node, id) { + for (let i = 0; i < node.contacts.length; ++i) { + if (arrayEquals(node.contacts[i].id, id)) return i + } + + return -1 + } + + /** + * Removes contact with the provided id. + * + * @param {Uint8Array} id The ID of the contact to remove. + * @return {Object} The k-bucket itself. + */ + this.remove = function (id) { + ensureInt8('the id as parameter 1', id) + + let bitIndex = 0 + let node = this.root + + while (node.contacts === null) { + node = this._determineNode(node, id, bitIndex++) + } + + const index = this._indexOf(node, id) + if (index >= 0) { + const contact = node.contacts.splice(index, 1)[0] + reactor.dispatchEvent('removed', contact) + } + + return this + } + + /** + * Splits the node, redistributes contacts to the new nodes, and marks the + * node that was split as an inner node of the binary tree of nodes by + * setting this.root.contacts = null + * + * @param {Object} node node for splitting + * @param {Number} bitIndex the bitIndex to which byte to check in the + * Uint8Array for navigating the binary tree + */ + this._split = function (node, bitIndex) { + node.left = createNode() + node.right = createNode() + + // redistribute existing contacts amongst the two newly created nodes + for (const contact of node.contacts) { + this._determineNode(node, contact.id, bitIndex).contacts.push(contact) + } + + node.contacts = null // mark as inner tree node + + // don't split the "far away" node + // we check where the local node would end up and mark the other one as + // "dontSplit" (i.e. "far away") + const detNode = this._determineNode(node, this.localNodeId, bitIndex) + const otherNode = node.left === detNode ? node.right : node.left + otherNode.dontSplit = true + } + + /** + * Returns all the contacts contained in the tree as an array. + * If this is a leaf, return a copy of the bucket. `slice` is used so that we + * don't accidentally leak an internal reference out that might be + * accidentally misused. If this is not a leaf, return the union of the low + * and high branches (themselves also as arrays). + * + * @return {Array} All of the contacts in the tree, as an array + */ + this.toArray = function () { + let result = [] + for (const nodes = [this.root]; nodes.length > 0;) { + const node = nodes.pop() + if (node.contacts === null) nodes.push(node.right, node.left) + else result = result.concat(node.contacts) + } + return result + } + + /** + * Updates the contact selected by the arbiter. + * If the selection is our old contact and the candidate is some new contact + * then the new contact is abandoned (not added). + * If the selection is our old contact and the candidate is our old contact + * then we are refreshing the contact and it is marked as most recently + * contacted (by being moved to the right/end of the bucket array). + * If the selection is our new contact, the old contact is removed and the new + * contact is marked as most recently contacted. + * + * @param {Object} node internal object that has 2 leafs: left and right + * @param {Number} index the index in the bucket where contact exists + * (index has already been computed in a previous + * calculation) + * @param {Object} contact The contact object to update. + */ + this._update = function (node, index, contact) { + // sanity check + if (!arrayEquals(node.contacts[index].id, contact.id)) { + throw new Error('wrong index for _update') + } + + const incumbent = node.contacts[index] + + /***************Change made by Abhishek*************/ + const selection = this.arbiter(incumbent, contact) + //const selection = localbitcoinplusplus.kademlia.arbiter(incumbent, contact); + // if the selection is our old contact and the candidate is some new + // contact, then there is nothing to do + if (selection === incumbent && incumbent !== contact) return + + node.contacts.splice(index, 1) // remove old contact + node.contacts.push(selection) // add more recent contact version + /***************Change made by Abhishek*************/ + reactor.dispatchEvent('updated', { + ...incumbent, + ...selection + }) + //reactor.dispatchEvent('updated', incumbent.concat(selection)) + } + } + + +kBucketObj = { + + decodeBase58Address: function (blockchain, address) { + let k = bitjs.Base58.decode(address) + k.shift() + k.splice(-4, 4) + return Crypto.util.bytesToHex(k) + }, + launchKBucket: function() { + return new Promise((resolve, reject)=>{ + try { + //const master_flo_pubKey = localbitcoinplusplus.master_configurations.masterFLOPubKey; + const master_flo_addr = adminID; + const SuKBucketId = this.floIdToKbucketId(crypto, master_flo_addr); + const SukbOptions = { localNodeId: SuKBucketId } + supernodeKBucket = new BuildKBucket(SukbOptions); + for(var i=0; i{ + return new Promise((resolve, reject)=>{ + try { + let flo_id = bitjs.pubkey2address(pubKey); + let kname = `SKBucket_${pubKey}`; + const KBucketId = this.floIdToKbucketId(crypto, flo_id) + const kbOptions = { localNodeId: KBucketId } + window[kname] = new BuildKBucket(kbOptions); + resolve(true); + } catch (error) { + reject(error); + } + }) + }) + }, + addContact: function (id, floID, KB=supernodeKBucket) { + const contact = { + id: id, + floID: floID + }; + KB.add(contact) + }, + addNewUserNodeInKbucket: function(blockchain, address, KB=supernodeKBucket) { + let decodedId = address; + try { + decodedId = this.floIdToKbucketId(blockchain, address); + } catch(e) { + decodedId = address; + } + const addNewUserNode = this.addContact(decodedId, address, KB); + return {decodedId:decodedId, address:address}; + }, + floIdToKbucketId: function (blockchain, address) { + const decodedId = this.decodeBase58Address(blockchain, address); + const nodeIdBigInt = new BigInteger(decodedId, 16); + const nodeIdBytes = nodeIdBigInt.toByteArrayUnsigned(); + const nodeIdNewInt8Array = new Uint8Array(nodeIdBytes); + return nodeIdNewInt8Array; + }, + arbiter: function (incumbent, candidate) { + // we create a new object so that our selection is guaranteed to replace + // the incumbent + const merged = { + id: incumbent.id, // incumbent.id === candidate.id within an arbiter + data: incumbent.data + } + + Object.keys(candidate.data).forEach(workerNodeId => { + merged.data[workerNodeId] = candidate.data[workerNodeId]; + }) + + return merged; + }, + newBase64DiscoverId: function (pubKey) { + let pubKeyBytes = Crypto.util.hexToBytes(pubKey); + return Crypto.util.bytesToBase64(pubKeyBytes); + }, + restoreKbucket: function(flo_addr, blockchain="FLO_TEST", KB=KBucket) { + return new Promise((resolve, reject)=>{ + readAllDB('kBucketStore') + .then(dbObject => { + if (typeof dbObject=="object") { + let su_flo_addr_array = localbitcoinplusplus.master_configurations.supernodesPubKeys + .map(pubk=>bitjs.pubkey2address(pubk)); + // Prevent supernode to re-added in kbucket + dbObject + .filter(f=>!su_flo_addr_array.includes(f.data.id)) + .map(dbObj=>{ + this.addNewUserNodeInKbucket(blockchain, flo_addr, dbObj.data, KB); + }); + } else { + reject(`Failed to restore kBucket.`); + } + resolve(dbObject); + }); + }) + }, + restoreSupernodeKBucket: function() { + return new Promise((resolve, reject)=>{ + const supernodeSeeds = localbitcoinplusplus.master_configurations.supernodeSeeds; + if (typeof supernodeSeeds !== "object") reject("Failed to get supernode seeds."); + let supernodeSeedsObj = JSON.parse(supernodeSeeds); + + Object.entries(supernodeSeedsObj).map(seedObj=>{ + let kbuck = this.addNewUserNodeInKbucket(crypto, seedObj[1].kbucketId, + { id: seedObj[1].kbucketId }, supernodeKBucket); + }); + + resolve(true); + }) + }, + updateClosestSupernodeSeeds: function(flo_addr) { + return new Promise(async (resolve, reject) => { + await removeAllinDB('myClosestSupernodes'); + let nearestSupernodeAddresslist = await this.addClosestSupernodeInDB(flo_addr); + nearestSupernodeAddresslist.map((nearestSupernodeAddress, index)=>{ + updateinDB('myClosestSupernodes', { + id: index+1, + ip: nearestSupernodeAddress.ip, + port: nearestSupernodeAddress.port, + trader_flo_address: nearestSupernodeAddress.kbucketId, + is_live: null + }).then(updatedClosestSupernodes=>{ + readAllDB('myClosestSupernodes').then(nearestSupernodeAddresslist=>{ + showMessage(`INFO: Updated closest supernodes list successfully.`); + resolve(nearestSupernodeAddresslist); + }); + }); + }); + }); + }, + getSupernodeSeed: function (flo_addr) { + return new Promise(async (resolve, reject) => { + let nearestSupernodeAddresslist = await readAllDB('myClosestSupernodes'); + if (nearestSupernodeAddresslist.length<1) { + nearestSupernodeAddresslist = await this.updateClosestSupernodeSeeds(flo_addr); + } + resolve(nearestSupernodeAddresslist); + }); + }, + isNodePresentInMyKbucket: function(flo_id, KB=KBucket) { + return new Promise((resolve, reject)=>{ + let kArray = KB.toArray(); + let kArrayFloIds = kArray.map(k=>k.data.id); + if (kArrayFloIds.includes(flo_id)) { + resolve(true); + } else { + reject(false); + } + }); + }, + determineClosestSupernode: function(flo_addr="", n=1, KB=supernodeKBucket, su="") { + return new Promise((resolve, reject)=>{ + let msg = ``; + if (typeof supernodeKBucket !== "object") { + msg = `ERROR: Supernode KBucket not found.`; + showMessage(msg); + reject(msg); + return false; + } + + if (su.length>0) { + try { + let closestSupernodeMasterList = supernodeKBucket.closest(supernodeKBucket.localNodeId); + const index = closestSupernodeMasterList.findIndex(f=>f.data.id==su); + let tail = closestSupernodeMasterList.splice(0, index); + const newClosestSupernodeMasterList = closestSupernodeMasterList.concat(tail); + resolve(newClosestSupernodeMasterList); + return true; + } catch (error) { + reject(error); + } + return false; + } + + try { + if(flo_addr.length < 0) { + showMessage(`WARNING: No Flo Id provided to determine closest Supenode.`); + return; + } + let isFloIdUint8 = flo_addr instanceof Uint8Array; + if (!isFloIdUint8) { + flo_addr = this.floIdToKbucketId(crypto, flo_addr); + } + const closestSupernode = supernodeKBucket.closest(flo_addr, n); + resolve(closestSupernode); + return true; + } catch (error) { + showMessage(error); + reject(error); + return false; + } + }) + }, + + addClosestSupernodeInDB: function(flo_addr, KB=KBucket) { + return new Promise(async (resolve, reject)=>{ + const supernodeSeeds = localbitcoinplusplus.master_configurations.supernodeSeeds; + if (typeof supernodeSeeds !== "object") reject("Failed to get supernode seeds."); + let supernodeSeedsObj = JSON.parse(supernodeSeeds); + + Object.entries(supernodeSeedsObj).map(seedObj=>{ + console.log(seedObj); + this.addNewUserNodeInKbucketAndDB( + crypto, seedObj[1].kbucketId, + { id: seedObj[1].kbucketId }); + }); + + let primarySu = await this.determineClosestSupernode(flo_addr); + let nearestSupernode = await this.determineClosestSupernode(flo_addr="", n=1, supernodeKBucket, primarySu[0].data.id); + let nearestSupernodeIds = nearestSupernode.map(f=>f.data.id); + let supernodeSeedsArray = Object.values(supernodeSeedsObj) + .filter(seed=>nearestSupernodeIds.includes(seed.kbucketId)) + .sort(function(a, b){ + return nearestSupernodeIds.indexOf(a.kbucketId) - nearestSupernodeIds.indexOf(b.kbucketId); + }); + + if (supernodeSeedsArray.length>0) { + resolve(supernodeSeedsArray); + } else { + reject(false); + } + }) + } +} + +function sendDataToSuperNode(floID,data){ + kBucketObj.determineClosestSupernode(floID).then(result=>{ + var superNodeWS = new WebSocket("ws://"+profiles[result[0].floID].onionAddr+"/ws"); + superNodeWS.onopen = function(ev){ + console.log(`Connected to ${floID}'s SuperNode!`); + superNodeWS.send(data); + }; + superNodeWS.onerror = function(ev) {console.log(`${floid}'s SuperNode is offline!`);}; + superNodeWS.onclose = function(ev) {console.log(`Disconnected from ${floid}'s SuperNode!`);}; + }).catch(e => { + console.log(e.message); + }); + } \ No newline at end of file diff --git a/app/web/home.html b/app/web/home.html index 6b7e00b..b0f30e2 100644 --- a/app/web/home.html +++ b/app/web/home.html @@ -26,7 +26,7 @@ Profiles
  • - Messages + Messages
  • @@ -49,27 +49,30 @@
    - +
    +
    + +
    -
    -
    - TWEETS - - -
    +
    +
    + TWEETS + - +
    +
    +
    +
    + FOLLOWING + - +
    +
    +
    +
    + FOLLOWERS + - +
    +
    -
    -
    - FOLLOWING - - -
    -
    -
    -
    - FOLLOWERS - - -
    -
    -
    diff --git a/app/web/home.js b/app/web/home.js index 0b88dad..fc08346 100644 --- a/app/web/home.js +++ b/app/web/home.js @@ -1,5 +1,5 @@ var profiles = [] -var tweeterID; +var selfID; var selfWebsocket,followingWebSockets = []; var privKey; var following; @@ -20,28 +20,44 @@ function userDataStartUp(){ profiles = arrayToObject(result); console.log(profiles); sessionStorage.profiles = JSON.stringify(profiles); - getuserID().then(function(result){ - console.log(result); - tweeterID = result; - sessionStorage.privKey = privKey; - sessionStorage.selfID = tweeterID; - alert(`${tweeterID}\nWelcome ${profiles[tweeterID].name}`) - initselfWebSocket(); - listProfiles(); - getFollowinglistFromIDB().then(function(result){ - following = result; - console.log(following); - displayTweetsFromIDB().then(function(result){ - connectToAllFollowing(); + getSuperNodeListfromIDB().then(function(result){ + console.log(result) + superNodeList = result; + sessionStorage.superNodeList = JSON.stringify(superNodeList); + kBucketObj.launchKBucket().then(function(result){ + console.log(result) + getuserID().then(function(result){ + console.log(result); + selfID = result; + if(superNodeList.includes(selfID)) + modSuperNode = true; + sessionStorage.privKey = JSON.stringify(encrypt.createShamirsSecretShares(privKey,10,10)); + sessionStorage.selfID = selfID; + alert(`${selfID}\nWelcome ${profiles[selfID].name}`) + initselfWebSocket(); + listProfiles(); + pingSuperNodeforNewMsgs(); + getFollowinglistFromIDB().then(function(result){ + following = result; + if(!following.includes(selfID)) + following.push(selfID); + console.log(following); + displayTweetsFromIDB().then(function(result){ + connectToAllFollowing(); + }).catch(function(error){ + console.log(error.message); + }) }).catch(function(error){ console.log(error.message); }) - }).catch(function(error){ - console.log(error.message); - }) - + }).catch(function (error) { + console.log(error.message); + }); + }).catch(function(error){ + console.log(error.message); + }); }).catch(function (error) { - console.log(error.message); + console.log(error.message); }); }).catch(function (error) { console.log(error.message); @@ -86,18 +102,25 @@ function getDatafromAPI(){ }; idb.onupgradeneeded = function(event) { var db = event.target.result; + var objectStore0 = event.target.result.createObjectStore("superNodes"); var objectStore1 = db.createObjectStore("profiles",{ keyPath: 'floID' }); objectStore1.createIndex('onionAddr', 'onionAddr', { unique: false }); objectStore1.createIndex('name', 'name', { unique: false }); objectStore1.createIndex('pubKey', 'pubKey', { unique: false }); var objectStore2 = db.createObjectStore("lastTx"); - var objectStore3 = db.createObjectStore("tweets",{ keyPath: 'id' }); + var objectStore3 = db.createObjectStore("tweets",{ keyPath: 'tweetID' }); + objectStore3.createIndex('tid', 'tid', { unique: false }); objectStore3.createIndex('floID', 'floID', { unique: false }); objectStore3.createIndex('time', 'time', { unique: false }); objectStore3.createIndex('data', 'data', { unique: false }); var objectStore4 = db.createObjectStore("lastTweet"); var objectStore5 = db.createObjectStore("followers"); var objectStore6 = db.createObjectStore("following"); + var objectStore7 = event.target.result.createObjectStore("messages",{ keyPath: 'msgID' }); + objectStore7.createIndex('time', 'time', { unique: false }); + objectStore7.createIndex('text', 'text', { unique: false }); + objectStore7.createIndex('floID', 'floID', { unique: false }); + objectStore7.createIndex('type', 'type', { unique: false }); }; idb.onsuccess = function(event) { var db = event.target.result; @@ -127,18 +150,26 @@ function getDatafromAPI(){ } response.items.reverse().forEach(function(tx){ try { - //if (tx.vin[0].addr != addr) - //return; - var data = JSON.parse(tx.floData).FLO_Tweet; - if(data !== undefined){ - if(encrypt.getFLOIDfromPubkeyHex(data.pubKey)!=tx.vin[0].addr) - throw("PublicKey doesnot match with floID") - data = {floID : tx.vin[0].addr, onionAddr : data.onionAddr, name : data.name, pubKey:data.pubKey}; - storedata(data).then(function (response) { - }).catch(function (error) { - console.log(error.message); - }); - } + if (tx.vin[0].addr == addr){ + var data = JSON.parse(tx.floData).FLO_Tweet_SuperNode; + if(data !== undefined){ + storeSuperNodeData(data).then(function (response) { + }).catch(function (error) { + console.log(error.message); + }); + } + }else{ + var data = JSON.parse(tx.floData).FLO_Tweet; + if(data !== undefined){ + if(encrypt.getFLOIDfromPubkeyHex(data.pubKey)!=tx.vin[0].addr) + throw("PublicKey doesnot match with floID") + data = {floID : tx.vin[0].addr, onionAddr : data.onionAddr, name : data.name, pubKey:data.pubKey}; + storedata(data).then(function (response) { + }).catch(function (error) { + console.log(error.message); + }); + } + } } catch (e) { //console.log(e) } @@ -156,11 +187,56 @@ function getDatafromAPI(){ ); } +function storeSuperNodeData(data){ + return new Promise( + function(resolve, reject) { + var idb = indexedDB.open("FLO_Tweet"); + idb.onerror = function(event) { + reject("Error in opening IndexedDB!"); + }; + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction('superNodes', "readwrite").objectStore('superNodes'); + if(data.addNodes) + for(var i=0; i -
    - - ${cursor.value.text} - - - ${getTime(cursor.value.time)} - -
    -
    `; - chat.appendChild(msgdiv); - }else if(cursor.value.type == "S"){ - var msgdiv = document.createElement('div'); - msgdiv.setAttribute("class", "row message-body"); - msgdiv.innerHTML = `
    -
    - ${cursor.value.text} - - - ${getTime(cursor.value.time)} - -
    -
    `; - chat.appendChild(msgdiv); - } - - cursor.continue(); - } else { - console.log('Entries all displayed.'); - resolve("Read Msg from IDB"); - } - }; - db.close(); - }; - } - ); -} - function initselfWebSocket(){ selfWebsocket = new WebSocket("ws://"+location.host+"/ws"); selfWebsocket.onopen = function(evt){ console.log("Connecting"); - var pass = sessionStorage.serverPass || prompt("Enter server password :"); + var pass = (sessionStorage.serverPass !== undefined ? encrypt.retrieveShamirSecret(JSON.parse(sessionStorage.serverPass)): prompt("Enter server password :")); selfWebsocket.send("$"+pass); - sessionStorage.serverPass = pass; + sessionStorage.serverPass = JSON.stringify(encrypt.createShamirsSecretShares(pass,5,5)); }; selfWebsocket.onclose = function(evt){ console.log("DISCONNECTED"); @@ -296,7 +303,7 @@ function initselfWebSocket(){ if(evt.data == "$Access Denied!"){ var pass = prompt("Access Denied! reEnter server password :"); selfWebsocket.send("$"+pass); - sessionStorage.serverPass = pass; + sessionStorage.serverPass = JSON.stringify(encrypt.createShamirsSecretShares(pass,5,5)); }else if(evt.data == "$Access Granted!") alert("Access Granted!") else{ @@ -320,6 +327,47 @@ function initselfWebSocket(){ db.close(); }; selfWebsocket.send(`U${data.floID}`); + }else if(data.message && data.to == selfID){ + var msg = encrypt.decryptMessage(data.secret,data.pubVal) + if(encrypt.verify(msg,data.sign,profiles[data.from].pubKey)) + storeMsg({time:data.time,floID:data.from,text:msg,type:'R'}); + }else if(data.fromSuperNode && following.includes(data.floID)){ + var tid = data.tid; + data = JSON.parse(data.data); + if(encrypt.verify(data.tweet,data.sign,profiles[data.floID].pubKey)){ + storeTweet({floID:data.floID,time:data.time,data:data.tweet},tid); + createTweetElement(data.floID,data.time,data.tweet); + } + }else if(modSuperNode){ + if(data.reqNewTweets){ + kBucketObj.determineClosestSupernode(data.floID).then(result=>{ + if(result[0].floID == selfID) + SuperNode_sendTweetsFromIDB(data.floID,data.tid,data.requestor); + }).catch(e => { + console.log(e.message); + }); + }else if(data.newSuperNodeTweet){ + kBucketObj.determineClosestSupernode(data.floID).then(result=>{ + if(result[0].floID == selfID) + SuperNode_storeSuperNodeTweet(data.data,data.tid); + }).catch(e => { + console.log(e.message); + }); + }else if(data.viaSuperNodeMsg){ + kBucketObj.determineClosestSupernode(data.to).then(result=>{ + if(result[0].floID == selfID) + SuperNode_storeViaSuperNodeMsg(data.from,data.to,data.data); + }).catch(e => { + console.log(e.message); + }); + }else if(data.viaMsgreq){ + kBucketObj.determineClosestSupernode(data.floID).then(result=>{ + if(result[0].floID == selfID) + SuperNode_sendviaMsgFromIDB(data.floID); + }).catch(e => { + console.log(e.message); + }); + } } }catch(error){ console.log(error.message); @@ -331,24 +379,41 @@ function initselfWebSocket(){ }; } +function listProfiles(){ + console.log("listProfiles"); + document.getElementById("profileName").innerHTML=profiles[selfID].name; + document.getElementById("profileFloID").innerHTML='@'+selfID; + var profileList = document.getElementById("profileList"); + profileList.innerHTML = ""; + for (p in profiles){ + var element = document.createElement("div"); + element.setAttribute("class", "media"); + element.innerHTML = `
    +
    ${profiles[p].name}
    + @${p} +
    ` + profileList.appendChild(element); + } + //document.getElementById("profileInfo").style.display = "none"; +} + function postTweet(){ var tweetBox = document.getElementById("tweetBox"); var tweet = tweetBox.value; tweetBox.value = ""; var time = (new Date).getTime(); var sign = encrypt.sign(tweet,privKey); - var data = JSON.stringify({floID:tweeterID,time:time,tweet:tweet,sign:sign}); + var data = JSON.stringify({floID:selfID,time:time,tweet:tweet,sign:sign}); console.log(data); selfWebsocket.send(data); - createTweetElement(tweeterID,time,tweet); - getLastTweetCount(tweeterID).then(function(result){ - storeTweet({floID:tweeterID,time:time,data:tweet},result+1); + getLastTweetCount(selfID).then(function(result){ + sendTweetToSuperNode(data,result+1); }).catch(function(error){ console.log(error.message); }); } -function storeTweet(data,id){ +function storeTweet(data,tid){ var idb = indexedDB.open("FLO_Tweet"); idb.onerror = function(event) { console.log("Error in opening IndexedDB!"); @@ -356,14 +421,45 @@ function storeTweet(data,id){ idb.onsuccess = function(event) { var db = event.target.result; var obs = db.transaction("tweets", "readwrite").objectStore("tweets"); - data.id = `${data.time}_${data.floID}`; + data.tweetID = `${data.time}_${data.floID}`; + data.tid = tid; obs.add(data); var obsL = db.transaction("lastTweet", "readwrite").objectStore("lastTweet"); - obsL.put(id,data.floID); + obsL.put(tid,data.floID); db.close(); }; } +function storeMsg(data){ + var idb = indexedDB.open("FLO_Tweet"); + idb.onerror = function(event) { + console.log("Error in opening IndexedDB!"); + }; + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction("messages", "readwrite").objectStore("messages"); + data.msgID = `${data.time}_${data.floID}`; + obs.add(data); + db.close(); + }; +} + +function sendTweetToSuperNode(data,tid){ + kBucketObj.determineClosestSupernode(selfID).then(result=>{ + var superNodeWS = new WebSocket("ws://"+profiles[result[0].floID].onionAddr+"/ws"); + superNodeWS.onopen = function(ev){ + console.log(`Connected to self SuperNode!`); + data = JSON.stringify({newSuperNodeTweet:true,floID:selfID,tid:tid,data:data}) + console.log(data) + superNodeWS.send(data); + }; + superNodeWS.onerror = function(ev) {console.log(`self SuperNode is offline!`);}; + superNodeWS.onclose = function(ev) {console.log(`Disconnected from self SuperNode!`);}; + }).catch(e => { + console.log(e.message); + }); +} + function getFollowinglistFromIDB(){ return new Promise( function(resolve,reject){ @@ -402,7 +498,7 @@ function displayTweetsFromIDB(){ var cursor = event.target.result; if(cursor) { //console.log(cursor.value) - if(cursor.value.floID == tweeterID || following.includes(cursor.value.floID)) + if(cursor.value.floID == selfID || following.includes(cursor.value.floID)) createTweetElement(cursor.value.floID,cursor.value.time,cursor.value.data); cursor.continue(); }else{ @@ -425,7 +521,7 @@ function createTweetElement(floID,time,tweet){ element.innerHTML = `

    ${profiles[floID].name} @${floID}

    -

    ${tweet}

    +

    ${tweet.replace(/\n/g, "
    ")}

    + + + + \ No newline at end of file diff --git a/app/web/msg.js b/app/web/msg.js new file mode 100644 index 0000000..2edd34b --- /dev/null +++ b/app/web/msg.js @@ -0,0 +1,210 @@ +var profiles; +var receiverID,selfID,privKey; +var selfwebsocket,receiverWebSocket,recStat; + +function initMsgs(){ + if( sessionStorage.profiles === undefined || sessionStorage.privKey === undefined || sessionStorage.selfID === undefined || sessionStorage.serverPass === undefined){ + alert("Login credentials failed! Returning to home page!"); + window.location.href = "home.html"; + return; + } + profiles = JSON.parse(sessionStorage.profiles); + console.log(profiles); + privKey = encrypt.retrieveShamirSecret(JSON.parse(sessionStorage.privKey)); + selfID = sessionStorage.selfID; + superNodeList = JSON.parse(sessionStorage.superNodeList); + kBucketObj.launchKBucket().then(function(result){ + console.log(result) + initselfWebSocket(); + readMsgfromIDB().then(function(result){ + listProfiles(); + document.getElementById("sendMsgInput").addEventListener("keyup",function(event){ + if(event.keyCode === 13){ + event.preventDefault(); + sendMsg(); + } + }); + }).catch(function(error){ + console.log(error); + }); + }).catch(function(error){ + console.log(error); + }); +} + +function listProfiles(){ + console.log("listProfiles"); + document.getElementById("profileName").innerHTML=profiles[selfID].name; + document.getElementById("profileFloID").innerHTML='@'+selfID; + var profileList = document.getElementById("profileList"); + profileList.innerHTML = ""; + for (p in profiles){ + var element = document.createElement("div"); + element.setAttribute("class", "media"); + element.innerHTML = `
    +
    ${profiles[p].name}
    + @${p} +
    ` + profileList.appendChild(element); + } +} + +function initselfWebSocket(){ + selfWebsocket = new WebSocket("ws://"+location.host+"/ws"); + selfWebsocket.onopen = function(evt){ + console.log("Connecting"); + var serverPass = encrypt.retrieveShamirSecret(JSON.parse(sessionStorage.serverPass)); + selfWebsocket.send("$"+serverPass); + }; + selfWebsocket.onclose = function(evt){ + console.log("DISCONNECTED"); + }; + selfWebsocket.onmessage = function(evt){ + console.log(evt.data); + if(evt.data[0] == '$') + return; + try{ + data = JSON.parse(evt.data); + if(data.follow && encrypt.verify(selfID, data.sign, profiles[data.floID].pubKey)){ + var idb = indexedDB.open("FLO_Tweet"); + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction("followers", "readwrite").objectStore("followers"); + obs.add(data.sign,data.floID); + db.close(); + }; + selfWebsocket.send(`F${data.floID}-${data.sign}`); + }else if(data.unfollow && encrypt.verify(selfID, data.sign, profiles[data.floID].pubKey)){ + var idb = indexedDB.open("FLO_Tweet"); + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction("followers", "readwrite").objectStore("followers"); + obs.delete(data.floID); + db.close(); + }; + selfWebsocket.send(`U${data.floID}`); + }else if(data.message && data.to == selfID){ + var msg = encrypt.decryptMessage(data.secret,data.pubVal) + if(encrypt.verify(msg,data.sign,profiles[data.from].pubKey)){ + createMsgElement(data.from,data.time,msg,'R') + storeMsg({time:data.time,floID:data.from,text:msg,type:'R'}); + } + } + }catch(error){ + console.log(error.message) + } + }; + selfWebsocket.onerror = function(evt){ + console.log(evt); + }; +} + +function readMsgfromIDB(){ + return new Promise( + function(resolve,reject){ + var disp = document.getElementById("msgsContainer"); + for(floID in profiles){ + var element = document.createElement('div'); + element.setAttribute("id", floID); + element.style.display = 'none'; + disp.appendChild(element); + } + var idb = indexedDB.open("FLO_Tweet"); + idb.onerror = function(event) { + reject("Error in opening IndexedDB!"); + }; + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction("messages", "readwrite").objectStore("messages"); + obs.openCursor().onsuccess = function(event) { + var cursor = event.target.result; + if(cursor) { + createMsgElement(cursor.value.floID,cursor.value.time,cursor.value.text,cursor.value.type); + cursor.continue(); + } else { + console.log('Entries all displayed.'); + resolve("Read Msg from IDB"); + } + }; + db.close(); + }; + } + ); +} + +function changeReceiver(floID){ + try{ + if(receiverID !== undefined) + document.getElementById(receiverID).style.display = 'none'; + if(receiverWebSocket !== undefined && receiverWebSocket.readyState === WebSocket.OPEN) + receiverWebSocket.close(); + }catch(e){ + console.log(e); + } + console.log(floID); + receiverID = floID; + document.getElementById('recipient_floID').innerHTML = `${profiles[receiverID].name}
    @${receiverID}`; + recStat = false; + document.getElementById(receiverID).style.display = 'block'; + try{ + receiverWebSocket = new WebSocket("ws://"+profiles[receiverID].onionAddr+"/ws"); + receiverWebSocket.onopen = function(ev){ recStat = true; }; + receiverWebSocket.onerror = function(ev) { recStat = false;}; + receiverWebSocket.onclose = function(ev) { recStat = false; }; + }catch(e){ + console.log(e); + } +} + +function sendMsg(){ + if(receiverID === undefined){ + alert("Select a contact and send message"); + return; + } + var inp = document.getElementById('sendMsgInput') + var msg = inp.value + inp.value = "" + console.log(msg) + var time = Date.now() + var sign = encrypt.sign(msg,privKey) + var msgEncrypt = encrypt.encryptMessage(msg,profiles[receiverID].pubKey) + var data = JSON.stringify({message:true,from:selfID,to:receiverID,time:time,secret:msgEncrypt.secret,sign:sign,pubVal:msgEncrypt.senderPublicKeyString}); + + if(recStat) + receiverWebSocket.send(data); + else{ + var SNdata = JSON.stringify({viaSuperNodeMsg:true,from:selfID,to:receiverID,data:data}) + sendDataToSuperNode(receiverID,SNdata) + } + console.log(`sentMsg : ${data}`); + createMsgElement(receiverID,time,msg,'S') + storeMsg({time:time,floID:receiverID,text:msg,type:'S'}); +} + +function createMsgElement(floID,time,msg,type){ + var msgField = document.getElementById(floID); + var element = document.createElement("div"); + element.setAttribute("class", "media"); + element.innerHTML = ` +
    +
    + ${msg}
    + ${getTime(time)} +
    +
    `; + msgField.appendChild(element); +} + +function storeMsg(data){ + var idb = indexedDB.open("FLO_Tweet"); + idb.onerror = function(event) { + console.log("Error in opening IndexedDB!"); + }; + idb.onsuccess = function(event) { + var db = event.target.result; + var obs = db.transaction("messages", "readwrite").objectStore("messages"); + data.msgID = `${data.time}_${data.floID}`; + obs.add(data); + db.close(); + }; +} \ No newline at end of file diff --git a/app/web/profile.html b/app/web/profile.html index 6b723f5..4fd9dd7 100644 --- a/app/web/profile.html +++ b/app/web/profile.html @@ -27,7 +27,7 @@ Profiles
  • - Messages + Messages
  • @@ -49,8 +49,7 @@
    -
    - +
    diff --git a/app/web/profile.js b/app/web/profile.js index 66e2406..f32c19f 100644 --- a/app/web/profile.js +++ b/app/web/profile.js @@ -1,7 +1,7 @@ -var profileWebsocket, selfWebsocket; +var profileWebsocket, selfWebsocket,profileServerStatus; var profiles; -var floID, privKey, selfID, serverPass; +var profileID, privKey, selfID; function viewProfile(){ if( sessionStorage.profiles === undefined || sessionStorage.privKey === undefined || sessionStorage.selfID === undefined || sessionStorage.serverPass === undefined){ @@ -11,23 +11,28 @@ function viewProfile(){ } profiles = JSON.parse(sessionStorage.profiles); console.log(profiles); - privKey = sessionStorage.privKey; + privKey = encrypt.retrieveShamirSecret(JSON.parse(sessionStorage.privKey)); selfID = sessionStorage.selfID; - serverPass = sessionStorage.serverPass; var url = new URL(window.location.href); - floID = url.searchParams.get("floID"); - listProfiles(); - displayProfile(floID); + profileID = url.searchParams.get("floID"); + superNodeList = JSON.parse(sessionStorage.superNodeList); + kBucketObj.launchKBucket().then(function(result){ + console.log(result) + listProfiles(); + displayProfile(profileID); + }).catch(function(error){ + console.log(error.message); + }); } -function displayProfile(floID){ - console.log(floID); +function displayProfile(profileID){ + console.log(profileID); var errorMsg; - if(!floID) + if(!profileID) errorMsg = "Select a Profile to display"; - else if(!validateAddr(floID)) + else if(!validateAddr(profileID)) errorMsg = "Invalid FLO ID"; - else if(!(floID in profiles)) + else if(!(profileID in profiles)) errorMsg = "FLO ID not registered to FLO Tweet"; if(errorMsg !== undefined){ @@ -36,15 +41,18 @@ function displayProfile(floID){ } console.log("displayProfile"); - document.getElementById("profileName").innerHTML=profiles[floID].name; - document.getElementById("profileFloID").innerHTML='@'+floID; + document.getElementById("profileName").innerHTML=profiles[profileID].name; + document.getElementById("profileFloID").innerHTML='@'+profileID; initselfWebSocket(); - displayTweetFromIDB(floID).then(function(result){ - connectToX(floID).then(function(result){ + displayTweetFromIDB(profileID).then(function(result){ + connectToX(profileID).then(function(result){ console.log(result); - getTweetsFromX(floID); + profileServerStatus = true; + getTweetsFromX(profileID); }).catch(function(error){ - console.log(error.message); + console.log(error); + pingSuperNodeforNewTweets(profileID); + profileServerStatus = false; }); }).catch(function(error){ console.log(error.message); @@ -76,7 +84,7 @@ function displayTweetFromIDB(floID){ obs.openCursor().onsuccess = function(event) { var cursor = event.target.result; if(cursor) { - console.log(cursor.value) + //console.log(cursor.value) if(cursor.value.floID == floID) createTweetElement(floID,cursor.value.time,cursor.value.data); cursor.continue(); @@ -90,6 +98,22 @@ function displayTweetFromIDB(floID){ ); } +function listProfiles(){ + console.log("listProfiles"); + var profileList = document.getElementById("profileList"); + profileList.innerHTML = ""; + for (p in profiles){ + var element = document.createElement("div"); + element.setAttribute("class", "media"); + element.innerHTML = `
    +
    ${profiles[p].name}
    + @${p} +
    ` + profileList.appendChild(element); + } + //document.getElementById("profileInfo").style.display = "none"; +} + function createTweetElement(floID,time,tweet){ var tweetDisplay = document.getElementById("profileBody"); var element = document.createElement("div"); @@ -97,7 +121,7 @@ function createTweetElement(floID,time,tweet){ element.innerHTML = `

    ${profiles[floID].name} @${floID}

    -

    ${tweet}

    + ${tweet}