Commit 358754d3 authored by nanahira's avatar nanahira

catchup and schema roles

parent f8422155
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"ip": "^1.1.5", "ip": "^1.1.5",
"koishi-thirdeye": "^8.2.0", "koishi-thirdeye": "^8.2.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"moment": "^2.29.1", "moment": "^2.29.1",
"source-map-support": "^0.5.21", "source-map-support": "^0.5.21",
...@@ -2714,21 +2714,21 @@ ...@@ -2714,21 +2714,21 @@
} }
}, },
"node_modules/koishi-thirdeye": { "node_modules/koishi-thirdeye": {
"version": "8.2.0", "version": "8.2.1",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-8.2.0.tgz", "resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-8.2.1.tgz",
"integrity": "sha512-8qC0flqMSIV+17t5/uT2ihmZdBqggt5qdepL6HjjIJStt2phZrzKfPmpzNItCyg8W2zmEPyop5AcYSJWQIV4fg==", "integrity": "sha512-EVOqunYyach5sd5R7MQdcVzav2+dskiWDWo815jS+4bOQEjTMSuvU/cxZhzS5XnPAK9ZBUyeChJ8+h+7O8FtRg==",
"dependencies": { "dependencies": {
"@types/koa": "^2.13.4", "@types/koa": "^2.13.4",
"@types/koa__router": "^8.0.11", "@types/koa__router": "^8.0.11",
"koishi-decorators": "^1.0.6", "koishi-decorators": "^1.0.6",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"schemastery": "^2.1.2", "schemastery": "^2.4.2",
"schemastery-gen": "^2.4.0", "schemastery-gen": "^2.4.1",
"typed-reflector": "^1.0.9" "typed-reflector": "^1.0.9"
}, },
"peerDependencies": { "peerDependencies": {
"koishi": "^4.1.1" "koishi": "^4.2.0"
} }
}, },
"node_modules/koishi/node_modules/file-type": { "node_modules/koishi/node_modules/file-type": {
...@@ -3647,14 +3647,14 @@ ...@@ -3647,14 +3647,14 @@
} }
}, },
"node_modules/schemastery": { "node_modules/schemastery": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.4.1.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.4.2.tgz",
"integrity": "sha512-BBXNUBLlYv3WR0C/EmwMiAUkwv9wWUCwYt13F3wgkoaecAY5JtWTQkHSzZk3UmL+KumfYkCnBIlHxfwFXd4Cyg==" "integrity": "sha512-0sCJuGa7LyAtnoXEVwUKSPSTMfizA0zpK0kX7dzGPLpeLuxgJg7VVyR2KFsfHg+WlqYbUOvoGY7JSNPk5I5uHQ=="
}, },
"node_modules/schemastery-gen": { "node_modules/schemastery-gen": {
"version": "2.4.0", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.4.0.tgz", "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.4.1.tgz",
"integrity": "sha512-ez+jP+AHXoBXTX+/D0AkQiaw7lWlhSPts5rEGcDwpPuS8C+/Vu/QYm+A0+wMufpJJ+fBv1HoQHXHUcjqkZh0Hw==", "integrity": "sha512-JJqNrStiTlPwVt72RkcC5GuWqVApr8vbeYFSuy+DMU6SXzZWL39HiSjGddu4q2UtuJOrkffJIpbfeXYNKGtiqg==",
"dependencies": { "dependencies": {
"lodash": "^4.17.21", "lodash": "^4.17.21",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
...@@ -6611,17 +6611,17 @@ ...@@ -6611,17 +6611,17 @@
} }
}, },
"koishi-thirdeye": { "koishi-thirdeye": {
"version": "8.2.0", "version": "8.2.1",
"resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-8.2.0.tgz", "resolved": "https://registry.npmjs.org/koishi-thirdeye/-/koishi-thirdeye-8.2.1.tgz",
"integrity": "sha512-8qC0flqMSIV+17t5/uT2ihmZdBqggt5qdepL6HjjIJStt2phZrzKfPmpzNItCyg8W2zmEPyop5AcYSJWQIV4fg==", "integrity": "sha512-EVOqunYyach5sd5R7MQdcVzav2+dskiWDWo815jS+4bOQEjTMSuvU/cxZhzS5XnPAK9ZBUyeChJ8+h+7O8FtRg==",
"requires": { "requires": {
"@types/koa": "^2.13.4", "@types/koa": "^2.13.4",
"@types/koa__router": "^8.0.11", "@types/koa__router": "^8.0.11",
"koishi-decorators": "^1.0.6", "koishi-decorators": "^1.0.6",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"schemastery": "^2.1.2", "schemastery": "^2.4.2",
"schemastery-gen": "^2.4.0", "schemastery-gen": "^2.4.1",
"typed-reflector": "^1.0.9" "typed-reflector": "^1.0.9"
} }
}, },
...@@ -7272,14 +7272,14 @@ ...@@ -7272,14 +7272,14 @@
} }
}, },
"schemastery": { "schemastery": {
"version": "2.4.1", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.4.1.tgz", "resolved": "https://registry.npmjs.org/schemastery/-/schemastery-2.4.2.tgz",
"integrity": "sha512-BBXNUBLlYv3WR0C/EmwMiAUkwv9wWUCwYt13F3wgkoaecAY5JtWTQkHSzZk3UmL+KumfYkCnBIlHxfwFXd4Cyg==" "integrity": "sha512-0sCJuGa7LyAtnoXEVwUKSPSTMfizA0zpK0kX7dzGPLpeLuxgJg7VVyR2KFsfHg+WlqYbUOvoGY7JSNPk5I5uHQ=="
}, },
"schemastery-gen": { "schemastery-gen": {
"version": "2.4.0", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.4.0.tgz", "resolved": "https://registry.npmjs.org/schemastery-gen/-/schemastery-gen-2.4.1.tgz",
"integrity": "sha512-ez+jP+AHXoBXTX+/D0AkQiaw7lWlhSPts5rEGcDwpPuS8C+/Vu/QYm+A0+wMufpJJ+fBv1HoQHXHUcjqkZh0Hw==", "integrity": "sha512-JJqNrStiTlPwVt72RkcC5GuWqVApr8vbeYFSuy+DMU6SXzZWL39HiSjGddu4q2UtuJOrkffJIpbfeXYNKGtiqg==",
"requires": { "requires": {
"lodash": "^4.17.21", "lodash": "^4.17.21",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
}, },
"dependencies": { "dependencies": {
"ip": "^1.1.5", "ip": "^1.1.5",
"koishi-thirdeye": "^8.2.0", "koishi-thirdeye": "^8.2.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"moment": "^2.29.1", "moment": "^2.29.1",
"source-map-support": "^0.5.21", "source-map-support": "^0.5.21",
......
...@@ -8,7 +8,7 @@ import path from 'path'; ...@@ -8,7 +8,7 @@ import path from 'path';
@RegisterSchema() @RegisterSchema()
export class HisoutensokuJammerPluginConfig { export class HisoutensokuJammerPluginConfig {
constructor(config: Partial<HisoutensokuJammerPluginConfig>) {} constructor(config: Partial<HisoutensokuJammerPluginConfig>) {}
@DefineSchema({ description: '干扰时间', default: 10000 }) @DefineSchema({ description: '干扰时间', default: 10000, role: 'ms' })
attackTimeout: number; attackTimeout: number;
@DefineSchema({ description: 'IP 白名单', default: [], type: 'string' }) @DefineSchema({ description: 'IP 白名单', default: [], type: 'string' })
......
...@@ -27,8 +27,10 @@ declare module 'koishi' { ...@@ -27,8 +27,10 @@ declare module 'koishi' {
} }
} }
const matcherGlobal = /(0*[^\d]*)*([1-2]?[^\d]?\d{0,2})(([^\d]+[1-2]?\d{1,2}){3,}?).+?([1-6]([^\d]*\d){4})/g; const matcherGlobal =
const matcherSingle = /(0*[^\d]*)*([1-2]?[^\d]?\d{0,2})(([^\d]+[1-2]?\d{1,2}){3,}?).+?([1-6]([^\d]*\d){4})/; /(0*[^\d]*)*([1-2]?[^\d]?\d{0,2})(([^\d]+[1-2]?\d{1,2}){3,}?).+?([1-6]([^\d]*\d){4})/g;
const matcherSingle =
/(0*[^\d]*)*([1-2]?[^\d]?\d{0,2})(([^\d]+[1-2]?\d{1,2}){3,}?).+?([1-6]([^\d]*\d){4})/;
const PROTOCOL_BASE64 = 'base64://'; const PROTOCOL_BASE64 = 'base64://';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment