@futdevpro/nts-dynamo 1.4.7 → 1.4.9

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@futdevpro/nts-dynamo",
-  "version": "01.04.07",
+  "version": "01.04.09",
   "description": "Dynamic NodeTS (NodeJS-Typescript), MongoDB Backend System Framework by Future Development Ltd.",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "build": "npx tsc",
     "postbuild": "npm publish"
   },
@@ -42,6 +41,7 @@
       "types": "./lib/_services/index.d.ts",
       "typings": "./lib/_services/index.d.ts"
     },
+
     "./test-module": {
       "default": "./lib/_modules/test/index.js",
       "module": "./lib/_modules/test/index.js",
@@ -54,6 +54,7 @@
       "types": "./lib/_modules/usage/index.d.ts",
       "typings": "./lib/_modules/usage/index.d.ts"
     },
+
     "./app": {
       "default": "./lib/_modules/app.index.js",
       "module": "./lib/_modules/app.index.js",
@@ -78,6 +79,12 @@
       "types": "./lib/_modules/controller.index.d.ts",
       "typings": "./lib/_modules/controller.index.d.ts"
     },
+    "./data-models": {
+      "default": "./lib/_modules/data-models.index.js",
+      "module": "./lib/_modules/data-models.index.js",
+      "types": "./lib/_modules/data-models.index.d.ts",
+      "typings": "./lib/_modules/data-models.index.d.ts"
+    },
     "./data-service": {
       "default": "./lib/_modules/data-service.index.js",
       "module": "./lib/_modules/data-service.index.js",
@@ -99,12 +106,14 @@
       "services": [
         "lib/_services/index.d.ts"
       ],
+
       "test-module": [
         "lib/_modules/test/index.d.ts"
       ],
       "usage-module": [
         "lib/_modules/usage/index.d.ts"
       ],
+
       "app": [
         "lib/_modules/app.index.d.ts"
       ],
@@ -117,6 +126,9 @@
       "controller": [
         "lib/_modules/controller.index.d.ts"
       ],
+      "data-models": [
+        "lib/_modules/data-models.index.d.ts"
+      ],
       "data-service": [
         "lib/_modules/data-service.index.d.ts"
       ]
@@ -141,7 +153,7 @@
   },
   "homepage": "https:/futdevpro.hu/projects/dynamo",
   "peerDependencies": {
-    "@futdevpro/fsm-dynamo": "~1.0.11",
+    "@futdevpro/fsm-dynamo": "~1.0.21",
     "@types/express": "~4.17.7",
     "@types/geoip-lite": "~1.4.1",
     "@types/nodemailer": "~6.4.4",

package/src/_constants/dynamobe-global.settings.ts

@@ -1,3 +1,4 @@
+
 import { DynamoBERouteSecurity } from '../_enums/dynamobe-route-security.enum';
 import { DynamoBEGlobalSettings } from '../_models/dynamobe-global-settings';
 

package/src/_models/dynamobe-data-model-params.ts

@@ -1,6 +1,5 @@
-
-import { DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
-
+/* 
+export { DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
 import { DataModelType } from '../_enums/data-model-type.enum';
 
 export class DynamoBEDataModelParams {
@@ -22,3 +21,4 @@ export class DynamoBEDataModelParams {
     }
   }
 }
+ */

package/src/_models/dynamobe-endpoint-params.ts

@@ -1,6 +1,7 @@
 
 
 import { NextFunction, Request, Response } from 'express';
+
 import { HttpCallType } from '../_enums/http/http-call-type.enum';
 import { DynamoBERouteSecurity as DynamoBERouteSecurity } from '../_enums/dynamobe-route-security.enum';
 import { DBE_Shared } from '../_services/dynamobe-shared.service';

package/src/_models/index.ts

@@ -3,7 +3,7 @@
 // MODELS
 export * from './dynamobe-api-call-params';
 export * from './dynamobe-app-params';
-export * from './dynamobe-data-model-params';
+/* export * from './dynamobe-data-model-params'; */
 export * from './dynamobe-endpoint-params';
 export * from './dynamobe-global-settings';
 

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 '@futdevpro/fsm-dynamo/error-module';
 
 // 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 '@futdevpro/fsm-dynamo/error-module';

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 '@futdevpro/fsm-dynamo/error-module';

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

@@ -1,8 +1,7 @@
 
 
 
-import { CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo';
-
+import { CustomData, customDataModelParams } from '@futdevpro/fsm-dynamo/test-module';
 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 '@futdevpro/fsm-dynamo/test-module';
 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

@@ -1,6 +1,6 @@
 
-// MODULES
+// TEST MODULE
 export * from './test-controller';
 export * from './custom-data.service';
 export * from './get-test-routing-module';
-
+export * from '@futdevpro/fsm-dynamo/test-module';

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 '@futdevpro/fsm-dynamo/test-module';
 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 '@futdevpro/fsm-dynamo/usage-module';
 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

@@ -1,6 +1,7 @@
 
-// MODULE
+// USAGE MODULE
 export * from './usage-controller';
 export * from './usage.service';
 export * from './get-usage-routing-module';
+export * from '@futdevpro/fsm-dynamo/usage-module';
 

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

@@ -1,7 +1,6 @@
 
 import { Request, Response } from 'express';
-import { usageModuleSettings, DynamoUsageSession } from '@futdevpro/fsm-dynamo';
-
+import { usageModuleSettings, DynamoUsageSession } from '@futdevpro/fsm-dynamo/usage-module';
 import { HttpCallType } from '../../_enums/http/http-call-type.enum';
 import { DynamoBEEndpointParams } from '../../_models/dynamobe-endpoint-params';
 import { DynamoBEAuthService } from '../../_services/dynamobe-auth.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 { DynamoBEError } from '@futdevpro/fsm-dynamo';
+import { DynamoUsageSession, usageSessionModelParams, DynamoUsageData, 
+  DailyUsageData } from '@futdevpro/fsm-dynamo/usage-module';
 
 import { DynamoBEDataService } from '../../_services/dynamobe-data.service';
-import { DBE_Shared_BE } from '../../_services/dynamobe-shared-be.service';
+import { DBE_Shared } from '../../_services/dynamobe-shared.service';
 
 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-data.service.ts

@@ -1,7 +1,6 @@
 
-import { Metadata, DynamoBEDataPropertyParams, DynamoBEDataParams, 
-  DynamoBEError } from '@futdevpro/fsm-dynamo';
-  
+import { Metadata, DynamoBEDataParams, DynamoBEDataPropertyParams, DynamoBEError } from '@futdevpro/fsm-dynamo';
+
 import { DynamoBEDBService } from './dynamobe-db.service';
 import { DBE_Global_S } from './dynamobe-global.service';
 

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

@@ -1,8 +1,7 @@
 
 import * as mongoose from 'mongoose';
 import { Schema } from 'mongoose';
-import { Metadata, DynamoBEDataParams, DynamoBEError, 
-  DynamoBEDataPropertyParams } from '@futdevpro/fsm-dynamo';
+import { Metadata, DynamoBEDataParams, DynamoBEDataPropertyParams, DynamoBEError } from '@futdevpro/fsm-dynamo';
 
 export class DynamoBEDBService<T extends Metadata> {
   dataModel = mongoose.model(this.dataParams.dbName, this.getSchema());

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

@@ -1,6 +1,6 @@
 
 
-import { DynamoBEDataParams, Metadata } from '@futdevpro/fsm-dynamo';
+import { Metadata, DynamoBEDataParams } from '@futdevpro/fsm-dynamo';
 
 import { DynamoBEAuthService } from './dynamobe-auth.service';
 import { DynamoBEDBServiceCollection } from './dynamobe-db-service-collection.service';

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

@@ -1,6 +1,10 @@
 
-import { LocationCoordinates, DynamoBEError, 
+import * as ReadLine from 'readline';
+import { Request } from 'express';
+import * as GeoIp from 'geoip-lite';
+import { DynamoBEError, GeoIpLocation, LocationCoordinates, 
   year, hour, day, week, month } from '@futdevpro/fsm-dynamo';
+
 import { LogStyle } from '../_enums/log-style.enum';
 
 export class DBE_Shared {
@@ -217,6 +221,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 +294,22 @@ 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);
+      }
+    });
+  }
+}

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,4 @@ export * from './_services';
 export * from './_modules/test/index';
 export * from './_modules/usage/index';
 
+

package/tsconfig.json

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