fix for issue with checkZFT static method

webarkit · Nov 22, 2024 · 4618f52 · 4618f52
1 parent af5d453
commit 4618f52
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/dist/ARToolkitNFT.js b/dist/ARToolkitNFT.js
diff --git a/dist/ARToolkitNFT_simd.js b/dist/ARToolkitNFT_simd.js
diff --git a/dist/ARToolkitNFT_td.js b/dist/ARToolkitNFT_td.js
diff --git a/examples/js/threading_files/ARToolkitNFT_td.js b/examples/js/threading_files/ARToolkitNFT_td.js
diff --git a/src/ARToolkitNFT_simd.ts b/src/ARToolkitNFT_simd.ts
@@ -438,6 +438,7 @@ export class ARToolkitNFT implements IARToolkitNFT {
         const filename4 = prefix + ".zft";
 
         let type = Utils.checkZFT(element + ".zft");
+        console.log(type);
         if (type) {
           pending -= 2;
           this.ajax(

diff --git a/src/Utils.ts b/src/Utils.ts
@@ -113,23 +113,17 @@ export default class Utils {
     return out;
   }
 
-  static checkZFT(url: string): any {
-    let isZFT: boolean = null;
+  static checkZFT(url: string): boolean {
+    const request = new XMLHttpRequest();
+    request.open("GET", url, false); // `false` makes the request synchronous
+    request.send(null);
 
-    try {
-      const response: any = axios.get(url);
-
-      return () => {
-        if (response.status == 200) {
-          isZFT = true;
-        } else {
-          isZFT = false;
-        }
-        return isZFT;
-      };
-    } catch (error) {
-      throw new Error("Error in Utils.checkZFT: ", error);
+    if (request.status === 200) {
+      return true;
+    } else if (request.status === 404) {
+      return false;
     }
+    return false;
   }
   /**
    * Stores data in the Emscripten filesystem.

diff --git a/types/src/Utils.d.ts b/types/src/Utils.d.ts
@@ -3,6 +3,6 @@ export default class Utils {
     static fetchRemoteDataCallback(url: string, callback: any): Promise<any>;
     static string2Uint8Data(string: string): Uint8Array;
     static Uint8ArrayToStr(array: any): string;
-    static checkZFT(url: string): any;
+    static checkZFT(url: string): boolean;
     static _storeDataFile(data: Uint8Array, target: string, instance: any): void;
 }