@futdevpro/nts-dynamo 1.4.7 → 1.4.8

package/src/_models/fullstack/data-models/usage-session.ts

@@ -0,0 +1,85 @@
+
+import { GeoIpLocation } from '../control-models/geo-ip-location';
+import { Metadata } from './metadata';
+import { DynamoUsageData } from '../control-models/usage-data';
+import { DynamoBEDataParams } from '../control-models/dynamobe-data-params';
+
+export class DynamoUsageSession extends Metadata {
+  date?: string;
+  sessionStart?: Date;
+  sessionEnd?: Date;
+  address?: string;
+  issuer?: string;
+  locationData?: GeoIpLocation;
+
+  usageData?: DynamoUsageData[];
+  totalSessionTime?: number;
+  loggedInAs?: string;
+
+  constructor(
+    set?: {
+      _id?: string,
+
+      date?: string;
+      sessionStart?: Date,
+      sessionEnd?: Date,
+      address?: string,
+      issuer?: string,
+      locationData?: GeoIpLocation,
+
+      usageData?: DynamoUsageData[],
+      totalSessionTime?: number,
+      loggedInAs?: string,
+
+      __created?: Date,
+      __createdBy?: string,
+      __lastModified?: Date,
+      __lastModifiedBy?: string,
+      __v?: number
+    }
+  ) {
+    super({
+      _id: set?._id,
+      __created: set?.__created,
+      __createdBy: set?.__createdBy,
+      __lastModified: set?.__lastModified,
+      __lastModifiedBy: set?.__lastModifiedBy,
+      __v: set?.__v,
+    });
+    if (set) {
+      if (set.date) {
+        this.date = set.date;
+      } else if (set.sessionStart) {
+        this.date = set.sessionStart.toISOString().substring(0, 10);
+      }
+      this.sessionStart = set.sessionStart;
+      this.sessionEnd = set.sessionEnd;
+      this.address = set.address;
+      this.issuer = set.issuer;
+      this.locationData = set.locationData;
+
+      this.usageData = set.usageData ? set.usageData : [];
+      this.totalSessionTime = set.totalSessionTime;
+      this.loggedInAs = set.loggedInAs;
+    }
+  }
+}
+
+export const usageSessionModelParams = new DynamoBEDataParams({
+  dataName: 'usageSession',
+  modelParams: [
+    { key: 'date', type: 'string',
+      required: true, index: true
+    },
+    { key: 'sessionStart', type: 'Date',
+      required: true, index: true
+    },
+    { key: 'sessionEnd', type: 'Date' },
+    { key: 'address', type: 'string' },
+    { key: 'issuer', type: 'string' },
+    { key: 'locationData', type: 'IpApiLocation' },
+    { key: 'usageData', type: 'UsageData[]' },
+    { key: 'totalSessionTime', type: 'number' },
+    { key: 'loggedInAs', type: 'string' },
+  ]
+})

package/src/_models/index.ts

@@ -6,4 +6,16 @@ export * from './dynamobe-app-params';
 export * from './dynamobe-data-model-params';
 export * from './dynamobe-endpoint-params';
 export * from './dynamobe-global-settings';
+  // FULLSTACK - CONTROL MODELS
+export * from './fullstack/control-models/daily-usage-data';
+export * from './fullstack/control-models/dynamobe-data-property-params';
+export * from './fullstack/control-models/dynamobe-error';
+export * from './fullstack/control-models/geo-ip-location';
+export * from './fullstack/control-models/usage-action';
+export * from './fullstack/control-models/usage-data';
+export * from './fullstack/control-models/dynamobe-data-params';
+  // FULLSTACK - DATA MODELS
+export * from './fullstack/data-models/custom-data';
+export * from './fullstack/data-models/metadata';
+export * from './fullstack/data-models/usage-session';
 

package/src/_modules/api-service.index.ts

