oox 0.0.7 → 0.2.0

package/bin/proxyer.js

@@ -1,95 +1,95 @@
-
-const fs = require ( 'fs' )
-
-const path = require ( 'path' )
-
-var Service = require ( '../service/service.class' )
-
-
-
-/**
- * 重写 require 缓存
- * @param {String} id 
- * @param {*} exports 
- */
- function rewriteModuleCache ( id, exports ) {
-
-    const pathname = id.split ( path.sep ).slice ( 0, -1 ).join ( path.sep )
-
-    const pathSplit = pathname.split ( path.sep )
-
-    const paths = pathSplit.map ( ( v, i, a ) => a.slice ( 0, i + 1 ).concat ( 'node_modules' ).join ( path.sep ) ).reverse ( )
-
-    const m = new module.constructor ( )
-
-    m.id = id
-    m.path = pathname
-    m.exports = exports
-    m.filename = m.id
-    m.loaded = true
-    m.children = [ ]
-    m.paths = paths
-    m.parent = null
-
-    require.cache [ id ] = m
-}
-
-
-
-function dotCall ( name, paths = [ ] ) {
-	
-	return new Proxy ( function ( ) { }, {
-
-        get ( target, key ) {
-
-			return dotCall ( name, paths.concat ( key ) )
-		},
-		
-		has ( target, key ) { return true },
-		
-		apply ( target, thisObject, args ) {
-
-            return Service.call ( name, paths.join ( '.' ), args )
-		}
-	} )
-}
-
-
-
-exports.proxyServices = ( servicesDirectory, excludes = [ ] ) => {
-
-    if ( !servicesDirectory ) return
-
-    const directory = path.resolve ( servicesDirectory )
-
-    const stat = fs.statSync ( directory )
-
-    if ( !stat.isDirectory ( ) ) throw new Error ( 'services must be directory' )
-
-    const subs = fs.readdirSync ( directory )
-
-    for ( const filename of subs ) {
-
-        const fullPath = path.resolve ( directory + path.sep + filename )
-
-        const stat = fs.statSync ( fullPath )
-
-        let id = '', name = ''
-
-        if ( stat.isDirectory ( ) && fs.existsSync ( fullPath + '/index.js' ) ) {
-
-            id = fullPath + '/index.js'
-            name = filename
-        } else if ( filename.endsWith ( '.js' ) ) {
-
-            id = fullPath
-            name = filename.split ( '.js' ) [ 0 ]
-        } else continue
-
-        if ( !excludes.includes ( name ) ) rewriteModuleCache ( id, dotCall ( name ) )
-    }
-}
-
-
-
+
+const fs = require ( 'fs' )
+
+const path = require ( 'path' )
+
+var Service = require ( '../service/service.class' )
+
+
+
+/**
+ * 重写 require 缓存
+ * @param {String} id 
+ * @param {*} exports 
+ */
+ function rewriteModuleCache ( id, exports ) {
+
+    const pathname = id.split ( path.sep ).slice ( 0, -1 ).join ( path.sep )
+
+    const pathSplit = pathname.split ( path.sep )
+
+    const paths = pathSplit.map ( ( v, i, a ) => a.slice ( 0, i + 1 ).concat ( 'node_modules' ).join ( path.sep ) ).reverse ( )
+
+    const m = new module.constructor ( )
+
+    m.id = id
+    m.path = pathname
+    m.exports = exports
+    m.filename = m.id
+    m.loaded = true
+    m.children = [ ]
+    m.paths = paths
+    m.parent = null
+
+    require.cache [ id ] = m
+}
+
+
+
+function dotCall ( name, paths = [ ] ) {
+	
+	return new Proxy ( function ( ) { }, {
+
+        get ( target, key ) {
+
+			return dotCall ( name, paths.concat ( key ) )
+		},
+		
+		has ( target, key ) { return true },
+		
+		apply ( target, thisObject, args ) {
+
+            return Service.call ( name, paths.join ( '.' ), args )
+		}
+	} )
+}
+
+
+
+exports.proxyServices = ( servicesDirectory, excludes = [ ] ) => {
+
+    if ( !servicesDirectory ) return
+
+    const directory = path.resolve ( servicesDirectory )
+
+    const stat = fs.statSync ( directory )
+
+    if ( !stat.isDirectory ( ) ) throw new Error ( 'services must be directory' )
+
+    const subs = fs.readdirSync ( directory )
+
+    for ( const filename of subs ) {
+
+        const fullPath = path.resolve ( directory + path.sep + filename )
+
+        const stat = fs.statSync ( fullPath )
+
+        let id = '', name = ''
+
+        if ( stat.isDirectory ( ) && fs.existsSync ( fullPath + '/index.js' ) ) {
+
+            id = fullPath + '/index.js'
+            name = filename
+        } else if ( filename.endsWith ( '.js' ) ) {
+
+            id = fullPath
+            name = filename.split ( '.js' ) [ 0 ]
+        } else continue
+
+        if ( !excludes.includes ( name ) ) rewriteModuleCache ( id, dotCall ( name ) )
+    }
+}
+
+
+
 exports.setService = serviceClazz => Service = serviceClazz

