Merge pull request #487 from Chia-Network/develop

Hydrate main with develop

Dockerfile

@@ -3,7 +3,6 @@ FROM node:16
 WORKDIR /usr/src/app
 RUN npm install -g json
 COPY package*.json ./
-COPY .env.copy ./.env
 RUN json -I -f package.json -e "this.type=\"commonjs\""
 RUN npm set-script prepare ""
 RUN npm set-script requirements-check ""

package.json

@@ -1,6 +1,6 @@
 {
   "name": "climate-warehouse",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "private": true,
   "bin": "build/server.js",
   "type": "module",
@@ -19,7 +19,7 @@
     "prepare": "husky install",
     "build": "babel src --keep-file-extension --out-dir build --copy-files",
     "build-migrations": "babel migrations --keep-file-extension --out-dir dist/migrations --copy-files",
-    "prepare-binary": "rm -rf dist && mkdir dist && cp .env.copy dist/.env",
+    "prepare-binary": "rm -rf dist && mkdir dist",
     "create-win-x64-dist": "npm run build && npm run prepare-binary && pkg package.json -t node16-win-x64 --out-path dist",
     "create-mac-x64-dist": "npm run build && npm run prepare-binary && pkg package.json -t node16-macos-x64 --out-path dist",
     "create-linux-x64-dist": "npm run build && npm run prepare-binary && pkg package.json -t node16-linux-x64 --out-path dist"
@@ -37,6 +37,7 @@
     "express-fileupload": "^1.2.1",
     "express-joi-validation": "^5.0.0",
     "joi": "^17.5.0",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "log-update": "^4.0.0",
     "mysql2": "^2.3.3",

src/config/config.cjs

@@ -1,10 +1,51 @@
 require('dotenv').config();
 
+const _ = require('lodash');
+const yaml = require('js-yaml');
+const fs = require('fs');
 const os = require('os');
+const path = require('path');
 const homeDir = os.homedir();
+const defaultConfig = require('../utils/defaultConfig.json');
 
 const persistanceFolder = `${homeDir}/.chia/climate-warehouse`;
 
+// Adding this duplicate function here because im having trouble
+// importing it in from utils folder
+const getConfig = _.memoize(() => {
+  const configFile = path.resolve(
+    `${homeDir}/.chia/climate-warehouse/config.yaml`,
+  );
+
+  // First write it to chia home
+  if (!fs.existsSync(configFile)) {
+    try {
+      fs.writeFileSync(configFile, yaml.dump(defaultConfig), 'utf8');
+    } catch (err) {
+      // if it still doesnt exist that means we are in an env without write permissions
+      // so just load the default en
+      if (typeof process.env.USE_SIMULATOR === 'string') {
+        defaultConfig.APP.USE_SIMULATOR = process.env.USE_SIMULATOR === 'true';
+      }
+
+      console.log('Cant write config file, falling back to defaults');
+      return yaml.load(yaml.dump(defaultConfig));
+    }
+  }
+
+  try {
+    const yml = yaml.load(fs.readFileSync(configFile, 'utf8'));
+
+    if (typeof process.env.USE_SIMULATOR === 'string') {
+      yml.APP.USE_SIMULATOR = process.env.USE_SIMULATOR === 'true';
+    }
+
+    return yml;
+  } catch (e) {
+    console.log(e, `Config file not found at ${configFile}`);
+  }
+});
+
 module.exports = {
   local: {
     dialect: 'sqlite',
@@ -27,10 +68,10 @@ module.exports = {
     logging: false,
   },
   mirror: {
-    username: process.env.DB_USERNAME || '',
-    password: process.env.DB_PASSWORD || '',
-    database: process.env.DB_NAME || '',
-    host: process.env.DB_HOST || '',
+    username: getConfig().MIRROR_DB.DB_USERNAME || '',
+    password: getConfig().MIRROR_DB.DB_PASSWORD || '',
+    database: getConfig().MIRROR_DB.DB_NAME || '',
+    host: getConfig().MIRROR_DB.DB_HOST || '',
     dialect: 'mysql',
     logging: false,
   },

src/controllers/governance.controller.js

@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
 import { Governance } from '../models';
 
 import {
@@ -21,6 +23,32 @@ export const findAll = async (req, res) => {
   }
 };
 
+export const findOrgList = async (req, res) => {
+  try {
+    const results = await Governance.findOne({ where: { metaKey: 'orgList' } });
+    return res.json(JSON.parse(_.get(results, 'metaValue', {})));
+  } catch (error) {
+    res.status(400).json({
+      message: 'Can not retreive Governance Data',
+      error: error.message,
+    });
+  }
+};
+
+export const findPickList = async (req, res) => {
+  try {
+    const results = await Governance.findOne({
+      where: { metaKey: 'pickList' },
+    });
+    return res.json(JSON.parse(_.get(results, 'metaValue', {})));
+  } catch (error) {
+    res.status(400).json({
+      message: 'Can not retreive Governance Data',
+      error: error.message,
+    });
+  }
+};
+
 // eslint-disable-next-line
 export const createGoveranceBody = async (req, res) => {
   try {

src/controllers/organization.controller.js

@@ -87,6 +87,26 @@ export const create = async (req, res) => {
   }
 };
 
+export const resetHomeOrg = async (req, res) => {
+  try {
+    await assertIfReadOnlyMode();
+    await assertDataLayerAvailable();
+    await assertWalletIsAvailable();
+    await assertWalletIsSynced();
+
+    await Organization.destroy({ where: { isHome: true } });
+
+    res.json({
+      message: 'Your home organization was reset, please create a new one.',
+    });
+  } catch (error) {
+    res.status(400).json({
+      message: 'Error resetting your organization',
+      error: error.message,
+    });
+  }
+};
+
 // eslint-disable-next-line
 export const importOrg = async (req, res) => {
   try {

src/controllers/staging.controller.js

@@ -20,7 +20,7 @@ import {
 
 export const findAll = async (req, res) => {
   try {
-    let { page, limit, type } = req.query;
+    let { page, limit, type, table } = req.query;
 
     let pagination = paginationParams(page, limit);
 
@@ -33,6 +33,10 @@ export const findAll = async (req, res) => {
       where = { failedCommit: true };
     }
 
+    if (table) {
+      where.table = table;
+    }
+
     let stagingData = await Staging.findAndCountAll({
       distinct: true,
       where,

src/database/index.js

@@ -4,6 +4,7 @@ import Debug from 'debug';
 Debug.enable('climate-warehouse:mirror-database');
 const log = Debug('climate-warehouse:mirror-database');
 import mysql from 'mysql2/promise';
+import { getConfig } from '../utils/config-loader';
 
 import { migrations } from './migrations';
 import { seeders } from './seeders';
@@ -26,7 +27,10 @@ export const safeMirrorDbHandler = (callback) => {
         callback();
       })
       .catch(() => {
-        if (process.env.DB_HOST && process.env.DB_HOST !== '') {
+        if (
+          getConfig().MIRROR_DB.DB_HOST &&
+          getConfig().MIRROR_DB.DB_HOST !== ''
+        ) {
           log('Mirror DB not connected');
         }
       });
@@ -99,18 +103,18 @@ export const prepareDb = async () => {
 
   if (
     mirrorConfig == 'mirror' &&
-    process.env.DB_HOST &&
-    process.env.DB_HOST !== ''
+    getConfig().MIRROR_DB.DB_HOST &&
+    getConfig().MIRROR_DB.DB_HOST !== ''
   ) {
     const connection = await mysql.createConnection({
-      host: process.env.DB_HOST,
+      host: getConfig().MIRROR_DB.DB_HOST,
       port: 3306,
-      user: process.env.DB_USERNAME,
-      password: process.env.DB_PASSWORD,
+      user: getConfig().MIRROR_DB.DB_USERNAME,
+      password: getConfig().MIRROR_DB.DB_PASSWORD,
     });
 
     await connection.query(
-      `CREATE DATABASE IF NOT EXISTS \`${process.env.DB_NAME}\`;`,
+      `CREATE DATABASE IF NOT EXISTS \`${getConfig().MIRROR_DB.DB_NAME}\`;`,
     );
 
     const db = new Sequelize(config[mirrorConfig]);

src/datalayer/persistance.js

@@ -4,6 +4,7 @@ import fs from 'fs';
 import path from 'path';
 import request from 'request-promise';
 import os from 'os';
+import { getConfig } from '../utils/config-loader';
 
 import Debug from 'debug';
 Debug.enable('climate-warehouse:datalayer:persistance');
@@ -12,7 +13,7 @@ const log = Debug('climate-warehouse:datalayer:persistance');
 
 process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
 
-const rpcUrl = process.env.DATALAYER_URL;
+const rpcUrl = getConfig().APP.DATALAYER_URL;
 
 const getBaseOptions = () => {
   const homeDir = os.homedir();
@@ -197,8 +198,6 @@ export const dataLayerAvailable = async () => {
     log(data);
     return false;
   } catch (error) {
-    log(error);
-
     return false;
   }
 };

src/datalayer/syncService.js

@@ -2,6 +2,7 @@ import _ from 'lodash';
 
 import { decodeHex, decodeDataLayerResponse } from '../utils/datalayer-utils';
 import { Organization, Staging, ModelKeys } from '../models';
+import { getConfig } from '../utils/config-loader';
 
 import * as dataLayer from './persistance';
 import * as simulator from './simulator';
@@ -10,6 +11,8 @@ import Debug from 'debug';
 Debug.enable('climate-warehouse:datalayer:syncService');
 const log = Debug('climate-warehouse:datalayer:syncService');
 
+const { USE_SIMULATOR } = getConfig().APP;
+
 const POLLING_INTERVAL = 5000;
 const frames = ['-', '\\', '|', '/'];
 
@@ -36,7 +39,7 @@ const startDataLayerUpdatePolling = async () => {
 const syncDataLayerStoreToClimateWarehouse = async (storeId, rootHash) => {
   let storeData;
 
-  if (process.env.USE_SIMULATOR === 'true') {
+  if (USE_SIMULATOR) {
     storeData = await simulator.getStoreData(storeId, rootHash);
   } else {
     storeData = await dataLayer.getStoreData(storeId, rootHash);
@@ -119,7 +122,7 @@ const dataLayerWasUpdated = async () => {
   }
 
   let rootResponse;
-  if (process.env.USE_SIMULATOR === 'true') {
+  if (USE_SIMULATOR) {
     rootResponse = await simulator.getRoots(subscribedOrgIds);
   } else {
     rootResponse = await dataLayer.getRoots(subscribedOrgIds);
@@ -160,7 +163,7 @@ const dataLayerWasUpdated = async () => {
 };
 
 const subscribeToStoreOnDataLayer = async (storeId, ip, port) => {
-  if (process.env.USE_SIMULATOR === 'true') {
+  if (USE_SIMULATOR) {
     return simulator.subscribeToStoreOnDataLayer(storeId, ip, port);
   } else {
     return dataLayer.subscribeToStoreOnDataLayer(storeId, ip, port);
@@ -192,7 +195,7 @@ const getSubscribedStoreData = async (
     }
   }
 
-  if (process.env.USE_SIMULATOR !== 'true') {
+  if (!USE_SIMULATOR) {
     const storeExistAndIsConfirmed = await dataLayer.getRoot(storeId, true);
     if (!storeExistAndIsConfirmed) {
       log(`Retrying...`, retry + 1);
@@ -205,7 +208,7 @@ const getSubscribedStoreData = async (
   }
 
   let encodedData;
-  if (process.env.USE_SIMULATOR === 'true') {
+  if (USE_SIMULATOR) {
     encodedData = await simulator.getStoreData(storeId);
   } else {
     encodedData = await dataLayer.getStoreData(storeId);
@@ -231,13 +234,13 @@ const getSubscribedStoreData = async (
 };
 
 const getRootHistory = (storeId) => {
-  if (process.env.USE_SIMULATOR !== 'true') {
+  if (!USE_SIMULATOR) {
     return dataLayer.getRootHistory(storeId);
   }
 };
 
 const getRootDiff = (storeId, root1, root2) => {
-  if (process.env.USE_SIMULATOR !== 'true') {
+  if (!USE_SIMULATOR) {
     return dataLayer.getRootDiff(storeId, root1, root2);
   }
 };

src/datalayer/wallet.js

@@ -2,10 +2,11 @@ import fs from 'fs';
 import path from 'path';
 import request from 'request-promise';
 import os from 'os';
+import { getConfig } from '../utils/config-loader';
 
 process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0;
 
-const rpcUrl = process.env.WALLET_URL;
+const rpcUrl = getConfig().APP.WALLET_URL;
 
 const getBaseOptions = () => {
   const homeDir = os.homedir();
@@ -81,7 +82,7 @@ const hasUnconfirmedTransactions = async () => {
 };
 
 const getPublicAddress = async () => {
-  if (process.env.USE_SIMULATOR === 'true') {
+  if (getConfig().APP.USE_SIMULATOR) {
     return Promise.resolve('xch33300ddsje98f33hkkdf9dfuSIMULATED_ADDRESS');
   }