cgserver 11.2.9 → 12.0.0

package/dist/types/Framework/Server/WebSocketServer/IClientWebSocket.d.ts

@@ -0,0 +1,17 @@
+import { IWebSocketServer } from './IWebSocketServer';
+import { IWebSocket } from './IWebSocket';
+import { EProtoType } from '../ProtoFilter/IProtoFilter';
+import * as ws from 'websocket';
+/**
+ * 服务器接收到的客户端的连接
+ * 客户端的session对象
+ */
+export declare class IClientWebSocket extends IWebSocket {
+    protected _server: IWebSocketServer;
+    get server(): IWebSocketServer;
+    constructor(server: IWebSocketServer, protoType?: EProtoType, protoPath?: string);
+    onClose(reasonCode: number, description: string): void;
+    broadCast(data: any): void;
+    protected _onDecode(message: ws.Message, ...params: any[]): any;
+    protected _onEncode(data: any, ...params: any[]): any;
+}

package/dist/types/Framework/Server/WebSocketServer/IRpc.d.ts

@@ -0,0 +1,32 @@
+import { BaseMsg } from "./IWebSocket";
+export declare class RpcMsg extends BaseMsg {
+    __rpcid: string;
+    __return: boolean;
+    /**
+      * 发送者分组
+      */
+    from_group: string;
+    /**
+     * 发送者分组下的某个具体对象id
+     */
+    from_id: string;
+    /**
+     * 必填，目的组
+     */
+    to_group: string;
+    /**
+     * 目的分组下的某个具体对象id
+     */
+    to_id: string;
+    /**
+     * 监听的对象，比如，发送给push服务器的，监听了10086的服务器listem="10086",listem,也可以理解为子group
+     */
+    listen: string;
+    /**
+     * 消息携带的数据
+     */
+    data: any;
+}
+export declare abstract class IRpc {
+    abstract callRemote(msg: RpcMsg): any;
+}

package/dist/types/Framework/Server/WebSocketServer/IRpcClientWebSocket.d.ts

@@ -0,0 +1,29 @@
+import { IRpc, RpcMsg } from "./IRpc";
+import { IClientWebSocket } from "./IClientWebSocket";
+export declare class IRpcClientWebSocket extends IClientWebSocket implements IRpc {
+    /**
+     * 自己的身份
+     */
+    protected _group: string;
+    protected _id: string;
+    protected _timeout: number;
+    protected _listens: {
+        [key: string]: boolean;
+    };
+    isListenning(listen: string): boolean;
+    protected _genId(pre?: string): string;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): RpcMsg;
+    toRetMsg(req_msg: RpcMsg, data: any, errcode?: {
+        id: number;
+        des: string;
+    }): RpcMsg;
+    callRemote(msg: RpcMsg): Promise<unknown>;
+    receive_init(req_msg: RpcMsg): void;
+    receive_listen(req_msg: RpcMsg): void;
+    receive_unlisten(req_msg: RpcMsg): void;
+    receive_other_all(msg: RpcMsg): void;
+    protected _onMessage(msg: RpcMsg): Promise<void>;
+}

package/dist/types/Framework/Server/WebSocketServer/IRpcServerWebSocket.d.ts

@@ -0,0 +1,23 @@
+import { IServerWebSocket } from "./IServerWebSocket";
+import { IRpc, RpcMsg } from "./IRpc";
+export declare class IRpcServerWebSocket extends IServerWebSocket implements IRpc {
+    /**
+     * 自己的身份
+     */
+    protected _group: string;
+    protected _id: string;
+    protected _timeout: number;
+    constructor(group: string, id: string, timeout?: number);
+    protected _genId(pre?: string): string;
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): RpcMsg;
+    toRetMsg(req_msg: RpcMsg, data: any, errcode?: {
+        id: number;
+        des: string;
+    }): RpcMsg;
+    callRemote(msg: RpcMsg): Promise<RpcMsg>;
+    receive_other_all(msg: RpcMsg): void;
+    protected _onMessage(msg: RpcMsg): Promise<void>;
+}

package/dist/types/Framework/Server/WebSocketServer/IServerWebSocket.d.ts

