@mingzey/typedrpc 1.0.2 → 1.1.0

package/dist/test/socketio.js

@@ -1,77 +0,0 @@
-/**
- * 测试全双工通信实现双向调用
- * TypedRPC的默认实现是基于http的，全双工必须实现自定义的Provider
- * 这里使用socket.io作为Provider的底层通讯
- */
-import { TestCase } from "./TestCase.js";
-import { TypedRPCAPIDefine, TypedRPCConnectionProviderSocketIO } from "../index.js";
-import { TypedRPCServer } from "../index.js";
-import { TypedRPCClient } from "../index.js";
-const ServerAPIDefine = new TypedRPCAPIDefine;
-const ClientAPIDefine = new TypedRPCAPIDefine;
-const server = new TypedRPCServer({
-    local: ServerAPIDefine,
-    remote: ClientAPIDefine,
-    connection: {
-        provider: new TypedRPCConnectionProviderSocketIO(),
-    }
-});
-server.hook('math', 'add', {
-    handler: (a, b) => {
-        return a + b;
-    }
-});
-const client = new TypedRPCClient({
-    local: ClientAPIDefine,
-    remote: ServerAPIDefine,
-    connection: {
-        provider: new TypedRPCConnectionProviderSocketIO(),
-    }
-});
-client.hook('status', 'time', {
-    handler: () => {
-        return Date.now();
-    }
-});
-export default class TestSocketIO extends TestCase {
-    name() {
-        return "SocketIO";
-    }
-    async run() {
-        let requestToServer;
-        let requestToClient;
-        requestToClient = new Promise((resolve) => {
-            server.emitter.on('connection', async (connectionToClient) => {
-                const apiToClient = server.getAPI(connectionToClient);
-                const result = await apiToClient.status.time.call();
-                if (result != null) {
-                    resolve(true);
-                }
-                else {
-                    resolve(false);
-                }
-            });
-        });
-        await server.listen({
-            port: 3698,
-        });
-        requestToServer = new Promise(async (resolve) => {
-            const connectionToServer = await client.connect("localhost:3698");
-            const apiToServer = client.getAPI(connectionToServer);
-            const result = await apiToServer.math.add.call(1, 2);
-            if (result == 3) {
-                resolve(true);
-            }
-            else {
-                resolve(false);
-            }
-        });
-        const resultToClient = await requestToClient;
-        const resultToServer = await requestToServer;
-        return resultToClient && resultToServer;
-    }
-    async finally() {
-        await server.close();
-    }
-}
-//# sourceMappingURL=socketio.js.map

package/dist/test/socketio.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"socketio.js","sourceRoot":"","sources":["../../src/test/socketio.ts"],"names":[],"mappings":"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"}

package/dist/test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=test.d.ts.map

package/dist/test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":""}

package/dist/test.js

@@ -1,33 +0,0 @@
-const testList = [
-    import('./test/basic.js'),
-    import('./test/context.js'),
-    import('./test/socketio.js'),
-    import('./test/authorization.js'),
-    import('./test/expressmix.js'),
-    import('./test/socket.js'),
-];
-async function main() {
-    for (let i of testList) {
-        let exp = await i;
-        let test = new (exp.default)();
-        let result = await test.run().catch((e) => {
-            console.log(`Test:${test.name()} failed. ${e}`);
-            throw e;
-        });
-        await test.finally();
-        if (result) {
-            console.log(`\x1b[32m[PASS]\x1b[0m ${test.name()}`);
-        }
-        else {
-            console.log(`\x1b[31m[FAIL]\x1b[0m ${test.name()}`);
-        }
-    }
-}
-main().then(() => {
-    console.log('TypedRPC test finished.');
-}).catch((e) => {
-    console.log(`TypedRPC test failed. ${e}`);
-    throw e;
-});
-export {};
-//# sourceMappingURL=test.js.map