@@ -5,6 +5,7 @@ export * from '../_services/dynamobe-singleton.service';
 
 // MODELS
 export * from '../_models/dynamobe-api-call-params';
+export * from '../_models/fullstack/control-models/dynamobe-error';
 
 // ENUMS
 export * from '../_enums/http/http-call-type.enum';

package/src/_modules/auth.index.ts

@@ -2,3 +2,6 @@
 // SERVICES
 export * from '../_services/dynamobe-auth.service';
 export * from '../_services/dynamobe-shared.service';
+
+// MODELS
+export * from '../_models/fullstack/control-models/dynamobe-error';

package/src/_modules/data-models.index.ts

@@ -0,0 +1,3 @@
+
+export * from '../_models/fullstack/data-models/metadata';
+export * from '../_models/fullstack/control-models/dynamobe-data-params';

package/src/_modules/data-service.index.ts

@@ -4,3 +4,6 @@ export * from '../_services/dynamobe-data.service';
 export * from '../_services/dynamobe-db.service';
 export * from '../_services/dynamobe-global.service';
 export * from '../_services/dynamobe-shared.service';
+
+// MODELS
+export * from '../_models/fullstack/control-models/dynamobe-error';

package/src/_modules/test/custom-data.service.ts

@@ -1,8 +1,7 @@
 
 
 