package/bin/register.js

@@ -1,105 +1,105 @@
-
-const chalk = require ( 'chalk' )
-
-var Service = require ( '../service/service.class' )
-
-
-
-function delay ( ms ) {
-
-    return new Promise ( function ( resolve, reject ) {
-
-        setTimeout ( resolve, ms )
-    } )
-}
-
-
-
-function urlFormatter ( service, url ) {
-
-    // :6000
-    if ( url.startsWith ( ':' ) ) url = service.config.host + url
-
-    // http://127.0.0.1:6000
-    if ( url.startsWith ( 'http://' ) ) url = url.substr ( 7 )
-
-    // 127.0.0.1:6000
-    if ( !url.startsWith ( 'ws://' ) ) url = 'ws://' + url
-
-    const urlObject = new URL ( url )
-
-    if ( urlObject.pathname === '/' && !url.endsWith ( '/' ) ) url = url + '/socket.io'
-
-    return url
-}
-
-
-/**
- * 
- * @param {Service} service 
- * @param {String} url 
- */
-async function connect ( service, url, prevError = null ) {
-
-    if ( service.socketio.config ) {
-
-        const { port, path } = service.socketio.config
-
-        if ( `ws://${service.config.host}:${port}${path}` === url ) return
-    }
-
-    try {
-
-        const socket = await Service.SocketIO.connect ( url, service.name )
-
-        onConnection ( socket, service, url )
-    } catch ( error ) {
-
-        if ( !prevError ) console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'error.' )
-
-        await delay ( 5000 )
-
-        connect ( service, url, error )
-    }
-}
-
-
-
-async function onConnection ( socket, service, url ) {
-
-    socket.on ( 'disconnect', async ( ) => {
-
-        console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'disconnected.' )
-
-        await delay ( 1000 )
-
-        connect ( service, url )
-    } )
-
-    console.log ( chalk.green`[Registry]`, chalk.underline.green`${url}`, 'connected.' )
-}
-
-
-
-/**
- * 
- * @param {Service} service 
- * @param {String[]} registry 
- */
-exports.connect = async ( service, registry ) => {
-
-    if ( 'string' === typeof registry ) {
-
-        connect ( service, urlFormatter ( service, registry ) )
-    } else {
-        
-        for ( const url of registry ) {
-
-            connect ( service, urlFormatter ( service, url ) )
-        }
-    }
-}
-
-
-
+
+const chalk = require ( 'chalk' )
+
+var Service = require ( '../service/service.class' )
+
+
+
+function delay ( ms ) {
+
+    return new Promise ( function ( resolve, reject ) {
+
+        setTimeout ( resolve, ms )
+    } )
+}
+
+
+
+function urlFormatter ( service, url ) {
+
+    // :6000
+    if ( url.startsWith ( ':' ) ) url = service.config.host + url
+
+    // http://127.0.0.1:6000
+    if ( url.startsWith ( 'http://' ) ) url = url.substr ( 7 )
+
+    // 127.0.0.1:6000
+    if ( !url.startsWith ( 'ws://' ) ) url = 'ws://' + url
+
+    const urlObject = new URL ( url )
+
+    if ( urlObject.pathname === '/' && !url.endsWith ( '/' ) ) url = url + '/socket.io'
+
+    return url
+}
+
+
+/**
+ * 
+ * @param {Service} service 
+ * @param {String} url 
+ */
+async function connect ( service, url, prevError = null ) {
+
+    if ( service.socketio.config ) {
+
+        const { port, path } = service.socketio.config
+
+        if ( `ws://${service.config.host}:${port}${path}` === url ) return
+    }
+
+    try {
+
+        const socket = await Service.SocketIO.connect ( url, service.name )
+
+        onConnection ( socket, service, url )
+    } catch ( error ) {
+
+        if ( !prevError ) console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'error.' )
+
+        await delay ( 5000 )
+
+        connect ( service, url, error )
+    }
+}
+
+
+
+async function onConnection ( socket, service, url ) {
+
+    socket.on ( 'disconnect', async ( ) => {
+
+        console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'disconnected.' )
+
+        await delay ( 1000 )
+
+        connect ( service, url )
+    } )
+
+    console.log ( chalk.green`[Registry]`, chalk.underline.green`${url}`, 'connected.' )
+}
+
+
+
+/**
+ * 
+ * @param {Service} service 
+ * @param {String[]} registry 
+ */
+exports.connect = async ( service, registry ) => {
+
+    if ( 'string' === typeof registry ) {
+
+        connect ( service, urlFormatter ( service, registry ) )
+    } else {
+        
+        for ( const url of registry ) {
+
+            connect ( service, urlFormatter ( service, url ) )
+        }
+    }
+}
+
+
+
 exports.setService = serviceClazz => Service = serviceClazz

