Merge branch 'develop' of https://github.com/DivanteLtd/vue-storefront-api into develop

# Conflicts:
#	package.json

Author: pkarw

README.md

@@ -31,7 +31,7 @@ The **legacy** (A) mode - starting just the Elastic and Redis containers:
 `docker-compose up -d`
 
 The **standard** (B) mode - starting Elastic, Redis + Vue Storefront API containers:
-`docker-compose -f docker-compose.yml -f docker-compose.all.yml up -d`
+`docker-compose -f docker-compose.yml -f docker-compose.nodejs.yml up -d`
 
 As a result, all necessary services will be launched:
 - Vue Storefront API runtime environment (Node.js with dependencies from `package.json`)

package.json

@@ -10,14 +10,15 @@
     "start": "node dist",
     "db": "babel-node --plugins transform-es2015-modules-commonjs scripts/db.js",
     "seo": "babel-node --plugins transform-es2015-modules-commonjs scripts/seo.js",
-    "restore": "node node_modules/elasticdump/bin/elasticdump --input=var/catalog.json --output=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog_temp",
-    "restore_it": "node node_modules/elasticdump/bin/elasticdump --input=var/catalog_it.json --output=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog_it && npm run db rebuild -- --indexName=vue_storefront_catalog_it",
-    "restore_de": "node node_modules/elasticdump/bin/elasticdump --input=var/catalog_de.json --output=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog_de && npm run db rebuild -- --indexName=vue_storefront_catalog_de",
-    "restore2main": "node node_modules/elasticdump/bin/elasticdump --input=var/catalog.json --output=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog",
-    "dump": "node node_modules/elasticdump/bin/elasticdump --output=var/catalog.json --input=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog",
-    "dump_it": "node node_modules/elasticdump/bin/elasticdump --output=var/catalog_it.json --input=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog_it",
-    "dump_de": "node node_modules/elasticdump/bin/elasticdump --output=var/catalog_de.json --input=http://$ELASTICSEARCH_HOST:$ELASTICSEARCH_PORT/vue_storefront_catalog_de",
-    "kue-dashboard": "node node_modules/kue/bin/kue-dashboard -p 3050 -r redis://$REDIS_HOST:$REDIS_PORT",
+    "restore": "babel-node --plugins transform-es2015-modules-commonjs scripts/elastic.js restore",
+    "restore_it": "npm run restore -- --input-file=var/catalog_it.json --output-index=vue_storefront_catalog_it && npm run db rebuild -- --indexName=vue_storefront_catalog_it",
+    "restore_de": "npm run restore -- --input-file=var/catalog_de.json --output-index=vue_storefront_catalog_de && npm run db rebuild -- --indexName=vue_storefront_catalog_de",
+    "restore2main": "npm run restore -- --output-index=vue_storefront_catalog",
+    "dump": "babel-node --plugins transform-es2015-modules-commonjs scripts/elastic.js dump",
+    "dump_it": "npm run dump -- --input-index=vue_storefront_catalog_it --output-file=var/catalog_it.json",
+    "dump_de": "npm run dump -- --input-index=vue_storefront_catalog_de --output-file=var/catalog_de.json",
+    "kue": "babel-node --plugins transform-es2015-modules-commonjs scripts/kue.js",
+    "kue-dashboard": "npm run kue dashboard -- --port=3050",
     "o2m": "babel src -s -D -d dist --presets es2015,stage-0; node dist/worker/order_to_magento2.js start",
     "o2m-anon": "babel src -s -D -d dist --presets es2015,stage-0; node dist/worker/order_to_magento2.js testAnon",
     "o2m-auth": "babel src -s -D -d dist --presets es2015,stage-0; node dist/worker/order_to_magento2.js testAuth",

scripts/elastic.js

@@ -0,0 +1,68 @@
+'use harmony'
+
+const CommandRouter = require('command-router')
+const cli = CommandRouter()
+
+const util = require('util');
+const config = require('config').elasticsearch
+const spawnSync = require('child_process').spawnSync
+
+cli.option({
+  name: 'input-file',
+  default: 'var/catalog.json',
+  type: String
+})
+
+cli.option({
+  name: 'input-index',
+  default: 'vue_storefront_catalog',
+  type: String
+})
+
+cli.option({
+  name: 'output-file',
+  default: 'var/catalog.json',
+  type: String
+})
+
+cli.option({
+  name: 'output-index',
+  default: 'vue_storefront_catalog_temp',
+  type: String
+})
+
+function stdOutErr(stdout, stderr) {
+  if (stdout.length > 0)
+    console.log(stdout.toString('utf8'));
+  if (stderr.length > 0)
+    console.error(stderr.toString('utf8'));
+}
+
+cli.command('dump', () => {
+  var input = util.format('http://%s:%d/%s', config.host, config.port, cli.options['input-index']);
+
+  var child = spawnSync('node', ['node_modules/elasticdump/bin/elasticdump', '--input=' + input, '--output=' + cli.options['output-file']]);
+  stdOutErr(child.stdout, child.stderr);
+})
+
+cli.command('restore', () => {
+  var output = util.format('http://%s:%d/%s', config.host, config.port, cli.options['output-index']);
+
+  var child = spawnSync('node', ['node_modules/elasticdump/bin/elasticdump', '--input=' + cli.options['input-file'], '--output=' + output]);
+  stdOutErr(child.stdout, child.stderr);
+})
+
+cli.on('notfound', (action) => {
+  console.error('I don\'t know how to: ' + action)
+  process.exit(1)
+})
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log("Unhandled Rejection at: Promise ", p, " reason: ", reason);
+});
+
+process.on('uncaughtException', function(exception) {
+  console.log(exception);
+});
+
+cli.parse(process.argv);

scripts/kue.js

@@ -0,0 +1,48 @@
+'use harmony'
+
+const CommandRouter = require('command-router')
+const cli = CommandRouter()
+
+const util = require('util');
+const config = require('config').redis
+const kue = require('kue');
+
+cli.option({
+  name: 'port',
+  alias: 'p',
+  default: 3000,
+  type: Number
+})
+
+cli.option({
+  name: 'prefix',
+  alias: 'q',
+  default: 'q',
+  type: String
+})
+
+cli.command('dashboard', () => {
+  var redis = util.format('redis://%s:%d', config.host, config.port);
+
+  kue.createQueue({
+    redis: redis,
+    prefix: cli.options.prefix
+  });
+
+  kue.app.listen(cli.options.port);
+})
+
+cli.on('notfound', (action) => {
+  console.error('I don\'t know how to: ' + action)
+  process.exit(1)
+})
+
+process.on('unhandledRejection', (reason, p) => {
+  console.log("Unhandled Rejection at: Promise ", p, " reason: ", reason);
+});
+
+process.on('uncaughtException', function(exception) {
+  console.log(exception);
+});
+
+cli.parse(process.argv);