Merge pull request #154 from hodlforjesus/fb-carver2d

Webpack 3->4 migration, split secrets config, beginning reddit integration

.gitignore

@@ -57,8 +57,9 @@ typings/
 # dotenv environment variables file
 .env
 
-# setings file for syste
+# setings file for system
 config.js
+config.server.js
 *.cron_lock
 
 .DS_Store

config.server.template.js

@@ -0,0 +1,21 @@
+/**
+ * Keep all your API & secrets here. DO NOT IMPORT THIS FILE IN /client folder
+ */
+const secretsConfig = {
+  db: {
+    host: '127.0.0.1',
+    port: '27017',
+    name: 'blockex',
+    user: 'blockexuser',
+    pass: 'Explorer!1'
+  },
+  rpc: {
+    host: '127.0.0.1',
+    port: '52541',
+    user: 'bulwarkrpc',
+    pass: 'someverysafepassword',
+    timeout: 8000, // 8 seconds
+  },
+}
+
+module.exports = { secretsConfig }; // This is returned as an object on purpose so you have to be explicit at stating that you are accessing a secrets config

config.template.js

@@ -9,20 +9,6 @@ const config = {
     prefix: '/api',
     timeout: '5s'
   },
-  db: {
-    host: '127.0.0.1',
-    port: '27017',
-    name: 'blockex',
-    user: 'blockexuser',
-    pass: 'Explorer!1'
-  },
-  rpc: {
-    host: '127.0.0.1',
-    port: '52541',
-    user: 'bulwarkrpc',
-    pass: 'someverysafepassword',
-    timeout: 8000, // 8 seconds
-  },
   coinDetails: {
     name: 'Bulwark',
     shortName: 'BWK',

cron/social/reddit.js

@@ -0,0 +1,46 @@
+
+require('babel-polyfill');
+const config = require('../../config');
+const { exit, rpc } = require('../../lib/cron');
+const fetch = require('../../lib/fetch');
+const locker = require('../../lib/locker');
+const moment = require('moment');
+// Models.
+const Coin = require('../../model/coin');
+const { CarverAddress, CarverMovement } = require('../../model/carver2d');
+const { CarverAddressType } = require('../../lib/carver2d');
+const { TimeInterval } = require('../../model/timeInterval');
+const { BlockRewardDetails } = require('../../model/blockRewardDetails');
+const { TimeIntervalType, TimeIntervalColumn } = require('../../lib/timeInterval');
+
+/**
+ * Gets most reddit posts and stores them in db for later use
+ */
+const syncRedditPosts = async () => {
+}
+
+/**
+ * Handle locking.
+ */
+async function update() {
+  const type = 'social_reddit';
+  let code = 0;
+
+  try {
+    locker.lock(type);
+    await syncRedditPosts();
+  } catch (err) {
+    console.log(err);
+    code = 1;
+  } finally {
+    try {
+      locker.unlock(type);
+    } catch (err) {
+      console.log(err);
+      code = 1;
+    }
+    exit(code);
+  }
+}
+
+update();

lib/db.js

@@ -1,28 +1,28 @@
 
-const config = require('../config');
+const { secretsConfig } = require('../config.server');
 const promise = require('bluebird');
 
 /**
  * Return the DSN string for the mongodb connection.
  */
 const getDSN = () => {
-  return `mongodb://${ config.db.host }:${ config.db.port }/${ config.db.name }`;
+  return `mongodb://${secretsConfig.db.host}:${secretsConfig.db.port}/${secretsConfig.db.name}`;
 };
 
 /**
  * Return the options for the mongodb connection.
  */
 const getOptions = () => {
   return {
-    auth: { authdb: config.db.name },
+    auth: { authdb: secretsConfig.db.name },
     native_parser: true,
-    pass: config.db.pass,
+    pass: secretsConfig.db.pass,
     promiseLibrary: promise,
-    user: config.db.user
+    user: secretsConfig.db.user
   };
 };
 
-module.exports =  {
+module.exports = {
   getDSN,
   getOptions
 };

lib/rpc.js

@@ -1,5 +1,5 @@
 
-const config = require('../config');
+const { secretsConfig } = require('../config.server');
 const promise = require('bluebird');
 const rpc = require('node-bitcoin-rpc');
 
@@ -17,13 +17,13 @@ class RPC {
       instance = this;
 
       rpc.init(
-        config.rpc.host,
-        config.rpc.port,
-        config.rpc.user,
-        config.rpc.pass
+        secretsConfig.rpc.host,
+        secretsConfig.rpc.port,
+        secretsConfig.rpc.user,
+        secretsConfig.rpc.pass
       );
 
-      rpc.setTimeout(config.rpc.timeout);
+      rpc.setTimeout(secretsConfig.rpc.timeout);
     }
 
     return instance;

package.json

@@ -52,7 +52,9 @@
     "react-router-dom": "^4.2.2",
     "react-router-redux": "^4.0.8",
     "reactstrap": "next",
-    "redux": "^3.7.2"
+    "redux": "^3.7.2",
+    "snoowrap": "^1.20.0",
+    "webpack-cli": "^3.3.9"
   },
   "devDependencies": {
     "animate-sass": "^0.8.2",
@@ -66,14 +68,14 @@
     "chai-http": "^3.0.0",
     "compression-webpack-plugin": "^1.1.11",
     "css-loader": "^0.28.9",
-    "html-webpack-plugin": "^2.30.1",
+    "html-webpack-plugin": "^3.2.0",
     "mocha": "^5.0.0",
     "node-sass": "^4.7.2",
     "sass-loader": "^6.0.6",
     "style-loader": "^0.20.1",
     "uglifyjs-webpack-plugin": "^1.2.4",
-    "webpack": "^3.11.0",
-    "webpack-dev-server": ">=3.1.11",
+    "webpack": "^4.41.0",
+    "webpack-dev-server": "^3.8.2",
     "worker-loader": "^1.1.1"
   }
 }

