oox 0.2.0 → 0.3.0-beta1

package/rpc/socketio.class.js

@@ -1,223 +0,0 @@
-
-const SocketIOClient = require ( '../socketio/client.class' )
-
-const Context = require ( './context.class' )
-
-const RPC = require ( './rpc.interface.class' )
-
-const Socket = require ( '../socketio/socket.class' )
-
-const Global = require ( '../global' )
-
-
-
-module.exports = class SocketIOModule extends SocketIOClient {
-
-
-
-    /**
-     * @type {RPC}
-     */
-    rpc = null
-
-
-
-    /**
-     * @param config {{port:Number, path:String}}
-     */
-    set config ( config ) {
-
-        if ( !config ) return this.rpc.config.gateway.socketio = null
-
-        config = this.rpc.config.gateway.socketio = Object.assign ( this.config || { }, config )
-
-        this.port = config.port || 0
-
-        if ( config.path ) this.path = config.path
-        else config.path = this.path
-    }
-
-
-
-    get config ( ) {
-
-        return this.rpc.config.gateway.socketio
-    }
-
-
-
-    /**
-     * 
-     * @param {RPC} rpc 
-     */
-    constructor ( rpc ) {
-
-        super ( rpc.name )
-
-        this.rpc = rpc
-
-        this.host = rpc.config.host
-    }
-
-
-
-    async serve ( ) {
-
-        if ( !this.config ) return
-
-        await super.serve ( )
-
-        this.config.port = this.port
-        this.config.path = this.path
-    }
-
-
-
-    async stop ( ) {
-
-        await super.stop ( )
-    }
-
-
-
-    genOptions ( ) {
-
-        const options = super.genOptions ( )
-        
-        if ( this.rpc.config.origin ) {
-
-            const origin = this.rpc.config.origin
-
-            options.cors = {
-                origin
-            }
-        }
-
-        return options
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     */
-    onConnection ( socket ) {
-
-        super.onConnection ( socket )
-
-        socket.setMaxListeners ( 0 )
-
-        const connectionContext = {
-            ip: socket.data.host,
-            caller: socket.data.name,
-            callerId: socket.data.id,
-        }
-
-        socket.on ( 'call', async ( action, params, context, callback ) => {
-
-            if ( 'object' !== typeof context ) context = Global.genContext ( connectionContext )
-            else context = Global.genContext ( Object.assign ( context, connectionContext ) )
-
-            this.call ( action, params, context, callback )
-        } )
-    }
-
-
-
-    async call ( action, params, context, callback ) {
-
-        const format = await this.rpc.call ( action, params, context )
-
-        'function' === typeof callback && callback ( format )
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     */
-    static onConnection ( socket ) {
-
-        super.onConnection ( socket )
-
-        const [ callerServer ] = Global.socketIOServers.filter ( server => server.name === socket.data.owner )
-
-        if ( callerServer ) socket.on ( 'call', callerServer.call.bind ( callerServer ) )
-    }
-
-
-
-    /**
-     * RPC emit
-     * @param {String} url
-     * @param {String} action 函数名称
-     * @param {[]} params 参数列表
-     * @param {Context} context 上下文
-     */
-     static async emit ( url, action, params, context ) {
-
-        if ( !context || !context.traceId ) {
-
-            context = Global.getContext ( )
-        }
-
-        /**
-         * @type {Socket}
-         */
-        let socket = null
-
-        try {
-
-            socket = await this.connect ( url, context.caller )
-        } catch ( error ) {
-
-            // try again
-            socket = await this.connect ( url, context.caller )
-        }
-
-        try {
-
-            return await new Promise ( ( resolve, reject ) => {
-
-                const onError = reason => reject ( new Error ( `SocketIO name[${socket.data.name}] id[${socket.data.id}] ` + ( 'string' === typeof reason ? reason : reason.message ) ) )
-    
-                // RPC 执行时中断连接
-                socket.once ( 'disconnect', onError )
-
-                socket.emit ( action, ...params, format => {
-
-                    socket.off ( 'disconnect', onError )
-
-                    resolve ( format )
-                } )
-            } )
-        } catch ( error ) {
-
-            throw new Error ( error.message )
-        }
-    }
-
-
-
-    /**
-     * HTTP RPC
-     * @param {String} url
-     * @param {String} action 函数名称
-     * @param {[]} params 参数列表
-     * @param {Context} context 上下文
-     */
-     static async call ( url, action, params, context ) {
-
-        if ( !context || !context.traceId ) {
-
-            context = Global.getContext ( )
-        }
-
-        const { error, body } = await this.emit ( url, 'call', [ action, params, context ], context )
-
-        if ( error ) throw new Error ( error.message )
-        else return body
-    }
-}

package/service/service.class.js

@@ -1,74 +0,0 @@
-
-const Global = require ( '../global' )
-
-const RPC = require ( '../rpc/rpc.class' )
-
-const SocketIO = require ( './socketio.class' )
-
-const Context = require ( '../rpc/context.class' )
-
-
-
-module.exports = class Service extends RPC {
-
-
-
-    static SocketIO = SocketIO
-
-
-
-    /**
-     * 
-     * @param {String} name 
-     * @param {String} action 
-     * @param {Array} params 
-     * @param {Context} context 
-     * @returns 
-     */
-    static async call ( name, action, params, context ) {
-
-        if ( !context || !context.traceId ) {
-
-            context = Global.getContext ( )
-        }
-
-        const socketIONodes = Global.socketIORegistry.get ( name )
-
-        if ( socketIONodes.length ) {
-
-            const node = this.selectSocketIONode ( socketIONodes )
-
-            return this.SocketIO.call ( node, action, params, context )
-        } else throw new Error ( 'No running service as ' + name )
-    }
-
-
-
-    static async emit ( name, action, params, context ) {
-
-        if ( !context || !context.traceId ) {
-
-            context = Global.getContext ( )
-        }
-
-        const socketIONodes = Global.socketIORegistry.get ( name )
-
-        if ( socketIONodes.length ) {
-
-            const node = this.selectSocketIONode ( socketIONodes )
-
-            return this.SocketIO.emit ( node, action, params, context )
-        } else throw new Error ( 'No running service as ' + name )
-    }
-
-
-
-    /**
-     * 
-     * @param {string[]} nodes 
-     */
-    static selectSocketIONode ( nodes ) {
-
-        return nodes [ Math.floor ( Math.random ( ) * nodes.length ) ]
-    }
-}

package/service/socketio.class.js

@@ -1,145 +0,0 @@
-
-const RPCSocketIO = require ( '../rpc/socketio.class' )
-
-const Socket = require ( '../socketio/socket.class' )
-
-const Context = require ( '../rpc/context.class' )
-
-const Global = require ( '../global' )
-
-
-
-module.exports = class SocketIO extends RPCSocketIO {
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     * @returns 
-     */
-    onConnection ( socket ) {
-
-        super.onConnection ( socket )
-
-        Global.socketIORegistry.add ( socket.data.name, socket.data.id )
-
-        socket.on ( 'syncConnection', async fn => {
-
-            if ( 'function' !== typeof fn ) return
-
-            const data = await this.onSyncConnection ( socket )
-
-            fn ( data )
-        } )
-
-        socket.on ( 'fetchActions', async ( search, fn ) => {
-
-            if ( 'function' !== typeof fn ) return
-
-            const data = await this.constructor.onFetchActions ( socket, search )
-
-            fn ( data )
-        } )
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     * @returns 
-     */
-    onSyncConnection ( socket ) {
-
-        const sockets = Array.from ( Global.sockets.values ( ) )
-        .filter ( s => 
-            s !== socket && 
-            s.data.name !== socket.data.name &&
-            s.data.id.startsWith ( 'ws://' ) )
-
-        return sockets.map ( s => s.data )
-    }
-
-
-    
-    /**
-     * 
-     * @param {Socket} socket 
-     */
-    onDisconnect ( socket, reason ) {
-
-        super.onDisconnect ( socket, reason )
-
-        Global.socketIORegistry.delete ( socket.data.name, socket.data.id )
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     */
-    static onConnection ( socket ) {
-
-        super.onConnection ( socket )
-
-        Global.socketIORegistry.add ( socket.data.name, socket.data.id )
-
-        socket.emit ( 'syncConnection', socketDatas => this.onSyncConnection ( socket, socketDatas ) )
-
-        socket.on ( 'fetchActions', async ( search, fn ) => {
-
-            if ( 'function' !== typeof fn ) return
-            
-            const actions = await this.onFetchActions ( socket, search )
-
-            fn ( actions )
-        } )
-    }
-
-
-
-    static onDisconnect ( socket, reason ) {
-
-        super.onDisconnect ( socket, reason )
-
-        Global.socketIORegistry.delete ( socket.data.name, socket.data.id )
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 是由哪个通道发送过来的
-     * @param {Socket.Data[]} socketDatas 
-     */
-    static onSyncConnection ( socket, socketDatas ) {
-
-        for ( const socketData of socketDatas )
-            if ( !Global.sockets.has ( socketData.id ) )
-                this.connect ( socketData.id, socket.data.owner ).catch ( error => console.error ( error ) )
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     * @param {String} search 
-     * @returns {String[]}
-     */
-    static onFetchActions ( socket, search ) {
-
-        const data = [ ]
-
-        const [ service ] = Global.instances.filter ( service => service.name === socket.data.owner )
-
-        if ( !service ) return data
-
-        for ( const key of service.kvMethods.keys ( ) )
-            if ( !key.endsWith ( '_proxy' ) && key.includes ( search ) ) data.push ( key )
-        
-        return data
-    }
-}

package/setMap.class.js

@@ -1,67 +0,0 @@
-
-module.exports = class SetMap {
-
-
-
-    /**
-     * @type {Map<String,Set>}
-     */
-    map = new Map ( )
-
-
-
-    has ( name, node ) {
-
-        if ( !this.map.has ( name ) ) return false
-
-        if ( !node ) return true
-
-        const set = this.map.get ( name )
-
-        return set.has ( node )
-    }
-
-
-
-    add ( name, node ) {
-
-        if ( !this.map.has ( name ) ) {
-
-            this.map.set ( name, new Set ( [ node ] ) )
-        } else {
-
-            this.map.get ( name ).add ( node )
-        }
-    }
-
-
-
-    delete ( name, node ) {
-
-        if ( !this.map.has ( name ) ) return
-
-        if ( !node ) return void this.map.get ( name ).clear ( )
-
-        this.map.get ( name ).delete ( node )
-    }
-
-
-
-    get ( name ) {
-
-        if ( !name ) {
-
-            const result = Object.create ( null )
-
-            for ( const key of this.map.keys ( ) ) {
-
-                result [ key ] = this.get ( key )
-            }
-
-            return result
-        } else if ( this.map.has ( name ) ) {
-
-            return Array.from ( this.map.get ( name ).values ( ) )
-        } else return [ ]
-    }
-}

package/socketio/client.class.js

@@ -1,190 +0,0 @@
-
-const SocketIOClient = require ( 'socket.io-client' )
-
-const Socket = require ( './socket.class' )
-
-const SocketIOServer = require ( './server.class' )
-
-const Global = require ( '../global' )
-
-
-
-module.exports = class SocketIOCore extends SocketIOServer {
-
-
-
-    /**
-     * 连接RPC服务
-     * @param {String} url ws服务器地址
-     * @param {String} caller 本地服务名称
-     * @returns {Promise<Socket>}
-     */
-    static async connect ( url, caller = null ) {
-
-        let socket = Global.sockets.get ( url )
-
-        // 已经连接的直接返回
-        if ( socket ) {
-
-            try {
-
-                await this.waitConnection ( socket )
-            } catch ( error ) {
-    
-                this.onSocketDisconnect ( socket, error )
-    
-                throw error
-            }
-
-            return socket
-        }
-
-        if ( !caller ) throw new Error ( 'Caller Required' )
-
-
-
-        const headers = {
-            'x-caller': String ( caller )
-        }
-
-
-
-        const [ callerServer ] = Global.socketIOServers.filter ( server => server.name === caller )
-
-        if ( callerServer ) {
-
-            const { host, port, path } = callerServer
-
-            headers [ 'x-ip' ] = host
-
-            headers [ 'x-caller-id' ] = `ws://${host}:${port}${path}`
-        }
-
-
-
-        // create socket handler
-        const mURL = new URL ( url )
-
-        socket = SocketIOClient.io ( mURL.origin, {
-            extraHeaders: headers,
-            path: mURL.pathname
-        } )
-
-        socket.data = { connected: false, id: url, host: mURL.host, owner: caller }
-
-        Global.sockets.set ( url, socket )
-
-        this.onSocketCreated ( socket )
-
-
-
-        try {
-
-            await this.waitConnection ( socket )
-        } catch ( error ) {
-
-            this.onSocketDisconnect ( socket, error )
-
-            throw error
-        }
-
-        return socket
-    }
-
-
-
-    static onSocketCreated ( socket ) {
-
-        socket.once ( 'disconnect', reason => this.onSocketDisconnect ( socket, reason ) )
-    }
-
-
-
-    /**
-     * 客户端Socket连接事件
-     * @param {Socket} socket 
-     */
-    static onSocketConnection ( socket ) {
-
-        socket.data.connected = true
-
-        this.onConnection ( socket )
-    }
-
-
-
-    static onConnection ( socket ) { }
-
-
-
-    /**
-     * 客户端Socket断开事件
-     * @param {Socket} socket 
-     */
-    static onSocketDisconnect ( socket, reason ) {
-
-        socket.data.connected = false
-
-        socket.disconnect ( true )
-
-        Global.sockets.delete ( socket.data.id )
-
-        this.onDisconnect ( socket, reason )
-    }
-
-
-
-    static onDisconnect ( socket, reason ) { }
-
-
-
-    /**
-     * 等待socket连接
-     * @param {Socket} socket 
-     */
-    static async waitConnection ( socket ) {
-
-        if ( socket.data.connected ) return
-
-        if ( socket.connect ) socket.connect ( )
-
-        try {
-
-            await new Promise ( function ( resolve, reject ) {
-
-                const onError = function ( reason ) {
-
-                    socket.offAny ( onError )
-
-                    const message = 'string' === typeof reason ? reason : reason.message
-
-                    reject ( new Error ( `SocketIO name[${socket.data.name}] id[${socket.data.id}] ${message}` ) )
-                }
-
-                socket.once ( 'disconnect', onError )
-
-                socket.once ( 'connect_error', onError )
-
-                socket.once ( 'connect_timeout', onError )
-
-                socket.once ( 'reconnect_error', onError )
-
-                socket.once ( 'reconnect_failed', onError )
-
-                socket.once ( 'oox_connected', function ( { name } ) {
-
-                    socket.offAny ( onError )
-
-                    socket.data.name = name
-
-                    resolve ( )
-                } )
-            } )
-        } catch ( error ) {
-
-            throw new Error ( error.message )
-        }
-
-        this.onSocketConnection ( socket )
-    }
-}