@indra.ai/deva 1.1.13 → 1.1.15

package/index.js

@@ -29,8 +29,12 @@ class Deva {
       data: '📀 DATA',
       ask: '🙋‍♀️ ASK',
       cmd: '📟 COMMAND',
-      question: '🙋‍♂️ QUESTION',
-      answer: '🔮 ANSWER',
+      question: '🤖 QUESTION',
+      question_ask: '🤖 SEND QUEATION TO ASK',
+      question_cmd: '🤖 SEND QUESTION TO CMD',
+      queation_answer: '🔮 ANSWER QUESTION',
+      ask_question: '🤖 ASK QUESTION',
+      ask_answer: '🔮 ASK ANSWER',
       talk: '🎙️ TALK',
       listen: '🎧 LISTEN',
       error: '❌ ERROR',
@@ -84,10 +88,10 @@ class Deva {
     - st: The state flag to set for the Deva that matches to this._states
   describe
   ***************/
-  state(st) {
+  state(st, data=false) {
     this._state = this._states[st];
     this.prompt(this._state);
-    this.talk(`${this.agent.id}:state`, this._state);
+    this.talk(`${this.agent.key}:state`, data);
   }
 
   // Called from the init function to bind the elements defined in the this.bind variable.
@@ -336,6 +340,7 @@ class Deva {
   ***************/
   ask(packet) {
     if (!this._active) return Promise.resolve(this.messages.offline);
+    this.state('ask_question', packet);
 
     packet.a = {
       agent: this.agent || false,
@@ -370,8 +375,9 @@ class Deva {
         else {
           packet.a.text = result;
         }
+
+        this.state('ask_answer', packet);
         this.talk(`${this.agent.key}:ask:${packet.id}`, packet);
-        this.state('wait');
       }).catch(err => {
         this.talk(`${this.agent.key}:ask:${packet.id}`, {error:err.toString()});
         return this.error(err, packet);
@@ -396,16 +402,14 @@ class Deva {
   question(TEXT=false, DATA=false) {
     if (!this._active) return Promise.resolve(this.messages.offline);
 
-    this.state('question');                 // set the state to question.
-
     const id = this.uid();                            // generate a unique transport id for the question.
     const t_split = TEXT.split(' ');
 
     // check to see if the string is an #ask string to talk to the other Deva.
-    const isAsk = t_split[0].startsWith(this.askChr) ? t_split[0].substring(1) : false;
+    const isAsk = t_split[0].startsWith(this.askChr);
 
     // check to see if the string is a command string to run a local method.
-    const isCmd = t_split[0].startsWith(this.cmdChr) ? t_split[0].substring(1) : false;
+    const isCmd = t_split[0].startsWith(this.cmdChr);
 
     // Format the packet for return on the request.
     const orig = TEXT;
@@ -433,15 +437,16 @@ class Deva {
         // #agent method:param1:param2 with text strings for proccessing
         // !method param:list:parse for the local agent
         // if is an ask then we format one way
+        let _state = 'question';
         if (isAsk) {
-          this.state('ask');
+          _state = 'question_ask'
+          key = t_split[0]substring(1);
           params = t_split[1] ? t_split[1].split(':') : false;
           method = params[0];
           text = t_split.slice(2).join(' ').trim();
-          key = isAsk;
         }
         else if (isCmd) {
-          this.state('cmd');
+          _state = 'question_cmd'
           params = t_split[1] ? t_split[1].split(':') : false;
           method = isCmd;
           text = t_split.slice(1).join(' ').trim()
@@ -463,18 +468,20 @@ class Deva {
 
         // hash the packet and insert the hash into the packet meta object.
         packet.q.meta.hash = this.hash(JSON.stringify(packet.q));
+        this.state(_state, packet);
 
         // If a question to another Deva with '#' then trigger events
         if (isAsk) {
-          this.talk(`${isAsk}:ask`, packet);
-          this.once(`${isAsk}:ask:${packet.id}`, answer => {
+          this.talk(`${key}:ask`, packet);
+          this.once(`${key}:ask:${packet.id}`, answer => {
             return resolve(answer);
           });
         }
         // if the user sends a local command '$' then it will ask of the self.
         else {
-          this.state('answer');
-          if (typeof this.methods[method] !== 'function') return resolve(this._methodNotFound(packet));
+          if (typeof this.methods[method] !== 'function') {
+            return resolve(this._methodNotFound(packet));
+          }
           this.methods[method](packet).then(result => {
             const text = typeof result === 'object' ? result.text : result;
             const html = typeof result === 'object' ? result.html : result;
@@ -497,7 +504,6 @@ class Deva {
             // create a hash for entire packet and insert into packet
             packet.hash = this.hash(JSON.stringify(packet));
 
-            this.talk(`log`, packet);
             return resolve(packet);
           }).catch(err => {
             return this.error(err, packet);
@@ -535,7 +541,7 @@ class Deva {
         return this._assignListeners();
       }).then(() => {
         this.state('init');
-        return this.onInit && typeof this.onInit === 'function' ? this.onInit() : this.start();
+        return this.onInit && typeof this.onInit === 'function' ? this.onInit() : this.start(this._state);
       }).then(started => {
         return resolve(started)
       }).catch(err => {
@@ -549,10 +555,10 @@ class Deva {
   // e: is the error to pass into the interface.
   // packet: the packet that caused the error.
   error(err,packet=false,reject=false) {
-    this.state('error');
+    this.state('error', err);
+    if (this.onError && typeof this.onError === 'function') ? return this.onError(err, packet, reject);
     console.error(err)
-    if (this.onError) return this.onError(err, packet, reject);
-    return reject ? reject(err) : false;
+    return reject ? reject(err) : err;
   }
 
   /**************
@@ -566,7 +572,7 @@ class Deva {
   start() {
     if (!this._active) return;
     this.state('start');
-    return this.onStart && typeof this.onStart === 'function' ? this.onStart() : this.enter();
+    return this.onStart && typeof this.onStart === 'function' ? this.onStart() : this.enter(this._state);
   }
 
   /**************
@@ -583,7 +589,7 @@ class Deva {
     if (!this._active) return Promise.resolve(this.messages.offline);
     this.state('stop');
     this._active = false;
-    return this.onStop && typeof this.onStop === 'function' ? this.onStop() : this.exit();
+    return this.onStop && typeof this.onStop === 'function' ? this.onStop() : this.exit(this._state);
   }
 
   /**************
@@ -598,7 +604,7 @@ class Deva {
   enter() {
     if (!this._active) return Promise.resolve(this.messages.offline);
     this.state('enter');
-    return this.onEnter && typeof this.onEnter === 'function' ? this.onEnter() : this.done(this.state)
+    return this.onEnter && typeof this.onEnter === 'function' ? this.onEnter() : this.done(this._state)
   }
 
   /**************

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indra.ai/deva",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "The Deva Core",
   "main": "index.js",
   "scripts": {