doix-db 1.0.60 → 1.0.62

package/index.js

@@ -2,11 +2,12 @@ const DbQueryBinary = require ('./lib/query/DbQueryBinary.js')
 
 module.exports = {
 
-	DbCallTracker : require ('./lib/DbCallTracker.js'),
 	DbClient:       require ('./lib/DbClient.js'),
 	DbPool:         require ('./lib/DbPool.js'), 
 	DbLang:         require ('./lib/DbLang.js'),
 	DbCsvPrinter:   require ('./lib/DbCsvPrinter.js'),
+	DbQueue:        require ('./lib/DbQueue.js'),
+
 	DbColumn:       require ('./lib/model/DbColumn.js'),
 	DbReference:    require ('./lib/model/DbReference.js'),
 	DbObjectMerger: require ('./lib/model/DbObjectMerger.js'),

package/lib/DbCall.js

@@ -18,7 +18,8 @@ const MD_OBJECT = 'object'
 const MD_SCALAR = 'scalar'
 
 const EventEmitter = require ('events')
-const {Transform} = require ('stream')
+const {Transform}  = require ('stream')
+const {Tracker}    = require ('events-to-winston')
 
 class DbCall extends EventEmitter {
 
@@ -93,6 +94,45 @@ class DbCall extends EventEmitter {
 
 	}
 
+	get [Tracker.LOGGING_PARENT] () {
+
+		return this.db
+
+	}
+
+	get [Tracker.LOGGING_ID] () {
+
+		return this.ord
+
+	}
+
+	get [Tracker.LOGGING_EVENTS] () {
+
+		return {
+
+			start: {
+				level: 'info',
+				message: function () {return this.sql},
+				details: {},
+			},
+		
+			finish: {
+				level: 'info',
+				elapsed: true,
+			}
+
+		}
+
+	}
+
+	get [Tracker.LOGGING_DETAILS] () {
+
+		const {params} = this
+
+		return {params}
+
+	}
+
 	get objectMode () {
 
 		return this.options.rowMode === MD_OBJECT

package/lib/DbClient.js

@@ -1,6 +1,7 @@
 const EventEmitter    = require ('events')
 const {randomUUID}    = require ('crypto')
 const {Readable, Writable}      = require ('stream')
+const {Tracker}       = require ('events-to-winston')
 
 const DbCsvPrinter    = require ('./DbCsvPrinter.js')
 const DbCall          = require ('./DbCall.js')
@@ -38,6 +39,18 @@ class DbClient extends EventEmitter {
 	
 	}
 
+	get [Tracker.LOGGING_PARENT] () {
+
+		return this.job
+
+	}
+
+	get [Tracker.LOGGING_ID] () {
+
+		return this.name
+
+	}
+
 	async createTempTable (table, options) {
 
 		if (typeof table === 'string') table = this.model.find (table)
@@ -336,12 +349,19 @@ class DbClient extends EventEmitter {
 
 		const call = new DbCall (this, q, params, options)
 
-		call.tracker = new this.pool.trackerClass (call)
+		call.tracker = new Tracker (call, this.pool.logger)
+		call.tracker.listen ()
 
 		return call
 
 	}
 
+	async peek (queue) {
+
+		return this.getObject (this.lang.genPeekSql (queue), [], {notFound: null})
+
+	}
+
 }
 
 module.exports = DbClient

package/lib/DbLang.js

@@ -528,6 +528,12 @@ class DbLang {
 
 	}
 
+	genPeekSql ({qName, queue: {order}}) {
+
+		return `SELECT * FROM ${qName} ORDER BY ${order}`
+
+	}
+
 }
 
 module.exports = DbLang

package/lib/DbPool.js

@@ -1,5 +1,4 @@
 const {ResourcePool} = require ('doix')
-const DbCallTracker = require ('./DbCallTracker.js')
 
 class DbPool extends ResourcePool {
 
@@ -12,8 +11,6 @@ class DbPool extends ResourcePool {
 		
 		this.logger = o.logger
 
-		this.trackerClass = o.trackerClass || DbCallTracker
-
 		this.on ('acquire', db => db.waitFor (this.onAcquire (db)))
 
 	}

package/lib/DbQueue.js

@@ -0,0 +1,30 @@
+const {Queue} = require ('doix')
+
+class DbQueue extends Queue {
+
+	constructor (view, o) {
+
+        const {name} = view
+
+        if (!('order' in o)) throw Error ('DbQueuePg: order not set for ' + view.name)
+
+        if ('maxPending' in o && o.maxPending !== 1) throw Error (`DbQueuePg: maxPending=${o.maxPending} set for ${view.name}, must be 1`)
+
+		super (view.model.db.app, {name, ...o})
+
+        this.view  = view
+        this.order = o.order
+
+	}
+
+    async peek (job) {
+
+        const {view} = this
+
+        return job [view.model.db.name].peek (view)
+
+    }
+	
+}
+
+module.exports = DbQueue

package/lib/model/DbView.js

@@ -1,4 +1,5 @@
 const DbRelation = require ('./DbRelation.js')
+const DbQueue = require ('../DbQueue.js')
 
 class DbView extends DbRelation {
 
@@ -14,18 +15,18 @@ class DbView extends DbRelation {
 
 		if (typeof this.wrap !== 'boolean') throw Error (`${this.name}: wrap option must be boolean`)
 		
-		
-	}		
+	}
 
 	setLang (lang) {
 
 		super.setLang (lang)
-		
+
 		if (this.wrap) lang.wrapViewSql (this)
 
+		if (this.queue) this.queue = new DbQueue (this, this.queue)
+
 	}
 
-	
 }
 
 module.exports = DbView

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doix-db",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "Shared database related code for doix",
   "main": "index.js",
   "files": [
@@ -40,13 +40,12 @@
   },
   "homepage": "https://github.com/do-/node-doix-db#readme",
   "peerDependencies": {
-    "doix": "^1.0.32"
+    "doix": "^1.0.39"
   },
   "devDependencies": {
     "jest": "^29.6.1"
   },
   "dependencies": {
-    "string-escape-map": "^1.0.0",
-    "subclassable-object-merger": "^1.0.0"
+    "string-escape-map": "^1.0.0"
   }
 }

package/lib/DbCallTracker.js

@@ -1,70 +0,0 @@
-const {LifeCycleTracker} = require ('doix')
-const stringEscape  = require ('string-escape-map')
-
-const ESC_PARAMS = new stringEscape ([
-  ['\t', '\\t'],
-  ['\n', '\\n'],
-  ['\r', '\\r'],
-  [ "'", "''"],
-])
-
-const stringifyParams = params => {
-	
-	if (!Array.isArray (params)) return JSON.stringify (params)
-	
-	if (params.length === 0) return ''
-
-	let s = '['; for (const p of params) {
-	
-		if (s.length !== 1) s += ', '
-		
-		if (typeof p === 'string') {
-		
-			s += "'"
-			s += ESC_PARAMS.escape (p)
-			s += "'"
-		
-		}
-		else {
-
-			s += p
-
-		}
-	
-	}
-	
-	return s + ']'
-
-}
-
-class DbCallTracker extends LifeCycleTracker {
-
-	constructor (call) {
-
-		const {db} = call
-
-		super (call, db.pool.logger)
-
-		this.call = call
-
-		this.prefix = db.job.tracker.prefix + '/' + db.uuid + '/' + call.ord
-
-	}
-	
-	startMessage () {
-
-		const {sql, params} = this.call
-
-		const s = super.startMessage () + ' ' + sql
-
-		if (params.length === 0) return s
-
-		return s + ' ' + stringifyParams (params)
-
-	}
-
-}
-
-DbCallTracker.stringifyParams = stringifyParams
-
-module.exports = DbCallTracker