oox 0.0.7 → 0.2.0

package/service/socketio.class.js

@@ -1,191 +1,145 @@
-
-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 )
-        } )
-
-        socket.on ( 'proxyCall', async ( id, action, params, context, fn ) => {
-
-            const result = await this.constructor.onProxyCall ( socket, id, action, params, context )
-
-            if ( 'function' === typeof fn ) fn ( result )
-        } )
-    }
-
-
-
-    /**
-     * 
-     * @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 )
-        } )
-
-        socket.on ( 'proxyCall', async ( id, action, params, context, fn ) => {
-
-            const result = await this.onProxyCall ( socket, id, action, params, context )
-
-            if ( 'function' === typeof fn ) fn ( result )
-        } )
-    }
-
-
-
-    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.includes ( search ) ) data.push ( key )
-        
-        return data
-    }
-
-
-
-    /**
-     * 
-     * @param {Socket} socket 
-     * @param {String} id 
-     * @param {String} action 
-     * @param {Context} contextPrev
-     * @param {[]} params 
-     */
-    static async onProxyCall ( socket, id, action, params, contextPrev ) {
-
-        const context = new Context ( )
-
-        context.traceId = contextPrev.traceId
-        context.sourceIP = socket.data.host
-
-        try {
-
-            return await this.emit ( id, 'call', [ action, params, context ], context )
-        } catch ( error ) {
-
-            return {
-                success: false,
-                error: {
-                    message: error.message,
-                    stack: error.stack
-                }
-            }
-        }
-    }
+
+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 +1,67 @@
-
-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 [ ]
-    }
-}
+
+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 [ ]
+    }
+}