mirror of
https://github.com/spacebarchat/spacebarchat.git
synced 2024-11-09 20:22:45 +01:00
Merge branch 'master' of https://github.com/fosscord/fosscord
This commit is contained in:
commit
33ca701049
29
.github/workflows/sync.yml
vendored
Normal file
29
.github/workflows/sync.yml
vendored
Normal file
@ -0,0 +1,29 @@
|
||||
name: Update submodules
|
||||
|
||||
# Controls when the action will run.
|
||||
on:
|
||||
# Allows you to run this workflow manually from the Actions tab
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: "0 0 * * *"
|
||||
|
||||
jobs:
|
||||
# This workflow contains a single job called "update"
|
||||
update:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Pull & update submodules recursively
|
||||
run: |
|
||||
git submodule update --init --recursive
|
||||
git submodule update --recursive --remote
|
||||
|
||||
- name: Commit & push changes
|
||||
run: |
|
||||
git config --global user.name Fosscord
|
||||
git config --global user.email actions@github.com
|
||||
git commit -am "Update submodules"
|
||||
git push
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ node_modules/
|
||||
.DS_STORE
|
||||
.docker/data/*
|
||||
!.docker/data/.keep
|
||||
dist/
|
68
.gitmodules
vendored
68
.gitmodules
vendored
@ -1,39 +1,3 @@
|
||||
[submodule "fosscord/api"]
|
||||
path = api
|
||||
url = https://github.com/fosscord/fosscord-api
|
||||
[submodule "fosscord/gateway"]
|
||||
path = gateway
|
||||
url = https://github.com/fosscord/fosscord-gateway
|
||||
[submodule "fosscord/themes"]
|
||||
path = themes
|
||||
url = https://github.com/fosscord/fosscord-themes
|
||||
[submodule "fosscord/plugins"]
|
||||
path = plugins
|
||||
url = https://github.com/fosscord/fosscord-plugins
|
||||
[submodule "fosscord/media"]
|
||||
path = media
|
||||
url = https://github.com/fosscord/fosscord-media
|
||||
[submodule "fosscord/server-util"]
|
||||
path = server-util
|
||||
url = https://github.com/fosscord/fosscord-server-util
|
||||
[submodule "fosscord/cdn"]
|
||||
path = cdn
|
||||
url = https://github.com/fosscord/fosscord-cdn
|
||||
[submodule "fosscord/ui"]
|
||||
path = ui
|
||||
url = https://github.com/fosscord/fosscord-ui
|
||||
[submodule "fosscord/client"]
|
||||
path = client
|
||||
url = https://github.com/fosscord/fosscord-client
|
||||
[submodule "fosscord/dashboard"]
|
||||
path = dashboard
|
||||
url = https://github.com/fosscord/fosscord-dashboard
|
||||
[submodule "fosscord/support"]
|
||||
path = support
|
||||
url = https://github.com/fosscord/fosscord-support
|
||||
[submodule "fosscord/landingpage"]
|
||||
path = landingpage
|
||||
url = https://github.com/fosscord/fosscord-landingpage
|
||||
[submodule "docs"]
|
||||
path = docs
|
||||
url = https://github.com/fosscord/fosscord-docs
|
||||
@ -41,38 +5,66 @@
|
||||
[submodule "fosscord.js"]
|
||||
path = fosscord.js
|
||||
url = https://github.com/fosscord/fosscord.js/
|
||||
branch = master
|
||||
[submodule "collection"]
|
||||
path = collection
|
||||
url = https://github.com/fosscord/fosscord.js-collection
|
||||
branch = master
|
||||
[submodule "api"]
|
||||
path = api
|
||||
url = https://github.com/fosscord/fosscord-api
|
||||
branch = master
|
||||
[submodule "cdn"]
|
||||
path = cdn
|
||||
url = https://github.com/fosscord/fosscord-cdn
|
||||
branch = master
|
||||
[submodule "client"]
|
||||
path = client
|
||||
url = https://github.com/fosscord/fosscord-client
|
||||
branch = master
|
||||
[submodule "dashboard"]
|
||||
path = dashboard
|
||||
url = https://github.com/fosscord/fosscord-dashboard
|
||||
branch = master
|
||||
[submodule "gateway"]
|
||||
path = gateway
|
||||
url = https://github.com/fosscord/fosscord-gateway
|
||||
branch = master
|
||||
[submodule "landingpage"]
|
||||
branch = master
|
||||
[submodule "media"]
|
||||
path = landingpage
|
||||
url = https://github.com/fosscord/fosscord-landingpage
|
||||
branch = master
|
||||
[submodule "plugins"]
|
||||
path = plugins
|
||||
url = https://github.com/fosscord/fosscord-plugins
|
||||
branch = master
|
||||
[submodule "server-util"]
|
||||
path = server-util
|
||||
url = https://github.com/fosscord/fosscord-server-util
|
||||
branch = master
|
||||
[submodule "support"]
|
||||
path = support
|
||||
url = https://github.com/fosscord/fosscord-support
|
||||
branch = master
|
||||
[submodule "themes"]
|
||||
path = themes
|
||||
url = https://github.com/fosscord/fosscord-themes
|
||||
branch = master
|
||||
[submodule "ui"]
|
||||
path = ui
|
||||
url = https://github.com/fosscord/fosscord-ui
|
||||
branch = master
|
||||
[submodule "voice-gateway"]
|
||||
path = voice-gateway
|
||||
url = https://github.com/fosscord/fosscord-voice-gateway
|
||||
branch = master
|
||||
[submodule "rtc"]
|
||||
path = rtc
|
||||
url = https://github.com/fosscord/fosscord-rtc
|
||||
branch = master
|
||||
[submodule "client-native"]
|
||||
path = client-native
|
||||
url = https://github.com/fosscord/fosscord-client-native
|
||||
[submodule "rtc-js"]
|
||||
path = rtc-js
|
||||
url = https://github.com/fosscord/fosscord-rtc-js
|
||||
|
2
api
2
api
@ -1 +1 @@
|
||||
Subproject commit d96878d57cef093cfeeb9d598e19c135355b8863
|
||||
Subproject commit 2be07d2f7375c991644b9debd49c4bb7bf42e821
|
2
cdn
2
cdn
@ -1 +1 @@
|
||||
Subproject commit fdaa277935aa2807218c369cbb323db7f27fd8a2
|
||||
Subproject commit c845d19226e1a261b062784132cd5d3d70dd9a96
|
2
client
2
client
@ -1 +1 @@
|
||||
Subproject commit 35c6422503c640ab3a68d30cae226254d31d2829
|
||||
Subproject commit 988f96089f15f0dddac4a038a9755b24c21f11fc
|
@ -6,7 +6,7 @@ services:
|
||||
build: gateway
|
||||
ports:
|
||||
- "3002:3002"
|
||||
links:
|
||||
depends_on:
|
||||
- mongo
|
||||
env_file: ./.docker/env
|
||||
fosscord-api:
|
||||
@ -15,7 +15,7 @@ services:
|
||||
build: api
|
||||
ports:
|
||||
- "3001:3001"
|
||||
links:
|
||||
depends_on:
|
||||
- mongo
|
||||
env_file: ./.docker/env
|
||||
mongo:
|
||||
@ -27,6 +27,7 @@ services:
|
||||
ports:
|
||||
- "27017:27017"
|
||||
command: mongod --replSet rs0
|
||||
restart: unless-stopped
|
||||
mongo-init-replica:
|
||||
image: mongo
|
||||
command: >
|
||||
@ -40,5 +41,5 @@ services:
|
||||
echo \"Tried $$i times. Waiting 5 secs...\";
|
||||
sleep 5;
|
||||
done; (exit $$s)"
|
||||
links:
|
||||
depends_on:
|
||||
- mongo
|
2
docs
2
docs
@ -1 +1 @@
|
||||
Subproject commit a90a039c14b53a1d2c434c1c17b9f95ac0041546
|
||||
Subproject commit 374c1f038b83103825a8519752e87b45d7227dce
|
@ -1 +0,0 @@
|
||||
Subproject commit 9c9c948ae9eb1959aabd70eff968dd49272a05fb
|
@ -1 +0,0 @@
|
||||
Subproject commit 78e5b546b620e9d2aac7e5fdc45c4fd7b5c2f046
|
@ -33,6 +33,15 @@
|
||||
{
|
||||
"path": "./api"
|
||||
},
|
||||
{
|
||||
"path": "./rtc"
|
||||
},
|
||||
{
|
||||
"path": "./rtc-js"
|
||||
},
|
||||
{
|
||||
"path": "./voice-gateway"
|
||||
},
|
||||
{
|
||||
"path": "./landingpage"
|
||||
},
|
||||
@ -60,5 +69,6 @@
|
||||
{
|
||||
"path": "./ui"
|
||||
}
|
||||
]
|
||||
],
|
||||
"settings": {}
|
||||
}
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 1a7a20d1eebc667bc8c6ec858143f446be4c472c
|
||||
Subproject commit 9b079b2097899f881f242730ce4b4984a3a28c53
|
2
gateway
2
gateway
@ -1 +1 @@
|
||||
Subproject commit afa30bd07a2fa05a52720dd0ea79faf5cc9444f9
|
||||
Subproject commit 8437156fd384f594e434b19b7ce217286f5780f3
|
@ -1 +1 @@
|
||||
Subproject commit c7b2b1945385e2025457731886d5a7dcdf3f6066
|
||||
Subproject commit fdb3753f0b5602d80f5f72a8648e45cb0b20c0a6
|
1
media
1
media
@ -1 +0,0 @@
|
||||
Subproject commit f107fa823e8d14c79f2e7ba6fe1c17309ee3c259
|
1
rtc
Submodule
1
rtc
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit d2fb1ee4588436eca9bb0097bd06ca05dbc3e5f0
|
1
rtc-js
Submodule
1
rtc-js
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit ae1a1fddd36836cad127bc86a3220ccacd97ec17
|
7487
scripts/server/package-lock.json
generated
Normal file
7487
scripts/server/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
52
scripts/server/package.json
Normal file
52
scripts/server/package.json
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
"name": "build",
|
||||
"version": "1.0.0",
|
||||
"description": "",
|
||||
"main": "dist/start.js",
|
||||
"bin": "dist/start.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"build:cdn": "tsc -b node_modules/@fosscord/cdn",
|
||||
"build:gateway": "tsc -b node_modules/@fosscord/gateway",
|
||||
"build:api": "tsc -b node_modules/@fosscord/api",
|
||||
"build": "npm run build:cdn && npm run build:gateway && npm run build:api && tsc -b . ",
|
||||
"package": "pkg",
|
||||
"start": "npm run build && node dist/start.js"
|
||||
},
|
||||
"pkg": {
|
||||
"scripts": [],
|
||||
"assets": [
|
||||
"node_modules/@fosscord/**/*",
|
||||
"dist/**/*.js"
|
||||
],
|
||||
"targets": [
|
||||
"latest-linux-arm64",
|
||||
"latest-linux-x64",
|
||||
"latest-win-x64",
|
||||
"latest-win-arm64",
|
||||
"latest-macos-x64",
|
||||
"latest-macos-arm64"
|
||||
],
|
||||
"outputPath": "build"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@fosscord/api": "github:fosscord/fosscord-api",
|
||||
"@fosscord/cdn": "github:fosscord/fosscord-cdn",
|
||||
"@fosscord/gateway": "github:fosscord/fosscord-gateway",
|
||||
"@fosscord/server-util": "^1.3.16",
|
||||
"mongodb-memory-server": "^6.9.6",
|
||||
"mongoose": "^5.12.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/bcrypt": "^5.0.0",
|
||||
"@types/express": "^4.17.12",
|
||||
"@types/i18next-node-fs-backend": "^2.1.0",
|
||||
"@types/multer": "^1.4.5",
|
||||
"@types/node-fetch": "^2.5.10",
|
||||
"@types/ws": "^7.4.4",
|
||||
"pkg": "^5.2.1"
|
||||
}
|
||||
}
|
26
scripts/server/src/server.ts
Normal file
26
scripts/server/src/server.ts
Normal file
@ -0,0 +1,26 @@
|
||||
import http from "http";
|
||||
import cluster from "cluster";
|
||||
|
||||
import { FosscordServer as APIServer } from "@fosscord/api";
|
||||
import { Server as GatewayServer } from "@fosscord/gateway";
|
||||
import { CDNServer } from "@fosscord/cdn";
|
||||
import express from "express";
|
||||
import { Config } from "@fosscord/server-util";
|
||||
|
||||
const app = express();
|
||||
const server = http.createServer(app);
|
||||
const port = 8080;
|
||||
const production = true;
|
||||
|
||||
const api = new APIServer({ server, port, production, app });
|
||||
// const cdn = new CDNServer({ server, port, production, app });
|
||||
const gateway = new GatewayServer({ server, port });
|
||||
|
||||
async function main() {
|
||||
await Promise.all([api.start(), gateway.listen()]);
|
||||
|
||||
if (!Config.get().gateway.endpoint) await Config.set({ gateway: { endpoint: `ws://localhost:${port}` } });
|
||||
if (!Config.get().cdn.endpoint) await Config.set({ cdn: { endpoint: `http://localhost:${port}` } });
|
||||
}
|
||||
|
||||
main().caught();
|
48
scripts/server/src/start.ts
Normal file
48
scripts/server/src/start.ts
Normal file
@ -0,0 +1,48 @@
|
||||
// process.env.MONGOMS_DEBUG = "1";
|
||||
import fs from "fs/promises";
|
||||
import { MongoMemoryReplSet } from "mongodb-memory-server";
|
||||
import path from "path";
|
||||
import cluster from "cluster";
|
||||
import os from "os";
|
||||
|
||||
const cores = Number(process.env.threads) || 1 || os.cpus().length;
|
||||
|
||||
if (cluster.isMaster && !process.env.masterStarted) {
|
||||
const dbPath = path.join(__dirname, "..", "data", "db");
|
||||
|
||||
const replicaSetName = "rs1";
|
||||
|
||||
const mongod = new MongoMemoryReplSet({
|
||||
autoStart: false,
|
||||
|
||||
replSet: {
|
||||
name: replicaSetName,
|
||||
dbName: "fosscord",
|
||||
storageEngine: "wiredTiger",
|
||||
count: 1,
|
||||
},
|
||||
});
|
||||
process.env.masterStarted = "true";
|
||||
|
||||
(async () => {
|
||||
await fs.mkdir(dbPath, { recursive: true });
|
||||
|
||||
await mongod.start();
|
||||
console.log(`[DB] started`);
|
||||
process.env.MONGO_URL = (await mongod.getUri()) + `replicaSet=${replicaSetName}&w=majority`;
|
||||
|
||||
console.log(`Primary ${process.pid} is running`);
|
||||
|
||||
// Fork workers.
|
||||
for (let i = 0; i < cores; i++) {
|
||||
cluster.fork();
|
||||
}
|
||||
|
||||
cluster.on("exit", (worker: any, code: any, signal: any) => {
|
||||
console.log(`worker ${worker.process.pid} died, restart worker`);
|
||||
cluster.fork();
|
||||
});
|
||||
})();
|
||||
} else {
|
||||
require("./server");
|
||||
}
|
BIN
scripts/server/start
Executable file
BIN
scripts/server/start
Executable file
Binary file not shown.
70
scripts/server/tsconfig.json
Normal file
70
scripts/server/tsconfig.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"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. */
|
||||
}
|
||||
}
|
@ -1,19 +1,16 @@
|
||||
# Getting Started
|
||||
## Without automated scripts
|
||||
To use this method, you must have [NodeJS and NPM](https://nodejs.org) installed.
|
||||
|
||||
### Windows
|
||||
1. Open up a Terminal.
|
||||
2. Type this command: `curl https://raw.githubusercontent.com/fosscord/fosscord/main/scripts/setup/setup.bat --output setup.bat && setup.bat`.
|
||||
1. Open cmd
|
||||
2. Type this command:
|
||||
```
|
||||
curl https://raw.githubusercontent.com/fosscord/fosscord/main/scripts/setup/setup.bat --output setup.bat && setup.bat
|
||||
```
|
||||
|
||||
### Posix systems (MacOS, Linux...)
|
||||
1. Open up a Terminal.
|
||||
2. Type this command: `curl https://raw.githubusercontent.com/fosscord/fosscord/main/scripts/setup/setup.sh --output setup.sh && sh setup.sh`.
|
||||
|
||||
## With automated scripts
|
||||
This method need to have [Git](https://git-scm.com) installed.
|
||||
### Windows
|
||||
1. Open up a Terminal.
|
||||
2. Type this command: `git clone https://github.com/fosscord/fosscord && .\fosscord\scripts\setup\setup.bat`.
|
||||
|
||||
### Posix systems (MacOS, Linux...)
|
||||
1. Open up a Terminal.
|
||||
2. Type this command: `git clone https://github.com/fosscord/fosscord && sh ./fosscord/scripts/setup/setup.sh`.
|
||||
### Linux or macOS
|
||||
1. Open Terminal
|
||||
2. Type this command:
|
||||
```
|
||||
curl https://raw.githubusercontent.com/fosscord/fosscord/main/scripts/setup/setup.sh --output setup.sh && bash setup.sh
|
||||
```
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 9fb7bf9491e8d88ee1244624d3dedd5cce018474
|
||||
Subproject commit 9b3f1f5a642d9fa6e240c1d693722705e3472704
|
2
ui
2
ui
@ -1 +1 @@
|
||||
Subproject commit 5fc8130d9d8b389f0efaf589c40f83688ae740e8
|
||||
Subproject commit f59416cf151389f7add104dfca986639a95ce06b
|
1
voice-gateway
Submodule
1
voice-gateway
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 76f56f4c829e53fa4b5ab097dbcfdf7e28c09d54
|
Loading…
Reference in New Issue
Block a user