diff --git a/.gitignore b/.gitignore index 32ef9beb..c2636bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .DS_STORE db/ dist/ -node_modules \ No newline at end of file +node_modules diff --git a/README.md b/README.md new file mode 100644 index 00000000..c679e685 --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# Fosscord Server +Consists of: + * HTTP Rest API + * CDN + * Gateway + * RTC + +## Dev getting started +1. Install deps: `npm i` +2. TODO: Configure +3. Start the server: + * To run all at once, run `npm start` in root directory. + * To run api, do `npm start` in `api` folder + * To run cdn, do `npm start` in `cdn` folder + * To run gateway, do `npm start` in `gateway` folder diff --git a/api/package-lock.json b/api/package-lock.json index 276ae72a..c9dc3919 100644 Binary files a/api/package-lock.json and b/api/package-lock.json differ diff --git a/cdn/package-lock.json b/cdn/package-lock.json deleted file mode 100644 index 0c87d5c3..00000000 Binary files a/cdn/package-lock.json and /dev/null differ diff --git a/cdn/package.json b/cdn/package.json index 26f62b2c..21976809 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -23,7 +23,6 @@ }, "homepage": "https://github.com/discord-open-source/discord-cdn#readme", "dependencies": { - "@fosscord/server-util": "^1.3.42", "@fosscord/util": "file:../util", "body-parser": "^1.19.0", "btoa": "^1.2.1", diff --git a/gateway/package-lock.json b/gateway/package-lock.json deleted file mode 100644 index 40323baa..00000000 Binary files a/gateway/package-lock.json and /dev/null differ diff --git a/gateway/package.json b/gateway/package.json index 98eb04a3..e6c45427 100644 --- a/gateway/package.json +++ b/gateway/package.json @@ -15,7 +15,6 @@ "author": "Fosscord", "license": "ISC", "dependencies": { - "@fosscord/server-util": "^1.3.51", "@fosscord/util": "file:../util", "ajv": "^8.5.0", "amqplib": "^0.8.0", diff --git a/package.json b/package.json new file mode 100644 index 00000000..75d1c3cb --- /dev/null +++ b/package.json @@ -0,0 +1,33 @@ +{ + "name": "fosscord-server", + "version": "1.3.52", + "description": "Fosscord server", + "main": "src/index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "build": "tsc -b .", + "prepublish": "npm run build" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/fosscord/fosscord-server.git" + }, + "keywords": [ + "discord", + "fosscord", + "fosscord-server-util", + "discord open source", + "discord-open-source" + ], + "author": "Fosscord", + "license": "GPLV3", + "bugs": { + "url": "https://github.com/fosscord/fosscord-server/issues" + }, + "homepage": "https://docs.fosscord.com/", + "dependencies": { + "@fosscord/api": "file:api", + "@fosscord/cdn": "file:cdn", + "@fosscord/gateway": "file:gateway" + } +} diff --git a/src/index.js b/src/index.js new file mode 100644 index 00000000..cb1b2356 --- /dev/null +++ b/src/index.js @@ -0,0 +1 @@ +// TODO: start api AND cdn AND gateway \ No newline at end of file diff --git a/util/package-lock.json b/util/package-lock.json deleted file mode 100644 index 4412d90e..00000000 Binary files a/util/package-lock.json and /dev/null differ diff --git a/webrtc/package.json b/webrtc/package.json index d5605c09..8163ac57 100644 --- a/webrtc/package.json +++ b/webrtc/package.json @@ -18,7 +18,7 @@ "typescript": "^4.3.2" }, "dependencies": { - "@fosscord/server-util": "^1.3.15", + "../util": "*", "mediasoup": "^3.7.16", "node-turn": "^0.0.6", "ws": "^7.4.6"