@litert/televoke 1.0.0-1 → 1.0.0-3

package/src/lib/client/LegacyHttpClient.impl.ts

@@ -36,7 +36,8 @@ class TvLegacyHttpClient extends EventEmitter implements C.IClient<any> {
         private readonly _request: (opts: any, cb: (resp: $Http.IncomingMessage) => void) => $Http.ClientRequest,
         private readonly _opts: $Https.RequestOptions,
         private readonly _agent: $Http.Agent,
-        private readonly _apiNameWrapper?: (name: string) => string
+        private readonly _retryOnConnReset: boolean = true,
+        private readonly _apiNameWrapper?: (name: string) => string,
     ) {
 
         super();
@@ -75,7 +76,26 @@ class TvLegacyHttpClient extends EventEmitter implements C.IClient<any> {
         return Promise.reject(new Shared.errors.cmd_not_impl());
     }
 
-    public invoke(api: any, ...args: any[]): Promise<any> {
+    public async invoke(api: any, ...args: any[]): Promise<any> {
+
+        try {
+
+            return await this._invoke(api, ...args);
+        }
+        catch (e) {
+
+            if (this._retryOnConnReset && (e as any)?.code === 'ECONNRESET') {
+
+                return this._invoke(api, ...args);
+            }
+            else {
+
+                throw e;
+            }
+        }
+    }
+
+    private _invoke(api: any, ...args: any[]): Promise<any> {
 
         const CST = Date.now();
 
@@ -84,7 +104,7 @@ class TvLegacyHttpClient extends EventEmitter implements C.IClient<any> {
             rid: 0,
             cst: CST,
             args,
-            api: this._apiNameWrapper ? this._apiNameWrapper(api) : api
+            api: this._apiNameWrapper?.(api) ?? api
         });
 
         return new Promise((resolve, reject) => {
@@ -207,7 +227,7 @@ class TvLegacyHttpClient extends EventEmitter implements C.IClient<any> {
     }
 }
 
-export interface IHttpClientNetworkOptions extends $Https.RequestOptions {
+interface IHttpClientOptionsBase extends $Https.RequestOptions {
 
     /**
      * Whether to use HTTPS.
@@ -217,44 +237,43 @@ export interface IHttpClientNetworkOptions extends $Https.RequestOptions {
     https?: boolean;
 
     /**
-     * The hostname of HTTP server.
+     * Wrap the API name before sending to server.
      *
-     * @default 'localhost'
+     * @default null
      */
-    hostname: string;
+    apiNameWrapper?: (name: string) => string;
 
     /**
-     * The port of HTTP server.
+     * Whether to retry on connection reset.
      *
-     * @default 80 or 443
+     * @default true
      */
-    port?: number;
+    retryOnConnReset?: boolean;
+}
+
+export interface IHttpClientNetworkOptions extends IHttpClientOptionsBase {
 
     /**
-     * The path to the RPC entry.
+     * The hostname of HTTP server.
      *
-     * @default '/'
+     * @default 'localhost'
      */
-    path?: string;
-
-    apiNameWrapper?: (name: string) => string;
-}
-
-export interface IHttpClientUnixSocketOptions extends $Https.RequestOptions {
+    hostname: string;
 
     /**
-     * Whether to use HTTPS.
+     * The port of HTTP server.
      *
-     * > Always `false` for Unix domain socket.
+     * @default 80 or 443
      */
-    https?: false;
+    port?: number;
+}
+
+export interface IHttpClientUnixSocketOptions extends IHttpClientOptionsBase {
 
     /**
      * The path of Unix domain socket to connect to.
      */
     socketPath: string;
-
-    apiNameWrapper?: (name: string) => string;
 }
 
 export type IHttpClientOptions = IHttpClientNetworkOptions | IHttpClientUnixSocketOptions;
@@ -265,14 +284,15 @@ export function createLegacyHttpClient<TAPIs extends Shared.IObject>(opts: IHttp
         opts.https ? $Https.request : $Http.request,
         opts,
         opts.https ? new $Https.Agent({
-            maxSockets: 0,
-            keepAlive: true,
-            keepAliveMsecs: DEFAULT_TIMEOUT
+            'maxSockets': 0,
+            'keepAlive': true,
+            'keepAliveMsecs': DEFAULT_TIMEOUT
         }) : new $Http.Agent({
-            maxSockets: 0,
-            keepAlive: true,
-            keepAliveMsecs: DEFAULT_TIMEOUT
+            'maxSockets': 0,
+            'keepAlive': true,
+            'keepAliveMsecs': DEFAULT_TIMEOUT
         }),
-        opts.apiNameWrapper
+        opts.retryOnConnReset,
+        opts.apiNameWrapper,
     );
 }

package/src/lib/shared/Encodings/v2/DecoderV2.ts

@@ -234,7 +234,7 @@ class TvPushMessageRequestDecoder implements IPacketDecoder {
             'cmd': CSv2.ECommand.PUSH_MESSAGE,
             'typ': CSv2.EPacketType.REQUEST,
             'seq': ctx.seq,
-            'ct': readVarBuffer16(ctx)
+            'ct': readVarBuffer(ctx)
         } satisfies dEnc2.IPushMessageRequestPacket;
     }
 }

package/src/lib/shared/Encodings/v2/EncoderV2.ts

@@ -174,7 +174,7 @@ class PushMessageRequestEncoder implements IPacketEncoder {
 
     public encode(packet: dEnc2.IPushMessageRequestPacket): v2.IDataChunkArray {
 
-        const leadSeg = Buffer.allocUnsafe(CS.HEADER_SIZE + 2);
+        const leadSeg = Buffer.allocUnsafe(CS.HEADER_SIZE + 4);
 
         writePacketHeader(leadSeg, packet.cmd, packet.typ, packet.seq);
 
@@ -187,12 +187,12 @@ class PushMessageRequestEncoder implements IPacketEncoder {
                 bodyLen += Buffer.byteLength(p);
             }
 
-            leadSeg.writeUInt16LE(bodyLen, CS.HEADER_SIZE);
+            leadSeg.writeUInt32LE(bodyLen, CS.HEADER_SIZE);
 
             return [leadSeg, ...packet.ct];
         }
 
-        leadSeg.writeUInt16LE(Buffer.byteLength(packet.ct), CS.HEADER_SIZE);
+        leadSeg.writeUInt32LE(Buffer.byteLength(packet.ct), CS.HEADER_SIZE);
 
         return [leadSeg, packet.ct];
     }

package/src/lib/transporters/websocket/WebSocket.Server.ts

@@ -28,6 +28,7 @@ class WebSocketGateway extends EventEmitter implements dT.IGateway {
     public constructor(
         private readonly _listener: Listener.IHttpListener,
         private readonly _server: dT.IServer,
+        timeout?: number,
     ) {
 
         super();
@@ -38,6 +39,7 @@ class WebSocketGateway extends EventEmitter implements dT.IGateway {
 
         this._wsServer = LibWS.createServer({
             liteFrameMode: true,
+            timeout,
         });
     }
 
@@ -103,6 +105,18 @@ class WebSocketGateway extends EventEmitter implements dT.IGateway {
     }
 }
 
+export interface IWebSocketGatewayOptions {
+
+    /**
+     * The timeout of WebSocket connections.
+     *
+     * > Set to 0 to disable timeout.
+     *
+     * @default 60000
+     */
+    timeout?: number;
+}
+
 /**
  * Create a WebSocket gateway.
  *
@@ -112,7 +126,8 @@ class WebSocketGateway extends EventEmitter implements dT.IGateway {
 export function createWebsocketGateway(
     listener: Listener.IHttpListener,
     server: dT.IServer,
+    options: IWebSocketGatewayOptions = {}
 ): dT.IGateway {
 
-    return new WebSocketGateway(listener, server);
+    return new WebSocketGateway(listener, server, options.timeout);
 }