v0.9.0

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

lerna.json

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

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,12 +19,12 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "@javatypes/amqp-client": "^0.0.2",
         "@javatypes/spring-amqp": "^0.0.2",
         "@javatypes/spring-rabbit": "^0.0.2",

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,9 +19,9 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4",
-        "@ccms/ployfill": "^0.8.4",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0",
+        "@ccms/ployfill": "^0.9.0",
         "base64-js": "^1.3.1",
         "source-map-builder": "^0.0.7"
     },

packages/api/src/chat.ts

@@ -0,0 +1,19 @@
+export namespace chat {
+    export abstract class Chat {
+        sendMessage(sender: any, message: string) {
+            throw new Error("Method not implemented.")
+        }
+        sendActionBar(sender: any, message: string) {
+            throw new Error("Method not implemented.")
+        }
+        clearActionBar(sender: any) {
+            this.sendActionBar(sender, '')
+        }
+        sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+            throw new Error("Method not implemented.")
+        }
+        clearTitle(sender: any) {
+            this.sendTitle(sender, '', '', 0, 0, 0)
+        }
+    }
+}

packages/api/src/console.ts

@@ -97,10 +97,11 @@ export class MiaoScriptConsole implements Console {
                     MiaoScriptConsole.sourceMaps[fileName] = null
                     let sourceLine = base.read(fileName).split('\n')
                     let lastLine = sourceLine[sourceLine.length - 1]
+                    // lastLine is similar //# sourceMappingURL=data:application/json;base64,
                     if (lastLine.startsWith('//# sourceMappingURL=')) {
                         let sourceContent = null
                         let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1]
-                        if (sourceMappingURL.startsWith('data:application/jsonbase64,')) {
+                        if (sourceMappingURL.startsWith('data:application/json;base64,')) {
                             sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
                         } else if (sourceMappingURL.startsWith('http')) {
                             // TODO
@@ -122,6 +123,9 @@ export class MiaoScriptConsole implements Console {
             }
         } catch (error) {
             console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
+            if (global.debug) {
+                console.ex(error)
+            }
         }
         return {
             fileName,

packages/api/src/event.ts

@@ -4,7 +4,7 @@
 import i18n from '@ccms/i18n'
 import { injectable, unmanaged } from '@ccms/container'
 
-const Thread = Java.type('java.lang.Thread');
+const Thread = Java.type('java.lang.Thread')
 
 export namespace event {
     /**
@@ -30,7 +30,7 @@ export namespace event {
         protected baseEventDir = '';
 
         constructor(@unmanaged() baseEventDir: string) {
-            this.baseEventDir = baseEventDir;
+            this.baseEventDir = baseEventDir
         }
 
         /**
@@ -39,74 +39,74 @@ export namespace event {
          *     org.spongepowered.api.event.game.GameRegistryEvent.Register => gameregistryevent$register
          */
         mapEventName() {
-            if (this.baseEventDir === "") { throw new Error(i18n.translate('ms.api.event.empty.event.dir')); }
-            let count = 0;
-            let jar = this.getJarFile(this.baseEventDir);
-            let entries = jar.entries();
+            if (this.baseEventDir === "") { throw new Error(i18n.translate('ms.api.event.empty.event.dir')) }
+            let count = 0
+            let jar = this.getJarFile(this.baseEventDir)
+            let entries = jar.entries()
             while (entries.hasMoreElements()) {
-                let entry = entries.nextElement();
-                let name = entry.name;
+                let entry = entries.nextElement()
+                let name = entry.name
                 if (name.startsWith(this.baseEventDir) && name.endsWith(".class")) {
                     // replace name to qualifiedName
-                    let qualifiedName = name.replaceAll('/', '.');
+                    let qualifiedName = name.replaceAll('/', '.')
                     try {
-                        let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6));
+                        let clazz = base.getClass(qualifiedName.substring(0, qualifiedName.length - 6))
                         if (this.isValidEvent(clazz)) {
-                            let simpleName = this.class2Name(clazz).toLowerCase();
-                            console.trace(i18n.translate("ms.api.event.mapping", { canonicalName: clazz.canonicalName, simpleName }));
-                            this.mapEvent[simpleName] = clazz;
-                            count++;
+                            let simpleName = this.class2Name(clazz).toLowerCase()
+                            console.trace(i18n.translate("ms.api.event.mapping", { canonicalName: clazz.canonicalName, simpleName }))
+                            this.mapEvent[simpleName] = clazz
+                            count++
                         }
                     } catch (ex) {
                         //ignore already loaded class
                     }
                 }
             }
-            return count;
+            return count
         }
 
         getJarFile(resource: string, loader?: any) {
-            let dirs = (loader || Thread.currentThread().getContextClassLoader()).getResources(resource);
+            let dirs = (loader || Thread.currentThread().getContextClassLoader()).getResources(resource)
             if (dirs.hasMoreElements()) {
-                let url = dirs.nextElement();
-                if (url.protocol === "jar") { return url.openConnection().jarFile; }
+                let url = dirs.nextElement()
+                if (url.protocol === "jar") { return url.openConnection().jarFile }
             }
             throw new Error(i18n.translate("ms.api.event.resource.not.found", { resource }))
         }
 
         class2Name(clazz: any) {
-            return clazz.simpleName;
+            return clazz.simpleName
         }
 
         name2Class(name: any, event: string) {
-            let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event'];
+            let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event']
             if (!eventCls) {
                 try {
-                    eventCls = base.getClass(eventCls);
-                    this.mapEvent[event] = eventCls;
+                    eventCls = base.getClass(eventCls)
+                    this.mapEvent[event] = eventCls
                 } catch (ex) {
                     console.i18n("ms.api.event.not.found", { name, event })
-                    return;
+                    return
                 }
             }
-            return eventCls;
+            return eventCls
         }
 
         execute(name, exec, eventCls) {
             return (...args: any[]) => {
                 try {
-                    let event = args[args.length - 1];
+                    let event = args[args.length - 1]
                     if (eventCls.isAssignableFrom(event.getClass())) {
                         let time = Date.now()
-                        exec(event);
-                        let cost = Date.now() - time;
+                        exec(event)
+                        let cost = Date.now() - time
                         if (cost > 20) {
                             console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
                         }
                     }
                 } catch (ex) {
                     console.i18n("ms.api.event.execute.error", { name, event: this.class2Name(eventCls), ex })
-                    console.ex(ex);
+                    console.ex(ex)
                 }
             }
         }
@@ -120,34 +120,34 @@ export namespace event {
         * @param ignoreCancel
         */
         listen(plugin: any, event: string, exec: (event: any) => void, priority: EventPriority = EventPriority.NORMAL, ignoreCancel = false) {
-            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"));
-            var name = plugin.description.name;
-            var eventCls = this.name2Class(name, event);
-            if (!eventCls) { return; }
+            if (!plugin || !plugin.description || !plugin.description.name) throw new TypeError(i18n.translate("ms.api.event.listen.plugin.name.empty"))
+            var name = plugin.description.name
+            var eventCls = this.name2Class(name, event)
+            if (!eventCls) { return }
             if (typeof priority === 'boolean') {
-                ignoreCancel = priority;
-                priority = EventPriority.NORMAL;
+                ignoreCancel = priority
+                priority = EventPriority.NORMAL
             }
-            priority = priority || EventPriority.NORMAL;
-            ignoreCancel = ignoreCancel || false;
+            priority = priority || EventPriority.NORMAL
+            ignoreCancel = ignoreCancel || false
             // noinspection JSUnusedGlobalSymbols
-            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel);
-            var listenerMap = this.listenerMap;
+            var listener = this.register(eventCls, this.execute(name, exec, eventCls), priority, ignoreCancel)
+            var listenerMap = this.listenerMap
             // add to cache Be used for close plugin to close event
-            if (!listenerMap[name]) listenerMap[name] = [];
+            if (!listenerMap[name]) listenerMap[name] = []
             var offExec = () => {
-                this.unregister(eventCls, listener);
-                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls) }));
-            };
+                this.unregister(eventCls, listener)
+                console.debug(i18n.translate("ms.api.event.unregister", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
+            }
             var off = {
                 event: eventCls,
                 listener: listener,
                 off: offExec
-            };
-            listenerMap[name].push(off);
+            }
+            listenerMap[name].push(off)
             // noinspection JSUnresolvedVariable
