i2p example, secure config examle tweak, downgrade ncc

Author: sevenbitbyte

examples/i2p-host.js

@@ -0,0 +1,89 @@
+const Path = require('path')
+const debug = require('debug')('test.server-db')
+const Dataparty = require('../src')
+const dataparty_crypto = require('@dataparty/crypto')
+
+class ExampleService extends Dataparty.IService {
+  constructor(opts){
+    super(opts)
+
+    this.addMiddleware(Dataparty.middleware_paths.pre.decrypt)
+    this.addMiddleware(Dataparty.middleware_paths.pre.validate)
+
+    this.addMiddleware(Dataparty.middleware_paths.post.validate)
+    this.addMiddleware(Dataparty.middleware_paths.post.encrypt)
+
+    this.addEndpoint(Dataparty.endpoint_paths.echo)
+    this.addEndpoint(Dataparty.endpoint_paths.secureecho)
+    this.addEndpoint(Dataparty.endpoint_paths.identity)
+    this.addEndpoint(Dataparty.endpoint_paths.version)
+
+    this.addSchema(Path.join(__dirname, './party/schema/basic_types.js'))
+  }
+
+}
+
+async function main(){
+
+  
+  //const uri = 'mongodb://localhost:27017/server-party-test'
+  //debug('db location', uri)
+
+  
+  const service = new ExampleService({ name: '@dataparty/example', version: '0.0.1' })
+  const build = await service.compile(Path.join(__dirname,'/dataparty'), true)
+  
+  const serviceName = build.package.name
+  const basePath = '/data/dataparty/'
+  const servicePath = Path.join(basePath, serviceName.replace('/','-'))
+
+  let config = new Dataparty.Config.JsonFileConfig({ basePath: servicePath })
+  config.touchDir('/tingo')
+
+  const dbPath = Path.join(servicePath, '/tingo')
+
+  let party = new Dataparty.TingoParty({
+    config,
+    path: dbPath,
+    model: build
+  })
+
+  party.topics = new Dataparty.LocalTopicHost()
+
+  const live = new Dataparty.IService(build.package, build)
+
+  
+  const runner = new Dataparty.ServiceRunnerNode({
+    party,
+    //prefix: 'foo',
+    service: live,
+    sendFullErrors: false,
+    useNative: false
+  })
+
+  
+  
+  
+  const runnerRouter = new Dataparty.RunnerRouter(runner)
+  
+  
+  const host = new Dataparty.ServiceHost({
+    runner: runnerRouter,
+    trust_proxy: true,
+    wsEnabled: true,
+    i2pEnabled: true
+  })
+  
+  debug(runner.party.identity)
+  await party.start()
+  await runnerRouter.start()
+  await host.start()
+
+  console.log('started')
+}
+
+
+
+main().catch(err=>{
+  console.error(err)
+})

examples/secure-config.js

@@ -15,7 +15,8 @@ async function main(){
 
 
     secureConfig = new Dataparty.Config.SecureConfig({
-        config: jsonConfig
+        config: jsonConfig,
+        //timeoutMs: 15*1000
     })
 
 
@@ -124,7 +125,7 @@ async function main(){
 
         console.log('timer config', await secureConfig.readAll())
 
-    }, 30000)
+    }, 1000*60*6)
 
 }
 

examples/test-service-node-host.js

