diff --git a/index.js b/index.js index 2fff1d2..b12cd6c 100644 --- a/index.js +++ b/index.js @@ -10,7 +10,7 @@ import path from "node:path"; import rammerhead from "@rubynetwork/rammerhead"; import chalk from "chalk"; import dotenv from "dotenv-flow"; -import wisp from "wisp-server-node"; +import { server as wisp, logging } from "@mercuryworkshop/wisp-js/server"; import router from "./middleware/ProxyExt/index.js"; import { handler as astroSSR } from "./dist/server/entry.mjs"; import cookies from "cookie-parser"; @@ -20,6 +20,7 @@ dotenv.config(); const whiteListedDomains = ["aluu.xyz", "localhost"]; const LICENSE_SERVER_URL = "https://license.mercurywork.shop/validate?license="; const MASQR_ENABLED = process.env.MASQR_ENABLED; +logging.set_level(logging.WARN); const log = (message) => console.log(chalk.gray.bold("[Alu] " + message)); const success = (message) => console.log(chalk.green.bold("[Alu] " + message)); diff --git a/package.json b/package.json index e38f954..d42e365 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,7 @@ "express": "^4.21.1", "notyf": "^3.10.0", "sequelize": "^6.37.5", - "sqlite3": "^5.1.7", - "wisp-server-node": "^1.1.7" + "sqlite3": "^5.1.7" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^7.18.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc2887f..0606ad4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,16 +28,16 @@ importers: version: 1.3.12 '@mercuryworkshop/wisp-js': specifier: ^0.3.2 - version: 0.3.2(utf-8-validate@6.0.4) + version: 0.3.2 '@rubynetwork/rammerhead': specifier: ^1.3.5 - version: 1.3.5(bufferutil@4.0.8)(utf-8-validate@6.0.4) + version: 1.3.5(bufferutil@4.0.8) '@titaniumnetwork-dev/ultraviolet': specifier: ^3.2.10 version: 3.2.10 '@tomphttp/bare-server-node': specifier: ^2.0.4 - version: 2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.4) + version: 2.0.4(bufferutil@4.0.8) '@types/node': specifier: ^20.17.1 version: 20.17.1 @@ -65,9 +65,6 @@ importers: sqlite3: specifier: ^5.1.7 version: 5.1.7 - wisp-server-node: - specifier: ^1.1.7 - version: 1.1.7 optionalDependencies: bufferutil: specifier: ^4.0.8 @@ -2976,10 +2973,6 @@ packages: url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - utf-8-validate@6.0.4: - resolution: {integrity: sha512-xu9GQDeFp+eZ6LnCywXN/zBancWvOpUMzgjLPSjy4BRHSmTelvn2E0DG0o1sTiw5hkCKBHo8rwSKncfRfv2EEQ==} - engines: {node: '>=6.14.2'} - util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -3070,9 +3063,6 @@ packages: resolution: {integrity: sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==} engines: {node: '>=18'} - wisp-server-node@1.1.7: - resolution: {integrity: sha512-1kL4dbGAZLHks3qYQDOzhxFKvmKwPwfMFTskvsdOc2YA6TmUKZvq5TNPkGs9JJXPnWiOtqMzAVQVC/FwixxXvQ==} - wkx@0.5.0: resolution: {integrity: sha512-Xng/d4Ichh8uN4l0FToV/258EjMGU9MGcA0HV2d9B/ZpZB3lqQm7nkOdZdm5GhKtLLhAE7PiVQwN4eN+2YJJUg==} @@ -3602,12 +3592,12 @@ snapshots: dependencies: libcurl.js: 0.6.17 - '@mercuryworkshop/wisp-js@0.3.2(utf-8-validate@6.0.4)': + '@mercuryworkshop/wisp-js@0.3.2': dependencies: bufferutil: 4.0.8 commander: 12.1.0 ipaddr.js: 2.2.0 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) + ws: 8.18.0(bufferutil@4.0.8) transitivePeerDependencies: - utf-8-validate @@ -3701,9 +3691,9 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.24.2': optional: true - '@rubynetwork/rammerhead@1.3.5(bufferutil@4.0.8)(utf-8-validate@6.0.4)': + '@rubynetwork/rammerhead@1.3.5(bufferutil@4.0.8)': dependencies: - '@rubynetwork/rh': 1.2.74(bufferutil@4.0.8)(utf-8-validate@6.0.4) + '@rubynetwork/rh': 1.2.74(bufferutil@4.0.8) commander: 12.1.0 picocolors: 1.1.1 transitivePeerDependencies: @@ -3711,17 +3701,17 @@ snapshots: - supports-color - utf-8-validate - '@rubynetwork/rh@1.2.74(bufferutil@4.0.8)(utf-8-validate@6.0.4)': + '@rubynetwork/rh@1.2.74(bufferutil@4.0.8)': dependencies: async-exit-hook: 2.0.1 cookie: 0.7.2 lru-cache: 7.18.3 mime: 2.6.0 sticky-session-custom: 1.2.1 - testcafe-hammerhead: 31.7.2(bufferutil@4.0.8)(utf-8-validate@6.0.4) + testcafe-hammerhead: 31.7.2(bufferutil@4.0.8) uglify-js: 3.19.3 uuid: 8.3.2 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) + ws: 8.18.0(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - supports-color @@ -3764,7 +3754,7 @@ snapshots: parse5: 7.2.0 set-cookie-parser: 2.7.1 - '@tomphttp/bare-server-node@2.0.4(bufferutil@4.0.8)(utf-8-validate@6.0.4)': + '@tomphttp/bare-server-node@2.0.4(bufferutil@4.0.8)': dependencies: async-exit-hook: 2.0.1 commander: 10.0.1 @@ -3772,7 +3762,7 @@ snapshots: http-errors: 2.0.0 ipaddr.js: 2.2.0 source-map-support: 0.5.21 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) + ws: 8.18.0(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - utf-8-validate @@ -6428,7 +6418,7 @@ snapshots: mkdirp: 1.0.4 yallist: 4.0.0 - testcafe-hammerhead@31.7.2(bufferutil@4.0.8)(utf-8-validate@6.0.4): + testcafe-hammerhead@31.7.2(bufferutil@4.0.8): dependencies: '@adobe/css-tools': 4.4.0 '@electron/asar': 3.2.14 @@ -6454,7 +6444,7 @@ snapshots: semver: 7.5.3 tough-cookie: 4.1.3 tunnel-agent: 0.6.0 - ws: 7.5.10(bufferutil@4.0.8)(utf-8-validate@6.0.4) + ws: 7.5.10(bufferutil@4.0.8) transitivePeerDependencies: - bufferutil - supports-color @@ -6601,10 +6591,6 @@ snapshots: querystringify: 2.2.0 requires-port: 1.0.0 - utf-8-validate@6.0.4: - dependencies: - node-gyp-build: 4.8.2 - util-deprecate@1.0.2: {} utils-merge@1.0.1: {} @@ -6665,12 +6651,6 @@ snapshots: dependencies: string-width: 7.2.0 - wisp-server-node@1.1.7: - dependencies: - bufferutil: 4.0.8 - utf-8-validate: 6.0.4 - ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4) - wkx@0.5.0: dependencies: '@types/node': 20.17.1 @@ -6685,15 +6665,13 @@ snapshots: wrappy@1.0.2: {} - ws@7.5.10(bufferutil@4.0.8)(utf-8-validate@6.0.4): + ws@7.5.10(bufferutil@4.0.8): optionalDependencies: bufferutil: 4.0.8 - utf-8-validate: 6.0.4 - ws@8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4): + ws@8.18.0(bufferutil@4.0.8): optionalDependencies: bufferutil: 4.0.8 - utf-8-validate: 6.0.4 xxhash-wasm@1.0.2: {}