From 80aaaea402ac536c8efc3ab40c6b89a2abae58f0 Mon Sep 17 00:00:00 2001
From: ryanhamley <ryan.hamley@mapbox.com>
Date: Wed, 1 Apr 2020 16:52:22 -0700
Subject: [PATCH 1/3] Allow client to retry RTLTextPlugin load after
 NetworkError

---
 debug/rtl.html                | 16 ++++++++++++----
 src/source/rtl_text_plugin.js |  7 +++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/debug/rtl.html b/debug/rtl.html
index 162eeb500f0..1a24ef2b705 100644
--- a/debug/rtl.html
+++ b/debug/rtl.html
@@ -30,7 +30,8 @@
 <script src='/dist/mapbox-gl-dev.js'></script>
 <script src='/debug/access_token_generated.js'></script>
 <script>
-var pluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js';
+var badPluginURL = 'http://localhost:9966/debug/2762.html';
+var goodPluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js'
 var map = window.map = new mapboxgl.Map({
     container: 'map',
     zoom: 16.5,
@@ -40,13 +41,20 @@
 });
 
 document.getElementById('loadSync').onclick = function() {
-    mapboxgl.setRTLTextPlugin(pluginURL);
+    mapboxgl.setRTLTextPlugin(goodPluginURL);
 };
 
 document.getElementById('loadAsync').onclick = function() {
-    mapboxgl.setRTLTextPlugin(pluginURL, function(err) {
+    mapboxgl.setRTLTextPlugin(badPluginURL, function(err) {
         if (err) {
-            throw err;
+            mapboxgl.setRTLTextPlugin(goodPluginURL, function (err) {
+                if (err) {
+                    throw err;
+                }
+                else {
+                    console.log('rtl-text-plugin retry loaded successfully');
+                }
+            })
         } else {
             console.log('rtl-text-plugin loaded successfully');
         }
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
index 6ff9f033c0e..60e6ee2fff1 100644
--- a/src/source/rtl_text_plugin.js
+++ b/src/source/rtl_text_plugin.js
@@ -28,6 +28,13 @@ let pluginStatus = status.unavailable;
 let pluginURL = null;
 
 export const triggerPluginCompletionEvent = function(error: ?Error) {
+    // allow plugin loading to be retried if a NetworkError is encountered
+    // the error is a string because it's serialized from the worker so we
+    // have to search the string rather than check the error code
+    if (error && error.indexOf('NetworkError') > -1) {
+        pluginStatus = status.error;
+    }
+
     if (_completionCallback) {
         _completionCallback(error);
     }

From 995584aa3df1d0b0c927b84aa8e73ea34caf38b4 Mon Sep 17 00:00:00 2001
From: ryanhamley <ryan.hamley@mapbox.com>
Date: Wed, 1 Apr 2020 17:16:56 -0700
Subject: [PATCH 2/3] Fix Flow & Lint errors

---
 debug/rtl.html                | 7 +++----
 src/source/rtl_text_plugin.js | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debug/rtl.html b/debug/rtl.html
index 1a24ef2b705..df1819d4797 100644
--- a/debug/rtl.html
+++ b/debug/rtl.html
@@ -31,7 +31,7 @@
 <script src='/debug/access_token_generated.js'></script>
 <script>
 var badPluginURL = 'http://localhost:9966/debug/2762.html';
-var goodPluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js'
+var goodPluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js';
 var map = window.map = new mapboxgl.Map({
     container: 'map',
     zoom: 16.5,
@@ -50,11 +50,10 @@
             mapboxgl.setRTLTextPlugin(goodPluginURL, function (err) {
                 if (err) {
                     throw err;
-                }
-                else {
+                } else {
                     console.log('rtl-text-plugin retry loaded successfully');
                 }
-            })
+            });
         } else {
             console.log('rtl-text-plugin loaded successfully');
         }
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
index 60e6ee2fff1..dc0e178a1f6 100644
--- a/src/source/rtl_text_plugin.js
+++ b/src/source/rtl_text_plugin.js
@@ -31,7 +31,7 @@ export const triggerPluginCompletionEvent = function(error: ?Error) {
     // allow plugin loading to be retried if a NetworkError is encountered
     // the error is a string because it's serialized from the worker so we
     // have to search the string rather than check the error code
-    if (error && error.indexOf('NetworkError') > -1) {
+    if (error && typeof error === 'string' && error.indexOf('NetworkError') > -1) {
         pluginStatus = status.error;
     }
 

From c309c2d38035aa29de15a1847b034683ac031633 Mon Sep 17 00:00:00 2001
From: ryanhamley <ryan.hamley@mapbox.com>
Date: Thu, 2 Apr 2020 13:28:32 -0700
Subject: [PATCH 3/3] Update comments

---
 debug/rtl.html                | 1 +
 src/source/rtl_text_plugin.js | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debug/rtl.html b/debug/rtl.html
index df1819d4797..f39e4c61b58 100644
--- a/debug/rtl.html
+++ b/debug/rtl.html
@@ -30,6 +30,7 @@
 <script src='/dist/mapbox-gl-dev.js'></script>
 <script src='/debug/access_token_generated.js'></script>
 <script>
+// badPluginURL allows us to simulate a NetworkError that we can recover from by retrying plugin loading
 var badPluginURL = 'http://localhost:9966/debug/2762.html';
 var goodPluginURL = 'https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js';
 var map = window.map = new mapboxgl.Map({
diff --git a/src/source/rtl_text_plugin.js b/src/source/rtl_text_plugin.js
index dc0e178a1f6..1d1e6888b0e 100644
--- a/src/source/rtl_text_plugin.js
+++ b/src/source/rtl_text_plugin.js
@@ -28,9 +28,7 @@ let pluginStatus = status.unavailable;
 let pluginURL = null;
 
 export const triggerPluginCompletionEvent = function(error: ?Error) {
-    // allow plugin loading to be retried if a NetworkError is encountered
-    // the error is a string because it's serialized from the worker so we
-    // have to search the string rather than check the error code
+    // NetworkError's are not correctly reflected by the plugin status which prevents reloading plugin
     if (error && typeof error === 'string' && error.indexOf('NetworkError') > -1) {
         pluginStatus = status.error;
     }