@indra.ai/deva 1.1.82 → 1.1.84

package/config.json

@@ -13,6 +13,18 @@
       "lib",
       "_agent"
     ],
+    "events": {
+      "prompt": "devacore:prompt",
+      "error": "devacore:error",
+      "question": "devacore:question",
+      "answer": "devacore:answer",
+      "state": "devacore:state",
+      "zone": "devacore:zone",
+      "action": "devacore:action",
+      "feature": "devacore:feature",
+      "load": "devacore:load",
+      "unload": "devacore:unload"
+    },
     "state": "offline",
     "states": {
         "ask": "asking another",

package/index.js

@@ -61,6 +61,7 @@ class Deva {
     this._messages = {
       notext: 'NO TEXT WAS PROVIDED',
       nopacket: 'NO PACKET WAS PROVIDED',
+      method_not_found: 'METHOD NOT FOUND',
     }; // set the messages from config
 
     // then here we are going to loop the messages config to make sure custom values are set
@@ -772,7 +773,8 @@ class Deva {
         packet.q.meta.hash = this.hash(packet.q);
 
         this.action(_action);
-        this.talk('devacore:question', this.copy(packet));         // global question event make sure to copy data.
+        this.talk(`${key}:question`, this.copy(packet)); // key question event make sure to copy data.
+        this.talk(config.events.question, this.copy(packet)); // global question event make sure to copy data.
 
         if (isAsk) {                                      // isAsk check if the question isAsk and talk
           this.state('ask');
@@ -851,7 +853,8 @@ class Deva {
 
 
       this.action('answer_talk');
-      this.talk('devacore:answer', this.copy(packet));             // talk the answer with a copy of the data
+      this.talk(`${agent.key}:answer`, this.copy(packet)); // agent key answer event
+      this.talk(config.events.answer, this.copy(packet)); // global talk event
 
       return resolve(this.copy(packet));                             // resolve the packet to the caller.
     }).catch(err => {                                     // catch any errors in the method
@@ -880,8 +883,8 @@ class Deva {
     this.state('ask');
     this.action('ask');
 
-    const agent = this.agent() || false;
-    const client = this.client() || false;
+    const agent = this.agent();
+    const client = this.client();
     // build the answer packet from this model
     packet.a = {
       agent,
@@ -901,8 +904,7 @@ class Deva {
       if (typeof this.methods[packet.q.meta.method] !== 'function') {
         return setImmediate(() => {
           this.action('invalid')
-          packet.a.text = `INVALID METHOD (${packet.q.meta.method})`;
-          this.talk(`${this._agent.key}:ask:${packet.id}`, packet);
+          this.talk(`${this._agent.key}:ask:${packet.id}`, this._methodNotFound(packet));
         });
       }
 
@@ -918,16 +920,17 @@ class Deva {
           packet.a.text = result;
         }
         this.action('ask_answer');
-        this.talk(`${this._agent.key}:ask:${packet.id}`, packet);
+        this.talk(`${agent.key}:answer`, this.copy(packet));
+        this.talk(`${agent.key}:ask:${packet.id}`, packet);
       }).catch(err => {
         this.action('error');
-        this.talk(`${this._agent.key}:ask:${packet.id}`, {error:err});
+        this.talk(`${agent.key}:ask:${packet.id}`, {error:err});
         return this.error(err, packet);
       })
     }
     catch (e) {
       this.action('error');
-      this.talk(`${this._agent.key}:ask:${packet.id}`, {error:e});
+      this.talk(`${agent.key}:ask:${packet.id}`, {error:e});
       return this.error(e, packet)
     }
     // now when we ask the meta params[0] should be the method
@@ -1166,7 +1169,7 @@ class Deva {
         created: Date.now(),
       };
       _data.hash = this.hash(_data);
-      this.talk('devacore:state', _data);
+      this.talk(config.events.state, _data);
     } catch (e) {
       return this.error(e);
     }
@@ -1202,7 +1205,7 @@ class Deva {
         created: Date.now(),
       };
       _data.hash = this.hash(_data);
-      this.talk('devacore:zone', _data);
+      this.talk('', _data);
     } catch (e) {
       return this.error(e);
     }
@@ -1229,7 +1232,7 @@ class Deva {
         created: Date.now(),
       };
       _data.hash = this.hash(_data);
-      this.talk('devacore:action', _data);
+      this.talk(config.events.action, _data);
     } catch (e) {
       return this.error(e)
     }
@@ -1256,7 +1259,7 @@ class Deva {
         created: Date.now(),
       };
       _data.hash = this.hash(_data);
-      this.talk('devacore:feature', _data);
+      this.talk(config.events.feature, _data);
     } catch (e) {
       return this.error(e);
     }
@@ -1515,7 +1518,7 @@ class Deva {
     return new Promise((resolve, reject) => {
       this.state('load');
       this.devas[key].init(client).then(loaded => {
-        this.talk(`devacore:load`, {
+        this.talk(config.events.load, {
           id:this.uid(true),
           key,
           created: Date.now(),
@@ -1539,11 +1542,7 @@ class Deva {
         this.state('uload');
         this.devas[key].stop().then(exit => {
           delete this.devas[key];
-          this.talk(`devacore:unload`, {
-            id:this.uid(true),
-            key,
-            created: Date.now(),
-          });
+          this.talk(config.events.unload, key);
         });
         return resolve(this._messages.states.unload);
       } catch (e) {
@@ -1678,7 +1677,7 @@ class Deva {
       text,
       created: Date.now(),
     }
-    return this.talk('devacore:prompt', _data);
+    return this.talk(config.events.prompt, _data);
   }
 
 
@@ -1841,7 +1840,7 @@ class Deva {
       data,
       created: Date.now(),
     }
-    this.talk('devacore:error', this.copy(_data));
+    this.talk(config.events.error, this.copy(_data));
 
     const hasOnError = this.onError && typeof this.onError === 'function' ? true : false;
     if (hasOnError) return this.onError(err, data, reject);

package/package.json

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