replaces most require with es6 import/export

package-lock.json

@@ -196,6 +196,116 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz",
+      "integrity": "sha512-tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.2.3"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz",
+          "integrity": "sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.3.3",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          },
+          "dependencies": {
+            "@babel/types": {
+              "version": "7.3.3",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+              "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.11",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz",
+          "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.0.0",
+            "@babel/helper-optimise-call-expression": "^7.0.0",
+            "@babel/traverse": "^7.2.3",
+            "@babel/types": "^7.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz",
+          "integrity": "sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+          "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.2.2",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.0.0",
+            "@babel/parser": "^7.2.3",
+            "@babel/types": "^7.2.2",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.10"
+          },
+          "dependencies": {
+            "@babel/types": {
+              "version": "7.3.3",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+              "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.11",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
+      }
+    },
     "@babel/helper-define-map": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
@@ -422,6 +532,16 @@
         "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.3.tgz",
+      "integrity": "sha512-XO9eeU1/UwGPM8L+TjnQCykuVcXqaO5J1bkRPIygqZ/A2L1xVMJ9aZXrY31c0U4H2/LHKL4lbFQLsxktSrc/Ng==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.3.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",

package.json

@@ -86,6 +86,7 @@
   "devDependencies": {
     "@babel/cli": "^7.1.5",
     "@babel/core": "^7.2.0",
+    "@babel/plugin-proposal-class-properties": "^7.3.3",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.2.0",

server.js

@@ -14,12 +14,11 @@ try {
 let currentApp;
 
 try {
-  const Server = require('./server/');
+  const Server = require('./server/').default;
   currentApp = Server;
 
   const speech = new Server();
   speech.start();
-
 } catch (error) {
   console.log('server startup error:', error);
   process.exit(1);

server/chainquery/index.js

@@ -1,5 +1,5 @@
-const Sequelize = require('sequelize');
+import Sequelize from 'sequelize';
-const logger = require('winston');
+import logger from 'winston';
 
 import abnormalClaimTable from './tables/abnormalClaimTable';
 import addressTable from './tables/addressTable';
@@ -22,51 +22,45 @@ import transactionAddressQueries from './queries/transactionAddressQueries';
 import transactionQueries from './queries/transactionQueries';
 
 const DATABASE_STRUCTURE = {
-  'abnormal_claim': {
+  abnormal_claim: {
     table: abnormalClaimTable,
     queries: abnormalClaimQueries,
   },
-  'address': {
+  address: {
     table: addressTable,
     queries: addressQueries,
   },
-  'block': {
+  block: {
     table: blockTable,
     queries: blockQueries,
   },
-  'claim': {
+  claim: {
     table: claimTable,
     queries: claimQueries,
   },
-  'input': {
+  input: {
     table: inputTable,
     queries: inputQueries,
   },
-  'output': {
+  output: {
     table: outputTable,
     queries: outputQueries,
   },
-  'support': {
+  support: {
     table: supportTable,
     queries: supportQueries,
   },
-  'transaction_address': {
+  transaction_address: {
     table: transactionAddressTable,
     queries: transactionAddressQueries,
   },
-  'transaction': {
+  transaction: {
     table: transactionTable,
     queries: transactionQueries,
   },
 };
 
-const {
+const { host, port, database, username, password } = require('@config/chainqueryConfig');
-  host,
-  port,
-  database,
-  username,
-  password,
-} = require('@config/chainqueryConfig');
 
 if (!database || !username || !password) {
   logger.warn('missing database, user, or password from chainqueryConfig');
@@ -74,17 +68,17 @@ if (!database || !username || !password) {
 
 // set sequelize options
 const sequelize = new Sequelize(database, username, password, {
-  host          : host,
+  host: host,
-  import        : port,
+  import: port,
-  dialect       : 'mysql',
+  dialect: 'mysql',
   dialectOptions: {
     decimalNumbers: true,
   },
   logging: false,
-  pool   : {
+  pool: {
-    max    : 5,
+    max: 5,
-    min    : 0,
+    min: 0,
-    idle   : 10000,
+    idle: 10000,
     acquire: 10000,
   },
   operatorsAliases: false,
@@ -93,7 +87,7 @@ const sequelize = new Sequelize(database, username, password, {
 const db = {};
 const DATABASE_STRUCTURE_KEYS = Object.keys(DATABASE_STRUCTURE);
 
-for(let i = 0; i < DATABASE_STRUCTURE_KEYS.length; i++) {
+for (let i = 0; i < DATABASE_STRUCTURE_KEYS.length; i++) {
   let dbKey = DATABASE_STRUCTURE_KEYS[i];
   let currentData = DATABASE_STRUCTURE[dbKey];
 

server/controllers/api/blocked/index.js

@@ -1,5 +1,5 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../models');
+import db from 'server/models';
 
 const updateBlockedList = (req, res) => {
   db.Blocked.refreshTable()
@@ -19,4 +19,4 @@ const updateBlockedList = (req, res) => {
     });
 };
 
-module.exports = updateBlockedList;
+export default updateBlockedList;

server/controllers/api/channel/availability/checkChannelAvailability.js

@@ -1,18 +1,17 @@
-const db = require('../../../../models');
+import db from 'server/models';
 
-const checkChannelAvailability = (name) => {
+const checkChannelAvailability = name => {
-  return db.Channel
+  return db.Channel.findAll({
-    .findAll({
+    where: {
-      where: {
+      channelName: name,
-        channelName: name,
+    },
-      },
+  })
-    })
     .then(result => {
-      return (result.length <= 0);
+      return result.length <= 0;
     })
     .catch(error => {
       throw error;
     });
 };
 
-module.exports = checkChannelAvailability;
+export default checkChannelAvailability;

server/controllers/api/channel/availability/index.js

@@ -1,6 +1,6 @@
-const checkChannelAvailability = require('./checkChannelAvailability.js');
+import checkChannelAvailability from './checkChannelAvailability.js';
-const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+import { sendGATimingEvent } from '@serverutils/googleAnalytics.js';
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
 
 /*
 
@@ -8,7 +8,7 @@ const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
 */
 
-function addAtSymbolIfNecessary (name) {
+function addAtSymbolIfNecessary(name) {
   if (name.substring(0, 1) !== '@') {
     return `@${name}`;
   }
@@ -22,7 +22,7 @@ const channelAvailability = ({ ip, originalUrl, params: { name } }, res) => {
     .then(isAvailable => {
       let responseObject = {
         success: true,
-        data   : isAvailable,
+        data: isAvailable,
       };
       if (isAvailable) {
         responseObject['message'] = `${name} is available`;
@@ -37,4 +37,4 @@ const channelAvailability = ({ ip, originalUrl, params: { name } }, res) => {
     });
 };
 
-module.exports = channelAvailability;
+export default channelAvailability;

server/controllers/api/channel/claims/getChannelClaims.js

@@ -1,7 +1,7 @@
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const logger = require('winston');
+import logger from 'winston';
-const getClaimData = require('server/utils/getClaimData');
+import getClaimData from 'server/utils/getClaimData';
-const { returnPaginatedChannelClaims } = require('./channelPagination.js');
+import { returnPaginatedChannelClaims } from './channelPagination.js';
 
 const getChannelClaims = async (channelName, channelLongId, page) => {
   logger.debug(`getChannelClaims: ${channelName}, ${channelLongId}, ${page}`);
@@ -33,4 +33,4 @@ const getChannelClaims = async (channelName, channelLongId, page) => {
   return returnPaginatedChannelClaims(channelName, channelShortId, processedChannelClaims, page);
 };
 
-module.exports = getChannelClaims;
+export default getChannelClaims;

server/controllers/api/channel/claims/index.js

@@ -1,5 +1,5 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const getChannelClaims = require('./getChannelClaims.js');
+import getChannelClaims from './getChannelClaims.js';
 
 const NO_CHANNEL = 'NO_CHANNEL';
 
@@ -16,7 +16,7 @@ const channelClaims = ({ ip, originalUrl, body, params }, res) => {
   const page = params.page;
   getChannelClaims(channelName, channelClaimId, page)
     .then(data => {
-      res.status(200).json({success: true, data});
+      res.status(200).json({ success: true, data });
     })
     .catch(error => {
       if (error === NO_CHANNEL) {
@@ -29,4 +29,4 @@ const channelClaims = ({ ip, originalUrl, body, params }, res) => {
     });
 };
 
-module.exports = channelClaims;
+export default channelClaims;

server/controllers/api/channel/data/getChannelData.js

@@ -1,18 +1,25 @@
-const db = require('server/models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
 
 const getChannelData = async (channelName, channelClaimId) => {
-  let longChannelClaimId = await chainquery.claim.queries.getLongClaimId(channelName, channelClaimId).catch(() => false);
+  let longChannelClaimId = await chainquery.claim.queries
+    .getLongClaimId(channelName, channelClaimId)
+    .catch(() => false);
 
   if (!longChannelClaimId) {
     // Allow an error to throw here if this fails
     longChannelClaimId = await db.Certificate.getLongChannelId(channelName, channelClaimId);
   }
 
-  let shortChannelClaimId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(longChannelClaimId, channelName).catch(() => false);
+  let shortChannelClaimId = await chainquery.claim.queries
+    .getShortClaimIdFromLongClaimId(longChannelClaimId, channelName)
+    .catch(() => false);
 
   if (!shortChannelClaimId) {
-    shortChannelClaimId = await db.Certificate.getShortChannelIdFromLongChannelId(longChannelClaimId, channelName);
+    shortChannelClaimId = await db.Certificate.getShortChannelIdFromLongChannelId(
+      longChannelClaimId,
+      channelName
+    );
   }
 
   return {
@@ -22,4 +29,4 @@ const getChannelData = async (channelName, channelClaimId) => {
   };
 };
 
-module.exports = getChannelData;
+export default getChannelData;

server/controllers/api/channel/data/index.js

@@ -1,7 +1,8 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const getChannelData = require('./getChannelData.js');
+import getChannelData from './getChannelData.js';
-const isApprovedChannel = require('../../../../../utils/isApprovedChannel');
+import isApprovedChannel from '@globalutils/isApprovedChannel';
-const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+import { publishing } from '@config/siteConfig';
+const { serveOnlyApproved, approvedChannels } = publishing;
 
 const NO_CHANNEL = 'NO_CHANNEL';
 const LONG_ID = 'longId';
@@ -20,7 +21,9 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   if (channelClaimId === 'none') channelClaimId = null;
   const chanObj = {};
   if (channelName) chanObj.name = channelName;
-  if (channelClaimId) chanObj[(channelClaimId.length === LONG_CLAIM_LENGTH ? LONG_ID : SHORT_ID)] = channelClaimId;
+  if (channelClaimId) {
+    chanObj[channelClaimId.length === LONG_CLAIM_LENGTH ? LONG_ID : SHORT_ID] = channelClaimId;
+  }
   if (serveOnlyApproved && !isApprovedChannel(chanObj, approvedChannels)) {
     return res.status(404).json({
       success: false,
@@ -46,4 +49,4 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
     });
 };
 
-module.exports = channelData;
+export default channelData;

server/controllers/api/channel/shortId/index.js

@@ -1,6 +1,6 @@
-const { handleErrorResponse } = require('server/controllers/utils/errorHandlers.js');
+import { handleErrorResponse } from 'server/controllers/utils/errorHandlers.js';
-const db = require('server/models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
 
 /*
 
@@ -10,7 +10,9 @@ route to get a short channel id from long channel Id
 
 const channelShortIdRoute = async ({ ip, originalUrl, params }, res) => {
   try {
-    let shortId = await chainquery.claim.queries.getShortClaimIdFromLongClaimId(params.longId, params.name).catch(() => false);
+    let shortId = await chainquery.claim.queries
+      .getShortClaimIdFromLongClaimId(params.longId, params.name)
+      .catch(() => false);
 
     if (!shortId) {
       shortId = await db.Certificate.getShortChannelIdFromLongChannelId(params.longId, params.name);
@@ -22,4 +24,4 @@ const channelShortIdRoute = async ({ ip, originalUrl, params }, res) => {
   }
 };
 
-module.exports = channelShortIdRoute;
+export default channelShortIdRoute;

server/controllers/api/claim/abandon/index.js

@@ -1,9 +1,9 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('server/models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const { abandonClaim } = require('server/lbrynet');
+import { abandonClaim } from 'server/lbrynet';
-const deleteFile = require('../publish/deleteFile.js');
+import deleteFile from '../publish/deleteFile.js';
-const authenticateUser = require('../publish/authentication.js');
+import authenticateUser from '../publish/authentication.js';
 
 /*
   route to abandon a claim through the daemon
@@ -47,4 +47,4 @@ const claimAbandon = async (req, res) => {
   }
 };
 
-module.exports = claimAbandon;
+export default claimAbandon;

server/controllers/api/claim/availability/checkClaimAvailability.js

@@ -1,16 +1,18 @@
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('@config/siteConfig');
+import Sequelize from 'sequelize';
-const Sequelize = require('sequelize');
+
+import { publishing } from '@config/siteConfig';
+const { primaryClaimAddress, additionalClaimAddresses } = publishing;
 const Op = Sequelize.Op;
 
-const claimAvailability = async (name) => {
+const claimAvailability = async name => {
   const claimAddresses = additionalClaimAddresses || [];
   claimAddresses.push(primaryClaimAddress);
   // find any records where the name is used
   return chainquery.claim
     .findAll({
       attributes: ['claim_address'],
-      where     : {
+      where: {
         name,
         claim_address: {
           [Op.or]: claimAddresses,
@@ -18,11 +20,11 @@ const claimAvailability = async (name) => {
       },
     })
     .then(result => {
-      return (result.length <= 0);
+      return result.length <= 0;
     })
     .catch(error => {
       throw error;
     });
 };
 
-module.exports = claimAvailability;
+export default claimAvailability;

server/controllers/api/claim/availability/index.js

@@ -1,6 +1,6 @@
-const checkClaimAvailability = require('./checkClaimAvailability.js');
+import checkClaimAvailability from './checkClaimAvailability.js';
-const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+import { sendGATimingEvent } from '../../../../utils/googleAnalytics.js';
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
 
 /*
 
@@ -14,7 +14,7 @@ const claimAvailability = ({ ip, originalUrl, params: { name } }, res) => {
     .then(isAvailable => {
       let responseObject = {
         success: true,
-        data   : isAvailable,
+        data: isAvailable,
       };
       if (isAvailable) {
         responseObject['message'] = `That claim name is available`;
@@ -29,4 +29,4 @@ const claimAvailability = ({ ip, originalUrl, params: { name } }, res) => {
     });
 };
 
-module.exports = claimAvailability;
+export default claimAvailability;

server/controllers/api/claim/data/index.js

@@ -1,7 +1,7 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const getClaimData = require('server/utils/getClaimData');
+import getClaimData from 'server/utils/getClaimData';
-const fetchClaimData = require('server/utils/fetchClaimData');
+import fetchClaimData from 'server/utils/fetchClaimData';
-const logger = require('winston');
+import logger from 'winston';
 /*
 
   route to return data for a claim
@@ -28,4 +28,4 @@ const claimData = async ({ ip, originalUrl, body, params }, res) => {
   }
 };
 
-module.exports = claimData;
+export default claimData;

server/controllers/api/claim/get/index.js

@@ -1,13 +1,13 @@
+import { createFileRecordDataAfterGet } from 'server/models/utils/createFileRecordData.js';
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
+import getClaimData from 'server/utils/getClaimData';
+import chainquery from 'chainquery';
+import db from 'server/models';
+import logger from 'winston';
+import awaitFileSize from 'server/utils/awaitFileSize';
+import isBot from 'isbot';
+import publishCache from 'server/utils/publishCache';
 const { getClaim, resolveUri } = require('server/lbrynet');
-const { createFileRecordDataAfterGet } = require('server/models/utils/createFileRecordData.js');
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
-const getClaimData = require('server/utils/getClaimData');
-const chainquery = require('chainquery').default;
-const db = require('server/models');
-const logger = require('winston');
-const awaitFileSize = require('server/utils/awaitFileSize');
-const isBot = require('isbot');
-const publishCache = require('server/utils/publishCache');
 
 const RETRY_MS = 250;
 const TIMEOUT_MS = 15000;
@@ -83,4 +83,4 @@ const claimGet = async ({ ip, originalUrl, params, headers }, res) => {
     handleErrorResponse(originalUrl, ip, error, res);
   }
 };
-module.exports = claimGet;
+export default claimGet;

server/controllers/api/claim/list/index.js

@@ -1,5 +1,5 @@
-const { getClaimList } = require('../../../../lbrynet');
+import { getClaimList } from 'server/lbrynet';
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
 
 /*
 
@@ -17,4 +17,4 @@ const claimList = ({ ip, originalUrl, params }, res) => {
     });
 };
 
-module.exports = claimList;
+export default claimList;

server/controllers/api/claim/longId/index.js

@@ -1,10 +1,10 @@
-const db = require('server/models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const logger = require('winston');
+import logger from 'winston';
-const publishCache = require('server/utils/publishCache');
+import publishCache from 'server/utils/publishCache';
-const { handleErrorResponse } = require('server/controllers/utils/errorHandlers.js');
+import { handleErrorResponse } from 'server/controllers/utils/errorHandlers.js';
 
-const getClaimId = require('server/controllers/utils/getClaimId.js');
+import getClaimId from 'server/controllers/utils/getClaimId.js';
 
 const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
@@ -72,4 +72,4 @@ const claimLongId = ({ ip, originalUrl, body, params }, res) => {
     });
 };
 
-module.exports = claimLongId;
+export default claimLongId;

server/controllers/api/claim/publish/authentication.js

@@ -1,5 +1,5 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../../models');
+import db from 'server/models';
 
 const authenticateChannelCredentials = (channelName, channelId, userPassword) => {
   return new Promise((resolve, reject) => {
@@ -10,10 +10,9 @@ const authenticateChannelCredentials = (channelName, channelId, userPassword) =>
     if (channelName) channelFindParams['channelName'] = channelName;
     if (channelId) channelFindParams['channelClaimId'] = channelId;
     // find the channel
-    db.Channel
+    db.Channel.findOne({
-      .findOne({
+      where: channelFindParams,
-        where: channelFindParams,
+    })
-      })
       .then(channel => {
         if (!channel) {
           logger.debug('no channel found');
@@ -51,7 +50,7 @@ const authenticateUser = (channelName, channelId, channelPassword, user) => {
     // case: no channelName or channel Id are provided (anonymous), regardless of whether user token is provided
     if (!channelName && !channelId) {
       resolve({
-        channelName   : null,
+        channelName: null,
         channelClaimId: null,
       });
       return;
@@ -67,7 +66,7 @@ const authenticateUser = (channelName, channelId, channelPassword, user) => {
         return;
       }
       resolve({
-        channelName   : user.channelName,
+        channelName: user.channelName,
         channelClaimId: user.channelClaimId,
       });
       return;
@@ -81,4 +80,4 @@ const authenticateUser = (channelName, channelId, channelPassword, user) => {
   });
 };
 
-module.exports = authenticateUser;
+export default authenticateUser;

server/controllers/api/claim/publish/createPublishParams.js

@@ -1,5 +1,5 @@
-const logger = require('winston');
+import logger from 'winston';
-const { details, publishing } = require('@config/siteConfig');
+import { details, publishing } from '@config/siteConfig';
 const createPublishParams = (
   filePath,
   name,
@@ -59,4 +59,4 @@ const createPublishParams = (
   return publishParams;
 };
 
-module.exports = createPublishParams;
+export default createPublishParams;

server/controllers/api/claim/publish/createThumbnailPublishParams.js

@@ -1,5 +1,5 @@
-const logger = require('winston');
+import logger from 'winston';
-const { details, publishing } = require('@config/siteConfig');
+import { details, publishing } from '@config/siteConfig';
 
 const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, licenseUrl, nsfw) => {
   if (!thumbnailFilePath) {
@@ -26,4 +26,4 @@ const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, lic
   };
 };
 
-module.exports = createThumbnailPublishParams;
+export default createThumbnailPublishParams;

server/controllers/api/claim/publish/deleteFile.js

@@ -1,7 +1,7 @@
-const logger = require('winston');
+import logger from 'winston';
-const fs = require('fs');
+import fs from 'fs';
 
-const deleteFile = (filePath) => {
+const deleteFile = filePath => {
   fs.unlink(filePath, err => {
     if (err) {
       return logger.error(`error deleting temporary file ${filePath}`);
@@ -10,4 +10,4 @@ const deleteFile = (filePath) => {
   });
 };
 
-module.exports = deleteFile;
+export default deleteFile;

server/controllers/api/claim/publish/index.js

@@ -1,30 +1,33 @@
-const logger = require('winston');
+import logger from 'winston';
 
+import { sendGATimingEvent } from 'server/utils/googleAnalytics.js';
+
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
+
+import checkClaimAvailability from '../availability/checkClaimAvailability.js';
+
+import publish from './publish.js';
+import createPublishParams from './createPublishParams.js';
+import createThumbnailPublishParams from './createThumbnailPublishParams.js';
+import parsePublishApiRequestBody from './parsePublishApiRequestBody.js';
+import parsePublishApiRequestFiles from './parsePublishApiRequestFiles.js';
+import authenticateUser from './authentication.js';
+
+import chainquery from 'chainquery';
+import publishCache from 'server/utils/publishCache';
+import isApprovedChannel from '@globalutils/isApprovedChannel';
+import { details, publishing } from '@config/siteConfig';
+
+import createCanonicalLink from '@globalutils/createCanonicalLink';
+const { host } = details;
 const {
-  details: { host },
+  disabled,
-  publishing: { disabled, disabledMessage },
+  disabledMessage,
-} = require('@config/siteConfig');
+  publishOnlyApproved,
-
+  approvedChannels,
-const { sendGATimingEvent } = require('server/utils/googleAnalytics.js');
+  thumbnailChannel,
-const isApprovedChannel = require('@globalutils/isApprovedChannel');
+  thumbnailChannelId,
-const {
+} = publishing;
-  publishing: { publishOnlyApproved, approvedChannels, thumbnailChannel, thumbnailChannelId },
-} = require('@config/siteConfig');
-
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
-
-const checkClaimAvailability = require('../availability/checkClaimAvailability.js');
-
-const publish = require('./publish.js');
-const createPublishParams = require('./createPublishParams.js');
-const createThumbnailPublishParams = require('./createThumbnailPublishParams.js');
-const parsePublishApiRequestBody = require('./parsePublishApiRequestBody.js');
-const parsePublishApiRequestFiles = require('./parsePublishApiRequestFiles.js');
-const authenticateUser = require('./authentication.js');
-
-const chainquery = require('chainquery').default;
-const createCanonicalLink = require('@globalutils/createCanonicalLink');
-const publishCache = require('server/utils/publishCache');
 const CLAIM_TAKEN = 'CLAIM_TAKEN';
 const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL';
 
@@ -218,4 +221,4 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     });
 };
 
-module.exports = claimPublish;
+export default claimPublish;

server/controllers/api/claim/publish/parsePublishApiRequestBody.js

@@ -36,4 +36,4 @@ const parsePublishApiRequestBody = ({
   };
 };
 
-module.exports = parsePublishApiRequestBody;
+export default parsePublishApiRequestBody;

server/controllers/api/claim/publish/parsePublishApiRequestBody.test.js

@@ -1,14 +1,14 @@
-const chai = require('chai');
+import chai from 'chai';
 const expect = chai.expect;
 
-describe('#parsePublishApiRequestBody()', function () {
+describe('#parsePublishApiRequestBody()', function() {
   const parsePublishApiRequestBody = require('./parsePublishApiRequestBody.js');
 
-  it('should throw an error if no body', function () {
+  it('should throw an error if no body', function() {
     expect(parsePublishApiRequestBody.bind(this, null)).to.throw();
   });
 
-  it('should throw an error if no body.name', function () {
+  it('should throw an error if no body.name', function() {
     const bodyNoName = {};
     expect(parsePublishApiRequestBody.bind(this, bodyNoName)).to.throw();
   });

server/controllers/api/claim/publish/parsePublishApiRequestFiles.js

@@ -1,6 +1,6 @@
-const path = require('path');
+import path from 'path';
-const validateFileTypeAndSize = require('./validateFileTypeAndSize.js');
+import validateFileTypeAndSize from './validateFileTypeAndSize.js';
-const validateFileForPublish = require('./validateFileForPublish.js');
+import validateFileForPublish from './validateFileForPublish.js';
 
 const parsePublishApiRequestFiles = ({ file, thumbnail }, isUpdate) => {
   // make sure a file was provided
@@ -59,4 +59,4 @@ const parsePublishApiRequestFiles = ({ file, thumbnail }, isUpdate) => {
   return obj;
 };
 
-module.exports = parsePublishApiRequestFiles;
+export default parsePublishApiRequestFiles;

server/controllers/api/claim/publish/parsePublishApiRequestFiles.test.js

@@ -1,19 +1,19 @@
-const chai = require('chai');
+import chai from 'chai';
 const expect = chai.expect;
 
-describe('#parsePublishApiRequestFiles()', function () {
+describe('#parsePublishApiRequestFiles()', function() {
   const parsePublishApiRequestFiles = require('./parsePublishApiRequestFiles.js');
 
-  it('should throw an error if no files', function () {
+  it('should throw an error if no files', function() {
     expect(parsePublishApiRequestFiles.bind(this, null)).to.throw();
   });
 
-  it('should throw an error if no files.file', function () {
+  it('should throw an error if no files.file', function() {
     const filesNoFile = {};
     expect(parsePublishApiRequestFiles.bind(this, filesNoFile)).to.throw();
   });
 
-  it('should throw an error if file.size is too large', function () {
+  it('should throw an error if file.size is too large', function() {
     const filesTooBig = {
       file: {
         name: 'file.jpg',
@@ -25,7 +25,7 @@ describe('#parsePublishApiRequestFiles()', function () {
     expect(parsePublishApiRequestFiles.bind(this, filesTooBig)).to.throw();
   });
 
-  it('should throw error if not an accepted file type', function () {
+  it('should throw error if not an accepted file type', function() {
     const filesWrongType = {
       file: {
         name: 'file.jpg',
@@ -37,7 +37,7 @@ describe('#parsePublishApiRequestFiles()', function () {
     expect(parsePublishApiRequestFiles.bind(this, filesWrongType)).to.throw();
   });
 
-  it('should throw NO error if no problems', function () {
+  it('should throw NO error if no problems', function() {
     const filesNoProblems = {
       file: {
         name: 'file.jpg',

server/controllers/api/claim/publish/publish.js

@@ -1,11 +1,9 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../../models');
+import db from '../../../../models';
-const { publishClaim } = require('../../../../lbrynet');
+import { publishClaim } from '../../../../lbrynet';
-const { createFileRecordDataAfterPublish } = require('server/models/utils/createFileRecordData.js');
+import { createFileRecordDataAfterPublish } from '../../../../models/utils/createFileRecordData.js';
-const {
+import { createClaimRecordDataAfterPublish } from '../../../../models/utils/createClaimRecordData.js';
-  createClaimRecordDataAfterPublish,
+import deleteFile from './deleteFile.js';
-} = require('server/models/utils/createClaimRecordData.js');
-const deleteFile = require('./deleteFile.js');
 
 const publish = async (publishParams, fileName, fileType) => {
   let publishResults;
@@ -80,5 +78,4 @@ const publish = async (publishParams, fileName, fileType) => {
     };
   }
 };
-
+export default publish;
-module.exports = publish;

server/controllers/api/claim/publish/validateFileForPublish.js

@@ -1,6 +1,6 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const { publishing } = require('@config/siteConfig.json');
+import { publishing } from '@config/siteConfig.json';
 
 const { fileSizeLimits } = publishing;
 
@@ -35,4 +35,4 @@ const validateFileForPublish = file => {
   return file;
 };
 
-module.exports = validateFileForPublish;
+export default validateFileForPublish;

server/controllers/api/claim/publish/validateFileTypeAndSize.js

@@ -1,4 +1,4 @@
-const logger = require('winston');
+import logger from 'winston';
 
 const {
   publishing: { maxSizeImage = 10000000, maxSizeGif = 50000000, maxSizeVideo = 50000000 },
@@ -41,4 +41,4 @@ const validateFileTypeAndSize = file => {
   return file;
 };
 
-module.exports = validateFileTypeAndSize;
+export default validateFileTypeAndSize;

server/controllers/api/claim/resolve/index.js

@@ -1,5 +1,5 @@
-const { resolveUri } = require('../../../../lbrynet/index');
+import { resolveUri } from 'server/lbrynet/index';
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
 
 /*
 
@@ -17,4 +17,4 @@ const claimResolve = ({ headers, ip, originalUrl, params }, res) => {
     });
 };
 
-module.exports = claimResolve;
+export default claimResolve;

server/controllers/api/claim/shortId/index.js

@@ -1,5 +1,5 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
 
 /*
 
@@ -22,4 +22,4 @@ const claimShortId = async ({ ip, originalUrl, body, params }, res) => {
   }
 };
 
-module.exports = claimShortId;
+export default claimShortId;

server/controllers/api/claim/update/index.js

@@ -1,21 +1,20 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('server/models');
+import { sendGATimingEvent } from '@serverutils/googleAnalytics.js';
-const {
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-  details,
+import publish from '../publish/publish.js';
-  publishing: { disabled, disabledMessage, primaryClaimAddress },
+import parsePublishApiRequestBody from '../publish/parsePublishApiRequestBody';
-} = require('@config/siteConfig');
+import parsePublishApiRequestFiles from '../publish/parsePublishApiRequestFiles.js';
-const { resolveUri } = require('server/lbrynet');
+import authenticateUser from '../publish/authentication.js';
-const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+import createThumbnailPublishParams from '../publish/createThumbnailPublishParams.js';
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import chainquery from 'chainquery';
-const publish = require('../publish/publish.js');
+import { getFileListFileByOutpoint } from 'server/lbrynet';
-const parsePublishApiRequestBody = require('../publish/parsePublishApiRequestBody');
+import publishCache from 'server/utils/publishCache';
-const parsePublishApiRequestFiles = require('../publish/parsePublishApiRequestFiles.js');
+import createCanonicalLink from '@globalutils/createCanonicalLink';
-const authenticateUser = require('../publish/authentication.js');
+import isApprovedChannel from '@globalutils/isApprovedChannel';
-const createThumbnailPublishParams = require('../publish/createThumbnailPublishParams.js');
+import { details, publishing } from '@config/siteConfig';
-const chainquery = require('chainquery').default;
+const { disabled, disabledMessage, primaryClaimAddress } = publishing;
-const createCanonicalLink = require('@globalutils/createCanonicalLink');
+
-const { getFileListFileByOutpoint } = require('server/lbrynet');
+//, approvedChannels, thumbnailChannel, thumbnailChannelId
-const publishCache = require('server/utils/publishCache');
 
 /*
   route to update a claim through the daemon
@@ -242,4 +241,4 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
     });
 };
 
-module.exports = claimUpdate;
+export default claimUpdate;

server/controllers/api/claim/views/index.js

@@ -1,5 +1,5 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const db = require('server/models');
+import db from 'server/models';
 
 /*
 
@@ -16,7 +16,7 @@ const claimViews = async ({ ip, originalUrl, body, params }, res) => {
 
     res.status(200).json({
       success: true,
-      data   : {
+      data: {
         [claimId]: viewCount,
       },
     });
@@ -25,4 +25,4 @@ const claimViews = async ({ ip, originalUrl, body, params }, res) => {
   }
 };
 
-module.exports = claimViews;
+export default claimViews;

server/controllers/api/config/site/publishing/index.js

@@ -1,12 +1,14 @@
-const { publishing: {
+const {
-  primaryClaimAddress,
+  publishing: {
-  uploadDirectory,
+    primaryClaimAddress,
-  thumbnailChannel,
+    uploadDirectory,
-  thumbnailChannelId,
+    thumbnailChannel,
-  additionalClaimAddresses,
+    thumbnailChannelId,
-  disabled,
+    additionalClaimAddresses,
-  disabledMessage,
+    disabled,
-} } = require('@config/siteConfig');
+    disabledMessage,
+  },
+} = require('@config/siteConfig');
 
 /*
 
@@ -26,4 +28,4 @@ const publishingConfig = (req, res) => {
   });
 };
 
-module.exports = publishingConfig;
+export default publishingConfig;

server/controllers/api/file/availability/index.js

@@ -1,10 +1,10 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const { getFileListFileByOutpoint } = require('server/lbrynet');
+import { getFileListFileByOutpoint } from 'server/lbrynet';
 
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const publishCache = require('server/utils/publishCache');
+import publishCache from 'server/utils/publishCache';
 
 /*
 
@@ -37,4 +37,4 @@ const fileAvailability = async ({ ip, originalUrl, params }, res) => {
   }
 };
 
-module.exports = fileAvailability;
+export default fileAvailability;

server/controllers/api/homepage/data/getChannelData.js

@@ -1,16 +1,13 @@
-const db = require('../../../../models');
+import db from 'server/models';
 
 const getChannelData = (channelName, channelClaimId) => {
   return new Promise((resolve, reject) => {
     let longChannelClaimId;
     // 1. get the long channel Id (make sure channel exists)
-    db.Certificate
+    db.Certificate.getLongChannelId(channelName, channelClaimId)
-      .getLongChannelId(channelName, channelClaimId)
       .then(fullClaimId => {
         longChannelClaimId = fullClaimId;
-        return db
+        return db.Certificate.getShortChannelIdFromLongChannelId(fullClaimId, channelName);
-          .Certificate
-          .getShortChannelIdFromLongChannelId(fullClaimId, channelName);
       })
       .then(shortChannelClaimId => {
         resolve({
@@ -25,4 +22,4 @@ const getChannelData = (channelName, channelClaimId) => {
   });
 };
 
-module.exports = getChannelData;
+export default getChannelData;

server/controllers/api/homepage/data/index.js

@@ -1,6 +1,6 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
 
-const getChannelData = require('./getChannelData.js');
+import getChannelData from './getChannelData.js';
 
 const NO_CHANNEL = 'NO_CHANNEL';
 
@@ -32,4 +32,4 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
     });
 };
 
-module.exports = channelData;
+export default channelData;

server/controllers/api/oEmbed/getOEmbedDataForAsset.js

@@ -1,11 +1,10 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../models');
+import db from 'server/models';
-const getClaimId = require('../../utils/getClaimId');
+import getClaimId from '../../utils/getClaimId';
-const publishCache = require('server/utils/publishCache');
+import publishCache from 'server/utils/publishCache';
 
-const {
+import { details } from '@config/siteConfig';
-  details: { host, title: siteTitle },
+const { host, title: siteTitle } = details;
-} = require('@config/siteConfig');
 
 const getOEmbedDataForAsset = (channelName, channelClaimId, claimName, claimId) => {
   let fileData, claimData;
@@ -66,4 +65,4 @@ const getOEmbedDataForAsset = (channelName, channelClaimId, claimName, claimId)
     });
 };
 
-module.exports = getOEmbedDataForAsset;
+export default getOEmbedDataForAsset;

server/controllers/api/oEmbed/getOEmbedDataForChannel.js

@@ -1,33 +1,26 @@
-const db = require('../../../models');
+import db from 'server/models';
-
+import { details } from '@config/siteConfig';
-const {
+const { host, title: siteTitle } = details;
-  details: {
-    host,
-    title: siteTitle,
-  },
-} = require('@config/siteConfig');
 
 const getOEmbedDataForChannel = (channelName, channelClaimId) => {
-  return db.Certificate
+  return db.Certificate.findOne({
-    .findOne({
+    where: {
-      where: {
+      name: channelName,
-        name   : channelName,
+      claimId: channelClaimId,
-        claimId: channelClaimId,
+    },
-      },
+  }).then(certificateRecord => {
-    })
+    const certificateData = certificateRecord.dataValues;
-    .then(certificateRecord => {
+    return {
-      const certificateData = certificateRecord.dataValues;
+      version: 1.0,
-      return {
+      provider_name: siteTitle,
-        version      : 1.0,
+      provider_url: host,
-        provider_name: siteTitle,
+      type: 'link',
-        provider_url : host,
+      author_name: certificateData.name,
-        type         : 'link',
+      title: `${certificateData.name}'s channel on Spee.ch`,
-        author_name  : certificateData.name,
+      author_url: `${host}/${certificateData.name}:${certificateData.claimId}`,
-        title        : `${certificateData.name}'s channel on Spee.ch`,
+      cache_age: 86400, // one day in seconds
-        author_url   : `${host}/${certificateData.name}:${certificateData.claimId}`,
+    };
-        cache_age    : 86400, // one day in seconds
+  });
-      };
-    });
 };
 
-module.exports = getOEmbedDataForChannel;
+export default getOEmbedDataForChannel;

server/controllers/api/oEmbed/index.js

@@ -1,12 +1,14 @@
-const logger = require('winston');
+import logger from 'winston';
-const lbryUri = require('../../../../utils/lbryUri');
+import lbryUri from '@globalutils/lbryUri';
 
-const getOEmbedDataForChannel = require('./getOEmbedDataForChannel');
+import getOEmbedDataForChannel from './getOEmbedDataForChannel';
-const getOEmbedDataForAsset = require('./getOEmbedDataForAsset');
+import getOEmbedDataForAsset from './getOEmbedDataForAsset';
-const parseSpeechUrl = require('./parseSpeechUrl');
+import parseSpeechUrl from './parseSpeechUrl';
 
 const getOEmbedData = (req, res) => {
-  const { query: { url, format } } = req;
+  const {
+    query: { url, format },
+  } = req;
   logger.debug('req url', url);
   logger.debug('req format', format);
 
@@ -36,7 +38,7 @@ const getOEmbedData = (req, res) => {
           return res.status(200).json(data);
         }
       })
-      .catch((error) => {
+      .catch(error => {
         return res.status(404).json({
           success: false,
           message: error,
@@ -54,7 +56,7 @@ const getOEmbedData = (req, res) => {
           return res.status(200).json(data);
         }
       })
-      .catch((error) => {
+      .catch(error => {
         return res.status(404).json({
           success: false,
           message: error,
@@ -63,4 +65,4 @@ const getOEmbedData = (req, res) => {
   }
 };
 
-module.exports = getOEmbedData;
+export default getOEmbedData;

server/controllers/api/oEmbed/parseSpeechUrl.js

@@ -1,17 +1,10 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const parseSpeechUrl = (url) => {
+const parseSpeechUrl = url => {
   const componentsRegex = new RegExp(
-    '([^:/?#]+://)' +
+    '([^:/?#]+://)' + '([^/?#]*)' + '(/)' + '([^/?#]*)' + '(/)' + '([^/?#]*)'
-    '([^/?#]*)' +
-    '(/)' +
-    '([^/?#]*)' +
-    '(/)' +
-    '([^/?#]*)'
   );
-  const [, , , , paramOne, , paramTwo] = componentsRegex
+  const [, , , , paramOne, , paramTwo] = componentsRegex.exec(url).map(match => match || null);
-    .exec(url)
-    .map(match => match || null);
 
   logger.debug(`params from speech url: ${paramOne} ${paramTwo}`);
 
@@ -21,4 +14,4 @@ const parseSpeechUrl = (url) => {
   };
 };
 
-module.exports = parseSpeechUrl;
+export default parseSpeechUrl;

server/controllers/api/special/claims/index.js

@@ -1,6 +1,6 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const db = require('server/models');
+import db from 'server/models';
-const getClaimData = require('server/utils/getClaimData');
+import getClaimData from 'server/utils/getClaimData';
 
 /*
 
@@ -9,25 +9,22 @@ const getClaimData = require('server/utils/getClaimData');
 */
 
 const channelClaims = async ({ ip, originalUrl, body, params }, res) => {
-  const {
+  const { name, page } = params;
-    name,
-    page,
-  } = params;
 
   if (name === 'trending') {
     const result = await db.Trending.getTrendingClaims();
-    const claims = await Promise.all(result.map((claim) => getClaimData(claim)));
+    const claims = await Promise.all(result.map(claim => getClaimData(claim)));
     return res.status(200).json({
       success: true,
-      data   : {
+      data: {
-        channelName       : name,
+        channelName: name,
         claims,
         longChannelClaimId: name,
-        currentPage       : 1,
+        currentPage: 1,
-        nextPage          : null,
+        nextPage: null,
-        previousPage      : null,
+        previousPage: null,
-        totalPages        : 1,
+        totalPages: 1,
-        totalResults      : claims.length,
+        totalResults: claims.length,
       },
     });
   }
@@ -39,4 +36,4 @@ const channelClaims = async ({ ip, originalUrl, body, params }, res) => {
   handleErrorResponse(originalUrl, ip, 'Feature endpoint not found', res);
 };
 
-module.exports = channelClaims;
+export default channelClaims;

server/controllers/api/tor/index.js

@@ -1,5 +1,5 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../models');
+import db from 'server/models';
 
 /*
 
@@ -13,7 +13,7 @@ const getTorList = (req, res) => {
       logger.debug('number of records', result.length);
       res.status(200).json(result);
     })
-    .catch((error) => {
+    .catch(error => {
       logger.error(error);
       res.status(500).json({
         success: false,
@@ -22,4 +22,4 @@ const getTorList = (req, res) => {
     });
 };
 
-module.exports = getTorList;
+export default getTorList;

server/controllers/api/user/password/index.js

@@ -1,7 +1,7 @@
-const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
+import { handleErrorResponse } from '../../../utils/errorHandlers.js';
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../../../models');
+import db from 'server/models';
-const { masterPassword } = require('@private/authConfig.json');
+import { masterPassword } from '@private/authConfig.json';
 /*
 
   route to update a password
@@ -22,7 +22,8 @@ const updateUserPassword = ({ ip, originalUrl, body }, res) => {
   if (!userName || !oldPassword || !newPassword) {
     return res.status(400).json({
       success: false,
-      message: 'body should include userName (channel name without the @), oldPassword, & newPassword',
+      message:
+        'body should include userName (channel name without the @), oldPassword, & newPassword',
     });
   }
 
@@ -60,9 +61,9 @@ const updateUserPassword = ({ ip, originalUrl, body }, res) => {
         newPassword,
       });
     })
-    .catch((error) => {
+    .catch(error => {
       handleErrorResponse(originalUrl, ip, error, res);
     });
 };
 
-module.exports = updateUserPassword;
+export default updateUserPassword;

server/controllers/assets/serveAsset/index.js

@@ -1,5 +1,5 @@
-const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
+import { sendGAServeEvent } from '@serverutils/googleAnalytics';
-const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
+import getClaimIdAndServeAsset from '../utils/getClaimIdAndServeAsset.js';
 
 /*
 
@@ -14,4 +14,4 @@ const serveAsset = ({ headers, ip, originalUrl, params: { claimName, claimId } }
   getClaimIdAndServeAsset(null, null, claimName, claimId, originalUrl, ip, res, headers);
 };
 
-module.exports = serveAsset;
+export default serveAsset;

server/controllers/assets/serveByClaim/index.js

@@ -1,14 +1,14 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
+import { sendGAServeEvent } from '@serverutils/googleAnalytics';
-const handleShowRender = require('../../../render/handleShowRender').default;
+import handleShowRender from 'server/render/handleShowRender';
 
-const lbryUri = require('../../../../utils/lbryUri.js');
+import lbryUri from '@globalutils/lbryUri.js';
 
-const determineRequestType = require('../utils/determineRequestType.js');
+import determineRequestType from '../utils/determineRequestType.js';
-const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
+import getClaimIdAndServeAsset from '../utils/getClaimIdAndServeAsset.js';
 
-const { SHOW } = require('../constants/request_types.js');
+import { SHOW } from '../constants/request_types.js';
 
 /*
 
@@ -41,8 +41,8 @@ const serveByClaim = (req, res) => {
 
     sendGAServeEvent(headers, ip, originalUrl);
   } catch (error) {
-    return res.status(400).json({success: false, message: error.message});
+    return res.status(400).json({ success: false, message: error.message });
   }
 };
 
-module.exports = serveByClaim;
+export default serveByClaim;

server/controllers/assets/serveByIdentifierAndClaim/index.js

@@ -1,15 +1,15 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
+import { sendGAServeEvent } from 'server/utils/googleAnalytics';
-const handleShowRender = require('../../../render/handleShowRender').default;
+import handleShowRender from 'server/render/handleShowRender';
 
-const lbryUri = require('../../../../utils/lbryUri.js');
+import lbryUri from '@globalutils/lbryUri.js';
 
-const determineRequestType = require('../utils/determineRequestType.js');
+import determineRequestType from '../utils/determineRequestType.js';
-const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');
+import getClaimIdAndServeAsset from '../utils/getClaimIdAndServeAsset.js';
-const flipClaimNameAndId = require('../utils/flipClaimNameAndId.js');
+import flipClaimNameAndId from '../utils/flipClaimNameAndId.js';
 
-const { SHOW } = require('../constants/request_types.js');
+import { SHOW } from '../constants/request_types.js';
 
 /*
 
@@ -30,7 +30,9 @@ const serverByIdentifierAndClaim = (req, res) => {
     }
 
     ({ claimName } = lbryUri.parseClaim(params.claim));
-    ({ isChannel, channelName, channelClaimId, claimId } = lbryUri.parseIdentifier(params.identifier));
+    ({ isChannel, channelName, channelClaimId, claimId } = lbryUri.parseIdentifier(
+      params.identifier
+    ));
 
     if (!isChannel) {
       [claimId, claimName] = flipClaimNameAndId(claimId, claimName);
@@ -47,12 +49,21 @@ const serverByIdentifierAndClaim = (req, res) => {
       claimId,
     });
 
-    getClaimIdAndServeAsset(channelName, channelClaimId, claimName, claimId, originalUrl, ip, res, headers);
+    getClaimIdAndServeAsset(
+      channelName,
+      channelClaimId,
+      claimName,
+      claimId,
+      originalUrl,
+      ip,
+      res,
+      headers
+    );
 
     sendGAServeEvent(headers, ip, originalUrl);
   } catch (error) {
-    return res.status(400).json({success: false, message: error.message});
+    return res.status(400).json({ success: false, message: error.message });
   }
 };
 
-module.exports = serverByIdentifierAndClaim;
+export default serverByIdentifierAndClaim;

server/controllers/assets/utils/determineRequestType.js

@@ -1,6 +1,6 @@
-const { SERVE, SHOW } = require('../constants/request_types.js');
+import { SERVE, SHOW } from '../constants/request_types.js';
 
-function clientWantsAsset ({accept, range}) {
+function clientWantsAsset({ accept, range }) {
   const imageIsWanted = accept && accept.match(/image\/.*/) && !accept.match(/text\/html/);
   const videoIsWanted = accept && accept.match(/video\/.*/) && !accept.match(/text\/html/);
   return imageIsWanted || videoIsWanted;
@@ -13,4 +13,4 @@ const determineRequestType = (hasFileExtension, headers) => {
   return SHOW;
 };
 
-module.exports = determineRequestType;
+export default determineRequestType;

server/controllers/assets/utils/flipClaimNameAndId.js

@@ -1,14 +1,14 @@
-function isValidClaimId (claimId) {
+function isValidClaimId(claimId) {
-  return ((claimId.length === 40) && !/[^A-Za-z0-9]/g.test(claimId));
+  return claimId.length === 40 && !/[^A-Za-z0-9]/g.test(claimId);
-};
+}
 
-function isValidShortId (claimId) {
+function isValidShortId(claimId) {
-  return claimId.length === 1;  // it should really evaluate the short url itself
+  return claimId.length === 1; // it should really evaluate the short url itself
-};
+}
 
-function isValidShortIdOrClaimId (input) {
+function isValidShortIdOrClaimId(input) {
-  return (isValidClaimId(input) || isValidShortId(input));
+  return isValidClaimId(input) || isValidShortId(input);
-};
+}
 
 const flipClaimNameAndId = (identifier, name) => {
   // this is a patch for backwards compatability with '/name/claimId' url format
@@ -20,4 +20,4 @@ const flipClaimNameAndId = (identifier, name) => {
   return [identifier, name];
 };
 
-module.exports = flipClaimNameAndId;
+export default flipClaimNameAndId;

server/controllers/assets/utils/getClaimIdAndServeAsset.js

@@ -1,16 +1,20 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const db = require('server/models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const isApprovedChannel = require('@globalutils/isApprovedChannel');
+import { getFileListFileByOutpoint, getClaim } from 'server/lbrynet';
-const { getFileListFileByOutpoint, getClaim } = require('server/lbrynet');
+import getClaimId from '../../utils/getClaimId.js';
-const getClaimId = require('../../utils/getClaimId.js');
+import { handleErrorResponse } from '../../utils/errorHandlers.js';
-const { handleErrorResponse } = require('../../utils/errorHandlers.js');
+import awaitFileSize from 'server/utils/awaitFileSize';
-const awaitFileSize = require('server/utils/awaitFileSize');
+import serveFile from './serveFile.js';
-const serveFile = require('./serveFile.js');
+import parseQueryString from 'server/utils/parseQuerystring';
-const parseQueryString = require('server/utils/parseQuerystring');
+import publishCache from 'server/utils/publishCache';
-const publishCache = require('server/utils/publishCache');
+import isBot from 'isbot';
-const isBot = require('isbot');
+import isApprovedChannel from '@globalutils/isApprovedChannel';
+
+import { publishing } from '@config/siteConfig';
+
+const { serveOnlyApproved, approvedChannels } = publishing;
 
 const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
@@ -22,10 +26,6 @@ const RETRY_MS = 250;
 const TIMEOUT_MS = 15000;
 const MIN_BYTES = 15000000;
 
-const {
-  publishing: { serveOnlyApproved, approvedChannels },
-} = require('@config/siteConfig');
-
 const getClaimIdAndServeAsset = async (
   channelName,
   channelClaimId,
@@ -125,4 +125,4 @@ const getClaimIdAndServeAsset = async (
   }
 };
 
-module.exports = getClaimIdAndServeAsset;
+export default getClaimIdAndServeAsset;

server/controllers/assets/utils/getLocalFileRecord.js

@@ -1,15 +1,14 @@
-const db = require('../../../models');
+import db from 'server/models';
 
 const NO_FILE = 'NO_FILE';
 
 const getLocalFileRecord = (claimId, name) => {
-  return db.File.findOne({where: {claimId, name}})
+  return db.File.findOne({ where: { claimId, name } }).then(file => {
-    .then(file => {
+    if (!file) {
-      if (!file) {
+      return NO_FILE;
-        return NO_FILE;
+    }
-      }
+    return file.dataValues;
-      return file.dataValues;
+  });
-    });
 };
 
-module.exports = getLocalFileRecord;
+export default getLocalFileRecord;

server/controllers/assets/utils/logRequestData.js

@@ -1,4 +1,4 @@
-const logger = require('winston');
+import logger from 'winston';
 
 const logRequestData = (responseType, claimName, channelName, claimId) => {
   logger.debug('responseType ===', responseType);
@@ -7,4 +7,4 @@ const logRequestData = (responseType, claimName, channelName, claimId) => {
   logger.debug('claim id ===', claimId);
 };
 
-module.exports = logRequestData;
+export default logRequestData;

server/controllers/assets/utils/serveFile.js

@@ -1,10 +1,10 @@
-const logger = require('winston');
+import logger from 'winston';
-const transformImage = require('./transformImage');
+import transformImage from './transformImage';
-const parseQueryString = require('server/utils/parseQuerystring');
+import parseQueryString from 'server/utils/parseQuerystring';
-const isValidQueryObject = require('server/utils/isValidQueryObj');
+import isValidQueryObject from 'server/utils/isValidQueryObj';
-const {
+import { serving } from '@config/siteConfig';
-  serving: { dynamicFileSizing },
+const { dynamicFileSizing } = serving;
-} = require('@config/siteConfig');
+
 const { enabled: dynamicEnabled } = dynamicFileSizing;
 
 const serveFile = async (
@@ -57,4 +57,4 @@ const serveFile = async (
   }
 };
 
-module.exports = serveFile;
+export default serveFile;

server/controllers/assets/utils/transformImage.js

@@ -1,9 +1,9 @@
-const gm = require('gm');
+import gm from 'gm';
-const logger = require('winston');
+import logger from 'winston';
+import { getImageHeightAndWidth } from '@serverutils/imageProcessing';
 const imageMagick = gm.subClass({ imageMagick: true });
-const { getImageHeightAndWidth } = require('../../../utils/imageProcessing');
 
-module.exports = function transformImage(path, queryObj) {
+export default function transformImage(path, queryObj) {
   return new Promise((resolve, reject) => {
     let { h: cHeight = null } = queryObj;
     let { w: cWidth = null } = queryObj;
@@ -39,7 +39,7 @@ module.exports = function transformImage(path, queryObj) {
       reject(e);
     }
   });
-};
+}
 
 function _cropCenter(path, cropWidth, cropHeight, originalWidth, originalHeight) {
   let oAspect = originalWidth / originalHeight;

server/controllers/auth/login/index.js

@@ -1,4 +1,4 @@
-const speechPassport = require('../../../speechPassport/index');
+import speechPassport from 'server/speechPassport/index';
 
 const login = (req, res, next) => {
   speechPassport.authenticate('local-login', (err, user, info) => {
@@ -11,13 +11,13 @@ const login = (req, res, next) => {
         message: info.message,
       });
     }
-    req.logIn(user, (err) => {
+    req.logIn(user, err => {
       if (err) {
         return next(err);
       }
       return res.status(200).json({
-        success       : true,
+        success: true,
-        channelName   : req.user.channelName,
+        channelName: req.user.channelName,
         channelClaimId: req.user.channelClaimId,
         shortChannelId: req.user.shortChannelId,
       });
@@ -25,4 +25,4 @@ const login = (req, res, next) => {
   })(req, res, next);
 };
 
-module.exports = login;
+export default login;

server/controllers/auth/logout/index.js

@@ -7,4 +7,4 @@ const logout = (req, res) => {
   res.status(200).json(responseObject);
 };
 
-module.exports = logout;
+export default logout;

server/controllers/auth/signup/index.js

@@ -1,10 +1,10 @@
 const signup = (req, res) => {
   res.status(200).json({
-    success       : true,
+    success: true,
-    channelName   : req.user.channelName,
+    channelName: req.user.channelName,
     channelClaimId: req.user.channelClaimId,
     shortChannelId: req.user.shortChannelId,
   });
 };
 
-module.exports = signup;
+export default signup;

server/controllers/auth/user/index.js

@@ -1,9 +1,9 @@
 const user = (req, res) => {
   const responseObject = {
     success: true,
-    data   : req.user,
+    data: req.user,
   };
   res.status(200).json(responseObject);
 };
 
-module.exports = user;
+export default user;

server/controllers/pages/sendVideoEmbedPage.js

@@ -1,42 +1,40 @@
-const {
+import { assetDefaults, details } from '@config/siteConfig';
-  assetDefaults: { thumbnail },
+const { thumbnail } = assetDefaults;
-  details: { host },
+const { host } = details;
-} = require('@config/siteConfig');
-
 const padSizes = {
-  small : 'padSmall',
+  small: 'padSmall',
   medium: 'padMedium',
-  large : 'padLarge',
+  large: 'padLarge',
 };
 
 const argumentProcessors = {
-  'bottom': async (config) => {
+  bottom: async config => {
     config.classNames.push('bottom');
   },
-  'right': async (config) => {
+  right: async config => {
     config.classNames.push('right');
   },
-  'pad': async (config, val) => {
+  pad: async (config, val) => {
     config.classNames.push(padSizes[val]);
   },
-  'logoClaim': async (config, val) => {
+  logoClaim: async (config, val) => {
     config.logoUrl = `${host}/${val}`;
   },
-  'link': async (config, val) => {
+  link: async (config, val) => {
     config.logoLink = val;
   },
 };
 
-const parseLogoConfigParam = async (rawConfig) => {
+const parseLogoConfigParam = async rawConfig => {
   if (rawConfig) {
     let parsedConfig = {
       classNames: ['logoLink'],
-      logoUrl   : thumbnail,
+      logoUrl: thumbnail,
     };
     let splitConfig;
     try {
       splitConfig = rawConfig.split(',');
-    } catch (e) { }
+    } catch (e) {}
 
     if (!splitConfig) {
       return false;
@@ -64,11 +62,7 @@ const parseLogoConfigParam = async (rawConfig) => {
 };
 
 const sendVideoEmbedPage = async ({ params }, res) => {
-  let {
+  let { claimId, config, name } = params;
-    claimId,
-    config,
-    name,
-  } = params;
 
   // if channel then swap name and claimId for order
   if (name[0] === '@' && name.includes(':')) {
@@ -86,4 +80,4 @@ const sendVideoEmbedPage = async ({ params }, res) => {
   res.status(200).render('embed', { host, claimId, name, logoConfig });
 };
 
-module.exports = sendVideoEmbedPage;
+export default sendVideoEmbedPage;

server/controllers/utils/errorHandlers.js

@@ -1,45 +1,44 @@
-const logger = require('winston');
+import logger from 'winston';
 
-module.exports = {
+export function handleErrorResponse(originalUrl, ip, error, res) {
-  handleErrorResponse: function (originalUrl, ip, error, res) {
+  logger.error(`Error on ${originalUrl}`, useObjectPropertiesIfNoKeys(error));
-    logger.error(`Error on ${originalUrl}`, module.exports.useObjectPropertiesIfNoKeys(error));
+  const [status, message] = returnErrorMessageAndStatus(error);
-    const [status, message] = module.exports.returnErrorMessageAndStatus(error);
+  res.status(status).json(createErrorResponsePayload(status, message));
-    res
+}
-      .status(status)
+
-      .json(module.exports.createErrorResponsePayload(status, message));
+export function returnErrorMessageAndStatus(error) {
-  },
+  let status, message;
-  returnErrorMessageAndStatus: function (error) {
+  // check for daemon being turned off
-    let status, message;
+  if (error.code === 'ECONNREFUSED') {
-    // check for daemon being turned off
+    status = 503;
-    if (error.code === 'ECONNREFUSED') {
+    message = 'Connection refused.  The daemon may not be running.';
-      status = 503;
+    // fallback for everything else
-      message = 'Connection refused.  The daemon may not be running.';
+  } else {
-      // fallback for everything else
+    status = 400;
+    if (error.message) {
+      message = error.message;
     } else {
-      status = 400;
+      message = error;
-      if (error.message) {
-        message = error.message;
-      } else {
-        message = error;
-      }
     }
-    return [status, message];
+  }
-  },
+  return [status, message];
-  useObjectPropertiesIfNoKeys: function (err) {
+}
-    if (Object.keys(err).length === 0) {
+
-      let newErrorObject = {};
+export function useObjectPropertiesIfNoKeys(err) {
-      Object.getOwnPropertyNames(err).forEach((key) => {
+  if (Object.keys(err).length === 0) {
-        newErrorObject[key] = err[key];
+    let newErrorObject = {};
-      });
+    Object.getOwnPropertyNames(err).forEach(key => {
-      return newErrorObject;
+      newErrorObject[key] = err[key];
-    }
+    });
-    return err;
+    return newErrorObject;
-  },
+  }
-  createErrorResponsePayload (status, message) {
+  return err;
-    return {
+}
-      status,
+
-      success: false,
+function createErrorResponsePayload(status, message) {
-      message,
+  return {
-    };
+    status,
-  },
+    success: false,
-};
+    message,
+  };
+}

server/controllers/utils/getClaimId.js

@@ -1,8 +1,8 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../../models');
+import db from 'server/models';
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
-const publishCache = require('server/utils/publishCache');
+import publishCache from 'server/utils/publishCache';
-const createCanonicalLink = require('@globalutils/createCanonicalLink');
+import createCanonicalLink from '@globalutils/createCanonicalLink';
 
 const getClaimIdByChannel = async (channelName, channelClaimId, claimName) => {
   logger.debug(`getClaimIdByChannel(${channelName}, ${channelClaimId}, ${claimName})`);
@@ -36,4 +36,4 @@ const getClaimId = async (channelName, channelClaimId, name, claimId) => {
   }
 };
 
-module.exports = getClaimId;
+export default getClaimId;

server/controllers/utils/redirect.js

@@ -1,7 +1,7 @@
-const redirect = (route) => {
+const redirect = route => {
   return (req, res) => {
     res.status(301).redirect(route);
   };
 };
 
-module.exports = redirect;
+export default redirect;

server/index.js

@@ -1,36 +1,33 @@
 // load modules
-const express = require('express');
+import express from 'express';
-const bodyParser = require('body-parser');
+import bodyParser from 'body-parser';
-const expressHandlebars = require('express-handlebars');
+import expressHandlebars from 'express-handlebars';
-const helmet = require('helmet');
+import helmet from 'helmet';
-const cookieSession = require('cookie-session');
+import cookieSession from 'cookie-session';
-const http = require('http');
+import http from 'http';
-const logger = require('winston');
+import logger from 'winston';
-const Path = require('path');
+import Path from 'path';
-const httpContext = require('express-http-context');
+import httpContext from 'express-http-context';
 
 // load local modules
-const db = require('./models');
+import db from './models';
-const requestLogger = require('./middleware/requestLogger');
+import requestLogger from './middleware/requestLogger';
-const createDatabaseIfNotExists = require('./models/utils/createDatabaseIfNotExists');
+import createDatabaseIfNotExists from './models/utils/createDatabaseIfNotExists';
-const { getAccountBalance } = require('./lbrynet/index');
+import { getAccountBalance } from './lbrynet/index';
-const configureLogging = require('./utils/configureLogging');
+import configureLogging from './utils/configureLogging';
-const configureSlack = require('./utils/configureSlack');
+import configureSlack from './utils/configureSlack';
-const { setupBlockList } = require('./utils/blockList');
+import { setupBlockList } from './utils/blockList';
-const speechPassport = require('./speechPassport');
+import speechPassport from './speechPassport';
-const processTrending = require('./utils/processTrending');
+import processTrending from './utils/processTrending';
 
-const {
+import {
   logMetricsMiddleware,
   setRouteDataInContextMiddleware,
-} = require('./middleware/logMetricsMiddleware');
+} from './middleware/logMetricsMiddleware';
-
+import { sessionKey } from '@private/authConfig.json';
-const {
+import { details, startup } from '@config/siteConfig';
-  details: { port: PORT, blockListEndpoint },
+const { port: PORT, blockListEndpoint } = details;
-  startup: { performChecks, performUpdates },
+const { performChecks, performUpdates } = startup;
-} = require('@config/siteConfig');
-
-const { sessionKey } = require('@private/authConfig.json');
 
 // configure.js doesn't handle new keys in config.json files yet. Make sure it doens't break.
 let finalBlockListEndpoint;
@@ -246,4 +243,4 @@ function Server() {
   };
 }
 
-module.exports = Server;
+export default Server;

server/lbrynet/index.js

@@ -1,212 +1,209 @@
-const axios = require('axios');
+import axios from 'axios';
-const logger = require('winston');
+import logger from 'winston';
-const { apiHost, apiPort, getTimeout } = require('@config/lbryConfig');
+import db from 'server/models';
-const lbrynetUri = 'http://' + apiHost + ':' + apiPort;
+import { handleLbrynetResponse } from './utils/handleLbrynetResponse.js';
-const db = require('../models');
+import { apiHost, apiPort, getTimeout } from '@config/lbryConfig';
-const { chooseGaLbrynetPublishLabel, sendGATimingEvent } = require('../utils/googleAnalytics.js');
+import { chooseGaLbrynetPublishLabel, sendGATimingEvent } from '../utils/googleAnalytics.js';
-const handleLbrynetResponse = require('./utils/handleLbrynetResponse.js');
+import { publishing } from '@config/siteConfig';
-const { publishing } = require('@config/siteConfig');
 
-module.exports = {
+const lbrynetUri = 'http://' + apiHost + ':' + apiPort;
-  publishClaim(publishParams) {
+
-    logger.debug(`lbryApi >> Publishing claim to "${publishParams.name}"`);
+export function publishClaim(publishParams) {
-    const gaStartTime = Date.now();
+  logger.debug(`lbryApi >> Publishing claim to "${publishParams.name}"`);
-    return new Promise((resolve, reject) => {
+  const gaStartTime = Date.now();
-      axios
+  return new Promise((resolve, reject) => {
-        .post(lbrynetUri, {
+    axios
-          method: 'publish',
+      .post(lbrynetUri, {
-          params: publishParams,
+        method: 'publish',
-        })
+        params: publishParams,
-        .then(response => {
+      })
-          sendGATimingEvent(
+      .then(response => {
-            'lbrynet',
+        sendGATimingEvent(
-            'publish',
+          'lbrynet',
-            chooseGaLbrynetPublishLabel(publishParams),
+          'publish',
-            gaStartTime,
+          chooseGaLbrynetPublishLabel(publishParams),
-            Date.now()
+          gaStartTime,
-          );
+          Date.now()
-          handleLbrynetResponse(response, resolve, reject);
+        );
-        })
+        handleLbrynetResponse(response, resolve, reject);
-        .catch(error => {
+      })
-          reject(error);
+      .catch(error => {
-        });
+        reject(error);
-    });
-  },
-  getClaim(uri) {
-    logger.debug(`lbryApi >> Getting Claim for "${uri}"`);
-    const gaStartTime = Date.now();
-    return new Promise((resolve, reject) => {
-      axios
-        .post(lbrynetUri, {
-          method: 'get',
-          params: {
-            uri,
-            timeout: getTimeout || 30,
-          },
-        })
-        .then(response => {
-          sendGATimingEvent('lbrynet', 'getClaim', 'GET', gaStartTime, Date.now());
-          handleLbrynetResponse(response, resolve, reject);
-        })
-        .catch(error => {
-          reject(error);
-        });
-    });
-  },
-  getFileListFileByOutpoint(outpoint) {
-    logger.debug(`lbryApi >> Getting File_List for "${outpoint}"`);
-    const gaStartTime = Date.now();
-    return new Promise((resolve, reject) => {
-      axios
-        .post(lbrynetUri, {
-          method: 'file_list',
-          params: {
-            outpoint,
-          },
-        })
-        .then(response => {
-          sendGATimingEvent('lbrynet', 'getFileList', 'FILE_LIST', gaStartTime, Date.now());
-          handleLbrynetResponse(response, resolve, reject);
-        })
-        .catch(error => {
-          reject(error);
-        });
-    });
-  },
-  async abandonClaim({ claimId }) {
-    logger.debug(`lbryApi >> Abandon claim "${claimId}"`);
-    const gaStartTime = Date.now();
-    try {
-      const abandon = await axios.post(lbrynetUri, {
-        method: 'claim_abandon',
-        params: { claim_id: claimId },
       });
-      sendGATimingEvent('lbrynet', 'abandonClaim', 'ABANDON_CLAIM', gaStartTime, Date.now());
+  });
-      return abandon.data;
+}
-    } catch (error) {
+
-      logger.error(error);
+export function getClaim(uri) {
-      return error;
+  logger.debug(`lbryApi >> Getting Claim for "${uri}"`);
-    }
+  const gaStartTime = Date.now();
-  },
+  return new Promise((resolve, reject) => {
-  getClaimList(claimName) {
+    axios
-    logger.debug(`lbryApi >> Getting claim_list for "${claimName}"`);
+      .post(lbrynetUri, {
-    const gaStartTime = Date.now();
+        method: 'get',
-    return new Promise((resolve, reject) => {
+        params: {
-      axios
+          uri,
-        .post(lbrynetUri, {
+          timeout: getTimeout || 30,
-          method: 'claim_list',
+        },
-          params: { name: claimName },
+      })
-        })
+      .then(response => {
-        .then(response => {
+        sendGATimingEvent('lbrynet', 'getClaim', 'GET', gaStartTime, Date.now());
-          sendGATimingEvent('lbrynet', 'getClaimList', 'CLAIM_LIST', gaStartTime, Date.now());
+        handleLbrynetResponse(response, resolve, reject);
-          handleLbrynetResponse(response, resolve, reject);
+      })
-        })
+      .catch(error => {
-        .catch(error => {
+        reject(error);
-          reject(error);
+      });
-        });
+  });
+}
+
+export async function abandonClaim({ claimId }) {
+  logger.debug(`lbryApi >> Abandon claim "${claimId}"`);
+  const gaStartTime = Date.now();
+  try {
+    const abandon = await axios.post(lbrynetUri, {
+      method: 'claim_abandon',
+      params: { claim_id: claimId },
     });
-  },
+    sendGATimingEvent('lbrynet', 'abandonClaim', 'ABANDON_CLAIM', gaStartTime, Date.now());
-  resolveUri(uri) {
+    return abandon.data;
-    logger.debug(`lbryApi >> Resolving URI for "${uri}"`);
+  } catch (error) {
-    const gaStartTime = Date.now();
+    logger.error(error);
-    return new Promise((resolve, reject) => {
+    return error;
-      axios
+  }
-        .post(lbrynetUri, {
+}
-          method: 'resolve',
+
-          params: { urls: uri },
+export function getFileListFileByOutpoint(outpoint) {
-        })
+  logger.debug(`lbryApi >> Getting File_List for "${outpoint}"`);
-        .then(({ data }) => {
+  const gaStartTime = Date.now();
-          sendGATimingEvent('lbrynet', 'resolveUri', 'RESOLVE', gaStartTime, Date.now());
+  return new Promise((resolve, reject) => {
-          if (Object.keys(data.result).length === 0 && data.result.constructor === Object) {
+    axios
-            // workaround for daemon returning empty result object
+      .post(lbrynetUri, {
-            // https://github.com/lbryio/lbry/issues/1485
+        method: 'file_list',
-            db.Claim.findOne({ where: { claimId: uri.split('#')[1] } })
+        params: {
-              .then(() => reject('This claim has not yet been confirmed on the LBRY blockchain'))
+          outpoint,
-              .catch(() => reject(`Claim ${uri} does not exist`));
+        },
-          } else if (data.result[uri].error) {
+      })
-            // check for errors
+      .then(response => {
-            reject(data.result[uri].error);
+        sendGATimingEvent('lbrynet', 'getFileList', 'FILE_LIST', gaStartTime, Date.now());
-          } else {
+        handleLbrynetResponse(response, resolve, reject);
-            // if no errors, resolve
+      })
-            resolve(data.result[uri]);
+      .catch(error => {
-          }
+        reject(error);
-        })
+      });
-        .catch(error => {
+  });
-          reject(error);
+}
-        });
+
-    });
+export function getClaimList(claimName) {
-  },
+  logger.debug(`lbryApi >> Getting claim_list for "${claimName}"`);
-  getDownloadDirectory() {
+  const gaStartTime = Date.now();
-    logger.debug('lbryApi >> Retrieving the download directory path from lbry daemon...');
+  return new Promise((resolve, reject) => {
-    const gaStartTime = Date.now();
+    axios
-    return new Promise((resolve, reject) => {
+      .post(lbrynetUri, {
-      axios
+        method: 'claim_list',
-        .post(lbrynetUri, {
+        params: { name: claimName },
-          method: 'settings_get',
+      })
-        })
+      .then(response => {
-        .then(({ data }) => {
+        sendGATimingEvent('lbrynet', 'getClaimList', 'CLAIM_LIST', gaStartTime, Date.now());
-          sendGATimingEvent(
+        handleLbrynetResponse(response, resolve, reject);
-            'lbrynet',
+      })
-            'getDownloadDirectory',
+      .catch(error => {
-            'SETTINGS_GET',
+        reject(error);
-            gaStartTime,
+      });
-            Date.now()
+  });
+}
+export function resolveUri(uri) {
+  logger.debug(`lbryApi >> Resolving URI for "${uri}"`);
+  const gaStartTime = Date.now();
+  return new Promise((resolve, reject) => {
+    axios
+      .post(lbrynetUri, {
+        method: 'resolve',
+        params: { urls: uri },
+      })
+      .then(({ data }) => {
+        sendGATimingEvent('lbrynet', 'resolveUri', 'RESOLVE', gaStartTime, Date.now());
+        if (Object.keys(data.result).length === 0 && data.result.constructor === Object) {
+          // workaround for daemon returning empty result object
+          // https://github.com/lbryio/lbry/issues/1485
+          db.Claim.findOne({ where: { claimId: uri.split('#')[1] } })
+            .then(() => reject('This claim has not yet been confirmed on the LBRY blockchain'))
+            .catch(() => reject(`Claim ${uri} does not exist`));
+        } else if (data.result[uri].error) {
+          // check for errors
+          reject(data.result[uri].error);
+        } else {
+          // if no errors, resolve
+          resolve(data.result[uri]);
+        }
+      })
+      .catch(error => {
+        reject(error);
+      });
+  });
+}
+export function getDownloadDirectory() {
+  logger.debug('lbryApi >> Retrieving the download directory path from lbry daemon...');
+  const gaStartTime = Date.now();
+  return new Promise((resolve, reject) => {
+    axios
+      .post(lbrynetUri, {
+        method: 'settings_get',
+      })
+      .then(({ data }) => {
+        sendGATimingEvent(
+          'lbrynet',
+          'getDownloadDirectory',
+          'SETTINGS_GET',
+          gaStartTime,
+          Date.now()
+        );
+        if (data.result) {
+          resolve(data.result.download_directory);
+        } else {
+          return new Error(
+            'Successfully connected to lbry daemon, but unable to retrieve the download directory.'
           );
-          if (data.result) {
+        }
-            resolve(data.result.download_dir);
+      })
-          } else {
+      .catch(error => {
-            return new Error(
+        logger.error('Lbrynet Error:', error);
-              'Successfully connected to lbry daemon, but unable to retrieve the download directory.'
+        resolve('/home/lbry/Downloads/');
-            );
+      });
-          }
+  });
-        })
+}
-        .catch(error => {
+export function createChannel(name) {
-          logger.error('Lbrynet Error:', error);
+  logger.debug(`lbryApi >> Creating channel for ${name}...`);
-          resolve('/home/lbry/Downloads/');
+  const gaStartTime = Date.now();
-        });
+  return new Promise((resolve, reject) => {
-    });
+    axios
-  },
+      .post(lbrynetUri, {
-  createChannel(name) {
+        method: 'channel_new',
-    logger.debug(`lbryApi >> Creating channel for ${name}...`);
+        params: {
-    const gaStartTime = Date.now();
+          channel_name: name,
-    return new Promise((resolve, reject) => {
+          amount: publishing.channelClaimBidAmount,
-      axios
+        },
-        .post(lbrynetUri, {
+      })
-          method: 'channel_new',
+      .then(response => {
-          params: {
+        sendGATimingEvent('lbrynet', 'createChannel', 'CHANNEL_NEW', gaStartTime, Date.now());
-            channel_name: name,
+        handleLbrynetResponse(response, resolve, reject);
-            amount: publishing.channelClaimBidAmount,
+      })
-          },
+      .catch(error => {
-        })
+        reject(error);
-        .then(response => {
+      });
-          sendGATimingEvent('lbrynet', 'createChannel', 'CHANNEL_NEW', gaStartTime, Date.now());
+  });
-          handleLbrynetResponse(response, resolve, reject);
+}
-        })
+export function getAccountBalance() {
-        .catch(error => {
+  const gaStartTime = Date.now();
-          reject(error);
+  return new Promise((resolve, reject) => {
-        });
+    axios
-    });
+      .post(lbrynetUri, {
-  },
+        method: 'account_balance',
-  getAccountBalance() {
+      })
-    const gaStartTime = Date.now();
+      .then(response => {
-    return new Promise((resolve, reject) => {
+        sendGATimingEvent('lbrynet', 'getAccountBalance', 'SETTINGS_GET', gaStartTime, Date.now());
-      axios
+        handleLbrynetResponse(response, resolve, reject);
-        .post(lbrynetUri, {
+      })
-          method: 'account_balance',
+      .catch(error => {
-        })
+        reject(error);
-        .then(response => {
+      });
-          sendGATimingEvent(
+  });
-            'lbrynet',
+}
-            'getAccountBalance',
-            'SETTINGS_GET',
-            gaStartTime,
-            Date.now()
-          );
-          handleLbrynetResponse(response, resolve, reject);
-        })
-        .catch(error => {
-          reject(error);
-        });
-    });
-  },
-};

server/lbrynet/utils/handleLbrynetResponse.js

@@ -1,6 +1,6 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const handleLbrynetResponse = ({ data }, resolve, reject) => {
+export const handleLbrynetResponse = ({ data }, resolve, reject) => {
   logger.debug('lbry api data:', data);
   if (data) {
     // check for an error
@@ -15,5 +15,3 @@ const handleLbrynetResponse = ({ data }, resolve, reject) => {
   // fallback in case it just timed out
   reject(JSON.stringify(data));
 };
-
-module.exports = handleLbrynetResponse;

server/middleware/autoblockPublishMiddleware.js

@@ -1,9 +1,8 @@
-const fs = require('fs');
+import fs from 'fs';
 
-const logger = require('winston');
+import logger from 'winston';
-const {
+import { publishing } from '@config/siteConfig';
-  publishing: { publishingChannelWhitelist },
+const { publishingChannelWhitelist } = publishing;
-} = require('@config/siteConfig');
 const ipBanFile = './site/config/ipBan.txt';
 const forbiddenMessage =
   '<h1>Forbidden</h1>If you are seeing this by mistake, please contact us using <a href="https://chat.lbry.com/">https://chat.lbry.com/</a>';
@@ -23,7 +22,7 @@ if (fs.existsSync(ipBanFile)) {
   });
 }
 
-const autoblockPublishMiddleware = (req, res, next) => {
+export const autoblockPublishMiddleware = (req, res, next) => {
   let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
 
   if (blockedAddresses.indexOf(ip) !== -1) {
@@ -56,7 +55,7 @@ const autoblockPublishMiddleware = (req, res, next) => {
   }
 };
 
-const autoblockPublishBodyMiddleware = (req, res, next) => {
+export const autoblockPublishBodyMiddleware = (req, res, next) => {
   if (req.body && publishingChannelWhitelist) {
     let ip = (req.headers['x-forwarded-for'] || req.connection.remoteAddress).split(/,\s?/)[0];
     const { channelName } = req.body;
@@ -67,8 +66,3 @@ const autoblockPublishBodyMiddleware = (req, res, next) => {
   }
   next();
 };
-
-module.exports = {
-  autoblockPublishMiddleware,
-  autoblockPublishBodyMiddleware,
-};

server/middleware/logMetricsMiddleware.js

@@ -1,8 +1,8 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../models');
+import db from '../models';
-const httpContext = require('express-http-context');
+import httpContext from 'express-http-context';
 
-function logMetricsMiddleware (req, res, next) {
+export function logMetricsMiddleware(req, res, next) {
   res.on('finish', () => {
     const userAgent = req.get('user-agent');
     const routePath = httpContext.get('routePath');
@@ -26,15 +26,15 @@ function logMetricsMiddleware (req, res, next) {
     }
 
     db.Metrics.create({
-      time      : Date.now(),
+      time: Date.now(),
       isInternal: /node-fetch/.test(userAgent),
-      isChannel : res.isChannel,
+      isChannel: res.isChannel,
-      claimId   : res.claimId,
+      claimId: res.claimId,
-      routePath : httpContext.get('routePath'),
+      routePath: httpContext.get('routePath'),
-      params    : JSON.stringify(req.params),
+      params: JSON.stringify(req.params),
-      ip        : req.headers['x-forwarded-for'] || req.connection.remoteAddress,
+      ip: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
-      request   : req.url,
+      request: req.url,
-      routeData : JSON.stringify(httpContext.get('routeData')),
+      routeData: JSON.stringify(httpContext.get('routeData')),
       referrer,
       userAgent,
     });
@@ -43,15 +43,10 @@ function logMetricsMiddleware (req, res, next) {
   next();
 }
 
-function setRouteDataInContextMiddleware (routePath, routeData) {
+export function setRouteDataInContextMiddleware(routePath, routeData) {
-  return function (req, res, next) {
+  return function(req, res, next) {
     httpContext.set('routePath', routePath);
     httpContext.set('routeData', routeData);
     next();
   };
 }
-
-module.exports = {
-  logMetricsMiddleware,
-  setRouteDataInContextMiddleware,
-};

server/middleware/multipartMiddleware.js

@@ -1,5 +1,6 @@
-const multipart = require('connect-multiparty');
+import multipart from 'connect-multiparty';
-const { publishing: { uploadDirectory } } = require('@config/siteConfig');
+import { publishing } from '@config/siteConfig';
-const multipartMiddleware = multipart({uploadDir: uploadDirectory});
+const { uploadDirectory } = publishing;
+const multipartMiddleware = multipart({ uploadDir: uploadDirectory });
 
-module.exports = multipartMiddleware;
+export default multipartMiddleware;

server/middleware/requestLogger.js

@@ -1,8 +1,8 @@
-const logger = require('winston');
+import logger from 'winston';
 
-const requestLogger = (req, res, next) => {  // custom logging middleware to log all incoming http requests
+const requestLogger = (req, res, next) => {
+  // custom logging middleware to log all incoming http requests
   logger.debug(`Request on ${req.originalUrl} from ${req.ip}`);
   next();
 };
-
+export default requestLogger;
-module.exports = requestLogger;

server/middleware/torCheckMiddleware.js

@@ -1,22 +1,22 @@
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../models');
+import db from 'server/models';
 
 const torCheck = (req, res, next) => {
   const { ip } = req;
   logger.debug(`tor check for: ${ip}`);
-  return db.Tor.findAll(
+  return db.Tor.findAll({
-    {
+    where: {
-      where: {
+      address: ip,
-        address: ip,
+    },
-      },
+    raw: true,
-      raw: true,
+  })
-    })
     .then(result => {
       if (result.length >= 1) {
         logger.info('Tor request blocked:', ip);
         const failureResponse = {
           success: false,
-          message: 'Unfortunately this api route is not currently available for tor users.  We are working on a solution that will allow tor users to use this endpoint in the future.',
+          message:
+            'Unfortunately this api route is not currently available for tor users.  We are working on a solution that will allow tor users to use this endpoint in the future.',
         };
         res.status(403).json(failureResponse);
       } else {
@@ -27,5 +27,4 @@ const torCheck = (req, res, next) => {
       logger.error(error);
     });
 };
-
+export default torCheck;
-module.exports = torCheck;

server/models/blocked.js

@@ -1,12 +1,12 @@
-const logger = require('winston');
+import logger from 'winston';
 const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 
-module.exports = (sequelize, { STRING }) => {
+export default (sequelize, { STRING }) => {
   const Blocked = sequelize.define(
     'Blocked',
     {
       outpoint: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
     },
@@ -15,15 +15,16 @@ module.exports = (sequelize, { STRING }) => {
     }
   );
 
-  Blocked.getBlockList = function () {
+  Blocked.getBlockList = function() {
     logger.debug('returning full block list');
     return new Promise((resolve, reject) => {
-      this.findAll()
+      this.findAll().then(list => {
-        .then(list => { return resolve(list) });
+        return resolve(list);
+      });
     });
   };
 
-  Blocked.isNotBlocked = function (outpoint) {
+  Blocked.isNotBlocked = function(outpoint) {
     logger.debug(`checking to see if ${outpoint} is not blocked`);
     return new Promise((resolve, reject) => {
       this.findOne({
@@ -44,7 +45,7 @@ module.exports = (sequelize, { STRING }) => {
     });
   };
 
-  Blocked.refreshTable = function (blockEndpoint) {
+  Blocked.refreshTable = function(blockEndpoint) {
     let blockedList = [];
 
     return fetch(blockEndpoint)

server/models/certificate.js

@@ -1,98 +1,98 @@
-const logger = require('winston');
+import logger from 'winston';
-const returnShortId = require('./utils/returnShortId.js');
+import returnShortId from './utils/returnShortId';
 
 const NO_CHANNEL = 'NO_CHANNEL';
 
-function isLongChannelId (channelId) {
+function isLongChannelId(channelId) {
-  return (channelId && (channelId.length === 40));
+  return channelId && channelId.length === 40;
 }
 
-function isShortChannelId (channelId) {
+function isShortChannelId(channelId) {
-  return (channelId && (channelId.length < 40));
+  return channelId && channelId.length < 40;
 }
 
-module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
+export default (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
   const Certificate = sequelize.define(
     'Certificate',
     {
       address: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       amount: {
-        type   : DECIMAL(19, 8),
+        type: DECIMAL(19, 8),
         default: null,
       },
       claimId: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       claimSequence: {
-        type   : INTEGER,
+        type: INTEGER,
         default: null,
       },
       decodedClaim: {
-        type   : BOOLEAN,
+        type: BOOLEAN,
         default: null,
       },
       depth: {
-        type   : INTEGER,
+        type: INTEGER,
         default: null,
       },
       effectiveAmount: {
-        type   : DECIMAL(19, 8),
+        type: DECIMAL(19, 8),
         default: null,
       },
       hasSignature: {
-        type   : BOOLEAN,
+        type: BOOLEAN,
         default: null,
       },
       height: {
-        type   : INTEGER,
+        type: INTEGER,
         default: null,
       },
       hex: {
-        type   : TEXT('long'),
+        type: TEXT('long'),
         default: null,
       },
       name: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       nout: {
-        type   : INTEGER,
+        type: INTEGER,
         default: null,
       },
       txid: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       validAtHeight: {
-        type   : INTEGER,
+        type: INTEGER,
         default: null,
       },
       outpoint: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       valueVersion: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       claimType: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       certificateVersion: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       keyType: {
-        type   : STRING,
+        type: STRING,
         default: null,
       },
       publicKey: {
-        type   : TEXT('long'),
+        type: TEXT('long'),
         default: null,
       },
     },
@@ -109,14 +109,13 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
-  Certificate.getShortChannelIdFromLongChannelId = function (longChannelId, channelName) {
+  Certificate.getShortChannelIdFromLongChannelId = function(longChannelId, channelName) {
     logger.debug(`getShortChannelIdFromLongChannelId ${channelName}:${longChannelId}`);
     return new Promise((resolve, reject) => {
-      this
+      this.findAll({
-        .findAll({
+        where: { name: channelName },
-          where: {name: channelName},
+        order: [['height', 'ASC']],
-          order: [['height', 'ASC']],
+      })
-        })
         .then(result => {
           switch (result.length) {
             case 0:
@@ -131,11 +130,11 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
-  Certificate.validateLongChannelId = function (name, claimId) {
+  Certificate.validateLongChannelId = function(name, claimId) {
     logger.debug(`validateLongChannelId(${name}, ${claimId})`);
     return new Promise((resolve, reject) => {
       this.findOne({
-        where: {name, claimId},
+        where: { name, claimId },
       })
         .then(result => {
           if (!result) {
@@ -150,19 +149,18 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
-  Certificate.getLongChannelIdFromShortChannelId = function (channelName, channelClaimId) {
+  Certificate.getLongChannelIdFromShortChannelId = function(channelName, channelClaimId) {
     logger.debug(`getLongChannelIdFromShortChannelId(${channelName}, ${channelClaimId})`);
     return new Promise((resolve, reject) => {
-      this
+      this.findAll({
-        .findAll({
+        where: {
-          where: {
+          name: channelName,
-            name   : channelName,
+          claimId: {
-            claimId: {
+            [sequelize.Op.like]: `${channelClaimId}%`,
-              [sequelize.Op.like]: `${channelClaimId}%`,
-            },
           },
-          order: [['height', 'ASC']],
+        },
-        })
+        order: [['height', 'ASC']],
+      })
         .then(result => {
           switch (result.length) {
             case 0:
@@ -178,14 +176,13 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
-  Certificate.getLongChannelIdFromChannelName = function (channelName) {
+  Certificate.getLongChannelIdFromChannelName = function(channelName) {
     logger.debug(`getLongChannelIdFromChannelName(${channelName})`);
     return new Promise((resolve, reject) => {
-      this
+      this.findAll({
-        .findAll({
+        where: { name: channelName },
-          where: { name: channelName },
+        order: [['effectiveAmount', 'DESC'], ['height', 'ASC']],
-          order: [['effectiveAmount', 'DESC'], ['height', 'ASC']],
+      })
-        })
         .then(result => {
           switch (result.length) {
             case 0:
@@ -201,7 +198,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
-  Certificate.getLongChannelId = function (channelName, channelClaimId) {
+  Certificate.getLongChannelId = function(channelName, channelClaimId) {
     logger.debug(`getLongChannelId(${channelName}, ${channelClaimId})`);
     if (isLongChannelId(channelClaimId)) {
       return this.validateLongChannelId(channelName, channelClaimId);

server/models/channel.js

@@ -1,13 +1,13 @@
-module.exports = (sequelize, { STRING }) => {
+export default (sequelize, { STRING }) => {
   const Channel = sequelize.define(
     'Channel',
     {
       channelName: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       channelClaimId: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
     },

server/models/claim.js

@@ -1,13 +1,10 @@
-const logger = require('winston');
+import logger from 'winston';
-const returnShortId = require('./utils/returnShortId.js');
+import returnShortId from './utils/returnShortId.js';
-const isApprovedChannel = require('../../utils/isApprovedChannel');
+import isApprovedChannel from '@globalutils/isApprovedChannel';
-const {
+import { assetDefaults, details, publishing } from '@config/siteConfig';
-  assetDefaults: { thumbnail: defaultThumbnail },
+const { thumbnail: defaultThumbnail } = assetDefaults;
-  details: { host },
+const { host } = details;
-} = require('@config/siteConfig');
+const { serveOnlyApproved, approvedChannels } = publishing;
-const {
-  publishing: { serveOnlyApproved, approvedChannels },
-} = require('@config/siteConfig');
 
 const NO_CLAIM = 'NO_CLAIM';
 
@@ -53,7 +50,7 @@ function isShortClaimId(claimId) {
   return claimId && claimId.length < 40;
 }
 
-module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
+export default (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
   const Claim = sequelize.define(
     'Claim',
     {

server/models/file.js

@@ -1,35 +1,35 @@
-module.exports = (sequelize, { STRING, BOOLEAN, INTEGER }) => {
+export default (sequelize, { STRING, BOOLEAN, INTEGER }) => {
   const File = sequelize.define(
     'File',
     {
       name: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       claimId: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       outpoint: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       fileHeight: {
-        type     : INTEGER,
+        type: INTEGER,
         allowNull: false,
-        default  : 0,
+        default: 0,
       },
       fileWidth: {
-        type     : INTEGER,
+        type: INTEGER,
         allowNull: false,
-        default  : 0,
+        default: 0,
       },
       fileName: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       filePath: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       fileType: {

server/models/index.js

@@ -1,22 +1,18 @@
-const Sequelize = require('sequelize');
+import Sequelize from 'sequelize';
-const logger = require('winston');
+import logger from 'winston';
 
-const Blocked = require('./blocked');
+import Blocked from './blocked';
-const Certificate = require('./certificate');
+import Certificate from './certificate';
-const Channel = require('./channel');
+import Channel from './channel';
-const Claim = require('./claim');
+import Claim from './claim';
-const File = require('./file');
+import File from './file';
-const Metrics = require('./metrics');
+import Metrics from './metrics';
-const Tor = require('./tor');
+import Tor from './tor';
-const Trending = require('./trending');
+import Trending from './trending';
-const User = require('./user');
+import User from './user';
-const Views = require('./views');
+import Views from './views';
 
-const {
+import { database, username, password } from '@config/mysqlConfig';
-  database,
-  username,
-  password,
-} = require('@config/mysqlConfig');
 
 if (!database || !username || !password) {
   logger.warn('missing database, user, or password from mysqlConfig');
@@ -24,16 +20,16 @@ if (!database || !username || !password) {
 
 // set sequelize options
 const sequelize = new Sequelize(database, username, password, {
-  host          : 'localhost',
+  host: 'localhost',
-  dialect       : 'mysql',
+  dialect: 'mysql',
   dialectOptions: {
     decimalNumbers: true,
   },
   logging: false,
-  pool   : {
+  pool: {
-    max    : 5,
+    max: 5,
-    min    : 0,
+    min: 0,
-    idle   : 10000,
+    idle: 10000,
     acquire: 10000,
   },
   operatorsAliases: false,
@@ -77,23 +73,24 @@ db.sequelize = sequelize;
 db.Sequelize = Sequelize;
 // add an 'upsert' method to the db object
 db.upsert = (Model, values, condition, tableName) => {
-  return Model
+  return Model.findOne({
-    .findOne({
+    where: condition,
-      where: condition,
+  })
-    })
     .then(obj => {
-      if (obj) {  // update
+      if (obj) {
+        // update
         logger.debug(`updating record in db.${tableName}`);
         return obj.update(values);
-      } else {  // insert
+      } else {
+        // insert
         logger.debug(`creating record in db.${tableName}`);
         return Model.create(values);
       }
     })
-    .catch(function (error) {
+    .catch(function(error) {
       logger.error(`${tableName}.upsert error`, error);
       throw error;
     });
 };
 
-module.exports = db;
+export default db;

server/models/metrics.js

@@ -1,51 +1,51 @@
-module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
+export default (sequelize, { BOOLEAN, DATE, STRING }) => {
   const Metrics = sequelize.define(
     'Metrics',
     {
       time: {
-        type        : DATE(6),
+        type: DATE(6),
         defaultValue: sequelize.NOW,
       },
       isInternal: {
         type: BOOLEAN,
       },
       isChannel: {
-        type        : BOOLEAN,
+        type: BOOLEAN,
         defaultValue: false,
       },
       claimId: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       ip: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       request: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       userAgent: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       referrer: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       routePath: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       params: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
     },
     {
       freezeTableName: true,
-      timestamps     : false, // don't use default timestamps columns
+      timestamps: false, // don't use default timestamps columns
-      indexes        : [
+      indexes: [
         {
           fields: ['isInternal', 'isChannel', 'time', 'claimId', 'routePath'],
         },

server/models/tor.js

@@ -1,16 +1,17 @@
-const logger = require('winston');
+import logger from 'winston';
-const { details: { ipAddress } } = require('@config/siteConfig');
+import { details } from '@config/siteConfig';
+const { ipAddress } = details;
 
-module.exports = (sequelize, { STRING }) => {
+export default (sequelize, { STRING }) => {
   const Tor = sequelize.define(
     'Tor',
     {
       address: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       fingerprint: {
-        type     : STRING,
+        type: STRING,
         allowNull: true,
       },
     },
@@ -19,7 +20,7 @@ module.exports = (sequelize, { STRING }) => {
     }
   );
 
-  Tor.refreshTable = function () {
+  Tor.refreshTable = function() {
     let torList = [];
     return fetch(`https://check.torproject.org/api/bulk?ip=${ipAddress}&port=80`)
       .then(response => {
@@ -30,7 +31,7 @@ module.exports = (sequelize, { STRING }) => {
         // prep the records
         for (let i = 0; i < jsonResponse.length; i++) {
           torList.push({
-            address    : jsonResponse[i].Address,
+            address: jsonResponse[i].Address,
             fingerprint: jsonResponse[i].Fingerprint,
           });
         }
@@ -47,7 +48,7 @@ module.exports = (sequelize, { STRING }) => {
         // return the new table
         return this.findAll({
           attributes: ['address', 'fingerprint'],
-          raw       : true,
+          raw: true,
         });
       })
       .catch(error => {

server/models/trending.js

@@ -1,47 +1,48 @@
-const chainquery = require('chainquery').default;
+import chainquery from 'chainquery';
 
-module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
+export default (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
   const Trending = sequelize.define(
     'Trending',
     {
-      time: { /* TODO: Historical analysis and log roll */
+      time: {
-        type        : DATE(6),
+        /* TODO: Historical analysis and log roll */
+        type: DATE(6),
         defaultValue: sequelize.NOW,
       },
       isChannel: {
-        type        : BOOLEAN,
+        type: BOOLEAN,
         defaultValue: false,
       },
       claimId: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       publisherId: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       intervalViews: {
-        type        : INTEGER,
+        type: INTEGER,
         defaultValue: 0,
       },
       weight: {
-        type        : FLOAT,
+        type: FLOAT,
         defaultValue: 0,
       },
       zScore: {
-        type        : FLOAT,
+        type: FLOAT,
         defaultValue: 0,
       },
       pValue: {
-        type        : FLOAT,
+        type: FLOAT,
         defaultValue: 0,
       },
       // TODO: Calculate t-statistics
     },
     {
       freezeTableName: true,
-      timestamps     : false, // don't use default timestamps columns
+      timestamps: false, // don't use default timestamps columns
-      indexes        : [
+      indexes: [
         {
           fields: ['claimId'],
         },
@@ -52,16 +53,15 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
     }
   );
 
-  Trending.getTrendingWeightData = async ({
+  Trending.getTrendingWeightData = async ({ hours = 2, minutes = 0, limit = 20 } = {}) => {
-    hours = 2,
-    minutes = 0,
-    limit = 20,
-  } = {}) => {
     let time = new Date();
     time.setHours(time.getHours() - hours);
     time.setMinutes(time.getMinutes() - minutes);
 
-    const sqlTime = time.toISOString().slice(0, 19).replace('T', ' ');
+    const sqlTime = time
+      .toISOString()
+      .slice(0, 19)
+      .replace('T', ' ');
 
     const selectString = 'DISTINCT(claimId), weight';
     const whereString = `isChannel = false and time > '${sqlTime}'`;
@@ -89,7 +89,7 @@ module.exports = (sequelize, { BOOLEAN, DATE, FLOAT, INTEGER, STRING }) => {
       },
     });
 
-    return claimData.map((claimData) => {
+    return claimData.map(claimData => {
       return Object.assign(trendingClaims[claimData.claim_id], claimData.dataValues);
     });
   };

server/models/user.js

@@ -1,17 +1,17 @@
 'use strict';
-const bcrypt = require('bcrypt');
+import bcrypt from 'bcrypt';
-const logger = require('winston');
+import logger from 'winston';
 
-module.exports = (sequelize, { STRING }) => {
+export default (sequelize, { STRING }) => {
   const User = sequelize.define(
     'User',
     {
       userName: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
       password: {
-        type     : STRING,
+        type: STRING,
         allowNull: false,
       },
     },
@@ -24,11 +24,11 @@ module.exports = (sequelize, { STRING }) => {
     User.hasOne(db.Channel);
   };
 
-  User.prototype.comparePassword = function (password) {
+  User.prototype.comparePassword = function(password) {
     return bcrypt.compare(password, this.password);
   };
 
-  User.prototype.changePassword = function (newPassword) {
+  User.prototype.changePassword = function(newPassword) {
     return new Promise((resolve, reject) => {
       // generate a salt string to use for hashing
       bcrypt.genSalt((saltError, salt) => {
@@ -46,8 +46,7 @@ module.exports = (sequelize, { STRING }) => {
             return;
           }
           // replace the current password with the new hash
-          this
+          this.update({ password: hash })
-            .update({password: hash})
             .then(() => {
               resolve();
             })

server/models/utils/createClaimRecordData.js

@@ -1,44 +1,37 @@
-const db = require('../index.js');
+import db from 'server/models';
 
-const createClaimRecordDataAfterPublish = (certificateId, channelName, fileName, fileType, publishParams, publishResults) => {
+export const createClaimRecordDataAfterPublish = (
+  certificateId,
+  channelName,
+  fileName,
+  fileType,
+  publishParams,
+  publishResults
+) => {
   const {
     name,
-    metadata: {
+    metadata: { title, description, thumbnail, nsfw },
-      title,
-      description,
-      thumbnail,
-      nsfw,
-    },
     claim_address: address,
     bid: amount,
   } = publishParams;
 
-  const {
+  const { claim_id: claimId, txid, nout } = publishResults;
-    claim_id: claimId,
-    txid,
-    nout,
-  } = publishResults;
 
-  return db.Claim.getCurrentHeight()
+  return db.Claim.getCurrentHeight().then(height => {
-    .then(height => {
+    return {
-      return {
+      name,
-        name,
+      claimId,
-        claimId,
+      title,
-        title,
+      description,
-        description,
+      address,
-        address,
+      thumbnail,
-        thumbnail,
+      outpoint: `${txid}:${nout}`,
-        outpoint   : `${txid}:${nout}`,
+      height,
-        height,
+      contentType: fileType,
-        contentType: fileType,
+      nsfw,
-        nsfw,
+      amount,
-        amount,
+      certificateId,
-        certificateId,
+      channelName,
-        channelName,
+    };
-      };
+  });
-    });
-};
-
-module.exports = {
-  createClaimRecordDataAfterPublish,
 };

server/models/utils/createDatabaseIfNotExists.js

@@ -1,14 +1,15 @@
-const Sequelize = require('sequelize');
+import Sequelize from 'sequelize';
-const {database, username, password} = require('@config/mysqlConfig');
+import { database, username, password } from '@config/mysqlConfig';
 
 const createDatabaseIfNotExists = () => {
   const sequelize = new Sequelize('', username, password, {
-    dialect         : 'mysql',
+    dialect: 'mysql',
-    logging         : false,
+    logging: false,
     operatorsAliases: false,
   });
   return new Promise((resolve, reject) => {
-    sequelize.query(`CREATE DATABASE IF NOT EXISTS ${database};`)
+    sequelize
+      .query(`CREATE DATABASE IF NOT EXISTS ${database};`)
       .then(() => {
         resolve();
       })
@@ -18,4 +19,4 @@ const createDatabaseIfNotExists = () => {
   });
 };
 
-module.exports = createDatabaseIfNotExists;
+export default createDatabaseIfNotExists;

server/models/utils/createFileRecordData.js

@@ -1,22 +1,11 @@
-const getMediaDimensions = require('../../utils/getMediaDimensions.js');
+import getMediaDimensions from 'server/utils/getMediaDimensions.js';
 
-async function createFileRecordDataAfterGet (resolveResult, getResult) {
+export async function createFileRecordDataAfterGet(resolveResult, getResult) {
-  const {
+  const { name, claimId, outpoint, contentType: fileType } = resolveResult;
-    name,
-    claimId,
-    outpoint,
-    contentType: fileType,
-  } = resolveResult;
 
-  const {
+  const { file_name: fileName, download_path: filePath } = getResult;
-    file_name: fileName,
-    download_path: filePath,
-  } = getResult;
 
-  const {
+  const { height: fileHeight, width: fileWidth } = await getMediaDimensions(fileType, filePath);
-    height: fileHeight,
-    width: fileWidth,
-  } = await getMediaDimensions(fileType, filePath);
 
   return {
     name,
@@ -30,22 +19,17 @@ async function createFileRecordDataAfterGet (resolveResult, getResult) {
   };
 }
 
-async function createFileRecordDataAfterPublish (fileName, fileType, publishParams, publishResults) {
+export async function createFileRecordDataAfterPublish(
-  const {
+  fileName,
-    name,
+  fileType,
-    file_path: filePath,
+  publishParams,
-  } = publishParams;
+  publishResults
+) {
+  const { name, file_path: filePath } = publishParams;
 
-  const {
+  const { claim_id: claimId, txid, nout } = publishResults;
-    claim_id: claimId,
-    txid,
-    nout,
-  } = publishResults;
 
-  const {
+  const { height: fileHeight, width: fileWidth } = await getMediaDimensions(fileType, filePath);
-    height: fileHeight,
-    width: fileWidth,
-  } = await getMediaDimensions(fileType, filePath);
 
   return {
     name,
@@ -58,8 +42,3 @@ async function createFileRecordDataAfterPublish (fileName, fileType, publishPara
     fileType,
   };
 }
-
-module.exports = {
-  createFileRecordDataAfterGet,
-  createFileRecordDataAfterPublish,
-};

server/models/utils/returnShortId.js

@@ -16,10 +16,10 @@ const returnShortId = (claimsArray, longId) => {
     shortIdLength += 1;
     shortId = longId.substring(0, shortIdLength);
     possibleMatches = possibleMatches.filter(element => {
-      return (element.claimId && (element.claimId.substring(0, shortIdLength) === shortId));
+      return element.claimId && element.claimId.substring(0, shortIdLength) === shortId;
     });
   }
   return shortId;
 };
 
-module.exports = returnShortId;
+export default returnShortId;

server/models/utils/returnShortId.test.js

@@ -1,36 +1,36 @@
-const chai = require('chai');
+import chai from 'chai';
 const expect = chai.expect;
 
-describe('#parsePublishApiRequestBody()', function () {
+describe('#parsePublishApiRequestBody()', function() {
   const returnShortId = require('./returnShortId.js');
   let dummyClaimsArray;
   let dummyLongId;
 
-  it('should thow an error if the claimId is not in the claim list', function () {
+  it('should thow an error if the claimId is not in the claim list', function() {
     dummyClaimsArray = [
-      {claimId: 'a123456789'},
+      { claimId: 'a123456789' },
-      {claimId: 'b123456789'},
+      { claimId: 'b123456789' },
-      {claimId: 'c123456789'},
+      { claimId: 'c123456789' },
     ];
     dummyLongId = 'xxxxxxxxxx';
     expect(returnShortId.bind(this, dummyClaimsArray, dummyLongId)).to.throw();
   });
 
-  it('should return the shortest unique claim id', function () {
+  it('should return the shortest unique claim id', function() {
     dummyClaimsArray = [
-      {claimId: 'a123456789'},
+      { claimId: 'a123456789' },
-      {claimId: 'b123456789'},
+      { claimId: 'b123456789' },
-      {claimId: 'c123456789'},
+      { claimId: 'c123456789' },
     ];
     dummyLongId = 'c123456789';
     expect(returnShortId(dummyClaimsArray, dummyLongId)).to.equal('c');
   });
 
-  it('if there is a conflict between unqiue ids, it should give preference to the one with the lowest height', function () {
+  it('if there is a conflict between unqiue ids, it should give preference to the one with the lowest height', function() {
     dummyClaimsArray = [
-      {claimId: 'a123456789', height: 10},
+      { claimId: 'a123456789', height: 10 },
-      {claimId: 'ab12345678', height: 11},
+      { claimId: 'ab12345678', height: 11 },
-      {claimId: 'ab12341111', height: 12},
+      { claimId: 'ab12341111', height: 12 },
     ];
     dummyLongId = 'a123456789';
     expect(returnShortId(dummyClaimsArray, dummyLongId)).to.equal('a');

server/models/utils/trendingAnalysis.js

@@ -5,7 +5,7 @@ const MAX_P_PRECISION = Math.exp(-16); // Rought estimation of V8 precision, -16
 const MIN_P = -6.44357455534; // v8 float 0.0...0
 const MAX_P = 6.44357455534; // v8 float 1.0...0
 
-const getMean = (numArr) => {
+const getMean = numArr => {
   let total = 0;
   let length = numArr.length; // store local to reduce potential prop lookups
 
@@ -17,12 +17,10 @@ const getMean = (numArr) => {
 };
 
 const getStandardDeviation = (numArr, mean) => {
-  return Math.sqrt(numArr.reduce((sq, n) => (
+  return Math.sqrt(numArr.reduce((sq, n) => sq + Math.pow(n - mean, 2), 0) / (numArr.length - 1));
-    sq + Math.pow(n - mean, 2)
-  ), 0) / (numArr.length - 1));
 };
 
-const getInformationFromValues = (numArr) => {
+export const getInformationFromValues = numArr => {
   let mean = getMean(numArr);
 
   return {
@@ -31,9 +29,10 @@ const getInformationFromValues = (numArr) => {
   };
 };
 
-const getZScore = (value, mean, sDeviation) => (sDeviation !== 0 ? (value - mean) / sDeviation : 0);
+export const getZScore = (value, mean, sDeviation) =>
+  sDeviation !== 0 ? (value - mean) / sDeviation : 0;
 
-const getFastPValue = (zScore) => {
+export const getFastPValue = zScore => {
   if (zScore <= MIN_P) {
     return 0;
   }
@@ -47,7 +46,10 @@ const getFastPValue = (zScore) => {
   let term = 1;
 
   while (Math.abs(term) > MAX_P_PRECISION) {
-    term = ONE_DIV_SQRT_2PI * Math.pow(-1, k) * Math.pow(zScore, k) / (2 * k + 1) / Math.pow(2, k) * Math.pow(zScore, k + 1) / factorialK;
+    term =
+      (((ONE_DIV_SQRT_2PI * Math.pow(-1, k) * Math.pow(zScore, k)) / (2 * k + 1) / Math.pow(2, k)) *
+        Math.pow(zScore, k + 1)) /
+      factorialK;
     sum += term;
     k++;
     factorialK *= k;
@@ -57,11 +59,4 @@ const getFastPValue = (zScore) => {
   return sum;
 };
 
-const getWeight = (zScore, pValue) => (zScore * pValue);
+export const getWeight = (zScore, pValue) => zScore * pValue;
-
-module.exports = {
-  getInformationFromValues,
-  getZScore,
-  getFastPValue,
-  getWeight,
-};

server/models/views.js

@@ -1,32 +1,32 @@
-module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
+export default (sequelize, { BOOLEAN, DATE, STRING }) => {
   const Views = sequelize.define(
     'Views',
     {
       time: {
-        type        : DATE(6),
+        type: DATE(6),
         defaultValue: sequelize.NOW,
       },
       isChannel: {
-        type        : BOOLEAN,
+        type: BOOLEAN,
         defaultValue: false,
       },
       claimId: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       publisherId: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
       ip: {
-        type        : STRING,
+        type: STRING,
         defaultValue: null,
       },
     },
     {
       freezeTableName: true,
-      timestamps     : false, // don't use default timestamps columns
+      timestamps: false, // don't use default timestamps columns
-      indexes        : [
+      indexes: [
         {
           fields: ['time', 'isChannel', 'claimId', 'publisherId', 'ip'],
         },
@@ -34,15 +34,15 @@ module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
     }
   );
 
-  Views.getUniqueViews = ({
+  Views.getUniqueViews = ({ hours = 0, minutes = 30 } = {}) => {
-    hours = 0,
-    minutes = 30,
-  } = {}) => {
     let time = new Date();
     time.setHours(time.getHours() - hours);
     time.setMinutes(time.getMinutes() - minutes);
 
-    const sqlTime = time.toISOString().slice(0, 19).replace('T', ' ');
+    const sqlTime = time
+      .toISOString()
+      .slice(0, 19)
+      .replace('T', ' ');
 
     const selectString = 'claimId, publisherId, isChannel, COUNT(DISTINCT ip) as views';
     const groupString = 'claimId, publisherId, isChannel';
@@ -53,13 +53,13 @@ module.exports = (sequelize, { BOOLEAN, DATE, STRING }) => {
     );
   };
 
-  Views.getGetUniqueViewsbByClaimId = (claimId) => {
+  Views.getGetUniqueViewsbByClaimId = claimId => {
     return Views.count({
       where: {
         claimId,
       },
       distinct: true,
-      col     : 'ip',
+      col: 'ip',
     });
   };
 

server/render/renderFullPage.js

@@ -1,11 +1,11 @@
-const md5File = require('md5-file');
+import md5File from 'md5-file';
-const path = require('path');
+import path from 'path';
 
 const bundlePath = path.resolve('./public/bundle/bundle.js');
 const bundleHash = md5File.sync(bundlePath);
 const shortBundleHash = bundleHash.substring(0, 4);
 
-module.exports = (helmet, html, preloadedState) => {
+export default (helmet, html, preloadedState) => {
   // take the html and preloadedState and return the full page
   return `
     <!DOCTYPE html>

server/routes/api/index.js

@@ -1,65 +1,87 @@
 // middleware
-const { autoblockPublishMiddleware, autoblockPublishBodyMiddleware } = require('../../middleware/autoblockPublishMiddleware');
+import multipartMiddleware from 'server/middleware/multipartMiddleware';
-const multipartMiddleware = require('../../middleware/multipartMiddleware');
+import torCheckMiddleware from 'server/middleware/torCheckMiddleware';
-const torCheckMiddleware = require('../../middleware/torCheckMiddleware');
 // route handlers
-const channelAvailability = require('../../controllers/api/channel/availability');
+import channelAvailability from 'server/controllers/api/channel/availability';
-const channelClaims = require('../../controllers/api/channel/claims');
+import channelClaims from 'server/controllers/api/channel/claims';
-const channelData = require('../../controllers/api/channel/data');
+import channelData from 'server/controllers/api/channel/data';
-const channelShortId = require('../../controllers/api/channel/shortId');
+import channelShortId from 'server/controllers/api/channel/shortId';
-const claimAvailability = require('../../controllers/api/claim/availability');
+import claimAvailability from 'server/controllers/api/claim/availability';
-const claimData = require('../../controllers/api/claim/data/');
+import claimData from 'server/controllers/api/claim/data/';
-const claimGet = require('../../controllers/api/claim/get');
+import claimGet from 'server/controllers/api/claim/get';
-const claimList = require('../../controllers/api/claim/list');
+import claimList from 'server/controllers/api/claim/list';
-const claimLongId = require('../../controllers/api/claim/longId');
+import claimLongId from 'server/controllers/api/claim/longId';
-const claimPublish = require('../../controllers/api/claim/publish');
+import claimPublish from 'server/controllers/api/claim/publish';
-const claimAbandon = require('../../controllers/api/claim/abandon');
+import claimAbandon from 'server/controllers/api/claim/abandon';
-const claimUpdate = require('../../controllers/api/claim/update');
+import claimUpdate from 'server/controllers/api/claim/update';
-const claimResolve = require('../../controllers/api/claim/resolve');
+import claimResolve from 'server/controllers/api/claim/resolve';
-const claimShortId = require('../../controllers/api/claim/shortId');
+import claimShortId from 'server/controllers/api/claim/shortId';
-const claimViews = require('../../controllers/api/claim/views');
+import claimViews from 'server/controllers/api/claim/views';
-const fileAvailability = require('../../controllers/api/file/availability');
+import fileAvailability from 'server/controllers/api/file/availability';
-const specialClaims = require('../../controllers/api/special/claims');
+import specialClaims from 'server/controllers/api/special/claims';
-const userPassword = require('../../controllers/api/user/password');
+import userPassword from 'server/controllers/api/user/password';
-const publishingConfig = require('../../controllers/api/config/site/publishing');
+import publishingConfig from 'server/controllers/api/config/site/publishing';
-const getTorList = require('../../controllers/api/tor');
+import getTorList from 'server/controllers/api/tor';
-const getBlockedList = require('../../controllers/api/blocked');
+import getBlockedList from 'server/controllers/api/blocked';
-const getOEmbedData = require('../../controllers/api/oEmbed');
+import getOEmbedData from 'server/controllers/api/oEmbed';
+const {
+  autoblockPublishMiddleware,
+  autoblockPublishBodyMiddleware,
+} = require('server/middleware/autoblockPublishMiddleware');
 
 export default {
   // homepage routes
-  '/api/homepage/data/channels'                           : { controller: [ torCheckMiddleware, channelData ] },
+  '/api/homepage/data/channels': { controller: [torCheckMiddleware, channelData] },
   // channel routes
-  '/api/channel/availability/:name'                       : { controller: [ torCheckMiddleware, channelAvailability ] },
+  '/api/channel/availability/:name': { controller: [torCheckMiddleware, channelAvailability] },
-  '/api/channel/short-id/:longId/:name'                   : { controller: [ torCheckMiddleware, channelShortId ] },
+  '/api/channel/short-id/:longId/:name': { controller: [torCheckMiddleware, channelShortId] },
-  '/api/channel/data/:channelName/:channelClaimId'        : { controller: [ torCheckMiddleware, channelData ] },
+  '/api/channel/data/:channelName/:channelClaimId': {
-  '/api/channel/claims/:channelName/:channelClaimId/:page': { controller: [ torCheckMiddleware, channelClaims ] },
+    controller: [torCheckMiddleware, channelData],
+  },
+  '/api/channel/claims/:channelName/:channelClaimId/:page': {
+    controller: [torCheckMiddleware, channelClaims],
+  },
 
   // sepcial routes
-  '/api/special/:name/:page': { controller: [ torCheckMiddleware, specialClaims ] },
+  '/api/special/:name/:page': { controller: [torCheckMiddleware, specialClaims] },
 
   // claim routes
-  '/api/claim/availability/:name'        : { controller: [ torCheckMiddleware, claimAvailability ] },
+  '/api/claim/availability/:name': { controller: [torCheckMiddleware, claimAvailability] },
-  '/api/claim/data/:claimName/:claimId'  : { controller: [ torCheckMiddleware, claimData ] },
+  '/api/claim/data/:claimName/:claimId': { controller: [torCheckMiddleware, claimData] },
-  '/api/claim/get/:name/:claimId'        : { controller: [ torCheckMiddleware, claimGet ] },
+  '/api/claim/get/:name/:claimId': { controller: [torCheckMiddleware, claimGet] },
-  '/api/claim/list/:name'                : { controller: [ torCheckMiddleware, claimList ] },
+  '/api/claim/list/:name': { controller: [torCheckMiddleware, claimList] },
-  '/api/claim/long-id'                   : { method: 'post', controller: [ torCheckMiddleware, claimLongId ] }, // note: should be a 'get'
+  '/api/claim/long-id': { method: 'post', controller: [torCheckMiddleware, claimLongId] }, // note: should be a 'get'
-  '/api/claim/publish'                   : { method: 'post', controller: [ torCheckMiddleware, autoblockPublishMiddleware, multipartMiddleware, autoblockPublishBodyMiddleware, claimPublish ] },
+  '/api/claim/publish': {
-  '/api/claim/update'                    : { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimUpdate ] },
+    method: 'post',
-  '/api/claim/abandon'                   : { method: 'post', controller: [ torCheckMiddleware, multipartMiddleware, claimAbandon ] },
+    controller: [
-  '/api/claim/resolve/:name/:claimId'    : { controller: [ torCheckMiddleware, claimResolve ] },
+      torCheckMiddleware,
-  '/api/claim/short-id/:longId/:name'    : { controller: [ torCheckMiddleware, claimShortId ] },
+      autoblockPublishMiddleware,
-  '/api/claim/views/:claimId'            : { controller: [ torCheckMiddleware, claimViews ] },
+      multipartMiddleware,
+      autoblockPublishBodyMiddleware,
+      claimPublish,
+    ],
+  },
+  '/api/claim/update': {
+    method: 'post',
+    controller: [torCheckMiddleware, multipartMiddleware, claimUpdate],
+  },
+  '/api/claim/abandon': {
+    method: 'post',
+    controller: [torCheckMiddleware, multipartMiddleware, claimAbandon],
+  },
+  '/api/claim/resolve/:name/:claimId': { controller: [torCheckMiddleware, claimResolve] },
+  '/api/claim/short-id/:longId/:name': { controller: [torCheckMiddleware, claimShortId] },
+  '/api/claim/views/:claimId': { controller: [torCheckMiddleware, claimViews] },
   // file routes
-  '/api/file/availability/:name/:claimId': { controller: [ torCheckMiddleware, fileAvailability ] },
+  '/api/file/availability/:name/:claimId': { controller: [torCheckMiddleware, fileAvailability] },
   // user routes
-  '/api/user/password/'                  : { method: 'put', controller: [ torCheckMiddleware, userPassword ] },
+  '/api/user/password/': { method: 'put', controller: [torCheckMiddleware, userPassword] },
   // configs
-  '/api/config/site/publishing'          : { controller: [ torCheckMiddleware, publishingConfig ] },
+  '/api/config/site/publishing': { controller: [torCheckMiddleware, publishingConfig] },
   // tor
-  '/api/tor'                             : { controller: [ torCheckMiddleware, getTorList ] },
+  '/api/tor': { controller: [torCheckMiddleware, getTorList] },
   // blocked
-  '/api/blocked'                         : { controller: [ torCheckMiddleware, getBlockedList ] },
+  '/api/blocked': { controller: [torCheckMiddleware, getBlockedList] },
   // open embed
-  '/api/oembed'                          : { controller: [ torCheckMiddleware, getOEmbedData ] },
+  '/api/oembed': { controller: [torCheckMiddleware, getOEmbedData] },
 };

server/routes/assets/index.js

@@ -1,11 +1,19 @@
-const serveByClaim = require('../../controllers/assets/serveByClaim');
+import serveByClaim from 'server/controllers/assets/serveByClaim';
-const serveByIdentifierAndClaim = require('../../controllers/assets/serveByIdentifierAndClaim');
+import serveByIdentifierAndClaim from 'server/controllers/assets/serveByIdentifierAndClaim';
 
 // TODO: Adjust build & sources to use import/export everywhere
 const Actions = require('@actions').default;
 const Sagas = require('@sagas').default;
 
 export default {
-  '/:identifier/:claim': { controller: serveByIdentifierAndClaim, action: Actions.onHandleShowPageUri, saga: Sagas.handleShowPageUri },
+  '/:identifier/:claim': {
-  '/:claim'            : { controller: serveByClaim, action: Actions.onHandleShowPageUri, saga: Sagas.handleShowPageUri },
+    controller: serveByIdentifierAndClaim,
+    action: Actions.onHandleShowPageUri,
+    saga: Sagas.handleShowPageUri,
+  },
+  '/:claim': {
+    controller: serveByClaim,
+    action: Actions.onHandleShowPageUri,
+    saga: Sagas.handleShowPageUri,
+  },
 };

server/routes/auth/index.js

@@ -1,12 +1,15 @@
-const speechPassport = require('../../speechPassport');
+import speechPassport from '../../speechPassport';
-const handleSignupRequest = require('../../controllers/auth/signup');
+import handleSignupRequest from '../../controllers/auth/signup';
-const handleLoginRequest = require('../../controllers/auth/login');
+import handleLoginRequest from '../../controllers/auth/login';
-const handleLogoutRequest = require('../../controllers/auth/logout');
+import handleLogoutRequest from '../../controllers/auth/logout';
-const handleUserRequest = require('../../controllers/auth/user');
+import handleUserRequest from '../../controllers/auth/user';
 
 export default {
-  '/signup': { method: 'post', controller: [ speechPassport.authenticate('local-signup'), handleSignupRequest ] },
+  '/signup': {
-  '/auth'  : { method: 'post', controller: handleLoginRequest },
+    method: 'post',
+    controller: [speechPassport.authenticate('local-signup'), handleSignupRequest],
+  },
+  '/auth': { method: 'post', controller: handleLoginRequest },
   '/logout': { controller: handleLogoutRequest },
-  '/user'  : { controller: handleUserRequest },
+  '/user': { controller: handleUserRequest },
 };

server/routes/pages/index.js

@@ -1,21 +1,25 @@
 import handlePageRequest from '../../controllers/pages/sendReactApp';
-const handleVideoEmbedRequest = require('../../controllers/pages/sendVideoEmbedPage');
+import handleVideoEmbedRequest from '../../controllers/pages/sendVideoEmbedPage';
-const redirect = require('../../controllers/utils/redirect');
+import redirect from '../../controllers/utils/redirect';
 
 // TODO: Adjust build & sources to use import/export everywhere
 const Actions = require('@actions').default;
 const Sagas = require('@sagas').default;
 
 export default {
-  '/'                                   : { controller: handlePageRequest, action: Actions.onHandleShowHomepage, saga: Sagas.handleShowHomepage  },
+  '/': {
-  '/login'                              : { controller: handlePageRequest },
+    controller: handlePageRequest,
-  '/about'                              : { controller: handlePageRequest },
+    action: Actions.onHandleShowHomepage,
-  '/tos'                                : { controller: handlePageRequest },
+    saga: Sagas.handleShowHomepage,
-  '/faq'                                : { controller: handlePageRequest },
+  },
-  '/trending'                           : { controller: redirect('/popular') },
+  '/login': { controller: handlePageRequest },
-  '/popular'                            : { controller: handlePageRequest },
+  '/about': { controller: handlePageRequest },
-  '/new'                                : { controller: handlePageRequest },
+  '/tos': { controller: handlePageRequest },
-  '/edit/:claimId'                      : { controller: handlePageRequest },
+  '/faq': { controller: handlePageRequest },
-  '/multisite'                          : { controller: handlePageRequest },
+  '/trending': { controller: redirect('/popular') },
-  '/video-embed/:name/:claimId/:config?': { controller: handleVideoEmbedRequest },  // for twitter
+  '/popular': { controller: handlePageRequest },
+  '/new': { controller: handlePageRequest },
+  '/edit/:claimId': { controller: handlePageRequest },
+  '/multisite': { controller: handlePageRequest },
+  '/video-embed/:name/:claimId/:config?': { controller: handleVideoEmbedRequest }, // for twitter
 };

server/speechPassport/index.js

@@ -1,12 +1,12 @@
-const passport = require('passport');
+import passport from 'passport';
-const localLoginStrategy = require('./utils/local-login.js');
+import localLoginStrategy from './utils/local-login.js';
-const localSignupStrategy = require('./utils/local-signup.js');
+import localSignupStrategy from './utils/local-signup.js';
-const serializeUser = require('./utils/serializeUser.js');
+import serializeUser from './utils/serializeUser.js';
-const deserializeUser = require('./utils/deserializeUser.js');
+import deserializeUser from './utils/deserializeUser.js';
 
 passport.deserializeUser(deserializeUser);
 passport.serializeUser(serializeUser);
 passport.use('local-login', localLoginStrategy);
 passport.use('local-signup', localSignupStrategy);
 
-module.exports = passport;
+export default passport;

server/speechPassport/utils/deserializeUser.js

@@ -3,4 +3,4 @@ const deserializeUser = (user, done) => {
   done(null, user);
 };
 
-module.exports = deserializeUser;
+export default deserializeUser;

server/speechPassport/utils/local-login.js

@@ -1,15 +1,15 @@
+import db from 'server/models';
 const PassportLocalStrategy = require('passport-local').Strategy;
 const logger = require('winston');
-const db = require('../../models');
 
-const returnUserAndChannelInfo = (userInstance) => {
+const returnUserAndChannelInfo = userInstance => {
   return new Promise((resolve, reject) => {
     let userInfo = {};
     userInfo['id'] = userInstance.id;
     userInfo['userName'] = userInstance.userName;
     userInstance
       .getChannel()
-      .then(({channelName, channelClaimId}) => {
+      .then(({ channelName, channelClaimId }) => {
         userInfo['channelName'] = channelName;
         userInfo['channelClaimId'] = channelClaimId;
         return db.Certificate.getShortChannelIdFromLongChannelId(channelClaimId, channelName);
@@ -24,26 +24,26 @@ const returnUserAndChannelInfo = (userInstance) => {
   });
 };
 
-module.exports = new PassportLocalStrategy(
+const Strategy = new PassportLocalStrategy(
   {
     usernameField: 'username',
     passwordField: 'password',
   },
   (username, password, done) => {
-    return db.User
+    return db.User.findOne({
-      .findOne({
+      where: { userName: username },
-        where: {userName: username},
+    })
-      })
       .then(user => {
         if (!user) {
           logger.debug('no user found');
-          return done(null, false, {message: 'Incorrect username or password'});
+          return done(null, false, { message: 'Incorrect username or password' });
         }
-        return user.comparePassword(password)
+        return user
+          .comparePassword(password)
           .then(isMatch => {
             if (!isMatch) {
               logger.debug('incorrect password');
-              return done(null, false, {message: 'Incorrect username or password'});
+              return done(null, false, { message: 'Incorrect username or password' });
             }
             logger.debug('Password was a match, returning User');
             return returnUserAndChannelInfo(user)
@@ -63,3 +63,5 @@ module.exports = new PassportLocalStrategy(
       });
   }
 );
+
+export default Strategy;

server/speechPassport/utils/local-signup.js

@@ -1,10 +1,12 @@
+import { createChannel } from 'server/lbrynet';
 const PassportLocalStrategy = require('passport-local').Strategy;
-const { createChannel } = require('../../lbrynet');
 const logger = require('winston');
-const db = require('../../models');
+const db = require('server/models');
-const { publishing: { closedRegistration } } = require('@config/siteConfig');
+const {
+  publishing: { closedRegistration },
+} = require('@config/siteConfig');
 
-module.exports = new PassportLocalStrategy(
+const Strategy = new PassportLocalStrategy(
   {
     usernameField: 'username',
     passwordField: 'password',
@@ -28,19 +30,23 @@ module.exports = new PassportLocalStrategy(
         logger.verbose('userData >', userData);
         // create user record
         const channelData = {
-          channelName   : `@${username}`,
+          channelName: `@${username}`,
           channelClaimId: tx.claim_id,
         };
         logger.verbose('channelData >', channelData);
         // create certificate record
         const certificateData = {
           claimId: tx.claim_id,
-          name   : `@${username}`,
+          name: `@${username}`,
           // address,
         };
         logger.verbose('certificateData >', certificateData);
         // save user and certificate to db
-        return Promise.all([db.User.create(userData), db.Channel.create(channelData), db.Certificate.create(certificateData)]);
+        return Promise.all([
+          db.User.create(userData),
+          db.Channel.create(channelData),
+          db.Certificate.create(certificateData),
+        ]);
       })
       .then(([newUser, newChannel, newCertificate]) => {
         logger.verbose('user and certificate successfully created');
@@ -54,7 +60,10 @@ module.exports = new PassportLocalStrategy(
       })
       .then(() => {
         logger.verbose('user and certificate successfully associated');
-        return db.Certificate.getShortChannelIdFromLongChannelId(userInfo.channelClaimId, userInfo.channelName);
+        return db.Certificate.getShortChannelIdFromLongChannelId(
+          userInfo.channelClaimId,
+          userInfo.channelName
+        );
       })
       .then(shortChannelId => {
         userInfo['shortChannelId'] = shortChannelId;
@@ -66,3 +75,4 @@ module.exports = new PassportLocalStrategy(
       });
   }
 );
+export default Strategy;

server/speechPassport/utils/serializeUser.js

@@ -3,4 +3,4 @@ const serializeUser = (user, done) => {
   done(null, user);
 };
 
-module.exports = serializeUser;
+export default serializeUser;

server/task-scripts/update-channel-names.js

@@ -1,17 +1,18 @@
 // load dependencies
-const logger = require('winston');
+import logger from 'winston';
-const db = require('../models');
+import db from 'server/models';
 require('../helpers/configureLogger.js')(logger);
 
 let totalClaims = 0;
 let totalClaimsNoCertificate = 0;
 
-db.sequelize.sync() // sync sequelize
+db.sequelize
+  .sync() // sync sequelize
   .then(() => {
     logger.info('finding claims with no channels');
     return db.Claim.findAll({
       where: {
-        channelName  : null,
+        channelName: null,
         certificateId: {
           $ne: null,
         },
@@ -21,10 +22,9 @@ db.sequelize.sync() // sync sequelize
   .then(claimsArray => {
     totalClaims = claimsArray.length;
     const claimsUpdatePromises = claimsArray.map(claim => {
-      return db.Certificate
+      return db.Certificate.findOne({
-        .findOne({
+        where: { claimId: claim.get('certificateId') },
-          where: { claimId: claim.get('certificateId') },
+      })
-        })
         .then(certificate => {
           // if a certificate is found...
           if (certificate) {
@@ -49,6 +49,6 @@ db.sequelize.sync() // sync sequelize
     logger.info('total claims found with no matching certificate record', totalClaimsNoCertificate);
     logger.debug('all done');
   })
-  .catch((error) => {
+  .catch(error => {
     logger.error(error);
   });