Update api.nswag

.editorconfig

@@ -1,15 +1,17 @@
 root = true
 
 [*]
-end_of_line = lf
-indent_style = space
-indent_size = 4
 charset = utf-8
-trim_trailing_whitespace = true
+end_of_line = lf
+indent_size = 4
+indent_style = space
 insert_final_newline = true
+max_line_length = 120
+trim_trailing_whitespace = true
 
 [*.md]
+indent_size = 1
 trim_trailing_whitespace = false
 
-[*.env*]
+[.env*]
 insert_final_newline = false

examples/api.js

@@ -8,9 +8,7 @@ dotenv.config();
 
 async function main() {
     const tribufu = TribufuApi.fromEnv();
-    console.log(
+    console.log(await tribufu.getUserInfo());
-        await tribufu.getServerByAddressAndQueryPort("mine.tribufu.com", 25565),
-    );
 }
 
 main();

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tribufu",
-    "version": "1.0.0",
+    "version": "1.0.2",
     "description": "Tribufu JS SDK",
     "repository": "https://github.com/Tribufu/TribufuJs",
     "author": "Tribufu <contact@Tribufu.com>",

scripts/nswag.ps1

@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
 
 nswag run ./src/api/api.nswag
-nswag run ./src/translate/translate.nswag

src/api/api.nswag

@@ -48,7 +48,7 @@
             "useLeafType": false,
             "classTypes": [],
             "extendedClasses": [],
-            "extensionCode": "../core/include.ts",
+            "extensionCode": "include.ts",
             "generateDefaultValues": true,
             "excludedTypeNames": [],
             "excludedParameterNames": [],

src/api/base.ts

@@ -92,12 +92,10 @@ export abstract class TribufuApiBase {
      * @returns
      */
     protected transformOptions(options: RequestInit) {
-        if (this.apiKey) {
+        options.headers = {
-            options.headers = {
+            ...options.headers,
-                ...options.headers,
+            ...this.getHeaders(),
-                ...this.getHeaders(),
+        };
-            };
-        }
 
         return Promise.resolve(options);
     }

src/api/generated.ts

@@ -8,7 +8,7 @@
 /* eslint-disable */
 // ReSharper disable InconsistentNaming
 
-import { TribufuApiBase } from "../core/base";
+import { TribufuApiBase } from "./base";
 
 export class TribufuApiGenerated extends TribufuApiBase {
     private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
@@ -447,7 +447,7 @@ export class TribufuApiGenerated extends TribufuApiBase {
      * Get a list of games.
      * @return OK
      */
-    getGames(): Promise<Application[]> {
+    getGames(): Promise<Game[]> {
         let url_ = this.baseUrl + "/v1/games";
         url_ = url_.replace(/[?&]$/, "");
 
@@ -465,13 +465,13 @@ export class TribufuApiGenerated extends TribufuApiBase {
         });
     }
 
-    protected processGetGames(response: Response): Promise<Application[]> {
+    protected processGetGames(response: Response): Promise<Game[]> {
         const status = response.status;
         let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
         if (status === 200) {
             return response.text().then((_responseText) => {
             let result200: any = null;
-            result200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver) as Application[];
+            result200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver) as Game[];
             return result200;
             });
         } else if (status !== 200 && status !== 204) {
@@ -479,14 +479,14 @@ export class TribufuApiGenerated extends TribufuApiBase {
             return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             });
         }
-        return Promise.resolve<Application[]>(null as any);
+        return Promise.resolve<Game[]>(null as any);
     }
 
     /**
      * Get a game by id.
      * @return OK
      */
-    getGameById(id: string): Promise<Application> {
+    getGameById(id: string): Promise<Game> {
         let url_ = this.baseUrl + "/v1/games/{id}";
         if (id === undefined || id === null)
             throw new Error("The parameter 'id' must be defined.");
@@ -507,13 +507,13 @@ export class TribufuApiGenerated extends TribufuApiBase {
         });
     }
 
-    protected processGetGameById(response: Response): Promise<Application> {
+    protected processGetGameById(response: Response): Promise<Game> {
         const status = response.status;
         let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
         if (status === 200) {
             return response.text().then((_responseText) => {
             let result200: any = null;
-            result200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver) as Application;
+            result200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver) as Game;
             return result200;
             });
         } else if (status !== 200 && status !== 204) {
@@ -521,7 +521,7 @@ export class TribufuApiGenerated extends TribufuApiBase {
             return throwException("An unexpected server error occurred.", status, _responseText, _headers);
             });
         }
