feat: add geoip and update migration and repository export

tinylog · Mar 12, 2018 · 66503c4 · 66503c4
1 parent 0875010
commit 66503c4
Show file tree

Hide file tree

Showing 16 changed files with 245 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -25,11 +25,13 @@
   },
   "dependencies": {
     "@types/crypto-js": "^3.1.38",
+    "@types/geoip-lite": "^1.1.29",
     "@types/ioredis": "^3.2.5",
     "class-transformer": "^0.1.9",
     "class-validator": "^0.8.1",
     "config": "^1.30.0",
     "crypto-js": "^3.1.9-1",
+    "geoip-lite": "^1.2.1",
     "ioredis": "^3.2.2",
     "kcors": "^2.2.1",
     "koa": "^2.5.0",

diff --git a/src/controllers/Log.ts b/src/controllers/Log.ts
@@ -1,11 +1,12 @@
 import { Service, Inject } from 'typedi';
-import { JsonController, Post, Body, HeaderParam, State, UseBefore } from 'routing-controllers';
+import { JsonController, Post, Body, HeaderParam, State, UseBefore, Ctx } from 'routing-controllers';
 import { IInitialize, IPageInfo, IAssetsInfo, IExit } from '../interfaces/Log';
 import { Description, ResType } from 'routing-controllers-openapi-v3';
 import { LogService } from '../services/LogService';
 import { IToken, IPageId } from '../interfaces/Helper';
 import hostInject from '../middlewares/hostInject';
 import sessionInject from '../middlewares/sessionInject';
+import { Context } from 'koa';
 
 @Service()
 @JsonController('/log')
@@ -17,11 +18,12 @@ export class LogController {
   @Post('/initialize')
   @UseBefore(hostInject())
   async initialize(
+    @Ctx() ctx: Context,
     @Body() body: IInitialize,
     @State('hostId') hostId: string,
     @HeaderParam('Authorization') token?: string
   ): Promise<IToken> {
-    return await this.logService.initialize(body, hostId, token);
+    return await this.logService.initialize(body, ctx.ip, hostId, token);
   }
 
   @Description(`页面数据`)

diff --git a/src/entities/Visiter.ts b/src/entities/Visiter.ts
@@ -8,7 +8,16 @@ export default class Visiter {
   @Column() lang: string;
 
   /** 地区 */
-  @Column() location: string;
+  @Column() region: string;
+
+  /** 国家 */
+  @Column() country: string;
+
+  /** LL */
+  @Column('json') ll: string[];
+
+  /** range */
+  @Column('json') range: string[];
 
   /** 城市 */
   @Column() city: string;

diff --git a/src/index.ts b/src/index.ts
@@ -19,6 +19,7 @@ useContainerForOrm(Container);
 
 const app = new Koa();
 
+app.proxy = true;
 app.use(logger());
 app.use(errorCatch());
 

diff --git a/src/middlewares/hostInject.ts b/src/middlewares/hostInject.ts
@@ -1,7 +1,7 @@
 import { Context } from 'koa';
 import Cache from '../libraries/Cache';
 import { getCustomRepository } from 'typeorm';
-import { HostRepository } from '../repositories/HostRepository';
+import HostRepository from '../repositories/HostRepository';
 import { BadRequestError } from 'routing-controllers';
 
 /**

diff --git a/src/migrations/1520751870576-Initialize.ts b/src/migrations/1520751870576-Initialize.ts
@@ -1,6 +1,6 @@
 import { MigrationInterface, QueryRunner, getCustomRepository } from 'typeorm';
-import { HostRepository } from '../repositories/HostRepository';
-import { UserRepository } from '../repositories/UserRepository';
+import HostRepository from '../repositories/HostRepository';
+import UserRepository from '../repositories/UserRepository';
 import { SHA256 } from 'crypto-js';
 
 export class Initialize1520751870576 implements MigrationInterface {

diff --git a/src/migrations/1520833483738-Update.ts b/src/migrations/1520833483738-Update.ts
@@ -0,0 +1,67 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class Update1520833483738 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.query('ALTER TABLE `visiter` DROP COLUMN `location`');
+    await queryRunner.query('ALTER TABLE `visiter` ADD `region` varchar(255) NOT NULL');
+    await queryRunner.query('ALTER TABLE `visiter` ADD `country` varchar(255) NOT NULL');
+    await queryRunner.query('ALTER TABLE `visiter` ADD `ll` json NOT NULL');
+    await queryRunner.query('ALTER TABLE `visiter` ADD `range` json NOT NULL');
+    await queryRunner.query('ALTER TABLE `page` DROP FOREIGN KEY `FK_3b8c31625c102e69e9ba2563a6f`');
+    await queryRunner.query('ALTER TABLE `page` DROP FOREIGN KEY `FK_44c49cb9fa857c96310cc304a4f`');
+    await queryRunner.query('ALTER TABLE `page` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `page` ADD PRIMARY KEY (`id`, `visiterId`)');
+    await queryRunner.query('ALTER TABLE `page` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `page` ADD PRIMARY KEY (`id`, `hostId`)');
+    await queryRunner.query('ALTER TABLE `asset` DROP FOREIGN KEY `FK_877c8bfeaa7212ecd08b046a983`');
+    await queryRunner.query('ALTER TABLE `asset` DROP FOREIGN KEY `FK_8fca349ca0e1e30be543a8fd5e5`');
+    await queryRunner.query('ALTER TABLE `asset` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `asset` ADD PRIMARY KEY (`id`, `hostId`)');
+    await queryRunner.query('ALTER TABLE `asset` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `asset` ADD PRIMARY KEY (`id`, `visiterId`)');
+    await queryRunner.query(
+      'ALTER TABLE `page` ADD CONSTRAINT `FK_44c49cb9fa857c96310cc304a4f` FOREIGN KEY (`visiterId`) REFERENCES `visiter`(`id`)'
+    );
+    await queryRunner.query(
+      'ALTER TABLE `page` ADD CONSTRAINT `FK_3b8c31625c102e69e9ba2563a6f` FOREIGN KEY (`hostId`) REFERENCES `host`(`id`)'
+    );
+    await queryRunner.query(
+      'ALTER TABLE `asset` ADD CONSTRAINT `FK_877c8bfeaa7212ecd08b046a983` FOREIGN KEY (`visiterId`) REFERENCES `visiter`(`id`)'
+    );
+    await queryRunner.query(
+      'ALTER TABLE `asset` ADD CONSTRAINT `FK_8fca349ca0e1e30be543a8fd5e5` FOREIGN KEY (`hostId`) REFERENCES `host`(`id`)'
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.query('ALTER TABLE `asset` DROP FOREIGN KEY `FK_8fca349ca0e1e30be543a8fd5e5`');
+    await queryRunner.query('ALTER TABLE `asset` DROP FOREIGN KEY `FK_877c8bfeaa7212ecd08b046a983`');
+    await queryRunner.query('ALTER TABLE `page` DROP FOREIGN KEY `FK_3b8c31625c102e69e9ba2563a6f`');
+    await queryRunner.query('ALTER TABLE `page` DROP FOREIGN KEY `FK_44c49cb9fa857c96310cc304a4f`');
+    await queryRunner.query('ALTER TABLE `asset` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `asset` ADD PRIMARY KEY (`id`, `visiterId`, `hostId`)');
+    await queryRunner.query('ALTER TABLE `asset` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `asset` ADD PRIMARY KEY (`id`, `visiterId`, `hostId`)');
+    await queryRunner.query(
+      'ALTER TABLE `asset` ADD CONSTRAINT `FK_8fca349ca0e1e30be543a8fd5e5` FOREIGN KEY (`hostId`) REFERENCES `host`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT'
+    );
+    await queryRunner.query(
+      'ALTER TABLE `asset` ADD CONSTRAINT `FK_877c8bfeaa7212ecd08b046a983` FOREIGN KEY (`visiterId`) REFERENCES `visiter`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT'
+    );
+    await queryRunner.query('ALTER TABLE `page` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `page` ADD PRIMARY KEY (`id`, `hostId`, `visiterId`)');
+    await queryRunner.query('ALTER TABLE `page` DROP PRIMARY KEY');
+    await queryRunner.query('ALTER TABLE `page` ADD PRIMARY KEY (`id`, `hostId`, `visiterId`)');
+    await queryRunner.query(
+      'ALTER TABLE `page` ADD CONSTRAINT `FK_44c49cb9fa857c96310cc304a4f` FOREIGN KEY (`visiterId`) REFERENCES `visiter`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT'
+    );
+    await queryRunner.query(
+      'ALTER TABLE `page` ADD CONSTRAINT `FK_3b8c31625c102e69e9ba2563a6f` FOREIGN KEY (`hostId`) REFERENCES `host`(`id`) ON DELETE RESTRICT ON UPDATE RESTRICT'
+    );
+    await queryRunner.query('ALTER TABLE `visiter` DROP COLUMN `range`');
+    await queryRunner.query('ALTER TABLE `visiter` DROP COLUMN `ll`');
+    await queryRunner.query('ALTER TABLE `visiter` DROP COLUMN `country`');
+    await queryRunner.query('ALTER TABLE `visiter` DROP COLUMN `region`');
+    await queryRunner.query('ALTER TABLE `visiter` ADD `location` varchar(255) NOT NULL');
+  }
+}
diff --git a/src/repositories/AssetRepository.ts b/src/repositories/AssetRepository.ts
@@ -2,4 +2,4 @@ import { EntityRepository, Repository } from 'typeorm';
 import Asset from '../entities/Asset';
 
 @EntityRepository(Asset)
-export class AssetRepository extends Repository<Asset> {}
+export default class AssetRepository extends Repository<Asset> {}
diff --git a/src/repositories/HostRepository.ts b/src/repositories/HostRepository.ts
@@ -2,4 +2,4 @@ import { EntityRepository, Repository } from 'typeorm';
 import Host from '../entities/Host';
 
 @EntityRepository(Host)
-export class HostRepository extends Repository<Host> {}
+export default class HostRepository extends Repository<Host> {}
diff --git a/src/repositories/PageRepository.ts b/src/repositories/PageRepository.ts
@@ -2,4 +2,4 @@ import { EntityRepository, Repository } from 'typeorm';
 import Page from '../entities/Page';
 
 @EntityRepository(Page)
-export class PageRepository extends Repository<Page> {}
+export default class PageRepository extends Repository<Page> {}
diff --git a/src/repositories/SessionRepository.ts b/src/repositories/SessionRepository.ts
@@ -6,7 +6,7 @@ import { MD5 } from 'crypto-js';
 import Host from '../entities/Host';
 
 @EntityRepository(Session)
-export class SessionRepository extends Repository<Session> {
+export default class SessionRepository extends Repository<Session> {
   async newSession(visiter: Visiter, host: Host, referrer: string) {
     const token = MD5(visiter.id + host.id + Date.now().toString()).toString();
     const session = await this.create({

diff --git a/src/repositories/UserRepository.ts b/src/repositories/UserRepository.ts
@@ -2,4 +2,4 @@ import { EntityRepository, Repository } from 'typeorm';
 import User from '../entities/User';
 
 @EntityRepository(User)
-export class UserRepository extends Repository<User> {}
+export default class UserRepository extends Repository<User> {}
diff --git a/src/repositories/VisiterRepository.ts b/src/repositories/VisiterRepository.ts
@@ -3,13 +3,16 @@ import Visiter from '../entities/Visiter';
 import Cache from '../libraries/Cache';
 
 @EntityRepository(Visiter)
-export class VisiterRepository extends Repository<Visiter> {
-  async getVisiterByToken(token: string) {
+export default class VisiterRepository extends Repository<Visiter> {
+  async getVisiterByToken(token: string, ip: string) {
     const visiterId = await Cache.Instance.get(`TOKEN:${token}`);
     if (!visiterId) {
       return undefined;
     }
 
-    return await this.findOne(visiterId);
+    return await this.findOne({
+      id: visiterId,
+      ip
+    });
   }
 }
diff --git a/src/services/LogService.ts b/src/services/LogService.ts
@@ -1,13 +1,14 @@
 import { Service } from 'typedi';
+import * as geoip from 'geoip-lite';
 import { IInitialize, IPageInfo, IAssetsInfo, IExit } from '../interfaces/Log';
-import { SessionRepository } from '../repositories/SessionRepository';
+import SessionRepository from '../repositories/SessionRepository';
 import { getCustomRepository } from 'typeorm';
-import { VisiterRepository } from '../repositories/VisiterRepository';
+import VisiterRepository from '../repositories/VisiterRepository';
 import { IToken, IPageId } from '../interfaces/Helper';
-import { PageRepository } from '../repositories/PageRepository';
+import PageRepository from '../repositories/PageRepository';
 import { BadRequestError } from 'routing-controllers';
-import { HostRepository } from '../repositories/HostRepository';
-import { AssetRepository } from '../repositories/AssetRepository';
+import HostRepository from '../repositories/HostRepository';
+import AssetRepository from '../repositories/AssetRepository';
 
 @Service()
 export class LogService {
@@ -17,22 +18,29 @@ export class LogService {
   hostRepository: HostRepository = getCustomRepository(HostRepository);
   assetRepository: AssetRepository = getCustomRepository(AssetRepository);
 
-  async initialize(body: IInitialize, hostId: string, preToken?: string): Promise<IToken> {
+  async initialize(body: IInitialize, ip: string, hostId: string, preToken?: string): Promise<IToken> {
     const host = await this.hostRepository.findOne(hostId);
 
     if (!host) {
       throw new BadRequestError('Host is not registed');
     }
 
-    const visiter = preToken && (await this.visiterRepository.getVisiterByToken(preToken));
+    // TOKEN 有效（复用 Visiter）前提是 Token 正确且对应的 Visiter 的 IP 地址和现在的相同
+    const visiter = preToken && (await this.visiterRepository.getVisiterByToken(preToken, ip));
 
     if (visiter) {
       const token = await this.sessionRepository.newSession(visiter, host, body.referrer);
       return {
         token
       };
     } else {
-      const newVisiter = await this.visiterRepository.create(body);
+      const geo = geoip.lookup(ip);
+      const newVisiter = await this.visiterRepository.create({
+        lang: body.lang,
+        ua: body.ua,
+        os: body.os,
+        ...geo
+      });
       const token = await this.sessionRepository.newSession(newVisiter, host, body.referrer);
       return {
         token

diff --git a/tslint.json b/tslint.json
@@ -7,6 +7,7 @@
     "object-literal-sort-keys": false,
     "member-access": false,
     "semicolon": [true, "always"],
-    "max-classes-per-file": false
+    "max-classes-per-file": false,
+    "no-console": false
   }
 }