minerender 2.0.0-alpha.7 → 2.0.0-alpha.8

package/dist/esm/assets/source/HostedAssetSource.js

@@ -0,0 +1,183 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { AssetSource } from ".";
+import { prefix } from "../../util";
+import { NBTHelper } from "../../nbt";
+import { ImageLoader } from "../../image";
+import { AssetKey } from "../AssetKey";
+import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "../Assets";
+import { Requests } from "../../request";
+import { AssetLoader } from "../AssetLoader";
+import { AssetParser } from "./parser";
+import merge from "ts-deepmerge";
+const p = prefix("HostedAssetSource");
+const DEFAULT_OPTIONS = {
+    retryDefaults: true
+};
+export class HostedAssetSource extends AssetSource {
+    loadOrRetryWithDefaults(key, parser) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const direct = yield this.load(key, parser);
+            if (typeof direct !== "undefined") {
+                return direct;
+            }
+            if (key.namespace !== DEFAULT_NAMESPACE) {
+                console.info(p, "Retrying", key, "with default namespace");
+                // Try on the same host but with default minecraft: namespace
+                const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
+                const namespaced = yield this.load(namespaceKey, parser);
+                if (typeof namespaced !== "undefined") {
+                    return namespaced;
+                }
+                if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
+                    console.info(p, "Retrying", key, "with default root+namespace");
+                    // Try both defaults
+                    const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+                    const namespacedRooted = yield this.load(namespacedRootedKey, parser);
+                    if (typeof namespacedRooted !== "undefined") {
+                        return namespacedRooted;
+                    }
+                }
+            }
+            else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.root !== "undefined" && this.root !== DEFAULT_ROOT)) {
+                console.info(p, "Retrying", key, "with default root");
+                // Try on default root
+                const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
+                const rooted = yield this.load(rootKey, parser);
+                if (typeof rooted !== "undefined") {
+                    return rooted;
+                }
+            }
+            return undefined;
+        });
+    }
+    load(key, parser) {
+        return __awaiter(this, void 0, void 0, function* () {
+            console.info(p, "Loading", key);
+            const url = `${this.assetBasePath(key)}${key.type !== undefined ? key.type + '/' : ''}${key.path}${key.extension}`;
+            console.debug(p, url);
+            let req = {
+                url: url
+            };
+            parser.config(req);
+            // @ts-ignore
+            return yield Requests.mcAssetRequest(req)
+                .then(response => {
+                if (response && response.data) {
+                    try {
+                        return parser.parse(response);
+                    }
+                    catch (e) {
+                        console.warn("Parser failed to process response", response, e);
+                        throw e;
+                    }
+                }
+                return undefined;
+            })
+                .catch(err => {
+                if (err.response) {
+                    let response = err.response;
+                    if (response.status === 404) {
+                        console.debug(p, key, "not found");
+                        return undefined;
+                    }
+                }
+                console.debug(p, "Failed to load", key, err === null || err === void 0 ? void 0 : err.message);
+                return undefined;
+            });
+        });
+    }
+    assetBasePath(key) {
+        var _a, _b;
+        return `${(_b = (_a = key.root) !== null && _a !== void 0 ? _a : this.root) !== null && _b !== void 0 ? _b : AssetLoader.ROOT}/${key.rootType !== undefined ? key.rootType + '/' : ''}${key.namespace !== undefined ? key.namespace + '/' : ''}${key.assetType !== undefined ? key.assetType + '/' : ''}`;
+    }
+    constructor(root, options) {
+        super();
+        this._root = root;
+        this._options = merge({}, DEFAULT_OPTIONS, options !== null && options !== void 0 ? options : {});
+    }
+    get root() {
+        return this._root;
+    }
+    get options() {
+        return this._options;
+    }
+    get(key, parser) {
+        const responseParser = HostedAssetSource.PARSER_MAP.get(parser);
+        if (this.options.retryDefaults) {
+            return this.loadOrRetryWithDefaults(key, responseParser);
+        }
+        return this.load(key, responseParser);
+    }
+}
+HostedAssetSource.MODEL = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+HostedAssetSource.BLOCKSTATE = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+HostedAssetSource.META = {
+    config(request) {
+        // request.responseType = "arraybuffer";
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+HostedAssetSource.NBT = {
+    config(request) {
+        request.responseType = "arraybuffer";
+    },
+    parse(response) {
+        return NBTHelper.fromBuffer(Buffer.from(response.data));
+    }
+};
+HostedAssetSource.IMAGE = {
+    config(request) {
+        request.responseType = "arraybuffer";
+    },
+    parse(response) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield ImageLoader.processResponse(response);
+        });
+    }
+};
+HostedAssetSource.LIST = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+HostedAssetSource.JSON = {
+    config(request) {
+    },
+    parse(response) {
+        return response.data;
+    }
+};
+HostedAssetSource.PARSER_MAP = new Map([
+    [AssetParser.MODEL, HostedAssetSource.MODEL],
+    [AssetParser.BLOCKSTATE, HostedAssetSource.BLOCKSTATE],
+    [AssetParser.META, HostedAssetSource.META],
+    [AssetParser.NBT, HostedAssetSource.NBT],
+    [AssetParser.IMAGE, HostedAssetSource.IMAGE],
+    [AssetParser.LIST, HostedAssetSource.LIST],
+    [AssetParser.JSON, HostedAssetSource.JSON],
+]);
+//# sourceMappingURL=HostedAssetSource.js.map

