@litert/televoke 0.4.4 → 0.4.6

package/src/lib/Server/Gateways/TCP.ts

@@ -39,7 +39,7 @@ interface IClient {
 
     socket: $Net.Socket;
 
-    decoder: G.IDecoder<G.IRawRequest>;
+    decoder: G.IDecoder<C.IRequest>;
 
     status: EClientStatus;
 
@@ -48,7 +48,7 @@ interface IClient {
 
 class TCPGateway implements C.IGateway {
 
-    private _socket: $Net.Server = $Net.createServer(this._onConnect.bind(this));
+    private readonly _socket: $Net.Server = $Net.createServer(this._onConnect.bind(this));
 
     private _status: EStatus = EStatus.IDLE;
 
@@ -64,16 +64,17 @@ class TCPGateway implements C.IGateway {
     ) => void;
 
     public constructor(
-        private _host: string,
-        private _port: number
-    ) { }
+        public host: string,
+        public port: number,
+        private readonly _backlog?: number,
+    ) {}
 
     private _onConnect(socket: $Net.Socket): void {
 
         const clientId = this._clientIdCounter++;
 
         const encoder = createEncoder();
-        const decoder = createDecoder<G.IRawRequest>();
+        const decoder = createDecoder<C.IRequest>();
         const client = {
             decoder,
             socket,
@@ -93,6 +94,7 @@ class TCPGateway implements C.IGateway {
         decoder.onData = (data) => {
 
             client.loads++;
+            data.ip = (socket.address() as any).address;
 
             this.onRequest(
                 data,
@@ -141,11 +143,15 @@ class TCPGateway implements C.IGateway {
 
                 return new Promise((resolve, reject) => {
 
-                    this._socket.listen(this._port, this._host)
+                    this._socket.listen(this.port, this.host, this._backlog)
                         .once('listening', () => {
 
                             this._socket.removeAllListeners('error');
                             this._status = EStatus.WORKING;
+                            if (this.port === 0) {
+
+                                this.port = (this._socket.address() as $Net.AddressInfo).port;
+                            }
                             resolve();
                         })
                         .once('error', (e) => {
@@ -178,7 +184,7 @@ class TCPGateway implements C.IGateway {
             case EStatus.WORKING:
                 return new Promise((resolve) => {
 
-                    this._socket.close(() => resolve());
+                    this._socket.close(() => { resolve(); });
 
                     for (const clientId in this._clients) {
 
@@ -204,7 +210,12 @@ class TCPGateway implements C.IGateway {
     }
 }
 
-export function createTCPGateway(host: string, port: number): C.IGateway {
+/**
+ * Create a gateway of TCP-base televoke/1 protocol.
+ *
+ * @deprecated This legacy TCP-based televoke/1 protocol is no longer maintained, and will be removed in v2.0.0
+ */
+export function createTCPGateway(host: string, port: number, backlog?: number): C.IGateway {
 
-    return new TCPGateway(host, port);
+    return new TCPGateway(host, port, backlog);
 }

package/src/lib/Server/Server.ts

@@ -35,6 +35,18 @@ class Server extends Events.EventEmitter<C.IServerEvents> implements C.IServer {
 
     private _status: EStatus = EStatus.IDLE;
 
+    public getGateway(name: string): C.IGateway {
+
+        const ret = this._gateways[name];
+
+        if (!ret) {
+
+            throw new E.E_GATEWAY_NOT_FOUND({ name });
+        }
+
+        return ret;
+    }
+
     public addGateway(name: string, gateway: C.IGateway): this {
 
         if (this._status !== EStatus.IDLE) {
@@ -44,7 +56,7 @@ class Server extends Events.EventEmitter<C.IServerEvents> implements C.IServer {
 
         this._gateways[name] = gateway;
 
-        if (gateway.onError || gateway.onRequest) {
+        if (gateway.onError ?? gateway.onRequest) {
 
             throw new E.E_GATEWAY_BUSY();
         }
@@ -60,24 +72,26 @@ class Server extends Events.EventEmitter<C.IServerEvents> implements C.IServer {
 
             if (!handler) {
 
-                return reply({
+                reply({
                     rid: req.rid,
                     srt: req.srt,
                     sst: Date.now(),
                     code: G.EResponseCode.API_NOT_FOUND,
                     body: null
                 });
+                return;
             }
 
             if (!this._router.validate(req, handler)) {
 
-                return reply({
+                reply({
                     rid: req.rid,
                     srt: req.srt,
                     sst: Date.now(),
                     code: G.EResponseCode.MALFORMED_ARGUMENTS,
                     body: null
                 });
+                return;
             }
 
             let resultPr: any;
@@ -101,21 +115,29 @@ class Server extends Events.EventEmitter<C.IServerEvents> implements C.IServer {
 
             if (resultPr instanceof Promise) {
 
-                resultPr.then((body) => reply({
-                    rid: req.rid,
-                    srt: req.srt,
-                    sst: Date.now(),
-                    code: G.EResponseCode.OK,
-                    body: body ?? null
-                }), (body) => reply({
-                    rid: req.rid,
-                    srt: req.srt,
-                    sst: Date.now(),
-                    code: G.EResponseCode.FAILURE,
-                    body: body ?? null
-                }));
+                resultPr.then(
+                    (body) => {
+                        reply({
+                            rid: req.rid,
+                            srt: req.srt,
+                            sst: Date.now(),
+                            code: G.EResponseCode.OK,
+                            body: body ?? null
+                        });
+                    },
+                    (err) => {
+                        reply({
+                            rid: req.rid,
+                            srt: req.srt,
+                            sst: Date.now(),
+                            code: G.EResponseCode.FAILURE,
+                            body: err ?? null
+                        });
+                    }
+                );
             }
             else {
+
                 reply({
                     rid: req.rid,
                     srt: req.srt,

package/src/lib/Server/SimpleRouter.ts

@@ -66,7 +66,7 @@ class SimpleRouter implements ISimpleRouter {
         return this;
     }
 
-    public route(name: string): [any, boolean] | void {
+    public route(name: string): [any, boolean] | null {
 
         return this._handlers[name];
     }