tweak secure config events

Author: sevenbitbyte

examples/secure-config.js

@@ -3,6 +3,7 @@ const Dataparty = require('../src/index')
 
 const prompt = require('prompt')
 
+let secureConfig = null
 
 async function main(){
     const memoryConfig = new Dataparty.Config.MemoryConfig({foo: 'bar'})
@@ -13,8 +14,8 @@ async function main(){
     })
 
 
-    const secureConfig = new Dataparty.Config.SecureConfig({
-        config: memoryConfig
+    secureConfig = new Dataparty.Config.SecureConfig({
+        config: jsonConfig
     })
 
 
@@ -41,6 +42,7 @@ async function main(){
         if(await secureConfig.isInitialized() && secureConfig.isLocked()){
 
             if(blocked){
+                console.log('blocked true')
                 await secureConfig.waitForUnlocked()
                 return
             }
@@ -94,38 +96,40 @@ async function main(){
             console.log("passwords don't match")
         }
 
-        secureConfig.setPassword(password, {
+        await secureConfig.setPassword(password, {
             foo: 'bar'
         })
 
+        console.log('password set')
+
+
+        await secureConfig.unlock(password)
+
     })
 
+    console.log('starting')
+
     await secureConfig.start()
 
+    console.log('wait for startup')
+
     await secureConfig.waitForUnlocked('startup')
 
     console.log('wait over')
 
     console.log('main config', await secureConfig.readAll())
 
-    setTimeout(async ()=>{
+    let timer = setTimeout(async ()=>{
 
 
         console.log('timer config', await secureConfig.readAll())
 
     }, 30000)
 
-    //process.exit()
 }
 
 main().catch((err)=>{
     console.error('crashed', err)  
 }).then(()=>{
     console.log('done')
 })
-
-
-/*
-setTimeout(function () {
-    process.exit();
-}, 5000);*/

src/config/secure-config.js

@@ -24,6 +24,8 @@ class SecureConfig extends IConfig {
         this.lastActivity = null
         this.timeoutMs = timeoutMs || 15*1000
         this.includeActivity = includeActivity || true
+
+        this.blocked = false
     }
 
     async start(){
@@ -78,30 +80,32 @@ class SecureConfig extends IConfig {
 
         await this.config.save()
 
-        this.emit('ready')
-
+        
         const contentMsg = new dataparty_crypto.Message( initialContent )
-
-        console.log('msg', contentMsg)
-
         //! Verify message
         await contentMsg.decrypt(pwIdentity)
+        this.emit('ready')
     }
 
     async waitForUnlocked(reason){
-
 
         if(!this.isLocked()){
             return
         }
 
         debug('waitForUnlocked', reason)
 
-        this.emit('blocked', reason)
+        if(!this.blocked){
+            this.emit('blocked', reason)
+        }
+
+        this.blocked = true
+
 
         let waiting = new Promise((resolve,reject)=>{
 
             this.once('unlocked', ()=>{
+                this.blocked = false
                 resolve()
                 debug('waitForUnlocked - done')
             })
@@ -121,26 +125,18 @@ class SecureConfig extends IConfig {
         let salt = Buffer.from(await this.config.read('salt'),'hex')
         let rounds = await this.config.read('rounds')
 
-        console.log('salt', salt)
-        console.log('rounds', rounds)
-
         let key = await dataparty_crypto.Routines.createKeyFromPassword(password, salt, rounds)
 
         const pwIdentity = new dataparty_crypto.Identity({
             key,
             id: this.id
         })
 
-        console.log(pwIdentity)
 
         this.content = await this.config.read('content')
 
-        console.log('content', this.content, typeof this.content)
-
         const contentMsg = new dataparty_crypto.Message( this.content )
 
-        console.log('msg', contentMsg)
-
         //! Verify message
         await contentMsg.decrypt(pwIdentity)