package/dist/esm/assets/source/HostedAssetSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"HostedAssetSource.js","sourceRoot":"src/","sources":["assets/source/HostedAssetSource.ts"],"names":[],"mappings":"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"}

package/dist/esm/assets/source/index.d.ts

@@ -0,0 +1,3 @@
+export * from './AssetSource';
+export * from './HostedAssetSource';
+export * from './parser';

package/dist/esm/assets/source/index.js

@@ -0,0 +1,5 @@
+// autogenerated
+export * from './AssetSource';
+export * from './HostedAssetSource';
+export * from './parser';
+//# sourceMappingURL=index.js.map

package/dist/esm/assets/source/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,UAAU,CAAC"}

package/dist/esm/assets/source/parser/AssetParsers.d.ts

@@ -0,0 +1,9 @@
+export declare enum AssetParser {
+    MODEL = "model",
+    BLOCKSTATE = "blockstate",
+    META = "meta",
+    NBT = "nbt",
+    IMAGE = "image",
+    LIST = "list",
+    JSON = "json"
+}

package/dist/esm/assets/source/parser/AssetParsers.js

@@ -0,0 +1,11 @@
+export var AssetParser;
+(function (AssetParser) {
+    AssetParser["MODEL"] = "model";
+    AssetParser["BLOCKSTATE"] = "blockstate";
+    AssetParser["META"] = "meta";
+    AssetParser["NBT"] = "nbt";
+    AssetParser["IMAGE"] = "image";
+    AssetParser["LIST"] = "list";
+    AssetParser["JSON"] = "json";
+})(AssetParser || (AssetParser = {}));
+//# sourceMappingURL=AssetParsers.js.map

package/dist/esm/assets/source/parser/AssetParsers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AssetParsers.js","sourceRoot":"src/","sources":["assets/source/parser/AssetParsers.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WAUX;AAVD,WAAY,WAAW;IAEnB,8BAAe,CAAA;IACf,wCAAyB,CAAA;IACzB,4BAAa,CAAA;IACb,0BAAW,CAAA;IACX,8BAAe,CAAA;IACf,4BAAa,CAAA;IACb,4BAAa,CAAA;AAEjB,CAAC,EAVW,WAAW,KAAX,WAAW,QAUtB"}

package/dist/esm/assets/source/parser/ResponseParser.d.ts

@@ -0,0 +1,7 @@
+import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { Maybe } from "../../../util";
+import { MinecraftAsset } from "../../../MinecraftAsset";
+export interface ResponseParser<T extends MinecraftAsset> {
+    config(request: AxiosRequestConfig): any;
+    parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
+}

