@indra.ai/deva.veda 0.2.6 → 0.3.0

package/func/index.js

@@ -3,14 +3,6 @@
 // Legal Signature Required For Lawful Use.
 // Distributed under VLA:49633069290486712918 LICENSE.md
 
-import {laws} from '../data/manu/index.js';
-import {avbooks} from '../data/atharvaveda/index.js';
-
-// set the __dirname
-import {dirname} from 'node:path';
-import {fileURLToPath} from 'node:url';    
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
 export const func = {
 	/**************
 	func: menu
@@ -22,7 +14,8 @@ export const func = {
 		return new Promise((resolve, reject) => {
 			try {
 				const agent = this.agent();
-				const menufile = this.lib.path.join(__dirname, '..', 'data', 'menu.json');
+				const {dir} = this.info();
+				const menufile = this.lib.path.join(dir, 'data', 'menu.json');
 				const menudata = this.lib.fs.readFileSync(menufile);
 				const menujson = JSON.parse(menudata);
 				
@@ -71,16 +64,20 @@ export const func = {
 	describe: Return a list of books based on section identifier.
 	***************/
 	books(opts) {
-		this.action('func', 'books');
+		const {id} = opts;
+		this.action('func', `book:${id.uid}`);
 		return new Promise((resolve, reject) => {
+			this.action('try', `books:${id.uid}`); // set action try
 			try {
 				const agent = this.agent();
-				const section = opts.meta.params[1];
-				const booksfile = this.lib.path.join(__dirname, '..', 'data', section, 'index.json');
+				const {dir} = this.info();
+				this.state('data', `books:${id.uid}`); // set state data
+				const booksfile = this.lib.path.join(dir, 'data', 'rigveda', 'index.json');
 				const booksdata = this.lib.fs.readFileSync(booksfile);
 				const booksjson = JSON.parse(booksdata);
+
 	
-				this.state('set', 'books data');
+				this.state('set', `books:${id.uid}`);
 				const text = [
 					`::BEGIN:BOOKS:${booksjson.id}`,
 					`## ${booksjson.title}`,
@@ -91,21 +88,30 @@ export const func = {
 					'::begin:menu',
 				];
 				const books = [];
+
 				// loop over the data and format it into a feecting command string
 				booksjson.data.forEach((book, idx) => {
-					books.push(`button[${book.title}]:${this.askChr}${agent.key} book:${section}:${book.key}`);
+					books.push(`button[${book.title}]:${this.askChr}${agent.key} book:${book.key}`);
 				});
+				
+
 				const booktext = books.join('\n');
-				const bookshash = this.lib.hash(booktext);
+				const bookshash = this.hash(booktext, 'sha256');
 				text.push(booktext);
 				text.push(`::end:menu`);
 				text.push(`::begin:hidden`);
 				text.push(`#color = {{profile.color}}`);
 				text.push(`#bgcolor = {{profile.bgcolor}}`);
-				text.push(`#bg = {{profile.background}}`);
+				text.push(`#bg = {{profile.background}}`);				
+				text.push(`hash: ${bookshash}`);
+				text.push(`copyright: {{profile.copyright}}`);
 				text.push(`::end:hidden`);
-				text.push(`::END:BOOKS:${bookshash}`);
-				this.state('resolve', 'books');
+				text.push(`::END:BOOKS:${id.uid}`);
+
+				this.action('resolve', `books:${id.uid}`);
+				this.state('valid', ` books:${id.uid}`);
+				this.intent('good', ` books:${id.uid}`);
+
 				return resolve({
 					id: booksjson.id,
 					title: booksjson.title,
@@ -116,7 +122,8 @@ export const func = {
 					created: Date.now(),
 				});
 			} catch (e) {
-				this.state('reject', 'books');
+				this.action('catch', `books:${id.uid}`);
+				this.intent('bad', ` books:${id.uid}`);
 				return reject(e);
 			}
 		});
@@ -127,37 +134,42 @@ export const func = {
 	describe: The book function calls the public facing api to get a listing of books to list to the user. originally this file came from sacred-texts.com but was migrated to indra.church with a json api.
 	***********/
 	book(opts) {
-		const section = opts.meta.params[1] || false;
-		const book = opts.meta.params[2] || false;
-		this.action('func', `${section} book ${book}`);
+		const book = opts.meta.params[1] || false;
+		this.action('func', `book:${book}:${opts.id.uid}`);
 		return new Promise((resolve, reject) => {
 			if (!book) return resolve(this.vars.messages.nobook);
+			const key = book.length < 2 ? `0${book}` : book;
+			
+			this.state('try', `book:${book}:${opts.id.uid}`); // set state try
 			try {
 				const agent = this.agent();
-				const key = book.length < 2 ? `0${book}` : book;
-				const filepath = this.lib.path.join(__dirname, '..', 'data', section, `${key}.json`)
+				const {dir} = this.info();
+				const filepath = this.lib.path.join(dir, 'data', 'rigveda', 'books', `${key}.json`)
 				const theFile = this.lib.fs.readFileSync(filepath);
 				const theJSON = JSON.parse(theFile);
 	
-				const {id, title, describe, DATA} = theJSON;
+				const {id, title, describe, data} = theJSON;
 	
-				this.state('set', `book data`);
+				this.state('data', `book:${book}:${key}:${opts.id.uid}`);
 				const _text = [
 					`::BEGIN:BOOK:${id}`,
 					`## ${title}`,
 					`p: ${describe}`,
 					'::begin:buttons',
 					`button[🗂️ Main]:${this.askChr}${agent.key} menu`,
-					`button[📚 Books]:${this.askChr}${agent.key} books:${section}`,
+					`button[📚 Books]:${this.askChr}${agent.key} books`,
 					'::end:buttons',
 					'::begin:menu',
 				];
+				
 				const _hymns = [];
-				DATA.forEach((hymn, idx) => {
-					_hymns.push(`button[${hymn.key} - ${hymn.title}]:#${agent.key} hymn ${hymn.key}`);
+
+				data.forEach((hymn, idx) => {
+					_hymns.push(`button[${hymn.key} - ${hymn.title}]:#${agent.key} hymn:${hymn.key}`);
 				});
+
 				const _hymnsText = _hymns.join('\n');
-				const _hymnsHash = this.lib.hash(_hymnsText);
+				const _hymnsHash = this.hash(_hymnsText, 'sha256');
 				_text.push(_hymnsText);
 				_text.push(`::end:menu`);
 				_text.push(`::begin:hidden`);
@@ -167,18 +179,18 @@ export const func = {
 				_text.push(`::end:hidden`);
 				_text.push(`::END:BOOK:${_hymnsHash}`);
 	
-				this.state('resolve', `${section} book ${book}`)
+				this.action('resolve', `book:${book}:${key}:${opts.id.uid}`);
 				return resolve({
 					id,
 					title,
 					describe,
 					text: _text.join('\n'),
-					data: DATA,
-					hash: this.lib.hash(JSON.stringify(DATA)),
+					data,
+					hash: this.hash(data, 'sha256'),
 					created: Date.now(),
 				});
 			} catch (e) {
-				this.state('reject', `${section} book ${book}`)
+				this.action('reject', `book:${key}:${opts.id.uid}`)
 				return reject(e);
 			}
 		});
@@ -189,15 +201,17 @@ export const func = {
 	params: packet
 	describe: The View function returns a specific hymn from one of the Books.
 	***************/
-	hymn(h) {
-		this.action('func', `hymn ${h}`);
+	hymn(opts) {
+		const {params} = opts.meta;
+		const _h = params[1];
+		this.action('func', `hymn:${_h}:${opts.id.uid}`);
 		return new Promise((resolve, reject) => {
-			if (!h) return resolve(this._messages.notext);
-			const id = this.lib.uid();
-			const agent = this.agent();
-	
+			if (!_h) return resolve(this._messages.notext);
 			try {
-				const hymnPath = this.lib.path.join(__dirname, 'data', 'rigveda', 'hymns', `${h}.json`);
+				const id = this.uid();
+				const agent = this.agent();
+				const {dir} = this.info();
+				const hymnPath = this.lib.path.join(dir, 'data', 'rigveda', 'hymns', `${_h}.json`);
 				const hymnExists = this.lib.fs.existsSync(hymnPath);
 				if (!hymnExists) return resolve(this.vars.messages.notfound);
 				// parse hymns
@@ -205,7 +219,7 @@ export const func = {
 				const _hymn = JSON.parse(theFile);
 				const processed = this.utils.process({key:_hymn.key,title:_hymn.title,content:_hymn.orig});
 	
-				this.state('set', `hymn ${h}`);
+				this.state('set', `hymn:${_h}:${opts.id.uid}`);
 				const hymn = [
 					`::BEGIN:HYMN:${processed.key}`,
 					`# ${processed.title}`,
@@ -214,21 +228,34 @@ export const func = {
 					'::end:content',
 					'::begin:meta',
 					`title: ${processed.title}`,
-					processed.people.length ? `people: ${processed.people.join(', ')}` : '',
+					processed.people.kings.length ? `kings: ${processed.people.kings.join(', ')}` : '',
+					processed.people.male.length ? `male: ${processed.people.male.join(', ')}` : '',
+					processed.people.female.length ? `female: ${processed.people.female.join(', ')}` : '',
 					processed.places.length ? `places: ${processed.places.join(', ')}` : '',
 					processed.things.length ? `things: ${processed.things.join(', ')}` : '',
 					processed.groups.length ? `groups: ${processed.groups.join(', ')}` : '',
 					processed.concepts.length ? `concepts: ${processed.concepts.join(', ')}` : '',
+					`uid: ${opts.id.uid}`,
+					`time: ${opts.id.time}`,
+					`date: ${opts.id.date}`,
+					`fingerprint: ${opts.id.fingerprint}`,
+					`md5: ${this.hash(processed.text, 'md5')}`,
+					`sha256: ${this.hash(processed.text, 'sha256')}`,
+					`sha512: ${this.hash(processed.text, 'sha512')}`,
+					`copyright: ${opts.id.copyright}`,
 					'::end:meta',
 					`::begin:hidden`,
 					`#color = {{profile.color}}`,
 					`#bgcolor = {{profile.bgcolor}}`,
 					`#bg = {{profile.background}}`,
+					`copyright: {{profile.copyright}}`,
 					`::end:hidden`,
-					`::END:HYMN:${this.lib.hash(processed)}`,
+					`::END:HYMN:${processed.key}`,
 				];
 	
-				this.state('resolve', `hymn ${h}`)
+				this.action('resolve', `hymn:${opts.id.uid}`)
+				this.state('valid', `hymn ${opts.id.uid}`)
+				this.intent('good', `hymn ${opts.id.uid}`)
 				return resolve({
 					id,
 					key: processed.key,
@@ -239,12 +266,12 @@ export const func = {
 					created: Date.now(),
 				});
 			} catch (e) {
-				this.state('reject', `hymn ${h}`)
-				return reject(e);
+				this.action('reject', `hymn ${opts.id.uid}`)
+				this.state('invalid', `hymn ${opts.id.uid}`)
+				this.intent('bad', `hymn ${opts.id.uid}`)
+				return this.err(e, opts, reject);
 			}
 		});
 	},
-	laws,
-	avbooks,	
 }
 

package/methods/index.js

@@ -3,11 +3,6 @@
 // Legal Signature Required For Lawful Use.
 // Distributed under VLA:49633069290486712918 LICENSE.md
 
-import {manu, manuhash} from '../data/manu/index.js';
-import {rvbooks} from '../data/rigveda/index.js';
-import {avbooks} from '../data/atharvaveda/index.js';
-import {svbooks} from '../data/samaveda/index.js';
-
 import {dirname} from 'node:path';
 import {fileURLToPath} from 'node:url';    
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -46,22 +41,32 @@ export const methods = {
 	describe: Call the books function to get a listing of books.
 	***************/
 	books(packet) {
-		this.context('books');
-		this.action('method', 'books');
+		const {id, q} = packet;
+		this.context('books', id.uid);
+		this.action('method', `books:${id.uid}`);
 		return new Promise((resolve, reject) => {
 			if (!packet) return reject(this._messages.nopacket);
 			const data = {};
-			this.func.books(packet.q).then(books => {
+			this.func.books(q).then(books => {
+				this.state('data', `books:${id.uid}`); // set state set
 				data.books = books;
 				return this.question(`${this.askChr}feecting parse ${books.text}`);
 			}).then(feecting => {
+				this.state('data', `feecting:${id.uid}`); // set state set
 				data.feecting = feecting;
+				
+				this.action('resolve', `books:${id.uid}`); // set action resolve
+				this.state('valid', `books:${id.uid}`); // set action resolve
+				this.intent('good', `books:${id.uid}`); // set action resolve
 				return resolve({
 					text:feecting.a.text,
 					html:feecting.a.html,
 					data,
 				});
 			}).catch(err => {
+				this.action('catch', `books:${id.uid}`); // set action resolve
+				this.state('invalid', `books:${id.uid}`); // set action resolve
+				this.intent('bad', `books:${id.uid}`); // set action resolve
 				return this.error(err, packet, reject);
 			});
 		})
@@ -79,6 +84,7 @@ export const methods = {
 			const agent = this.agent();
 			const data = {};
 			this.func.book(packet.q).then(book => {
+				console.log('getting to resolve');
 				data.book = book;
 				return this.question(`${this.askChr}feecting parse ${book.text}`);
 			}).then(feecting => {
@@ -105,15 +111,16 @@ export const methods = {
 			this.context('hymn', packet.q.text);
 			const agent = this.agent();
 			let data;
-			this.func.hymn(packet.q.text).then(hymn => {
+			this.func.hymn(packet.q).then(hymn => {
 				data = hymn.data
 				const {text} = hymn;
-	
+				
 				this.talk(`chat:topic`, {
-					id: this.lib.uid(),
+					id: this.uid(),
 					data: `Current topic is Rig Veda hymn ${text}`,
 					created: Date.now(),
 				});
+				
 				return this.question(`${this.askChr}feecting parse:${agent.key} ${text}`);
 			}).then(feecting => {
 				return resolve({
@@ -122,6 +129,10 @@ export const methods = {
 					data,
 				});
 			}).catch(err => {
+				this.action('catch', `hymn:${packet.id.uid}`); // set action catch
+				this.state('invalid', `hymn${packet.id.uid}`); // set state invalid
+				this.intent('bad', `hymn${packet.id.uid}`); // set state invalid
+				console.log('hymn error', err);
 				return this.error(err, packet, reject);
 			});
 		});
@@ -173,7 +184,7 @@ export const methods = {
 				const data = [];
 				indexjson.data.forEach((item,index) => {
 					const newitem = {
-						id: this.lib.uid(),
+						id: this.uid(),
 						key: item.key,
 						title: item.title,
 						api: `data/${packet.q.text}/books/${item.key}.json`,
@@ -198,7 +209,4 @@ export const methods = {
 			}
 		});
 	},
-	rvbooks,
-	avbooks,
-	svbooks,
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "id": "49633069290486712918",
   "name": "@indra.ai/deva.veda",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "license": "VLA:49633069290486712918 LICENSE.md",
   "VLA": {
     "uid": "49633069290486712918",
@@ -63,7 +63,7 @@
   },
   "homepage": "https://indra.ai",
   "dependencies": {
-    "@indra.ai/deva": "^1.20.3",
+    "@indra.ai/deva": "^1.21.0",
     "cheerio": "^1.0.0",
     "he": "^1.2.0"
   },

package/utils.js

@@ -76,7 +76,7 @@ export default {
 
     // next here we need to check for people places and things then add them to a meta index.
     // this will start with that we loop over he processing value key peple
-    const ret = {
+    const data = {
       key,
       title,
       book,
@@ -86,56 +86,78 @@ export default {
         original,
         sanskrit,
       },
-      people: [],
+      people: {
+        kings: [],
+        male: [],
+        female: [],
+      },
       places: [],
       things: [],
       groups: [],
       concepts: [],
     };
 
-    getProcessingData('people').forEach(person => {
-      const _reg = new RegExp(`(\\b)(${person})(\\b)`, 'gi');
-      const hasPerson = _reg.exec(ret.text);
-      if (hasPerson) {
-        if (!ret.people.includes(person)) ret.people.push(person);
+    const people = getProcessingData('people');
+    people.kings.forEach(king => {
+      const _reg = new RegExp(`(\\b)(${king})(\\b)`, 'gi');
+      const hasKing = _reg.exec(data.text);
+      if (hasKing) {
+        if (!data.people.kings.includes(king)) data.people.kings.push(king);
+        // ret.text = ret.text.replace(_reg, `$1@${person}$3`);
+      }
+    });
+    people.male.forEach(male => {
+      const _reg = new RegExp(`(\\b)(${male})(\\b)`, 'gi');
+      const hasMale = _reg.exec(data.text);
+      if (hasMale) {
+        if (!data.people.male.includes(male)) data.people.male.push(male);
+        // ret.text = ret.text.replace(_reg, `$1@${person}$3`);
+      }
+    });
+
+    people.female.forEach(female => {
+      const _reg = new RegExp(`(\\b)(${female})(\\b)`, 'gi');
+      const hasMale = _reg.exec(data.text);
+      if (hasMale) {
+        if (!data.people.female.includes(female)) data.people.female.push(female);
         // ret.text = ret.text.replace(_reg, `$1@${person}$3`);
       }
     });
 
     getProcessingData('places').forEach(place => {
       const _reg = new RegExp(`(^|\\b)(${place})(\\b)`, 'gi');
-      const hasPlace = _reg.exec(ret.text);
+      const hasPlace = _reg.exec(data.text);
       if (hasPlace) {
-        if (!ret.places.includes(place)) ret.places.push(place);
+        if (!data.places.includes(place)) data.places.push(place);
         // ret.text = ret.text.replace(_reg, `$1$${place}$3`);
       }
     });
 
     getProcessingData('things').forEach(thing => {
       const _reg = new RegExp(`(^|\\b)(${thing})(\\b)`, 'gi');
-      const hasThing = _reg.exec(ret.text);
+      const hasThing = _reg.exec(data.text);
       if (hasThing) {
-        if (!ret.things.includes(thing)) ret.things.push(thing);
+        if (!data.things.includes(thing)) data.things.push(thing);
         // ret.text = ret.text.replace(_reg, `$1#$2$3`);
       }
     });
 
     getProcessingData('groups').forEach(group => {
       const _reg = new RegExp(`(^|\\b)(${group})(\\b)`, 'gi');
-      const hasGroup = _reg.exec(ret.text);
+      const hasGroup = _reg.exec(data.text);
       if (hasGroup) {
-        if (!ret.groups.includes(group)) ret.groups.push(group);
+        if (!data.groups.includes(group)) data.groups.push(group);
         // ret.text = ret.text.replace(_reg, `$1#$2$3`);
       }
     });
 
     getProcessingData('concepts').forEach(concept => {
       const _reg = new RegExp(`(^|\\b)(${concept})(\\b)`, 'gi');
-      const hasConcept = _reg.exec(ret.text);
+      const hasConcept = _reg.exec(data.text);
       if (hasConcept) {
-        if (!ret.concepts.includes(concept)) ret.concepts.push(concept);
+        if (!data.concepts.includes(concept)) data.concepts.push(concept);
       }
     });
-    return ret;
+    return data;
   }
 };