Added support for graceful recovery of failing search initialization on file:// protocol

material/assets/manifest.json

@@ -1,6 +1,6 @@
 {
-  "assets/javascripts/bundle.js": "assets/javascripts/bundle.c51f1a8c.min.js",
+  "assets/javascripts/bundle.js": "assets/javascripts/bundle.f593c2a5.min.js",
-  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.c51f1a8c.min.js.map",
+  "assets/javascripts/bundle.js.map": "assets/javascripts/bundle.f593c2a5.min.js.map",
   "assets/javascripts/vendor.js": "assets/javascripts/vendor.ff4ef43d.min.js",
   "assets/javascripts/vendor.js.map": "assets/javascripts/vendor.ff4ef43d.min.js.map",
   "assets/javascripts/worker/search.js": "assets/javascripts/worker/search.58d22e8e.min.js",

material/base.html

@@ -179,7 +179,7 @@
     </div>
     {% block scripts %}
       <script src="{{ 'assets/javascripts/vendor.ff4ef43d.min.js' | url }}"></script>
-      <script src="{{ 'assets/javascripts/bundle.c51f1a8c.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.f593c2a5.min.js' | url }}"></script>
       {%- set translations = {} -%}
       {%- for key in [
         "clipboard.copy",

src/assets/javascripts/index.ts

@@ -30,7 +30,10 @@ import {
   combineLatest,
   animationFrameScheduler,
   fromEvent,
-  from
+  from,
+  defer,
+  of,
+  NEVER
 } from "rxjs"
 import { ajax } from "rxjs/ajax"
 import {
@@ -42,7 +45,8 @@ import {
   observeOn,
   take,
   shareReplay,
-  pluck
+  pluck,
+  catchError
 } from "rxjs/operators"
 
 import {
@@ -228,7 +232,8 @@ export function initialize(config: unknown) {
 
   /* ----------------------------------------------------------------------- */
 
-  // External index
+  /* Search worker */
+  const worker$ = defer(() => {
     const index = config.search && config.search.index
       ? config.search.index
       : undefined
@@ -249,13 +254,18 @@ export function initialize(config: unknown) {
             )
           )
 
-  const worker = setupSearchWorker(config.search.worker, {
+    return of(setupSearchWorker(config.search.worker, {
       base$, index$
+    }))
   })
 
   /* ----------------------------------------------------------------------- */
 
   /* Mount search query */
+  const search$ = worker$
+    .pipe(
+      switchMap(worker => {
+
         const query$ = useComponent("search-query")
           .pipe(
             mountSearchQuery(worker, { transform: config.search.transform }),
@@ -276,13 +286,14 @@ export function initialize(config: unknown) {
             shareReplay(1)
           )
 
-  /* ----------------------------------------------------------------------- */
+        return useComponent("search")
-
-  const search$ = useComponent("search")
           .pipe(
             mountSearch(worker, { query$, reset$, result$ }),
             shareReplay(1)
           )
+      }),
+      catchError(() => NEVER)
+    )
 
   /* ----------------------------------------------------------------------- */