package/dist/esm/assets/source/parser/ResponseParser.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ResponseParser.js.map

package/dist/esm/assets/source/parser/ResponseParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ResponseParser.js","sourceRoot":"src/","sources":["assets/source/parser/ResponseParser.ts"],"names":[],"mappings":""}

package/dist/esm/assets/source/parser/index.d.ts

@@ -0,0 +1,2 @@
+export * from './AssetParsers';
+export * from './ResponseParser';

package/dist/esm/assets/source/parser/index.js

@@ -0,0 +1,4 @@
+// autogenerated
+export * from './AssetParsers';
+export * from './ResponseParser';
+//# sourceMappingURL=index.js.map

package/dist/esm/assets/source/parser/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["assets/source/parser/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}

package/dist/esm/index.d.ts

@@ -38,6 +38,8 @@ export * from './three';
 export * from './util';
 export * from './world';
 export * from './assets';
+export * from './assets/source';
+export * from './assets/source/parser';
 export * from './bedrock';
 export * from './cache';
 export * from './canvas';

package/dist/esm/index.js

@@ -39,6 +39,8 @@ export * from './three';
 export * from './util';
 export * from './world';
 export * from './assets';
+export * from './assets/source';
+export * from './assets/source/parser';
 export * from './bedrock';
 export * from './cache';
 export * from './canvas';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,OAAO,CAAC;AACtB,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,oBAAoB,CAAC;AACnC,cAAc,QAAQ,CAAC;AACvB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,OAAO,CAAC;AACtB,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,cAAc,OAAO,CAAC;AACtB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/esm/three/index.d.ts

@@ -1,4 +1,2 @@
-export * from './BufferGeometryUtils.d';
-export * from './OrbitControls.d';
 export * from './BufferGeometryUtils';
 export * from './OrbitControls';

package/dist/esm/three/index.js

@@ -1,6 +1,4 @@
 // autogenerated
-export * from './BufferGeometryUtils.d';
-export * from './OrbitControls.d';
 export * from './BufferGeometryUtils';
 export * from './OrbitControls';
 //# sourceMappingURL=index.js.map

package/dist/esm/three/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"src/","sources":["three/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"src/","sources":["three/index.ts"],"names":[],"mappings":"AAAA,gBAAgB;AAChB,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minerender",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "",
   "main": "./dist/cjs/index.js",
   "types": "./dist/cjs/index.d.ts",
@@ -13,6 +13,7 @@
     "bundle": "node ./build.mjs",
     "bundle:w": "TODO",
     "build": "yarn run clean && npm run compile && npm run bundle",
+    "test": "ava",
     "doc": "typedoc --out docs src",
     "publish:alpha": "npm version prerelease --force --preid=alpha && npm publish --tag=alpha"
   },
@@ -72,10 +73,7 @@
     "util": "^0.12.3"
   },
   "devDependencies": {
-    "browserify-fs": "^1.0.0",
-    "browserify-incremental": "^3.1.1",
-    "browserify-shim": "^3.8.14",
-    "browserify-zlib": "^0.2.0",
+    "@ava/typescript": "^4.1.0",
     "@mapbox/node-pre-gyp": "^1.0.0",
     "@types/browser-or-node": "^1.3.0",
     "@types/crypto-js": "^4.0.1",
@@ -83,9 +81,15 @@
     "@types/node": "^14.14.31",
     "@types/node-persist": "^3.1.1",
     "@types/three": "^0.125.2",
+    "ava": "^5.3.1",
+    "browserify-fs": "^1.0.0",
+    "browserify-incremental": "^3.1.1",
+    "browserify-shim": "^3.8.14",
+    "browserify-zlib": "^0.2.0",
     "clean-webpack-plugin": "^3.0.0",
     "esbuild": "^0.19.5",
     "esbuild-plugin-polyfill-node": "^0.3.0",
+    "esbuild-runner": "^2.2.2",
     "event-stream": "^4.0.1",
     "glob": "^7.1.6",
     "progress-stream": "^2.0.0",

package/src/assets/AssetKey.ts

@@ -1,4 +1,3 @@
-import { base64encode, md5 } from "../util/util";
 import { Serializable } from "../Serializable";
 import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "./Assets";
 import { AssetLoader } from "./AssetLoader";

package/src/assets/AssetLoader.ts

@@ -11,142 +11,41 @@ import { ListAsset } from "../ListAsset";
 import { AssetKey } from "./AssetKey";
 import { NBTAsset, NBTHelper } from "../nbt/NBTHelper";
 import { prefix } from "../util/log";
+import { AssetSource } from "./source/AssetSource";
+import { AssetParser } from "./source/parser/AssetParsers";
+import { HostedAssetSource } from "./source";
 
 const p = prefix("AssetLoader");
 
-export interface ResponseParser<T extends MinecraftAsset> {
-    config(request: AxiosRequestConfig);
-
-    parse(response: AxiosResponse): Maybe<T> | Promise<Maybe<T>>;
-}
 
 export class AssetLoader {
 
-    static readonly MODEL: ResponseParser<Model> = {
-        config(request: AxiosRequestConfig) {
-        },
-        parse(response: AxiosResponse): Maybe<Model> {
-            return response.data as Model;
-        }
-    }
-    static readonly BLOCKSTATE: ResponseParser<BlockState> = {
-        config(request: AxiosRequestConfig) {
-        },
-        parse(response: AxiosResponse): Maybe<BlockState> {
-            return response.data as BlockState;
-        }
-    }
-    static readonly META: ResponseParser<MinecraftTextureMeta> = {
-        config(request: AxiosRequestConfig) {
-            // request.responseType = "arraybuffer";
-        },
-        parse(response: AxiosResponse): Maybe<MinecraftTextureMeta> {
-            return response.data as MinecraftTextureMeta;
-        }
-    }
-    static readonly NBT: ResponseParser<NBTAsset> = {
-        config(request: AxiosRequestConfig) {
-            request.responseType = "arraybuffer";
-        },
-        parse(response: AxiosResponse): Promise<Maybe<NBTAsset>> {
-            return NBTHelper.fromBuffer(Buffer.from(response.data));
-        }
-    }
-    static readonly IMAGE: ResponseParser<TextureAsset> = {
-        config(request: AxiosRequestConfig) {
-            request.responseType = "arraybuffer";
-        },
-        async parse(response: AxiosResponse): Promise<Maybe<TextureAsset>> {
-            return await ImageLoader.processResponse(response) as TextureAsset;
-        }
-    }
-    static readonly LIST: ResponseParser<ListAsset> = {
-        config(request: AxiosRequestConfig) {
-        },
-        parse(response: AxiosResponse): Maybe<ListAsset> {
-            return response.data as ListAsset;
-        }
-    }
-    static readonly JSON: ResponseParser<any> = {
-        config(request: AxiosRequestConfig) {
-        },
-        parse(response: AxiosResponse): Maybe<any> {
-            return response.data;
-        }
+    static ROOT: string = DEFAULT_ROOT;
+
+    private static _SOURCES: AssetSourceReference[] = [];
+
+    public static addSource(key: string, source: AssetSource) {
+        this._SOURCES.unshift({key, source});
+        console.log(p, "Added AssetSource", key);
     }
 
-    static ROOT: string = DEFAULT_ROOT;
+    static {
+        this.addSource("mcassets", new HostedAssetSource(DEFAULT_ROOT));
+    }
 
-    public static async loadOrRetryWithDefaults<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>> {
-        const direct = await this.load<T>(key, parser);
-        if (typeof direct !== "undefined") {
-            return direct;
-        }
-        if (key.namespace !== DEFAULT_NAMESPACE) {
-            console.info(p, "Retrying", key, "with default namespace");
-            // Try on the same host but with default minecraft: namespace
-            const namespaceKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, key.root);
-            const namespaced = await this.load<T>(namespaceKey, parser);
-            if (typeof namespaced !== "undefined") {
-                return namespaced;
-            }
-            if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== DEFAULT_ROOT)) {
-                console.info(p, "Retrying", key, "with default root+namespace");
-                // Try both defaults
-                const namespacedRootedKey = new AssetKey(DEFAULT_NAMESPACE, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
-                const namespacedRooted = await this.load<T>(namespacedRootedKey, parser);
-                if (typeof namespacedRooted !== "undefined") {
-                    return namespacedRooted;
-                }
-            }
-        } else if ((typeof key.root !== "undefined" && key.root !== DEFAULT_ROOT) || (typeof this.ROOT !== "undefined" && this.ROOT !== DEFAULT_ROOT)) {
-            console.info(p, "Retrying", key, "with default root");
-            // Try on default root
-            const rootKey = new AssetKey(key.namespace, key.path, key.assetType, key.type, key.rootType, key.extension, DEFAULT_ROOT);
-            const rooted = await this.load<T>(rootKey, parser);
-            if (typeof rooted !== "undefined") {
-                return rooted;
+    public static async get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>> {
+        for (const source of this._SOURCES) {
+            const result = await source.source.get<T>(key, parser);
+            if (result) {
+                return result;
             }
         }
         return undefined;
     }
 
+}
 
-    protected static async load<T extends MinecraftAsset>(key: AssetKey, parser: ResponseParser<T>): Promise<Maybe<T>> {
-        console.info(p, "Loading", key);
-        const url = `${ this.assetBasePath(key) }${ key.type !== undefined ? key.type + '/' : '' }${ key.path }${ key.extension }`;
-        console.debug(p, url);
-        let req: AxiosRequestConfig = {
-            url: url
-        };
-        parser.config(req);
-        return await Requests.mcAssetRequest(req)
-            .then(response => {
-                if (response && response.data) {
-                    try {
-                        return parser.parse(response);
-                    } catch (e) {
-                        console.warn("Parser failed to process response", response, e);
-                        throw e;
-                    }
-                }
-                return undefined;
-            })
-            .catch(err => {
-                if (err.response) {
-                    let response = err.response as AxiosResponse;
-                    if (response.status === 404) {
-                        console.debug(p, key, "not found");
-                        return undefined;
-                    }
-                }
-                console.debug(p, "Failed to load", key, err?.message);
-                return undefined;
-            })
-    }
-
-    public static assetBasePath(key: AssetKey) {
-        return `${ key.root ?? this.ROOT }/${ key.rootType !== undefined ? key.rootType + '/' : '' }${ key.namespace !== undefined ? key.namespace + '/' : '' }${ key.assetType !== undefined ? key.assetType + '/' : '' }`;
-    }
-
+interface AssetSourceReference {
+    key: string;
+    source: AssetSource;
 }

package/src/assets/BlockStates.ts

@@ -8,6 +8,8 @@ import defaultBlockStates from "../model/defaultBlockStates.json";
 import { BlockStateProperties, BlockStatePropertyDefaults } from "../model/block/BlockStateProperties";
 import { AssetKey } from "./AssetKey";
 import { PersistentCache } from "../cache/PersistentCache";
+import { AssetParser } from "./source/parser/AssetParsers";
+import { ListAsset } from "../ListAsset";
 
 export class BlockStates {
 
@@ -16,7 +18,7 @@ export class BlockStates {
     // BlockState names are hardcoded
     @Memoize()
     public static async getList(): Promise<string[]> {
-        return AssetLoader.loadOrRetryWithDefaults(new AssetKey(
+        return AssetLoader.get<ListAsset>(new AssetKey(
             DEFAULT_NAMESPACE,
             "_list",
             "blockstates",
@@ -24,7 +26,7 @@ export class BlockStates {
             "assets",
             ".json",
             DEFAULT_ROOT
-        ), AssetLoader.LIST).then(r => r?.files ?? []);
+        ), AssetParser.LIST).then(r => r?.files ?? []);
     }
 
     public static getDefaultState(key: AssetKey): Maybe<BlockStatePropertyDefaults> {
@@ -41,9 +43,7 @@ export class BlockStates {
         const keyStr = key.serialize();
         return Caching.blockStateCache.get(keyStr, k => {
             return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                return AssetLoader.loadOrRetryWithDefaults(key, AssetLoader.BLOCKSTATE).then(asset => {
-                    return asset;
-                })
+                return AssetLoader.get<BlockState>(key, AssetParser.BLOCKSTATE);
             })
         }).then(asset => {
             if (asset) {
@@ -61,4 +61,8 @@ export class BlockStates {
         return Promise.all(promises);
     }
 
+    public static async clearCache() {
+        await this.PERSISTENT_CACHE.clear();
+    }
+
 }

package/src/assets/ModelTextures.ts

@@ -9,6 +9,7 @@ import { MinecraftTextureMeta } from "../MinecraftTextureMeta";
 import { PersistentCache } from "../cache/PersistentCache";
 import { keys } from "node-persist";
 import { AssetKey } from "./AssetKey";
+import { AssetParser } from "./source/parser/AssetParsers";
 
 export class ModelTextures {
 
@@ -25,7 +26,7 @@ export class ModelTextures {
     public static async preload(key: AssetKey): Promise<Maybe<TextureAsset>> {
         const keyStr = key.serialize();
         return Caching.textureAssetCache.get(keyStr, k => {
-            return AssetLoader.loadOrRetryWithDefaults<TextureAsset>(key, AssetLoader.IMAGE).then(asset => {
+            return AssetLoader.get<TextureAsset>(key, AssetParser.IMAGE).then(asset => {
                 if (asset)
                     asset.key = key;
                 return asset;
@@ -42,7 +43,7 @@ export class ModelTextures {
 
         return Caching.textureMetaCache.get(keyStr, k => {
             return this.PERSISTENT_META_CACHE.getOrLoad(keyStr, k1 => {
-                return AssetLoader.loadOrRetryWithDefaults<MinecraftTextureMeta>(key, AssetLoader.META).then(asset => {
+                return AssetLoader.get<MinecraftTextureMeta>(key, AssetParser.META).then(asset => {
                     if (asset)
                         asset.key = key;
                     return asset;

package/src/assets/Models.ts

@@ -8,6 +8,8 @@ import { Memoize } from "typescript-memoize";
 import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "./Assets";
 import { PersistentCache } from "../cache/PersistentCache";
 import { AssetKey } from "./AssetKey";
+import { ListAsset } from "../ListAsset";
+import { AssetParser } from "./source/parser/AssetParsers";
 
 export class Models {
 
@@ -15,7 +17,7 @@ export class Models {
 
     @Memoize()
     public static async getItemList(): Promise<string[]> {
-        return AssetLoader.loadOrRetryWithDefaults(new AssetKey(
+        return AssetLoader.get<ListAsset>(new AssetKey(
             DEFAULT_NAMESPACE,
             "_list",
             "models",
@@ -23,7 +25,7 @@ export class Models {
             "assets",
             ".json",
             DEFAULT_ROOT
-        ), AssetLoader.LIST).then(r => r?.files ?? []);
+        ), AssetParser.LIST).then(r => r?.files ?? []);
     }
 
     public static async loadAndMerge(key: AssetKey): Promise<Maybe<Model>> {
@@ -44,9 +46,7 @@ export class Models {
         const keyStr = key.serialize();
         return Caching.rawModelCache.get(keyStr, k => {
             return this.PERSISTENT_CACHE.getOrLoad(keyStr, k1 => {
-                return AssetLoader.loadOrRetryWithDefaults(key, AssetLoader.MODEL).then(asset => {
-                    return asset;
-                })
+                return AssetLoader.get<Model>(key, AssetParser.MODEL);
             })
         }).then(asset => {
             if (asset) {