-            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls) }));
-            return off;
+            console.debug(i18n.translate("ms.api.event.register", { name, event: this.class2Name(eventCls), exec: exec.name || '[anonymous]' }))
+            return off
         }
 
         /**
@@ -155,10 +155,10 @@ export namespace event {
          * @param plugin 插件
          */
         disable(plugin: any) {
-            var eventCache = this.listenerMap[plugin.description.name];
+            var eventCache = this.listenerMap[plugin.description.name]
             if (eventCache) {
-                eventCache.forEach(t => t.off());
-                delete this.listenerMap[plugin.description.name];
+                eventCache.forEach(t => t.off())
+                delete this.listenerMap[plugin.description.name]
             }
         }
 
@@ -166,7 +166,7 @@ export namespace event {
          * 判断
          * @param clazz 事件类
          */
-        abstract isValidEvent(clazz: any): boolean;
+        abstract isValidEvent(clazz: any): boolean
         /**
          * 注册事件
          * @param eventCls 事件类
@@ -174,12 +174,12 @@ export namespace event {
          * @param priority 优先级
          * @param ignoreCancel 是否忽略已取消的事件
          */
-        abstract register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean): any;
+        abstract register(eventCls: any, exec: Function, priority: any, ignoreCancel: boolean): any
         /**
          * 取消监听事件
          * @param event 事件
          * @param listener 监听器
          */
-        abstract unregister(event: any, listener: any): void;
+        abstract unregister(event: any, listener: any): void
     }
 }

packages/api/src/index.ts

@@ -1,4 +1,6 @@
 import "@ccms/nashorn"
+
+export * from './chat'
 export * from './task'
 export * from './event'
 export * from './console'

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     }
 }

packages/bukkit/src/chat.ts

@@ -0,0 +1,16 @@
+import { chat } from '@ccms/api'
+import { provideSingleton } from '@ccms/container'
+import bukkitChat from './enhance/chat'
+
+@provideSingleton(chat.Chat)
+export class BukkitChat extends chat.Chat {
+    sendMessage(sender: any, message: string) {
+        bukkitChat.send(sender, { text: message }, 0)
+    }
+    sendActionBar(sender: any, message: string) {
+        bukkitChat.send(sender, { text: message }, 2)
+    }
+    sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 1, time: number = 5, fadeOut: number = 1) {
+        sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
+    }
+}