@@ -0,0 +1,38 @@
+/// <reference types="node" />
+import { IWebSocket } from './IWebSocket';
+import * as ws from 'websocket';
+import { EProtoType } from '../ProtoFilter/IProtoFilter';
+import * as http from "http";
+/**
+ * 连接到服务器的websocket
+ * 默认自动重连
+ */
+export declare class IServerWebSocket extends IWebSocket {
+    protected _host: string;
+    /**
+     * 连接的服务器地址
+     */
+    get host(): string;
+    protected _port: number;
+    /**
+     * 连接的服务器端口
+     */
+    get port(): number;
+    protected _requestedProtocols: string | string[];
+    get requestedProtocols(): string | string[];
+    protected _origin: string;
+    get origin(): string;
+    protected _headers: http.OutgoingHttpHeaders;
+    get headers(): http.OutgoingHttpHeaders;
+    protected _extraRequestOptions: http.RequestOptions;
+    get extraRequestOptions(): http.RequestOptions;
+    protected _need_close: boolean;
+    constructor(protoType?: EProtoType, protoPath?: string);
+    connect(domain: string, port: number, requestedProtocols?: string | string[], origin?: string, headers?: http.OutgoingHttpHeaders, extraRequestOptions?: http.RequestOptions): void;
+    protected _connect(): void;
+    onOpen(e?: any): void;
+    onClose(reasonCode: number, description: string): boolean;
+    close(): void;
+    protected _onDecode(message: ws.Message, ...params: any[]): any;
+    protected _onEncode(data: any, ...params: any[]): any;
+}

package/dist/types/Framework/Server/WebSocketServer/IWebSocket.d.ts

@@ -0,0 +1,76 @@
+import { IProtoFilter, EProtoType } from "../ProtoFilter/IProtoFilter";
+import * as ws from 'websocket';
+export declare class BaseMsg {
+    cmd: string;
+    errcode?: {
+        id: number;
+        des: string;
+    };
+    servertime: number;
+    constructor(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    });
+}
+export declare class IWebSocket {
+    /**
+     * 是否同步消息
+     * 默认为true
+     */
+    protected _is_sync_msg: boolean;
+    get isSynMsg(): boolean;
+    protected _debug_msg: boolean;
+    get debug_msg(): boolean;
+    set debug_msg(value: boolean);
+    protected _socket_id: number;
+    get socketId(): number;
+    protected _tipKey: string;
+    get tipKey(): string;
+    protected _ws: ws.connection;
+    get ws(): ws.connection;
+    protected _req: ws.request;
+    protected _protoType: EProtoType;
+    protected _protoFilter: IProtoFilter;
+    protected _protoPath: string;
+    protected _ip: string;
+    get remoteHost(): string;
+    get connected(): boolean;
+    protected _nodebugmsgs: {
+        [cmd: string]: boolean;
+    };
+    constructor(protoType?: EProtoType, protoPath?: string);
+    getNewMsg(cmd: string, errcode?: {
+        id: number;
+        des: string;
+    }): BaseMsg | any;
+    receive_heartbeat(jsonData: any): void;
+    send_heartbeat(): void;
+    onConnect(_ws: ws.connection, _req: ws.request): void;
+    onMessage(message: ws.Message): void;
+    protected _onDecode(message: ws.Message, ...params: any[]): any;
+    protected _onEncode(data: any, ...params: any[]): any;
+    /**
+     * 过滤消息，每个消息处理之前调用
+     * @param msg
+     * @returns
+     */
+    filterMsg(msg: BaseMsg): boolean;
+    protected _onMessage(data: any): Promise<void>;
+    onOpen(e?: any): void;
+    onError(e: Error): void;
+    onClose(reasonCode: number, description: string): void;
+    filterSendMsg(msg: BaseMsg): boolean;
+    send(msg: BaseMsg): void;
+    /**
+     * Close the connection. A close frame will be sent to the remote peer indicating
+     * that we wish to close the connection, and we will then wait for up to
+     * `config.closeTimeout` milliseconds for an acknowledgment from the remote peer
+     * before terminating the underlying socket connection.
+     */
+    close(reasonCode?: number, description?: string): void;
+    /**
+     * Send a close frame to the remote peer and immediately close the socket without
+     * waiting for a response. This should generally be used only in error conditions.
+     */
+    drop(reasonCode?: number, description?: string, skipCloseFrame?: boolean): void;
+}

package/dist/types/Framework/Server/WebSocketServer/IWebSocketServer.d.ts

