scheduler-node-models 1.1.8 → 1.1.10

package/general/index.d.ts

@@ -2,3 +2,4 @@ export * from './general';
 export * from './viewstate';
 export * from './emailer';
 export * from './report';
+export * from './logger';

package/general/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./general"), exports);
 __exportStar(require("./viewstate"), exports);
 __exportStar(require("./emailer"), exports);
 __exportStar(require("./report"), exports);
+__exportStar(require("./logger"), exports);

package/general/logger.d.ts

@@ -0,0 +1,10 @@
+export declare class Logger {
+    private logFile;
+    private flushInterval;
+    private buffer;
+    private interval;
+    constructor(logFile: string, flushInterval?: number);
+    log(message: string): void;
+    private flush;
+    stop(): void;
+}

package/general/logger.js

@@ -0,0 +1,67 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+const fs = __importStar(require("fs"));
+class Logger {
+    logFile;
+    flushInterval;
+    buffer = [];
+    interval;
+    constructor(logFile, flushInterval = 100) {
+        this.logFile = logFile;
+        this.flushInterval = flushInterval;
+        this.interval = setInterval(() => this.flush(), flushInterval);
+    }
+    log(message) {
+        this.buffer.push(message);
+    }
+    flush() {
+        if (this.buffer.length > 0) {
+            const logLines = this.buffer.join('\n') + '\n';
+            fs.appendFile(this.logFile, logLines, (err) => {
+                if (err) {
+                    console.error(`Error writing to log file: ${err}`);
+                }
+            });
+            this.buffer = [];
+        }
+    }
+    stop() {
+        clearInterval(this.interval);
+        this.flush();
+    }
+}
+exports.Logger = Logger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scheduler-node-models",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "main": "index.js",
   "types": "index.d.ts",
   "files": [

package/users/user.d.ts

@@ -1,4 +1,3 @@
-import { ObjectId } from "mongodb";
 /**
  * The user class and interface.
  */
@@ -7,7 +6,8 @@ import { ObjectId } from "mongodb";
  * its class object.
  */
 export interface IUser {
-    _id?: ObjectId;
+    _id?: string;
+    id: string;
     emailAddress: string;
     password?: string;
     passwordExpires: Date;
@@ -37,7 +37,7 @@ export interface IUser {
  * password change, plus token expiration date/time the reset token expires)
  */
 export declare class User implements IUser {
-    _id: ObjectId;
+    id: string;
     emailAddress: string;
     password?: string;
     passwordExpires: Date;

package/users/user.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.User = void 0;
-const mongodb_1 = require("mongodb");
-const bcrypt_1 = require("bcrypt");
+const bcrypt_ts_1 = require("bcrypt-ts");
 /**
  * This class represents a user and all the actions available to the user object.
  * The main class members are:
@@ -20,7 +19,7 @@ const bcrypt_1 = require("bcrypt");
  * password change, plus token expiration date/time the reset token expires)
  */
 class User {
-    _id;
+    id;
     emailAddress;
     password;
     passwordExpires;
@@ -33,7 +32,10 @@ class User {
     resettokenexp;
     additionalEmails;
     constructor(user) {
-        this._id = (user && user._id) ? user._id : new mongodb_1.ObjectId();
+        this.id = (user && user.id) ? user.id : '';
+        if (this.id === '') {
+            this.id = (user && user._id) ? user._id.toString() : '';
+        }
         this.emailAddress = (user) ? user.emailAddress : '';
         this.password = (user) ? user.password : undefined;
         this.passwordExpires = (user) ? new Date(user.passwordExpires) : new Date();
@@ -104,8 +106,8 @@ class User {
      * @param passwd The string value for the new password
      */
     setPassword(passwd) {
-        const salt = (0, bcrypt_1.genSaltSync)(12);
-        const result = (0, bcrypt_1.hashSync)(passwd, salt);
+        const salt = (0, bcrypt_ts_1.genSaltSync)(12);
+        const result = (0, bcrypt_ts_1.hashSync)(passwd, salt);
         this.password = result;
         this.passwordExpires = new Date();
         this.badAttempts = 0;
@@ -117,7 +119,7 @@ class User {
      * @throws An error if the account is locked or there is a mismatch with the password.
      */
     checkPassword(pwd) {
-        if (this.password && (0, bcrypt_1.compareSync)(pwd, this.password)) {
+        if (this.password && (0, bcrypt_ts_1.compareSync)(pwd, this.password)) {
             if (this.badAttempts > 2) {
                 throw new Error("Account Locked");
             }