Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update commander

Browse source
This commit is contained in:
acalcutt 2022-09-14 21:28:32 -04:00
parent 082243bda9
commit 2362137667
2 changed files with 63 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -28,7 +28,7 @@
"chokidar": "3.3.1", "chokidar": "3.3.1",
"clone": "2.1.2", "clone": "2.1.2",
"color": "3.1.2", "color": "3.1.2",
"commander": "4.1.1", "commander": "9.4.0",
"cors": "2.8.5", "cors": "2.8.5",
"esm": "3.2.25", "esm": "3.2.25",
"express": "4.17.1", "express": "4.17.1",

122
src/main.js
View file

@ -17,76 +17,78 @@ if (args.length >= 3 && args[2][0] !== '-') {
args.splice(2, 0, '--mbtiles'); args.splice(2, 0, '--mbtiles');
} }
const opts = require('commander') const { program } = require('commander');
.description('tileserver-gl startup options') program
.usage('tileserver-gl [mbtiles] [options]') .description('tileserver-gl startup options')
.option( .usage('tileserver-gl [mbtiles] [options]')
'--mbtiles <file>', .option(
'MBTiles file (uses demo configuration);\n' + '--mbtiles <file>',
'\t ignored if the configuration file is also specified' 'MBTiles file (uses demo configuration);\n' +
) '\t ignored if the configuration file is also specified',
.option( )
'-c, --config <file>', .option(
'Configuration file [config.json]', '-c, --config <file>',
'config.json' 'Configuration file [config.json]',
) 'config.json',
.option( )
'-b, --bind <address>', .option(
'Bind address' '-b, --bind <address>',
) 'Bind address',
.option( )
'-p, --port <port>', .option(
'Port [8080]', '-p, --port <port>',
8080, 'Port [8080]',
parseInt 8080,
) parseInt,
.option( )
'-C|--no-cors', .option(
'Disable Cross-origin resource sharing headers' '-C|--no-cors',
) 'Disable Cross-origin resource sharing headers',
.option( )
'-u|--public_url <url>', .option(
'Enable exposing the server on subpaths, not necessarily the root of the domain' '-u|--public_url <url>',
) 'Enable exposing the server on subpaths, not necessarily the root of the domain',
.option( )
'-V, --verbose', .option(
'More verbose output' '-V, --verbose',
) 'More verbose output',
.option( )
'-s, --silent', .option(
'Less verbose output' '-s, --silent',
) 'Less verbose output',
.option( )
'-l|--log_file <file>', .option(
'output log file (defaults to standard out)' '-l|--log_file <file>',
) 'output log file (defaults to standard out)',
.option( )
'-f|--log_format <format>', .option(
'define the log format: https://github.com/expressjs/morgan#morganformat-options' '-f|--log_format <format>',
) 'define the log format: https://github.com/expressjs/morgan#morganformat-options',
.version( )
packageJson.version, .version(
'-v, --version' packageJson.version,
) '-v, --version',
.parse(args); );
program.parse(process.argv);
const options = program.opts();
console.log(`Starting ${packageJson.name} v${packageJson.version}`); console.log(`Starting ${packageJson.name} v${packageJson.version}`);
const startServer = (configPath, config) => { const startServer = (configPath, config) => {
let publicUrl = opts.public_url; let publicUrl = options.public_url;
if (publicUrl && publicUrl.lastIndexOf('/') !== publicUrl.length - 1) { if (publicUrl && publicUrl.lastIndexOf('/') !== publicUrl.length - 1) {
publicUrl += '/'; publicUrl += '/';
} }
return require('./server')({ return require('./server')({
configPath: configPath, configPath: configPath,
config: config, config: config,
bind: opts.bind, bind: options.bind,
port: opts.port, port: options.port,
cors: opts.cors, cors: options.cors,
verbose: opts.verbose, verbose: options.verbose,
silent: opts.silent, silent: options.silent,
logFile: opts.log_file, logFile: options.log_file,
logFormat: opts.log_format, logFormat: options.log_format,
publicUrl: publicUrl publicUrl: publicUrl
}); });
}; };