Skip to content

Commit 280a72d

Browse files
committed
add useOwnCredits to start, use json body instead of form-data
1 parent 9bda67d commit 280a72d

File tree

6 files changed

+27
-124
lines changed

6 files changed

+27
-124
lines changed

package-lock.json

Lines changed: 2 additions & 100 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "exaroton",
3-
"version": "1.8.3",
3+
"version": "1.9.0",
44
"description": "exaroton API client",
55
"homepage": "https://exaroton.com",
66
"main": "index.js",
@@ -11,7 +11,6 @@
1111
"node": ">=12.0.0"
1212
},
1313
"dependencies": {
14-
"form-data": "^3.0.1",
1514
"got": "^11.8.2",
1615
"ws": "^7.4.5"
1716
}

src/Client.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,22 +106,22 @@ class Client {
106106
async request(request) {
107107
request.client = this;
108108
const url = this.baseURL + request.getEndpoint();
109-
const headers = Object.assign({
110-
"authorization": "Bearer " + this.#apiToken,
111-
"user-agent": this.#userAgent
112-
}, request.headers);
113109

114110
let gotOptions = {
115111
method: request.method,
116112
retry: 0,
117-
headers: headers,
118113
responseType: request.responseType
119114
};
120115

121116
if (request.hasBody()) {
122117
gotOptions.body = request.getBody();
123118
}
124119

120+
gotOptions.headers = Object.assign({
121+
"authorization": "Bearer " + this.#apiToken,
122+
"user-agent": this.#userAgent
123+
}, request.headers);
124+
125125
let response;
126126
try {
127127
if (request.hasOutputStream()) {

src/Request/Request.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
const FormData = require('form-data');
21
const {createReadStream} = require('fs');
32
const {createWriteStream} = require("fs");
43

@@ -149,20 +148,8 @@ class Request {
149148
return this.data;
150149
}
151150

152-
let body = new FormData();
153-
for (let key in this.data) {
154-
if (!this.data.hasOwnProperty(key)) {
155-
continue;
156-
}
157-
if (Array.isArray(this.data[key])) {
158-
for (let element of this.data[key]) {
159-
body.append(key + "[]", element);
160-
}
161-
continue;
162-
}
163-
body.append(key, this.data[key]);
164-
}
165-
return body;
151+
this.setHeader("content-type", "application/json");
152+
return JSON.stringify(this.data);
166153
}
167154

168155
/**

src/Request/Server/StartServerRequest.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@ const ServerRequest = require('./ServerRequest');
22

33
class StartServerRequest extends ServerRequest {
44
endpoint = "servers/{id}/start";
5+
method = "POST";
6+
7+
/**
8+
* StartServerRequest constructor
9+
*
10+
* @param {string} id
11+
* @param {boolean} useOwnCredits
12+
*/
13+
constructor(id, useOwnCredits = false) {
14+
super(id);
15+
this.data = {
16+
useOwnCredits: useOwnCredits
17+
};
18+
}
519
}
620

721
module.exports = StartServerRequest;

src/Server/Server.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,12 @@ class Server extends EventEmitter {
149149
/**
150150
* Start the server
151151
*
152+
* @param {boolean} useOwnCredits
152153
* @return {Promise<Response>}
153154
* @throws {RequestError}
154155
*/
155-
async start() {
156-
return this.#client.request(new StartServerRequest(this.id));
156+
async start(useOwnCredits = false) {
157+
return this.#client.request(new StartServerRequest(this.id, useOwnCredits));
157158
}
158159

159160
/**

0 commit comments

Comments
 (0)