v0.19.8

Signed-off-by: MiaoWoo <admin@yumc.pw>

lerna.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.19.5",
+    "version": "0.19.8",
     "useWorkspaces": true,
     "npmClient": "yarn",
     "packages": [

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     },

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",

packages/api/src/plugin.ts

@@ -20,7 +20,7 @@ export namespace plugin {
     export abstract class PluginManager {
         abstract scan(folder: string): void
         abstract build(): void
-        abstract loadFromFile(file: string, ext: any): Plugin
+        abstract loadFromFile(file: string, ext?: any): Plugin
         abstract load(...args: any[]): void
         abstract enable(...args: any[]): void
         abstract disable(...args: any[]): void

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.19.5",
+    "version": "0.19.8",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,7 +24,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/container": "^0.19.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"

packages/core/src/exit.js

@@ -1,4 +1,13 @@
 function exit() {
+    var http = require('@ccms/common/dist/http').default
+    function upgradeModules(core) {
+        if (base.version && global.ScriptEngineVersion != core['dist-tags']['latest']) {
+            var Paths = Java.type('java.nio.file.Paths')
+            base.save(Paths.get(root, "upgrade"), core['dist-tags']['latest'])
+            console.info('@ccms/core found new version ' + core['dist-tags']['latest'] + ' will upgrade after reboot!')
+        }
+    }
+    upgradeModules(http.get('https://registry.npmmirror.com/@ccms/core'))
     console.debug('exit finish!')
 }
 exit()

packages/core/src/initialize.js

@@ -1,22 +1,34 @@
-var fs = require('@ccms/common/dist/fs')
-function updateJar() {
-    if (!base.version) {
-        var pluginFolder = fs.file(fs.concat(root, '..'))
-        var updateFolder = fs.concat(pluginFolder, 'update')
-    }
-}
-function upgradeModules(core) {
-    if (base.version && global.ScriptEngineVersion != core['dist-tags']['latest']) {
-        var Paths = Java.type('java.nio.file.Paths')
-        base.save(Paths.get(root, "upgrade"), core['dist-tags']['latest'])
-        console.info('@ccms/core found new version ' + core['dist-tags']['latest'] + ' will upgrade after reboot!')
-    }
-}
-function initialize() {
+global.initialize = function () {
     var mspmc = 'https://ms.yumc.pw/api/plugin/download/name/'
+    var artifact = 'https://ci.yumc.pw/job/Minecraft/job/MiaoScript/lastSuccessfulBuild/artifact'
 
+    var fs = require('@ccms/common/dist/fs')
     var http = require('@ccms/common/dist/http').default
 
+    function updateJar() {
+        var DocumentBuilderFactory = Java.type('javax.xml.parsers.DocumentBuilderFactory')
+        var URLDecoder = Java.type('java.net.URLDecoder')
+        var pom = DocumentBuilderFactory.newInstance().newDocumentBuilder()
+            .parse(artifact + "/pom.xml")
+        var latestVersion = pom.getElementsByTagName("version").item(0).getTextContent()
+        if (base.version != latestVersion) {
+            var pluginFolder = fs.file(fs.concat(root, '..'))
+            var updateFolder = fs.concat(pluginFolder, 'update')
+            fs.mkdirs(updateFolder)
+            var filePath = base.getInstance().class.classLoader.getURLs()[0]
+            var pluginFile = fs.file(URLDecoder.decode(filePath.getFile(), "UTF-8"))
+            var updateFile = fs.file(updateFolder, pluginFile.getName())
+            http.download(artifact + "/target/MiaoScript.jar", updateFile.getAbsolutePath())
+            console.info('MiaoScript found new version ' + latestVersion + ' will upgrade after reboot!')
+        }
+    }
+    function upgradeModules(core) {
+        if (base.version && global.ScriptEngineVersion != core['dist-tags']['latest']) {
+            var Paths = Java.type('java.nio.file.Paths')
+            base.save(Paths.get(root, "upgrade"), core['dist-tags']['latest'])
+            console.info('@ccms/core found new version ' + core['dist-tags']['latest'] + ' will upgrade after reboot!')
+        }
+    }
     var pluginFolder = fs.concat(root, 'plugins')
     var updateFolder = fs.concat(pluginFolder, 'update')
     var pluginFile = fs.concat(pluginFolder, 'MiaoScriptPackageManager.js')
@@ -43,9 +55,14 @@ function initialize() {
     try {
         Java.type("org.bukkit.Bukkit")
         updateJar()
-    } catch (ignore) {
+    } catch (error) {
+        console.debug(error)
+        if (global.debug) {
+            console.ex(error)
+        }
     }
     upgradeModules(http.get('https://registry.npmmirror.com/@ccms/core'))
     console.debug('initialize finish!')
 }
-initialize()
+global.initialize()
+delete global.initialize

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/container": "^0.19.0"
     }
 }

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     },

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     }

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.19.5",
+    "version": "0.19.7",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0",
         "@ccms/i18n": "^0.19.0",