@@ -34,7 +34,7 @@ async function main(){
   const build = await service.compile(Path.join(__dirname,'/dataparty'), true)
 
   const serviceName = build.package.name
-  const basePath = '/data/datparty/'
+  const basePath = '/data/dataparty/'
   const servicePath = Path.join(basePath, serviceName.replace('/','-'))
 
   let config = new Dataparty.Config.JsonFileConfig({ basePath: servicePath })
@@ -80,7 +80,7 @@ async function main(){
 
   console.log('started')
 
-  process.exit()
+  //process.exit()
 }
 
 

package.json

@@ -64,6 +64,7 @@
     "@diva.exchange/i2p-sam": "^4.1.8",
     "@markwylde/liferaft": "^1.3.4",
     "@vercel/ncc": "^0.36.1",
+    "@zeit/ncc": "^0.22.3",
     "ajv": "6.9.1",
     "axios": "^0.27.2",
     "bleno": "npm:@abandonware/bleno@^0.5.1-4",

src/config/secure-config.js

@@ -8,11 +8,12 @@ const reach = require('../utils/reach')
 const IConfig = require('./iconfig')
 
 const PASSWORD_HASHING_ROUNDS = 1000000
+const DEFAULT_TIMEOUT_MS = 5*60*1000 //! 5min
 
 class SecureConfig extends IConfig {
     constructor({
         id = 'secure-config',
-        config, timeoutMs=15*1000, includeActivity=true
+        config, timeoutMs=DEFAULT_TIMEOUT_MS, includeActivity=true
     }){
         super()
         this.id = id || 'secure-config'
@@ -22,7 +23,7 @@ class SecureConfig extends IConfig {
         this.identity = null
         this.timer = null
         this.lastActivity = null
-        this.timeoutMs = timeoutMs || 15*1000
+        this.timeoutMs = timeoutMs || DEFAULT_TIMEOUT_MS
         this.includeActivity = includeActivity || true
 
         this.blocked = false
@@ -58,8 +59,19 @@ class SecureConfig extends IConfig {
         const salt = await dataparty_crypto.Routines.generateSalt()
         const rounds = PASSWORD_HASHING_ROUNDS
 
+
+        await this.config.write('salt', salt.toString('hex'))
+        await this.config.write('rounds', rounds)
+
         let key = await dataparty_crypto.Routines.createKeyFromPassword(password, salt, rounds)
 
+        await this.setIdentity(key)
+    }
+
+    async setIdentity(key){
+        debug('setIdentity')
+        if(await this.isInitialized()){ throw new Error('already initialized') }
+
         const pwIdentity = new dataparty_crypto.Identity({
             key,
             id: this.id,
@@ -69,9 +81,6 @@ class SecureConfig extends IConfig {
 
         await initialContent.encrypt(pwIdentity, pwIdentity.toMini())
 
-        await this.config.write('salt', salt.toString('hex'))
-        await this.config.write('rounds', rounds)
-        //await this.config.write('identity', pwIdentity.toJSON())
         await this.config.write('content', initialContent.toJSON())
 
         debug('\t', 'identity', pwIdentity)
@@ -142,7 +151,9 @@ class SecureConfig extends IConfig {
 
         this.identity = pwIdentity
 
-        this.timer = setTimeout(this.onTimeout.bind(this), this.timeoutMs)
+        if(this.timeoutMs >= 0){
+            this.timer = setTimeout(this.onTimeout.bind(this), this.timeoutMs)
+        }
 
         this.emit('unlocked')
     }
@@ -176,7 +187,11 @@ class SecureConfig extends IConfig {
         }
 
         clearTimeout(this.timer)
-        this.timer = setTimeout(this.onTimeout.bind(this), this.timeoutMs)
+
+        if(this.timeoutMs >= 0){
+            this.timer = setTimeout(this.onTimeout.bind(this), this.timeoutMs)
+        }
+        this.lastActivity = Date.now()
     }
 
     async clear(){ 

src/service/iservice.js

@@ -1,6 +1,7 @@
 const fs = require('fs')
 const Path = require('path')
-const NCC = require('@vercel/ncc')
+//const NCC = require('@vercel/ncc')
+const NCC = require('@zeit/ncc')
 const Hoek = require('@hapi/hoek')
 const {JSONPath} = require('jsonpath-plus')
 const gitRepoInfo = require('git-repo-info')

src/service/service-host.js

@@ -8,6 +8,8 @@ const bodyParser = require('body-parser')
 const expressListRoutes = require('express-list-routes')
 const debug = require('debug')('dataparty.service.host')
 
+const reach = require('../utils/reach')
+
 const ServiceHostWebsocket = require('./service-host-websocket')
 
 const Pify = async (p)=>{
@@ -24,7 +26,7 @@ class ServiceHost {
    * @param {string} options.listenUri      The uri of the host interface to tell express to listen on. Defaults to `http://0.0.0.0:4001
    * @param {boolean} options.i2pEnabled    When true, this server will be available over i2p
    * @param {string} options.i2pSamHost     The hostname of the i2p SAM control API. Defaults to `127.0.0.1`
-   * @param {Integer} options.i2pSamPort    The port of the i2p SAM control API. Defaults to `4444`
+   * @param {Integer} options.i2pSamPort    The port of the i2p SAM control API. Defaults to `7654`
    * @param {string} options.i2pKey         When set this i2p key will be used to host the service. If not set a new i2p key will be generated. Defaults to `null`
    * @param {boolean} options.wsEnabled     When true the server will host a dataparty websocket service. Defaults to `true`
    * @param {Integer} options.wsPort        Port for the websocket service to listen on. Defaults to `null`, using the same port as the http server.
@@ -38,7 +40,7 @@ class ServiceHost {
     listenUri = 'http://0.0.0.0:4001',
     i2pEnabled = false,
     i2pSamHost = '127.0.0.1',
-    i2pSamPort = 4444,
+    i2pSamPort = 7656,
     i2pKey = null,
     wsEnabled = true,
     wsPort = null,
@@ -107,8 +109,8 @@ class ServiceHost {
           privateKey: reach(i2pKey, 'privateKey')
         },
         forward: {
-          host: this.apiServerUri.host,
-          port: this.apiServerUri.port
+          host: '127.0.0.1', //this.apiServerUri.host,
+          port: 4001 //this.apiServerUri.port
         }
       }
     }
@@ -178,17 +180,30 @@ class ServiceHost {
     }
 
     if(this.i2pEnabled && this.i2p == null){
-      debug('starting i2p forward')
+      debug('starting i2p forward', this.i2pSettings)
       const SAM = require('@diva.exchange/i2p-sam')
 
       this.i2p = await SAM.createForward(this.i2pSettings)
-      this.i2pUri = this.i2p.getPublicKeys()
+      this.i2pUri = this.i2p.getB32Address()
       this.i2pSettings.privateKey = null  // clear no longer needed
 
+
+
       this.i2p.on('error', this.reportI2pError.bind(this))
 
+
+      this.i2p.on('close', ()=>{
+        debug('i2p closed')
+      })
+
+      this.i2p.on('data', (data)=>{
+        debug('i2p data')
+        debug(data.toString())
+      })
+
       debug('i2p started')
-      debug('\t','address', this.i2pUri)
+      debug('\t', 'address', this.i2pUri)
+      debug('\t', 'key', this.i2p.getPublicKey())
     }
   }
 

src/service/service-runner-node.js

@@ -151,12 +151,14 @@ class ServiceRunnerNode {
 
     if(!this.useNative){
       const build = Hoek.reach(this.service, `compiled.endpoints.${name}`)
+      //debug('build', build)
       endpoint = eval(build.code/*, build.map*/)
     }
     else{
       endpoint = this.service.constructors.endpoints[name]
     }
 
+    debug('endpoint', endpoint)
 
     debug('endpoint info', endpoint.info)
 
@@ -265,7 +267,7 @@ class ServiceRunnerNode {
    * @returns 
    */
   async onRequest(req, res){
-    debug('onRequest', req)
+    debug('onRequest')
 
     debug('req', req.method, req.hostname,'-', req.url, req.ips, req.body)