diff --git a/api/Dockerfile b/api/Dockerfile
index b1b00a7a..08d15f72 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,7 +1,7 @@
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-api
+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
diff --git a/api/README.md b/api/README.md
index c8a33a0b..384a9611 100644
--- a/api/README.md
+++ b/api/README.md
@@ -14,7 +14,7 @@
</a>
</p>
-## [About](https://github.com/fosscord/fosscord-api/wiki)
+## [About](https://github.com/fosscord/fosscord-server/wiki)
This repository contains the Fosscord HTTP API Server
@@ -43,8 +43,8 @@ and the other technologies we use
Clone the Repository:
```bash
-git clone https://github.com/fosscord/fosscord-api
-cd discord-server
+git clone https://github.com/fosscord/fosscord-server
+cd fosscord-server
```
#### Install (dev)dependencies:
diff --git a/api/package.json b/api/package.json
index c9dd6b1f..1fe3d574 100644
--- a/api/package.json
+++ b/api/package.json
@@ -12,18 +12,16 @@
"start": "npm run build && node dist/start",
"build": "tsc -b .",
"build-docker": "tsc -p tsconfig-docker.json",
- "dev": "tsnd --respawn src/start.ts",
- "bundle:macos": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord-api.app' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-macos.app.tgz' 'fosscord-api.app'",
- "bundle:linux": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js' && tar -czf 'fosscord-api-linux.tgz' 'fosscord'",
- "bundle:windows": "npx caxa -i . -m 'This may take a while to run the first time, please wait...' --output 'fosscord-api-windows.exe' -- '{{caxa}}/node_modules/.bin/node' '{{caxa}}/dist/start.js'"
+ "dev": "tsnd --respawn src/start.ts"
},
"repository": {
"type": "git",
- "url": "git+https://github.com/fosscord/fosscord-api.git"
+ "url": "git+https://github.com/fosscord/fosscord-server.git"
},
"keywords": [
"discord",
"fosscord",
+ "fosscord-server",
"fosscord-api",
"discord open source",
"discord-open-source"
@@ -31,9 +29,9 @@
"author": "Fosscord",
"license": "ISC",
"bugs": {
- "url": "https://github.com/fosscord/fosscord-api/issues"
+ "url": "https://github.com/fosscord/fosscord-server/issues"
},
- "homepage": "https://github.com/fosscord/fosscord-api#readme",
+ "homepage": "https://fosscord.com",
"dependencies": {
"@fosscord/util": "file:../util",
"@types/jest": "^26.0.22",
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index 8f012973..5b389440 100644
--- a/bundle/package-lock.json
+++ b/bundle/package-lock.json
@@ -34,7 +34,6 @@
"hasInstallScript": true,
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.52",
"@fosscord/util": "file:../util",
"@types/jest": "^26.0.22",
"@types/json-schema": "^7.0.7",
@@ -92,7 +91,6 @@
"hasInstallScript": true,
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.42",
"@fosscord/util": "file:../util",
"body-parser": "^1.19.0",
"btoa": "^1.2.1",
@@ -129,7 +127,6 @@
"hasInstallScript": true,
"license": "ISC",
"dependencies": {
- "@fosscord/server-util": "^1.3.51",
"@fosscord/util": "file:../util",
"ajv": "^8.5.0",
"amqplib": "^0.8.0",
@@ -155,7 +152,7 @@
},
"../util": {
"name": "@fosscord/util",
- "version": "1.3.52",
+ "version": "1.3.55",
"license": "GPLV3",
"dependencies": {
"@types/jsonwebtoken": "^8.5.0",
@@ -1583,7 +1580,6 @@
"@fosscord/api": {
"version": "file:../api",
"requires": {
- "@fosscord/server-util": "^1.3.52",
"@fosscord/util": "file:../util",
"@types/amqplib": "^0.8.1",
"@types/bcrypt": "^5.0.0",
@@ -1636,7 +1632,6 @@
"@fosscord/cdn": {
"version": "file:../cdn",
"requires": {
- "@fosscord/server-util": "^1.3.42",
"@fosscord/util": "file:../util",
"@types/body-parser": "^1.19.0",
"@types/btoa": "^1.2.3",
@@ -1668,7 +1663,6 @@
"@fosscord/gateway": {
"version": "file:../gateway",
"requires": {
- "@fosscord/server-util": "^1.3.51",
"@fosscord/util": "file:../util",
"@types/amqplib": "^0.8.1",
"@types/jsonwebtoken": "^8.5.0",
diff --git a/bundle/package.json b/bundle/package.json
index f4188565..a3478e03 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -12,15 +12,15 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/fosscord/fosscord-api.git"
+ "url": "git+https://github.com/fosscord/fosscord-server.git"
},
"keywords": [],
"author": "Fosscord",
"license": "AGPLV3",
"bugs": {
- "url": "https://github.com/fosscord/fosscord-api/issues"
+ "url": "https://github.com/fosscord/fosscord-server/issues"
},
- "homepage": "https://github.com/fosscord/fosscord-api#readme",
+ "homepage": "https://fosscord.com",
"devDependencies": {
"@types/async-exit-hook": "^2.0.0",
"@types/express": "^4.17.13",
diff --git a/bundle/src/start.ts b/bundle/src/start.ts
index 2ae2ce87..2bfb0069 100644
--- a/bundle/src/start.ts
+++ b/bundle/src/start.ts
@@ -6,7 +6,8 @@ import os from "os";
import osu from "node-os-utils";
import exitHook from "async-exit-hook";
-const cores = Number(process.env.threads) || 1 || os.cpus().length;
+// TODO: add tcp socket event transmission
+const cores = 1 || Number(process.env.threads) || os.cpus().length;
if (cluster.isMaster && !process.env.masterStarted) {
const dbPath = path.join(__dirname, "..", "..", "db");
diff --git a/package.json b/package.json
deleted file mode 100644
index 75d1c3cb..00000000
--- a/package.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "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/util/README.md b/util/README.md
index 9c983acd..fc9ad638 100644
--- a/util/README.md
+++ b/util/README.md
@@ -18,7 +18,7 @@
Fosscord is a free open source selfhostable chat, voice and video discord-compatible platform.
-Fosscord server util contains all necessary logic that is shared between the [api](https://github.com/fosscord/fosscord-api), [gateway](https://github.com/fosscord/fosscord-gateway) and [cdn](https://github.com/fosscord/fosscord-cdn).
+Fosscord server util contains all necessary logic that is shared between the [api](https://github.com/fosscord/fosscord-server/tree/master/api), [gateway](https://github.com/fosscord/fosscord-server/tree/master/gateway) and [cdn](https://github.com/fosscord/fosscord-server/tree/master/cdn).
It contains all mongoose database models and utility functions.
|
