feat(servers): get base url in a generic manner

SteveVanOpstal · Jun 2, 2016 · 2a22be0 · 2a22be0
1 parent 0af0e4f
commit 2a22be0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/src/server/match.ts b/src/server/match.ts
@@ -120,8 +120,7 @@ export class Match {
   }
 
   private getMatchList(region, summonerId, championKey, callback: CallBack) {
-    let baseUrl = this.server.config.protocol + this.server.getHostname(region) + '/api/lol';
-    let path = baseUrl + region + '/' + settings.apiVersions.matchlist + 'matchlist/by-summoner/' + summonerId;
+    let path = this.server.getBaseUrl(region) + '/' + settings.apiVersions.matchlist + 'matchlist/by-summoner/' + summonerId;
     this.server.sendRequest(path, region, (res: HostResponse) => {
       if (res.success && res.json.totalGames >= config.games.min) {
         return callback(undefined, res.json);
@@ -174,8 +173,7 @@ export class Match {
   }
 
   private getMatch(region: string, summonerId: number, matchId: number, callback: CallBack) {
-    let baseUrl = this.server.config.protocol + this.server.getHostname(region) + '/api/lol';
-    let path = baseUrl + region + '/' + settings.apiVersions.match + 'match' + matchId + '?includeTimeline=true';
+    let path = this.server.getBaseUrl(region) + '/' + settings.apiVersions.match + 'match' + matchId + '?includeTimeline=true';
     this.server.sendRequest(path, region, (res: HostResponse) => {
       if (res.success) {
         callback(undefined, res.json);

diff --git a/src/server/server.ts b/src/server/server.ts
@@ -85,8 +85,12 @@ export class Server {
     this.sendHttpsRequest(options, callback);
   }
 
+  public getBaseUrl(region?: string) {
+    return this.config.protocol + this.getHostname(region) + '/api/lol' + (region ? region : '');
+  }
+
   public getHostname(region?: string) {
-    return region ? region : 'global' + this.config.hostname;
+    return (region ? region : 'global') + this.config.hostname;
   }
 
   public setCache(url: string, data: any): void {

diff --git a/src/server/static-server.ts b/src/server/static-server.ts
@@ -5,7 +5,7 @@ import {settings} from '../../config/settings';
 
 let server = new Server(settings.staticServer.host, settings.staticServer.port);
 
-let baseUrl = server.config.protocol + server.getHostname() + '/api/lol';
+let baseUrl = server.getBaseUrl();
 
 server.run((request: IncomingMessage, response: ServerResponse) => {
   let pathname = getPathname(request.url);

diff --git a/src/server/summoner.ts b/src/server/summoner.ts
@@ -20,8 +20,7 @@ export class Summoner {
   }
 
   public getData(region: string, name: string, callback: (response: HostResponse) => void) {
-    let baseUrl = this.server.config.protocol + this.server.getHostname(region) + '/api/lol';
-    let path = baseUrl + region + '/' + settings.apiVersions.summoner + '/summoner/by-name/' + name;
+    let path = this.server.getBaseUrl(region) + '/' + settings.apiVersions.summoner + '/summoner/by-name/' + name;
     this.server.sendRequest(path, region, callback);
   }
 }