Merge branch 'docker-fix' of https://github.com/hbjydev/fosscord-server into hbjydev-docker-fix

.docker/env

@@ -1 +0,0 @@
-MONGO_URL=mongodb://db:27017/fosscord?readPreference=secondaryPreferred

.dockerignore

@@ -1,2 +1,5 @@
 node_modules/
-db/
+db/
+dist/
+coverage/
+*.db

.env.example

@@ -0,0 +1,6 @@
+PRODUCTION=false
+
+DATABASE="postgres://fosscord:fosscord@db:5432/fosscord"
+
+STORAGE_PROVIDER=file
+STORAGE_LOCATION=/data

api/Dockerfile

@@ -1,12 +1,29 @@
-FROM node:lts-alpine
+FROM node:lts-alpine AS builder
+
 # needed for native packages (bcrypt, canvas)
-RUN apk add --no-cache make gcc g++ python cairo-dev jpeg-dev pango-dev giflib-dev
+RUN apk add --no-cache \
-WORKDIR /usr/src/fosscord-server
+    make \
-COPY package.json .
+    gcc \
-COPY package-lock.json .
+    g++ \
-RUN npm rebuild bcrypt --build-from-source && npm install canvas --build-from-source
+    python \
-RUN npm install
+    cairo-dev \
-COPY . .
+    jpeg-dev \
-EXPOSE 3001
+    pango-dev \
+    giflib-dev
+
+WORKDIR /usr/src/api
+
+RUN npm rebuild bcrypt --build-from-source \
+    && npm install canvas --build-from-source
+
+COPY api/package.json api/package-lock.json ./
+COPY util ../util
+RUN cd ../util && npm install && cd ../api && npm install
+
+COPY api/ .
+
 RUN npm run build
+
+EXPOSE 3001
+
 CMD ["node", "dist/start.js"]

bundle/.vscode/tsconfig.json

@@ -0,0 +1,76 @@
+{
+	"include": ["src/**/*.ts"],
+	"compilerOptions": {
+		/* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+		/* Basic Options */
+		"incremental": true /* Enable incremental compilation */,
+		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
+		"lib": ["ES2015", "dom"] /* Specify library files to be included in the compilation. */,
+		"allowJs": true /* Allow javascript files to be compiled. */,
+		"checkJs": true /* Report errors in .js files. */,
+		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+		"declaration": true /* Generates corresponding '.d.ts' file. */,
+		"declarationMap": false /* Generates a sourcemap for each corresponding '.d.ts' file. */,
+		"inlineSourceMap": true /* Emit a single file with source maps instead of having a separate file. */,
+		// "sourceMap": true /* Generates corresponding '.map' file. */,
+		// "outFile": "./",                       /* Concatenate and emit output to single file. */
+		"outDir": "./dist/" /* Redirect output structure to the directory. */,
+		"rootDir": "./src/" /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */,
+		// "composite": true,                     /* Enable project compilation */
+		// "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+		// "removeComments": true,                /* Do not emit comments to output. */
+		// "noEmit": true,                        /* Do not emit outputs. */
+		// "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+		// "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+		// "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+		/* Strict Type-Checking Options */
+		"strict": true /* Enable all strict type-checking options. */,
+		"noImplicitAny": true /* Raise error on expressions and declarations with an implied 'any' type. */,
+		// "strictNullChecks": true,              /* Enable strict null checks. */
+		// "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+		// "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+		"strictPropertyInitialization": false /* Enable strict checking of property initialization in classes. */,
+		// "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+		"alwaysStrict": true /* Parse in strict mode and emit "use strict" for each source file. */,
+
+		/* Additional Checks */
+		// "noUnusedLocals": true,                /* Report errors on unused locals. */
+		// "noUnusedParameters": true,            /* Report errors on unused parameters. */
+		// "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+		// "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+		/* Module Resolution Options */
+		// "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+		// "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+		// "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+		// "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+		// "typeRoots": [],                       /* List of folders to include type definitions from. */
+		"types": ["node"] /* Type declaration files to be included in compilation. */,
+		// "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+		"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
+		// "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+		// "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+		/* Source Map Options */
+		// "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+		// "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+		/* Experimental Options */
+		"experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+		"emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+		/* Advanced Options */
+		"skipLibCheck": true /* Skip type checking of declaration files. */,
+		"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */,
+		"baseUrl": ".",
+		"paths": {
+			"@fosscord/cdn": ["src/index"],
+			"@fosscord/cdn/*": ["src/*"]
+		},
+		"plugins": [{ "transform": "@zerollup/ts-transform-paths" }]
+	}
+}

