holepunch-hop 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holepunch-hop",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "data interface to HOP",
   "main": "src/index.js",
   "type": "module",

package/src/adapters/sqliteDatabase.js

@@ -49,6 +49,29 @@ class SqliteAdapter extends EventEmitter {
     return newSqlite
   }
 
+    /**
+  * setup sqlite db and get tables and columns
+  * @method discoverColumns
+  *
+  */
+    discoverColumns = async function (table) {  
+      // columns in table
+      let header = []
+      const res = await new Promise((resolve, reject) => {
+        let sqlTableCols = `PRAGMA table_info('` + table + `')`
+        this.dataBase.all(sqlTableCols, [], (err, rows) => {
+          if (err) {
+      reject(err)
+          }
+          rows.forEach((row) => {
+            header.push(row)
+          })
+          resolve(header)
+        })
+    })
+      return res
+    }
+
   /**
   * setup sqlite db and get tables and columns
   * @method createDbConnection
@@ -88,28 +111,6 @@ class SqliteAdapter extends EventEmitter {
     return res
   }
 
-  /**
-  * setup sqlite db and get tables and columns
-  * @method discoverColumns
-  *
-  */
-  discoverColumns = async function (table) {  
-    // columns in table
-    let header = []
-    const res = await new Promise((resolve, reject) => {
-	    let sqlTableCols = `PRAGMA table_info('` + table + `')`
-	    this.dataBase.all(sqlTableCols, [], (err, rows) => {
-	      if (err) {
-		reject(err)
-	      }
-	      rows.forEach((row) => {
-		      header.push(row)
-	      })
-	      resolve(header)
-	    })
-	})
-    return res
-  }
 
   /**
   * query a table for data
@@ -117,11 +118,48 @@ class SqliteAdapter extends EventEmitter {
   *
   */
   queryTable = async function (table) {
+    console.log('HP--first SQL query')
+    console.log(table)
+    let tableName = table.context.deviceTable
+    // let devicetableName = table.context.devicetablename
+    let tableTimestamp = table.context.timestamp   // timecolumn
+    let deviceColumn = ''
+    if (table?.context?.deviceCol) {
+      deviceColumn = table?.context?.deviceCol?.name
+    } else {
+      deviceColumn = ''
+    }
+    let queryDevice = 0
+    if (table.context?.deviceID) {
+      queryDevice = table.context?.deviceID
+    } else {
+      queryDevice = 1 // table?.context?.device?._id
+    }
+    let queryLimit = true
+    let queryLevel = 1400
+    let blindTimestart = 0
+    let blindTimeend = 0
     // columns in table
     let data = []
     const res = await new Promise((resolve, reject) => {
-	    let sqlQuery = `SELECT * FROM MI_BAND_ACTIVITY_SAMPLE WHERE DEVICE_ID = 3 ORDER BY TIMESTAMP DESC LIMIT 1400` // AND TIMESTAMP BETWEEN 1627677840 AND 1627678380`
-
+	    let sqlQuery = `SELECT * FROM ` + tableName 
+      // now build filter of query based on input if any
+      if (deviceColumn.length > 0) {
+        sqlQuery += ` WHERE ` + deviceColumn + ` = ` + queryDevice 
+      }
+      if (tableTimestamp.length > 0) {
+        sqlQuery += ` ORDER BY TIMESTAMP DEC` // + tableTimestamp
+      }
+      if (blindTimestart) {
+        sqlQuery += ` AND TIMESTAMP BETWEEN ` + blindTimestart + ` AND ` + blindTimeend
+ 
+      }
+      // lastly set hard limit on length
+      if (queryLimit) {
+        sqlQuery += ` LIMIT ` + queryLevel
+      }
+      console.log('HP------formed ----------')
+      console.log(sqlQuery)
 	    this.dataBase.all(sqlQuery, [], (err, rows) => {
 	      if (err) {
 		reject(err)
@@ -135,12 +173,14 @@ class SqliteAdapter extends EventEmitter {
     return res
   }
 
+
   /**
   * query device table
   * @method deviceQuery
   *
   */
   deviceQuery = async function (table) {
+    console.log('HOLEP---adtpSQL--query device SQLite ad')
     let data = []
     const res = await new Promise((resolve, reject) => {
 	    let sqlQuery = `SELECT * FROM ` + table

package/src/bees.js

@@ -343,6 +343,17 @@ class HyperBee extends EventEmitter {
     return nodeData
   }
 
+  /**
+   * filter peer library to get compute modules with a key
+   * @method getPeerLibComputeModules
+   *
+  */
+  getPeerLibComputeModules = async function () {
+    const moduleData = await this.dbPeerLibrary.createHistoryStream({ reverse: true, limit: 10 })
+    return moduleData
+  }
+
+
   /**
    * get all kbl entries
    * @method KBLentries

package/src/drive.js

@@ -300,27 +300,37 @@ class HypDrive extends EventEmitter {
   *
   */
   SQLiteQuery = async function (dataInfo) {
+    console.log('HP--DRIVE--sqlite')
      let timestampCol = ''
     // is the sqliite database sill accive?
     // const stream = this.liveDataAPI.DriveFiles.listFilesFolder('sqlite/')
     let dbFile = await this.hyperdriveLocalfile('sqlite/' + dataInfo.file.file)
     let queryData = await this.AdapterSqlite.queryTable(dataInfo)
-    let contextKeys = Object.keys(queryData[0])
-    timestampCol = contextKeys[dataInfo.context.timestamp]
-    // now prepare into data and labels
-    let blindData = {}
-    let extractCol = []
-    let extractLabel = []
-    for (let rowi of queryData) {
-	extractCol.push(rowi[dataInfo.context.name.name])
-	// assume data column for now and parse to mills seconds
-	let testCH1 = chrono.parseDate(rowi[timestampCol])
-	let parseDate = testCH1 * 1000 // this.testDataExtact(testCH1)
-	extractLabel.push(parseDate)
+    if (queryData.length > 0) {
+      let contextKeys = Object.keys(queryData[0])
+      timestampCol = contextKeys[dataInfo.context.timestamp]
+      // now prepare into data and labels
+      let blindData = {}
+      let extractCol = []
+      let extractLabel = []
+      for (let rowi of queryData) {
+    extractCol.push(rowi[dataInfo.context.name.name])
+    // assume data column for now and parse to mills seconds
+    let testCH1 = chrono.parseDate(rowi[timestampCol])
+    let parseDate = testCH1 * 1000 // this.testDataExtact(testCH1)
+    extractLabel.push(parseDate)
+      }
+      blindData.data = extractCol
+      blindData.label = extractLabel
+      return blindData
+    } else {
+      console.log('no data for that query')
+      let blindData = {}
+      blindData.data = []
+      blindData.label = []
+      return blindData
     }
-    blindData.data = extractCol
-    blindData.label = extractLabel
-    return blindData
+
   }
 
 

package/src/fileParser.js

@@ -137,6 +137,26 @@ FileParser.prototype.webCSVparse = function (fData) {
   // this.convertJSON(o, ws, headerInfo, praser, 'web', fileNewName)
 }
 
+/**
+* TEMP blind json content
+* @method TEMPwebJSONparse
+*
+*/
+FileParser.prototype.TEMPwebJSONparse = function (fjData) {
+  console.log(fjData)
+  let extractLabel = []
+  let extractCol = []
+  for (let df of fjData.content) {
+    extractLabel.push(df[fjData.context.timestampname])
+    extractCol.push(df[fjData.context.name])
+  }
+  // extract out price and time
+  let extractedPair = {}
+  extractedPair.label = extractLabel
+  extractedPair.data = extractCol
+  return extractedPair
+}
+
 /**
 * TEMP blind csv content files from web
 * @method TEMPwebCSVparse

package/src/index.js

@@ -130,6 +130,8 @@ class HolepunchWorker extends EventEmitter {
           this.warmPeers.push(message.data)
           this.Peers.peerJoin(message.data)
         }
+      } else if (message.task === 'peer-board') {
+        console.log('public board share with peer')
       } else if (message.task === 'peer-write') {
         this.emit('peer-write', message.data)
       } else if (message.task === 'topic') {