packages/plugin/src/command.ts

@@ -57,6 +57,7 @@ export class PluginCommandManager {
                 let subcommandexec = pluginInstance[cmdKey]
                 if (!subcommandexec) {
                     subcommandexec = pluginInstance['cmdmain']
+                    subcommand = 'main'
                 } else {
                     args.shift()
                 }
@@ -66,30 +67,37 @@ export class PluginCommandManager {
                         sender,
                         pluginInstance['cmdhelp'] ?
                             `§6请执行 §b/${command} §ahelp §6查看帮助!` :
-                            `§b版本: §a ${pluginInstance.description.version}`
+                            [
+                                `§6插件: §b${pluginInstance.description.name}`,
+                                `§6版本: §a${pluginInstance.description.version}`
+                            ]
                     )
                     return
                 }
                 let permission: string
-                if (typeof cmd.permission == "string") {
-                    permission = cmd.permission as string
-                } else if (cmd.permission) {
-                    permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}.${subcommand}`
-                }
-                if (sender.hasPermission && !sender.hasPermission(permission)) {
-                    return pluginInstance.logger.sender(sender, `§c你需要 ${permission} 权限 才可执行此命令.`)
+                if (cmd.permission && sender.hasPermission) {
+                    if (typeof cmd.permission == "string") {
+                        permission = cmd.permission as string
+                    } else {
+                        permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}.${subcommand}`
+                    }
+                    if (!sender.hasPermission(permission)) {
+                        return pluginInstance.logger.sender(sender, `§c你需要 ${permission} 权限 才可执行此命令.`)
+                    }
                 }
                 return subcommandexec.apply(pluginInstance, [sender, ...args])
             }
             let originCompleter = cmdCompleter
             cmdCompleter = (sender: any, command: string, args: string[]) => {
                 let permission: string
-                if (typeof cmd.permission == "string") {
-                    permission = cmd.permission as string
-                } else if (cmd.permission) {
-                    permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}`
+                if (cmd.permission && sender.hasPermission) {
+                    if (typeof cmd.permission == "string") {
+                        permission = cmd.permission as string
+                    } else {
+                        permission = `${pluginInstance.description.name.toLocaleLowerCase()}.${command}`
+                    }
+                    if (!sender.hasPermission(permission)) { return [] }
                 }
-                if (sender.hasPermission && !sender.hasPermission(permission)) { return [] }
                 return (args.length == 1 ? cmdSubCache : []).concat(originCompleter?.apply(pluginInstance, [sender, command, args]) || [])
             }
         }

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,7 +25,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0"
     }

packages/spring/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/spring",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript spring package",
     "keywords": [
         "miaoscript",
@@ -24,9 +24,9 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/common": "^0.19.0",
         "@ccms/container": "^0.19.0",
-        "@ccms/database": "^0.19.5"
+        "@ccms/database": "^0.19.6"
     }
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/web",
-    "version": "0.19.5",
+    "version": "0.19.6",
     "description": "MiaoScript web package",
     "keywords": [
         "miaoscript",
@@ -29,7 +29,7 @@
         "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.19.5",
+        "@ccms/api": "^0.19.6",
         "@ccms/container": "^0.19.0"
     }
 }