package/dist/test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AAEA,MAAM,QAAQ,GAAG;IACb,MAAM,CAAC,iBAAiB,CAAC;IACzB,MAAM,CAAC,mBAAmB,CAAC;IAC3B,MAAM,CAAC,oBAAoB,CAAC;IAC5B,MAAM,CAAC,yBAAyB,CAAC;IACjC,MAAM,CAAC,sBAAsB,CAAC;IAC9B,MAAM,CAAC,kBAAkB,CAAC;CAC7B,CAAA;AAED,KAAK,UAAU,IAAI;IACf,KAAI,IAAI,CAAC,IAAI,QAAQ,EAAC;QAClB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC;QAClB,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAc,CAAC;QAC3C,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC;YAChD,MAAM,CAAC,CAAC;QACZ,CAAC,CAAC,CAAA;QACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,IAAG,MAAM,EAAC;YACN,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SACvD;aAAI;YACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;SACvD;KAEJ;AACL,CAAC;AAED,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IACb,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC;AAC3C,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACX,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,CAAC,CAAC;AACZ,CAAC,CAAC,CAAA"}

package/src/api.ts

@@ -1,72 +0,0 @@
-import type { TypedRPCAPIDefine } from "./define.js";
-import type { TypedRPCRequestPacket, TypedRPCResponsePacket } from "./packet.js";
-import type { TypedRPCDefineToTypedRPCAPI } from "./utils.js";
-
-
-class TypedRPCAPI<T extends TypedRPCAPIDefine<any>>{
-    constructor(){
-        
-    }
-
-    interface(callback:(context:{
-        serviceName:string,methodName:string,args:any[]
-    }) => Promise<{
-        request:TypedRPCRequestPacket,
-        response:TypedRPCResponsePacket,
-    }>):TypedRPCDefineToTypedRPCAPI<T>{
-        return new Proxy({}, {
-            get(target, serviceName, receiver) {
-                if (typeof serviceName !== 'string') {
-                    return Reflect.get(target, serviceName, receiver);
-                }
-                return new Proxy({}, {
-                    get(target, methodName, receiver) {
-                        if (typeof methodName !== 'string') {
-                            return Reflect.get(target, methodName, receiver);
-                        }
-                        
-                        const path = `${serviceName}.${methodName}`;
-                        const id = `${serviceName}.${methodName}`;
-                        
-                        return {
-                            call: async (...args: any[]) => {
-                                const result = await callback({
-                                    serviceName:serviceName,
-                                    methodName:methodName,
-                                    args:args,
-                                });
-                                if(result.response.error){
-                                    throw result.response.error;
-                                }
-                                return result.response.result;
-                            },
-                            request:async (config:{
-                                args?:any[],
-                                callback?:(result:any,req:TypedRPCRequestPacket,res:TypedRPCResponsePacket) => void,
-                                error?:(error:any,req:TypedRPCRequestPacket,res:TypedRPCResponsePacket) => void,
-                            }) => {
-                                const result = await callback({
-                                    serviceName:serviceName,
-                                    methodName:methodName,
-                                    args:config.args || [],
-                                });
-                                if(result.response.error){
-                                    config.error?.(result.response.error,result.request,result.response);
-                                }else{
-                                    config.callback?.(result.response.result,result.request,result.response);
-                                }
-                            },
-                            id,
-                            path
-                        };
-                    }
-                });
-            }
-        }) as TypedRPCDefineToTypedRPCAPI<T>;
-    }
-}
-
-
-export {
-    TypedRPCAPI
-}

package/src/client.ts