-        return Promise.resolve<Application>(null as any);
+        return Promise.resolve<Game>(null as any);
     }
 
     /**
@@ -2746,6 +2746,40 @@ export interface CryptoViewModel {
     decoded: string | null;
 }
 
+export interface Game {
+    game_port: number | null;
+    query_port: number | null;
+    rcon_port: number | null;
+    server_count: number;
+    steam_app_id: number | null;
+    steam_server_app_id: number | null;
+    enable_servers: boolean;
+    rust_gamedig_id: string | null;
+    node_gamedig_id: string | null;
+    server_connect_url: string | null;
+    server_tags: string | null;
+    id: string;
+    name: string | null;
+    description: string | null;
+    type: ApplicationType;
+    organization_id: string | null;
+    icon_url: string | null;
+    banner_url: string | null;
+    capsule_image_url: string | null;
+    library_image_url: string | null;
+    parent_id: string | null;
+    slug: string | null;
+    visibility: number;
+    password: string | null;
+    primary: number;
+    user_count: number;
+    achievement_count: number;
+    badge_count: number | null;
+    download_count: number;
+    created: string;
+    updated: string | null;
+}
+
 export interface GameServer {
     id: string;
     name: string | null;
@@ -2819,6 +2853,7 @@ export interface Group {
 export interface GroupGame {
     group_id: string;
     application_id: string;
+    application: Application;
     stats: any | null;
     acquired: string;
     last_used: string | null;

src/api/include.ts

@@ -0,0 +1 @@
+import { TribufuApiBase } from "./base";

src/api/index.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 import { TRIBUFU_API_URL } from "..";
-import { TribufuApiBase } from "../core/base";
+import { TribufuApiBase } from "./base";
 import { TribufuApiGenerated } from "./generated";
 import { TribufuApiOptions } from "../options";
 
@@ -98,8 +98,6 @@ export class TribufuApi extends TribufuApiGenerated {
         }
 
         const baseUrl = process.env[`TRIBUFU_API_URL`] || null;
-        return TribufuApiBase.debugEnabled() && baseUrl
+        return TribufuApiBase.debugEnabled() && baseUrl ? baseUrl : TRIBUFU_API_URL;
-            ? baseUrl
-            : TRIBUFU_API_URL;
     }
 }

src/core/include.ts

@@ -1 +0,0 @@
-import { TribufuApiBase } from "../core/base";

src/index.ts

@@ -22,9 +22,9 @@ export {
     TribufuApiSingleton,
 };
 
-export * from "./api/api.base";
+export * from "./api/base";
-export * from "./api/api.generated";
+export * from "./api/generated";
-export * from "./api/api.include";
+export * from "./api/include";
 export * from "./api/index";
 export * from "./api/singletion";
 export * from "./http/headers";

src/translate/generated.ts

@@ -1,84 +0,0 @@
-//----------------------
-// <auto-generated>
-//     Generated using the NSwag toolchain v14.1.0.0 (NJsonSchema v11.0.2.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
-// </auto-generated>
-//----------------------
-
-/* tslint:disable */
-/* eslint-disable */
-// ReSharper disable InconsistentNaming
-
-import { TribufuApiBase } from "../core/base";
-
-export class TribufuTranslateGenerated extends TribufuApiBase {
-    private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
-    private baseUrl: string;
-    protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
-
-    constructor(baseUrl?: string, http?: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> }) {
-        super();
-        this.http = http ? http : window as any;
-        this.baseUrl = baseUrl ?? "";
-    }
-
-    /**
-     * Translate a given text.
-     */
-    translate(): Promise<void> {
-        let url_ = this.baseUrl + "/translate";
-        url_ = url_.replace(/[?&]$/, "");
-
-        let options_: RequestInit = {
-            method: "POST",
-            headers: {
-            }
-        };
-
-        return this.transformOptions(options_).then(transformedOptions_ => {
-            return this.http.fetch(url_, transformedOptions_);
-        }).then((_response: Response) => {
-            return this.processTranslate(_response);
-        });
-    }
-
-    protected processTranslate(response: Response): Promise<void> {
-        const status = response.status;
-        let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
-        {
-            return response.text().then((_responseText) => {
-            return;
-            });
-        }
-    }
-}
-
-export class TribufuTranslateError extends Error {
-    override message: string;
-    status: number;
-    response: string;
-    headers: { [key: string]: any; };
-    result: any;
-
-    constructor(message: string, status: number, response: string, headers: { [key: string]: any; }, result: any) {
-        super();
-
-        this.message = message;
-        this.status = status;
-        this.response = response;
-        this.headers = headers;
-        this.result = result;
-    }
-
-    protected isTribufuTranslateError = true;
-
-    static isTribufuTranslateError(obj: any): obj is TribufuTranslateError {
-        return obj.isTribufuTranslateError === true;
-    }
-}
-
-function throwException(message: string, status: number, response: string, headers: { [key: string]: any; }, result?: any): any {
-    if (result !== null && result !== undefined)
-        throw result;
-    else
-        throw new TribufuTranslateError(message, status, response, headers, null);
-}

