upd. some types

* upd. deps
This commit is contained in:
Smith
2024-01-21 17:46:47 +01:00
parent 380d93d81e
commit ce0f2c95e7
6 changed files with 83 additions and 84 deletions

132
package-lock.json generated
View File

@@ -10,20 +10,20 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@commonify/lowdb": "^3.0.0",
"@slack/bolt": "^3.14.0",
"axios": "^1.6.0",
"discord.js": "^14.13.0",
"dotenv": "^16.3.1",
"@slack/bolt": "^3.17.1",
"axios": "^1.6.5",
"discord.js": "^14.14.1",
"dotenv": "^16.3.2",
"gamedig": "github:gamedig/node-gamedig",
"grammy": "^1.19.2",
"grammy": "^1.20.3",
"mustache": "^4.2.0"
},
"devDependencies": {
"@types/gamedig": "^4.0.4",
"@types/node": "^16.18.60",
"eslint": "^8.52.0",
"nodemon": "^3.0.1",
"typescript": "^5.2.2"
"@types/gamedig": "^4.0.5",
"@types/node": "^16.18.73",
"eslint": "^8.56.0",
"nodemon": "^3.0.3",
"typescript": "^5.3.3"
},
"engines": {
"node": ">=16.20.0"
@@ -217,9 +217,9 @@
}
},
"node_modules/@eslint/js": {
"version": "8.55.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
"integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
"version": "8.56.0",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
"integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -234,9 +234,9 @@
}
},
"node_modules/@grammyjs/types": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/@grammyjs/types/-/types-3.3.0.tgz",
"integrity": "sha512-18Qb12jXiIptqZAlboJMvFxNxydLskUjvE5PbU8ergKQlNIr8jRvYoHDm4t/x3qEfpf+FNhGw23lyZfgEE6e/g=="
"version": "3.4.6",
"resolved": "https://registry.npmjs.org/@grammyjs/types/-/types-3.4.6.tgz",
"integrity": "sha512-J7xb4JFmdTG2JXDirytp9KuUBKhzT8cAeB3tg2dyWy0VzF/Pdi1t8YaBmNsGeL6VvdvAXHtBTfzrc3jBTD2Kuw=="
},
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.13",
@@ -349,15 +349,15 @@
}
},
"node_modules/@slack/bolt": {
"version": "3.16.0",
"resolved": "https://registry.npmjs.org/@slack/bolt/-/bolt-3.16.0.tgz",
"integrity": "sha512-87mxCkxJMd5nJ2hp3LyLJKWfGkrdqDhBPQnCtbE6bPJ/BS2VIllkWzSqZg4K/ZGFJMmq/GzR6/PlY4ZX+FY79Q==",
"version": "3.17.1",
"resolved": "https://registry.npmjs.org/@slack/bolt/-/bolt-3.17.1.tgz",
"integrity": "sha512-N+4WxpkM59RXi7BL3IXUtENnn9cF7TOBn7ttaHpgvlnjUaro+yQyY60arXTlP4ytVDFJ1w0mSdfftcM17h+i2w==",
"dependencies": {
"@slack/logger": "^4.0.0",
"@slack/oauth": "^2.6.1",
"@slack/socket-mode": "^1.3.2",
"@slack/types": "^2.9.0",
"@slack/web-api": "^6.10.0",
"@slack/oauth": "^2.6.2",
"@slack/socket-mode": "^1.3.3",
"@slack/types": "^2.11.0",
"@slack/web-api": "^6.11.2",
"@types/express": "^4.16.1",
"@types/promise.allsettled": "^1.0.3",
"@types/tsscmp": "^1.0.0",
@@ -395,12 +395,12 @@
}
},
"node_modules/@slack/oauth": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/@slack/oauth/-/oauth-2.6.1.tgz",
"integrity": "sha512-Qm8LI+W9gtC5YQz/3yq7b6Qza7SSIJ9jVIgbkrY3AGwT4E0P6mUFV5gKHadvDEfTGG3ZiWuKMyC06ZpexZsQgg==",
"version": "2.6.2",
"resolved": "https://registry.npmjs.org/@slack/oauth/-/oauth-2.6.2.tgz",
"integrity": "sha512-2R3MyB/R63hTRXzk5J6wcui59TBxXzhk+Uh2/Xu3Wp3O4pXg/BNucQhP/DQbL/ScVhLvFtMXirLrKi0Yo5gIVw==",
"dependencies": {
"@slack/logger": "^3.0.0",
"@slack/web-api": "^6.3.0",
"@slack/web-api": "^6.11.2",
"@types/jsonwebtoken": "^8.3.7",
"@types/node": ">=12",
"jsonwebtoken": "^9.0.0",
@@ -424,12 +424,12 @@
}
},
"node_modules/@slack/socket-mode": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@slack/socket-mode/-/socket-mode-1.3.2.tgz",
"integrity": "sha512-6LiwYE6k4DNbnctZZSLfERiOzWngAvXogxQEYzUkxeZgh2GC6EdmRq6OEbZXOBe71/K66YVx05VfR7B4b1ScTQ==",
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/@slack/socket-mode/-/socket-mode-1.3.3.tgz",
"integrity": "sha512-vN3zG4woRtf2Ut6rZgRW6G/Oe56uLMlnz39I08Q7DOvVfB+1MmDbNv0PNOiFgujdKXJR+bXF41/F/VvryXcqlw==",
"dependencies": {
"@slack/logger": "^3.0.0",
"@slack/web-api": "^6.2.3",
"@slack/web-api": "^6.11.2",
"@types/node": ">=12.0.0",
"@types/p-queue": "^2.3.2",
"@types/ws": "^7.4.7",
@@ -491,24 +491,24 @@
}
},
"node_modules/@slack/types": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/@slack/types/-/types-2.10.0.tgz",
"integrity": "sha512-JXY9l49rf7dDgvfMZi0maFyugzGkvq0s5u+kDlD68WaRUhjZNLBDKZcsrycMsVVDFfyOK0R1UKkYGmy9Ph069Q==",
"version": "2.11.0",
"resolved": "https://registry.npmjs.org/@slack/types/-/types-2.11.0.tgz",
"integrity": "sha512-UlIrDWvuLaDly3QZhCPnwUSI/KYmV1N9LyhuH6EDKCRS1HWZhyTG3Ja46T3D0rYfqdltKYFXbJSSRPwZpwO0cQ==",
"engines": {
"node": ">= 12.13.0",
"npm": ">= 6.12.0"
}
},
"node_modules/@slack/web-api": {
"version": "6.10.0",
"resolved": "https://registry.npmjs.org/@slack/web-api/-/web-api-6.10.0.tgz",
"integrity": "sha512-UTX7EKWEf1MQ6+p//4KX7tNTbvzS2W9dbhd2hYk4Lt0mfXf9khe6ZYRYPnV7QBycYcZ3t6FJRJAB55GTcccZ/A==",
"version": "6.11.2",
"resolved": "https://registry.npmjs.org/@slack/web-api/-/web-api-6.11.2.tgz",
"integrity": "sha512-s4qCQGXasr8jpCf/+6+V/smq+Z2RX7EIBnJeO/xe7Luie1nyBihFMgjICNyvzWoWBdaGntSnn5CcZdFm4ItBWg==",
"dependencies": {
"@slack/logger": "^3.0.0",
"@slack/types": "^2.8.0",
"@slack/types": "^2.11.0",
"@types/is-stream": "^1.1.0",
"@types/node": ">=12.0.0",
"axios": "^1.6.0",
"axios": "^1.6.5",
"eventemitter3": "^3.1.0",
"form-data": "^2.5.0",
"is-electron": "2.2.2",
@@ -641,9 +641,9 @@
"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
},
"node_modules/@types/node": {
"version": "16.18.67",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.67.tgz",
"integrity": "sha512-gUa0tDO9oxyAYO9V9tqxDJguVMDpqUwH5I5Q9ASYBCso+8CUdJlKPKDYS1YSS9kyZWIduDafZvucGM0zGNKFjg=="
"version": "16.18.73",
"resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.73.tgz",
"integrity": "sha512-GaTgwUNzESSlX9uhTX2RQcwj2KBf/Wda+52TTtuMpgzR2Rvw7NNypQ8BJdc5Wk6osxZHcUZAKip5PtqWsUl31Q=="
},
"node_modules/@types/p-queue": {
"version": "2.3.2",
@@ -903,11 +903,11 @@
}
},
"node_modules/axios": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
"integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"version": "1.6.5",
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
"integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
"dependencies": {
"follow-redirects": "^1.15.0",
"follow-redirects": "^1.15.4",
"form-data": "^4.0.0",
"proxy-from-env": "^1.1.0"
}
@@ -1528,9 +1528,9 @@
}
},
"node_modules/dotenv": {
"version": "16.3.1",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
"integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
"version": "16.3.2",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz",
"integrity": "sha512-HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==",
"engines": {
"node": ">=12"
},
@@ -1703,15 +1703,15 @@
}
},
"node_modules/eslint": {
"version": "8.55.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
"integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
"version": "8.56.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
"integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
"dev": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1",
"@eslint/eslintrc": "^2.1.4",
"@eslint/js": "8.55.0",
"@eslint/js": "8.56.0",
"@humanwhocodes/config-array": "^0.11.13",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
@@ -2058,9 +2058,9 @@
"dev": true
},
"node_modules/follow-redirects": {
"version": "1.15.3",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
"integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
"version": "1.15.5",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
"integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
"funding": [
{
"type": "individual",
@@ -2367,11 +2367,11 @@
}
},
"node_modules/grammy": {
"version": "1.19.2",
"resolved": "https://registry.npmjs.org/grammy/-/grammy-1.19.2.tgz",
"integrity": "sha512-bvDWesJgLn65MOsWhShVTVG1bSnh6Yo3OtUwoFzTG21CdPt6r8nzPWcuBSzxMDUQyv8I1c0TXH7zIxXFxiH4sw==",
"version": "1.20.3",
"resolved": "https://registry.npmjs.org/grammy/-/grammy-1.20.3.tgz",
"integrity": "sha512-eHvS0iOD6aos7NbwL1dhFE6JDiMGm/Qz2TKgetRg/SZ5BIVoUSVSU/mn8L01r1Q7i+ywG9uePzy5xpK5CkOrUA==",
"dependencies": {
"@grammyjs/types": "3.3.0",
"@grammyjs/types": "^3.4.6",
"abort-controller": "^3.0.0",
"debug": "^4.3.4",
"node-fetch": "^2.7.0"
@@ -3226,9 +3226,9 @@
}
},
"node_modules/nodemon": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.2.tgz",
"integrity": "sha512-9qIN2LNTrEzpOPBaWHTm4Asy1LxXLSickZStAQ4IZe7zsoIpD/A7LWxhZV3t4Zu352uBcqVnRsDXSMR2Sc3lTA==",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-3.0.3.tgz",
"integrity": "sha512-7jH/NXbFPxVaMwmBCC2B9F/V6X1VkEdNgx3iu9jji8WxWcvhMWkmhNWhI5077zknOnZnBzba9hZP6bCPJLSReQ==",
"dev": true,
"dependencies": {
"chokidar": "^3.5.2",
@@ -4346,9 +4346,9 @@
}
},
"node_modules/typescript": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz",
"integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==",
"version": "5.3.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
"integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
"dev": true,
"bin": {
"tsc": "bin/tsc",

View File

@@ -25,20 +25,20 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@commonify/lowdb": "^3.0.0",
"@slack/bolt": "^3.14.0",
"axios": "^1.6.0",
"discord.js": "^14.13.0",
"dotenv": "^16.3.1",
"@slack/bolt": "^3.17.1",
"axios": "^1.6.5",
"discord.js": "^14.14.1",
"dotenv": "^16.3.2",
"gamedig": "github:gamedig/node-gamedig",
"grammy": "^1.19.2",
"grammy": "^1.20.3",
"mustache": "^4.2.0"
},
"devDependencies": {
"@types/gamedig": "^4.0.4",
"@types/node": "^16.18.60",
"eslint": "^8.52.0",
"nodemon": "^3.0.1",
"typescript": "^5.2.2"
"@types/gamedig": "^4.0.5",
"@types/node": "^16.18.73",
"eslint": "^8.56.0",
"nodemon": "^3.0.3",
"typescript": "^5.3.3"
},
"engines": {
"node": ">=16.20.0"

View File

@@ -1,6 +1,7 @@
import axios from 'axios';
import { Player, QueryResult, Type } from 'gamedig';
// @ts-ignore
import { GameDig, Player, QueryResult, Type } from 'gamedig';
import { GameDig } from 'gamedig';
import { Low, JSONFile } from '@commonify/lowdb';
import ipRegex from './lib/ipregex.js';
import getIP from './lib/getip.js';

View File

@@ -56,8 +56,8 @@ interface SelectOptionsResponse {
interface GameDigGame {
name: string;
release_year: number;
options?: {
protocol?: string;
options: {
protocol: string;
port?: number;
query_port?: number;
port_query?: number;

View File

@@ -1,6 +1,5 @@
import { App as AppType, Block, KnownBlock, MrkdwnElement, PlainTextElement } from '@slack/bolt';
import slack_pkg from '@slack/bolt';
const { App, LogLevel } = slack_pkg;
import bolt from '@slack/bolt';
import { Low, JSONFile } from '@commonify/lowdb';
import { GameServer } from './game-server.js';
import hhmmss from './lib/hhmmss.js';
@@ -25,11 +24,11 @@ let bot: AppType;
export async function init(token: string, appToken: string) {
if (!bot) {
console.log('slack-bot starting...');
bot = new App({
bot = new bolt.App({
token,
appToken,
socketMode: true,
logLevel: LogLevel.ERROR
logLevel: bolt.LogLevel.ERROR
});
if (DBG) {

View File

@@ -42,7 +42,6 @@ export interface GameServerConfig {
discord?: DiscordConfig[];
telegram?: TelegramConfig[];
slack?: SlackConfig[];
// node-gamedig stuff
type: Type;
host: string;