@@ -1,77 +0,0 @@
-import { TypedRPCAPI } from "./api.js";
-import type { TypedRPCConnection, TypedRPCConnectionProvider } from "./connecitons/basic.js";
-import { TypedRPCConnectionProviderDefault } from "./connection.js";
-import { TypedRPCCore } from "./core.js";
-import { TypedRPCAPIDefine } from "./define.js";
-
-import { TypedEmitter, type TypedRPCDefineMethodBody, type TypedRPCDefineMethodName, type TypedRPCDefineServiceInstance, type TypedRPCDefineServiceName, type TypedRPCDefineToTypedRPCAPI } from "./utils.js";
-
-type TypedRPCClientConfig<T extends TypedRPCAPIDefine<any>,R extends TypedRPCAPIDefine<any>> = {
-    local?:T,
-    remote?:R,
-    connection?:{
-        provider:TypedRPCConnectionProvider,
-    }
-}
-
-type TypedRPCClientEvents = {
-    // connection:(connection:TypedRPCConnection)=>void,
-}
-
-class TypedRPCClient<T extends TypedRPCAPIDefine<any>,R extends TypedRPCAPIDefine<any>> {
-
-    public emitter = new TypedEmitter<TypedRPCClientEvents>();
-    private config:TypedRPCClientConfig<T,R>;
-    public core:TypedRPCCore;
-
-    constructor(config?:TypedRPCClientConfig<T,R>){
-        const defaultConfig:TypedRPCClientConfig<T,R> = {
-            connection:{
-                provider:new TypedRPCConnectionProviderDefault(),
-            }
-        }
-        this.config = {...defaultConfig,...config};
-        this.core = new TypedRPCCore(this.config);
-    }
-
-    hook<S extends TypedRPCDefineServiceName<T>,M extends TypedRPCDefineMethodName<T,S>>(serviceName:S,methodName:M,config:{
-        handler:TypedRPCDefineMethodBody<T,S,M>,
-        bind?:any,
-    }){
-        return this.core.hook(serviceName,methodName,config);
-    }
-
-    hookService<S extends TypedRPCDefineServiceName<T>>(serviceName:S,instance:TypedRPCDefineServiceInstance<T,S>){
-        const methodList = TypedRPCAPIDefine.getMethodList(instance);
-        for(let methodName of methodList){
-            this.hook(serviceName,methodName as TypedRPCDefineMethodName<T,S>,{
-                handler:instance[methodName],
-                bind:instance,
-            })
-        }
-    }
-
-    get use(){
-        return this.core.handler.use.bind(this.core.handler);
-    }
-
-    get connect(){
-        return this.core.connect.bind(this.core);
-    }
-
-    getAPI(connection:TypedRPCConnection):TypedRPCDefineToTypedRPCAPI<R>{
-        const api = new TypedRPCAPI<R>();
-        return api.interface(async (context) => {
-            return await this.core.request({
-                connection,
-                serviceName:context.serviceName,
-                methodName:context.methodName,
-                args:context.args,
-            })
-        })
-    }
-}
-
-export {
-    TypedRPCClient,
-}

package/src/connecitons/basic.ts

@@ -1,49 +0,0 @@
-import { TypedEmitter } from "../utils.js";
-
-type TypedRPCConnectionEvents = {
-    /** 有新的请求进入时，应该由Provider调起 */
-    request:(context:{
-        data:string,
-        response:(data:string) => void,
-    }) => void;
-}
-abstract class TypedRPCConnection{
-    public emitter = new TypedEmitter<TypedRPCConnectionEvents>();
-    abstract request(data:string):Promise<string>;
-    /** 获取连接的id */
-    abstract getId():string;
-    /** 关闭连接 */
-    abstract close():boolean;
-    /** 是否关闭 */
-    abstract isClosed():boolean;
-}
-
-type TypedRPCConnectionProviderEvents = {
-    /** 新的连接建立时 */
-    connection:(connection:TypedRPCConnection) => void,
-}
-abstract class TypedRPCConnectionProvider{
-    public emitter = new TypedEmitter<TypedRPCConnectionProviderEvents>();
-    /**
-     * Server用，用于监听一个端口
-     */
-    abstract listen(config:{
-        port:number,
-        hostname?:string,
-    }):Promise<boolean>;
-
-    /**
-     * Server用，用于关闭监听的端口
-     */
-    abstract close():Promise<boolean>;
-
-    /**
-     * Client用，用于建立一个连接
-     */
-    abstract connect(target:string):Promise<TypedRPCConnection>;
-}
-
-export {
-    TypedRPCConnection,
-    TypedRPCConnectionProvider,
-}

package/src/connecitons/http.ts

