@indra.ai/deva 1.1.101 → 1.1.103

package/index.js

@@ -959,12 +959,12 @@ class Deva {
   init(client) {
     // set client
     this._active = Date.now();
-
+    const agent = this.agent();
     const _data = {
       id: this.uid(true),
-      key: 'return',
-      value: 'init',
-      agent: this._agent,
+      key: 'init',
+      value: agent.key,
+      agent,
       client: this.copy(client),
       text: this._messages.states.start,
       created: Date.now(),
@@ -1058,7 +1058,7 @@ class Deva {
     data.hash = this.hash(data);
     this.action(data.value)
     const hasOnDone = this.onDone && typeof this.onDone === 'function' ? true : false;
-    return hasOnDone ? this.onDone(data) : Promise.resolve(data);
+    return hasOnDone ? this.onDone(data) : this.finish(data);
   }
 
   /**************
@@ -1076,7 +1076,11 @@ class Deva {
     if (!this._active) return Promise.resolve(this._messages.states.offline);
     this.state('finish');
     this.action('finish');
-    return resolve(packet);
+    const hasOnFinish = this.onFinish && typeof this.onFinish === 'function' ? true : false;
+    if (hasOnFinish) return this.onFinish(packet, resolve);
+    else if (resolve) return resolve(packet);
+    else return Promise.resolve(packet)
+    return resolve ? resolve(packet) : Promise.resolve(packet);
   }
 
   /**************
@@ -1095,12 +1099,14 @@ class Deva {
   stop() {
     if (!this._active) return Promise.resolve(this._messages.states.offline);
     this.state('stop');
+    const agent = this.agent();
+    const client = this.client();
     const data = {
       id: this.uid(true),
-      key: 'return',
-      value: 'stop',
-      agent: this.agent(),
-      client: this.client(),
+      key: 'stop',
+      value: agent.key,
+      agent,
+      client,
       text: this._messages.states.stop,
       created: Date.now(),
     }
@@ -1541,19 +1547,8 @@ class Deva {
     This function will enable fast loading of Deva into a system.
   ***************/
   load(key, client) {
-    return new Promise((resolve, reject) => {
-      this.state('load');
-      this.devas[key].init(client).then(loaded => {
-        this.talk(config.events.load, {
-          id:this.uid(true),
-          key,
-          created: Date.now(),
-        });
-        return this.finish(this._messages.states.load, resolve);
-      }).catch(err => {
-        return this.error(err, deva, reject);
-      })
-    });
+    this.state('load');
+    return this.devas[key].init(client);
   }
 
   /**************
@@ -1670,12 +1665,14 @@ class Deva {
   ***************/
   prompt(text) {
     // Talk a global prompt event for the client
+    const agent = this.agent();
+    const client = this.client();
     const _data = {
       id: this.uid(true),
       key: 'prompt',
-      value: 'prompt',
-      agent: this.agent(),
-      client: this.client(),
+      value: agent.key,
+      agent,
+      client,
       text,
       created: Date.now(),
     }
@@ -1915,12 +1912,14 @@ class Deva {
       console.log('\n::END:DATA\n');
     }
 
+    const agent = this.agent();
+    const client = this.client();
     const _data = {
       id: this.uid(true),
-      key: 'return',
-      value: 'error',
-      agent: this.agent(),
-      client: this.client(),
+      key: 'error',
+      value: agent.key,
+      agent,
+      client,
       error: err,
       data,
       created: Date.now(),

package/package.json

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