Fix slowcord additional services

.gitignore

@@ -9,6 +9,5 @@ files/
 config.json
 
 .vscode/settings.json
-api/assets/plugins/*.js
 
 build

package-lock.json

@@ -10,7 +10,6 @@
 			"hasInstallScript": true,
 			"license": "AGPL-3.0-only",
 			"dependencies": {
-				"@yukikaze-bot/erlpack": "*",
 				"ajv": "^8.6.2",
 				"ajv-formats": "^2.1.1",
 				"bcrypt": "^5.0.1",

src-slowcord/bot/package-lock.json

@@ -9,15 +9,77 @@
 			"version": "1.0.0",
 			"license": "ISC",
 			"dependencies": {
-				"@fosscord/util": "file:../../util",
 				"fosscord-gopnik": "^1.0.0",
+				"fosscord-server": "file:../..",
 				"mysql": "^2.18.1",
 				"typescript": "^4.7.4"
 			}
 		},
+		"../..": {
+			"version": "1.0.0",
+			"hasInstallScript": true,
+			"license": "AGPL-3.0-only",
+			"dependencies": {
+				"ajv": "^8.6.2",
+				"ajv-formats": "^2.1.1",
+				"bcrypt": "^5.0.1",
+				"cheerio": "^1.0.0-rc.12",
+				"cookie-parser": "^1.4.6",
+				"dotenv": "^16.0.2",
+				"exif-be-gone": "^1.3.1",
+				"fast-zlib": "^2.0.1",
+				"file-type": "16.5",
+				"form-data": "^4.0.0",
+				"i18next": "^21.9.2",
+				"i18next-http-middleware": "^3.2.1",
+				"i18next-node-fs-backend": "^2.1.3",
+				"image-size": "^1.0.2",
+				"json-bigint": "^1.0.0",
+				"jsonwebtoken": "^8.5.1",
+				"lambert-server": "^1.2.12",
+				"module-alias": "^2.2.2",
+				"morgan": "^1.10.0",
+				"multer": "^1.4.5-lts.1",
+				"node-2fa": "^2.0.3",
+				"node-fetch": "^2.6.7",
+				"node-os-utils": "^1.3.7",
+				"picocolors": "^1.0.0",
+				"proxy-agent": "^5.0.0",
+				"sharp": "^0.31.0",
+				"sqlite3": "^5.1.1",
+				"typeorm": "^0.3.10",
+				"typescript-json-schema": "^0.50.1",
+				"ws": "^8.9.0"
+			},
+			"devDependencies": {
+				"@types/amqplib": "^0.8.2",
+				"@types/bcrypt": "^5.0.0",
+				"@types/cookie-parser": "^1.4.3",
+				"@types/i18next-node-fs-backend": "^2.1.1",
+				"@types/json-bigint": "^1.0.1",
+				"@types/jsonwebtoken": "^8.5.9",
+				"@types/morgan": "^1.9.3",
+				"@types/multer": "^1.4.7",
+				"@types/node": "^18.7.20",
+				"@types/node-fetch": "^2.6.2",
+				"@types/node-os-utils": "^1.3.0",
+				"@types/sharp": "^0.31.0",
+				"@types/ws": "^8.5.3",
+				"express": "^4.18.1",
+				"typescript": "^4.8.3"
+			},
+			"optionalDependencies": {
+				"@aws-sdk/client-s3": "^3.178.0",
+				"@sentry/node": "^7.13.0",
+				"@sentry/tracing": "^7.13.0",
+				"@yukikaze-bot/erlpack": "^1.0.1",
+				"amqplib": "^0.10.3"
+			}
+		},
 		"../../util": {
 			"name": "@fosscord/util",
 			"version": "1.0.0",
+			"extraneous": true,
 			"hasInstallScript": true,
 			"license": "AGPL-3.0-only",
 			"dependencies": {
@@ -71,10 +133,6 @@
 				"node": ">=16.9.0"
 			}
 		},
-		"node_modules/@fosscord/util": {
-			"resolved": "../../util",
-			"link": true
-		},
 		"node_modules/@sapphire/async-queue": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.3.1.tgz",
@@ -227,6 +285,10 @@
 				"discord.js": "^13.5.1"
 			}
 		},
+		"node_modules/fosscord-server": {
+			"resolved": "../..",
+			"link": true
+		},
 		"node_modules/inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
@@ -415,33 +477,6 @@
 			"resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-0.7.0.tgz",
 			"integrity": "sha512-R5i8Wb8kIcBAFEPLLf7LVBQKBDYUL+ekb23sOgpkpyGT+V4P7V83wTxcsqmX+PbqHt4cEHn053uMWfRqh/Z/nA=="
 		},
-		"@fosscord/util": {
-			"version": "file:../../util",
-			"requires": {
-				"@types/amqplib": "^0.8.1",
-				"@types/jsonwebtoken": "^8.5.0",
-				"@types/multer": "^1.4.7",
-				"@types/node": "^14.17.9",
-				"@types/node-fetch": "^2.5.12",
-				"amqplib": "^0.8.0",
-				"form-data": "^4.0.0",
-				"jest": "^27.0.6",
-				"jsonwebtoken": "^8.5.1",
-				"lambert-server": "^1.2.12",
-				"missing-native-js-functions": "^1.2.18",
-				"multer": "^1.4.3",
-				"node-fetch": "^2.6.2",
-				"patch-package": "^6.4.7",
-				"pg": "^8.7.1",
-				"picocolors": "^1.0.0",
-				"proxy-agent": "^5.0.0",
-				"reflect-metadata": "^0.1.13",
-				"ts-node": "^10.2.1",
-				"typeorm": "^0.2.37",
-				"typescript": "^4.4.2",
-				"typescript-json-schema": "^0.50.1"
-			}
-		},
 		"@sapphire/async-queue": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.3.1.tgz",
@@ -563,6 +598,61 @@
 				"discord.js": "^13.5.1"
 			}
 		},
+		"fosscord-server": {
+			"version": "file:../..",
+			"requires": {
+				"@aws-sdk/client-s3": "^3.178.0",
+				"@sentry/node": "^7.13.0",
+				"@sentry/tracing": "^7.13.0",
+				"@types/amqplib": "^0.8.2",
+				"@types/bcrypt": "^5.0.0",
+				"@types/cookie-parser": "^1.4.3",
+				"@types/i18next-node-fs-backend": "^2.1.1",
+				"@types/json-bigint": "^1.0.1",
+				"@types/jsonwebtoken": "^8.5.9",
+				"@types/morgan": "^1.9.3",
+				"@types/multer": "^1.4.7",
+				"@types/node": "^18.7.20",
+				"@types/node-fetch": "^2.6.2",
+				"@types/node-os-utils": "^1.3.0",
+				"@types/sharp": "^0.31.0",
+				"@types/ws": "^8.5.3",
+				"@yukikaze-bot/erlpack": "^1.0.1",
+				"ajv": "^8.6.2",
+				"ajv-formats": "^2.1.1",
+				"amqplib": "^0.10.3",
+				"bcrypt": "^5.0.1",
+				"cheerio": "^1.0.0-rc.12",
+				"cookie-parser": "^1.4.6",
+				"dotenv": "^16.0.2",
+				"exif-be-gone": "^1.3.1",
+				"express": "^4.18.1",
+				"fast-zlib": "^2.0.1",
+				"file-type": "16.5",
+				"form-data": "^4.0.0",
+				"i18next": "^21.9.2",
+				"i18next-http-middleware": "^3.2.1",
+				"i18next-node-fs-backend": "^2.1.3",
+				"image-size": "^1.0.2",
+				"json-bigint": "^1.0.0",
+				"jsonwebtoken": "^8.5.1",
+				"lambert-server": "^1.2.12",
+				"module-alias": "^2.2.2",
+				"morgan": "^1.10.0",
+				"multer": "^1.4.5-lts.1",
+				"node-2fa": "^2.0.3",
+				"node-fetch": "^2.6.7",
+				"node-os-utils": "^1.3.7",
+				"picocolors": "^1.0.0",
+				"proxy-agent": "^5.0.0",
+				"sharp": "^0.31.0",
+				"sqlite3": "^5.1.1",
+				"typeorm": "^0.3.10",
+				"typescript": "^4.8.3",
+				"typescript-json-schema": "^0.50.1",
+				"ws": "^8.9.0"
+			}
+		},
 		"inherits": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",

src-slowcord/bot/package.json

@@ -10,7 +10,7 @@
 	"author": "",
 	"license": "ISC",
 	"dependencies": {
-		"@fosscord/util": "file:../../util",
+		"fosscord-server": "file:../..",
 		"fosscord-gopnik": "^1.0.0",
 		"mysql": "^2.18.1",
 		"typescript": "^4.7.4"

src-slowcord/bot/src/index.ts

@@ -1,7 +1,7 @@
 import "dotenv/config";
 import Fosscord from "fosscord-gopnik";
 import Bot from "./Bot.js";	// huh?
-import { initDatabase } from "@fosscord/util";
+import { initDatabase } from "fosscord-server/src/util";
 
 const client = new Fosscord.Client({
 	intents: ["GUILD_MESSAGES"],

src-slowcord/login/package.json

@@ -3,6 +3,7 @@
 	"version": "1.0.0",
 	"description": "Slowcord login service",
 	"main": "build/index.js",
+	"types": "src/index.ts",
 	"scripts": {
 		"build": "tsc -b",
 		"start": "node build/index.js"
@@ -18,7 +19,7 @@
 	},
 	"homepage": "https://github.com/maddyunderstars/fosscord-server#readme",
 	"dependencies": {
-		"@fosscord/util": "file:../../util",
+		"fosscord-server": "file:../../",
 		"cookie-parser": "^1.4.6",
 		"dotenv": "^16.0.1",
 		"express": "^4.18.1",

src-slowcord/login/src/index.ts

@@ -1,8 +1,7 @@
 import "dotenv/config";
 import express, { Request, Response } from "express";
 import cookieParser from "cookie-parser";
-import * as util from "@fosscord/util";
+import { initDatabase, generateToken, User, Config, handleFile } from "fosscord-server/src/util";
-const { initDatabase, generateToken, User, Config, handleFile } = util;
 import path from "path";
 import fetch from "node-fetch";