finished /claim/claimId serve local first

controllers/serveController.js

@@ -19,6 +19,61 @@ function getClaimAndHandleResponse (claimUri, resolve, reject) {
     });
 }
 
+function resolveAndUpdateIfNeeded (uri, claimName, claimId, outpoint) {
+  logger.debug('initiating resolve on local record to check outpoint');
+  // 1. resolve claim
+  lbryApi
+    .resolveUri(uri)
+    .then(result => {
+      // logger.debug('resolved result:', result);
+      const resolvedOutpoint = `${result[uri].claim.txid}:${result[uri].claim.nout}`;
+      logger.debug('database outpoint:', outpoint);
+      logger.debug('resolved outpoint:', resolvedOutpoint);
+      // 2. if the outpoint's match, no further work needed
+      if (outpoint === resolvedOutpoint) {
+        logger.debug(`local outpoint matched`);
+      // 2. if the outpoints don't match, get claim and update records
+      } else {
+        logger.debug(`local outpoint did not match for ${uri}.  Initiating update.`);
+        getClaimAndUpdate(uri, claimName, claimId);
+      }
+    })
+    .catch(error => {
+      logger.error(`error resolving ${uri}`, error);
+    });
+}
+
+function getClaimAndUpdate (uri, claimName, claimId) {
+  // 1. get the claim
+  lbryApi
+    .getClaim(uri)
+    .then(({ outpoint, file_name, download_path, mime_type }) => {
+      logger.debug('getClaim outpoint', outpoint);
+      // 2. update the entry in db
+      db.File
+        .update({
+          outpoint: outpoint,
+          fileName: file_name,
+          filePath: download_path,
+          fileType: mime_type,
+        }, {
+          where: {
+            name   : claimName,
+            claimId: claimId,
+          },
+        })
+        .then(result => {
+          logger.debug('successfully updated mysql record', result);
+        })
+        .catch(error => {
+          logger.error('sequelize error', error);
+        });
+    })
+    .catch(error => {
+      logger.error(`error while getting claim for ${uri}`, error);
+    });
+}
+
 module.exports = {
   getClaimByName (claimName) {
     const deferred = new Promise((resolve, reject) => {
@@ -51,6 +106,7 @@ module.exports = {
               }
             })
             .catch(error => {
+              logger.error('sequelize error', error);
               reject(error);
             });
         })
@@ -63,39 +119,35 @@ module.exports = {
   getClaimByClaimId (claimName, claimId) {
     const deferred = new Promise((resolve, reject) => {
       const uri = `${claimName}#${claimId}`;
-      // resolve the Uri
-      lbryApi
-        .resolveUri(uri) // note: use 'spread' and make parallel with db.File.findOne()
-        .then(result => {
-          const resolvedOutpoint = `${result[uri].claim.txid}:${result[uri].claim.nout}`;
-          // check locally for the claim
-          db.File
-            .findOne({ where: { name: claimName, claimId: claimId } })
-            .then(claim => {
-              // if a found locally...
-              if (claim) {
-                logger.debug(`A mysql record was found for ${claimId}`);
-                // if the outpoint's match return it
-                if (claim.dataValues.outpoint === resolvedOutpoint) {
-                  logger.debug(`local outpoint matched for ${claimId}`);
-                  resolve(claim.dataValues);
-                  // if the outpoint's don't match, fetch updated claim
-                } else {
-                  logger.debug(`local outpoint did not match for ${claimId}`);
-                  getClaimAndHandleResponse(uri, resolve, reject);
-                }
-                // ... otherwise use daemon to retrieve it
-              } else {
+      // 1. check locally for the claim
+      db.File
+        .findOne({ where: { name: claimName, claimId: claimId } })
+        .then(claim => {
+          // 2. if a found locally, serve
+          if (claim) {
+            logger.debug(`A mysql record was found for ${claimId}`);
+            // trigger an update if needed
+            resolveAndUpdateIfNeeded(uri, claimName, claimId, claim.dataValues.outpoint);  // ok to just start asynch function, or need to add to a task cue?
+            // resolve and send
+            resolve(claim.dataValues);
+          // 2. otherwise use daemon to retrieve it
+          } else {
+            // 3. resolve the Uri
+            lbryApi
+              .resolveUri(uri)
+              .then(result => {
+                // 4. check to see if the claim is free & public
                 if (isFreePublicClaim(result[uri].claim)) {
+                  // 5. get claim and serve
                   getClaimAndHandleResponse(uri, resolve, reject);
                 } else {
                   reject('NO_FREE_PUBLIC_CLAIMS');
                 }
-              }
-            })
-            .catch(error => {
-              reject(error);
-            });
+              })
+              .catch(error => {
+                reject(error);
+              });
+          }
         })
         .catch(error => {
           reject(error);