Merge branch 'master' of http://github.com/fosscord/fosscord-server

Dockerfile

@@ -1,4 +1,4 @@
-FROM nikolaik/python-nodejs:latest
+FROM node:14
 WORKDIR /usr/src/fosscord-server/
 COPY . .
 WORKDIR /usr/src/fosscord-server/bundle

api/package.json

@@ -86,6 +86,7 @@
 		"multer": "^1.4.2",
 		"node-fetch": "^2.6.1",
 		"patch-package": "^6.4.7",
+		"proxy-agent": "^5.0.0",
 		"supertest": "^6.1.6",
 		"typeorm": "^0.2.37"
 	},

api/src/middlewares/TestClient.ts

@@ -2,9 +2,11 @@ import express, { Request, Response, Application } from "express";
 import fs from "fs";
 import path from "path";
 import fetch, { Response as FetchResponse } from "node-fetch";
+import ProxyAgent from 'proxy-agent';
 import { Config } from "@fosscord/util";
 
 export default function TestClient(app: Application) {
+	const agent = new ProxyAgent();
 	const assetCache = new Map<string, { response: FetchResponse; buffer: Buffer }>();
 	const indexHTML = fs.readFileSync(path.join(__dirname, "..", "..", "client_test", "index.html"), { encoding: "utf8" });
 
@@ -31,6 +33,7 @@ export default function TestClient(app: Application) {
 		const cache = assetCache.get(req.params.file);
 		if (!cache) {
 			response = await fetch(`https://discord.com/assets/${req.params.file}`, {
+				agent,
 				// @ts-ignore
 				headers: {
 					...req.headers

api/src/routes/gifs/search.ts

@@ -1,5 +1,6 @@
 import { Router, Response, Request } from "express";
 import fetch from "node-fetch";
+import ProxyAgent from 'proxy-agent';
 import { route } from "@fosscord/api";
 import { getGifApiKey, parseGifResult } from "./trending";
 
@@ -10,8 +11,11 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	const { q, media_format, locale } = req.query;
 
 	const apiKey = getGifApiKey();
+	
+	const agent = new ProxyAgent();
 
 	const response = await fetch(`https://g.tenor.com/v1/search?q=${q}&media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
+		agent,
 		method: "get",
 		headers: { "Content-Type": "application/json" }
 	});

api/src/routes/gifs/trending-gifs.ts

@@ -1,5 +1,6 @@
 import { Router, Response, Request } from "express";
 import fetch from "node-fetch";
+import ProxyAgent from 'proxy-agent';
 import { route } from "@fosscord/api";
 import { getGifApiKey, parseGifResult } from "./trending";
 
@@ -10,8 +11,11 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	const { media_format, locale } = req.query;
 
 	const apiKey = getGifApiKey();
+	
+	const agent = new ProxyAgent();
 
 	const response = await fetch(`https://g.tenor.com/v1/trending?media_format=${media_format}&locale=${locale}&key=${apiKey}`, {
+		agent,
 		method: "get",
 		headers: { "Content-Type": "application/json" }
 	});

api/src/routes/gifs/trending.ts

@@ -1,5 +1,6 @@
 import { Router, Response, Request } from "express";
 import fetch from "node-fetch";
+import ProxyAgent from 'proxy-agent';
 import { route } from "@fosscord/api";
 import { Config } from "@fosscord/util";
 import { HTTPError } from "lambert-server";
@@ -33,13 +34,17 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	const { media_format, locale } = req.query;
 
 	const apiKey = getGifApiKey();
+	
+	const agent = new ProxyAgent();
 
 	const [responseSource, trendGifSource] = await Promise.all([
 		fetch(`https://g.tenor.com/v1/categories?locale=${locale}&key=${apiKey}`, {
+			agent,
 			method: "get",
 			headers: { "Content-Type": "application/json" }
 		}),
 		fetch(`https://g.tenor.com/v1/trending?locale=${locale}&key=${apiKey}`, {
+			agent,
 			method: "get",
 			headers: { "Content-Type": "application/json" }
 		})

bundle/package.json

@@ -92,11 +92,13 @@
 		"node-os-utils": "^1.3.5",
 		"patch-package": "^6.4.7",
 		"pg": "^8.7.1",
+		"proxy-agent": "^5.0.0",
 		"reflect-metadata": "^0.1.13",
+		"sqlite3": "^5.0.2",
 		"supertest": "^6.1.6",
 		"typeorm": "^0.2.37",
 		"typescript": "^4.1.2",
 		"typescript-json-schema": "^0.50.1",
 		"ws": "^7.4.2"
 	}
-}
+}

docker-compose.yml

@@ -1,24 +1,7 @@
 version: "3"
 services:
-    db:
-        hostname: fosscord_db
-        image: mongo:latest
-        volumes:
-            - ./db:/data/db
-        restart: unless-stopped
-    api:
-        hostname: fosscord_api
-        image: fosscord/api
-        depends_on:
-            - db
-        ports:
-            - 3001:3001
-        env_file: ./.docker/env
-    gateway:
-        hostname: fosscord_gateway
-        image: fosscord/gateway
-        depends_on:
-            - db
-        ports:
-            - 3002:3002
-        env_file: ./.docker/env
+  server:
+    image: fosscord/server
+    build: .
+    ports:
+      - 3001:3001

gateway/package.json

@@ -33,6 +33,7 @@
 		"lambert-server": "^1.2.11",
 		"missing-native-js-functions": "^1.2.18",
 		"node-fetch": "^2.6.1",
+		"proxy-agent": "^5.0.0",
 		"typeorm": "^0.2.37",
 		"ws": "^7.4.2"
 	},

util/package.json

@@ -40,6 +40,7 @@
 	"dependencies": {
 		"amqplib": "^0.8.0",
 		"better-sqlite3": "^7.4.3",
+		"form-data": "^4.0.0",
 		"jsonwebtoken": "^8.5.1",
 		"lambert-server": "^1.2.12",
 		"missing-native-js-functions": "^1.2.18",
@@ -48,6 +49,7 @@
 		"node-fetch": "^2.6.1",
 		"patch-package": "^6.4.7",
 		"pg": "^8.7.1",
+		"proxy-agent": "^5.0.0",
 		"reflect-metadata": "^0.1.13",
 		"typeorm": "^0.2.38",
 		"typescript": "^4.4.2",

util/src/util/AutoUpdate.ts

@@ -1,5 +1,6 @@
 import "missing-native-js-functions";
 import fetch from "node-fetch";
+import ProxyAgent from 'proxy-agent';
 import readline from "readline";
 import fs from "fs/promises";
 import path from "path";
@@ -52,7 +53,8 @@ async function download(url: string, dir: string) {
 	try {
 		// TODO: use file stream instead of buffer (to prevent crash because of high memory usage for big files)
 		// TODO check file hash
-		const response = await fetch(url);
+		const agent = new ProxyAgent();
+		const response = await fetch(url, { agent });
 		const buffer = await response.buffer();
 		const tempDir = await fs.mkdtemp("fosscord");
 		fs.writeFile(path.join(tempDir, "Fosscord.zip"), buffer);
@@ -72,7 +74,8 @@ async function getCurrentVersion(dir: string) {
 
 async function getLatestVersion(url: string) {
 	try {
-		const response = await fetch(url);
+		const agent = new ProxyAgent();
+		const response = await fetch(url, { agent });
 		const content = await response.json();
 		return content.version;
 	} catch (error) {