ohzi-core 12.0.0 → 12.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "12.0.0",
+  "version": "12.0.2",
   "description": "OHZI Interactive Core Library",
   "source": "src/index.js",
   "module": "build/index.mjs",

package/src/loaders/AsyncAbstractLoader.js

@@ -37,7 +37,7 @@ class AsyncAbstractLoader
         if (asset_loader.has_error)
         {
           // Restore original url so the error message make more sense
-          // asset_loader.url = asset_loader.original_url;
+          asset_loader.url = asset_loader.original_url;
 
           asset_loader.print_error();
         }

package/src/loaders/assets_loader/AssetLoader.js

@@ -1,6 +1,6 @@
-import { AbstractLoader } from './AbstractLoader';
+import { AbstractLoader } from '../../resource_loader/AbstractLoader';
 
-class AssetLoader extends AbstractLoader
+export class AssetLoader extends AbstractLoader
 {
   constructor(resource_id, url, size)
   {
@@ -20,5 +20,3 @@ class AssetLoader extends AbstractLoader
     });
   }
 }
-
-export { AssetLoader };

package/src/resource_loader/AbstractLoader.js

@@ -1,7 +1,5 @@
-import { Browser } from '../Browser';
-import { Validation } from '../utilities/Validation';
 
-class AbstractLoader
+export class AbstractLoader
 {
   constructor(resource_id, url, size = 1)
   {
@@ -17,8 +15,8 @@ class AbstractLoader
 
   __update_downloaded_bytes(loaded, total)
   {
-    loaded = Validation.is_number(loaded) ? loaded : 1;
-    total  = Validation.is_number(total)  ? total  : 1;
+    loaded = this.is_number(loaded) ? loaded : 1;
+    total  = this.is_number(total)  ? total  : 1;
 
     this.loaded_bytes = loaded;
 
@@ -53,7 +51,7 @@ class AbstractLoader
   {
     if (resource_container.resources_by_url[this.url] === undefined)
     {
-      const cache = Browser.is_safari ? 'no-cache' : 'default';
+      const cache = 'default';
 
       fetch(this.url, {
         method: 'GET', // *GET, POST, PUT, DELETE, etc.
@@ -100,7 +98,15 @@ class AbstractLoader
       // console.log(`Received ${receivedLength} of ${contentLength}`);
     }
 
-    this.on_preloaded_finished(resource_container, response_clone);
+    if (response.ok)
+    {
+      this.on_preloaded_finished(resource_container, response_clone);
+    }
+    else
+    {
+      this.__set_error(`${response.status}: ${response.statusText}`);
+      this.__loading_ended();
+    }
   }
 
   on_preloaded_finished(resource_container, response)
@@ -111,6 +117,19 @@ class AbstractLoader
   {
     console.error(data);
   }
-}
 
-export { AbstractLoader };
+  is_int(n)
+  {
+    return Number(n) === n && n % 1 === 0;
+  }
+
+  is_float(n)
+  {
+    return Number(n) === n && n % 1 !== 0;
+  }
+
+  is_number(n)
+  {
+    return this.is_int(n) || this.is_float(n);
+  }
+}

package/src/loaders/assets_loader/AbstractLoader.js

@@ -1,129 +0,0 @@
-
-class AbstractLoader
-{
-  constructor(resource_id, url, size = 1)
-  {
-    this.resource_id = resource_id;
-    this.url = url;
-    this.loaded_bytes = 0;
-    this.total_bytes = size;
-
-    this.has_finished = false;
-    this.has_error = false;
-    this.error_message = 'none';
-  }
-
-  is_int(n)
-  {
-    return Number(n) === n && n % 1 === 0;
-  }
-
-  is_float(n)
-  {
-    return Number(n) === n && n % 1 !== 0;
-  }
-
-  is_number(n)
-  {
-    return this.is_int(n) || this.is_float(n);
-  }
-
-  __update_downloaded_bytes(loaded, total)
-  {
-    loaded = this.is_number(loaded) ? loaded : 1;
-    total  = this.is_number(total)  ? total  : 1;
-
-    this.loaded_bytes = loaded;
-
-    if (total > 0)
-    {
-      this.total_bytes = total;
-    }
-
-    if (this.loaded_bytes > this.total_bytes)
-    {
-      console.warn('Total bytes is smaller than loaded ones. Please set total bytes by hand to:', this.url);
-    }
-  }
-
-  __loading_ended()
-  {
-    this.has_finished = true;
-  }
-
-  __set_error(message)
-  {
-    this.has_error = true;
-    this.error_message = message;
-  }
-
-  print_error()
-  {
-    console.error('Error while loading ' + this.resource_id + '\n\t path: ' + this.url + '\n\t\t' + this.error_message);
-  }
-
-  load(resource_container)
-  {
-    if (resource_container.resources_by_url[this.url] === undefined)
-    {
-      const cache = 'no-cache';
-
-      fetch(this.url, {
-        method: 'GET', // *GET, POST, PUT, DELETE, etc.
-        mode: 'cors', // no-cors, *cors, same-origin
-        cache: cache, // *default, no-cache, reload, force-cache, only-if-cached
-        credentials: 'same-origin', // include, *same-origin, omit
-        redirect: 'follow' // manual, *follow, error
-      })
-        .then(this.on_progress.bind(this, resource_container))
-        .catch(this.__on_error.bind(this));
-    }
-    else
-    {
-      resource_container.set_resource(this.resource_id, this.url, resource_container.resources_by_url[this.url]);
-
-      this.__update_downloaded_bytes(1, 1);
-      this.__loading_ended();
-    }
-  }
-
-  async on_progress(resource_container, response)
-  {
-    const response_clone = response.clone();
-    const reader = response.body.getReader();
-
-    // Step 2: get total length
-    const contentLength = +response.headers.get('Content-Length');
-
-    // Step 3: read the data
-    let receivedLength = 0; // received that many bytes at the moment
-
-    while (true)
-    {
-      const { done, value } = await reader.read();
-
-      if (done)
-      {
-        break;
-      }
-
-      receivedLength += value.length;
-
-      this.__update_downloaded_bytes(receivedLength, contentLength);
-      // console.log(`Received ${receivedLength} of ${contentLength}`);
-    }
-
-    this.on_preloaded_finished(resource_container, response_clone);
-  }
-
-  on_preloaded_finished(resource_container, response)
-  {
-  }
-
-  __on_error(data)
-  {
-    console.error(data);
-  }
-}
-
-export { AbstractLoader };