packages/bukkit/src/enhance/chat.ts

@@ -1,29 +1,28 @@
 /*global Java, base, module, exports, require*/
-var nmsChatSerializerClass;
-var nmsChatSerializerMethod;
-var packetTypeConstructor;
-var nmsChatMessageTypeClass;
-var chatMessageTypes;
+let ChatSerializer: any
+let nmsChatSerializerMethodName: string
+let PacketPlayOutChat: any
+let chatMessageTypes: any
 
-var RemapUtils;
+let RemapUtils: any
 
-var playerConnectionFieldName;
-var sendPacketMethod;
+let playerConnectionFieldName: string
+let sendPacketMethodName: string
 
-var downgrade = false;
+let downgrade = false
 /**
  * 获取NMS版本
  */
 //@ts-ignore
-var nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3];
+let nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3]
 /**
  * 获取NMS类
  */
-function nmsCls(name) {
+function nmsCls(name: string) {
     return base.getClass(['net.minecraft.server', nmsVersion, name].join('.'))
 }
 
-function remapMethod(clazz: any, origin: string, test: string, params) {
+function remapMethod(clazz: any, origin: string, test: string, params: any) {
     try {
         return clazz.getMethod(origin, params)
     } catch (ex) {
@@ -49,66 +48,57 @@ function remapFieldName(clazz: any, origin: string, test: string) {
 
 function init() {
     try {
-        RemapUtils = Java.type('catserver.server.remapper.RemapUtils');
+        RemapUtils = Java.type('catserver.server.remapper.RemapUtils')
     } catch (ex) {
     }
-    nmsChatSerializerClass = nmsCls(nmsVersion.split("_")[1] > 7 ? "IChatBaseComponent$ChatSerializer" : "ChatSerializer");
-    nmsChatSerializerMethod = remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
-    var packetTypeClass = nmsCls("PacketPlayOutChat");
-    Java.from(packetTypeClass.constructors).forEach(function(c) {
+    let nmsChatSerializerClass = nmsCls(nmsVersion.split("_")[1] > 7 ? "IChatBaseComponent$ChatSerializer" : "ChatSerializer")
+    let nmsChatSerializerMethod = remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
+    nmsChatSerializerMethodName = nmsChatSerializerMethod.getName()
+    ChatSerializer = Java.type(nmsChatSerializerClass.getName())
+    let packetTypeClass = nmsCls("PacketPlayOutChat")
+    PacketPlayOutChat = Java.type(packetTypeClass.getName())
+    let packetTypeConstructor: { parameterTypes: any[] }
+    Java.from(packetTypeClass.constructors).forEach(function (c) {
         if (c.parameterTypes.length === 2) {
             packetTypeConstructor = c
         }
-    });
-    nmsChatMessageTypeClass = packetTypeConstructor.parameterTypes[1];
+    })
+    let nmsChatMessageTypeClass = packetTypeConstructor.parameterTypes[1]
     if (nmsChatMessageTypeClass.isEnum()) {
-        chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants();
-    } else {
-        switch (nmsChatMessageTypeClass.name) {
-            case "int":
-                //@ts-ignore
-                nmsChatMessageTypeClass = java.lang.Integer;
-                break;
-            case "byte":
-                //@ts-ignore
-                nmsChatMessageTypeClass = java.lang.Byte;
-                break;
-        }
+        chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
     }
-    var entityPlayerClass = nmsCls('EntityPlayer');
-    var packetClass = nmsCls('Packet');
-    var playerConnectionField = remapFieldName(entityPlayerClass, 'playerConnection', 'field_71135_a')
+    let playerConnectionField = remapFieldName(nmsCls('EntityPlayer'), 'playerConnection', 'field_71135_a')
     playerConnectionFieldName = playerConnectionField.getName()
-    sendPacketMethod = remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', packetClass)
+    sendPacketMethodName = remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', nmsCls('Packet')).getName()
 }
 
-function json(sender, json) {
+function json(sender: { name: string }, json: string) {
     if (downgrade) {
         return '/tellraw ' + sender.name + ' ' + json
     } else {
-        send(sender, json, 0);
-        return false;
+        send(sender, json, 0)
+        return false
     }
 }
 
-function send(sender, json, type) {
-    //@ts-ignore
-    sendPacket(sender, packetTypeConstructor.newInstance(nmsChatSerializerMethod.invoke(null, json), chatMessageTypes == null ? nmsChatMessageTypeClass.valueOf(java.lang.String.valueOf(type)) : chatMessageTypes[type]))
+function send(sender: any, json: any, type: number) {
+    sendPacket(sender, new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type]))
 }
 
-function sendPacket(player, p) {
-    sendPacketMethod.invoke(player.handle[playerConnectionFieldName], p)
+function sendPacket(player: { handle: { [x: string]: { [x: string]: (arg0: any) => void } } }, p: any) {
+    player.handle[playerConnectionFieldName][sendPacketMethodName](p)
 }
 
 try {
-    init();
+    init()
 } catch (ex) {
     org.bukkit.Bukkit.getConsoleSender().sendMessage(`§6[§cMS§6][§bbukkit§6][§achat§6] §cNMS Inject Error §4${ex} §cDowngrade to Command Mode...`)
-    downgrade = true;
+    downgrade = true
 }
 
 let chat = {
-    json
+    json,
+    send
 }
 
 export default chat

packages/bukkit/src/server.ts

@@ -1,18 +1,18 @@
 import { server, constants } from '@ccms/api'
-import { provideSingleton } from '@ccms/container';
+import { provideSingleton } from '@ccms/container'
 
 import * as reflect from '@ccms/common/dist/reflect'
 import chat from './enhance/chat'
 
-let Bukkit = org.bukkit.Bukkit;
+let Bukkit = org.bukkit.Bukkit
 
 @provideSingleton(server.Server)
 export class BukkitServer extends server.ReflectServer {
-    private pluginsFolder: string;
+    private pluginsFolder: string
 
     constructor() {
-        super();
-        this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath();
+        super()
+        this.pluginsFolder = Bukkit.getUpdateFolderFile().getParentFile().getCanonicalPath()
     }
 
     getPlayer(name: string) {
@@ -40,25 +40,25 @@ export class BukkitServer extends server.ReflectServer {
         return Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command)
     }
     getPluginsFolder(): string {
-        return this.pluginsFolder;
+        return this.pluginsFolder
     }
     getNativePluginManager() {
-        return Bukkit.getPluginManager() as any;
+        return Bukkit.getPluginManager() as any
     }
     getDedicatedServer() {
         return reflect.on(Bukkit.getServer()).get('console').get()
     }
     getNettyPipeline() {
-        return this.pipeline;
+        return this.pipeline
     }
     getRootLogger() {
-        return this.rootLogger;
+        return this.rootLogger
     }
     sendJson(sender: string | any, json: object | string): void {
         if (typeof sender === "string") {
             sender = this.getPlayer(sender)
         }
-        let result = chat.json(sender, json)
+        let result = chat.json(sender, typeof json == "string" ? json : JSON.stringify(json))
         if (result !== false) {
             this.dispatchConsoleCommand(result)
         }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     }
 }

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.8.3",
+    "version": "0.9.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "@javatypes/jdk": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.8.3",
+    "version": "0.9.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.9.6"

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -24,8 +24,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -4,7 +4,6 @@ import { plugin, server, task, constants } from '@ccms/api'
 import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ccms/container'
 console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() - containerStartTime) / 1000 })
 import http from '@ccms/common/dist/http'
-import { EventEmitter } from 'events'
 
 @provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {

packages/database/package.json

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

packages/i18n/languages/zh_cn.yml

@@ -21,8 +21,8 @@ ms.api.event.not.found: "§6插件 §b{name} §6注册事件 §c{event} §6失
 ms.api.event.execute.slow: "§c注意! §6插件 §b{name} §6处理 §d{event} §6事件 §c耗时 §4{cost}ms !"
 ms.api.event.execute.error: "§6插件 §b{name} §6处理 §d{event} §6事件时发生异常 §4{ex}"
 ms.api.event.listen.plugin.name.empty: "插件名称为空 请检查传入参数!"
-ms.api.event.register: "[{name}] 注册事件 {event}"
-ms.api.event.unregister: "[{name}] 注销事件 {event}"
+ms.api.event.register: "[{name}] 注册事件 {event} => {exec}"
+ms.api.event.unregister: "[{name}] 注销事件 {event} => {exec}"
 ms.api.command.register.input.error: "CommandExec 必须为一个函数... 输入: {exec}"
 ms.api.command.register: "[{plugin}] 注册命令 {name}({cmd})..."
 ms.api.command.unregister: "[{plugin}] 注销命令 {name}..."

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "@types/js-yaml": "^3.12.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",

packages/keyvalue/.npmignore

@@ -0,0 +1 @@
+../../.npmignore

packages/keyvalue/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/keyvalue",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript keyvalue package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,18 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "@javatypes/amqp-client": "^0.0.2",
         "@javatypes/spring-amqp": "^0.0.2",
         "@javatypes/spring-rabbit": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.9.6"
-    }
+    },
+    "gitHead": "2589633069d24f646ac09261b1b2304c21d4ea75"
 }

packages/keyvalue/src/adapter/admin.ts

@@ -0,0 +1,17 @@
+import { ConnectionFactoryAdapter } from "./connection"
+import { RabbitTemplateAdapter } from "./template"
+import { JSClass } from "@ccms/container"
+
+export const RabbitAdmin = Java.type('org.springframework.amqp.rabbit.core.RabbitAdmin')
+
+export class RabbitAdminAdapter {
+    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
+    private RabbitAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
+    private _Handler: org.springframework.amqp.rabbit.core.RabbitAdmin
+    constructor(config: RabbitTemplateAdapter | org.springframework.amqp.rabbit.core.RabbitTemplate | ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory) {
+        this._Handler = new RabbitAdmin((config instanceof RabbitTemplateAdapter || config instanceof ConnectionFactoryAdapter) ? config.getHandler() : config)
+    }
+    getHandler(): org.springframework.amqp.rabbit.core.RabbitAdmin {
+        return this._Handler
+    }
+}

packages/keyvalue/src/adapter/callback.ts

@@ -0,0 +1,30 @@
+export const ConfirmCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback')
+export const ReturnCallback = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback')
+
+export abstract class ConfirmCallbackAdapter {
+    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ConfirmCallback
+    constructor() {
+        let ConfirmCallbackImpl = Java.extend(ReturnCallback, {
+            confirm: (correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string) => this.confirm(correlationData, ack, cause)
+        })
+        this._Handler = new ConfirmCallbackImpl()
+    }
+    abstract confirm(correlationData: org.springframework.amqp.rabbit.connection.CorrelationData, ack: boolean, cause: string)
+    getHandler() {
+        return this._Handler
+    }
+}
+
+export abstract class ReturnCallbackAdapter {
+    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate.ReturnCallback
+    constructor() {
+        let ReturnCallbackImpl = Java.extend(ReturnCallback, {
+            returnedMessage: (message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string) => this.returnedMessage(message, replyCode, replyText, exchange, routingKey)
+        })
+        this._Handler = new ReturnCallbackImpl()
+    }
+    abstract returnedMessage(message: org.springframework.amqp.core.Message, replyCode: number, replyText: string, exchange: string, routingKey: string)
+    getHandler() {
+        return this._Handler
+    }
+}

packages/keyvalue/src/adapter/connection.ts

@@ -0,0 +1,31 @@
+import threadPool from '@ccms/common/dist/thread-pool'
+
+export const ConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.ConnectionFactory')
+const CachingConnectionFactory = Java.type('org.springframework.amqp.rabbit.connection.CachingConnectionFactory')
+interface ConnectionConfig {
+    url: string,
+    username?: string,
+    password?: string,
+    publisherConfirms?: boolean
+    cacheSize?: number
+}
+
+export class ConnectionFactoryAdapter {
+    private _Handler: org.springframework.amqp.rabbit.connection.CachingConnectionFactory
+
+    constructor(config: ConnectionConfig) {
+        if (!config.url) { throw new Error('Connection UrI Can\'t be undefiend!') }
+        config = { publisherConfirms: true, cacheSize: 50, ...config }
+        this._Handler = new CachingConnectionFactory(new java.net.URI(config.url))
+        config.username && this._Handler.setUsername(config.username)
+        config.password && this._Handler.setPassword(config.password)
+        this._Handler.setPublisherConfirms(config.publisherConfirms)
+        this._Handler.setExecutor(threadPool.create({
+            groupName: '@ccms/amqp-rabbit'
+        }))
+        this._Handler.setChannelCacheSize(config.cacheSize)
+    }
+    getHandler() {
+        return this._Handler
+    }
+}

packages/keyvalue/src/adapter/container.ts

@@ -0,0 +1,30 @@
+import { ConnectionFactoryAdapter, ConnectionFactory } from "./connection"
+import { ChannelAwareMessageListenerAdapter, ChannelAwareMessageListener } from "./listener"
+
+export const SimpleMessageListenerContainer = org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
+export const AcknowledgeMode: org.springframework.amqp.core.AcknowledgeMode = Java.type('org.springframework.amqp.core.AcknowledgeMode')
+interface ContainerConfig {
+    connectionFactory: ConnectionFactoryAdapter | typeof ConnectionFactory
+    queueNames: string[]
+    messageListener: ChannelAwareMessageListenerAdapter | typeof ChannelAwareMessageListener
+    maxConcurrentConsumers?: number
+    concurrentConsumers?: number
+    acknowledgeMode?: org.springframework.amqp.core.AcknowledgeMode
+}
+
+export class MessageListenerContainerAdapter {
+    private _Handler: org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer
+    constructor(config: ContainerConfig) {
+        config = { concurrentConsumers: 5, maxConcurrentConsumers: 10, acknowledgeMode: AcknowledgeMode.AUTO, ...config }
+        this._Handler = new SimpleMessageListenerContainer(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
+        //@ts-ignore
+        this._Handler.setQueueNames(config.queueNames)
+        this._Handler.setMaxConcurrentConsumers(config.maxConcurrentConsumers)
+        this._Handler.setConcurrentConsumers(config.concurrentConsumers)
+        this._Handler.setAcknowledgeMode(config.acknowledgeMode)
+        this._Handler.setMessageListener(config.messageListener instanceof ChannelAwareMessageListenerAdapter ? config.messageListener.getHandler() : config.messageListener)
+    }
+    getHandler() {
+        return this._Handler
+    }
+}

packages/keyvalue/src/adapter/converter.ts

@@ -0,0 +1,37 @@
+const JavaString = Java.type('java.lang.String')
+const MessageProperties = org.springframework.amqp.core.MessageProperties
+const Message = org.springframework.amqp.core.Message
+
+export const MessageConverter = Java.type('org.springframework.amqp.support.converter.MessageConverter')
+
+export class MessageConverterAdapter {
+    private _Handler: org.springframework.amqp.support.converter.MessageConverter
+    constructor() {
+        var MessageConverterImpl = Java.extend(MessageConverter, {
+            toMessage: (object: any, messageProperties: org.springframework.amqp.core.MessageProperties) => this.toMessage(object, messageProperties),
+            fromMessage: (message: org.springframework.amqp.core.Message) => this.fromMessage(message)
+        })
+        this._Handler = new MessageConverterImpl()
+    }
+    toMessage(object: any, messageProperties: org.springframework.amqp.core.MessageProperties) {
+        if (typeof object == "string") {
+            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_TEXT_PLAIN)
+            return new Message(new JavaString(object).getBytes(), messageProperties)
+        } else {
+            messageProperties.setContentType(MessageProperties.CONTENT_TYPE_JSON)
+            return new Message(new JavaString(JSON.stringify(object)).getBytes(), messageProperties)
+        }
+    }
+    fromMessage(message: org.springframework.amqp.core.Message) {
+        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_TEXT_PLAIN) {
+            return new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding())
+        }
+        if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
+            return JSON.parse(new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding()))
+        }
+        return message
+    }
+    getHandler() {
+        return this._Handler
+    }
+}