package/bin/starter.js

@@ -1,140 +1,144 @@
-
-const fs = require ( 'fs' )
-
-const path = require ( 'path' )
-
-const Service = require ( '../service/service.class' )
-
-const chalk = require ( 'chalk' )
-
-const proxyer = require ( './proxyer' )
-
-const configurer = require ( './configurer' )
-
-const register = require ( './register' )
-
-
-
-function getEntryFile ( ) {
-
-    const args = process.argv.slice ( 2 )
-
-    var [ entryFilename ] = args.filter ( arg => !arg.includes ( '=' ) && arg.endsWith ( '.js' ) )
-
-    if ( !entryFilename ) throw new Error ( 'Cannot find entry file' )
-
-    const fullPath = path.resolve ( entryFilename )
-
-    const filename = path.basename ( fullPath )
-
-    const directory = path.dirname ( fullPath ).split ( path.sep ).pop ( )
-
-    var name = filename === 'index.js' ? directory : filename.split ( '.js' ) [ 0 ]
-
-    return { name, path: fullPath }
-}
-
-
-
-function genEntry ( name, entryPath, templatePath ) {
-
-    /**
-     * @type {Service}
-     */
-    var entry = require ( entryPath )
-
-    if ( 'object' === typeof entry && 'function' === typeof entry.call && 'string' === typeof entry.name && 'object' === typeof entry.config ) {
-
-        // entry instanceof RPC
-
-    } else if ( 'function' === typeof entry && 'function' === typeof entry.call ) {
-
-        // entry extendsof RPC
-
-        entry = new entry ( name, null )
-    } else {
-
-        // custom service class
-
-        if ( !templatePath ) templatePath = path.dirname ( entryPath ) + '/service.class.js'
-
-        templatePath = path.resolve ( templatePath )
-
-        if ( fs.existsSync ( templatePath ) ) {
-
-            const CustomService = require ( templatePath )
-
-            entry = new CustomService ( name, entry )
-        } else {
-
-            entry = new Service ( name, entry )
-        }
-    }
-
-    return entry
-}
-
-
-
-exports.startup = async ( ) => {
-
-    // 加载环境变量
-    const env = configurer.configure ( )
-
-    Object.assign ( oox, env )
-
-
-
-    // 获取服务入口地址
-    const entryFile = getEntryFile ( )
-
-    // 代理<服务间调用>
-    if ( env.group ) {
-
-        const excludes = [ entryFile.name ]
-
-        if ( Array.isArray ( env.ignore ) ) excludes.push ( ...env.ignore )
-
-        proxyer.proxyServices ( env.group, excludes )
-    }
-
-    // 加载服务
-    const entry = genEntry ( entryFile.name, entryFile.path, env.template )
-
-    proxyer.setService ( entry.constructor )
-    register.setService ( entry.constructor )
-
-
-
-    // 服务配置
-    if ( !env.port && !env.http && !env.socketio ) env.port = 0
-
-    if ( 'number' === typeof env.port ) {
-
-        if ( !entry.http.config ) entry.http.config = { }
-        if ( !entry.socketio.config ) entry.socketio.config = { }
-
-        entry.http.config.port = 
-        entry.socketio.config.port = env.port
-    }
-
-    if ( 'http' in env ) entry.http.config = env.http
-
-    if ( 'socketio' in env ) entry.socketio.config = env.socketio
-
-    if ( env.origin ) entry.config.origin = env.origin
-
-
-
-    // 服务启动
-    await entry.serve ( )
-
-    console.log ( )
-    console.log ( 'Service', chalk.bold`${entry.name}`, 'running.' )
-    if ( entry.http.config ) console.log ( '  at', chalk.underline.green`http://${entry.config.host}:${entry.http.config.port}${entry.http.config.path}` )
-    if ( entry.socketio.config ) console.log ( '  at', chalk.underline.green`ws://${entry.config.host}:${entry.socketio.config.port}${entry.socketio.config.path}` )
-    console.log ( )
-
-    // 服务注册
-    if ( env.registry ) register.connect ( entry, env.registry )
+
+const fs = require ( 'fs' )
+
+const path = require ( 'path' )
+
+const Service = require ( '../service/service.class' )
+
+const chalk = require ( 'chalk' )
+
+const proxyer = require ( './proxyer' )
+
+const configurer = require ( './configurer' )
+
+const register = require ( './register' )
+
+
+
+function getEntryFile ( env ) {
+
+    const args = process.argv.slice ( 2 )
+
+    var [ entryFilename ] = args.filter ( arg => !arg.includes ( '=' ) && arg.endsWith ( '.js' ) )
+
+    if ( !entryFilename ) throw new Error ( 'Cannot find entry file' )
+
+    const fullPath = path.resolve ( entryFilename )
+
+    const filename = path.basename ( fullPath )
+
+    const fullDirectory = path.dirname ( fullPath )
+
+    const directory = fullDirectory.split ( path.sep ).pop ( )
+
+    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 }
+}
+
+
+
+function genEntry ( name, entryPath, templatePath ) {
+
+    /**
+     * @type {Service}
+     */
+    var entry = require ( entryPath )
+
+    if ( 'object' === typeof entry && 'function' === typeof entry.call && 'string' === typeof entry.name && 'object' === typeof entry.config ) {
+
+        // entry instanceof RPC
+
+    } else if ( 'function' === typeof entry && 'function' === typeof entry.call ) {
+
+        // entry extendsof RPC
+
+        entry = new entry ( name, null )
+    } else {
+
+        // custom service class
+
+        if ( !templatePath ) templatePath = path.dirname ( entryPath ) + '/service.class.js'
+
+        templatePath = path.resolve ( templatePath )
+
+        if ( fs.existsSync ( templatePath ) ) {
+
+            const CustomService = require ( templatePath )
+
+            entry = new CustomService ( name, entry )
+        } else {
+
+            entry = new Service ( name, entry )
+        }
+    }
+
+    return entry
+}
+
+
+
+exports.startup = async ( ) => {
+
+    // 加载环境变量
+    const env = configurer.configure ( )
+
+    Object.assign ( oox, env )
+
+
+
+    // 获取服务入口地址
+    const entryFile = getEntryFile ( env )
+
+    // 代理<服务间调用>
+    if ( env.group ) {
+
+        const excludes = [ entryFile.name ]
+
+        if ( Array.isArray ( env.ignore ) ) excludes.push ( ...env.ignore )
+
+        proxyer.proxyServices ( entryFile.group, excludes )
+    }
+
+    // 加载服务
+    const entry = genEntry ( entryFile.name, entryFile.path, env.template )
+
+    proxyer.setService ( entry.constructor )
+    register.setService ( entry.constructor )
+
+
+
+    // 服务配置
+    if ( !env.port && !env.http && !env.socketio ) env.port = 0
+
+    if ( 'number' === typeof env.port ) {
+
+        if ( !entry.http.config ) entry.http.config = { }
+        if ( !entry.socketio.config ) entry.socketio.config = { }
+
+        entry.http.config.port = 
+        entry.socketio.config.port = env.port
+    }
+
+    if ( 'http' in env ) entry.http.config = env.http
+
+    if ( 'socketio' in env ) entry.socketio.config = env.socketio
+
+    if ( env.origin ) entry.config.origin = env.origin
+
+
+
+    // 服务启动
+    await entry.serve ( )
+
+    console.log ( )
+    console.log ( 'Service', chalk.bold`${entry.name}`, 'running.' )
+    if ( entry.http.config ) console.log ( '  at', chalk.underline.green`http://${entry.config.host}:${entry.http.config.port}${entry.http.config.path}` )
+    if ( entry.socketio.config ) console.log ( '  at', chalk.underline.green`ws://${entry.config.host}:${entry.socketio.config.port}${entry.socketio.config.path}` )
+    console.log ( )
+
+    // 服务注册
+    if ( env.registry ) register.connect ( entry, env.registry )
 }