@futdevpro/nts-dynamo 1.4.13 → 1.4.14

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

@@ -2,235 +2,11 @@
 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 { GeoIpLocation, D_Shared } from '@futdevpro/fsm-dynamo/shared-service';
 
-import { LogStyle } from '../_enums/log-style.enum';
-
-export class DBE_Shared {
-
-  /**
-   * returns remapped object list by path list
-   * @param objList object list to map
-   * @param paths string list of path etc.:
-   * [ [ 'first', 'sub', 'label' ], [ 'first', 'dif', 'name' ]] will be...
-   * from
-   *  {
-   *    first: {
-   *      sub: {
-   *        label: 'vlmi'
-   *      },
-   *      dif: {
-   *        name: 'asd'
-   *      }
-   *    }
-   *  }[]
-   * to
-   * { label: 'vlmi', name: 'asd' }[]
-   * @returns remapped object list (the final obj will use the deepest keys)
-   */
-  static mapObjList(objList: object[], paths: string[][]): object[] {
-    let newObjList = [...objList];
-    newObjList = newObjList.map(obj => {
-      const newObj = {};
-      paths.forEach((path: string[]) => {
-        newObj[path[path.length - 1]] = this.getNestedData(obj, path);
-      });
-      return newObj;
-    });
-    return newObjList;
-  }
-
-  /**
-   * returns nested value from object
-   * @param parentObj data source object
-   * @param nestedDataKeys path of value as string list
-   * etc.: ['nestLvl1', 'nestLvl2', 'nestLvl3'] as parentObj.nestLvl1.nestLvl2.nestLvl3
-   * @returns data from object by path
-   */
-  static getNestedData(parentObj: object, nestedDataKeys: string[]): any {
-    let newData = {...parentObj};
-    nestedDataKeys.forEach((dk: string) => {
-      if (newData) {
-        newData = newData[dk];
-      }
-    });
-    return newData;
-  }
-
-  /**
-   * recursive function that nests data
-   * @param newData the object that that is needed to be updated
-   * @param nestKeys the path where the data should be updated
-   * @param dataToSet the actual value that will be setted
-   * @returns modified data
-   */
-  static nestData(parentObj: object, nestKeys: string[], dataToSet: any): object {
-    const newData = {...parentObj};
-    if (nestKeys.length > 1) {
-      const keys = [...nestKeys];
-      const nextNestKey = keys.shift();
-      newData[nextNestKey] = this.nestData(newData[nextNestKey], keys, dataToSet);
-    } else {
-      newData[nestKeys[0]] = dataToSet;
-    }
-    return newData;
-  }
-
-  /**
-   * recursive function that adds to nested data
-   * @param newData the object that that is needed to be updated
-   * @param nestKeys the path where the data should be updated
-   * @param dataToAdd the actual value that will be setted
-   * @returns modified data
-   */
-  static addToNestedData(parentObj: object, nestKeys: string[], dataToAdd: any): object {
-    const newData = {...parentObj};
-    if (nestKeys.length > 1) {
-      const keys = [...nestKeys];
-      const nextNestKey = keys.shift();
-      newData[nextNestKey] = this.addToNestedData(newData[nextNestKey], keys, dataToAdd);
-    } else {
-      newData[nestKeys[0]] += dataToAdd;
-    }
-    return newData;
-  }
-
-  /**
-   * recursive function that pushes to nested data
-   * @param newData the object that that is needed to be updated
-   * @param nestKeys the path where the data should be updated
-   * @param dataToPush the actual value that will be setted
-   * @returns modified data
-   */
-  static pushToNestedData(parentObj: object, nestKeys: string[], dataToPush: any): object {
-    const newData = {...parentObj};
-    if (nestKeys.length > 1) {
-      const keys = [...nestKeys];
-      const nextNestKey = keys.shift();
-      newData[nextNestKey] = this.pushToNestedData(newData[nextNestKey], keys, dataToPush);
-    } else {
-      if (Array.isArray(newData[nestKeys[0]])) {
-        newData[nestKeys[0]].push(dataToPush);
-      } else {
-        newData[nestKeys[0]] = [dataToPush];
-      }
-    }
-    return newData;
-  }
-
-  /**
-   * recursive function that nests data on recursive data structure etc.: xData: { ..., 'nestedListKey': xData[] }
-   * @param newData the object that that is needed to be updated
-   * @param nestedListKey the location of nested dataList
-   * @param nestIndexes path to the subject ect.: xData.listKey[1].listKey[4].listKey[0] will be [1, 4, 0]
-   * @param dataToSet the actual value that will be setted on location
-   * @returns modified data
-   */
-  static nestRecursiveListedData<T>(parentObj: T, nestedListKey: string, nestIndexes: number[], dataToSet: any): T {
-    const newData = {...parentObj};
-    if (nestIndexes.length > 1) {
-      const indexes = [...nestIndexes];
-      const nextLevelKey = indexes.shift();
-      newData[nestedListKey][nextLevelKey] = this.nestRecursiveListedData(
-          newData[nestedListKey][nextLevelKey], nestedListKey, indexes, dataToSet);
-    } else {
-      newData[nestedListKey][nestIndexes[0]] = dataToSet;
-    }
-    return newData;
-  }
-
-  static getAge(birthDate: Date | number | string) {
-    return this.getYear(+new Date() - +new Date(birthDate));
-  }
-
-  static getYear(date: Date | number | string) {
-    if (typeof date === 'string') {
-      date = new Date(date);
-    }
-    return (+date  / year);
-  }
-
-  static getHour(date: Date | number | string) {
-    if (typeof date === 'string') {
-      date = new Date(date);
-    }
-    return (+date  / hour);
-  }
-
-  static getDateByAge(age: number) {
-    return new Date(+new Date() - (year * age));
-  }
-
-  static getDistanceInKilometres(
-    from: LocationCoordinates,
-    to: LocationCoordinates
-  ): number {
-
-    const R = 6371; // kilometres
-    const φ1 = this.toRadians(from.latitude);
-    const φ2 = this.toRadians(to.latitude);
-    const Δφ = this.toRadians(to.latitude - from.latitude);
-    const Δλ = this.toRadians(to.longitude - from.longitude);
-
-    const a = Math.sin(Δφ / 2) * Math.sin(Δφ / 2) +
-            Math.cos(φ1) * Math.cos(φ2) *
-            Math.sin(Δλ / 2) * Math.sin(Δλ / 2);
-    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
-    return R * c;
-  }
-
-  static getLocationDegByKilometers(latiOrLong: 'latitude' | 'longitude', distanceInKm: number, latitude?: number): number {
-    if (latiOrLong === 'latitude') {
-      return distanceInKm / 110.574;
-    } else {
-      if (latitude) {
-        return distanceInKm / (Math.cos(this.toRadians(latitude)) * 111.320);
-      } else {
-        throw new DynamoBEError({ status: 417, message: 'When using getLocationDegByKilometers for longitude, you need to give latitude!' });
-      }
-    }
-  }
-
-  static toRadians(deg: number): number {
-    return deg * (Math.PI / 180);
-  }
-
-  static addMetadataToSchema(schema: any): any {
-    schema.__created = { type: Date };
-    schema.__createdBy = { type: String };
-    schema.__lastModified = { type: Date };
-    schema.__lastModifiedBy = { type: String };
-    return schema;
-  }
-
-  static oneHourAgo(): Date {
-    return new Date(+new Date() - hour);
-  }
-  static oneDayAgo(): Date {
-    return new Date(+new Date() - day);
-  }
-  static oneWeekAgo(): Date {
-    return new Date(+new Date() - week);
-  }
-  static oneMonthAgo(): Date {
-    return new Date(+new Date() - month);
-  }
-  static oneYearAgo(): Date {
-    return new Date(+new Date() - year);
-  }
+export class DBE_Shared extends D_Shared {
 
   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(', ');
@@ -239,8 +15,6 @@ export class DBE_Shared {
     } else {
       ip = request.socket.remoteAddress;
     }
-
-    /* console.log(`ip from request: ${ip}`); */
     return ip;
   }
 
@@ -248,53 +22,6 @@ export class DBE_Shared {
     return GeoIp.lookup(this.getIpFromRequest(request));
   }
 
-  static setLogStyle(styles: LogStyle[]): void {
-    let styleSets = '';
-    styles.forEach((style: LogStyle) => {
-      styleSets += style;
-    });
-    console.log(styleSets);
-  }
-  static resetLogStyle(): void {
-    console.log(LogStyle.reset);
-  }
-
-  static logStyle(input: string, styles: LogStyle[], dontReset?: boolean): string {
-    let result = '';
-    styles.forEach((style: LogStyle) => {
-      result += style;
-    });
-    result += input;
-    if (!dontReset) {
-      result += LogStyle.reset;
-    }
-    return result;
-  }
-
-  static logSuccess(message: string, ...optionalParams: any[]): void {
-    if (0 < optionalParams.length) {
-      console.error(`${LogStyle.green}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
-    } else {
-      console.error(`${LogStyle.green}${LogStyle.bright}${message}${LogStyle.reset}`);
-    }
-  }
-
-  static logError(message: string, ...optionalParams: any[]): void {
-    if (0 < optionalParams.length) {
-      console.error(`${LogStyle.red}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
-    } else {
-      console.error(`${LogStyle.red}${LogStyle.bright}${message}${LogStyle.reset}`);
-    }
-  }
-
-  static logWarning(message: string, ...optionalParams: any[]): void {
-    if (0 < optionalParams.length) {
-      console.warn(`${LogStyle.yellow}${LogStyle.bright}${message}`, ...optionalParams, LogStyle.reset);
-    } else {
-      console.warn(`${LogStyle.yellow}${LogStyle.bright}${message}${LogStyle.reset}`);
-    }
-  }
-
   static async prompt(question: string): Promise<string> {
     const readLine = ReadLine.createInterface({ 
       input: process.stdin, 

package/src/_services/index.ts

@@ -13,29 +13,6 @@ 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-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

@@ -8,11 +8,11 @@ export * from './_enums';
 // MODELS
 export * from './_models';
 
-// SERVICES
-export * from './_services';
-
 // MODULES
 export * from './_modules/test/index';
 export * from './_modules/usage/index';
 
+// SERVICES
+export * from './_services';
+
 

package/src/_enums/log-style.enum.ts

@@ -1,30 +0,0 @@
-
-
-export enum LogStyle {
-  reset = '\x1b[0m',
-
-  bright = '\x1b[1m',
-  dim = '\x1b[2m',
-  underline = '\x1b[4m',
-  blink = '\x1b[5m',
-  reverse = '\x1b[7m',
-  hidden = '\x1b[8m',
-
-  black = '\x1b[30m',
-  red = '\x1b[31m',
-  green = '\x1b[32m',
-  yellow = '\x1b[33m',
-  blue = '\x1b[34m',
-  magenta = '\x1b[35m',
-  cyan = '\x1b[36m',
-  white = '\x1b[37m',
-
-  BgBlack = '\x1b[40m',
-  BgRed = '\x1b[41m',
-  BgGreen = '\x1b[42m',
-  BgYellow = '\x1b[43m',
-  BgBlue = '\x1b[44m',
-  BgMagenta = '\x1b[45m',
-  BgCyan = '\x1b[46m',
-  BgWhite = '\x1b[47m',
-}

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

@@ -1,44 +0,0 @@
-
-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';
-
-export class DBE_Shared_BE extends DBE_Shared {
-
-  static getIpFromRequest(request: Request): string {
-    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;
-    }
-    return ip;
-  }
-
-  static getLocationDataByRequest(request: Request): GeoIpLocation {
-    return GeoIp.lookup(this.getIpFromRequest(request));
-  }
-
-  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);
-      }
-    });
-  }
-}