oox 0.0.7 → 0.2.0

package/.gitattributes

@@ -1,2 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+# Auto detect text files and perform LF normalization
+* text=auto

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 lipingruan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 lipingruan
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,29 +1,29 @@
-# OOX
-graceful microservice framework.
-
-### Features
-- [x] HTTP & socket.io support (native SSL coming soon)
-- [x] Zero configure startup
-- [x] Non-invasive coding style
-- [x] Intuitive route style
-- [x] Intuitive RPC style
-- [x] Anywhere interceptor
-- [x] Distributed tracing
-- [x] Service nodes expand infinitely
-- [x] Automatic service discovery (P2P)
-- [x] Automatic load balancing (support customization)
-- [x] `Distributed / Standalone` seamless handoff
-- [x] Highly customizable
-
-### Installation
-```bash
-npm install -g oox
-```
-
-### Usage
-```bash
-oox --help
-```
-
-### Documentation
-[oox.js.org](https://oox.js.org/)
+# OOX
+graceful microservice framework.
+
+### Features
+- [x] HTTP & socket.io support (native SSL coming soon)
+- [x] Zero configure startup
+- [x] Non-invasive coding style
+- [x] Intuitive route style
+- [x] Intuitive RPC style
+- [x] Anywhere interceptor
+- [x] Distributed tracing
+- [x] Service nodes expand infinitely
+- [x] Automatic service discovery (P2P)
+- [x] Automatic load balancing (support customization)
+- [x] `Distributed / Standalone` seamless handoff
+- [x] Highly customizable
+
+### Installation
+```bash
+npm install -g oox
+```
+
+### Usage
+```bash
+oox --help
+```
+
+### Documentation
+[oox.js.org](https://oox.js.org/)

package/bin/argv.js

@@ -1,95 +1,95 @@
-
-
-
-exports.getAllEnvArgs = function ( ) {
-
-    const args = process.argv.slice ( 2 )
-
-    const env = { }
-
-    for ( const arg of args ) {
-
-        if ( arg.startsWith ( '--' ) ) {
-
-        env [ arg.slice ( 2 ) ] = true
-        } else if ( arg.startsWith ( '-' ) ) {
-
-        env [ arg.slice ( 1 ) ] = true
-        } else if ( !arg.includes ( '=' ) ) {
-
-        env [ arg ] = true
-        } else {
-
-        const index = arg.indexOf ( '=' )
-
-        const key = arg.slice ( 0, index )
-
-        const val = arg.slice ( index + 1 )
-
-        env [ key ] = exports.parseEnvArg ( val )
-        }
-    }
-
-    return env
-}
-
-
-
-exports.getEnvArgs = function ( names ) {
-
-    const env = { }
-
-    for ( let name of names ) {
-
-        env [ name ] = exports.getEnvArg ( name )
-    }
-
-    return env
-}
-
-
-
-// 从命令行参数列表中获取参数值
-exports.getEnvArg = function ( name ) {
-
-    if ( 
-        process.argv.includes ( name ) || 
-        process.argv.includes ( '-' + name ) || 
-        process.argv.includes ( '--' + name ) 
-        ) {
-
-        return true
-    } else {
-
-        const prefix = name + '='
-
-        const [ argv ] = process.argv.filter ( arg => arg.startsWith ( prefix ) )
-
-        if ( !argv ) return null
-
-        const arg = argv.slice ( prefix.length )
-
-        return exports.parseEnvArg ( arg )
-    }
-}
-
-
-
-exports.parseEnvArg = function ( value ) {
-
-    switch ( value ) {
-        case 'no': return false
-        case 'yes': return true
-        case 'nil': return null
-        default:
-        try {
-
-            return JSON.parse ( value )
-        } catch ( error ) {
-
-            if ( value.includes ( ',' ) ) return value.split ( ',' )
-
-            return value
-        }
-    }
-}
+
+
+
+exports.getAllEnvArgs = function ( ) {
+
+    const args = process.argv.slice ( 2 )
+
+    const env = { }
+
+    for ( const arg of args ) {
+
+        if ( arg.startsWith ( '--' ) ) {
+
+        env [ arg.slice ( 2 ) ] = true
+        } else if ( arg.startsWith ( '-' ) ) {
+
+        env [ arg.slice ( 1 ) ] = true
+        } else if ( !arg.includes ( '=' ) ) {
+
+        env [ arg ] = true
+        } else {
+
+        const index = arg.indexOf ( '=' )
+
+        const key = arg.slice ( 0, index )
+
+        const val = arg.slice ( index + 1 )
+
+        env [ key ] = exports.parseEnvArg ( val )
+        }
+    }
+
+    return env
+}
+
+
+
+exports.getEnvArgs = function ( names ) {
+
+    const env = { }
+
+    for ( let name of names ) {
+
+        env [ name ] = exports.getEnvArg ( name )
+    }
+
+    return env
+}
+
+
+
+// 从命令行参数列表中获取参数值
+exports.getEnvArg = function ( name ) {
+
+    if ( 
+        process.argv.includes ( name ) || 
+        process.argv.includes ( '-' + name ) || 
+        process.argv.includes ( '--' + name ) 
+        ) {
+
+        return true
+    } else {
+
+        const prefix = name + '='
+
+        const [ argv ] = process.argv.filter ( arg => arg.startsWith ( prefix ) )
+
+        if ( !argv ) return null
+
+        const arg = argv.slice ( prefix.length )
+
+        return exports.parseEnvArg ( arg )
+    }
+}
+
+
+
+exports.parseEnvArg = function ( value ) {
+
+    switch ( value ) {
+        case 'no': return false
+        case 'yes': return true
+        case 'nil': return null
+        default:
+        try {
+
+            return JSON.parse ( value )
+        } catch ( error ) {
+
+            if ( value.includes ( ',' ) ) return value.split ( ',' )
+
+            return value
+        }
+    }
+}

package/bin/cli.js

@@ -1,58 +1,58 @@
-#! /usr/bin/env node
-
-const chalk = require ( 'chalk' )
-
-const starter = require ( './starter' )
-
-const args = process.argv.slice ( 2 )
-
-const command = args [ 0 ]
-
-var startup = true
-
-if ( !command || [ 'help', '-h', '-help', '--help', 'version', '-v', '-version', '--version' ].includes ( command ) ) {
-
-    startup = false
-
-    const pkg = require ( '../package.json' )
-
-    console.log ( )
-    console.log ( 'OOX Service' )
-    console.log ( chalk.bold`version`, chalk.bold.green`${pkg.version}` )
-    console.log ( chalk.underline`${pkg.homepage}` )
-    console.log ( )
-}
-
-if ( [ 'help', '-h', '-help', '--help' ].includes ( command ) ) {
-
-    console.log ( chalk.bold`Usage:` )
-    console.log ( '  oox entry.js' )
-    console.log ( )
-    console.log ( '  oox entry.js port=8080' )
-    console.log ( )
-    console.log ( '  oox app/entry/index.js group=app/ env=envs/entry.js ignore=core' )
-
-    console.log ( )
-    console.log ( chalk.bold`Params:` )
-
-    const params = [
-        [ '  default-env  [ file ]  ', '.js or .json file, merge to global.oox' ],
-        [ '  env          [ file ]  ', '.js or .json file, merge to global.oox', chalk.bold`(after default-env)` ],
-        [ '  port         [ int  ]  ', 'set', chalk.bold`0` ,'for random port, or any integer > 0' ],
-        [ '  group        [ dir  ]  ', 'service group directory, all LocalCall transform to RPC' ],
-        [ '  ignore       [ name ]  ', 'set a name for LocalCall do not transform to RPC, support string | array<string>' ],
-        [ '  http         [ json ]  ', 'HTTP server options, support flat name, ex: http.path=/api' ],
-        [ '  socketio     [ json ]  ', 'SocketIO server options, support flat name' ],
-        [ '  registry     [ urls ]  ', 'registry service url, support string | array<string>' ],
-        [ '  template     [ file ]  ', 'custom Service class file path' ],
-        [ '  origin       [ urls ]  ', 'set', chalk.bold`*`, 'allow any connections <Access-Control-Allow-Origin>' ],
-        [ '  ...                    ', 'set params as', chalk.bold`foo=bar`+',', 'usage as', chalk.bold`global.oox.foo` ]
-    ]
-
-    params.forEach ( row => console.log ( ...row, '\n' ) )
-    
-    console.log ( )
-}
-
-
+#! /usr/bin/env node
+
+const chalk = require ( 'chalk' )
+
+const starter = require ( './starter' )
+
+const args = process.argv.slice ( 2 )
+
+const command = args [ 0 ]
+
+var startup = true
+
+if ( !command || [ 'help', '-h', '-help', '--help', 'version', '-v', '-version', '--version' ].includes ( command ) ) {
+
+    startup = false
+
+    const pkg = require ( '../package.json' )
+
+    console.log ( )
+    console.log ( 'OOX Service' )
+    console.log ( chalk.bold`version`, chalk.bold.green`${pkg.version}` )
+    console.log ( chalk.underline`${pkg.homepage}` )
+    console.log ( )
+}
+
+if ( [ 'help', '-h', '-help', '--help' ].includes ( command ) ) {
+
+    console.log ( chalk.bold`Usage:` )
+    console.log ( '  oox entry.js' )
+    console.log ( )
+    console.log ( '  oox entry.js port=8080' )
+    console.log ( )
+    console.log ( '  oox app/entry/index.js group=app/ env=envs/entry.js ignore=core' )
+
+    console.log ( )
+    console.log ( chalk.bold`Params:` )
+
+    const params = [
+        [ '  default-env  [ file ]  ', '.js or .json file, merge to global.oox' ],
+        [ '  env          [ file ]  ', '.js or .json file, merge to global.oox', chalk.bold`(after default-env)` ],
+        [ '  port         [ int  ]  ', 'set', chalk.bold`0` ,'for random port, or any integer > 0' ],
+        [ '  group        [ dir  ]  ', 'service group directory, all LocalCall transform to RPC' ],
+        [ '  ignore       [ name ]  ', 'set a name for LocalCall do not transform to RPC, support string | array<string>' ],
+        [ '  http         [ json ]  ', 'HTTP server options, support flat name, ex: http.path=/api' ],
+        [ '  socketio     [ json ]  ', 'SocketIO server options, support flat name' ],
+        [ '  registry     [ urls ]  ', 'registry service url, support string | array<string>' ],
+        [ '  template     [ file ]  ', 'custom Service class file path' ],
+        [ '  origin       [ urls ]  ', 'set', chalk.bold`*`, 'allow any connections <Access-Control-Allow-Origin>' ],
+        [ '  ...                    ', 'set params as', chalk.bold`foo=bar`+',', 'usage as', chalk.bold`global.oox.foo` ]
+    ]
+
+    params.forEach ( row => console.log ( ...row, '\n' ) )
+    
+    console.log ( )
+}
+
+
 if ( startup ) starter.startup ( )

package/bin/configurer.js

@@ -1,78 +1,78 @@
-
-const fs = require ( 'fs' )
-
-const path = require ( 'path' )
-
-const argv = require ( './argv' )
-
-
-
-/**
- * x.y=1 => { x: { y: 1 } }
- * @param {*} env 
- */
-function mergeFlatEnv ( env ) {
-
-    for ( const key of Object.keys ( env ) ) {
-
-        // x.y.z
-        if ( key.includes ( '.' ) && !key.startsWith ( '.' ) && !key.endsWith ( '.' ) ) {
-
-            const subKeys = key.split ( '.' )
-
-            const valueKey = subKeys.pop ( )
-
-            let tmpEnv = env
-
-            for ( subKey of subKeys ) {
-
-                if ( subKey in tmpEnv ) { } else {
-
-                    tmpEnv [ subKey ] = { }
-                }
-
-                tmpEnv = tmpEnv [ subKey ]
-            }
-
-            tmpEnv [ valueKey ] = env [ key ]
-        }
-    }
-}
-
-
-
-exports.configure = ( ) => {
-
-    let env = Object.create ( null )
-
-    const defaultEnvPath = argv.getEnvArg ( 'default-env' )
-
-    if ( defaultEnvPath && fs.existsSync ( defaultEnvPath ) ) {
-
-        Object.assign ( env, require ( path.resolve ( defaultEnvPath ) ) )
-    }
-
-
-
-    const envPath = argv.getEnvArg ( 'env' )
-
-    if ( envPath && fs.existsSync ( envPath ) ) {
-
-        Object.assign ( env, require ( path.resolve ( envPath ) ) )
-    }
-
-    Object.assign ( env, argv.getAllEnvArgs ( ) )
-
-    mergeFlatEnv ( env )
-
-    if ( 'string' === typeof env.ignore ) env.ignore = env.ignore.split ( ',' )
-
-    if ( 'string' === typeof env.registry ) env.registry = env.registry.split ( ',' )
-
-    if ( 'string' === typeof env.origin && env.origin.includes ( ',' ) ) {
-
-        env.origin = env.origin.split ( ',' )
-    }
-
-    return env
+
+const fs = require ( 'fs' )
+
+const path = require ( 'path' )
+
+const argv = require ( './argv' )
+
+
+
+/**
+ * x.y=1 => { x: { y: 1 } }
+ * @param {*} env 
+ */
+function mergeFlatEnv ( env ) {
+
+    for ( const key of Object.keys ( env ) ) {
+
+        // x.y.z
+        if ( key.includes ( '.' ) && !key.startsWith ( '.' ) && !key.endsWith ( '.' ) ) {
+
+            const subKeys = key.split ( '.' )
+
+            const valueKey = subKeys.pop ( )
+
+            let tmpEnv = env
+
+            for ( subKey of subKeys ) {
+
+                if ( subKey in tmpEnv ) { } else {
+
+                    tmpEnv [ subKey ] = { }
+                }
+
+                tmpEnv = tmpEnv [ subKey ]
+            }
+
+            tmpEnv [ valueKey ] = env [ key ]
+        }
+    }
+}
+
+
+
+exports.configure = ( ) => {
+
+    let env = Object.create ( null )
+
+    const defaultEnvPath = argv.getEnvArg ( 'default-env' )
+
+    if ( defaultEnvPath && fs.existsSync ( defaultEnvPath ) ) {
+
+        Object.assign ( env, require ( path.resolve ( defaultEnvPath ) ) )
+    }
+
+
+
+    const envPath = argv.getEnvArg ( 'env' )
+
+    if ( envPath && fs.existsSync ( envPath ) ) {
+
+        Object.assign ( env, require ( path.resolve ( envPath ) ) )
+    }
+
+    Object.assign ( env, argv.getAllEnvArgs ( ) )
+
+    mergeFlatEnv ( env )
+
+    if ( 'string' === typeof env.ignore ) env.ignore = env.ignore.split ( ',' )
+
+    if ( 'string' === typeof env.registry ) env.registry = env.registry.split ( ',' )
+
+    if ( 'string' === typeof env.origin && env.origin.includes ( ',' ) ) {
+
+        env.origin = env.origin.split ( ',' )
+    }
+
+    return env
 }