@@ -0,0 +1,46 @@
+import { IClientWebSocket } from './IClientWebSocket';
+import * as ws from 'websocket';
+import { IServerConfig } from '../../Config/IServerConfig';
+import { BaseMsg } from './IWebSocket';
+export declare class IWebSocketServer {
+    protected _cfg: IServerConfig;
+    get cfg(): IServerConfig;
+    protected _is_runging: boolean;
+    get isrunging(): boolean;
+    get name(): string;
+    private _listening_websocket;
+    get listeningWebSocket(): ws.server;
+    protected _ws_clients: {
+        [socketid: number]: IClientWebSocket;
+    };
+    get listenPort(): number;
+    /**
+     * websocket can accepted protocol
+     */
+    protected _accepted_protocol: any;
+    protected _name_vs_class: {};
+    registerWebSocketHandleClass(name: string, cls: any): void;
+    constructor(cfg: IServerConfig);
+    removeServerWebSocketBySocketId(socketId: number): void;
+    run(): Promise<void>;
+    pause(): void;
+    resume(): void;
+    addClient(ws_client: IClientWebSocket): void;
+    isOriginAllowed(origin: any): boolean;
+    initWebSocket(wss?: any): void;
+    onClose(connection: ws.connection, reason: number, desc: string): void;
+    onListenning(): void;
+    onRequest(req: ws.request): void;
+    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection, req: ws.request): IClientWebSocket;
+    protected _getServerNameByCookies(cookies: any): string;
+    /**
+     * 广播消息
+     * @param msg
+     */
+    broadCast(msg: BaseMsg): void;
+    /**
+     * 获取任意客户端连接
+     * @returns
+     */
+    getAnyWebSocket(): IClientWebSocket;
+}

package/dist/types/Framework/ThirdParty/CgMq.d.ts

