rendersIgnoreProxy option

egorprnn · Mar 29, 2021 · 786f106 · 786f106
1 parent 71bada2
commit 786f106
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 20 deletions.
diff --git a/docs/EN.md b/docs/EN.md
@@ -60,12 +60,13 @@ Main class
 
 **Kind**: class
 
-| Param                       | Type     | Default        | Description                                                                |
-| --------------------------- | -------- | -------------- | -------------------------------------------------------------------------- |
-| options                     | `Object` |                | Object with parameters for the class                                       |
-| options.proxy               | `string` |                | Proxy for requests                                                         |
-| options.endpoint            | `string` | `"namemc.com"` | NameMC Endpoint                                                            |
-| options.defaultSkinsModel   | `string` | `"unknown"`    | Model for skins by default, if an error occurred while trying to parse it. |
+| Param                      | Type      | Default        | Description                                                               |
+| -------------------------- | --------- | -------------- | ------------------------------------------------------------------------- |
+| options                    | `Object`  |                | Object with parameters for the class                                      |
+| options.proxy              | `string`  |                | Proxy for requests                                                        |
+| options.endpoint           | `string`  | `"namemc.com"` | NameMC Endpoint                                                           |
+| options.defaultSkinsModel  | `string`  | `"unknown"`    | Model for skins by default, if an error occurred while trying to parse it |
+| options.rendersIgnoreProxy | `boolean` | `false`        | Ignore proxy field for image renders                                      |
 
 **Example**:
 

diff --git a/docs/RU.md b/docs/RU.md
@@ -59,12 +59,13 @@
 
 **Вид**: класс
 
-| Параметры                   | Тип      | По умолчанию   | Описание                                                                   |
-| --------------------------- | -------- | -------------- | -------------------------------------------------------------------------- |
-| options                     | `Object` |                | Объект с параметрами для класса                                            |
-| options.proxy               | `string` |                | Прокси для запросов                                                        |
-| options.endpoint            | `string` | `"namemc.com"` | Конечная точка NameMC для запросов                                         |
-| options.defaultSkinsModel   | `string` | `"unknown"`    | Модель для скинов по умолчанию, если при ее парсе произошла ошибка         |
+| Параметры                  | Тип       | По умолчанию   | Описание                                                           |
+| -------------------------- | --------- | -------------- | ------------------------------------------------------------------ |
+| options                    | `Object`  |                | Объект с параметрами для класса                                    |
+| options.proxy              | `string`  |                | Прокси для запросов                                                |
+| options.endpoint           | `string`  | `"namemc.com"` | Конечная точка NameMC для запросов                                 |
+| options.defaultSkinsModel  | `string`  | `"unknown"`    | Модель для скинов по умолчанию, если при ее парсе произошла ошибка |
+| options.rendersIgnoreProxy | `boolean` | `false`        | Игнорировать прокси для рендера изображений                        |
 
 **Пример**:
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "namemcwrapper",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "description": "ES6 Promise based wrapper for NameMC.com",
   "main": "./dist/NameMC.js",
   "exports": {
@@ -17,7 +17,8 @@
   "scripts": {
     "tsc": "tsc && node --experimental-modules --es-module-specifier-resolution=node ./scripts/removeEmptyFiles.mjs",
     "build": "npm run-script tsc && babel build --out-dir dist --copy-files && node --experimental-modules --es-module-specifier-resolution=node ./scripts/fixImports.mjs",
-    "test": "npm run-script build && node --experimental-modules --experimental-json-modules node_modules/mocha/bin/_mocha --reporter spec --timeout 180000",
+    "pretest": "npm run-script build",
+    "test": "mocha --reporter spec --timeout 180000",
     "eslint:check": "eslint ./src/**/*",
     "eslint:fix": "eslint ./src/**/* --fix"
   },

diff --git a/src/DataParser.ts b/src/DataParser.ts
@@ -16,7 +16,7 @@ export abstract class DataParser {
         this.options = options;
     }
 
-    abstract getEndpoint(options: IGetEndpointOptions): string;
+    protected abstract getEndpoint(options: IGetEndpointOptions): string;
     abstract getRenders(options: IGetRendersOptions): IRender;
     abstract getCapeInfo(hash: Hash): ICapeInfo;
 

diff --git a/src/NameMC.ts b/src/NameMC.ts
@@ -17,8 +17,22 @@ export class NameMC extends DataParser {
     constructor(options: IOptions = {}) {
         super(options);
 
+        const urlOptions: ("proxy" | "endpoint")[] = [
+            "proxy",
+            "endpoint"
+        ];
+
+        urlOptions.forEach((option) => {
+            const optionValue = options[option];
+
+            if (optionValue?.endsWith("/")) {
+                options[option] = optionValue.slice(0, optionValue.length - 1);
+            }
+        });
+
         this.options = {
             endpoint: "namemc.com",
+            proxy: "",
             ...options
         };
 
@@ -367,10 +381,10 @@ export class NameMC extends DataParser {
         });
     }
 
-    getEndpoint({ subdomain = "", domain = "" }: IGetEndpointOptions = {}): string {
-        const { proxy, endpoint }: IOptions = this.options;
+    protected getEndpoint({ subdomain = "", domain = "" }: IGetEndpointOptions = {}): string {
+        const { proxy, endpoint, rendersIgnoreProxy }: IOptions = this.options;
 
-        return `${proxy ? `${proxy}/` : ""}https://${subdomain ? `${subdomain}.` : ""}${domain || endpoint}`;
+        return `${rendersIgnoreProxy && subdomain === "renders" ? "" : proxy}https://${subdomain ? `${subdomain}.` : ""}${domain || endpoint}`;
     }
 }
 

diff --git a/src/interfaces/NameMC/options.ts b/src/interfaces/NameMC/options.ts
@@ -2,6 +2,7 @@ import { Model } from "./skin";
 
 export interface IOptions {
     proxy?: string;
+    rendersIgnoreProxy?: boolean;
     endpoint?: string;
     defaultSkinsModel?: Exclude<Model, "unknown">;
 }