1 files changed, 3 insertions, 31 deletions
diff --git a/platform/node/src/node_file_source.hpp b/platform/node/src/node_file_source.hpp
index dc1d06a3b0..4234b791ae 100644
--- a/platform/node/src/node_file_source.hpp
+++ b/platform/node/src/node_file_source.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mbgl/storage/file_source.hpp>
+#include <mbgl/util/run_loop.hpp>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -9,47 +10,18 @@
 #include <nan.h>
 #pragma GCC diagnostic pop
 
-#include <memory>
-#include <mutex>
-#include <unordered_map>
-
 namespace node_mbgl {
 
-namespace util { template <typename T> class AsyncQueue; }
-
 class NodeFileSource : public mbgl::FileSource {
 public:
     NodeFileSource(v8::Local<v8::Object>);
     ~NodeFileSource();
 
-    mbgl::Request* request(const mbgl::Resource&, Callback);
-    void cancel(mbgl::Request*);
-
-    // visiblity?
-    void notify(const mbgl::Resource&, const std::shared_ptr<const mbgl::Response>&);
+    std::unique_ptr<mbgl::FileRequest> request(const mbgl::Resource&, Callback);
 
 private:
-    struct Action;
-    using Queue = util::AsyncQueue<Action>;
-
-    void processAdd(const mbgl::Resource&);
-    void processCancel(const mbgl::Resource&);
-
     Nan::Persistent<v8::Object> options;
-
-private:
-    std::unordered_map<mbgl::Resource, Nan::Persistent<v8::Object>, mbgl::Resource::Hash> pending;
-
-    // The observers list will hold pointers to all the requests waiting
-    // for a particular resource. The access must be guarded by a mutex
-    // because the list is also accessed by a thread from the mbgl::Map
-    // object and from the main thread when notifying requests of
-    // completion. Concurrent access is specially needed when
-    // canceling a request to avoid a deadlock (see #129).
-    std::unordered_map<mbgl::Resource, mbgl::Request*, mbgl::Resource::Hash> observers;
-    std::mutex observersMutex;
-
-    Queue *queue = nullptr;
+    mbgl::util::RunLoop nodeLoop;
 };
 
 }