cdn/Dockerfile

@@ -1,8 +1,14 @@
-FROM node:lts-alpine
+FROM node:lts-alpine AS builder
-WORKDIR /usr/src/fosscord-cdn
+
-COPY package.json .
+WORKDIR /usr/src/util
-RUN npm install
+
-COPY . .
+COPY util .
-EXPOSE 3003
+RUN npm install && npm run build
-RUN npm run build
+
-CMD ["node", "dist/start.js"]
+WORKDIR /usr/src/cdn
+
+COPY cdn/ .
+RUN npm install && npm run build
+
+EXPOSE 3001
+CMD ["node", "dist/start.js"]

cdn/package.json

@@ -1,67 +1,67 @@
 {
-	"name": "@fosscord/cdn",
+    "name": "@fosscord/cdn",
-	"version": "1.0.0",
+    "version": "1.0.0",
-	"description": "cdn for fosscord",
+    "description": "cdn for fosscord",
-	"main": "dist/index.js",
+    "main": "dist/index.js",
-	"types": "src/index.ts",
+    "types": "src/index.ts",
-	"scripts": {
+    "scripts": {
-		"postinstall": "ts-patch install -s",
+        "test": "npm run build && jest --coverage ./tests",
-		"test": "npm run build && jest --coverage ./tests",
+        "build": "npx tsc -p .",
-		"build": "npx tsc -p .",
+        "start": "node dist/start.js"
-		"start": "npm run build && node dist/start.js"
+    },
-	},
+    "repository": {
-	"repository": {
+        "type": "git",
-		"type": "git",
+        "url": "git+https://github.com/fosscord/fosscord-server.git"
-		"url": "git+https://github.com/fosscord/fosscord-server.git"
+    },
-	},
+    "keywords": [],
-	"keywords": [],
+    "author": "",
-	"author": "",
+    "license": "ISC",
-	"license": "ISC",
+    "bugs": {
-	"bugs": {
+        "url": "https://github.com/fosscord/fosscord-server/issues"
-		"url": "https://github.com/fosscord/fosscord-server/issues"
+    },
-	},
+    "homepage": "https://github.com/fosscord/fosscord-server#readme",
-	"homepage": "https://github.com/fosscord/fosscord-server#readme",
+    "devDependencies": {
-	"devDependencies": {
+        "@types/amqplib": "^0.8.1",
-		"@types/amqplib": "^0.8.1",
+        "@types/body-parser": "^1.19.0",
-		"@types/body-parser": "^1.19.0",
+        "@types/btoa": "^1.2.3",
-		"@types/btoa": "^1.2.3",
+        "@types/dotenv": "^8.2.0",
-		"@types/dotenv": "^8.2.0",
+        "@types/express": "^4.17.12",
-		"@types/express": "^4.17.12",
+        "@types/fs-extra": "^9.0.12",
-		"@types/fs-extra": "^9.0.12",
+        "@types/jsonwebtoken": "^8.5.0",
-		"@types/jsonwebtoken": "^8.5.0",
+        "@types/multer": "^1.4.7",
-		"@types/multer": "^1.4.7",
+        "@types/node": "^14.17.0",
-		"@types/node": "^14.17.0",
+        "@types/node-fetch": "^2.5.7",
-		"@types/node-fetch": "^2.5.7",
+        "@zerollup/ts-transform-paths": "^1.7.18",
-		"@zerollup/ts-transform-paths": "^1.7.18",
+        "ts-patch": "^1.4.4"
-		"ts-patch": "^1.4.4"
+    },
-	},
+    "dependencies": {
-	"dependencies": {
+        "@aws-sdk/client-s3": "^3.36.1",
-		"@aws-sdk/client-s3": "^3.36.1",
+        "@aws-sdk/node-http-handler": "^3.36.0",
-		"@aws-sdk/node-http-handler": "^3.36.0",
+        "@fosscord/util": "file:../util",
-		"@fosscord/util": "file:../util",
+        "body-parser": "^1.19.0",
-		"body-parser": "^1.19.0",
+        "btoa": "^1.2.1",
-		"btoa": "^1.2.1",
+        "dotenv": "^10.0.0",
-		"dotenv": "^10.0.0",
+        "exif-be-gone": "^1.2.0",
-		"exif-be-gone": "^1.2.0",
+        "express": "^4.17.1",
-		"express": "^4.17.1",
+        "express-async-errors": "^3.1.1",
-		"express-async-errors": "^3.1.1",
+        "file-type": "^16.5.0",
-		"file-type": "^16.5.0",
+        "form-data": "^4.0.0",
-		"fs-extra": "^10.0.0",
+        "fs-extra": "^10.0.0",
-		"image-size": "^1.0.0",
+        "image-size": "^1.0.0",
-		"jest": "^27.0.6",
+        "jest": "^27.0.6",
-		"lambert-db": "^1.2.3",
+        "lambert-db": "^1.2.3",
-		"lambert-server": "^1.2.11",
+        "lambert-server": "^1.2.12",
-		"missing-native-js-functions": "^1.2.18",
+        "missing-native-js-functions": "^1.2.17",
-		"multer": "^1.4.2",
+        "multer": "^1.4.2",
-		"nanocolors": "^0.2.12",
+        "nanocolors": "^0.2.12",
-		"node-fetch": "^2.6.1",
+        "node-fetch": "^2.6.1",
-		"supertest": "^6.1.6",
+        "supertest": "^6.1.6",
-		"typescript": "^4.1.2"
+        "typescript": "^4.1.2"
-	},
+    },
-	"jest": {
+    "jest": {
-		"setupFilesAfterEnv": [
+        "setupFilesAfterEnv": [
-			"<rootDir>/jest/setup.js"
+            "<rootDir>/jest/setup.js"
-		],
+        ],
-		"verbose": true
+        "verbose": true
-	}
+    }
-}
+}

