Alpha-21 update

Author: kamil.mysliwiec

example/modules/users/chat.gateway.ts

@@ -1,13 +1,13 @@
-import { WebSocketGateway } from '../../../src/socket/utils/socket-gateway.decorator';
-import { SubscribeMessage } from '../../../src/socket/utils/subscribe-message.decorator';
+import { WebSocketGateway } from '../../../src/websockets/utils/socket-gateway.decorator';
+import { SubscribeMessage } from '../../../src/websockets/utils/subscribe-message.decorator';
 import { Subject } from 'rxjs/Subject';
-import { GatewayServer } from '../../../src/socket/utils/gateway-server.decorator';
+import { WebSocketServer } from '../../../src/websockets/utils/gateway-server.decorator';
 
 @WebSocketGateway({ port: 2000 })
 export class ChatGateway {
     private msg$ = new Subject<any>();
 
-    @GatewayServer server;
+    @WebSocketServer() server;
 
     get msgStream() {
         return this.msg$.asObservable();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nest.js",
-  "version": "1.0.0-alpha-20",
+  "version": "1.0.0-alpha-21",
   "description": "Modern, fast, powerful node.js web framework",
   "main": "index.js",
   "scripts": {

src/core/router/routes-resolver.ts

@@ -16,20 +16,20 @@ export class RoutesResolver {
         this.routerBuilder = new RouterBuilder(this.routerProxy, expressAdapter);
     }
 
-    resolve(expressInstance: Application) {
+    resolve(express: Application) {
         const modules = this.container.getModules();
-        modules.forEach(({ routes }) => this.setupRouters(routes, expressInstance));
+        modules.forEach(({ routes }) => this.setupRouters(routes, express));
     }
 
     setupRouters(
         routes: Map<string, InstanceWrapper<Controller>>,
-        expressInstance: Application) {
+        express: Application) {
 
         routes.forEach(({ instance, metatype }) => {
             this.logger.log(getControllerMappingMessage(metatype.name));
 
             const { path, router } = this.routerBuilder.build(instance, metatype);
-            expressInstance.use(path, router);
+            express.use(path, router);
         });
     }
 }

src/index.ts

@@ -1,10 +1,12 @@
 /*
  * Nest
- * Copyright(c) 2017 Kamil Mysliwiec
+ * Copyright(c) 2017-... Kamil Mysliwiec
  * www.kamilmysliwiec.com
  * MIT Licensed
  */
 
 export * from './common'
+export * from './core';
 export * from './nest-factory';
-export * from './core';
+export * from './nest-application'
+export * from './nest-microservice';

src/microservices/client/client-proxy.ts

@@ -7,15 +7,19 @@ export abstract class ClientProxy {
 
     send<T>(pattern, data): Observable<T> {
         return Observable.create((observer: Observer<T>) => {
-            this.sendSingleMessage({pattern, data}, (err, result) => {
-                if (err) {
-                    (<any>observer).error(err);
-                    return;
-                }
-                observer.next(result);
-                observer.complete();
-            });
+            this.sendSingleMessage({ pattern, data }, this.createObserver(observer));
         });
     }
 
+    createObserver<T>(observer: Observer<T>) {
+        return (err, result) => {
+            if (err) {
+                (<any>observer).error(err);
+                return;
+            }
+            observer.next(result);
+            observer.complete();
+        }
+    }
+
 }

src/microservices/client/client-redis.ts

@@ -7,6 +7,7 @@ export class ClientRedis extends ClientProxy {
     private readonly logger = new Logger(ClientProxy.name);
     private readonly DEFAULT_URL = 'redis://localhost:6379';
     private readonly url: string;
+
     private pub: redis.RedisClient;
     private sub: redis.RedisClient;
 
@@ -19,17 +20,27 @@ export class ClientRedis extends ClientProxy {
 
     sendSingleMessage(msg, callback: Function) {
         const pattern = JSON.stringify(msg.pattern);
-        const listener = (channel, msg) => {
+        const subscription = (channel, msg) => {
             const { err, response } = JSON.parse(msg);
             callback(err, response);
 
             this.sub.unsubscribe(this.getResPatternName(pattern));
-            this.sub.removeListener('message', listener);
+            this.sub.removeListener('message', subscription);
         };
-        this.sub.on('message', listener);
 
+        this.sub.on('message', subscription);
         this.sub.subscribe(this.getResPatternName(pattern));
         this.pub.publish(this.getAckPatternName(pattern), JSON.stringify(msg));
+
+        return subscription;
+    }
+
+    getAckPatternName(pattern: string): string {
+        return `${pattern}_ack`;
+    }
+
+    getResPatternName(pattern: string): string {
+        return `${pattern}_res`;
     }
 
     private init() {
@@ -48,12 +59,4 @@ export class ClientRedis extends ClientProxy {
         stream.on('error', (err) => this.logger.error(err));
     }
 
-    private getAckPatternName(pattern: string): string {
-        return `${pattern}_ack`;
-    }
-
-    private getResPatternName(pattern: string): string {
-        return `${pattern}_res`;
-    }
-
 }

src/microservices/client/client-tcp.ts

@@ -15,14 +15,18 @@ export class ClientTCP extends ClientProxy {
         this.host = host || this.DEFAULT_HOST;
     }
 
-    sendSingleMessage(msg, callback) {
-        jsocket.sendSingleMessageAndReceive(this.port, this.host, msg, (err, res) => {
+    sendSingleMessage(msg, callback: Function) {
+        jsocket.sendSingleMessageAndReceive(this.port, this.host, msg, this.createCallback(callback));
+    }
+
+    createCallback(callback: Function) {
+        return (err, res) => {
             if (err) {
                 callback(err);
                 return;
             }
             callback(res.err, res.response);
-        });
+        }
     }
 
 }

src/microservices/client/index.ts

@@ -0,0 +1,3 @@
+export * from './client-proxy';
+export * from './client-redis';
+export * from './client-tcp';

src/microservices/index.ts

@@ -0,0 +1,3 @@
+export * from './utils';
+export * from './interfaces';
+export * from './client';

src/microservices/interfaces/index.ts

@@ -0,0 +1,3 @@
+export * from './client-metadata.interface';
+export * from './microservice-configuration.interface';
+export * from './pattern-metadata.interface';