Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

Added timeout handling for pqueue (#6293)

christof-wittreich5d016a63f53d
diff --git a/web/js/components/animation-widget/play-queue.js b/web/js/components/animation-widget/play-queue.js
index 3da6b9dc2..90e9b0bdb 100644
--- a/web/js/components/animation-widget/play-queue.js
+++ b/web/js/components/animation-widget/play-queue.js
@@ -2,7 +2,7 @@
import React from 'react';
import PropTypes from 'prop-types';
// eslint-disable-next-line import/no-unresolved
-import PQueue from 'p-queue';
+import PQueue, { TimeoutError } from 'p-queue';
import { Progress } from 'reactstrap';
import LoadingIndicator from './loading-indicator';
import util from '../../util/util';
@@ -304,26 +304,32 @@ class PlayQueue extends React.Component {
this.inQueueObject[strDate] = date;
this.bufferArray.push(strDate);
- await this.queue.add(async () => {
- const startTime = Date.now();
- await promiseImageryForTime(date);
- const elapsedTime = Date.now() - startTime;
- const fetchTime = elapsedTime >= MIN_REQUEST_TIME_MS ? elapsedTime : MIN_REQUEST_TIME_MS;
- this.fetchTimes.push(fetchTime);
- this.setState({ loadedItems: loadedItems += 1 });
+ try {
+ await this.queue.add(async () => {
+ const startTime = Date.now();
+ await promiseImageryForTime(date);
+ const elapsedTime = Date.now() - startTime;
+ const fetchTime = elapsedTime >= MIN_REQUEST_TIME_MS ? elapsedTime : MIN_REQUEST_TIME_MS;
+ this.fetchTimes.push(fetchTime);
+ this.setState({ loadedItems: loadedItems += 1 });
- if (!this.mounted) return;
- this.bufferObject[strDate] = strDate;
- delete this.inQueueObject[strDate];
- const currentBufferSize = util.objectLength(this.bufferObject);
+ if (!this.mounted) return;
+ this.bufferObject[strDate] = strDate;
+ delete this.inQueueObject[strDate];
+ const currentBufferSize = util.objectLength(this.bufferObject);
- if (!initialLoad || this.canPreloadAll || currentBufferSize >= this.initialBufferSize) {
- this.checkQueue();
- this.checkShouldPlay();
- }
+ if (!initialLoad || this.canPreloadAll || currentBufferSize >= this.initialBufferSize) {
+ this.checkQueue();
+ this.checkShouldPlay();
+ }
- return strDate;
- });
+ return strDate;
+ });
+ } catch (error) {
+ if (error instanceof TimeoutError) {
+ console.error('Imagery loading timed out after 3 seconds');
+ }
+ }
}
play() {