Compare commits
2 Commits
30846cdc87
...
bdf674b678
Author | SHA1 | Date |
---|---|---|
MiaoWoo | bdf674b678 | |
MiaoWoo | 67fe13deac |
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"useWorkspaces": true,
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/amqp",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript amqp package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,12 +19,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/amqp-client": "^0.0.3",
|
||||
"@javatypes/spring-amqp": "^0.0.3",
|
||||
"@javatypes/spring-rabbit": "^0.0.3",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/api",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript api package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,9 +19,9 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0",
|
||||
"@ccms/polyfill": "^0.24.0",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/polyfill": "^0.24.1",
|
||||
"base64-js": "^1.5.1",
|
||||
"source-map-builder": "^0.0.7"
|
||||
},
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/bukkit",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript bukkit package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/bungee",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript bungee package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"private": true,
|
||||
"name": "@ccms/client",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript client package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/common",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript common package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/jdk": "^0.0.3",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/compile",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript compile package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/container",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript container package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"typescript": "^4.6.3"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/core",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript core package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -24,8 +24,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"gitHead": "781524f83e52cad26d7c480513e3c525df867121"
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/database",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript database package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,7 +25,7 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/i18n",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript i18n package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/keyvalue",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript keyvalue package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,12 +19,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/amqp-client": "^0.0.3",
|
||||
"@javatypes/spring-amqp": "^0.0.3",
|
||||
"@javatypes/spring-rabbit": "^0.0.3",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/molang",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "A fast parser for Minecraft's MoLang",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nashorn",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nashorn package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nodejs",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nodejs package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"tslib": "^2.3.1",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nukkit",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nukkit package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/plugin",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript plugin package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -26,10 +26,10 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0",
|
||||
"@ccms/i18n": "^0.24.0",
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/i18n": "^0.24.1",
|
||||
"@ccms/verify": "^0.21.1",
|
||||
"crypto-js": "^4.1.1",
|
||||
"js-yaml": "^4.1.0"
|
||||
|
|
|
@ -68,30 +68,25 @@ export class PluginConfigManager {
|
|||
private loadConfig0(plugin: plugin.Plugin, metadata: interfaces.ConfigMetadata) {
|
||||
try {
|
||||
let defaultValue = metadata.default ?? plugin[metadata.variable]
|
||||
let configValue = defaultValue || {}
|
||||
if (defaultValue) {
|
||||
metadata.file = fs.concat(
|
||||
fs.file(plugin.description.loadMetadata.file).parent,
|
||||
plugin.description.name,
|
||||
metadata.filename
|
||||
)
|
||||
let configLoader = this.getConfigLoader(metadata.format)
|
||||
if (!fs.exists(metadata.file)) {
|
||||
base.save(metadata.file, configLoader.dump(defaultValue))
|
||||
console.i18n("ms.plugin.manager.config.save.default", {
|
||||
plugin: plugin.description.name,
|
||||
name: metadata.name,
|
||||
format: metadata.format
|
||||
})
|
||||
} else if (metadata.migrate) {
|
||||
configValue = configLoader.load(base.read(metadata.file)) || {}
|
||||
if (defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
|
||||
base.save(metadata.file, configLoader.dump(configValue))
|
||||
}
|
||||
console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file} =>
|
||||
${JSON.stringify(configValue, undefined, 4).substring(0, 500)}`)
|
||||
}
|
||||
metadata.file = fs.concat(
|
||||
fs.file(plugin.description.loadMetadata.file).parent,
|
||||
plugin.description.name,
|
||||
metadata.filename
|
||||
)
|
||||
let configLoader = this.getConfigLoader(metadata.format)
|
||||
if (!fs.exists(metadata.file) && defaultValue) {
|
||||
base.save(metadata.file, configLoader.dump(defaultValue))
|
||||
console.i18n("ms.plugin.manager.config.save.default", {
|
||||
plugin: plugin.description.name,
|
||||
name: metadata.name,
|
||||
format: metadata.format
|
||||
})
|
||||
}
|
||||
let configValue = configLoader.load(base.read(metadata.file)) || {}
|
||||
if (metadata.migrate && defaultValue && this.setDefaultValue(configValue, defaultValue, !!metadata.default)) {
|
||||
base.save(metadata.file, configLoader.dump(configValue))
|
||||
}
|
||||
console.debug(`[${plugin.description.name}] Load Config ${metadata.variable} from file ${metadata.file}`)
|
||||
this.defienConfigProp(plugin, metadata, configValue)
|
||||
} catch (error: any) {
|
||||
console.i18n("ms.plugin.manager.config.load.error", {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/polyfill",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript polyfill package",
|
||||
"author": "MiaoWoo <admin@yumc.pw>",
|
||||
"homepage": "https://github.com/circlecloud/ms.git",
|
||||
|
@ -14,12 +14,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/i18n": "^0.24.0",
|
||||
"@ccms/nodejs": "^0.24.0",
|
||||
"@ccms/i18n": "^0.24.1",
|
||||
"@ccms/nodejs": "^0.24.1",
|
||||
"core-js": "^3.22.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"typescript": "^4.6.3"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/protocol",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript protocol package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/sponge",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript sponge package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/spring",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript spring package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -24,9 +24,9 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/common": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0",
|
||||
"@ccms/database": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/database": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/web",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript web package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -29,7 +29,7 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.0",
|
||||
"@ccms/container": "^0.24.0"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/websocket",
|
||||
"version": "0.24.0",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript websocket package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -23,7 +23,7 @@
|
|||
"parseuri": "^0.0.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.0",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/tomcat-websocket-api": "^0.0.3",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
Loading…
Reference in New Issue