@data-fair/lib-node 2.5.0 → 2.6.0

package/events-queue.d.ts

@@ -1,5 +1,6 @@
 import { type Event } from '@data-fair/lib-common-types/event/index.js';
 import { type Notification } from '@data-fair/lib-common-types/notification/index.js';
+import { SessionState } from '@data-fair/lib-common-types/session/index.js';
 type EventsQueueOptions = {
     eventsUrl: string;
     eventsSecret: string;
@@ -15,7 +16,7 @@ export declare class EventsQueue {
     stop: () => Promise<void>;
     loop(): Promise<void>;
     drain(): Promise<void>;
-    pushEvent(event: Omit<Event, 'date'>): void;
+    pushEvent(event: Omit<Event, 'date'>, sessionState?: SessionState): void;
     pushNotification(notification: Omit<Notification, 'date'>): void;
 }
 declare const eventsQueue: EventsQueue;

package/events-queue.js

@@ -65,11 +65,24 @@ export class EventsQueue {
     }
   }
 
-  pushEvent (event) {
+  pushEvent (event, sessionState) {
     this.options()
     if (this.stopped) { throw new Error('events queue has been stopped') }
     event.date = new Date().toISOString()
     debug('pushEvent', event)
+    if (sessionState && sessionState.user) {
+      event.originator = {
+        user: { id: sessionState.user.id, name: sessionState.user.name }
+      }
+      if (sessionState.organization) {
+        event.originator.organization = {
+          id: sessionState.organization.id,
+          name: sessionState.organization.name,
+          department: sessionState.organization.department,
+          departmentName: sessionState.organization.departmentName
+        }
+      }
+    }
     this.eventsQueue.push(event)
   }
 

package/mongo.d.ts

@@ -1,11 +1,12 @@
-import type { IndexSpecification, CreateIndexesOptions, MongoClientOptions, IndexDirection } from 'mongodb';
+import type { IndexSpecification, CreateIndexesOptions, MongoClientOptions, IndexDirection, Db } from 'mongodb';
 import { MongoClient } from 'mongodb';
 type IndexDirections = Record<string, IndexDirection>;
 export type IndexDefinitions = Record<string, Record<string, null | IndexDirections | [IndexDirections, CreateIndexesOptions]>>;
 export declare class Mongo {
     private _client;
+    private _db;
     get client(): MongoClient;
-    get db(): import("mongodb").Db;
+    get db(): Db;
     connect: (mongoUrl: string, options?: MongoClientOptions) => Promise<void>;
     ensureIndex: (collection: string, key: IndexSpecification, options?: CreateIndexesOptions) => Promise<void>;
     /**

package/mongo.js

@@ -1,13 +1,15 @@
 import { MongoClient, MongoError } from 'mongodb'
 export class Mongo {
   _client
+  _db
   get client () {
     if (!this._client) { throw new Error('db was not connected') }
     return this._client
   }
 
   get db () {
-    return this.client.db()
+    if (!this._db) { throw new Error('db was not connected') }
+    return this._db
   }
 
   connect = async (mongoUrl, options = {}) => {
@@ -17,6 +19,7 @@ export class Mongo {
     }
     console.log('connecting to mongodb...')
     this._client = await MongoClient.connect(mongoUrl, { maxPoolSize: 5, ignoreUndefined: true, ...options })
+    this._db = this._client.db()
     console.log('...ok')
   }
 

package/observer.js

@@ -93,8 +93,8 @@ export const startObserver = async (port = 9090) => {
     GET /metrics -> get prometheus metrics for this instance
     GET /service-metrics -> get prometheus metrics shared accross all instances
     GET /cpu-profile -> generate and fetch a CPU profile
-    GET /heap-snapshot -> generate and fetch a sampled heap allocation snapshot
-    GET /heap-snapshot-all -> generate and fetch a sampled heap allocation snapshot including objects collected by GC
+    GET /heap-profile -> generate and fetch a sampled heap allocation snapshot
+    GET /heap-profile-all -> generate and fetch a sampled heap allocation snapshot including objects collected by GC
 `)
 }
 export const stopObserver = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-node",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Small nodejs related utility functions for the data-fair stack.",
   "main": "index.js",
   "files": [