@@ -1,184 +0,0 @@
-
-import { IdMaker } from "../utils.js";
-import { TypedRPCConnection, TypedRPCConnectionProvider } from "./basic.js";
-
-
-/** 基于http的connection和provider */
-class TypedRPCConnectionHTTP extends TypedRPCConnection{
-
-    private id:string;
-    private closed:boolean = false;
-
-    constructor(private config:{
-        side:'client'|'server',
-        target?:string,
-    }){
-        super();
-        this.id = this.makeId();
-    }
-
-    private makeId(){
-        return IdMaker.makeId();
-    }
-
-    async request(data: string): Promise<string> {
-        if(this.config.side == 'server'){
-            throw new Error("The server connection cannot send RPC requests because the current connection is not bidirectional");
-        }
-        if(!this.config.target){
-            throw new Error("Client connection must have target");
-        }
-        // 发起请求
-        const response = await fetch(`http://${this.config.target}`,{
-            method:'POST',
-            body:data,
-            headers:{
-                // 必须指定typedrpc为1，否则服务器会认为这是一个普通的POST请求
-                typedrpc:'1',
-            }
-        }).then((res) => {
-            return res.text();
-        })
-        return response;
-    }
-
-    getId(): string {
-        return this.id;
-    }
-
-    close(): boolean {
-        this.closed = true;
-        return true;// http connection 关闭时，直接返回true
-    }
-
-    isClosed(): boolean {
-        return this.closed;
-    }
-    
-}
-
-type TypedRPCConnectionProviderHTTPServer = import('http').Server;
-
-type TypedRPCConnectionProviderHTTPConfig = {
-    server?:TypedRPCConnectionProviderHTTPServer,
-}
-
-type TypedRPCConnectionProviderHTTPMiddleware = (req:any,res:any) => void;
-
-class TypedRPCConnectionProviderHTTP extends TypedRPCConnectionProvider{
-
-    public config:TypedRPCConnectionProviderHTTPConfig;
-    public server:TypedRPCConnectionProviderHTTPServer | null = null;
-    private middlewares:TypedRPCConnectionProviderHTTPMiddleware[] = [];
-
-    constructor(config?:TypedRPCConnectionProviderHTTPConfig){
-        super();
-        const defaultConfig:TypedRPCConnectionProviderHTTPConfig = {
-            
-        }
-        this.config = {...defaultConfig,...config};
-        this.server = this.config.server || null;
-        if(this.server){
-            this.initServer(this.server);
-        }
-    }
-
-    public use(middleware:TypedRPCConnectionProviderHTTPMiddleware){
-        this.middlewares.push(middleware);
-    }
-
-    private initServer(server:TypedRPCConnectionProviderHTTPServer){
-        server.on('request',(req,res) => {
-            // 如果请求是不是POST，直接忽略
-            // 如果请求头没有typedrpc=1，直接忽略
-            if(req.method !== 'POST'
-            || req.headers['typedrpc'] !== '1'
-            ){
-                // 调用中间件
-                this.middlewares.forEach((middleware) => {
-                    middleware(req,res);
-                })
-                return;
-            }
-
-            let data = '';
-            req.on('data',(chunk) => {
-                data += chunk.toString();
-            })
-            req.on('end',() => {
-                // 创建一个connection
-                const connection = new TypedRPCConnectionHTTP({
-                    side:'server',
-                });
-                this.emitter.emit('connection',connection);
-                connection.emitter.emit('request',{
-                    data:data,
-                    response:(data) => {
-                        res.end(data);
-                        connection.close();
-                    }
-                })
-            })
-        })
-    }
-
-    private async createServer():Promise<TypedRPCConnectionProviderHTTPServer>{
-        const httpSupport = await import("http").catch(() => null);
-        if(!httpSupport){
-            throw new Error("http module not found");
-        }
-        return httpSupport.default.createServer();
-    }
-
-    async listen(config:{
-        port:number,
-        host?:string,
-    }): Promise<boolean> {
-        if(!this.server){
-            this.server = await this.createServer();
-            this.initServer(this.server);
-        }
-        
-        return new Promise<boolean>((resolve) => {
-            if(!this.server){
-                throw new Error("Listen before server created");
-            }
-            this.server.listen({
-                port:config.port,
-                host:config.host,
-            },() => {
-                resolve(true);
-            });
-        })
-
-    }
-    
-    close(): Promise<boolean> {
-        return new Promise<boolean>((resolve,reject) => {
-            if(!this.server){
-                return true;
-            }
-            this.server.close((err) => {
-                if(err){
-                    reject(err);
-                }
-                resolve(true);
-            })
-            this.server = null;
-        })
-    }
-
-    async connect(target: string): Promise<TypedRPCConnectionHTTP> {
-        const connection = new TypedRPCConnectionHTTP({
-            side:'client',
-            target,
-        });
-        this.emitter.emit('connection',connection);
-        return connection;
-    }
-}
-
-export {
-    TypedRPCConnectionHTTP,
-    TypedRPCConnectionProviderHTTP,
-}