-import { CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo';
-
+import { CustomData, customDataModelParams } from '../../_models/fullstack/data-models/custom-data';
 import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
 
 export class CustomDataService extends DynamoBEDataService<CustomData> {

package/src/_modules/test/get-test-routing-module.ts

@@ -1,6 +1,5 @@
 
-import { testModuleSettings } from '@futdevpro/fsm-dynamo';
-
+import { testModuleSettings } from '../../_constants/fullstack/module-settings/test-module-settings';
 import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
 import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
 import { TestController } from './test-controller';

package/src/_modules/test/index.ts

@@ -3,4 +3,6 @@
 export * from './test-controller';
 export * from './custom-data.service';
 export * from './get-test-routing-module';
+export * from '../../_models/fullstack/data-models/custom-data';
+export * from '../../_constants/fullstack/module-settings/test-module-settings';
 

package/src/_modules/test/test-controller.ts

@@ -1,7 +1,6 @@
 
 import { Request, Response } from 'express';
-import { testModuleSettings } from '@futdevpro/fsm-dynamo';
-
+import { testModuleSettings } from '../../_constants/fullstack/module-settings/test-module-settings';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
 import { DynamoBEController } from '../../_services/dynamobe-controller.service';

package/src/_modules/usage/get-usage-routing-module.ts

@@ -1,6 +1,5 @@
 
-import { usageModuleSettings } from '@futdevpro/fsm-dynamo';
-
+import { usageModuleSettings } from '../../_constants/fullstack/module-settings/usage-module-settings';
 import { DynamoBERouteSecurity } from '../../_enums/dynamobe-route-security.enum';
 import { DynamoBERoutingModule, DynamoBERoutingModuleSettings } from '../../_services/dynamobe-routing-module.service';
 import { UsageController } from './usage-controller';

package/src/_modules/usage/index.ts

@@ -3,4 +3,6 @@
 export * from './usage-controller';
 export * from './usage.service';
 export * from './get-usage-routing-module';
+export * from '../../_models/fullstack/data-models/usage-session';
+export * from '../../_constants/fullstack/module-settings/usage-module-settings';
 

package/src/_modules/usage/usage-controller.ts

@@ -1,9 +1,9 @@
 
 import { Request, Response } from 'express';
-import { usageModuleSettings, DynamoUsageSession } from '@futdevpro/fsm-dynamo';
-
+import { usageModuleSettings } from '../../_constants/fullstack/module-settings/usage-module-settings';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
+import { DynamoUsageSession } from '../../_models/fullstack/data-models/usage-session';
 import { DynamoBEAuthService } from '../../_services/dynamobe-auth.service';
 import { DynamoBEController } from '../../_services/dynamobe-controller.service';
 import { DBE_Global_S } from '../../_services/dynamobe-global.service';

package/src/_modules/usage/usage.service.ts

@@ -1,10 +1,11 @@
 
-import { Request } from 'express';
-import { DynamoUsageSession, DynamoUsageData, DailyUsageData, 
-  usageSessionModelParams, DynamoBEError } from '@futdevpro/fsm-dynamo';
-
 import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
-import { DBE_Shared_BE } from '../../_services/dynamobe-shared-be.service';
+import { DynamoBEError } from '../../_models/fullstack/control-models/dynamobe-error';
+import { DBE_Shared } from '../../_services/dynamobe-shared.service';
+import { Request } from 'express';
+import { DynamoUsageData } from '../../_models/fullstack/control-models/usage-data';
+import { DailyUsageData } from '../../_models/fullstack/control-models/daily-usage-data';
+import { DynamoUsageSession, usageSessionModelParams } from '../../_models/fullstack/data-models/usage-session';
 
 export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
   usageData: DynamoUsageData[] = [];
@@ -27,8 +28,8 @@ export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
 
   getLocationDataFromRequest(req: Request): void {
     try {
-      this.data.address = DBE_Shared_BE.getIpFromRequest(req);
-      this.data.locationData = DBE_Shared_BE.getLocationDataByRequest(req);
+      this.data.address = DBE_Shared.getIpFromRequest(req);
+      this.data.locationData = DBE_Shared.getLocationDataByRequest(req);
 
       /* console.log(`...getLocationDataFromRequest... ip: ${this.data.address}`, this.data.locationData); */
     } catch (error) {
@@ -39,7 +40,7 @@ export class UsageService extends DynamoBEDataService<DynamoUsageSession> {
   async getLastWeekUsage(): Promise<void> {
     try {
       await this.dataDBService.find({
-        sessionStart: { $gte: DBE_Shared_BE.oneWeekAgo() }
+        sessionStart: { $gte: DBE_Shared.oneWeekAgo() }
       }).then((res: DynamoUsageSession[]) => {
         this.dataList = res;
       });

package/src/_services/dynamobe-api.service.ts

@@ -1,10 +1,9 @@
 
 import * as Axios from 'axios';
-import { DynamoBEError } from '@futdevpro/fsm-dynamo';
-
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { HttpResponseType } from '../_enums/http/http-response-type.enum';
 import { DynamoBEApiCallParams } from '../_models/dynamobe-api-call-params';
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DBE_Shared } from './dynamobe-shared.service';
 
 export class DynamoBEApiService {

package/src/_services/dynamobe-auth.service.ts

@@ -1,7 +1,6 @@
 
 import { NextFunction, Request, Response } from 'express';
-import { DynamoBEError } from '@futdevpro/fsm-dynamo';
-
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DynamoBESingletonService } from './dynamobe-singleton.service';
 
 /**

package/src/_services/dynamobe-data.service.ts

@@ -1,9 +1,10 @@
 
-import { Metadata, DynamoBEDataPropertyParams, DynamoBEDataParams, 
-  DynamoBEError } from '@futdevpro/fsm-dynamo';
-  
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
+import { Metadata } from '../_models/fullstack/data-models/metadata';
 import { DynamoBEDBService } from './dynamobe-db.service';
+import { DynamoBEDataPropertyParams } from '../_models/fullstack/control-models/dynamobe-data-property-params';
 import { DBE_Global_S } from './dynamobe-global.service';
+import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
 
 export class DynamoBEDataService<T extends Metadata> {
   dataDBService: DynamoBEDBService<T>;

package/src/_services/dynamobe-db.service.ts

@@ -1,8 +1,10 @@
 
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
-import { Metadata, DynamoBEDataParams, DynamoBEError, 
-  DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
+import { Metadata } from '../_models/fullstack/data-models/metadata';
+import { DynamoBEDataPropertyParams } from '../_models/fullstack/control-models/dynamobe-data-property-params';
+import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
 
 export class DynamoBEDBService<T extends Metadata> {
   dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());

package/src/_services/dynamobe-email.service.ts

@@ -3,8 +3,7 @@ import * as FileSystem from 'fs';
 import * as Path from 'path';
 import * as NodeMailer from 'nodemailer';
 import { Options as MailOptions, Attachment } from 'nodemailer/lib/mailer';
-import { DynamoBEError } from '@futdevpro/fsm-dynamo';
-
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DBE_Shared } from './dynamobe-shared.service';
 
 export class DynamoBEEmailService {

package/src/_services/dynamobe-global.service.ts

@@ -1,12 +1,12 @@
 
 
-import { DynamoBEDataParams, Metadata } from '@futdevpro/fsm-dynamo';
-
+import { Metadata } from '../_models/fullstack/data-models/metadata';
 import { DynamoBEAuthService } from './dynamobe-auth.service';
 import { DynamoBEDBServiceCollection } from './dynamobe-db-service-collection.service';
 import { DynamoBEDBService } from './dynamobe-db.service';
 import { DynamoBEEmailServiceCollection } from './dynamobe-email-service-collection.service';
 import { DynamoBESingletonService } from './dynamobe-singleton.service';
+import { DynamoBEDataParams } from '../_models/fullstack/control-models/dynamobe-data-params';
 
 /**
  * This is the main Global/Core Service Collection used by DynamoBE, 

package/src/_services/dynamobe-routing-module.service.ts

@@ -1,11 +1,10 @@
 
 import { Router } from 'express';
-import { DynamoBEError } from '@futdevpro/fsm-dynamo';
-
 import { dynamoBEGlobalSettings } from '../_constants/dynamobe-global.settings';
 import { DynamoBERouteSecurity } from '../_enums/dynamobe-route-security.enum';
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../_models/dynamobe-endpoint-params';
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
 import { DynamoBEController } from './dynamobe-controller.service';
 import { DBE_Shared } from './dynamobe-shared.service';
 

package/src/_services/dynamobe-shared-be.service.ts

@@ -2,9 +2,9 @@
 import * as ReadLine from 'readline';
 import { Request } from 'express';
 import * as GeoIp from 'geoip-lite';
-import { GeoIpLocation } from '@futdevpro/fsm-dynamo';
 
 import { DBE_Shared } from './dynamobe-shared.service';
+import { GeoIpLocation } from '../_models/fullstack/control-models/geo-ip-location';
 
 export class DBE_Shared_BE extends DBE_Shared {
 

package/src/_services/dynamobe-shared.service.ts

@@ -1,7 +1,19 @@
 
-import { LocationCoordinates, DynamoBEError, 
-  year, hour, day, week, month } from '@futdevpro/fsm-dynamo';
+import * as ReadLine from 'readline';
+import { Request } from 'express';
+import * as GeoIp from 'geoip-lite';
+
+import { GeoIpLocation } from '../_models/fullstack/control-models/geo-ip-location';
 import { LogStyle } from '../_enums/log-style.enum';
+import { DynamoBEError } from '../_models/fullstack/control-models/dynamobe-error';
+
+export const second = 1000;
+export const minute = second * 60;
+export const hour = minute * 60;
+export const day = hour * 24;
+export const week = day * 7;
+export const month = day * 30.4368499;
+export const year = day * 365.242199;
 
 export class DBE_Shared {
 
@@ -217,6 +229,33 @@ export class DBE_Shared {
     return new Date(+new Date() - year);
   }
 
+  static getIpFromRequest(request: Request): string {
+    /* console.log('TESTTTT route:\n', 
+      `\n|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||\n
+      HEADERS\n`, request.headers,
+      `\n|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||\n
+      ELSE\n`, 
+      `\nremote `, request.socket.remoteAddress,
+      `\nlocal  `, request.socket.localAddress,
+    ); */
+
+    let ip: string;
+    if (request.headers['x-forwarded-for']) {
+      const route: string[] = (request.headers['x-forwarded-for'] as string).split(', ');
+      console.log('TESTTTT route:', route);
+      ip = route[route.length - 1];
+    } else {
+      ip = request.socket.remoteAddress;
+    }
+
+    /* console.log(`ip from request: ${ip}`); */
+    return ip;
+  }
+
+  static getLocationDataByRequest(request: Request): GeoIpLocation {
+    return GeoIp.lookup(this.getIpFromRequest(request));
+  }
+
   static setLogStyle(styles: LogStyle[]): void {
     let styleSets = '';
     styles.forEach((style: LogStyle) => {
@@ -263,5 +302,27 @@ export class DBE_Shared {
       console.warn(`${LogStyle.yellow}${LogStyle.bright}${message}${LogStyle.reset}`);
     }
   }
+
+  static async prompt(question: string): Promise<string> {
+    const readLine = ReadLine.createInterface({ 
+      input: process.stdin, 
+      output: process.stdout 
+    });
+    
+    return new Promise((resolve, reject) => {
+      try {
+        readLine.question(question, (result: string) => {
+          resolve(result);
+          readLine.close();
+        });
+      } catch (error) {
+        reject(error);
+      }
+    });
+  }
 }
 
+export interface LocationCoordinates {
+  longitude: number;
+  latitude: number;
+}

package/src/_services/index.ts

@@ -13,8 +13,29 @@ export * from './dynamobe-email-service-collection.service';
 export * from './dynamobe-email.service';
 export * from './dynamobe-global.service';
 export * from './dynamobe-routing-module.service';
-export * from './dynamobe-shared.service';
 export * from './dynamobe-shared-be.service';
+export * from './dynamobe-shared.service';
 export * from './dynamobe-singleton.service';
 
+/* 
+import { DynamoBEApiService } from './dynamobe-api.service';
+import { DynamoBEApp } from './dynamobe-app';
+import { DynamoBEAuthService } from './dynamobe-auth.service';
+import { DynamoBEController } from './dynamobe-controller.service';
+import { DynamoBEDataService } from './dynamobe-data.service';
+import { DynamoBEDBServiceCollection } from './dynamobe-db-service-collection.service';
+import { DynamoBEDBService } from './dynamobe-db.service';
+import { DynamoBEEmailServiceCollection } from './dynamobe-email-service-collection.service';
+import { DynamoBEEmailService } from './dynamobe-email.service';
+import { DBE_Global_S } from './dynamobe-global.service';
+import { DynamoBERountingModule } from './dynamobe-routing-module.service';
+import { DynamoBEServer } from './dynamobe-server';
+import { DBE_Shared } from './dynamobe-shared.service';
+import { DynamoBESingletonService } from './dynamobe-singleton.service';
 
+module.exports = {
+  DynamoBEApiService, DynamoBEApp, DynamoBEAuthService, DynamoBEController,
+  DynamoBEDataService, DynamoBEDBServiceCollection, DynamoBEDBService, 
+  DynamoBEEmailServiceCollection, DynamoBEEmailService, DBE_Global_S,
+  DynamoBERountingModule, DynamoBEServer, DBE_Shared, DynamoBESingletonService
+} */

package/src/index.ts

@@ -15,3 +15,9 @@ export * from './_services';
 export * from './_modules/test/index';
 export * from './_modules/usage/index';
 
+/* export * from './_modules/app.index';
+export * from './_modules/api-service.index';
+export * from './_modules/auth.index';
+export * from './_modules/controller.index';
+export * from './_modules/data-models.index';
+export * from './_modules/data-service.index'; */

package/tsconfig.json

@@ -6,6 +6,7 @@
     "lib": [
       "es6",
       "es2018",
+      "es2020",
       "dom"
     ],     
     "allowJs": true,