From b09f2970fc8dadb22630faeff60edc5b58dc39a9 Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Mon, 25 Mar 2019 17:44:18 +1100
Subject: [PATCH] Move NotFoundError to errors.js

---
 js/modules/loki_fetch.js       |  3 +++
 js/modules/loki_message_api.js | 11 ++---------
 libtextsecure/errors.js        | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/js/modules/loki_fetch.js b/js/modules/loki_fetch.js
index dcb2beac4..353992631 100644
--- a/js/modules/loki_fetch.js
+++ b/js/modules/loki_fetch.js
@@ -65,6 +65,9 @@ const fetch = async (url, options = {}) => {
 
     return result;
   } catch (e) {
+    if (e.code === 'ENOTFOUND') {
+      throw new textsecure.NotFoundError('Failed to resolve address', e);
+    }
     throw e;
   }
 };
diff --git a/js/modules/loki_message_api.js b/js/modules/loki_message_api.js
index 2a15beac7..c4953058a 100644
--- a/js/modules/loki_message_api.js
+++ b/js/modules/loki_message_api.js
@@ -5,13 +5,6 @@
 const _ = require('lodash');
 const { rpc } = require('./loki_fetch');
 
-class NotFoundError extends Error {
-  constructor() {
-    super('ENOTFOUND');
-    this.name = 'NotFoundError';
-  }
-}
-
 // Will be raised (to 3?) when we get more nodes
 const MINIMUM_SUCCESSFUL_REQUESTS = 2;
 
@@ -103,7 +96,7 @@ class LokiMessageAPI {
         successfulRequests += 1;
       } catch (e) {
         log.warn('Loki send message:', e);
-        if (e instanceof NotFoundError) {
+        if (e instanceof textsecure.NotFoundError) {
           canResolve = false;
         } else if (e instanceof textsecure.HTTPError) {
           // We mark the node as complete as we could still reach it
@@ -193,7 +186,7 @@ class LokiMessageAPI {
         successfulRequests += 1;
       } catch (e) {
         log.warn('Loki retrieve messages:', e);
-        if (e instanceof NotFoundError) {
+        if (e instanceof textsecure.NotFoundError) {
           canResolve = false;
         } else if (e instanceof textsecure.HTTPError) {
           // We mark the node as complete as we could still reach it
diff --git a/libtextsecure/errors.js b/libtextsecure/errors.js
index 8a30f35d5..f3be62b07 100644
--- a/libtextsecure/errors.js
+++ b/libtextsecure/errors.js
@@ -179,6 +179,22 @@
     appendStack(this, resolutionError);
   }
 
+  function NotFoundError(message, error) {
+    this.name = 'NotFoundError';
+    this.message = message;
+    this.error = error;
+
+    Error.call(this, message);
+
+    // Maintains proper stack trace, where our error was thrown (only available on V8)
+    //   via https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this);
+    }
+
+    appendStack(this, error);
+  }
+
   function HTTPError(message, response) {
     this.name = 'HTTPError';
     this.message = `${response.status} Error: ${message}`;
@@ -206,4 +222,5 @@
   window.textsecure.DNSResolutionError = DNSResolutionError;
   window.textsecure.LokiIpError = LokiIpError;
   window.textsecure.HTTPError = HTTPError;
+  window.textsecure.NotFoundError = NotFoundError;
 })();