packages/keyvalue/src/adapter/index.ts

@@ -0,0 +1,7 @@
+export * from './admin'
+export * from './callback'
+export * from './connection'
+export * from './container'
+export * from './converter'
+export * from './listener'
+export * from './template'

packages/keyvalue/src/adapter/listener.ts

@@ -0,0 +1,49 @@
+const JavaString = Java.type('java.lang.String')
+export const MessageProperties = org.springframework.amqp.core.MessageProperties
+export const ChannelAwareMessageListener = Java.type('org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener')
+export const AmqpRejectAndDontRequeueException = org.springframework.amqp.AmqpRejectAndDontRequeueException
+export const Channel: com.rabbitmq.client.Channel = Java.type('com.rabbitmq.client.Channel')
+export const Message = org.springframework.amqp.core.Message
+export type MessageHandler<T> = (content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => any
+export abstract class ChannelAwareMessageListenerAdapter<T = any> {
+    private _Handler: org.springframework.amqp.rabbit.listener.api.ChannelAwareMessageListener
+    constructor(manual: boolean = false) {
+        let ChannelAwareMessageListenerImpl = Java.extend(ChannelAwareMessageListener, {
+            onMessage: (message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) => {
+                let content = new JavaString(message.getBody(), message.getMessageProperties().getContentEncoding() || "UTF-8")
+                try {
+                    if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
+                        content = JSON.parse(content)
+                    }
+                } catch (error) {
+                    if (manual) {
+                        channel.basicReject(message.getMessageProperties().getDeliveryTag(), true)
+                    } else {
+                        throw new AmqpRejectAndDontRequeueException(`${error}`, error)
+                    }
+                }
+                manual ? this.manualOnMessage(content, message, channel) : this.onMessage(content, message, channel)
+            }
+        })
+        this._Handler = new ChannelAwareMessageListenerImpl()
+    }
+    abstract onMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any
+    onError(error: Error, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel): any { }
+    getHandler() {
+        return this._Handler
+    }
+    private manualOnMessage(content: T, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
+        let deliveryTag = message.getMessageProperties().getDeliveryTag()
+        try {
+            if (this.onMessage(content, message, channel)) {
+                channel.basicAck(deliveryTag, false)
+            } else if (message.getMessageProperties().getRedelivered()) {
+                channel.basicReject(deliveryTag, true)
+            } else {
+                channel.basicNack(deliveryTag, false, true)
+            }
+        } catch (error) {
+            channel.basicReject(deliveryTag, this.onError(error, message, channel))
+        }
+    }
+}

