@indra.ai/deva 1.1.14 → 1.1.16

package/examples/hello-world.js

@@ -5,6 +5,7 @@ const Deva = require('../index');
 const HelloWorld = new Deva({
   client: {
     id: 100,
+    key: 'hello',
   },
   agent: {
     id: 101,
@@ -37,11 +38,11 @@ const HelloWorld = new Deva({
     hello: 'Hello World'
   },
   listeners: {
-    '101:state'(st) {
-      console.log(`current state: ${st}`);
+    'hello:state'(packet) {
+      console.log(packet.state);
     },
-    'log'(packet) {
-      console.log('logger', packet);
+    'prompt'(text) {
+      console.log(text);
     }
   },
   deva: {},
@@ -65,7 +66,8 @@ const HelloWorld = new Deva({
 HelloWorld.init().then(done => {
   return HelloWorld.question('/state how are you')
 }).then(answer => {
-  console.log('ANSWER', answer.a.text);
+  // console.log(answer);
+  console.log(answer.a.text);
 });
 
 

package/index.js

@@ -9,6 +9,30 @@ class Deva {
     opts = opts || {};
     this._id = randomUUID();                             // the unique id assigned to the agent at load
     this._state = 'OFFLINE';                             // current state of agent.
+    this._active = false;                               // the active/birth date.
+    this.security = false;                              // inherited Security features.
+    this.support = false;                               // inherited Support features.
+    this.config = opts.config || {};                    // local Config Object
+    this.events = opts.events || new EventEmitter({});  // Event Bus
+    this.lib = opts.lib || {};                          // used for loading library functions
+    this.agent = opts.agent || false;                   // Agent profile object
+    this.client = opts.client || false;                 // Client profile object
+    this.devas = opts.devas || {};                      // Devas which are loaded
+    this.vars = opts.vars || {};                        // Variables object
+    this.listeners = opts.listeners || {};              // local Listeners
+    this.modules = opts.modules || {};                  // 3rd Party Modules
+    this.func = opts.func || {};                        // local Functions
+    this.methods = opts.methods || {};                  // local Methods
+    this.maxListeners = opts.maxListenners || 0;        // set the local maxListeners
+
+    for (var opt in opts) {
+      if (!this[opt]) this[opt] = opts[opt];            // set any remaining opts to this.
+    }
+
+    this.cmdChr = '/';
+    this.askChr = '#';
+    this.inherit = ["events", "config", "lib", "security", "client"];
+    this.bind = ["listeners", "methods", "func", "lib", "security", "agent", "client"];
     this._states = {                                    // The available states to work with.
       offline: '👻 OFFLINE',
       online: '📡 ONLINE',
@@ -29,11 +53,13 @@ class Deva {
       data: '📀 DATA',
       ask: '🙋‍♀️ ASK',
       cmd: '📟 COMMAND',
-      question: '🙋‍♂️ QUESTION',
-      answer: '🔮 ANSWER',
-      answer_ask: '🔮 ANSWER ASK',
-      answer_cmd: '🔮 ANSWER CMD',
-      answer_question: '🔮 ANSWER QUESTION',
+      question: '🐵 QUESTION',
+      question_ask: '🧙‍♂️ QUESTION ASK',
+      question_cmd: '🪄 QUESTION CMD',
+      question_answer: '🔮 QUESTION ANSWER',
+      ask_question: '👽 ASK QUESTION',
+      ask_answer: '🛸 ASK ANSWER',
+      method_not_found: '😩 METHOD NOT FOUND',
       talk: '🎙️ TALK',
       listen: '🎧 LISTEN',
       error: '❌ ERROR',
@@ -45,35 +71,18 @@ class Deva {
       systems: '👽 SYSTEMS',
       solutions: '🔬 SOLUTIONS',
     };
-    this._active = false;                               // the active/birth date.
-    this.security = false;                              // inherited Security features.
-    this.support = false;                               // inherited Support features.
-    this.config = opts.config || {};                    // local Config Object
-    this.events = opts.events || new EventEmitter({});  // Event Bus
-    this.lib = opts.lib || {};                          // used for loading library functions
-    this.agent = opts.agent || false;                   // Agent profile object
-    this.client = opts.client || false;                 // Client profile object
-    this.devas = opts.devas || {};                      // Devas which are loaded
-    this.vars = opts.vars || {};                        // Variables object
-    this.listeners = opts.listeners || {};              // local Listeners
-    this.modules = opts.modules || {};                  // 3rd Party Modules
-    this.func = opts.func || {};                        // local Functions
-    this.methods = opts.methods || {};                  // local Methods
-    this.maxListeners = opts.maxListenners || 0;        // set the local maxListeners
-
-    for (var opt in opts) {
-      if (!this[opt]) this[opt] = opts[opt];            // set any remaining opts to this.
-    }
-
-    this.cmdChr = '/';
-    this.askChr = '#';
-    this.inherit = ["events", "config", "lib", "security", "client"];
-    this.bind = ["listeners", "methods", "func", "lib", "security", "agent", "client"];
-    this.messages = {
-      offline: 'AGENT OFFLINE',
-      stopped: 'DEVAS STOPPED',
-      notext: 'NO TEXT',
-      notfound: 'NOT FOUND',
+    this._messages = {
+      offline: '🙅‍♂️ DEVA OFFLINE',
+      init: '✅ DEVA INITIALIZED',
+      start: '✅ DEVA STARTED',
+      stop: '💥 DEVA STOPPED',
+      enter: '🖖 DEVA ENTERED',
+      exit: '🚪 DEVA EXITED',
+      done: '👍 DEVA DONE',
+      devas_started: '🤝 DEVAS STARTED',
+      devas_stopped: '🛑 DEVAS STOPPED',
+      notext: '❌ NO TEXT',
+      method_not_found: '❌ THAT IS NOT GONNA WORK!',
     }
   }
 
@@ -87,10 +96,24 @@ class Deva {
     - st: The state flag to set for the Deva that matches to this._states
   describe
   ***************/
-  state(st) {
+  state(st, data=false) {
+    if (!Object.keys(this._states).includes(st)) return;
     this._state = this._states[st];
-    this.prompt(this._state);
-    this.talk(`${this.agent.id}:state`, this._state);
+    const _data = {
+      id: this.uid(true),
+      client: this.client.id,
+      agent: this.agent.id,
+      st: st,
+      state: this._state,
+      data,
+      created: Date.now(),
+    };
+    this.talk(`${this.agent.key}:state`, _data);
+    return this._state;
+  }
+
+  states() {
+    return this._states;
   }
 
   // Called from the init function to bind the elements defined in the this.bind variable.
@@ -139,12 +162,6 @@ class Deva {
   _assignListeners() {
     return new Promise((resolve, reject) => {
       try {
-        // set the default listeners for the states of the agent.
-        for (let state in this._states) {
-          this.events.on(`${this.agent.key}:${state}`, packet => {
-            return this[state](packet);
-          })
-        }
         // set the assigned listeners for the agent.
         for (let listener in this.listeners) {
           this.events.on(listener, packet => {
@@ -207,13 +224,14 @@ class Deva {
     packet.a = {
       agent: this.agent || false,
       client: this.client || false,
-      text: `${packet.q.meta.method} ${this.messages.notfound}`,
+      text: `${this._messages.method_not_found} - ${packet.q.meta.method} `,
       meta: {
         key: this.agent.key,
         method: packet.q.meta.method,
       },
       created: Date.now(),
     };
+    this.state('method_not_found', packet);
     return packet;
   }
 
@@ -338,8 +356,8 @@ class Deva {
     so the event is specific to the talk.
   ***************/
   ask(packet) {
-    if (!this._active) return Promise.resolve(this.messages.offline);
-    this.state('ask');
+    if (!this._active) return Promise.resolve(this._messages.offline);
+    this.state('ask_question', packet);
 
     packet.a = {
       agent: this.agent || false,
@@ -374,6 +392,8 @@ class Deva {
         else {
           packet.a.text = result;
         }
+
+        this.state('ask_answer', packet);
         this.talk(`${this.agent.key}:ask:${packet.id}`, packet);
       }).catch(err => {
         this.talk(`${this.agent.key}:ask:${packet.id}`, {error:err.toString()});
@@ -397,9 +417,7 @@ class Deva {
   describe:
   ***************/
   question(TEXT=false, DATA=false) {
-    if (!this._active) return Promise.resolve(this.messages.offline);
-
-    this.state('question');                 // set the state to question.
+    if (!this._active) return Promise.resolve(this._messages.offline);
 
     const id = this.uid();                            // generate a unique transport id for the question.
     const t_split = TEXT.split(' ');
@@ -426,9 +444,9 @@ class Deva {
         key = this.agent.key;
 
     return new Promise((resolve, reject) => {
-      if (!TEXT) return reject(this.messages.notext);
+      if (!TEXT) return reject(this._messages.notext);
       try {
-        if (!this._active) return reject(this.messages.offline);
+        if (!this._active) return reject(this._messages.offline);
 
         // *: send just a string of text
         // !: send a command to the local agent
@@ -436,21 +454,20 @@ 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 = 'answer_question';
+        let _state = 'question';
         if (isAsk) {
-          _state = 'answer_ask'
-          key = t_split[0]substring(1);
+          _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();
         }
         else if (isCmd) {
-          _state = 'answer_cmd'
+          _state = 'question_cmd'
           params = t_split[1] ? t_split[1].split(':') : false;
-          method = isCmd;
+          method = t_split[0].substring(1);
           text = t_split.slice(1).join(' ').trim()
         }
-        this.state(_state);
 
         packet.q = {
             agent: this.agent || false,
@@ -468,6 +485,7 @@ 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) {
@@ -479,7 +497,6 @@ class Deva {
         // if the user sends a local command '$' then it will ask of the self.
         else {
           if (typeof this.methods[method] !== 'function') {
-            this.state('answer_cmd');
             return resolve(this._methodNotFound(packet));
           }
           this.methods[method](packet).then(result => {
@@ -503,6 +520,7 @@ class Deva {
 
             // create a hash for entire packet and insert into packet
             packet.hash = this.hash(JSON.stringify(packet));
+            this.state('question_answer', packet);
 
             return resolve(packet);
           }).catch(err => {
@@ -541,7 +559,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._messages.init);
       }).then(started => {
         return resolve(started)
       }).catch(err => {
@@ -555,10 +573,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;
   }
 
   /**************
@@ -572,7 +590,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._messages.start);
   }
 
   /**************
@@ -586,10 +604,10 @@ class Deva {
     If the deva is offline it will return the offline message.
   ***************/
   stop() {
-    if (!this._active) return Promise.resolve(this.messages.offline);
+    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._messages.stop);
   }
 
   /**************
@@ -602,9 +620,9 @@ class Deva {
     If the Deva is offline it will return the offline message.
   ***************/
   enter() {
-    if (!this._active) return Promise.resolve(this.messages.offline);
+    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._messages.enter)
   }
 
   /**************
@@ -620,10 +638,10 @@ class Deva {
     If the deva is offline it will return the offline message.
   ***************/
   exit() {
-    if (!this._active) return Promise.resolve(this.messages.offline);
+    if (!this._active) return Promise.resolve(this._messages.offline);
     this.state('exit');
     this._active = false;
-    return this.onExit && typeof this.onExit === 'function' ? this.onExit() : Promise.resolve(this._state)
+    return this.onExit && typeof this.onExit === 'function' ? this.onExit() : Promise.resolve(this._messages.exit)
   }
 
   /**************
@@ -637,10 +655,10 @@ class Deva {
     If the deva is offline it will return the offline message.
   ***************/
   done(msg=false) {
-    if (!this._active) return Promise.resolve(this.messages.offline);
+    if (!this._active) return Promise.resolve(this._messages.offline);
     this.state('done');
     msg = msg ? msg : this._state;
-    return this.onDone && typeof this.onDone === 'function' ? this.onDone() : Promise.resolve(this._state)
+    return this.onDone && typeof this.onDone === 'function' ? this.onDone() : Promise.resolve(this._messages.done)
   }
 
   /**************
@@ -654,7 +672,7 @@ class Deva {
     If the deva is offline it will return the offline message.
   ***************/
   status(addto=false) {
-    if (!this._active) return Promise.resolve(this.messages.offline);
+    if (!this._active) return Promise.resolve(this._messages.offline);
     const id = this.uid();
     const dateFormat = new Intl.DateTimeFormat('en-US', { dateStyle: 'medium', timeStyle: 'medium' }).format(this._active);
     let text = `${this.agent.name} is ONLINE since ${dateFormat}`;
@@ -697,14 +715,13 @@ class Deva {
   startDevas() {
     this.state('devas_start');
     return new Promise((resolve, reject) => {
-      this.prompt
       const devas = [];
       for (let x in this.devas) {
         devas.push(this.devas[x].init());
       }
       Promise.all(devas).then(() => {
         this.state('devas_ready');
-        return resolve(this._state);
+        return resolve(this._messages.devas_started);
       }).catch(reject);
     });
   }
@@ -723,7 +740,7 @@ class Deva {
       }
       Promise.all(devas).then(() => {
         this.state('devas_stoped');
-        return resolve(this.messages.stopped);
+        return resolve(this._messages.devas_stopped);
       }).catch(reject);
     });
   }

package/package.json

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