diff --git a/api/package-lock.json b/api/package-lock.json index 882e2a20..aa0c07c5 100644 Binary files a/api/package-lock.json and b/api/package-lock.json differ diff --git a/bundle/package-lock.json b/bundle/package-lock.json index 487e84c3..e8b99037 100644 Binary files a/bundle/package-lock.json and b/bundle/package-lock.json differ diff --git a/bundle/package.json b/bundle/package.json index 2961e8a3..e0ae6156 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -62,7 +62,6 @@ "@fosscord/api": "file:../api", "@fosscord/cdn": "file:../cdn", "@fosscord/gateway": "file:../gateway", - "@fosscord/util": "file:../util", "@sentry/node": "^6.16.1", "@sentry/tracing": "^6.16.1", "ajv": "8.6.2", @@ -105,6 +104,7 @@ "typeorm": "^0.2.37", "typescript": "^4.1.2", "typescript-json-schema": "^0.50.1", - "ws": "^7.4.2" + "ws": "^7.4.2", + "nanocolors": "^0.2.12" } -} +} \ No newline at end of file diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts index 0d5e3d1f..83ce10c2 100644 --- a/bundle/src/Server.ts +++ b/bundle/src/Server.ts @@ -70,6 +70,7 @@ async function main() { new Tracing.Integrations.Express({ app }), ], tracesSampleRate: Config.get().sentry.traceSampleRate, + environment: Config.get().sentry.environment }); app.use(Sentry.Handlers.requestHandler()); diff --git a/cdn/package.json b/cdn/package.json index c029ffbf..fec43785 100644 --- a/cdn/package.json +++ b/cdn/package.json @@ -53,7 +53,7 @@ "lambert-server": "^1.2.12", "missing-native-js-functions": "^1.2.17", "multer": "^1.4.2", - "picocolors": "^1.0.0", + "nanocolors": "^0.2.12", "node-fetch": "^2.6.1", "supertest": "^6.1.6", "typescript": "^4.1.2" diff --git a/gateway/package-lock.json b/gateway/package-lock.json index eec1720d..a9813b6f 100644 Binary files a/gateway/package-lock.json and b/gateway/package-lock.json differ diff --git a/util/package-lock.json b/util/package-lock.json index 74b89e6c..c6f2ed6f 100644 Binary files a/util/package-lock.json and b/util/package-lock.json differ diff --git a/util/src/entities/Config.ts b/util/src/entities/Config.ts index 31384412..9e25c737 100644 --- a/util/src/entities/Config.ts +++ b/util/src/entities/Config.ts @@ -3,6 +3,7 @@ import { BaseClassWithoutId, PrimaryIdColumn } from "./BaseClass"; import crypto from "crypto"; import { Snowflake } from "../util/Snowflake"; import { SessionsReplace } from ".."; +import { hostname } from "os"; @Entity("config") export class ConfigEntity extends BaseClassWithoutId { @@ -193,6 +194,7 @@ export interface ConfigValue { enabled: boolean; endpoint: string; traceSampleRate: number; + environment: string; } } @@ -385,7 +387,8 @@ export const DefaultConfigOptions: ConfigValue = { }, sentry: { enabled: false, - endpoint: "", - traceSampleRate: 1.0 + endpoint: "https://05e8e3d005f34b7d97e920ae5870a5e5@sentry.thearcanebrony.net/6", + traceSampleRate: 1.0, + environment: hostname() } }; diff --git a/webrtc/package-lock.json b/webrtc/package-lock.json new file mode 100644 index 00000000..a5db2de1 Binary files /dev/null and b/webrtc/package-lock.json differ