Merge branch 'dev/restructure' into staging

2026-10-24 10:42:59 +00:00 · 2022-08-15 11:13:21 +02:00
commit 1a94fb1208
@@ -19,3 +19,5 @@ api/assets/plugins/*.js
 bundle/depclean.*
 *.tmp
 tmp/
+
+assets/cache/
@@ -0,0 +1,17 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${file}",
+            "outFiles": [
+                "${workspaceFolder}/**/*.js"
+            ]
+        }
+    ]
+}
@@ -1,8 +0,0 @@
-MONGO_URL=mongodb://localhost/fosscord
-PORT=3001
-PRODUCTION=TRUE
-THREADS=# automatically use all available cores, only available if production = true
-#LOG_REQUESTS=
-# only log 200 and 204: LOG_REQUESTS=200 204
-# log everything except 200 and 204: LOG_REQUESTS=-200 204
-# log all requests: LOG_REQUESTS=-
@@ -1,115 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# TypeScript v1 declaration files
-typings/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# Next.js build output
-.next
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-build
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and *not* Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-.DS_STORE
-src/ready.json
-
-# Docker
-.docker/config/*
-!.docker/config/.keep
-
-# fosscord
-*.db
@@ -1 +0,0 @@
-!dist/
@@ -1,6 +0,0 @@
-{
-	"tabWidth": 4,
-	"useTabs": true,
-	"printWidth": 140,
-	"trailingComma": "none"
-}
@@ -1,25 +0,0 @@
-{
-	"API Router": {
-		"scope": "javascript,typescript",
-		"prefix": "router",
-		"body": [
-			"import { Router, Response, Request } from \"express\";",
-			"import { route } from \"@fosscord/api\";",
-			"",
-			"const router = Router();",
-			"",
-			"router.get(\"/\", route({}), (req: Request, res: Response) => {",
-			"\tres.json({});",
-			"});",
-			"",
-			"export default router;"
-		],
-		"description": "A basic API router setup for a blank route."
-	},
-	"Route": {
-		"scope": "typescript",
-		"prefix": "route",
-		"body": ["router.get(\"$1\", route({}), (req: Request, res: Response) => {", "\t$2", "});"],
-		"description": "An API endpoint"
-	}
-}
@@ -1,28 +0,0 @@
-{
-	// Use IntelliSense to learn about possible attributes.
-	// Hover to view descriptions of existing attributes.
-	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-	"version": "0.2.0",
-	"configurations": [
-		{
-			"sourceMaps": true,
-			"type": "node",
-			"request": "launch",
-			"name": "Launch Server",
-			"program": "${workspaceFolder}/dist/start.js",
-			"preLaunchTask": "tsc: build - tsconfig.json",
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"envFile": "${workspaceFolder}/.env"
-		},
-		{
-			"name": "Debug current file",
-			"program": "${file}",
-			"request": "launch",
-			"skipFiles": ["<node_internals>/**"],
-			"runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"],
-			"preLaunchTask": "tsc: build - tsconfig.json",
-			"type": "node",
-			"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"]
-		}
-	]
-}
@@ -1,12 +0,0 @@
-FROM node:lts-alpine
-# needed for native packages (bcrypt, canvas)
-RUN apk add --no-cache make gcc g++ python cairo-dev jpeg-dev pango-dev giflib-dev
-WORKDIR /usr/src/fosscord-server
-COPY package.json .
-COPY package-lock.json .
-RUN npm rebuild bcrypt --build-from-source && npm install canvas --build-from-source
-RUN npm install
-COPY . .
-EXPOSE 3001
-RUN npm run build-docker
-CMD ["node", "dist/start.js"]
@@ -1,67 +0,0 @@
-<p align="center">
-  <img width="100" src="https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Icon-Rounded-Subtract.svg" />
-</p>
-<h1 align="center">Fosscord HTTP API Server</h1>
-
-<p>
-  <a href="https://discord.gg/ZrnGQP6p3d">
-    <img src="https://img.shields.io/discord/806142446094385153?color=7489d5&logo=discord&logoColor=ffffff" />
-  </a>
-  <img src="https://img.shields.io/static/v1?label=Status&message=Development&color=blue">
-  <a title="Crowdin" target="_blank" href="https://translate.fosscord.com/"><img src="https://badges.crowdin.net/fosscord/localized.svg"></a>
-   <a href="https://opencollective.com/fosscord">
-    <img src="https://opencollective.com/fosscord/tiers/badge.svg">
-  </a>
-</p>
-
-## [About](https://github.com/fosscord/fosscord-server/wiki)
-
-This repository contains the Fosscord HTTP API Server
-
-## Bug Tracker
-
-[Project Board](https://fosscord.notion.site/2c7fe9e73f9842d3bab3a4912dedd091)
-
-## API
-
-We use [express](https://expressjs.com/) for the HTTP Server and
-[lambert-server](https://www.npmjs.com/package/lambert-server) for route handling and body validation (customized).
-
-## Contribution
-
-You should be familiar with:
-
-   [Git](https://git-scm.com/)
-   [NodeJS](https://nodejs.org/)
-   [TypeScript](https://www.typescriptlang.org/)
-   [MongoDB/mongoose](http://mongoosejs.com/)
-
-and the other technologies we use
-
-### Getting Started
-
-Clone the Repository:
-
-```bash
-git clone https://github.com/fosscord/fosscord-server
-cd fosscord-server
-```
-
-#### Install (dev)dependencies:
-
-```bash
-npm install
-npm install --only=dev
-```
-
-#### Starting:
-
-```
-npm start
-```
-
-#### Debugging:
-
-**Vscode:**
-The Launch file configuration is in `./vscode/launch.json`,
-so you can just debug the server by pressing `F5` or the `> Launch Server` button
@@ -1,6 +0,0 @@
-module.exports = {
-	presets: [
-		["@babel/preset-env", { targets: { node: "current" } }],
-		["@babel/preset-typescript", { allowDeclareFields: true }]
-	]
-};
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-		<title>Discord Test Client</title>
-		<link rel="stylesheet" href="/assets/fosscord.css" />
-		<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />
-		<link id="customcss" rel="stylesheet" href="/assets/user.css" />
-		<!-- inline plugin marker -->
-		<!-- preload plugin marker -->
-	</head>
-
-	<body>
-		<div id="app-mount"></div>
-		<script>
-			window.__OVERLAY__ = /overlay/.test(location.pathname);
-			window.__BILLING_STANDALONE__ = /^\/billing/.test(location.pathname);
-			window.GLOBAL_ENV = {
-				API_ENDPOINT: "/api",
-				API_VERSION: 9,
-				GATEWAY_ENDPOINT: `${location.protocol === "https:" ? "wss://" : "ws://"}${location.hostname}:3002`,
-				WEBAPP_ENDPOINT: "",
-				CDN_HOST: `${location.hostname}:3003`,
-				ASSET_ENDPOINT: "",
-				MEDIA_PROXY_ENDPOINT: "https://media.discordapp.net",
-				WIDGET_ENDPOINT: `//${location.host}/widget`,
-				INVITE_HOST: `${location.hostname}/invite`,
-				GUILD_TEMPLATE_HOST: "${location.host}",
-				GIFT_CODE_HOST: "${location.hostname}",
-				RELEASE_CHANNEL: "stable",
-				MARKETING_ENDPOINT: "//discord.com",
-				BRAINTREE_KEY: "production_5st77rrc_49pp2rp4phym7387",
-				STRIPE_KEY: "pk_live_CUQtlpQUF0vufWpnpUmQvcdi",
-				NETWORKING_ENDPOINT: "//router.discordapp.net",
-				RTC_LATENCY_ENDPOINT: "//${location.hostname}/rtc",
-				PROJECT_ENV: "production",
-				REMOTE_AUTH_ENDPOINT: "//localhost:3020",
-				SENTRY_TAGS: { buildId: "75e36d9", buildType: "normal" },
-				MIGRATION_SOURCE_ORIGIN: "https://${location.hostname}",
-				MIGRATION_DESTINATION_ORIGIN: "https://${location.hostname}",
-				HTML_TIMESTAMP: Date.now(),
-				ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0"
-			};
-			GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
-			const localStorage = window.localStorage;
-			// TODO: remote auth
-			// window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
-			localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
-			localStorage.setItem(
-				"DeveloperOptionsStore",
-				`{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
-			);
-
-			setInterval(() => {
-				let token = JSON.parse(localStorage.getItem("token"));
-				if (token) {
-					let logincss = document.querySelector('#logincss'),
-					canRemove = logincss ? logincss: "";
-					if(canRemove !== "") {
-					document.querySelector("#logincss").remove();
-					canRemove = "";
-					}
-				}
-			}, 1000)
-
-			const settings = JSON.parse(localStorage.getItem("UserSettingsStore"));
-			if (settings && settings.locale.length <= 2) {
-				// fix client locale wrong and client not loading at all
-				settings.locale = "en-US";
-				localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
-			}
-		</script>
-	 	<script src="/assets/checkLocale.js"></script>
-		<script src="/assets/1e18f2aac02e172db283.js"></script>
-		<script src="/assets/681e53cdfefa5b82249a.js"></script>
-		<script src="/assets/7a036838c0a0e73f59d8.js"></script>
-		<script src="/assets/b6cf2184a7a05e7525ce.js"></script>
-		<!-- plugin marker -->
-	</body>
-</html>
@@ -1,66 +0,0 @@
-const { traverseDirectory } = require("lambert-server");
-const path = require("path");
-const express = require("express");
-const RouteUtility = require("../dist/util/route");
-const Router = express.Router;
-
-/**
- * Some documentation.
- *
- * @type {Map<string, RouteUtility.RouteOptions>}
- */
-const routes = new Map();
-let currentPath = "";
-let currentFile = "";
-const methods = ["get", "post", "put", "delete", "patch"];
-
-function registerPath(file, method, prefix, path, ...args) {
-	const urlPath = prefix + path;
-	const sourceFile = file.replace("/dist/", "/src/").replace(".js", ".ts");
-	const opts = args.find((x) => typeof x === "object");
-	if (opts) {
-		routes.set(urlPath + "|" + method, opts); // @ts-ignore
-		opts.file = sourceFile;
-		// console.log(method, urlPath, opts);
-	} else {
-		console.log(`${sourceFile}\nrouter.${method}("${path}") is missing the "route()" description middleware\n`);
-	}
-}
-
-function routeOptions(opts) {
-	return opts;
-}
-
-// @ts-ignore
-RouteUtility.route = routeOptions;
-
-express.Router = (opts) => {
-	const path = currentPath;
-	const file = currentFile;
-	const router = Router(opts);
-
-	for (const method of methods) {
-		router[method] = registerPath.bind(null, file, method, path);
-	}
-
-	return router;
-};
-
-module.exports = function getRouteDescriptions() {
-	const root = path.join(__dirname, "..", "dist", "routes", "/");
-	traverseDirectory({ dirname: root, recursive: true }, (file) => {
-		currentFile = file;
-		let path = file.replace(root.slice(0, -1), "");
-		path = path.split(".").slice(0, -1).join("."); // trancate .js/.ts file extension of path
-		path = path.replaceAll("#", ":").replaceAll("\\", "/"); // replace # with : for path parameters and windows paths with slashes
-		if (path.endsWith("/index")) path = path.slice(0, "/index".length * -1); // delete index from path
-		currentPath = path;
-
-		try {
-			require(file);
-		} catch (error) {
-			console.error("error loading file " + file, error);
-		}
-	});
-	return routes;
-};
@@ -1,20 +0,0 @@
-const { Config, initDatabase } = require("@fosscord/util");
-const fs = require("fs");
-const path = require("path");
-const { FosscordServer } = require("../dist/Server");
-const Server = new FosscordServer({ port: 3001 });
-global.server = Server;
-module.exports = async () => {
-	try {
-		fs.unlinkSync(path.join(process.cwd(), "database.db"));
-	} catch {}
-
-	await initDatabase();
-	await Config.init();
-	Config.get().limits.rate.disabled = true;
-	return await Server.start();
-};
-
-// afterAll(async () => {
-// 	return await Server.stop();
-// });
@@ -1,2 +0,0 @@
-jest.spyOn(global.console, "log").mockImplementation(() => jest.fn());
-jest.spyOn(global.console, "info").mockImplementation(() => jest.fn());
@@ -1,91 +0,0 @@
-{
-	"name": "@fosscord/api",
-	"version": "1.0.0",
-	"description": "This repository contains the HTTP API Server",
-	"main": "dist/index.js",
-	"types": "src/index.ts",
-	"scripts": {
-		"test:only": "npx jest --coverage --verbose --forceExit ./tests",
-		"test:routes": "npx jest --coverage --verbose --forceExit ./routes.test.ts",
-		"test": "npm run build && npm run test:only",
-		"test:watch": "npx jest --watch",
-		"start": "npm run build && node dist/start",
-		"build": "npx tsc -p .",
-		"dev": "npx tsnd --respawn src/start.ts",
-		"patch": "npx ts-patch install -s && npx patch-package",
-		"postinstall": "npm run patch",
-		"generate:docs": "node scripts/generate_openapi",
-		"generate:schema": "node scripts/generate_schema"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/fosscord/fosscord-server.git"
-	},
-	"keywords": [
-		"discord",
-		"fosscord",
-		"fosscord-server",
-		"fosscord-api",
-		"discord open source",
-		"discord-open-source"
-	],
-	"author": "Fosscord",
-	"license": "AGPL-3.0-only",
-	"bugs": {
-		"url": "https://github.com/fosscord/fosscord-server/issues"
-	},
-	"homepage": "https://fosscord.com",
-	"devDependencies": {
-		"@babel/core": "^7.18.9",
-		"@babel/preset-env": "^7.18.9",
-		"@babel/preset-typescript": "^7.15.0",
-		"@types/bcrypt": "^5.0.0",
-		"@types/express": "^4.17.9",
-		"@types/i18next-node-fs-backend": "^2.1.0",
-		"@types/morgan": "^1.9.3",
-		"@types/multer": "^1.4.5",
-		"@types/node": "^18.0.6",
-		"jest": "^28.1.3",
-		"jest-expect-message": "^1.0.2",
-		"ts-node-dev": "^2.0.0",
-		"typescript": "^4.4.2",
-		"typescript-json-schema": "^0.54.0"
-	},
-	"dependencies": {
-		"@babel/preset-typescript": "^7.15.0",
-		"@fosscord/util": "file:../util",
-		"ajv": "8.6.2",
-		"ajv-formats": "^2.1.1",
-		"bcrypt": "^5.0.1",
-		"body-parser": "^1.19.0",
-		"canvas": "^2.9.3",
-		"cheerio": "^1.0.0-rc.10",
-		"dotenv": "^16.0.1",
-		"express": "^4.17.1",
-		"i18next": "^21.8.14",
-		"i18next-http-middleware": "^3.1.3",
-		"i18next-node-fs-backend": "^2.1.3",
-		"image-size": "^1.0.0",
-		"lambert-server": "^1.2.12",
-		"missing-native-js-functions": "^1.2.18",
-		"morgan": "^1.10.0",
-		"multer": "^1.4.5-lts.1",
-		"node-2fa": "^2.0.3",
-		"node-fetch": "^2.6.7",
-		"patch-package": "^6.4.7",
-		"picocolors": "^1.0.0",
-		"proxy-agent": "^5.0.0",
-		"supertest": "^6.1.6",
-		"typeorm": "^0.3.7"
-	},
-	"jest": {
-		"setupFiles": [
-			"<rootDir>/jest/setup.js"
-		],
-		"setupFilesAfterEnv": [
-			"jest-expect-message"
-		],
-		"globalSetup": "<rootDir>/jest/globalSetup.js",
-		"verbose": true
-	}
-}
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="UTF-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>Discord Test Client</title>
+	<link rel="stylesheet" href="/assets/fosscord.css" />
+	<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />
+	<link id="customcss" rel="stylesheet" href="/assets/user.css" />
+	<!-- inline plugin marker -->
+	<!-- preload plugin marker -->
+</head>
+
+<body>
+	<div id="app-mount"></div>
+	<script>
+		window.__OVERLAY__ = /overlay/.test(location.pathname);
+		window.__BILLING_STANDALONE__ = /^\/billing/.test(location.pathname);
+		window.GLOBAL_ENV = {
+			API_ENDPOINT: "/api",
+			API_VERSION: 9,
+			GATEWAY_ENDPOINT: `${location.protocol === "https:" ? "wss://" : "ws://"}${location.host}`,
+			WEBAPP_ENDPOINT: "",
+			CDN_HOST: `${location.hostname}:3003`,
+			ASSET_ENDPOINT: "",
+			MEDIA_PROXY_ENDPOINT: "https://media.discordapp.net",
+			WIDGET_ENDPOINT: `//${location.host}/widget`,
+			INVITE_HOST: `${location.hostname}/invite`,
+			GUILD_TEMPLATE_HOST: "${location.host}",
+			GIFT_CODE_HOST: "${location.hostname}",
+			RELEASE_CHANNEL: "stable",
+			MARKETING_ENDPOINT: "//discord.com",
+			BRAINTREE_KEY: "production_5st77rrc_49pp2rp4phym7387",
+			STRIPE_KEY: "pk_live_CUQtlpQUF0vufWpnpUmQvcdi",
+			NETWORKING_ENDPOINT: "//router.discordapp.net",
+			RTC_LATENCY_ENDPOINT: "//${location.hostname}/rtc",
+			ACTIVITY_APPLICATION_HOST: 'discordsays.com',
+			PROJECT_ENV: "production",
+			REMOTE_AUTH_ENDPOINT: "//localhost:3020",
+			SENTRY_TAGS: { buildId: "75e36d9", buildType: "normal" },
+			MIGRATION_SOURCE_ORIGIN: "https://${location.hostname}",
+			MIGRATION_DESTINATION_ORIGIN: "https://${location.hostname}",
+			HTML_TIMESTAMP: Date.now(),
+			ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0",
+		};
+		GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
+		const localStorage = window.localStorage;
+		// TODO: remote auth
+		// window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
+		localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
+		localStorage.setItem(
+			"DeveloperOptionsStore",
+			`{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
+		);
+
+		setInterval(() => {
+			let token = JSON.parse(localStorage.getItem("token"));
+			if (token) {
+				let logincss = document.querySelector('#logincss'),
+					canRemove = logincss ? logincss : "";
+				if (canRemove !== "") {
+					document.querySelector("#logincss").remove();
+					canRemove = "";
+				}
+			}
+		}, 1000)
+
+		const settings = JSON.parse(localStorage.getItem("UserSettingsStore"));
+		if (settings && settings.locale.length <= 2) {
+			// fix client locale wrong and client not loading at all
+			settings.locale = "en-US";
+			localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
+		}
+	</script>
+	<script src="/assets/checkLocale.js"></script>
+	<script src="/assets/2f2e0c25e45eb2f5a6f1.js"></script>
+	<script src="/assets/006e72c08a4c69cb66fc.js"></script>
+	<script src="/assets/2f94a3ba801087653a38.js"></script>
+	<script src="/assets/f7703f092bdbfc607cc7.js"></script>
+	<!-- plugin marker -->
+</body>
+
+</html>