client/src/sagas/show_uri.js

@@ -3,7 +3,7 @@ import * as actions from '../constants/show_action_types';
 import { onRequestError, onNewChannelRequest, onNewAssetRequest } from '../actions/show';
 import { newAssetRequest } from '../sagas/show_asset';
 import { newChannelRequest } from '../sagas/show_channel';
-import lbryUri from '../utils/lbryUri';
+import lbryUri from '../../../utils/lbryUri';
 
 function * parseAndUpdateIdentifierAndClaim (modifier, claim) {
   // this is a request for an asset

client/src/utils/lbryUri.js

@@ -1,85 +0,0 @@
-module.exports = {
-  REGEXP_INVALID_CLAIM  : /[^A-Za-z0-9-]/g,
-  REGEXP_INVALID_CHANNEL: /[^A-Za-z0-9-@]/g,
-  REGEXP_ADDRESS        : /^b(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$/,
-  CHANNEL_CHAR          : '@',
-  parseIdentifier       : function (identifier) {
-    const componentsRegex = new RegExp(
-      '([^:$#/]*)' + // value (stops at the first separator or end)
-      '([:$#]?)([^/]*)' // modifier separator, modifier (stops at the first path separator or end)
-    );
-    const [proto, value, modifierSeperator, modifier] = componentsRegex  // eslint-disable-line no-unused-vars
-      .exec(identifier)
-      .map(match => match || null);
-
-    // Validate and process name
-    if (!value) {
-      throw new Error(`Check your URL.  No channel name provided before "${modifierSeperator}"`);
-    }
-    const isChannel = value.startsWith(module.exports.CHANNEL_CHAR);
-    const channelName = isChannel ? value : null;
-    let claimId;
-    if (isChannel) {
-      if (!channelName) {
-        throw new Error('Check your URL.  No channel name after "@".');
-      }
-      const nameBadChars = (channelName).match(module.exports.REGEXP_INVALID_CHANNEL);
-      if (nameBadChars) {
-        throw new Error(`Check your URL.  Invalid characters in channel name: "${nameBadChars.join(', ')}".`);
-      }
-    } else {
-      claimId = value;
-    }
-
-    // Validate and process modifier
-    let channelClaimId;
-    if (modifierSeperator) {
-      if (!modifier) {
-        throw new Error(`Check your URL.  No modifier provided after separator "${modifierSeperator}"`);
-      }
-
-      if (modifierSeperator === ':') {
-        channelClaimId = modifier;
-      } else {
-        throw new Error(`Check your URL.  The "${modifierSeperator}" modifier is not currently supported`);
-      }
-    }
-    return {
-      isChannel,
-      channelName,
-      channelClaimId: channelClaimId || null,
-      claimId       : claimId || null,
-    };
-  },
-  parseClaim: function (name) {
-    const componentsRegex = new RegExp(
-      '([^:$#/.]*)' + // name (stops at the first extension)
-      '([:$#.]?)([^/]*)' // extension separator, extension (stops at the first path separator or end)
-    );
-    const [proto, claimName, extensionSeperator, extension] = componentsRegex // eslint-disable-line no-unused-vars
-      .exec(name)
-      .map(match => match || null);
-
-    // Validate and process name
-    if (!claimName) {
-      throw new Error('Check your URL.  No claim name provided before "."');
-    }
-    const nameBadChars = (claimName).match(module.exports.REGEXP_INVALID_CLAIM);
-    if (nameBadChars) {
-      throw new Error(`Check your URL.  Invalid characters in claim name: "${nameBadChars.join(', ')}".`);
-    }
-    // Validate and process extension
-    if (extensionSeperator) {
-      if (!extension) {
-        throw new Error(`Check your URL.  No file extension provided after separator "${extensionSeperator}".`);
-      }
-      if (extensionSeperator !== '.') {
-        throw new Error(`Check your URL.  The "${extensionSeperator}" separator is not supported in the claim name.`);
-      }
-    }
-    return {
-      claimName,
-      extension: extension || null,
-    };
-  },
-};

server/controllers/api/oEmbed/index.js

@@ -1,5 +1,5 @@
 const logger = require('winston');
-const lbryUri = require('../../utils/lbryUri');
+const lbryUri = require('../../../../utils/lbryUri');
 
 const getOEmbedDataForChannel = require('./getOEmbedDataForChannel');
 const getOEmbedDataForAsset = require('./getOEmbedDataForAsset');

server/controllers/assets/serveByClaim/index.js

@@ -3,7 +3,7 @@ const logger = require('winston');
 const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
 const handleShowRender = require('../../../render/build/handleShowRender.js');
 
-const lbryUri = require('../../utils/lbryUri.js');
+const lbryUri = require('../../../../utils/lbryUri.js');
 
 const determineRequestType = require('../utils/determineRequestType.js');
 const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');

server/controllers/assets/serveByIdentifierAndClaim/index.js

@@ -3,7 +3,7 @@ const logger = require('winston');
 const { sendGAServeEvent } = require('../../../utils/googleAnalytics');
 const handleShowRender = require('../../../render/build/handleShowRender.js');
 
-const lbryUri = require('../../utils/lbryUri.js');
+const lbryUri = require('../../../../utils/lbryUri.js');
 
 const determineRequestType = require('../utils/determineRequestType.js');
 const getClaimIdAndServeAsset = require('../utils/getClaimIdAndServeAsset.js');

utils/lbryUri.js

@@ -1,20 +1,16 @@
-const logger = require('winston');
-
 module.exports = {
   REGEXP_INVALID_CLAIM  : /[^A-Za-z0-9-]/g,
   REGEXP_INVALID_CHANNEL: /[^A-Za-z0-9-@]/g,
   REGEXP_ADDRESS        : /^b(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$/,
   CHANNEL_CHAR          : '@',
   parseIdentifier       : function (identifier) {
-    logger.debug('parsing identifier:', identifier);
     const componentsRegex = new RegExp(
       '([^:$#/]*)' + // value (stops at the first separator or end)
       '([:$#]?)([^/]*)' // modifier separator, modifier (stops at the first path separator or end)
     );
-    const [proto, value, modifierSeperator, modifier] = componentsRegex
+    const [, value, modifierSeperator, modifier] = componentsRegex
       .exec(identifier)
       .map(match => match || null);
-    logger.debug(`${proto}, ${value}, ${modifierSeperator}, ${modifier}`);
 
     // Validate and process name
     if (!value) {
@@ -56,15 +52,13 @@ module.exports = {
     };
   },
   parseClaim: function (claim) {
-    logger.debug('parsing name:', claim);
     const componentsRegex = new RegExp(
       '([^:$#/.]*)' + // name (stops at the first modifier)
       '([:$#.]?)([^/]*)' // modifier separator, modifier (stops at the first path separator or end)
     );
-    const [proto, claimName, modifierSeperator, modifier] = componentsRegex
+    const [, claimName, modifierSeperator, modifier] = componentsRegex
       .exec(claim)
       .map(match => match || null);
-    logger.debug(`${proto}, ${claimName}, ${modifierSeperator}, ${modifier}`);
 
     // Validate and process name
     if (!claimName) {
@@ -86,18 +80,18 @@ module.exports = {
     // return results
     return {
       claimName,
+      extension: modifier || null,
     };
   },
   parseModifier: function (claim) {
-    logger.debug('parsing modifier:', claim);
     const componentsRegex = new RegExp(
       '([^:$#/.]*)' + // name (stops at the first modifier)
       '([:$#.]?)([^/]*)' // modifier separator, modifier (stops at the first path separator or end)
     );
-    const [proto, claimName, modifierSeperator, modifier] = componentsRegex
+    const [ , , modifierSeperator ] = componentsRegex
       .exec(claim)
       .map(match => match || null);
-    logger.debug(`${proto}, ${claimName}, ${modifierSeperator}, ${modifier}`);
+
     // Validate and process modifier
     let hasFileExtension = false;
     if (modifierSeperator) {