packages/keyvalue/src/adapter/template.ts

@@ -0,0 +1,27 @@
+import { MessageConverterAdapter } from "./converter"
+import { ConnectionFactoryAdapter } from "./connection"
+import { ConfirmCallbackAdapter, ReturnCallbackAdapter } from "./callback"
+
+export const RabbitTemplate = Java.type('org.springframework.amqp.rabbit.core.RabbitTemplate')
+
+interface TemplateConfig {
+    connectionFactory: ConnectionFactoryAdapter | org.springframework.amqp.rabbit.connection.ConnectionFactory
+    confirmCallback?: ConfirmCallbackAdapter
+    returnCallback?: ReturnCallbackAdapter
+    messageConverter?: MessageConverterAdapter
+}
+export class RabbitTemplateAdapter {
+    private _Handler: org.springframework.amqp.rabbit.core.RabbitTemplate
+    constructor(config: TemplateConfig) {
+        config = { messageConverter: new MessageConverterAdapter(), ...config }
+        console.debug(JSON.stringify(config))
+        this._Handler = new RabbitTemplate(config.connectionFactory instanceof ConnectionFactoryAdapter ? config.connectionFactory.getHandler() : config.connectionFactory)
+        config.returnCallback && this._Handler.setReturnCallback(config.returnCallback.getHandler())
+        config.confirmCallback && this._Handler.setConfirmCallback(config.confirmCallback.getHandler())
+        config.messageConverter && this._Handler.setMessageConverter(config.messageConverter.getHandler())
+    }
+
+    getHandler() {
+        return this._Handler
+    }
+}

