oox 0.1.0 → 0.2.0

package/bin/starter.js

@@ -15,7 +15,7 @@ const register = require ( './register' )
 
 
 
-function getEntryFile ( ) {
+function getEntryFile ( env ) {
 
     const args = process.argv.slice ( 2 )
 
@@ -27,11 +27,15 @@ function getEntryFile ( ) {
 
     const filename = path.basename ( fullPath )
 
-    const directory = path.dirname ( fullPath ).split ( path.sep ).pop ( )
+    const fullDirectory = path.dirname ( fullPath )
 
-    var name = filename === 'index.js' ? directory : filename.split ( '.js' ) [ 0 ]
+    const directory = fullDirectory.split ( path.sep ).pop ( )
 
-    return { name, path: fullPath }
+    const groupFullDirectory = env.group ? path.resolve ( env.group ) : ''
+
+    var name = filename === 'index.js' && groupFullDirectory !== fullDirectory ? directory : filename.split ( '.js' ) [ 0 ]
+
+    return { name, path: fullPath, group: groupFullDirectory }
 }
 
 
@@ -86,7 +90,7 @@ exports.startup = async ( ) => {
 
 
     // 获取服务入口地址
-    const entryFile = getEntryFile ( )
+    const entryFile = getEntryFile ( env )
 
     // 代理<服务间调用>
     if ( env.group ) {
@@ -95,7 +99,7 @@ exports.startup = async ( ) => {
 
         if ( Array.isArray ( env.ignore ) ) excludes.push ( ...env.ignore )
 
-        proxyer.proxyServices ( env.group, excludes )
+        proxyer.proxyServices ( entryFile.group, excludes )
     }
 
     // 加载服务

package/global.js

@@ -1,7 +1,7 @@
 
 if ( Error.stackTraceLimit < 20 ) Error.stackTraceLimit = 20
 
-const { getTraceIdByStack } = require ( './util' )
+const { AsyncLocalStorage } = require ( 'async_hooks' )
 
 const Context = require ( './rpc/context.class' )
 
@@ -19,22 +19,18 @@ const Global = {
 
 
 
-    md: Middleware.handler,
+    asyncStore: new AsyncLocalStorage ( ),
 
 
 
-    /**
-     * @type {[RPC]}
-     */
-    instances: [ ],
+    md: Middleware.handler,
 
 
 
     /**
-     * all contexts map
-     * @type {Map<String,Context>}
+     * @type {[RPC]}
      */
-    contexts: new Map ( ),
+    instances: [ ],
 
 
 
@@ -106,34 +102,13 @@ const Global = {
 
     /**
      * 
-     * @param {String} stack 
      * @returns {Context}
      */
-    genContextByStack ( stack ) {
-
-        if ( !stack ) {
-
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            stack = trace.stack
-        }
-
-        const traceId = getTraceIdByStack ( stack )
-
-        if ( traceId ) {
-
-            const sourceContext = this.contexts.get ( traceId )
-
-            if ( sourceContext ) {
+    getContext ( ) {
 
-                return this.genContext ( { traceId, sourceIP: sourceContext.sourceIP } )
-            } else {
+        const context = this.asyncStore.getStore ( )
 
-                return this.genContext ( { traceId } )
-            }
-        } else return this.genContext ( )
+        return context || this.genContext ( )
     },
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oox",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "distributed api service",
   "main": "index.js",
   "bin": {
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "chalk": "^4.1.0",
-    "socket.io": "^4.0.2",
-    "socket.io-client": "^4.0.2"
+    "socket.io": "^4.4.0",
+    "socket.io-client": "^4.4.0"
   }
 }

package/rpc/http.class.js

@@ -1,7 +1,7 @@
 
 const http = require ( 'http' )
 
-const { parseHTTPBody, getTraceIdByStack, getIPAddress, httpRequest } = require ( '../util' )
+const { parseHTTPBody, getIPAddress, httpRequest } = require ( '../util' )
 
 const Context = require ( './context.class' )
 
@@ -238,17 +238,6 @@ module.exports = class HTTPModule {
 
         let formatString = ''
 
-        if ( format instanceof Error ) {
-
-            format = {
-                success: false,
-                error: {
-                    message: format.message,
-                    stack: format.stack
-                }
-            }
-        }
-
         try {
 
             formatString = JSON.stringify ( format )
@@ -286,11 +275,7 @@ module.exports = class HTTPModule {
 
         if ( !context || !context.traceId ) {
 
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            context = Global.genContextByStack ( trace.stack )
+            context = Global.getContext ( )
         }
 
         const { traceId, caller, sourceIP } = context

package/rpc/rpc.class.js

@@ -11,6 +11,8 @@ const Global = require ( '../global' )
 
 const RPCInterface = require ( './rpc.interface.class' )
 
+const Middleware = require ( '../middleware' )
+
 
 
 module.exports = class RPC extends RPCInterface {
@@ -88,8 +90,6 @@ module.exports = class RPC extends RPCInterface {
 
         const { traceId } = context
 
-        Global.contexts.set ( traceId, context )
-
         this.emit ( 'request', action, params, context )
 
         const format = {
@@ -97,11 +97,9 @@ module.exports = class RPC extends RPCInterface {
             success: false
         }
 
-        const OOXTrace = genOOXTrace ( traceId, this.kvMethods )
-
         try {
 
-            const result = await OOXTrace [ traceId ] ( action, [ ...params ], context )
+            const result = await this.execute ( this.kvMethods, action, [ ...params ], context )
 
             format.body = result
 
@@ -111,18 +109,123 @@ module.exports = class RPC extends RPCInterface {
         } catch ( error ) {
 
             format.error = {
-            message: error.message,
-            stack: error.stack
+                message: error.message,
+                stack: error.stack
             }
 
             this.emit ( 'fail', action, params, context, error )
         } finally {
 
-            delete OOXTrace [ traceId ]
+            return format
+        }
+    }
 
-            Global.contexts.delete ( traceId )
 
-            return format
+    /**
+     * 
+     * @param {Map<String,Function>} methods 服务函数扁平化列表
+     * @param {String} action
+     * @param {Array} params
+     * @param {Context} context
+     */
+    async execute ( methods, action, params, context ) {
+
+        const __proxy = '__proxy', _proxy = '_proxy'
+
+
+
+        // 目标函数
+        const target = methods.get ( action )
+
+        // 目标代理函数
+        const targetProxy = methods.get ( action + _proxy )
+
+        // 即不存在目标也不存在目标代理时, 报错函数不存在
+        if ( !target && !targetProxy ) throw new Error ( 'Invalid Action [' + action + ']' )
+
+        Global.asyncStore.enterWith ( context )
+
+
+
+        // 最顶层代理
+        const topProxy = methods.get ( __proxy )
+
+        if ( topProxy ) {
+
+            const proxyReturns = await topProxy ( action, params, context )
+
+            if ( proxyReturns !== undefined ) return proxyReturns
+        }
+
+
+
+        // 'x.y.z' => [ 'x', 'y', 'z' ]
+        const nameStack = action.split ( '.' ), size = nameStack.length - 1
+
+        let  index = -1, proxyPrefix = ''
+
+
+
+        // 根代理遍历
+        while ( ++index < size ) {
+
+            // x.
+            // x.y.
+            proxyPrefix += nameStack [ index ] + '.'
+
+            // x.__proxy
+            // x.y.__proxy
+            const rootProxy = methods.get ( proxyPrefix + __proxy )
+
+            // x.__proxy ( 'y.z', ... )
+            // x.y.__proxy ( 'z', ... )
+            if ( rootProxy ) {
+
+                const proxyReturns = await rootProxy ( nameStack.slice ( index ).join ( '.' ), params, context )
+
+                if ( proxyReturns !== undefined ) return proxyReturns
+            }
+        }
+
+
+
+        // 同级代理
+        const layerProxy = methods.get ( proxyPrefix + _proxy )
+
+        if ( layerProxy ) {
+
+            const proxyReturns = await layerProxy ( nameStack [ index ], params, context )
+
+            if ( proxyReturns !== undefined ) return proxyReturns
+        }
+
+
+
+        if ( targetProxy ) {
+
+            const proxyReturns = await targetProxy ( params, context )
+
+            if ( proxyReturns !== undefined ) return proxyReturns
+        }
+
+
+
+        // make sure target action execute after all proxies
+        if ( target ) {
+
+            const sourceMethod = Middleware.wrappedActions.get ( action )
+
+            const middlewareNames = Middleware.actionMiddlewares.get ( sourceMethod )
+
+            if ( middlewareNames && middlewareNames.length ) for ( const name of middlewareNames ) {
+
+                const middleware = Middleware.middlewares.get ( name )
+
+                await middleware ( action, params, context )
+            }
+            
+            return await target ( ...params )
         }
     }
+  
 }

package/rpc/socketio.class.js

@@ -160,11 +160,7 @@ module.exports = class SocketIOModule extends SocketIOClient {
 
         if ( !context || !context.traceId ) {
 
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            context = Global.genContextByStack ( trace.stack )
+            context = Global.getContext ( )
         }
 
         /**
@@ -216,11 +212,7 @@ module.exports = class SocketIOModule extends SocketIOClient {
 
         if ( !context || !context.traceId ) {
 
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            context = Global.genContextByStack ( trace.stack )
+            context = Global.getContext ( )
         }
 
         const { error, body } = await this.emit ( url, 'call', [ action, params, context ], context )

package/service/service.class.js

@@ -29,11 +29,7 @@ module.exports = class Service extends RPC {
 
         if ( !context || !context.traceId ) {
 
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            context = Global.genContextByStack ( trace.stack )
+            context = Global.getContext ( )
         }
 
         const socketIONodes = Global.socketIORegistry.get ( name )
@@ -52,11 +48,7 @@ module.exports = class Service extends RPC {
 
         if ( !context || !context.traceId ) {
 
-            let trace = { }
-
-            Error.captureStackTrace ( trace )
-
-            context = Global.genContextByStack ( trace.stack )
+            context = Global.getContext ( )
         }
 
         const socketIONodes = Global.socketIORegistry.get ( name )

package/util.js

@@ -5,8 +5,6 @@ const http = require ( 'http' )
 
 const https = require ( 'https' )
 
-const querystring = require('querystring')
-
 const Context = require  ( './rpc/context.class' )
 
 const Middleware = require ( './middleware' )
@@ -223,151 +221,4 @@ exports.genKVMethods = function ( methods, kvMethods=new Map(), nameStack=[] ) {
   }
 
   return kvMethods
-}
-
-
-
-/**
- * parse traceId from execution stack
- * @param {String} stack 
- * @returns {String}
- */
-exports.getTraceIdByStack = function ( stack ) {
-
-  if ( !stack ) {
-
-    let trace = { }
-
-    Error.captureStackTrace ( trace )
-
-    stack = trace.stack
-  }
-
-  const prefix = 'OOXTrace.<computed>'
-
-  const index = stack.indexOf ( prefix )
-
-  if ( index === -1 ) return null
-
-  return stack.slice ( index ).match ( /(?<=as\s).*?(?=\s|\])/ ) [ 0 ]
-}
-
-
-
-/**
- * 
- * @param {String} traceId 全局唯一请求ID
- * @param {Map<String,Function>} methods 服务函数扁平化列表
- */
-exports.genOOXTrace = function ( traceId, methods ) {
-
-  const OOXTrace = { /* OOXTrace.<computed> [as traceId] */ }
-
-
-
-  /**
-   * trace magic function
-   * @param {String} action 
-   * @param {Array} params 
-   * @param {Context} context 
-   */
-  OOXTrace [ traceId ] = async function ( action, params, context ) {
-
-    const __proxy = '__proxy', _proxy = '_proxy'
-
-
-
-    // 目标函数
-    const target = methods.get ( action )
-
-    // 目标代理函数
-    const targetProxy = methods.get ( action + _proxy )
-
-    // 即不存在目标也不存在目标代理时, 报错函数不存在
-    if ( !target && !targetProxy ) throw new Error ( 'Invalid Action [' + action + ']' )
-
-
-
-    // 最顶层代理
-    const topProxy = methods.get ( __proxy )
-
-    if ( topProxy ) {
-
-      const proxyReturns = await topProxy ( action, params, context )
-
-      if ( proxyReturns !== undefined ) return proxyReturns
-    }
-
-
-
-    // 'x.y.z' => [ 'x', 'y', 'z' ]
-    const nameStack = action.split ( '.' ), size = nameStack.length - 1
-    
-    let  index = -1, proxyPrefix = ''
-
-
-
-    // 根代理遍历
-    while ( ++index < size ) {
-
-      // x.
-      // x.y.
-      proxyPrefix += nameStack [ index ] + '.'
-
-      // x.__proxy
-      // x.y.__proxy
-      const rootProxy = methods.get ( proxyPrefix + __proxy )
-
-      // x.__proxy ( 'y.z', ... )
-      // x.y.__proxy ( 'z', ... )
-      if ( rootProxy ) {
-
-        const proxyReturns = await rootProxy ( nameStack.slice ( index ).join ( '.' ), params, context )
-
-        if ( proxyReturns !== undefined ) return proxyReturns
-      }
-    }
-
-
-
-    // 同级代理
-    const layerProxy = methods.get ( proxyPrefix + _proxy )
-
-    if ( layerProxy ) {
-
-      const proxyReturns = await layerProxy ( nameStack [ index ], params, context )
-
-      if ( proxyReturns !== undefined ) return proxyReturns
-    }
-
-
-
-    if ( targetProxy ) {
-
-      const proxyReturns = await targetProxy ( params, context )
-
-      if ( proxyReturns !== undefined ) return proxyReturns
-    }
-
-
-
-    // make sure target action execute after all proxies
-    if ( target ) {
-
-      const sourceMethod = Middleware.wrappedActions.get ( action )
-
-      const middlewareNames = Middleware.actionMiddlewares.get ( sourceMethod )
-
-      if ( middlewareNames && middlewareNames.length ) for ( const name of middlewareNames ) {
-
-        const middleware = Middleware.middlewares.get ( name )
-
-        await middleware ( action, params, context )
-      }
-      
-      return await target ( ...params )
-    }
-  }
-
-  return OOXTrace
-}
+}