Skip to content

Commit 81f5c68

Browse files
committed
Updates README, makes serverURL required
- prints help when misconfigured - prints missing appId, masterKey, serverURL
1 parent 30aafd2 commit 81f5c68

File tree

5 files changed

+53
-12
lines changed

5 files changed

+53
-12
lines changed

README.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,28 @@ app.listen(1337, function() {
4444

4545
### Standalone Parse Server
4646

47-
Parse Server can also run as a standalone API server. The standalone Parse Server can be configured using [environment variables](#configuration). To start the server, just run `npm start`.
47+
Parse Server can also run as a standalone API server.
48+
You can configure Parse Server with a configuration file, arguments and environment variables.
49+
50+
To start the server:
51+
52+
`npm start -- --appId MYAPP --masterKey MASTER_KEY`.
53+
54+
To get more help for running the parse-server standalone, you can run:
55+
56+
`$ npm start -- --help`
57+
58+
The standalone API server supports loading a configuration file in JSON format:
59+
60+
`$ npm start -- path/to/your/config.json`
61+
62+
The default port is 1337, to use a different port set the PORT environment variable:
63+
64+
`$ PORT=8080 npm start -- path/to/your/config.json`
65+
66+
The standalone Parse Server can be configured using [environment variables](#configuration).
67+
68+
Please refer to the [configuration section](#configuration) or help;
4869

4970
You can also install Parse Server globally:
5071

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"babel-runtime": "^6.5.0",
2323
"bcrypt-nodejs": "0.0.3",
2424
"body-parser": "^1.14.2",
25+
"colors": "^1.1.2",
2526
"commander": "^2.9.0",
2627
"deepcopy": "^0.6.1",
2728
"express": "^4.13.4",

src/cli/cli-definitions.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ module.exports = {
1111
},
1212
"serverURL": {
1313
env: "PARSE_SERVER_URL",
14-
help: "URL to your parse server with http:// or https://"
14+
help: "URL to your parse server with http:// or https://",
15+
required: true
1516
},
1617
"databaseURI": {
1718
env: "PARSE_SERVER_DATABASE_URI",
@@ -65,7 +66,7 @@ module.exports = {
6566
},
6667
"enableAnonymousUsers": {
6768
env: "PARSE_SERVER_ENABLE_ANON_USERS",
68-
help: "Enable (or disable) anon users, enabled by default",
69+
help: "Enable (or disable) anon users, defaults to true",
6970
action: function(opt) {
7071
if (opt == "true" || opt == "1") {
7172
return true;
@@ -75,7 +76,8 @@ module.exports = {
7576
},
7677
"mountPath": {
7778
env: "PARSE_SERVER_MOUNT_PATH",
78-
help: "Mount path for the server, defaults to /"
79+
help: "Mount path for the server, defaults to /parse",
80+
default: "/parse"
7981
},
8082
"databaseAdapter": {
8183
env: "PARSE_SERVER_DATABASE_ADAPTER",

src/cli/parse-server.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var express = require('express');
33
var ParseServer = require("../index").ParseServer;
44
var definitions = require('./cli-definitions');
55
var program = require('./utils/commander');
6+
var colors = require('colors');
67

78
program.loadDefinitions(definitions);
89

@@ -19,15 +20,15 @@ program.on('--help', function(){
1920
console.log(' Usage with npm start');
2021
console.log('');
2122
console.log(' $ npm start -- path/to/config.json');
22-
console.log(' $ npm start -- --appId APP_ID --masterKey MASTER_KEY');
23-
console.log(' $ npm start -- --appId APP_ID --masterKey MASTER_KEY');
23+
console.log(' $ npm start -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL');
24+
console.log(' $ npm start -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL');
2425
console.log('');
2526
console.log('');
2627
console.log(' Usage:');
2728
console.log('');
2829
console.log(' $ parse-server path/to/config.json');
29-
console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY');
30-
console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY');
30+
console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL');
31+
console.log(' $ parse-server -- --appId APP_ID --masterKey MASTER_KEY --serverURL serverURL');
3132
console.log('');
3233
});
3334

@@ -40,6 +41,14 @@ if (program.args.length > 0 ) {
4041
jsonPath = path.resolve(jsonPath);
4142
options = require(jsonPath);
4243
console.log(`Configuation loaded from ${jsonPath}`)
44+
}
45+
46+
if (!program.appId || !program.masterKey || !program.serverURL) {
47+
program.outputHelp();
48+
console.error("");
49+
console.error(colors.red("ERROR: appId, masterKey and serverURL are required"));
50+
console.error("");
51+
process.exit(1);
4352
}
4453

4554
var options = Object.keys(definitions).reduce(function (options, key) {
@@ -49,8 +58,6 @@ var options = Object.keys(definitions).reduce(function (options, key) {
4958
return options;
5059
}, options);
5160

52-
options.mountPath = options.mountPath || '/';
53-
5461
var app = express();
5562
var api = new ParseServer(options);
5663
app.use(options.mountPath, api);

src/cli/utils/commander.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var program = require('commander');
22

33
var _definitions;
44
var _reverseDefinitions;
5-
5+
var _defaults;
66
program.loadDefinitions = function(definitions) {
77
_definitions = definitions;
88
Object.keys(definitions).reduce(function(program, opt){
@@ -16,7 +16,12 @@ program.loadDefinitions = function(definitions) {
1616
}
1717
return program.option(`--${opt} [${opt}]`)
1818
}, program);
19-
19+
_defaults = Object.keys(definitions).reduce(function(defs, opt) {
20+
if(_definitions[opt].default) {
21+
defs[opt] = _definitions[opt].default;
22+
}
23+
return defs;
24+
}, {});
2025
_reverseDefinitions = Object.keys(definitions).reduce(function(object, key){
2126
let value = definitions[key];
2227
if (typeof value == "object") {
@@ -65,6 +70,11 @@ program.parse = function(args, env) {
6570
program[key] = envOptions[key];
6671
}
6772
});
73+
Object.keys(_defaults).forEach(function(key){
74+
if (!program[key]) {
75+
program[key] = _defaults[key];
76+
}
77+
});
6878
}
6979

7080
module.exports = program;

0 commit comments

Comments
 (0)