packages/keyvalue/src/admin.ts

@@ -0,0 +1,89 @@
+import { JSClass } from "@ccms/container"
+import { RabbitAdminAdapter, MessageListenerContainerAdapter, AcknowledgeMode, MessageHandler, ChannelAwareMessageListenerAdapter } from "./adapter"
+
+export class AmqpAdmin {
+    @JSClass('org.springframework.amqp.core.TopicExchange')
+    private TopicExchange: typeof org.springframework.amqp.core.TopicExchange
+    @JSClass('org.springframework.amqp.core.Queue')
+    private Queue: typeof org.springframework.amqp.core.Queue
+    @JSClass('org.springframework.amqp.core.Binding')
+    private Binding: typeof org.springframework.amqp.core.Binding
+    @JSClass('org.springframework.amqp.rabbit.core.RabbitAdmin')
+    private RabbitAdmin: typeof org.springframework.amqp.rabbit.core.RabbitAdmin
+    @JSClass('org.springframework.amqp.core.Binding.DestinationType')
+    private DestinationType: org.springframework.amqp.core.Binding.DestinationType
+
+    private amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin
+
+    constructor(amqpAdmin: org.springframework.amqp.rabbit.core.RabbitAdmin | any) {
+        if (amqpAdmin instanceof this.RabbitAdmin) {
+            this.amqpAdmin = amqpAdmin
+        } else if (amqpAdmin instanceof RabbitAdminAdapter) {
+            this.amqpAdmin = amqpAdmin.getHandler()
+        } else {
+            this.amqpAdmin = new RabbitAdminAdapter(amqpAdmin).getHandler()
+        }
+    }
+
+    getHandler() {
+        return this.amqpAdmin
+    }
+
+    getQueueProperties(name: string) {
+        return this.amqpAdmin.getQueueProperties(name)
+    }
+
+    declareExchange(name: string) {
+        let exchange = new this.TopicExchange(name, true, false)
+        this.amqpAdmin.declareExchange(exchange)
+        return this
+    }
+
+    declareQueue(name: string) {
+        let queue = new this.Queue(name, true)
+        this.amqpAdmin.declareQueue(queue)
+        return this
+    }
+
+    declareBinding(queue: string, exchange: string, routerKey: string, argument: any = null) {
+        let binding = new this.Binding(queue, this.DestinationType.QUEUE, exchange, routerKey, argument)
+        this.amqpAdmin.declareBinding(binding)
+        return this
+    }
+
+    declareQueueAndBindExchange(queue: string, exchange: string, routerKey: string) {
+        return this.declareQueue(queue).declareExchange(exchange).declareBinding(queue, exchange, routerKey)
+    }
+
+    createContainer<T>(queue: string, listener: MessageHandler<T>, acknowledgeMode = AcknowledgeMode.AUTO) {
+        let connection = this.amqpAdmin.getRabbitTemplate().getConnectionFactory()
+        return new MessageListenerContainerAdapter({
+            connectionFactory: connection,
+            queueNames: [queue],
+            messageListener: new SimpleMessageHandler(listener),
+            acknowledgeMode: acknowledgeMode
+        }).getHandler()
+    }
+
+    send()
+    send() {
+
+    }
+
+    getTemplate() {
+        return this.amqpAdmin.getRabbitTemplate()
+    }
+
+    close() {
+        this.getTemplate().stop()
+    }
+}
+
+export class SimpleMessageHandler extends ChannelAwareMessageListenerAdapter {
+    constructor(private handler: MessageHandler<any>) {
+        super()
+    }
+    onMessage(content: any, message: org.springframework.amqp.core.Message, channel: com.rabbitmq.client.Channel) {
+        return this.handler(content, message, channel)
+    }
+}

