diff --git a/.docker/env b/.docker/env deleted file mode 100644 index 595b7ba2..00000000 --- a/.docker/env +++ /dev/null @@ -1 +0,0 @@ -MONGO_URL=mongodb://db:27017/fosscord?readPreference=secondaryPreferred diff --git a/.dockerignore b/.dockerignore index 61b7ef66..93d19905 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ node_modules/ -db/ \ No newline at end of file +db/ +dist/ +coverage/ +*.db \ No newline at end of file diff --git a/.env.example b/.env.example new file mode 100644 index 00000000..72449f88 --- /dev/null +++ b/.env.example @@ -0,0 +1,6 @@ +PRODUCTION=false + +DATABASE="postgres://fosscord:fosscord@db:5432/fosscord" + +STORAGE_PROVIDER=file +STORAGE_LOCATION=/data diff --git a/api/Dockerfile b/api/Dockerfile index 16443b15..41c9363b 100644 --- a/api/Dockerfile +++ b/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 -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 apk add --no-cache \ + make \ + gcc \ + g++ \ + python \ + cairo-dev \ + jpeg-dev \ + 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"] diff --git a/bundle/.vscode/tsconfig.json b/bundle/.vscode/tsconfig.json new file mode 100644 index 00000000..632bb40b --- /dev/null +++ b/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" }] + } +} diff --git a/cdn/Dockerfile b/cdn/Dockerfile index bb73884a..2503240b 100644 --- a/cdn/Dockerfile +++ b/cdn/Dockerfile @@ -1,8 +1,14 @@ -FROM node:lts-alpine -WORKDIR /usr/src/fosscord-cdn -COPY package.json . -RUN npm install -COPY . . -EXPOSE 3003 -RUN npm run build -CMD ["node", "dist/start.js"] \ No newline at end of file +FROM node:lts-alpine AS builder + +WORKDIR /usr/src/util + +COPY util . +RUN npm install && npm run build + +WORKDIR /usr/src/cdn + +COPY cdn/ . +RUN npm install && npm run build + +EXPOSE 3001 +CMD ["node", "dist/start.js"] diff --git a/cdn/package-lock.json b/cdn/package-lock.json index 74e1ce52..147264e9 100644 Binary files a/cdn/package-lock.json and b/cdn/package-lock.json differ diff --git a/cdn/package.json b/cdn/package.json index 852bfcdc..919fcc29 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -1,67 +1,67 @@ { - "name": "@fosscord/cdn", - "version": "1.0.0", - "description": "cdn for fosscord", - "main": "dist/index.js", - "types": "src/index.ts", - "scripts": { - "postinstall": "ts-patch install -s", - "test": "npm run build && jest --coverage ./tests", - "build": "npx tsc -p .", - "start": "npm run build && node dist/start.js" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/fosscord/fosscord-server.git" - }, - "keywords": [], - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/fosscord/fosscord-server/issues" - }, - "homepage": "https://github.com/fosscord/fosscord-server#readme", - "devDependencies": { - "@types/amqplib": "^0.8.1", - "@types/body-parser": "^1.19.0", - "@types/btoa": "^1.2.3", - "@types/dotenv": "^8.2.0", - "@types/express": "^4.17.12", - "@types/fs-extra": "^9.0.12", - "@types/jsonwebtoken": "^8.5.0", - "@types/multer": "^1.4.7", - "@types/node": "^14.17.0", - "@types/node-fetch": "^2.5.7", - "@zerollup/ts-transform-paths": "^1.7.18", - "ts-patch": "^1.4.4" - }, - "dependencies": { - "@aws-sdk/client-s3": "^3.36.1", - "@aws-sdk/node-http-handler": "^3.36.0", - "@fosscord/util": "file:../util", - "body-parser": "^1.19.0", - "btoa": "^1.2.1", - "dotenv": "^10.0.0", - "exif-be-gone": "^1.2.0", - "express": "^4.17.1", - "express-async-errors": "^3.1.1", - "file-type": "^16.5.0", - "fs-extra": "^10.0.0", - "image-size": "^1.0.0", - "jest": "^27.0.6", - "lambert-db": "^1.2.3", - "lambert-server": "^1.2.11", - "missing-native-js-functions": "^1.2.18", - "multer": "^1.4.2", - "nanocolors": "^0.2.12", - "node-fetch": "^2.6.1", - "supertest": "^6.1.6", - "typescript": "^4.1.2" - }, - "jest": { - "setupFilesAfterEnv": [ - "/jest/setup.js" - ], - "verbose": true - } -} + "name": "@fosscord/cdn", + "version": "1.0.0", + "description": "cdn for fosscord", + "main": "dist/index.js", + "types": "src/index.ts", + "scripts": { + "test": "npm run build && jest --coverage ./tests", + "build": "npx tsc -p .", + "start": "node dist/start.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/fosscord/fosscord-server.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/fosscord/fosscord-server/issues" + }, + "homepage": "https://github.com/fosscord/fosscord-server#readme", + "devDependencies": { + "@types/amqplib": "^0.8.1", + "@types/body-parser": "^1.19.0", + "@types/btoa": "^1.2.3", + "@types/dotenv": "^8.2.0", + "@types/express": "^4.17.12", + "@types/fs-extra": "^9.0.12", + "@types/jsonwebtoken": "^8.5.0", + "@types/multer": "^1.4.7", + "@types/node": "^14.17.0", + "@types/node-fetch": "^2.5.7", + "@zerollup/ts-transform-paths": "^1.7.18", + "ts-patch": "^1.4.4" + }, + "dependencies": { + "@aws-sdk/client-s3": "^3.36.1", + "@aws-sdk/node-http-handler": "^3.36.0", + "@fosscord/util": "file:../util", + "body-parser": "^1.19.0", + "btoa": "^1.2.1", + "dotenv": "^10.0.0", + "exif-be-gone": "^1.2.0", + "express": "^4.17.1", + "express-async-errors": "^3.1.1", + "file-type": "^16.5.0", + "form-data": "^4.0.0", + "fs-extra": "^10.0.0", + "image-size": "^1.0.0", + "jest": "^27.0.6", + "lambert-db": "^1.2.3", + "lambert-server": "^1.2.12", + "missing-native-js-functions": "^1.2.17", + "multer": "^1.4.2", + "nanocolors": "^0.2.12", + "node-fetch": "^2.6.1", + "supertest": "^6.1.6", + "typescript": "^4.1.2" + }, + "jest": { + "setupFilesAfterEnv": [ + "/jest/setup.js" + ], + "verbose": true + } +} \ No newline at end of file diff --git a/cdn/tsconfig.json b/cdn/tsconfig.json index 249dffff..4630623d 100644 --- a/cdn/tsconfig.json +++ b/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. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + "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. */, diff --git a/docker-compose.yml b/docker-compose.yml index 5861e12f..3dca75fb 100644 --- a/docker-compose.yml +++ b/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 - image: fosscord/api + build: + context: . + dockerfile: api/Dockerfile depends_on: - db ports: - 3001:3001 - env_file: ./.docker/env + env_file: .env + gateway: - hostname: fosscord_gateway - image: fosscord/gateway + build: + context: . + dockerfile: gateway/Dockerfile depends_on: - db ports: - 3002:3002 - env_file: ./.docker/env \ No newline at end of file + 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: {} diff --git a/util/package-lock.json b/util/package-lock.json index 0348b5d5..befa2fbb 100644 Binary files a/util/package-lock.json and b/util/package-lock.json differ diff --git a/util/package.json b/util/package.json index 5692913d..2f712013 100644 --- a/util/package.json +++ b/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", diff --git a/util/tsconfig.json b/util/tsconfig.json index 0398ce9a..84d47006 100644 --- a/util/tsconfig.json +++ b/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. */,