exaroton 1.8.1 → 1.9.0

package/.github/workflows/publish.yml

@@ -7,12 +7,16 @@ on:
 jobs:
   publish-npm:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 16
           registry-url: https://registry.npmjs.org/
+      - run: npm install -g npm
       - run: npm ci
       - run: npm publish --provenance --access public
         env:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exaroton",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "description": "exaroton API client",
   "homepage": "https://exaroton.com",
   "main": "index.js",
@@ -11,7 +11,6 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "form-data": "^3.0.1",
     "got": "^11.8.2",
     "ws": "^7.4.5"
   }

package/src/Client.js

@@ -106,15 +106,10 @@ class Client {
     async request(request) {
         request.client = this;
         const url = this.baseURL + request.getEndpoint();
-        const headers = Object.assign({
-            "authorization": "Bearer " + this.#apiToken,
-            "user-agent": this.#userAgent
-        }, request.headers);
 
         let gotOptions = {
             method: request.method,
             retry: 0,
-            headers: headers,
             responseType: request.responseType
         };
 
@@ -122,6 +117,11 @@ class Client {
             gotOptions.body = request.getBody();
         }
 
+        gotOptions.headers = Object.assign({
+            "authorization": "Bearer " + this.#apiToken,
+            "user-agent": this.#userAgent
+        }, request.headers);
+
         let response;
         try {
             if (request.hasOutputStream()) {

package/src/Request/Request.js

@@ -1,4 +1,3 @@
-const FormData = require('form-data');
 const {createReadStream} = require('fs');
 const {createWriteStream} = require("fs");
 
@@ -149,20 +148,8 @@ class Request {
             return this.data;
         }
 
-        let body = new FormData();
-        for (let key in this.data) {
-            if (!this.data.hasOwnProperty(key)) {
-                continue;
-            }
-            if (Array.isArray(this.data[key])) {
-                for (let element of this.data[key]) {
-                    body.append(key + "[]", element);
-                }
-                continue;
-            }
-            body.append(key, this.data[key]);
-        }
-        return body;
+        this.setHeader("content-type", "application/json");
+        return JSON.stringify(this.data);
     }
 
     /**

package/src/Request/Server/StartServerRequest.js

@@ -2,6 +2,20 @@ const ServerRequest = require('./ServerRequest');
 
 class StartServerRequest extends ServerRequest {
     endpoint = "servers/{id}/start";
+    method = "POST";
+
+    /**
+     * StartServerRequest constructor
+     *
+     * @param {string} id
+     * @param {boolean} useOwnCredits
+     */
+    constructor(id, useOwnCredits = false) {
+        super(id);
+        this.data = {
+            useOwnCredits: useOwnCredits
+        };
+    }
 }
 
 module.exports = StartServerRequest;

package/src/Server/Server.js

@@ -149,11 +149,12 @@ class Server extends EventEmitter {
     /**
      * Start the server
      *
+     * @param {boolean} useOwnCredits
      * @return {Promise<Response>}
      * @throws {RequestError}
      */
-    async start() {
-        return this.#client.request(new StartServerRequest(this.id));
+    async start(useOwnCredits = false) {
+        return this.#client.request(new StartServerRequest(this.id, useOwnCredits));
     }
 
     /**