packages/keyvalue/src/constants.ts

@@ -0,0 +1,3 @@
+export const METADATA_KEY = {
+
+}

packages/keyvalue/src/index.ts

@@ -0,0 +1,34 @@
+/// <reference types="@ccms/nashorn" />
+/// <reference types="@javatypes/jdk" />
+/// <reference types="@javatypes/spring-amqp" />
+/// <reference types="@javatypes/spring-rabbit" />
+/// <reference types="@javatypes/amqp-client" />
+
+import { amqp } from '@ccms/api'
+import { getContainer, reduceMetadata } from '@ccms/container'
+
+function init() {
+    const beanFactory = base.getInstance().getAutowireCapableBeanFactory()
+    getContainer().bind(amqp.rabbit.Template).toDynamicValue((ctx) => {
+        let metadata = reduceMetadata(ctx)
+        if (!metadata.named) {
+            return beanFactory.getBean('rabbitTemplate')
+        } else {
+            return beanFactory.getBean(`${metadata.named}-rabbitTemplate`)
+        }
+    })
+    getContainer().bind(amqp.rabbit.Admin).toDynamicValue((ctx) => {
+        let metadata = reduceMetadata(ctx)
+        if (!metadata.named) {
+            return beanFactory.getBean('rabbitAdmin')
+        } else {
+            return beanFactory.getBean(`${metadata.named}-rabbitAdmin`)
+        }
+    })
+}
+init()
+
+export * from './admin'
+export * from './adapter'
+export * from './manager'
+export * from './constants'

packages/keyvalue/src/listener.ts

@@ -0,0 +1,5 @@
+export class AmqpListener {
+    constructor() {
+
+    }
+}

packages/keyvalue/src/manager.ts

@@ -0,0 +1,18 @@
+import { amqp } from "@ccms/api"
+import { provideSingleton } from "@ccms/container"
+
+import { ConnectionFactoryAdapter, RabbitTemplateAdapter, RabbitAdminAdapter } from "./adapter"
+import { AmqpAdmin } from "./admin"
+
+@provideSingleton(amqp.Manager)
+export class AmqpManager {
+    createConnection(url: string, username: string, password: string) {
+        return new ConnectionFactoryAdapter({ url, username, password })
+    }
+    createTemplate(adapter: ConnectionFactoryAdapter) {
+        return new RabbitTemplateAdapter({ connectionFactory: adapter })
+    }
+    createAdmin(adapter: RabbitTemplateAdapter | ConnectionFactoryAdapter) {
+        return new AmqpAdmin(new RabbitAdminAdapter(adapter))
+    }
+}

