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

package/src/assets/index.ts

@@ -1,8 +1,9 @@
-// autogenerated
-export * from './AssetKey';
-export * from './AssetLoader';
-export * from './Assets';
-export * from './BlockStates';
-export * from './Entities';
-export * from './ModelTextures';
-export * from './Models';
+// autogenerated
+export * from './AssetKey';
+export * from './AssetLoader';
+export * from './Assets';
+export * from './BlockStates';
+export * from './Entities';
+export * from './ModelTextures';
+export * from './Models';
+export * from './source';

package/src/assets/source/AssetSource.ts

@@ -0,0 +1,13 @@
+import { MinecraftAsset } from "../../MinecraftAsset";
+import { AssetKey } from "../AssetKey";
+import { Maybe } from "../../util";
+import { AssetParser } from "./parser/AssetParsers";
+
+export abstract class AssetSource {
+
+    protected constructor() {
+    }
+
+    public abstract get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser | string): Promise<Maybe<T>>;
+
+}

package/src/assets/source/HostedAssetSource.ts

@@ -0,0 +1,191 @@
+import { AssetSource } from ".";
+import { BlockState, Model, TextureAsset } from "../../model";
+import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { Maybe, prefix } from "../../util";
+import { MinecraftTextureMeta } from "../../MinecraftTextureMeta";
+import { NBTAsset, NBTHelper } from "../../nbt";
+import { ImageLoader } from "../../image";
+import { ListAsset } from "../../ListAsset";
+import { MinecraftAsset } from "../../MinecraftAsset";
+import { AssetKey } from "../AssetKey";
+import { DEFAULT_NAMESPACE, DEFAULT_ROOT } from "../Assets";
+import { Requests } from "../../request";
+import { AssetLoader } from "../AssetLoader";
+import { AssetParser } from "./parser";
+import { ResponseParser } from "./parser";
+import merge from "ts-deepmerge";
+
+const p = prefix("HostedAssetSource");
+
+const DEFAULT_OPTIONS: HostedAssetSourceOptions = {
+    retryDefaults: true
+}
+
+export class HostedAssetSource extends AssetSource {
+
+    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 readonly PARSER_MAP: Map<AssetParser, ResponseParser<any>> = new Map<AssetParser, ResponseParser<any>>([
+        [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],
+    ]);
+
+    public 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;
+            }
+        }
+        return undefined;
+    }
+
+
+    protected 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);
+        // @ts-ignore
+        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 assetBasePath(key: AssetKey) {
+        return `${ key.root ?? this.root ?? AssetLoader.ROOT }/${ key.rootType !== undefined ? key.rootType + '/' : '' }${ key.namespace !== undefined ? key.namespace + '/' : '' }${ key.assetType !== undefined ? key.assetType + '/' : '' }`;
+    }
+
+    private readonly _root: string;
+    private readonly _options: HostedAssetSourceOptions;
+
+    public constructor(root: string, options?: Partial<HostedAssetSourceOptions>) {
+        super();
+        this._root = root;
+        this._options = merge({}, DEFAULT_OPTIONS, options ?? {});
+    }
+
+    public get root(): string {
+        return this._root;
+    }
+
+    public get options(): HostedAssetSourceOptions {
+        return this._options;
+    }
+
+    public get<T extends MinecraftAsset>(key: AssetKey, parser: AssetParser): Promise<Maybe<T>> {
+        const responseParser = HostedAssetSource.PARSER_MAP.get(parser) as ResponseParser<T>;
+        if (this.options.retryDefaults) {
+            return this.loadOrRetryWithDefaults(key, responseParser);
+        }
+        return this.load(key, responseParser);
+    }
+
+}
+
+interface HostedAssetSourceOptions {
+    retryDefaults: boolean;
+}

package/src/assets/source/index.ts

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

package/src/assets/source/parser/AssetParsers.ts

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

package/src/assets/source/parser/ResponseParser.ts

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

package/src/assets/source/parser/index.ts

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

package/src/index.ts

@@ -1,66 +1,68 @@
-// autogenerated
-export * from './AnimatorFunction';
-export * from './Axis';
-export * from './CubeFace';
-export * from './Disposable';
-export * from './Env';
-export * from './ExtractableImageData';
-export * from './Geometries';
-export * from './ListAsset';
-export * from './Materials';
-export * from './Meshes';
-export * from './MinecraftAsset';
-export * from './MinecraftCubeTexture';
-export * from './MinecraftTextureMeta';
-export * from './SceneStats';
-export * from './Serializable';
-export * from './Ticker';
-export * from './TintColors';
-export * from './Transformable';
-export * from './UVMapper';
-export * from './WrappedImage';
-export * from './assets';
-export * from './bedrock';
-export * from './cache';
-export * from './canvas';
-export * from './entity';
-export * from './error';
-export * from './gui';
-export * from './image';
-export * from './inspector';
-export * from './instance';
-export * from './model';
-export * from './nbt';
-export * from './renderer';
-export * from './request';
-export * from './skin';
-export * from './texture';
-export * from './three';
-export * from './util';
-export * from './world';
-export * from './assets';
-export * from './bedrock';
-export * from './cache';
-export * from './canvas';
-export * from './entity';
-export * from './entity/scene';
-export * from './error';
-export * from './gui';
-export * from './gui/scene';
-export * from './image';
-export * from './inspector';
-export * from './instance';
-export * from './model';
-export * from './model/block';
-export * from './model/block/scene';
-export * from './model/multiblock';
-export * from './model/scene';
-export * from './nbt';
-export * from './renderer';
-export * from './request';
-export * from './skin';
-export * from './skin/scene';
-export * from './texture';
-export * from './three';
-export * from './util';
-export * from './world';
+// autogenerated
+export * from './AnimatorFunction';
+export * from './Axis';
+export * from './CubeFace';
+export * from './Disposable';
+export * from './Env';
+export * from './ExtractableImageData';
+export * from './Geometries';
+export * from './ListAsset';
+export * from './Materials';
+export * from './Meshes';
+export * from './MinecraftAsset';
+export * from './MinecraftCubeTexture';
+export * from './MinecraftTextureMeta';
+export * from './SceneStats';
+export * from './Serializable';
+export * from './Ticker';
+export * from './TintColors';
+export * from './Transformable';
+export * from './UVMapper';
+export * from './WrappedImage';
+export * from './assets';
+export * from './bedrock';
+export * from './cache';
+export * from './canvas';
+export * from './entity';
+export * from './error';
+export * from './gui';
+export * from './image';
+export * from './inspector';
+export * from './instance';
+export * from './model';
+export * from './nbt';
+export * from './renderer';
+export * from './request';
+export * from './skin';
+export * from './texture';
+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';
+export * from './entity';
+export * from './entity/scene';
+export * from './error';
+export * from './gui';
+export * from './gui/scene';
+export * from './image';
+export * from './inspector';
+export * from './instance';
+export * from './model';
+export * from './model/block';
+export * from './model/block/scene';
+export * from './model/multiblock';
+export * from './model/scene';
+export * from './nbt';
+export * from './renderer';
+export * from './request';
+export * from './skin';
+export * from './skin/scene';
+export * from './texture';
+export * from './three';
+export * from './util';
+export * from './world';

package/src/three/index.ts

@@ -1,5 +1,3 @@
-// autogenerated
-export * from './BufferGeometryUtils.d';
-export * from './OrbitControls.d';
-export * from './BufferGeometryUtils';
-export * from './OrbitControls';
+// autogenerated
+export * from './BufferGeometryUtils';
+export * from './OrbitControls';