aboutsummaryrefslogtreecommitdiff
path: root/webAO
diff options
context:
space:
mode:
Diffstat (limited to 'webAO')
-rw-r--r--webAO/client.js34
-rw-r--r--webAO/services/request.js34
-rw-r--r--webAO/utils/getAnimLength.js1
3 files changed, 35 insertions, 34 deletions
diff --git a/webAO/client.js b/webAO/client.js
index a0dd895..835d8d2 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -2650,40 +2650,6 @@ export function opusCheck(channel) {
window.opusCheck = opusCheck;
/**
- * Make a GET request for a specific URI.
- * @param {string} url the URI to be requested
- * @returns response data
- * @throws {Error} if status code is not 2xx, or a network error occurs
- */
-async function requestBuffer(url) {
- return new Promise((resolve, reject) => {
- const xhr = new XMLHttpRequest();
- xhr.responseType = 'arraybuffer';
- xhr.addEventListener('error', () => {
- const err = new Error(`Request for ${url} failed: ${xhr.statusText}`);
- err.code = xhr.status;
- reject(err);
- });
- xhr.addEventListener('abort', () => {
- const err = new Error(`Request for ${url} was aborted!`);
- err.code = xhr.status;
- reject(err);
- });
- xhr.addEventListener('load', () => {
- if (xhr.status < 200 || xhr.status >= 300) {
- const err = new Error(`Request for ${url} failed with status code ${xhr.status}`);
- err.code = xhr.status;
- reject(err);
- } else {
- resolve(xhr.response);
- }
- });
- xhr.open('GET', url, true);
- xhr.send();
- });
-}
-
-/**
* Triggered when the reconnect button is pushed.
*/
export function ReconnectButton() {
diff --git a/webAO/services/request.js b/webAO/services/request.js
index 6479dcc..5a060fd 100644
--- a/webAO/services/request.js
+++ b/webAO/services/request.js
@@ -4,6 +4,40 @@
* @returns response data
* @throws {Error} if status code is not 2xx, or a network error occurs
*/
+export async function requestBuffer(url) {
+ return new Promise((resolve, reject) => {
+ const xhr = new XMLHttpRequest();
+ xhr.responseType = 'arraybuffer';
+ xhr.addEventListener('error', () => {
+ const err = new Error(`Request for ${url} failed: ${xhr.statusText}`);
+ err.code = xhr.status;
+ reject(err);
+ });
+ xhr.addEventListener('abort', () => {
+ const err = new Error(`Request for ${url} was aborted!`);
+ err.code = xhr.status;
+ reject(err);
+ });
+ xhr.addEventListener('load', () => {
+ if (xhr.status < 200 || xhr.status >= 300) {
+ const err = new Error(`Request for ${url} failed with status code ${xhr.status}`);
+ err.code = xhr.status;
+ reject(err);
+ } else {
+ resolve(xhr.response);
+ }
+ });
+ xhr.open('GET', url, true);
+ xhr.send();
+ });
+}
+
+/**
+ * Make a GET request for a specific URI.
+ * @param {string} url the URI to be requested
+ * @returns response data
+ * @throws {Error} if status code is not 2xx, or a network error occurs
+ */
const request = async (url) => new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest();
xhr.responseType = 'text';
diff --git a/webAO/utils/getAnimLength.js b/webAO/utils/getAnimLength.js
index e64703f..5b24e84 100644
--- a/webAO/utils/getAnimLength.js
+++ b/webAO/utils/getAnimLength.js
@@ -1,5 +1,6 @@
import calculatorHandler from './calculatorHandler';
import fileExists from './fileExists.js';
+import requestBuffer from '../services/request.js';
/**
* Gets animation length. If the animation cannot be found, it will
* silently fail and return 0 instead.