feat: Better DB - Use ephermal id for testing

mkg20001 · Dec 16, 2017 · 58b425d · 58b425d
1 parent 7f442c2
commit 58b425d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -20,7 +20,9 @@ const NodeTrust = require('./src')
 
 map(require('./test/ids.json'), Id.createFromJSON, (e, ids) => {
   if (e) throw e
-  const peer = new Peer(ids[1])
+  Id.create((e, id) => {
+  if (e) throw e
+  const peer = new Peer(id)
 
   listen.forEach(addr => peer.multiaddrs.add(addr))
 
@@ -69,4 +71,5 @@ map(require('./test/ids.json'), Id.createFromJSON, (e, ids) => {
       })
     })
   })
+  })
 })
diff --git a/server/src/config.dev.json b/server/src/config.dev.json
@@ -1,6 +1,5 @@
 {
   "zone": "node.libp2p",
-  "expire": 20000,
   "id": {
     "id": "QmRQuY14GoeyDx5DoFWq9xnCteSz6pWFKcopvJspei5LXa",
     "privKey": "CAASqQkwggSlAgEAAoIBAQDXW+yHJxrvsOVh6EqNowW0CNMZLvDX8Ai+Sy3zDf8LmgOtZaGvQW/5A07peETcYf/pBCw8p2eqZwzouVxXbPteYnGbLX5AV8edzb98PDIRFAb7tInRbzWcaIC6Bwh5hjiUC4smf2ZEuZl0St9zDGYFGYEPam6HSvIph1RfDPbMXU6X+AIqMXKiArc5K43BpEblNht432xR9ywDQUkJuoXM1NkERCjsE0VkO29MZ2IFM9yUp02JqGKNeubgwOsbfmbXsg715aiWoTiT6lTBJ5bgtydE56YO5jaKVuHsQw9u/QoqdygK6N9mK9vK/KANuveLOpQI9tXchHYwV1aY7VdFAgMBAAECggEBAKMTDoZBDFqYHvoGhf2+hmEPlZoqO2God1ZxYzf7Tzefxk0U+lvVN07ePHD6C1q+MqRl7oF3Wj5kjhfj1JK3CZks/k29Iy7hyVwrImaWxmq8OZV73ihjB7uKPn+fN8Gd61Xfb90U94Hu8M5oq89YgiA2cc4Uj+GO1NSxjyfyjyer0z/nOkQRCFgwh5NKxm8rxWHfDdwn3ftjwZglx9cRj3pwZ6g04Cga7HiQMEgZ3LRmwRVHKancqkqfT5woTgzR+8SpGJ4wu+8QVBcHPUWj91Rmt3jm3cLdH4/BBAIIY1RE23k6srWJw7axZOLOJKwgRJDM+qHr4LkYTAn89CoTggECgYEA/s2HqUK9O3S8+0Gf9oUM61GPQBqo8mzEjkeiXF1n2pKr+M0xavtCwj2fWrShpOiIKdXUyM3ANJya+aBDQ4/FPvOjFDGSR0ToQttcWdM+noXq+x6C4yiN/8U533mUKhlG+XzosH7PIaASDVLgKUV57GmbUIEuMEXHruhTHoh+OUECgYEA2F7zvFBPnk+yQGDkYbtrT5RpuqK9qU55ujLO2QuleL7Jm0hvK+/z3cTpuR6Lfn7nPcTl27vCxMLSJvLC/sBEuTcY02u+7PvclD9iBGVdvsXL9NoWBw5xYBXyBOXnQGQKcLhWSlDI4REHWezlcfkZ3Zicx8AqHB4nxaEMbkFG+QUCgYEAnkIHzaBPKluSeThEY3g2Ev6AS9+DKbdWycxCUr4NIBvTRmAkHn9a8owVqt/gOi3XTKysUeBBTiwqsXrR7GeiqjvnAUbcxPlOjR/0FzJ2hT1GOpyzzOVGdSMJk/zOgutaQuFLITxR6F+kdrQP2HJ3jNf3CKSDjKX6pW9VGPTL+UECgYEAg/HbVoHvG45kGAg+HS8qcHwDwbGOURmu95IWO5tzi99kmBIi4TtRjnKPSLlMvZXrs+pHdajZTB22A9RUfv+GqR/lPsBczK2GRM0mG6Io+bYq+ySm/CSdlMetL7l3PPgEudpfnLAI397/iaICBW+vi0eOi+0ugLkO7eCY8P9TpXUCgYAC87u6cHeNecWIjBEsZHoadOYXZTpQIZsVE2c1apcMFp8+xu89Jl4TM4iHYzuzpBuW9q/X7ZYAE35zUpR1iOE1YbWH3nXYj1JCYTuhFS+7acJ4bNfs7qy6AKCbqiw2fv9SNpY0gMn8Y/vLx6FQdzxU2AE8URANgSTA8pA9DaqVEQ==",

diff --git a/server/src/db/index.js b/server/src/db/index.js
@@ -0,0 +1,44 @@
+'use strict'
+
+const EE = require('events').EventEmitter
+
+class DB extends EE {
+  constructor (opt) {
+    super()
+    this.data = {}
+    this.maxAge = opt.maxAge
+    this.last_used = {}
+    setInterval(this._loop.bind(this), 100)
+  }
+  get (key) {
+    if (!this.data[key]) return false
+    this.last_used[key] = new Date().getTime()
+    return this.data[key]
+  }
+  get keys() {
+    return Object.keys(this.data)
+  }
+  peek (key) {
+    return this.data[key] || false
+  }
+  set (key, value) {
+    this.data[key] = value
+    this.last_used[key] = new Date().getTime()
+  }
+  remove (key) {
+    delete this.last_used[key]
+    return delete this.data[key]
+  }
+  _loop () {
+    const curTime = new Date().getTime()
+    const evictTime = curTime - this.maxAge
+    for (const key in this.data) {
+      if (this.last_used[key] <= evictTime) {
+        this.emit('evict', {key, value: this.data[key]})
+        this.remove(key)
+      }
+    }
+  }
+}
+
+module.exports = DB
diff --git a/server/src/dns/index.js b/server/src/dns/index.js
@@ -15,7 +15,7 @@ const toDNS = {
 
 module.exports = (swarm, config) => {
   let dns
-  const nameRegEx = new RegExp('^ci[a-z]{53}\\.' + swarm.zone.replace(/\./g, '\\.') + '$', 'mi')
+  const nameRegEx = new RegExp('^ci[a-z0-9]+\\.' + swarm.zone.replace(/\./g, '\\.') + '$', 'mi')
   const {db, dnsDB} = swarm
   db.on('evict', ({key}) => {
     dnsDB.remove(key)
@@ -75,7 +75,6 @@ module.exports = (swarm, config) => {
         (id, cb) => {
           swarm.getCN(id, (err, name) => {
             if (err) return cb(err)
-            dns += '.'
             cb(null, name)
           })
         },

diff --git a/server/src/index.js b/server/src/index.js
@@ -13,7 +13,7 @@ const SECIO = require('libp2p-secio')
 
 const protos = require('./protos')
 
-const LRU = require('lru')
+const DB = require('./db')
 
 module.exports = function NodetrustServer (config) {
   const self = this
@@ -52,9 +52,9 @@ module.exports = function NodetrustServer (config) {
     max: 1000000,
     maxAge: config.expire || 5 * 60 * 1000
   }
-  swarm.db = new LRU(swarm.dbParam)
-  swarm.discoveryDB = new LRU(swarm.dbParam)
-  swarm.dnsDB = new LRU(swarm.dbParam)
+  swarm.db = new DB(swarm.dbParam)
+  swarm.discoveryDB = new DB(swarm.dbParam)
+  swarm.dnsDB = new DB(swarm.dbParam)
 
   require('./ca')(swarm, config.ca)
   require('./dns')(swarm, config.dns)