murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change image API port, added TLS support, fixed content-type header

Browse source
This commit is contained in:
Essem 2021-12-02 18:01:33 -06:00
parent 871979105c
commit 38e5a1d9f2
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
6 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
utils/imageConnection.js
View file

@ -26,6 +26,7 @@ class ImageConnection {
constructor(host, auth, tls = false) {
this.requests = new Map();
this.host = host;
this.port = 3762;
this.auth = auth;
this.tag = null;
this.disconnected = false;
@ -38,7 +39,7 @@ class ImageConnection {
} else {
this.wsproto = "ws";
}
this.sockurl = `${this.wsproto}://${host}/sock`;
this.sockurl = `${this.wsproto}://${host}:${this.port}/sock`;
this.conn = new WebSocket(this.sockurl, {
headers: {
"Authentication": auth && auth !== "" ? auth : undefined
@ -50,7 +51,7 @@ class ImageConnection {
} else {
httpproto = "http";
}
this.httpurl = `${httpproto}://${host}/image`;
this.httpurl = `${httpproto}://${host}:${this.port}/image`;
this.conn.on("message", (msg) => this.onMessage(msg));
this.conn.once("error", (err) => this.onError(err));
this.conn.once("close", () => this.onClose());
@ -86,7 +87,7 @@ class ImageConnection {
}
this.requests.clear();
if (!this.disconnected) {
logger.warn(`Lost connection to ${this.host}, attempting to reconnect in 5 seconds...`);
logger.warn(`Lost connection to ${this.host}:${this.port}, attempting to reconnect in 5 seconds...`);
await setTimeout(5000);
this.conn = new WebSocket(this.sockurl, {
headers: {

2
utils/services/image.js
View file

@ -82,7 +82,7 @@ class ImageWorker extends BaseServiceWorker {
}
async connect(server, auth) {
const connection = new ImageConnection(`${server}:8080`, auth);
const connection = new ImageConnection(server, auth);
this.connections.set(server, connection);
}