cdn/tsconfig.json

@@ -5,9 +5,9 @@
 
 		/* Basic Options */
 		"incremental": true /* Enable incremental compilation */,
-		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+		"target": "ES2020" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
 		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
-		"lib": ["ES2015", "dom"] /* Specify library files to be included in the compilation. */,
+		"lib": ["ES2020", "dom"] /* Specify library files to be included in the compilation. */,
 		"allowJs": true /* Allow javascript files to be compiled. */,
 		"checkJs": true /* Report errors in .js files. */,
 		// "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
@@ -60,8 +60,8 @@
 		// "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
 		/* Experimental Options */
-		// "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+		"experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
-		// "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+		"emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
 
 		/* Advanced Options */
 		"skipLibCheck": true /* Skip type checking of declaration files. */,

docker-compose.yml

@@ -1,24 +1,52 @@
+---
 version: "3"
+
 services:
     db:
         hostname: fosscord_db
-        image: mongo:latest
+        image: postgres:latest
         volumes:
-            - ./db:/data/db
+            - db_data:/var/lib/postgres
         restart: unless-stopped
+        ports:
+            - 5432:5432
+        environment:
+            POSTGRES_USER: fosscord
+            POSTGRES_DATABASE: fosscord
+            POSTGRES_PASSWORD: fosscord
+
     api:
-        hostname: fosscord_api
+        build:
-        image: fosscord/api
+            context: .
+            dockerfile: api/Dockerfile
         depends_on:
             - db
         ports:
             - 3001:3001
-        env_file: ./.docker/env
+        env_file: .env
+
     gateway:
-        hostname: fosscord_gateway
+        build:
-        image: fosscord/gateway
+            context: .
+            dockerfile: gateway/Dockerfile
         depends_on:
             - db
         ports:
             - 3002:3002
-        env_file: ./.docker/env
+        env_file: .env
+
+    cdn:
+        build:
+            context: .
+            dockerfile: cdn/Dockerfile
+        depends_on:
+            - db
+        ports:
+            - 3003:3003
+        volumes:
+            - cdn_data:/data
+        env_file: .env
+
+volumes:
+    db_data: {}
+    cdn_data: {}

util/package.json

@@ -7,7 +7,6 @@
 	"scripts": {
 		"start": "npm run build && node dist/",
 		"test": "npm run build && jest",
-		"postinstall": "npm run build",
 		"build": "npx tsc -p .",
 		"typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js"
 	},
@@ -39,6 +38,7 @@
 	},
 	"dependencies": {
 		"amqplib": "^0.8.0",
+		"form-data": "^4.0.0",
 		"jsonwebtoken": "^8.5.1",
 		"lambert-server": "^1.2.12",
 		"missing-native-js-functions": "^1.2.18",

util/tsconfig.json

@@ -5,7 +5,7 @@
 
 		/* Basic Options */
 		"incremental": true /* Enable incremental compilation */,
-		"target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
+		"target": "ES2019" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */,
 		"module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */,
 		"lib": ["ES2021"] /* Specify library files to be included in the compilation. */,
 		"allowJs": true /* Allow javascript files to be compiled. */,