src/translate/translate.nswag

@@ -1,74 +0,0 @@
-{
-    "runtime": "Default",
-    "defaultVariables": null,
-    "documentGenerator": {
-        "fromDocument": {
-            "json": "",
-            "url": "http://localhost:5578/openapi.json",
-            "output": null,
-            "newLineBehavior": "Auto"
-        }
-    },
-    "codeGenerators": {
-        "openApiToTypeScriptClient": {
-            "className": "TribufuTranslateGenerated",
-            "moduleName": "",
-            "namespace": "",
-            "typeScriptVersion": 4.3,
-            "template": "Fetch",
-            "promiseType": "Promise",
-            "httpClass": "HttpClient",
-            "withCredentials": false,
-            "useSingletonProvider": false,
-            "injectionTokenType": "OpaqueToken",
-            "rxJsVersion": 6,
-            "dateTimeType": "String",
-            "nullValue": "Null",
-            "generateClientClasses": true,
-            "generateClientInterfaces": false,
-            "generateOptionalParameters": true,
-            "exportTypes": true,
-            "wrapDtoExceptions": false,
-            "exceptionClass": "TribufuTranslateError",
-            "clientBaseClass": "TribufuApiBase",
-            "wrapResponses": false,
-            "wrapResponseMethods": [],
-            "generateResponseClasses": true,
-            "responseClass": "SwaggerResponse",
-            "protectedMethods": [],
-            "configurationClass": null,
-            "useTransformOptionsMethod": true,
-            "useTransformResultMethod": false,
-            "generateDtoTypes": true,
-            "operationGenerationMode": "SingleClientFromOperationId",
-            "markOptionalProperties": false,
-            "generateCloneMethod": false,
-            "typeStyle": "Interface",
-            "enumStyle": "Enum",
-            "useLeafType": false,
-            "classTypes": [],
-            "extendedClasses": [],
-            "extensionCode": "../core/include.ts",
-            "generateDefaultValues": true,
-            "excludedTypeNames": [],
-            "excludedParameterNames": [],
-            "handleReferences": false,
-            "generateTypeCheckFunctions": false,
-            "generateConstructorInterface": true,
-            "convertConstructorInterfaceData": false,
-            "importRequiredTypes": true,
-            "useGetBaseUrlMethod": false,
-            "baseUrlTokenName": "API_BASE_URL",
-            "queryNullValue": "",
-            "useAbortSignal": false,
-            "inlineNamedDictionaries": false,
-            "inlineNamedAny": false,
-            "includeHttpContext": false,
-            "templateDirectory": null,
-            "serviceHost": null,
-            "serviceSchemes": null,
-            "output": "generated.ts",
-            "newLineBehavior": "LF"
-        }
-    }
-}