packages/keyvalue/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "baseUrl": "src",
+        "outDir": "dist"
+    }
+}

packages/nashorn/package.json

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

packages/nodejs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nodejs",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript nodejs package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.9.6"

packages/nukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/nukkit",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript nukkit package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     }
 }

packages/ployfill/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/ployfill",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript ployfill 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.8.4",
-        "@ccms/nodejs": "^0.8.4",
+        "@ccms/i18n": "^0.9.0",
+        "@ccms/nodejs": "^0.9.0",
         "core-js": "^3.6.5"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
         "typescript": "^3.9.6"

packages/plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/plugin",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,10 +25,10 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4",
-        "@ccms/i18n": "^0.8.4",
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0",
+        "@ccms/i18n": "^0.9.0",
         "js-yaml": "^3.14.0"
     }
 }

packages/plugin/src/event.ts

@@ -20,7 +20,7 @@ export class PluginEventManager {
             // ignore space listener
             if (!this.ServerChecker.check(event.servers)) { continue }
             // here must bind this to pluginInstance
-            this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance))
+            this.EventManager.listen(pluginInstance, event.name, pluginInstance[event.executor].bind(pluginInstance), event.priority, event.ignoreCancel)
         }
     }
 

packages/plugins/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/plugins",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript plugins package",
     "keywords": [
         "miaoscript",
@@ -28,8 +28,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/container": "^0.8.4",
-        "@ccms/plugin": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/container": "^0.9.0",
+        "@ccms/plugin": "^0.9.0"
     }
 }

packages/plugins/src/MiaoScriptPackageManager.ts

@@ -26,7 +26,7 @@ let langMap = {
     'main.command.not.exists': '§4未知的子命令: §c{command}',
     'main.command.help.tip': '§6请执行 §b/{command} §ahelp §6查看帮助!',
     'list.install.header': '§6当前 §bMiaoScript §6已安装下列插件:',
-    'list.install.body': '§6插件名称: §b{name} §6版本: §a{version} §6作者: §3{author}',
+    'list.install.body': '§6插件名称: §b{name} §6版本: §a{version} §6作者: §3{author} §6来源: §c{from}',
     'list.header': '§6当前 §bMiaoScriptPackageCenter §6中存在下列插件:',
     'list.body': '§6插件名称: §b{name} §6版本: §a{version} §6作者: §3{author} §6更新时间: §9{updated_at}',
     'plugin.not.exists': '§6插件 §b{name} §c不存在!',
@@ -51,7 +51,7 @@ let langMap = {
 
 let fallbackMap = langMap
 
-@plugin({ name: 'MiaoScriptPackageManager', prefix: 'PM', version: '1.0.1', author: 'MiaoWoo', source: __filename })
+@plugin({ name: 'MiaoScriptPackageManager', prefix: 'PM', version: '1.0.2', author: 'MiaoWoo', source: __filename })
 export class MiaoScriptPackageManager extends interfaces.Plugin {
     @inject(pluginApi.PluginManager)
     private pluginManager: pluginApi.PluginManager
@@ -114,7 +114,7 @@ export class MiaoScriptPackageManager extends interfaces.Plugin {
         if (type == "i" || type == "install") {
             this.i18n(sender, 'list.install.header')
             this.pluginManager.getPlugins().forEach((plugin) => {
-                this.i18n(sender, 'list.install.body', plugin.description)
+                this.i18n(sender, 'list.install.body', { ...plugin.description, from: plugin.description.loadMetadata.type })
             })
         } else {
             this.i18n(sender, 'list.header')
@@ -295,7 +295,7 @@ return '§a返回结果: §r'+ eval(${JSON.stringify(code)});`)
             http.download(this.packageCache[name].url, pluginFile)
             this.i18n(sender, 'download.finish', { name })
             if (!update) {
-                this.pluginManager.loadFromFile(fs.file(pluginFile))
+                this.pluginManager.loadFromFile(fs.concat(root, this.pluginFolder, name + '.js'))
                 this.i18n(sender, 'install.finish', { name })
             } else {
                 this.i18n(sender, 'update.finish', { name })

packages/plugins/src/SearchRanking.ts

@@ -179,6 +179,7 @@ class SearchRankingController {
                     sortType: 'va_rmdarkgmv30rt',
                     button_click: 'top'
                 } : {},
+                pageTotal: 3,
                 cacheKey: this.getResultCacheKey(keywords, type, dateCache)
             },
             resRouteSuffix: ROUTER_KEY,

packages/sponge/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/sponge",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -25,8 +25,8 @@
         "typescript": "^3.9.6"
     },
     "dependencies": {
-        "@ccms/api": "^0.8.4",
-        "@ccms/common": "^0.8.4",
-        "@ccms/container": "^0.8.4"
+        "@ccms/api": "^0.9.0",
+        "@ccms/common": "^0.9.0",
+        "@ccms/container": "^0.9.0"
     }
 }

packages/spring/package.json

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

packages/web/package.json

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

packages/websocket/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/websocket",
-    "version": "0.8.4",
+    "version": "0.9.0",
     "description": "MiaoScript websocket package",
     "keywords": [
         "miaoscript",
@@ -19,7 +19,7 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.8.4",
+        "@ccms/nashorn": "^0.9.0",
         "@javatypes/tomcat-websocket-api": "^0.0.2",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",