script/install.sh

@@ -130,32 +130,41 @@ installBlockEx () {
     git clone https://github.com/bulwark-crypto/bulwark-explorer.git /home/explorer/blockex
     cd /home/explorer/blockex
     yarn install
-    cat > /home/explorer/blockex/config.js << EOL
+    cat > /home/explorer/blockex/config.server.js << EOL
 /**
- * Global configuration object.
+ * Keep all your API & secrets here. DO NOT IMPORT THIS FILE IN /client folder
  */
-const config = {
-  api: {
-    host: 'https://explorer.bulwarkcrypto.com',
-    port: '3000',
-    portWorker: '443',
-    prefix: '/api',
-    timeout: '5s'
-  },
+const secretsConfig = {
   db: {
     host: '127.0.0.1',
     port: '27017',
     name: 'blockex',
-    user: '$rpcuser',
-    pass: '$rpcpassword'
+    user: 'blockexuser',
+    pass: 'Explorer!1'
   },
   rpc: {
     host: '127.0.0.1',
     port: '52541',
-    user: '$rpcuser',
-    pass: '$rpcpassword'
+    user: 'bulwarkrpc',
+    pass: 'someverysafepassword',
     timeout: 8000, // 8 seconds
   },
+}
+
+module.exports = { secretsConfig }; // This is returned as an object on purpose so you have to be explicit at stating that you are accessing a secrets config
+EOL
+    cat > /home/explorer/blockex/config.js << EOL
+/**
+ * Global configuration object.
+ */
+const config = {
+  api: {
+    host: 'https://explorer.bulwarkcrypto.com',
+    port: '3000',
+    portWorker: '443',
+    prefix: '/api',
+    timeout: '5s'
+  },
   coinDetails: {
     name: 'Bulwark',
     shortName: 'BWK',

webpack.config.js

@@ -2,7 +2,6 @@
 const compressionPlugin = require('compression-webpack-plugin');
 const htmlWebpackPlugin = require('html-webpack-plugin');
 const path = require('path');
-const uglifyJsPlugin = require('uglifyjs-webpack-plugin');
 const webpack = require('webpack');
 const config = require('./config')
 
@@ -22,7 +21,7 @@ const basePlugins = [
   }),
   new webpack.DefinePlugin({
     'process.env': {
-      'config.api':JSON.stringify(config.api),
+      'config.api': JSON.stringify(config.api),
     }
   }),
   new webpack.HotModuleReplacementPlugin(),
@@ -37,12 +36,12 @@ const prodPlugins = [
     algorithm: 'gzip',
     asset: '[path].gz[query]'
   }),
-  new webpack.optimize.UglifyJsPlugin({
-    compress: { warnings: false },
-    comments: false,
-    sourceMap: true,
-    minimize: false
-  })
+  /* new webpack.optimize.UglifyJsPlugin({
+     compress: { warnings: false },
+     comments: false,
+     sourceMap: true,
+     minimize: false
+   })*/
 ];
 
 const envPlugins = process.env.NODE_ENV === 'production'