@@ -1,5 +1,5 @@
-import { IRpcServerWebSocket } from "../SocketServer/IRpcServerWebSocket";
-import { RpcMsg } from "../SocketServer/IRpc";
+import { IRpcServerWebSocket } from "../Server/WebSocketServer/IRpcServerWebSocket";
+import { RpcMsg } from "../Server/WebSocketServer/IRpc";
 declare class CgMqServerWebsocket extends IRpcServerWebSocket {
     protected _cgmq: CgMq;
     protected _listens: {

package/dist/types/Framework/ThirdParty/Rpc.d.ts

@@ -1,4 +1,4 @@
-import { RpcMsg } from "../SocketServer/IRpc";
+import { RpcMsg } from "../Server/WebSocketServer/IRpc";
 import { CgMq, RpcConfig } from "./CgMq";
 declare class Remote {
     protected _retmsg: RpcMsg;

package/dist/types/Framework/cgserver.d.ts

@@ -1,11 +1,14 @@
-import { IWebServer } from "./WebServer/IWebServer";
-import { ISocketServer } from "./SocketServer/ISocketServer";
+import { IWebServer } from "./Server/WebServer/IWebServer";
+import { IWebSocketServer } from "./Server/WebSocketServer/IWebSocketServer";
 import { DbConfig } from "./Config/DbConfig";
 import * as minimist from "minimist";
+import { ISocketServer } from "./Server/SocketServer/ISocketServer";
 export declare class CgServer {
     protected _webservers: IWebServer[];
     get webServers(): IWebServer[];
-    protected _socketservers: ISocketServer[];
+    protected _websocket_servers: IWebSocketServer[];
+    get websocketServers(): IWebSocketServer[];
+    protected _socket_servers: ISocketServer[];
     get socketServers(): ISocketServer[];
     protected _events: {
         [name: string]: Function[];
@@ -51,6 +54,7 @@ export declare class CgServer {
     removeListener(event: "start" | "exit" | "uncaughtexception", func: () => void): boolean;
     onUnCaughtException(e: any): void;
     addWebServer(server: IWebServer): void;
+    addWebSocketServer(server: IWebSocketServer): void;
     addSocketServer(server: ISocketServer): void;
     initDb(dbcfg: DbConfig): Promise<void>;
     pause(): void;

package/dist/types/Framework/global.d.ts

@@ -25,12 +25,12 @@ export declare class global {
     static gWechatOATool: import("./ThirdParty/WechatTool").WechatTool;
     static gAlipayTool: import("./ThirdParty/AlipayTool").AlipayTool;
     static gAppleTool: import("./ThirdParty/AppleTool").AppleTool;
-    static gProtoFactory: import("./SocketServer/ProtoFilter/ProtoFactory").ProtoFactory;
+    static gProtoFactory: import("./Server/ProtoFilter/ProtoFactory").ProtoFactory;
     static gCgRankTool: import("./ThirdParty/CgRankTool").CgRankTool;
     /**
      * web服务中mvc的控制器管理器
      */
-    static gCtrMgr: import("./WebServer/Engine/ControllerManager").ControllerManager;
+    static gCtrMgr: import("./Server/WebServer/Engine/ControllerManager").ControllerManager;
     /**
      * mongo版本的缓存服务
      * 可以用来缓存kv数据

package/dist/types/Framework/index_export_.d.ts

@@ -37,19 +37,19 @@ export { MSSqlConfig } from './Database/MSSql/MSSqlManager';
 export { MongoConfig } from './Database/Mongo/MongoManager';
 export { MysqlConfig } from './Database/Mysql/MysqlManager';
 export { RedisConfig, RedisManager } from './Database/Redis/RedisManager';
-export { EProtoType } from './SocketServer/ProtoFilter/IProtoFilter';
-export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
-export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
-export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
-export { IServerWebSocket } from './SocketServer/IServerWebSocket';
-export { IClientWebSocket } from './SocketServer/IClientWebSocket';
-export { ISocketServer } from './SocketServer/ISocketServer';
-export { IWebSocket, BaseMsg } from './SocketServer/IWebSocket';
+export { EProtoType } from './Server/ProtoFilter/IProtoFilter';
+export { GoogleProtoFilter } from './Server/ProtoFilter/GoogleProtoFilter';
+export { IProtoFilter } from './Server/ProtoFilter/IProtoFilter';
+export { JsonProtoFilter } from './Server/ProtoFilter/JsonProtoFilter';
+export { IServerWebSocket } from './Server/WebSocketServer/IServerWebSocket';
+export { IClientWebSocket } from './Server/WebSocketServer/IClientWebSocket';
+export { IWebSocketServer } from './Server/WebSocketServer/IWebSocketServer';
+export { IWebSocket, BaseMsg } from './Server/WebSocketServer/IWebSocket';
 export { AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTool';
-export { IWebServer } from './WebServer/IWebServer';
-export { BaseController } from './WebServer/Controller/BaseController';
-export { MysqlBaseUserController } from './WebServer/Controller/MysqlBaseUserController';
-export { MongoBaseUserController } from './WebServer/Controller/MongoBaseUserController';
+export { IWebServer } from './Server/WebServer/IWebServer';
+export { BaseController } from './Server/WebServer/Controller/BaseController';
+export { MysqlBaseUserController } from './Server/WebServer/Controller/MysqlBaseUserController';
+export { MongoBaseUserController } from './Server/WebServer/Controller/MongoBaseUserController';
 export { MysqlAccountModel } from './Service/MysqlAccountService';
 export { MongoAccountModel } from './Service/MongoAccountService';
 export { AdminValidate } from './Decorator/AdminValidate';
@@ -58,17 +58,22 @@ export { CreatorValidate } from './Decorator/CreatorValidate';
 export { JsonAdminValidate } from './Decorator/JsonAdminValidate';
 export { JsonAuthorityValidate } from './Decorator/JsonAuthorityValidate';
 export { JsonCreatorValidate } from './Decorator/JsonCreatorValidate';
-export { Engine } from './WebServer/Engine/Engine';
-export { RazorJs } from './WebServer/Engine/RazorJs';
-export { Request } from './WebServer/Engine/Request';
-export { Response } from './WebServer/Engine/Response';
+export { Engine } from './Server/WebServer/Engine/Engine';
+export { RazorJs } from './Server/WebServer/Engine/RazorJs';
+export { Request } from './Server/WebServer/Engine/Request';
+export { Response } from './Server/WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
 export { EAccountState } from './Service/ini';
-export { RpcMsg as RpcBaseMsg } from './SocketServer/IRpc';
+export { IClientSocket } from './Server/SocketServer/IClientSocket';
+export { IServerSocket } from './Server/SocketServer/IServerSocket';
+export { ISocket } from './Server/SocketServer/ISocket';
+export { ISocketServer } from './Server/SocketServer/ISocketServer';
+export { PacketParser } from './Server/SocketServer/PacketParser';
+export { RpcMsg as RpcBaseMsg } from './Server/WebSocketServer/IRpc';
 export { Rpc } from './ThirdParty/Rpc';
 export { CgMq, RpcConfig } from './ThirdParty/CgMq';
-export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
-export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
+export { IRpcServerWebSocket } from './Server/WebSocketServer/IRpcServerWebSocket';
+export { IRpcClientWebSocket } from './Server/WebSocketServer/IRpcClientWebSocket';
 export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
 export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';
 export { global } from "./global";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "11.2.9",
+  "version": "12.0.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -48,6 +48,7 @@
     "@types/websocket": "^1.0.10",
     "alipay_sdk2": "^1.1.6",
     "alipay-sdk": "^3.6.1",
+    "azgaar-fmg-parser": "^1.2.2",
     "colors": "^1.4.0",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",