v0.19.0

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

lerna.json

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

package.json

@@ -9,10 +9,9 @@
         "bs": "lerna bootstrap",
         "clean": "lerna run clean",
         "watch": "lerna run watch --parallel",
-        "build": "lerna run build --scope=\"@ccms/!(plugins)\"",
-        "build:plugins": "lerna run build --scope=\"@ccms/plugins\"",
+        "build": "lerna run build",
         "ug": "yarn upgrade-interactive --latest",
-        "np": "lerna exec \"npm publish --access=public --registry https://registry.npmjs.org\" --scope=\"@ccms/!(client|plugins)\"",
+        "np": "./script/push.sh",
         "lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
         "lp": "lerna publish --registry https://registry.npmjs.org"
     },
@@ -20,6 +19,6 @@
         "packages/*"
     ],
     "devDependencies": {
-        "lerna": "^3.22.1"
+        "lerna": "^4.0.0"
     }
 }

packages/amqp/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/amqp",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript amqp package",
     "keywords": [
         "miaoscript",
@@ -19,17 +19,17 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
-        "@ccms/common": "^0.10.0",
-        "@ccms/container": "^0.10.0"
+        "@ccms/api": "^0.19.0",
+        "@ccms/common": "^0.19.0",
+        "@ccms/container": "^0.19.0"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.19.0",
         "@javatypes/amqp-client": "^0.0.3",
         "@javatypes/spring-amqp": "^0.0.3",
         "@javatypes/spring-rabbit": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     }
 }

packages/amqp/src/adapter/listener.ts

@@ -15,7 +15,7 @@ export abstract class ChannelAwareMessageListenerAdapter<T = any> {
                     if (message.getMessageProperties().getContentType() == MessageProperties.CONTENT_TYPE_JSON) {
                         content = JSON.parse(content)
                     }
-                } catch (error) {
+                } catch (error: any) {
                     if (manual) {
                         channel.basicReject(message.getMessageProperties().getDeliveryTag(), true)
                     } else {
@@ -42,7 +42,7 @@ export abstract class ChannelAwareMessageListenerAdapter<T = any> {
             } else {
                 channel.basicNack(deliveryTag, false, true)
             }
-        } catch (error) {
+        } catch (error: any) {
             channel.basicReject(deliveryTag, this.onError(error, message, channel))
         }
     }

packages/api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/api",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,16 +19,16 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "@ccms/common": "^0.10.0",
-        "@ccms/container": "^0.10.0",
-        "@ccms/ployfill": "^0.10.0",
-        "base64-js": "^1.3.1",
+        "@ccms/common": "^0.19.0",
+        "@ccms/container": "^0.19.0",
+        "@ccms/polyfill": "^0.19.0",
+        "base64-js": "^1.5.1",
         "source-map-builder": "^0.0.7"
     },
     "devDependencies": {
         "@types/base64-js": "^1.3.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     }
 }

packages/api/src/command.ts

@@ -44,12 +44,37 @@ export namespace command {
         protected setExecutor(plugin: plugin.Plugin, command: any, executor: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
-                    return executor(sender, command, Java.from(args))
-                } catch (ex) {
-                    console.i18n("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
+                    let time = Date.now()
+                    let result = executor(sender, command, Java.from(args))
+                    let cost = Date.now() - time
+                    if (cost > global.ScriptSlowExecuteTime) {
+                        console.i18n("ms.api.command.execute.slow", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            cost
+                        })
+                    }
+                    return result
+                } catch (ex: any) {
+                    console.i18n("ms.api.command.execute.error", {
+                        player: sender.name,
+                        plugin: plugin.description.name,
+                        command,
+                        args: Java.from(args).join(' '),
+                        ex
+                    })
                     console.ex(ex)
                     if (sender.name != 'CONSOLE') {
-                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                        console.sender(sender, [i18n.translate("ms.api.command.execute.error", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            ex
+                        }),
+                        ...console.stack(ex)])
                     }
                     return true
                 }
@@ -58,13 +83,42 @@ export namespace command {
         protected setTabCompleter(plugin: plugin.Plugin, command: any, tabCompleter: Function) {
             return (sender: any, _: any, command: string, args: string[]) => {
                 try {
+                    let time = Date.now()
                     var token = args[args.length - 1]
                     var complete = tabCompleter(sender, command, Java.from(args)) || []
-                    return this.copyPartialMatches(complete, token)
-                } catch (ex) {
-                    console.i18n("ms.api.command.tab.completer.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex })
+                    let result = this.copyPartialMatches(complete, token)
+                    let cost = Date.now() - time
+                    if (cost > global.ScriptSlowExecuteTime) {
+                        console.i18n("ms.api.command.tab.completer.slow", {
+                            player: sender.name,
+                            plugin: plugin.description.name,
+                            command,
+                            args: Java.from(args).join(' '),
+                            cost
+                        })
+                    }
+                    return result
+                } catch (ex: any) {
+                    console.i18n("ms.api.command.tab.completer.error", {
+                        player: sender.name,
+                        plugin: plugin.description.name,
+                        command,
+                        args: Java.from(args).join(' '),
+                        ex
+                    })
                     console.ex(ex)
-                    console.sender(sender, [i18n.translate("ms.api.command.tab.completer.error", { player: sender.name, plugin: plugin.description.name, command, args: Java.from(args).join(' '), ex }), ...console.stack(ex)])
+                    if (sender.name != 'CONSOLE') {
+                        console.sender(sender, [
+                            i18n.translate("ms.api.command.tab.completer.error", {
+                                player: sender.name,
+                                plugin: plugin.description.name,
+                                command,
+                                args: Java.from(args).join(' '),
+                                ex
+                            }),
+                            ...console.stack(ex)
+                        ])
+                    }
                     return []
                 }
             }

packages/api/src/console.ts

@@ -5,7 +5,7 @@ import * as base64 from 'base64-js'
 const Arrays = Java.type('java.util.Arrays')
 const Level = Java.type('java.util.logging.Level')
 const Paths = Java.type('java.nio.file.Paths')
-const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
+const ignoreLogPrefix = ['java.', 'javax.', 'sun.', 'net.minecraft.', 'org.bukkit.', 'jdk.nashorn.', 'org.openjdk.nashorn', 'io.netty.', 'org.spongepowered.', 'org.apache', 'org.springframework']
 
 enum LogLevel {
     ALL,
@@ -19,7 +19,8 @@ enum LogLevel {
 }
 
 export class MiaoScriptConsole implements Console {
-    Console: NodeJS.ConsoleConstructor
+    Console: any
+    memory: any
 
     private static sourceMaps: { [key: string]: SourceMapBuilder } = {}
     private static sourceFileMaps: { [key: string]: string } = {}
@@ -27,7 +28,8 @@ export class MiaoScriptConsole implements Console {
     private _level: LogLevel = LogLevel.INFO
 
     protected logger: any
-    protected prefix: string = '§6[§bMiaoScript§6]§r '
+
+    public prefix: string = '§6[§bMiaoScript§6]§r '
 
     constructor(name?: string) {
         this.name = name
@@ -47,10 +49,10 @@ export class MiaoScriptConsole implements Console {
     set name(name: string) {
         if (name) {
             this._name = `[${name}] `
-            // noinspection JSUnusedGlobalSymbols
             this.prefix = `§6[§cMS§6][§b${name}§6]§r `
         }
     }
+
     log(...args: any[]): void {
         this.logger.info(this.name + args.join(' '))
     }
@@ -90,7 +92,7 @@ export class MiaoScriptConsole implements Console {
     ex(ex: Error) {
         this.stack(ex).forEach(line => this.console(line))
     }
-    readSourceMap(fileName: string, lineNumber: number) {
+    readSourceMap(fileName: string, lineNumber: any) {
         try {
             if (fileName.endsWith('js')) {
                 if (MiaoScriptConsole.sourceMaps[fileName] === undefined) {
@@ -103,7 +105,7 @@ export class MiaoScriptConsole implements Console {
                         let sourceMappingURL = lastLine.split('sourceMappingURL=', 2)[1]
                         if (sourceMappingURL.startsWith('data:application/json;base64,')) {
                             sourceContent = String.fromCharCode(...Array.from(base64.toByteArray(sourceMappingURL.split(',', 2)[1])))
-                        } else if (sourceMappingURL.startsWith('http')) {
+                        } else if (sourceMappingURL.startsWith('http://') || sourceMappingURL.startsWith('https://')) {
                             // TODO
                         } else {
                             let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile()
@@ -121,7 +123,7 @@ export class MiaoScriptConsole implements Console {
                     if (sourceMapping && lineNumber != sourceMapping.mapping.sourceLine) { lineNumber = sourceMapping.mapping.sourceLine }
                 }
             }
-        } catch (error) {
+        } catch (error: any) {
             console.debug('search source map', fileName, 'line', lineNumber, 'error:', error)
             if (global.debug) {
                 console.ex(error)
@@ -133,6 +135,7 @@ export class MiaoScriptConsole implements Console {
         }
     }
     stack(ex: Error, color: boolean = true): string[] {
+        if (!ex) return []
         let stack = ex.getStackTrace()
         let cache = [(color ? '§c' : '') + ex]
         //@ts-ignore
@@ -152,14 +155,17 @@ export class MiaoScriptConsole implements Console {
             } else {
                 let className = trace.className
                 var fileName = trace.fileName as string
-                if (className.startsWith('jdk.nashorn.internal.scripts')) {
+                var lineNumber = trace.lineNumber
+                if (className.startsWith('jdk.nashorn.internal.scripts') || className.startsWith('org.openjdk.nashorn.internal.scripts')) {
                     className = className.substr(className.lastIndexOf('$') + 1)
-                    var { fileName, lineNumber } = this.readSourceMap(trace.fileName, trace.lineNumber)
+                    var { fileName, lineNumber } = this.readSourceMap(fileName, lineNumber)
                     if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
                 } else {
-                    for (let prefix in ignoreLogPrefix) {
-                        if (className.startsWith(ignoreLogPrefix[prefix])) {
-                            return
+                    if (!global.debug) {
+                        for (let prefix in ignoreLogPrefix) {
+                            if (className.startsWith(ignoreLogPrefix[prefix])) {
+                                return
+                            }
                         }
                     }
                 }
@@ -184,12 +190,15 @@ export class MiaoScriptConsole implements Console {
     countReset(label?: string): void {
         throw new Error("Method not implemented.")
     }
-    dir(obj: any, options?: NodeJS.InspectOptions): void {
+    dir(obj: any, options?: any): void {
         throw new Error("Method not implemented.")
     }
     dirxml(...data: any[]): void {
         throw new Error("Method not implemented.")
     }
+    exception(message?: string, ...optionalParams: any[]): void {
+        throw new Error('Method not implemented.')
+    }
     group(...label: any[]): void {
         throw new Error("Method not implemented.")
     }

packages/api/src/event.ts

@@ -57,7 +57,7 @@ export namespace event {
                             this.mapEvent[simpleName] = clazz
                             count++
                         }
-                    } catch (ex) {
+                    } catch (ex: any) {
                         //ignore already loaded class
                     }
                 }
@@ -82,9 +82,9 @@ export namespace event {
             let eventCls = this.mapEvent[event.toLowerCase()] || this.mapEvent[event.toLowerCase() + 'event']
             if (!eventCls) {
                 try {
-                    eventCls = base.getClass(eventCls)
+                    eventCls = base.getClass(event)
                     this.mapEvent[event] = eventCls
-                } catch (ex) {
+                } catch (ex: any) {
                     console.i18n("ms.api.event.not.found", { name, event })
                     return
                 }
@@ -100,11 +100,11 @@ export namespace event {
                         let time = Date.now()
                         exec(event)
                         let cost = Date.now() - time
-                        if (cost > 20) {
+                        if (cost > global.ScriptSlowExecuteTime) {
                             console.i18n("ms.api.event.execute.slow", { name, event: this.class2Name(eventCls), cost })
                         }
                     }
-                } catch (ex) {
+                } catch (ex: any) {
                     console.i18n("ms.api.event.execute.error", { name, event: this.class2Name(eventCls), ex })
                     console.ex(ex)
                 }

packages/api/src/index.ts

@@ -12,4 +12,5 @@ export * from './console'
 export * from './channel'
 export * from './command'
 export * from './database'
+export * from './particle'
 export * from './constants'

packages/api/src/particle.ts

@@ -0,0 +1,494 @@
+import { Autowired, injectable } from '@ccms/container'
+
+import { task, plugin } from './index'
+
+const UUID = Java.type('java.util.UUID')
+const Math = Java.type('java.lang.Math')
+
+export namespace particle {
+    /**
+     * 表示一个特效对象
+     *
+     * @author Zoyn
+     */
+    export abstract class Particle {
+        private spawner: ParticleSpawner
+        private readonly uuid: string
+
+        private particle: any /* Particle */
+        private count: number = 1;
+        private offsetX: number = 0;
+        private offsetY: number = 0;
+        private offsetZ: number = 0;
+        private extra: number = 0;
+        private data: Object = null;
+
+        constructor() {
+            this.uuid = UUID.randomUUID().toString()
+        }
+        abstract show(location: any)
+
+        getUUID() {
+            return this.uuid
+        }
+
+        getSpawner() {
+            return this.spawner
+        }
+
+        setSpawner(spawner: ParticleSpawner) {
+            this.spawner = spawner
+            return this
+        }
+
+        getParticle() {
+            return this.particle
+        }
+
+        setParticle(particle: any, data: any = null) {
+            this.particle = particle
+            this.data = data
+            return this
+        }
+
+        getCount() {
+            return this.count
+        }
+
+        setCount(count: number) {
+            this.count = count
+            return this
+        }
+
+        getOffsetX() {
+            return this.offsetX
+        }
+
+        setOffsetX(offsetX: number) {
+            this.offsetX = offsetX
+            return this
+        }
+
+        getOffsetY() {
+            return this.offsetY
+        }
+
+        setOffsetY(offsetY: number) {
+            this.offsetY = offsetY
+            return this
+        }
+
+        getOffsetZ() {
+            return this.offsetZ
+        }
+
+        setOffsetZ(offsetZ: number) {
+            this.offsetZ = offsetZ
+            return this
+        }
+
+        getExtra() {
+            return this.extra
+        }
+
+        setExtra(extra: number) {
+            this.extra = extra
+            return this
+        }
+
+        getData() {
+            return this.data
+        }
+
+        setData(data) {
+            this.data = data
+            return this
+        }
+
+        /**
+         * 通过给定一个坐标就可以使用已经指定的参数来播放粒子
+         *
+         * @param location 坐标
+         */
+        spawn(location: any) {
+            if (!this.spawner) throw new Error(`particle ${this.uuid} not set spawner can't spawn!`)
+            this.spawner.spawn(location, this)
+        }
+    }
+    /**
+     * 表示一条线
+     *
+     * @author Zoyn
+     */
+    export class Line extends Particle {
+        private vector: any
+        private start: any
+        private end: any
+        /**
+         * 步长
+         */
+        private step: number
+        /**
+         * 向量长度
+         */
+        private length: number
+
+        /**
+         * 构造一条线
+         *
+         * @param start 线的起点
+         * @param end   线的终点
+         */
+        constructor(start: any, end: any)
+        /**
+         * 构造一条线
+         *
+         * @param start  线的起点
+         * @param end    线的终点
+         * @param step   每个粒子之间的间隔 (也即步长)
+         */
+        constructor(start: any, end: any, step: number = 0.1) {
+            super()
+            this.start = start
+            this.end = end
+            this.step = step
+            // 对向量进行重置
+            this.resetVector()
+        }
+
+        show() {
+            for (let i = 0; i < this.length; i += this.step) {
+                let vectorTemp = this.vector.clone().multiply(i)
+                this.spawn(this.start.clone().add(vectorTemp))
+            }
+        }
+
+        /**
+         * 获取线的起始坐标
+         *
+         * @return {@link Location}
+         */
+        getStart() {
+            return this.start
+        }
+
+        /**
+         * 利用给定的坐标设置线的起始坐标
+         *
+         * @param start 起始坐标
+         * @return {@link Line}
+         */
+        setStart(start) {
+            this.start = start
+            this.resetVector()
+            return this
+        }
+
+        /**
+         * 获取线的终点坐标
+         *
+         * @return {@link Location}
+         */
+        getEnd() {
+            return this.end
+        }
+
+        /**
+         * 利用给定的坐标设置线的终点坐标
+         *
+         * @param end 终点
+         * @return {@link Line}
+         */
+        setEnd(end) {
+            this.end = end
+            this.resetVector()
+            return this
+        }
+
+        /**
+         * 获取每个粒子之间的间隔
+         *
+         * @return 也就是循环的步长
+         */
+        getStep() {
+            return this.step
+        }
+
+        /**
+         * 设置每个粒子之间的间隔
+         *
+         * @param step 间隔
+         * @return {@link Line}
+         */
+        setStep(step) {
+            this.step = step
+            this.resetVector()
+            return this
+        }
+
+        /**
+         * 手动重设线的向量
+         */
+        resetVector() {
+            this.vector = this.end.clone().subtract(this.start).toVector()
+            this.length = this.vector.length()
+            this.vector.normalize()
+        }
+
+        public static buildLine(locA: any, locB: any, step: number, particle: any) {
+            let vectorAB = locB.clone().subtract(locA).toVector()
+            let vectorLength = vectorAB.length()
+            vectorAB.normalize()
+            for (let i = 0; i < vectorLength; i += step) {
+                ParticleManager.globalSpawner.spawn(locA.clone().add(vectorAB.clone().multiply(i)), particle)
+            }
+        }
+    }
+    /**
+     * 表示一个弧
+     *
+     * @author Zoyn
+     */
+    export class Arc extends Particle {
+        private angle: number
+        private radius: number
+        private step: number
+
+        /**
+         * 构造一个弧
+         *
+         * @param origin 弧所在的圆的圆点
+         * @param angle  弧所占的角度
+         * @param radius 弧所在的圆的半径
+         * @param step   每个粒子的间隔(也即步长)
+         */
+        constructor(angle: number = 30, radius: number = 1, step: number = 1) {
+            super()
+            this.angle = angle
+            this.radius = radius
+            this.step = step
+        }
+
+        show(location: any) {
+            for (let i = 0; i < this.angle; i += this.step) {
+                let radians: number = Math.toRadians(i)
+                let x: number = this.radius * Math.cos(radians)
+                let z: number = this.radius * Math.sin(radians)
+
+                super.spawn(location.clone().add(x, 0, z))
+            }
+        }
+
+        getAngle(): number {
+            return this.angle
+        }
+
+        setAngle(angle: number): Arc {
+            this.angle = angle
+            return this
+        }
+
+        getRadius(): number {
+            return this.radius
+        }
+
+        setRadius(radius: number): Arc {
+            this.radius = radius
+            return this
+        }
+
+        getStep(): number {
+            return this.step
+        }
+
+        setStep(step: number): Arc {
+            this.step = step
+            return this
+        }
+    }
+    /**
+     * 表示一个圆
+     *
+     * @author Zoyn
+     */
+    export class Circle extends Arc {
+        constructor(radius: number)
+        constructor(radius: number, step: number)
+        /**
+         * 构造一个圆
+         *
+         * @param origin 圆的圆点
+         * @param radius 圆的半径
+         * @param step   每个粒子的间隔(也即步长)
+         * @param period 特效周期(如果需要可以使用)
+         */
+        constructor(radius: number = 1, step: number = 1) {
+            // Circle只需要控制这个fullArc就可以满足所有的要求
+            super(360, radius, step)
+        }
+    }
+    const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
+
+    @injectable()
+    export abstract class ParticleManager {
+        public static globalSpawner: ParticleSpawner = undefined
+        @Autowired()
+        private taskManager: task.TaskManager
+
+        protected taskId: java.util.concurrent.atomic.AtomicInteger
+        protected cacheTasks = new Map<string, ParticleTask>()
+        protected pluginCacheTasks = new Map<string, Map<number, ParticleTask>>()
+
+        constructor() {
+            this.taskId = new AtomicInteger(0)
+        }
+
+        /**
+         * 获得自增的任务ID
+         */
+        public nextId() {
+            return this.taskId.incrementAndGet()
+        }
+
+        public getTaskManager() {
+            return this.taskManager
+        }
+
+        public create(particle: Particle, plugin?: plugin.Plugin) {
+            let uuid = particle.getUUID()
+            if (this.cacheTasks.has(uuid)) {
+                return this.cacheTasks.get(uuid)
+            }
+            let task = this.create0(plugin, particle)
+            this.cacheTasks.set(uuid, task)
+            if (plugin) {
+                if (!this.pluginCacheTasks.has(plugin.description.name)) {
+                    this.pluginCacheTasks.set(plugin.description.name, new Map())
+                }
+                this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
+            }
+            return task
+        }
+
+        public cancel(particle: Particle) {
+            let uuid = particle.getUUID()
+            if (this.cacheTasks.has(uuid)) {
+                this.cacheTasks.get(uuid).cancel()
+                this.cacheTasks.delete(uuid)
+            } else {
+                throw new Error(`particle ${uuid} not found!`)
+            }
+        }
+
+        disable(plugin: plugin.Plugin) {
+            if (this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks
+                    .get(plugin.description.name)
+                    .forEach((task) => task.cancel())
+                this.pluginCacheTasks.delete(plugin.description.name)
+            }
+        }
+        protected create0(owner: plugin.Plugin, particle: Particle): ParticleTask {
+            particle.setSpawner(this.getGlobalSpawner())
+            return new ParticleTask(owner, particle, this)
+        }
+        protected abstract getGlobalSpawner(): ParticleSpawner
+    }
+
+    export class ParticleTask {
+
+        private particle: Particle
+        private isAsync: boolean = false
+        private interval: number = 0
+        private _location: any
+        private _follow: any
+
+        private owner: plugin.Plugin
+        private taskId: number
+        private task: task.Task
+        private taskManager: task.TaskManager
+        protected particleManager: ParticleManager
+
+        constructor(owner: plugin.Plugin, particle: Particle, particleManager: ParticleManager) {
+            this.owner = owner
+            this.taskId = particleManager.nextId()
+            this.particle = particle
+            this.taskManager = particleManager.getTaskManager()
+            this.particleManager = particleManager
+        }
+
+        getOwner() {
+            return this.task.getOwner()
+        }
+
+        getTaskId() {
+            return this.taskId
+        }
+
+        getParticle() {
+            return this.particle
+        }
+
+        async(isAsync: boolean = true) {
+            this.isAsync = isAsync
+            return this
+        }
+
+        timer(tick: number) {
+            this.interval = tick
+            return this
+        }
+
+        follow(entity: { getLocation: () => any }) {
+            this._follow = entity
+            this._location = undefined
+            return this
+        }
+
+        location(location: any) {
+            this._location = location
+            this._follow = undefined
+            return this
+        }
+
+        submit() {
+            this.cancel()
+            if (this._follow && !this.interval) throw new Error(`enable follow entity but interval is ${this.interval}!`)
+            this.taskManager.create(() => {
+                this.task = this.taskManager
+                    .create(() => {
+                        try {
+                            if (this._follow) {
+                                if (!this._follow.isOnline()) return this.cancel()
+                                this.particle.show(this._follow.getLocation().clone().add(0, 1, 0))
+                            } else if (this._location) {
+                                this.particle.show(this._location)
+                            } else {
+                                console.warn(`ParticleTask ${this.taskId} particle ${this.particle.getUUID()} cancel because entity and location both undefined!`)
+                                this.task.cancel()
+                            }
+                        } catch (error: any) {
+                            console.error(`§6插件 §a${this.owner.description.name} §c播放粒子发送异常 §4粒子播放任务已终止!`)
+                            console.ex(error)
+                            this.cancel()
+                        }
+                    }, this.owner)
+                    .async(this.isAsync)
+                    .timer(this.interval)
+                    .submit()
+            }, this.owner).later(2).submit()
+            return this
+        }
+
+        cancel() {
+            if (this.task != null) {
+                this.task.cancel()
+            }
+        }
+    }
+
+    export abstract class ParticleSpawner {
+        abstract spawnParticle(location: any, particle: any, count: number)
+        abstract spawn(location: any, particle: Particle)
+    }
+}

packages/api/src/server.ts

@@ -16,18 +16,37 @@ export namespace server {
      * Runtime Server Instance
      */
     export const ServerInstance = Symbol("ServerInstance")
+    export interface NativePlugin {
+        name: string
+        version: string
+        authors?: string | string[]
+        enable: boolean
+        depends?: string[]
+        softDepends?: string[]
+        /**
+         * 插件本体
+         */
+        origin: any
+        [key: string]: any
+    }
     @injectable()
     export abstract class NativePluginManager {
+        list(): NativePlugin[] {
+            throw new Error("Method not implemented.")
+        }
         has(name: string): boolean {
             return true
         }
-        load(name: string): boolean {
+        get(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
-        unload(name: string): boolean {
+        enable(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
-        reload(name: string): boolean {
+        disable(name: string): NativePlugin {
+            throw new Error("Method not implemented.")
+        }
+        reload(name: string): NativePlugin {
             throw new Error("Method not implemented.")
         }
         delete(name: string): boolean {
@@ -54,6 +73,12 @@ export namespace server {
         getService(service: string): any {
             throw new Error("Method not implemented.")
         }
+        broadcast(message: string, permission: string) {
+            throw new Error("Method not implemented.")
+        }
+        broadcastMessage(message: string) {
+            throw new Error("Method not implemented.")
+        }
         dispatchCommand(sender: string | any, command: string): boolean {
             throw new Error("Method not implemented.")
         }
@@ -109,7 +134,7 @@ export namespace server {
                 let consoleServer = this.getDedicatedServer()
                 this.reflectPipeline(consoleServer)
                 this.reflectRootLogger(consoleServer)
-            } catch (error) {
+            } catch (error: any) {
                 console.error('Error When Reflect MinecraftServer!', error)
                 console.ex(error)
             }
@@ -123,7 +148,7 @@ export namespace server {
                     if (connection.class.name.indexOf('ServerConnection') !== -1
                         || connection.class.name.indexOf('NetworkSystem') !== -1) { break }
                     connection = undefined
-                } catch (error) {
+                } catch (error: any) {
                     if (global.debug) {
                         console.ex(error)
                     }
@@ -135,7 +160,7 @@ export namespace server {
                     promise = reflect.on(connection).get(field).get().get(0)
                     if (promise.class.name.indexOf('Promise') !== -1) { break }
                     promise = undefined
-                } catch (error) {
+                } catch (error: any) {
                     if (global.debug) {
                         console.ex(error)
                     }
@@ -148,13 +173,13 @@ export namespace server {
         protected reflectRootLogger(consoleServer: any) {
             try {
                 this.rootLogger = reflect.on(consoleServer).get('LOGGER').get().parent
-            } catch (error) {
+            } catch (error: any) {
                 if (global.debug) {
                     console.ex(error)
                 }
                 try {
                     this.rootLogger = reflect.on(consoleServer).get(0).get().parent
-                } catch (error) {
+                } catch (error: any) {
                     if (global.debug) {
                         console.ex(error)
                     }

packages/api/src/task.ts

@@ -1,34 +1,66 @@
 import { plugin } from './index'
 import { injectable } from '@ccms/container'
 
+const AtomicInteger = Java.type("java.util.concurrent.atomic.AtomicInteger")
+
 export namespace task {
     @injectable()
     export abstract class TaskManager {
-        protected cacheTasks = new Map<string, task.Task[]>()
+        protected taskId: java.util.concurrent.atomic.AtomicInteger
+        protected cacheTasks = new Map<number, task.Task>()
+        protected pluginCacheTasks = new Map<string, Map<number, task.Task>>()
+
+        constructor() {
+            this.taskId = new AtomicInteger(0)
+            process.on('task.finish', (task: task.Task) => {
+                let taskId = task.getTaskId()
+                this.cacheTasks.delete(taskId)
+                let ownerName = task.getOwner()?.description.name
+                if (ownerName && this.pluginCacheTasks.has(ownerName)) {
+                    this.pluginCacheTasks.get(ownerName)?.delete(taskId)
+                }
+            })
+        }
 
         protected pluginCreate(plugin: plugin.Plugin, task: task.Task) {
-            if (!this.cacheTasks.has(plugin.description.name)) {
-                this.cacheTasks.set(plugin.description.name, [])
+            if (!this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.set(plugin.description.name, new Map())
             }
-            this.cacheTasks.get(plugin.description.name).push(task)
+            this.pluginCacheTasks.get(plugin.description.name).set(task.getTaskId(), task)
             return task
         }
+
         protected pluginDisable(plugin: plugin.Plugin) {
-            if (this.cacheTasks.has(plugin.description.name)) {
-                this.cacheTasks.get(plugin.description.name).forEach(task => task.cancel())
-                this.cacheTasks.delete(plugin.description.name)
+            if (this.pluginCacheTasks.has(plugin.description.name)) {
+                this.pluginCacheTasks.get(plugin.description.name).forEach((task) => {
+                    task.cancel()
+                })
+                this.pluginCacheTasks.delete(plugin.description.name)
             }
         }
+
+        /**
+         * 获得自增的任务ID
+         */
+        protected nextId() {
+            return this.taskId.incrementAndGet()
+        }
+
         /**
          * 创建任务
          * @param func 任务内容
          */
         create(func: Function, plugin?: plugin.Plugin): task.Task {
             if (Object.prototype.toString.call(func) !== "[object Function]") { throw TypeError('第一个参数 Task 必须为 function !') };
-            let task = this.create0(func)
+            let task = this.create0(plugin, func, this.nextId())
+            this.cacheTasks.set(task.getTaskId(), task)
             if (plugin) { return this.pluginCreate(plugin, task) }
             return task
         }
+        cancel(taskId: number) {
+            if (!this.cacheTasks.has(taskId)) { throw new Error(`Task ${taskId} not found!`) }
+            this.cacheTasks.get(taskId).cancel()
+        }
         /**
          * 在主线程执行代码
          * @param func 执行内容
@@ -41,22 +73,33 @@ export namespace task {
             if (plugin) { return this.pluginDisable(plugin) }
             this.disable0()
         }
-        protected abstract create0(func: Function): task.Task
+        protected abstract create0(owner: plugin.Plugin, func: Function, id: number): task.Task
         protected abstract disable0()
     }
     /**
      * 任务抽象
      */
-    export abstract class Task {
-        protected plugin: any
+    export abstract class Task implements Cancelable {
         protected func: Function
         protected isAsync: boolean = false;
         protected laterTime: number = 0;
         protected interval: number = 0;
+        protected owner: plugin.Plugin
+        protected taskId: number
+        protected innerTask: any
 
-        constructor(plugin: any, func: Function) {
-            this.plugin = plugin
+        constructor(owner: plugin.Plugin, func: Function, id: number) {
+            this.owner = owner
             this.func = func
+            this.taskId = id
+        }
+
+        getOwner() {
+            return this.owner
+        }
+
+        getTaskId() {
+            return this.taskId
         }
 
         /**
@@ -90,13 +133,16 @@ export namespace task {
          * 取消任务
          */
         cancel(): boolean {
-            throw new Error("Method not implemented.")
+            let result = this.cancel0()
+            process.emit('task.finish', this)
+            return result
         }
 
         protected run(...args: any[]): void {
             try {
                 this.func(...args)
-            } catch (ex) {
+                !this.interval && process.emit('task.finish', this)
+            } catch (ex: any) {
                 console.console('§4插件执行任务时发生错误', ex)
                 console.ex(ex)
             }
@@ -106,17 +152,22 @@ export namespace task {
          * 提交任务
          * @param args 任务参数
          */
-        submit(...args: any[]): Cancelable {
-            let cancelable = this.submit0(...args)
-            this.cancel = cancelable.cancel
-            return cancelable
+        submit(...args: any[]): task.Task {
+            this.innerTask = this.submit0(...args)
+            return this
         }
 
         /**
          * 提交任务
          * @param args 任务参数
          */
-        protected abstract submit0(...args: any[]): Cancelable
+        protected abstract submit0(...args: any[]): any
+        /**
+         * 取消任务
+         */
+        protected cancel0(): boolean {
+            return this.innerTask?.cancel()
+        }
     }
     /**
      * 返可取消的对象

packages/bukkit/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bukkit",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript bukkit package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/spigot-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
-        "@ccms/common": "^0.10.0",
-        "@ccms/container": "^0.10.0"
+        "@ccms/api": "^0.19.0",
+        "@ccms/common": "^0.19.0",
+        "@ccms/container": "^0.19.0"
     }
 }

packages/bukkit/src/channel.ts

@@ -1,7 +1,7 @@
 import { channel, plugin } from '@ccms/api'
 import { inject, provideSingleton } from '@ccms/container'
 
-const Bukkit = org.bukkit.Bukkit
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 const PluginMessageListener = Java.type("org.bukkit.plugin.messaging.PluginMessageListener")
 const Messenger = Bukkit.getMessenger()
 
@@ -32,7 +32,7 @@ export class BukkitChannel extends channel.Channel {
             onPluginMessageReceived: (/**String */ channel, /**Player */ player, /**byte[] */data) => {
                 try {
                     listener(data, { channel, player, data })
-                } catch (error) {
+                } catch (error: any) {
                     console.ex(error)
                 }
             }

packages/bukkit/src/chat.ts

@@ -1,9 +1,12 @@
 import { chat } from '@ccms/api'
 import { provideSingleton } from '@ccms/container'
-import bukkitChat from './enhance/chat'
+import bukkitChat from './internal/chat'
 
 @provideSingleton(chat.Chat)
 export class BukkitChat extends chat.Chat {
+    get handle(): any {
+        return bukkitChat
+    }
     sendJson(sender: any, json: string | object, type = 0) {
         bukkitChat.send(sender, typeof json === "string" ? json : JSON.stringify(json), type)
     }
@@ -16,7 +19,7 @@ export class BukkitChat extends chat.Chat {
     sendTitle(sender: any, title: string, subtitle: string = '', fadeIn: number = 20, time: number = 100, fadeOut: number = 20) {
         try {
             sender.sendTitle(title, subtitle, fadeIn, time, fadeOut)
-        } catch (error) {
+        } catch (error: any) {
             sender.sendTitle(title, subtitle)
         }
     }

packages/bukkit/src/command.ts

@@ -1,35 +1,38 @@
 import '@ccms/nashorn'
 
 import { command, plugin } from '@ccms/api'
-import * as reflect from '@ccms/common/dist/reflect'
 import { provideSingleton, postConstruct, inject } from '@ccms/container'
+import * as reflect from '@ccms/common/dist/reflect'
 
-let Bukkit = org.bukkit.Bukkit
-let TabCompleter = Java.type('org.bukkit.command.TabCompleter')
-let PluginCommand = Java.type('org.bukkit.command.PluginCommand')
-let CommandExecutor = Java.type('org.bukkit.command.CommandExecutor')
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
+const TabCompleter = Java.type('org.bukkit.command.TabCompleter')
+const PluginCommand = Java.type('org.bukkit.command.PluginCommand')
+const CommandExecutor = Java.type('org.bukkit.command.CommandExecutor')
 
 @provideSingleton(command.Command)
 export class BukkitCommand extends command.Command {
     @inject(plugin.PluginInstance)
     private pluginInstance: any
     private commandMap: any
+    private knownCommands: any
 
     @postConstruct()
     init() {
         this.commandMap = reflect.on(Bukkit.getPluginManager()).get('commandMap').get()
+        this.knownCommands = reflect.on(this.commandMap).get('knownCommands').get()
     }
     create(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
-        if (cmd && cmd instanceof PluginCommand) { return cmd };
+        if (cmd instanceof PluginCommand) { return cmd };
         cmd = reflect.on(PluginCommand).create(command, this.pluginInstance).get()
         this.commandMap.register(plugin.description.name, cmd)
         return cmd
     }
     remove(plugin: any, command: string) {
         var cmd = this.commandMap.getCommand(command)
-        if (cmd && cmd instanceof PluginCommand) {
+        if (cmd instanceof PluginCommand) {
             cmd.unregister(this.commandMap)
+            this.knownCommands.remove(command)
         }
     }
     tabComplete(sender: any, input: string, index?: number): string[] {

packages/bukkit/src/console.ts

@@ -1,20 +1,20 @@
 import { MiaoScriptConsole } from '@ccms/api'
 
-let Bukkit = org.bukkit.Bukkit;
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 
 export class BukkitConsole extends MiaoScriptConsole {
     sender(sender, ...args) {
         if (!(sender instanceof Java.type('org.bukkit.command.CommandSender'))) {
             this.error(`First parameter ${sender} not instanceof org.bukkit.command.CommandSender can't send message!`)
-            return;
+            return
         }
         if (Object.prototype.toString.call(args[0]) === "[object Array]") {
             args[0].forEach(line => sender.sendMessage(this.prefix + line))
         } else {
-            sender.sendMessage(this.prefix + args.join(' '));
+            sender.sendMessage(this.prefix + args.join(' '))
         }
     }
     console(...args: string[]): void {
-        this.sender(Bukkit.getConsoleSender(), args.join(' '));
+        this.sender(Bukkit.getConsoleSender(), args.join(' '))
     }
 }

packages/bukkit/src/enhance/chat.ts

@@ -1,118 +0,0 @@
-/*global Java, base, module, exports, require*/
-let ChatSerializer: any
-let nmsChatSerializerMethodName: string
-let PacketPlayOutChat: any
-let chatMessageTypes: any
-
-let RemapUtils: any
-
-let playerConnectionFieldName: string
-let sendPacketMethodName: string
-
-let above_1_16 = false
-let downgrade = false
-/**
- * 获取NMS版本
- */
-let nmsVersion = undefined
-/**
- * 获取NMS类
- */
-function nmsCls(name: string) {
-    return base.getClass(['net.minecraft.server', nmsVersion, name].join('.'))
-}
-
-function remapMethod(clazz: any, origin: string, test: string, params: any) {
-    try {
-        return clazz.getMethod(origin, params)
-    } catch (ex) {
-        if (RemapUtils) {
-            return clazz.getMethod(RemapUtils.mapMethod(clazz, origin, params), params)
-        } else {
-            return clazz.getMethod(test, params)
-        }
-    }
-}
-
-function remapFieldName(clazz: any, origin: string, test: string) {
-    try {
-        return clazz.getField(origin)
-    } catch (ex) {
-        if (RemapUtils) {
-            return clazz.getField(RemapUtils.mapFieldName(clazz, origin))
-        } else {
-            return clazz.getField(test)
-        }
-    }
-}
-
-function init() {
-    //@ts-ignore
-    nmsVersion = org.bukkit.Bukkit.server.class.name.split('.')[3]
-    try {
-        RemapUtils = Java.type('catserver.server.remapper.RemapUtils')
-    } catch (ex) {
-    }
-    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[] }
-    let constructors = packetTypeClass.constructors
-    Java.from(constructors).forEach(function (c) {
-        if (c.parameterTypes.length === 2) {
-            packetTypeConstructor = c
-        }
-        if (c.parameterTypes.length === 3) {
-            packetTypeConstructor = c
-            above_1_16 = true
-        }
-    })
-    let parameterTypes = packetTypeConstructor.parameterTypes
-    let nmsChatMessageTypeClass = parameterTypes[1]
-    if (nmsChatMessageTypeClass.isEnum()) {
-        chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
-    }
-    let playerConnectionField = remapFieldName(nmsCls('EntityPlayer'), 'playerConnection', 'field_71135_a')
-    playerConnectionFieldName = playerConnectionField.getName()
-    sendPacketMethodName = remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', nmsCls('Packet')).getName()
-}
-
-function json(sender: { name: string }, json: string) {
-    if (downgrade) {
-        return '/tellraw ' + sender.name + ' ' + json
-    } else {
-        send(sender, json, 0)
-        return false
-    }
-}
-
-function send(sender: any, json: any, type: number) {
-    let packet
-    if (above_1_16) {
-        packet = new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type], sender.getUniqueId())
-    } else {
-        packet = new PacketPlayOutChat(ChatSerializer[nmsChatSerializerMethodName](json), chatMessageTypes == null ? type : chatMessageTypes[type])
-    }
-    sendPacket(sender, packet)
-}
-
-function sendPacket(player: { handle: { [x: string]: { [x: string]: (arg0: any) => void } } }, p: any) {
-    player.handle[playerConnectionFieldName][sendPacketMethodName](p)
-}
-
-try {
-    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
-}
-
-let chat = {
-    json,
-    send
-}
-
-export default chat

packages/bukkit/src/event.ts

@@ -1,13 +1,13 @@
 import { event, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container';
+import { inject, provideSingleton } from '@ccms/container'
 import * as reflect from '@ccms/common/dist/reflect'
 
-const Bukkit = Java.type("org.bukkit.Bukkit");
-const Event = Java.type("org.bukkit.event.Event");
-const Modifier = Java.type("java.lang.reflect.Modifier");
-const Listener = Java.type("org.bukkit.event.Listener");
-const EventPriority = Java.type("org.bukkit.event.EventPriority");
-const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor");
+const Bukkit = Java.type("org.bukkit.Bukkit")
+const Event = Java.type("org.bukkit.event.Event")
+const Modifier = Java.type("java.lang.reflect.Modifier")
+const Listener = Java.type("org.bukkit.event.Listener")
+const EventPriority = Java.type("org.bukkit.event.EventPriority")
+const EventExecutor = Java.type("org.bukkit.plugin.EventExecutor")
 
 @provideSingleton(event.Event)
 export class BukkitEvent extends event.Event {
@@ -15,7 +15,7 @@ export class BukkitEvent extends event.Event {
     private pluginInstance: any
 
     constructor() {
-        super('org/bukkit/event');
+        super('org/bukkit/event')
     }
 
     getJarFile(resource: string) {
@@ -27,10 +27,10 @@ export class BukkitEvent extends event.Event {
             // 访问符为Public
             Modifier.isPublic(clazz.getModifiers()) &&
             // 不是抽象类
-            !Modifier.isAbstract(clazz.getModifiers());
+            !Modifier.isAbstract(clazz.getModifiers())
     }
     register(eventCls: any, exec: Function, priority: event.EventPriority, ignoreCancel: boolean) {
-        let listener = new Listener({});
+        let listener = new Listener({})
         Bukkit.pluginManager.registerEvent(
             eventCls,
             listener,
@@ -39,10 +39,10 @@ export class BukkitEvent extends event.Event {
                 execute: exec
             }),
             this.pluginInstance,
-            ignoreCancel);
-        return listener;
+            ignoreCancel)
+        return listener
     }
     unregister(event: any, listener: any): void {
-        reflect.on(event).call('getHandlerList').get().unregister(listener);
+        reflect.on(event).call('getHandlerList').get().unregister(listener)
     }
 }

packages/bukkit/src/index.ts

@@ -8,9 +8,12 @@ import './chat'
 import './task'
 import './event'
 import './server'
+import { BukkitNativePluginManager } from './plugin'
 import './command'
 import './channel'
+import './particle'
 
 export default function BukkitImpl(container: Container) {
     container.bind(server.Console).toConstantValue(BukkitConsole)
+    container.rebind(server.NativePluginManager).toConstantValue(new BukkitNativePluginManager())
 }

packages/bukkit/src/internal/chat.ts

@@ -0,0 +1,176 @@
+/*global Java, base, module, exports, require*/
+let bukkitChatInvoke: BukkitChatInvoke
+/**
+ * 获取NMS类
+ */
+abstract class BukkitChatInvoke {
+    private downgrade: boolean = false
+    protected RemapUtils: any
+
+    protected ChatSerializer: any
+    protected nmsChatSerializerMethodName: string
+    protected PacketPlayOutChat: any
+    protected chatMessageTypes: any
+    protected playerConnectionFieldName: string
+    protected sendPacketMethodName: string
+
+    constructor(private nmsVersion) {
+    }
+
+    init() {
+        try {
+            try {
+                this.RemapUtils = Java.type('catserver.server.remapper.RemapUtils')
+            } catch (ex: any) {
+            }
+            let nmsChatSerializerClass = this.getNmsChatSerializerClass()
+            let nmsChatSerializerMethod = this.remapMethod(nmsChatSerializerClass, 'a', 'func_150699_a', base.getClass('java.lang.String'))
+            this.nmsChatSerializerMethodName = nmsChatSerializerMethod.getName()
+            this.ChatSerializer = Java.type(nmsChatSerializerClass.getName())
+            let packetTypeClass = this.getPacketPlayOutChatClass()
+            this.PacketPlayOutChat = Java.type(packetTypeClass.getName())
+            let constructors = packetTypeClass.constructors
+            for (const constructor of Java.from(constructors)) {
+                let parameterTypes = constructor.parameterTypes
+                if (parameterTypes.length === 2 || parameterTypes.length === 3) {
+                    let nmsChatMessageTypeClass = parameterTypes[1]
+                    if (nmsChatMessageTypeClass.isEnum()) {
+                        this.chatMessageTypes = nmsChatMessageTypeClass.getEnumConstants()
+                        break
+                    }
+                }
+            }
+            let playerConnectionField = this.getPlayerConnectionField()
+            this.playerConnectionFieldName = playerConnectionField.getName()
+            this.sendPacketMethodName = this.remapMethod(playerConnectionField.getType(), 'sendPacket', 'func_179290_a', this.getPacketClass()).getName()
+        } catch (ex: any) {
+            org.bukkit.Bukkit.getConsoleSender().sendMessage(`§6[§cMS§6][§bbukkit§6][§achat§6] §cNMS Inject Error §4${ex} §cDowngrade to Command Mode...`)
+            this.downgrade = true
+        }
+    }
+
+    abstract getNmsChatSerializerClass()
+    abstract getPacketPlayOutChatClass()
+    abstract getPacketPlayOutChat(sender: any, json: any, type: number)
+    abstract getPlayerConnectionField()
+    abstract getPacketClass()
+
+    nmsCls(name: string) {
+        return base.getClass(['net.minecraft.server', this.nmsVersion, name].join('.'))
+    }
+
+    remapMethod(clazz: any, origin: string, test: string, params: any) {
+        try {
+            return clazz.getMethod(origin, params)
+        } catch (ex: any) {
+            if (this.RemapUtils) {
+                return clazz.getMethod(this.RemapUtils.mapMethod(clazz, origin, params), params)
+            } else {
+                return clazz.getMethod(test, params)
+            }
+        }
+    }
+
+    remapFieldName(clazz: any, origin: string, test: string) {
+        try {
+            return clazz.getField(origin)
+        } catch (ex: any) {
+            if (this.RemapUtils) {
+                return clazz.getField(this.RemapUtils.mapFieldName(clazz, origin))
+            } else {
+                return clazz.getField(test)
+            }
+        }
+    }
+
+    json(sender: { name: string }, json: string) {
+        if (this.downgrade) {
+            return '/tellraw ' + sender.name + ' ' + json
+        } else {
+            this.send(sender, json, 0)
+            return false
+        }
+    }
+    send(sender: any, json: any, type: number) {
+        this.sendPacket(sender, this.getPacketPlayOutChat(sender, json, type))
+    }
+    sendPacket(player: { handle: { [x: string]: { [x: string]: (arg0: any) => void } } }, p: any) {
+        player.handle[this.playerConnectionFieldName][this.sendPacketMethodName](p)
+    }
+}
+
+class BukkitChatInvokeBase extends BukkitChatInvoke {
+    getPacketPlayOutChat(sender: any, json: any, type: number) {
+        return new this.PacketPlayOutChat(this.ChatSerializer[this.nmsChatSerializerMethodName](json), type)
+    }
+    getNmsChatSerializerClass() {
+        return this.nmsCls("ChatSerializer")
+    }
+    getPacketPlayOutChatClass() {
+        return this.nmsCls("PacketPlayOutChat")
+    }
+    getPlayerConnectionField() {
+        return this.remapFieldName(this.nmsCls('EntityPlayer'), 'playerConnection', 'field_71135_a')
+    }
+    getPacketClass() {
+        return this.nmsCls('Packet')
+    }
+}
+
+class BukkitChatInvoke_1_7_10 extends BukkitChatInvokeBase {
+}
+
+class BukkitChatInvoke_1_8 extends BukkitChatInvoke_1_7_10 {
+    getPacketPlayOutChat(sender: any, json: any, type: number) {
+        return new this.PacketPlayOutChat(this.ChatSerializer[this.nmsChatSerializerMethodName](json), this.chatMessageTypes[type])
+    }
+    getNmsChatSerializerClass() {
+        return this.nmsCls("IChatBaseComponent$ChatSerializer")
+    }
+}
+class BukkitChatInvoke_1_16_5 extends BukkitChatInvoke_1_8 {
+    getPacketPlayOutChat(sender: any, json: any, type: number) {
+        return new this.PacketPlayOutChat(this.ChatSerializer[this.nmsChatSerializerMethodName](json), this.chatMessageTypes[type], sender.getUniqueId())
+    }
+}
+
+class BukkitChatInvoke_1_17_1 extends BukkitChatInvoke_1_16_5 {
+    getPacketPlayOutChatClass() {
+        return base.getClass('net.minecraft.network.protocol.game.PacketPlayOutChat')
+    }
+    getNmsChatSerializerClass() {
+        return base.getClass('net.minecraft.network.chat.IChatBaseComponent$ChatSerializer')
+    }
+    getPlayerConnectionField() {
+        return base.getClass('net.minecraft.server.level.EntityPlayer').getField('b')
+    }
+    getPacketClass() {
+        return base.getClass('net.minecraft.network.protocol.Packet')
+    }
+}
+
+try {
+    let Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
+    // @ts-ignore
+    let nmsVersion = Bukkit.getServer().class.name.split('.')[3]
+    let nmsSubVersion = nmsVersion.split("_")[1]
+    if (nmsSubVersion >= 8) {
+        bukkitChatInvoke = new BukkitChatInvoke_1_8(nmsVersion)
+    } else if (nmsSubVersion >= 16) {
+        bukkitChatInvoke = new BukkitChatInvoke_1_16_5(nmsVersion)
+    } else if (nmsSubVersion >= 17) {
+        bukkitChatInvoke = new BukkitChatInvoke_1_17_1(nmsVersion)
+    } else {
+        bukkitChatInvoke = new BukkitChatInvoke_1_7_10(nmsVersion)
+    }
+    bukkitChatInvoke.init()
+} catch (ex: any) {
+}
+
+let chat = {
+    invoke: bukkitChatInvoke,
+    json: bukkitChatInvoke.json.bind(bukkitChatInvoke),
+    send: bukkitChatInvoke.send.bind(bukkitChatInvoke)
+}
+
+export default chat

packages/bukkit/src/particle.ts

@@ -0,0 +1,31 @@
+import { provideSingleton } from '@ccms/container'
+import { particle } from '@ccms/api'
+
+@provideSingleton(particle.ParticleManager)
+export class BukkitParticleManager extends particle.ParticleManager {
+    private globalSpawner = new BukkitParticleSpawner()
+    constructor() {
+        super()
+        particle.ParticleManager.globalSpawner = this.globalSpawner
+    }
+    protected getGlobalSpawner() {
+        return this.globalSpawner
+    }
+}
+export class BukkitParticleSpawner extends particle.ParticleSpawner {
+    spawnParticle(location: any, particle: any, count: number = 1) {
+        location.getWorld().spawnParticle(particle, location, count)
+    }
+    spawn(location: any, particle: particle.Particle) {
+        location.getWorld().spawnParticle(
+            particle.getParticle(),
+            location,
+            particle.getCount(),
+            particle.getOffsetX(),
+            particle.getOffsetY(),
+            particle.getOffsetZ(),
+            particle.getExtra(),
+            particle.getData()
+        )
+    }
+}

packages/bukkit/src/plugin.ts

@@ -0,0 +1,52 @@
+import { server } from '@ccms/api'
+
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
+
+export class BukkitNativePluginManager extends server.NativePluginManager {
+    private bukkitPluginManager: org.bukkit.plugin.PluginManager
+
+    constructor() {
+        super()
+        this.bukkitPluginManager = Bukkit.getPluginManager()
+    }
+
+    list(): server.NativePlugin[] {
+        return Java.from(this.bukkitPluginManager.getPlugins()).map(plugin => this.convert(plugin))
+    }
+    has(name: string): boolean {
+        return !!this.bukkitPluginManager.getPlugin(name)
+    }
+    get(name: string): server.NativePlugin {
+        return this.convert(this.bukkitPluginManager.getPlugin(name))
+    }
+    enable(name: string): server.NativePlugin {
+        let origin = this.bukkitPluginManager.getPlugin(name)
+        if (!origin) { throw new Error(`Native Plugin ${name} not found.`) }
+        if (!origin.isEnabled()) {
+            this.bukkitPluginManager.enablePlugin(origin)
+        }
+        return this.convert(origin)
+    }
+    disable(name: string): server.NativePlugin {
+        let origin = this.bukkitPluginManager.getPlugin(name)
+        if (!origin) { throw new Error(`Native Plugin ${name} not found.`) }
+        if (origin.isEnabled()) {
+            this.bukkitPluginManager.disablePlugin(origin)
+        }
+        return this.convert(origin)
+    }
+
+    private convert(plugin: org.bukkit.plugin.Plugin): server.NativePlugin {
+        if (!plugin) return plugin as any
+        let desc = plugin.getDescription()
+        return {
+            name: plugin.getName(),
+            version: desc.getVersion(),
+            authors: Java.from(desc.getAuthors()),
+            depends: Java.from(desc.getDepend()),
+            softDepends: Java.from(desc.getSoftDepend()),
+            enable: plugin.isEnabled(),
+            origin: plugin
+        }
+    }
+}

packages/bukkit/src/server.ts

@@ -1,10 +1,9 @@
-import { server, constants } from '@ccms/api'
+import { server } from '@ccms/api'
 import { provideSingleton } from '@ccms/container'
 
 import * as reflect from '@ccms/common/dist/reflect'
-import chat from './enhance/chat'
 
-let Bukkit = org.bukkit.Bukkit
+const Bukkit: typeof org.bukkit.Bukkit = Java.type('org.bukkit.Bukkit')
 
 @provideSingleton(server.Server)
 export class BukkitServer extends server.ReflectServer {
@@ -30,6 +29,12 @@ export class BukkitServer extends server.ReflectServer {
     getService(service: string) {
         return Bukkit.getServicesManager().getRegistration(base.getClass(service))?.getProvider()
     }
+    broadcast(message: string, permission: string) {
+        return Bukkit.broadcast(message, permission)
+    }
+    broadcastMessage(message: string) {
+        return Bukkit.broadcastMessage(message)
+    }
     dispatchCommand(sender: string | any, command: string): boolean {
         if (typeof sender === 'string') {
             sender = this.getPlayer(sender)

packages/bukkit/src/task.ts

@@ -1,5 +1,5 @@
 import { task, plugin } from '@ccms/api'
-import { inject, provideSingleton } from '@ccms/container'
+import { provideSingleton } from '@ccms/container'
 
 const Bukkit = Java.type('org.bukkit.Bukkit')
 const BukkitRunnable = Java.type('org.bukkit.scheduler.BukkitRunnable')
@@ -7,28 +7,25 @@ const Callable = Java.type('java.util.concurrent.Callable')
 
 @provideSingleton(task.TaskManager)
 export class BukkitTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
-
-    create0(func: Function): task.Task {
-        return new BukkitTask(this.pluginInstance, func)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
+        return new BukkitTask(owner, func, id)
     }
     callSyncMethod(func: Function): any {
-        return Bukkit.getScheduler().callSyncMethod(this.pluginInstance, new Callable({ call: () => func() })).get()
+        return Bukkit.getScheduler().callSyncMethod(base.getInstance(), new Callable({ call: () => func() })).get()
     }
     disable0() {
-        Bukkit.getScheduler().cancelTasks(this.pluginInstance)
+        Bukkit.getScheduler().cancelTasks(base.getInstance())
     }
 }
 
 export class BukkitTask extends task.Task {
     submit0(...args: any[]): task.Cancelable {
         let run = new BukkitRunnable({ run: () => this.run(...args) })
-        let funcName = `runTask${this.interval ? 'Timer' : 'Later'}${this.isAsync ? 'Asynchronously' : ''}`
+        let suffix = this.isAsync ? 'Asynchronously' : ''
         if (this.interval) {
-            return run[funcName](this.plugin, this.laterTime, this.interval)
+            return run[`runTaskTimer${suffix}`](base.getInstance(), this.laterTime, this.interval)
         } else {
-            return run[funcName](this.plugin, this.laterTime)
+            return run[`runTaskLater${suffix}`](base.getInstance(), this.laterTime)
         }
     }
 }

packages/bungee/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/bungee",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript bungee package",
     "keywords": [
         "miaoscript",
@@ -22,11 +22,11 @@
         "@javatypes/bungee-api": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
-        "@ccms/common": "^0.10.0",
-        "@ccms/container": "^0.10.0"
+        "@ccms/api": "^0.19.0",
+        "@ccms/common": "^0.19.0",
+        "@ccms/container": "^0.19.0"
     }
 }

packages/bungee/src/event.ts

@@ -79,7 +79,7 @@ export class BungeeEvent extends event.Event {
             currentPriorityMap.put(listener, methods);
             this.bakeHandlers.invoke(this.eventBus, eventCls);
             return listener;
-        } catch (ex) {
+        } catch (ex: any) {
             console.ex(ex)
         } finally {
             this.lock.unlock()
@@ -108,7 +108,7 @@ export class BungeeEvent extends event.Event {
                 }
                 this.bakeHandlers.invoke(this.eventBus, eventCls);
             }
-        } catch (ex) {
+        } catch (ex: any) {
             console.ex(ex)
         } finally {
             this.lock.unlock()

packages/bungee/src/index.ts

@@ -3,13 +3,15 @@
 import { server } from '@ccms/api'
 import { Container } from '@ccms/container'
 
-import { BungeeConsole } from './console';
-import './event';
-import './server';
-import './command';
-import './channel';
-import './task';
+import { BungeeConsole } from './console'
+import './task'
+import './event'
+import './server'
+import { BungeeNativePluginManager } from './plugin'
+import './command'
+import './channel'
 
 export default function BungeeImpl(container: Container) {
-    container.bind(server.Console).toConstantValue(BungeeConsole);
+    container.bind(server.Console).toConstantValue(BungeeConsole)
+    container.rebind(server.NativePluginManager).toConstantValue(new BungeeNativePluginManager())
 }

packages/bungee/src/plugin.ts

@@ -0,0 +1,36 @@
+import { server } from '@ccms/api'
+
+let Bungee: net.md_5.bungee.api.ProxyServer = base.getInstance().getProxy()
+
+export class BungeeNativePluginManager extends server.NativePluginManager {
+    private bungeePluginManager: net.md_5.bungee.api.plugin.PluginManager
+
+    constructor() {
+        super()
+        this.bungeePluginManager = Bungee.getPluginManager()
+    }
+
+    list(): server.NativePlugin[] {
+        return Java.from(this.bungeePluginManager.getPlugins()).map(plugin => this.convert(plugin))
+    }
+    has(name: string): boolean {
+        return !!this.bungeePluginManager.getPlugin(name)
+    }
+    get(name: string): server.NativePlugin {
+        return this.convert(this.bungeePluginManager.getPlugin(name))
+    }
+
+    private convert(plugin: net.md_5.bungee.api.plugin.Plugin): server.NativePlugin {
+        if (!plugin) return plugin as any
+        let desc = plugin.getDescription()
+        return {
+            name: desc.getName(),
+            version: desc.getVersion(),
+            authors: [desc.getAuthor()],
+            depends: Java.from(desc.getDepends()) as any,
+            softDepends: Java.from(desc.getSoftDepends()) as any,
+            enable: true,
+            origin: plugin
+        }
+    }
+}

packages/bungee/src/server.ts

@@ -26,7 +26,7 @@ export class BungeeServer implements server.Server {
                 // @ts-ignore
                 this.pipeline = reflect.on(base.getInstance().getProxy()).get('listeners').get().toArray()[0].pipeline()
                 wait.cancel()
-            } catch (ex) {
+            } catch (ex: any) {
                 count++
                 if (count > 50) {
                     console.error('Reflect BungeeCord netty channel pipeline error time > 50times. Err: ' + ex)
@@ -38,7 +38,7 @@ export class BungeeServer implements server.Server {
         }).later(10).timer(20).submit()
         try {
             this.rootLogger = Bungee.getLogger()
-        } catch (error) {
+        } catch (error: any) {
             console.error("Can't found rootLogger!")
         }
     }
@@ -58,6 +58,12 @@ export class BungeeServer implements server.Server {
     getService(service: string) {
         throw new Error("Method not implemented.")
     }
+    broadcast(message: string, permission: string) {
+        return Bungee.broadcast(message)
+    }
+    broadcastMessage(message: string) {
+        return Bungee.broadcast(message)
+    }
     dispatchCommand(sender: string | any, command: string): boolean {
         if (typeof sender === 'string') {
             sender = this.getPlayer(sender)

packages/bungee/src/task.ts

@@ -6,17 +6,14 @@ let TimeUnit = Java.type('java.util.concurrent.TimeUnit')
 
 @provideSingleton(task.TaskManager)
 export class BungeeTaskManager extends task.TaskManager {
-    @inject(plugin.PluginInstance)
-    private pluginInstance: any
-
-    create0(func: Function): task.Task {
-        return new BungeeTask(this.pluginInstance, func)
+    create0(owner: plugin.Plugin, func: Function, id: number): task.Task {
+        return new BungeeTask(owner, func, id)
     }
     callSyncMethod(func: Function): any {
         return func()
     }
     disable0() {
-        this.pluginInstance.getProxy().getScheduler().cancel(this.pluginInstance)
+        base.getInstance().getProxy().getScheduler().cancel(base.getInstance())
     }
 }
 
@@ -24,12 +21,12 @@ export class BungeeTask extends task.Task {
     submit0(...args: any[]): task.Cancelable {
         let run = new Runnable({ run: () => this.run(...args) })
         if (this.isAsync) {
-            return this.plugin.getProxy().getScheduler().runAsync(this.plugin, run)
+            return base.getInstance().getProxy().getScheduler().runAsync(base.getInstance(), run)
         }
         if (this.interval) {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, this.interval * 50, TimeUnit.MILLISECONDS)
         } else {
-            return this.plugin.getProxy().getScheduler().schedule(this.plugin, run, this.laterTime * 50, TimeUnit.MILLISECONDS)
+            return base.getInstance().getProxy().getScheduler().schedule(base.getInstance(), run, this.laterTime * 50, TimeUnit.MILLISECONDS)
         }
     }
 }

packages/client/.gitignore

@@ -0,0 +1 @@
+src/emp.ts

packages/client/package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "@ccms/client",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript client package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,19 @@
         "watch": "tsc --watch",
         "build": "yarn clean && tsc",
         "start": "node dist/index.js",
+        "debug": "DEBUG=minecraft-protocol node dist/index.js",
+        "emp": "node dist/emp.js",
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "dependencies": {
-        "minecraft-protocol": "^1.16.0"
+        "axios": "^0.25.0",
+        "minecraft-protocol": "^1.30.0",
+        "minecraft-protocol-forge": "^1.0.0",
+        "proxy-agent": "^5.0.0"
     },
     "devDependencies": {
+        "@types/node": "^17.0.17",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     }
 }

packages/client/src/index.ts

@@ -1,13 +1,15 @@
 import { createInterface } from 'readline'
-import { createClient } from 'minecraft-protocol'
+import { Client, createClient } from 'minecraft-protocol'
 
 import { attachForge } from './forge'
 import { attachEvents } from './event'
 
-let username = process.argv[2] || 'Mr_jtb'
-let password = process.argv[3] || ''
-let version = process.argv[4] || '1.12.2'
-let readAddress = process.argv[5] || '192.168.2.5:25577'
+let readUserInfo = process.argv[2] || 'Mr_jtb'
+let realUserInfo = readUserInfo.split(":")
+let username = realUserInfo[0]
+let password = realUserInfo[1] || ''
+let version = process.argv[3] || '1.12.2'
+let readAddress = process.argv[4] || '192.168.2.25:25565'
 let realAddress = readAddress.split(":")
 let address = realAddress[0]
 let port = parseInt(realAddress[1] || "25565")
@@ -18,17 +20,23 @@ function commandLineCreateClient() {
 }
 
 function createConnection(host: string, port: number, username: string, password: string) {
-    let client = createClient({
+    let clientOptions: any = {
         version,
         host,
         port,
         username,
         password,
-        clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
+        // clientToken: 'd02c7f39-2376-45da-a5a5-50e24fa8b185',
         //@ts-ignore
-        authServer: 'https://mcsso.yumc.pw/api/yggdrasil/authserver',
-        sessionServer: 'https://mcsso.yumc.pw/api/yggdrasil/sessionserver'
-    })
+        // authServer: 'https://skin.yumc.pw/api/yggdrasil/authserver',
+        // sessionServer: 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    if (clientOptions.password) {
+        clientOptions.clientToken = 'd02c7f39-2376-45da-a5a5-50e24fa8b185'
+        clientOptions.authServer = 'https://skin.yumc.pw/api/yggdrasil/authserver'
+        clientOptions.sessionServer = 'https://skin.yumc.pw/api/yggdrasil/sessionserver'
+    }
+    let client = createClient(clientOptions)
 
     attachCommon(client)
     attachForge(client)
@@ -36,7 +44,24 @@ function createConnection(host: string, port: number, username: string, password
     return client
 }
 
-function attachCommon(client) {
+function attachCommon(client: Client) {
+    client.on('login', () => {
+        // client.registerChannel('updater', ['string', []])
+        // client.registerChannel('updater-enabled', ['string', []])
+        // client.registerChannel('dragoncore', ['string', []])
+        // client.registerChannel('dragoncore:main', ['string', []])
+        client.on('REGISTER', (array) => {
+            for (const channel of array) {
+                client.on('channel', console.log)
+            }
+        })
+        // client.on('dragoncore:main', (data) => {
+        //     console.log(data)
+        // })
+    })
+    client.on('custom_payload', (data) => {
+        console.log('custom_payload' + JSON.stringify(data))
+    })
     client.on('error', (error) => {
         console.log("Client Error", error)
     })

packages/client/start.sh

@@ -0,0 +1,5 @@
+while :; do
+    yarn emp
+    echo 进程退出 休眠120秒!
+    sleep 120
+done

packages/common/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/common",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -19,11 +19,11 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.19.0",
         "@javatypes/jdk": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "gitHead": "562e2d00175c9d3a99c8b672aa07e6d92706a027"
 }

packages/common/src/http.ts

@@ -23,7 +23,7 @@ interface RequestConfig {
 }
 
 function request(config: RequestConfig) {
-    // @ts-ignore
+    // @ts-ignore XMLHttpRequest class only exist nashorn polyfill
     let xhr = new XMLHttpRequest()
     xhr.open(config.method, config.url, false)
     for (const header in config.headers) {
@@ -44,6 +44,7 @@ function request(config: RequestConfig) {
     if (xhr.getResponseHeader("Content-Type").indexOf('application/json') != -1) {
         xhr.responseType = "json"
     }
+    // @ts-ignore get only exist nashorn polyfill
     return xhr.get()
 }
 

packages/common/src/reflect.ts

@@ -48,7 +48,7 @@ class Reflect {
             try {
                 // Try getting a public field
                 field = this.class.getField(nameOrIndex)
-            } catch (ex) {
+            } catch (ex: any) {
                 // Try again, getting a non-public field
                 field = declaredField(this.class, nameOrIndex)
             }
@@ -113,10 +113,10 @@ function declaredConstructor(clazz, param) {
     let constructor
     try {
         constructor = clazz.getDeclaredConstructor(types(param))
-    } catch (ex) {
+    } catch (ex: any) {
         try {
             constructor = clazz.getDeclaredConstructor(types(param, true))
-        } catch (ex) {
+        } catch (ex: any) {
             constructor = clazz.getDeclaredConstructors()[0]
         }
     }
@@ -132,7 +132,7 @@ function declaredField(clazz: java.lang.Class<any>, name: string | java.lang.Str
         try {
             field = target.getDeclaredField(name)
             if (field !== null) { break }
-        } catch (e) {
+        } catch (error: any) {
             if (target === undefined) { break }
             target = target.getSuperclass()
         }
@@ -151,10 +151,10 @@ function declaredMethod(clazz: java.lang.Class<any>, nameOrIndex: string | numbe
     } else {
         try {
             methodCache.set(key, clazz.getMethod(nameOrIndex, clazzs as any))
-        } catch (ex) {
+        } catch (ex: any) {
             try {
                 methodCache.set(key, clazz.getDeclaredMethod(nameOrIndex, clazzs as any))
-            } catch (ex) {
+            } catch (ex: any) {
                 for (const m of Java.from(declaredMethods(clazz))) {
                     if (m.getName() == nameOrIndex) {
                         methodCache.set(key, m)

packages/compile/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/compile",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript compile package",
     "keywords": [
         "miaoscript",
@@ -21,6 +21,6 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     }
 }

packages/container/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/container",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript container package",
     "keywords": [
         "miaoscript",
@@ -19,13 +19,13 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
+        "@ccms/nashorn": "^0.19.0",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "inversify": "^5.0.1",
+        "inversify": "^6.0.1",
         "inversify-binding-decorators": "^4.0.0"
     }
 }

packages/container/src/index.ts

@@ -37,8 +37,8 @@ export const provideSingletonNamed = (identifier: interfaces.ServiceIdentifier<a
  */
 export const JavaClass = (className: string) => {
     return function (target: object, propertyKey: string, index?: number) {
-        try { target[propertyKey] = Java.type(className).class; return } catch (error) { }
-        try { target[propertyKey] = base.getClass(className); return } catch (error) { }
+        try { target[propertyKey] = Java.type(className).class; return } catch (error: any) { }
+        try { target[propertyKey] = base.getClass(className); return } catch (error: any) { }
         console.warn('JavaClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
     }
 }
@@ -49,8 +49,8 @@ export const JavaClass = (className: string) => {
  */
 export const JSClass = (className: string) => {
     return function (target: object, propertyKey: string, index?: number) {
-        try { target[propertyKey] = Java.type(className); return } catch (error) { }
-        try { target[propertyKey] = base.getClass(className).static; return } catch (error) { }
+        try { target[propertyKey] = Java.type(className); return } catch (error: any) { }
+        try { target[propertyKey] = base.getClass(className).static; return } catch (error: any) { }
         console.warn('JSClass', className, 'Inject target', target.constructor.name, 'propertyKey', propertyKey, 'failed!')
     }
 }

packages/core/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/core",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript api package",
     "keywords": [
         "miaoscript",
@@ -21,11 +21,11 @@
     "devDependencies": {
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
-        "@ccms/container": "^0.10.0"
+        "@ccms/api": "^0.19.0",
+        "@ccms/container": "^0.19.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/core/src/index.ts

@@ -1,25 +1,23 @@
 let containerStartTime = Date.now()
 console.i18n("ms.core.ioc.initialize", { scope: global.scope })
 import { plugin, server, task, constants } from '@ccms/api'
-import { DefaultContainer as container, inject, provideSingleton, ContainerInstance, buildProviderModule } from '@ccms/container'
+import { DefaultContainer as container, provideSingleton, ContainerInstance, buildProviderModule, Autowired } from '@ccms/container'
 console.i18n("ms.core.ioc.completed", { scope: global.scope, time: (Date.now() - containerStartTime) / 1000 })
 import http from '@ccms/common/dist/http'
 
 @provideSingleton(MiaoScriptCore)
 class MiaoScriptCore {
-    @inject(server.Console)
+    @Autowired(server.Console)
     private Console: Console
-    @inject(task.TaskManager)
-    private taskManager: task.TaskManager
-    @inject(plugin.PluginFolder)
+    @Autowired(plugin.PluginFolder)
     private pluginFolder: string
-    @inject(plugin.PluginManager)
+    @Autowired()
+    private taskManager: task.TaskManager
+    @Autowired()
     private pluginManager: plugin.PluginManager
 
     enable() {
         this.loadServerConsole()
-        this.loadTaskFunction()
-        global.level = "TRACE"
         this.loadPlugins()
         return () => this.disable()
     }
@@ -29,15 +27,6 @@ class MiaoScriptCore {
         global.setGlobal('console', new this.Console(), { writable: false, configurable: false })
     }
 
-    loadTaskFunction() {
-        global.setGlobal('setTimeout', (func: Function, tick: number, ...args: any[]) => {
-            return this.taskManager.create(func).later(tick).submit(...args)
-        }, { writable: false, configurable: false })
-        global.setGlobal('setInterval', (func: Function, tick: number, ...args: any[]) => {
-            return this.taskManager.create(func).timer(tick).submit(...args)
-        }, { writable: false, configurable: false })
-    }
-
     loadPlugins() {
         let loadPluginStartTime = new Date().getTime()
         console.i18n("ms.core.plugin.initialize")
@@ -54,7 +43,11 @@ class MiaoScriptCore {
         this.pluginManager.disable(this.pluginManager.getPlugins())
         this.taskManager.disable()
         process.exit(0)
-        console.i18n("ms.core.engine.disable.finish", { version: 'v' + global.ScriptEngineVersion, time: (new Date().getTime() - disableStartTime) / 1000 })
+        console.i18n("ms.core.engine.disable.finish", {
+            loader: base.version,
+            version: 'v' + global.ScriptEngineVersion,
+            time: (new Date().getTime() - disableStartTime) / 1000
+        })
     }
 }
 
@@ -62,34 +55,42 @@ function detectServer(): constants.ServerType {
     try {
         Java.type("org.bukkit.Bukkit")
         return constants.ServerType.Bukkit
-    } catch (ex) {
+    } catch (ex: any) {
     }
     try {
         Java.type("org.spongepowered.api.Sponge")
         return constants.ServerType.Sponge
-    } catch (ex) {
+    } catch (ex: any) {
     }
     try {
         Java.type("cn.nukkit.Nukkit")
         return constants.ServerType.Nukkit
-    } catch (ex) {
+    } catch (ex: any) {
     }
     try {
         Java.type("net.md_5.bungee.api.ProxyServer")
         return constants.ServerType.Bungee
-    } catch (ex) {
+    } catch (ex: any) {
     }
     try {
         Java.type("org.springframework.boot.SpringApplication")
         return constants.ServerType.Spring
-    } catch (ex) {
+    } catch (ex: any) {
     }
     throw Error('Unknow Server Type...')
 }
 
 function initialize() {
+    global.ScriptSlowExecuteTime = 30
     global.ScriptEngineVersion = require('../package.json').version
-    try { engineLoad({ script: http.get("http://ms.yumc.pw/api/plugin/download/name/initialize"), name: 'core/initialize.js' }) } catch (error) { console.debug(error) }
+    try {
+        engineLoad({
+            script: http.get("https://ms.yumc.pw/api/plugin/download/name/initialize"),
+            name: 'core/initialize.js'
+        })
+    } catch (error: any) {
+        console.debug(error)
+    }
     try {
         let corePackageStartTime = new Date().getTime()
         container.bind(ContainerInstance).toConstantValue(container)
@@ -106,9 +107,13 @@ function initialize() {
         container.load(buildProviderModule())
         console.i18n("ms.core.package.completed", { scope: global.scope, type, time: (Date.now() - corePackageStartTime) / 1000 })
         let disable = container.get<MiaoScriptCore>(MiaoScriptCore).enable()
-        console.i18n("ms.core.engine.completed", { version: 'v' + global.ScriptEngineVersion, time: (Date.now() - global.ScriptEngineStartTime) / 1000 })
+        console.i18n("ms.core.engine.completed", {
+            loader: base.version,
+            version: 'v' + global.ScriptEngineVersion,
+            time: (Date.now() - global.ScriptEngineStartTime) / 1000
+        })
         return disable
-    } catch (error) {
+    } catch (error: any) {
         console.i18n("ms.core.initialize.error", { error })
         console.ex(error)
         return () => console.i18n('ms.core.engine.disable.abnormal')

packages/core/src/initialize.js

@@ -0,0 +1,52 @@
+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() {
+    var core = http.get('https://registry.npmmirror.com/@ccms/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() {
+    var mspmc = 'https://ms.yumc.pw/api/plugin/download/name/'
+
+    var http = require('@ccms/common/dist/http').default
+
+    var pluginFolder = fs.concat(root, 'plugins')
+    var updateFolder = fs.concat(pluginFolder, 'update')
+    var pluginFile = fs.concat(pluginFolder, 'MiaoScriptPackageManager.js')
+    if (!fs.exists(pluginFile)) {
+        fs.mkdirs(pluginFile)
+        base.save(fs.concat(updateFolder, 'MiaoScriptPackageManager.auto.install'), '.')
+    }
+    fs.list(updateFolder).forEach(function (path) {
+        var file = path.toFile()
+        if (file.exists()) {
+            var filename = file.getName()
+            if (filename.endsWith(".auto.install")) {
+                var pluginName = filename.replace('.auto.install', '')
+                var pluginFile = fs.concat(pluginFolder, pluginName + '.js')
+                if (!fs.exists(pluginFile)) {
+                    var pluginTemp = pluginFile + '.tmp'
+                    http.download(mspmc + pluginName, pluginTemp)
+                    fs.move(pluginTemp, pluginFile, true)
+                }
+                base.delete(file)
+            }
+        }
+    })
+    try {
+        Java.type("org.bukkit.Bukkit")
+        updateJar()
+    } catch (ignore) {
+    }
+    upgradeModules()
+    console.debug('initialize finish!')
+}
+initialize()

packages/database/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/database",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript database package",
     "keywords": [
         "miaoscript",
@@ -22,10 +22,10 @@
         "@javatypes/spring-jdbc": "^0.0.3",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "@ccms/api": "^0.10.0",
-        "@ccms/container": "^0.10.0"
+        "@ccms/api": "^0.19.0",
+        "@ccms/container": "^0.19.0"
     }
 }

packages/database/src/manager.ts

@@ -17,7 +17,7 @@ export class DataBaseManager {
             this.beanFactory = this.instance.getAutowireCapableBeanFactory()
             let mainDatasource = this.beanFactory.getBean(Packages.javax.sql.DataSource.class)
             this.mainDatabase = new DataBase({ url: mainDatasource })
-        } catch (error) {
+        } catch (error: any) {
             console.ex(error)
         }
     }

packages/i18n/languages/en.yml

@@ -1,6 +1,6 @@
 ms.i18n.completed: "Internationalization component initialization completed. Current Language: English"
-ms.ployfill.initialize: "Initialization Java Nashorn ployfill. Please wait..."
-ms.ployfill.completed: "Java Nashorn ployfill loading completed... Cost ({time}s)!"
+ms.polyfill.initialize: "Initialization Java Nashorn polyfill. Please wait..."
+ms.polyfill.completed: "Java Nashorn polyfill loading completed... Cost ({time}s)!"
 
 ms.core.ioc.initialize: "Initialization MiaoScript IOC Container {scope}/container. Please wait..."
 ms.core.ioc.completed: "MiaoScript IOC Container {scope}/container loading completed({time}s)!"
@@ -31,7 +31,8 @@ ms.api.command.tab.completer.error: "§6Player {player} §6exec §b{plugin} §6P
 
 ms.plugin.initialize: "Initialization MiaoScript Plugin System: Plugin: {plugin} Loader: {loader}..."
 ms.plugin.event.map: "Total {count} {type} Event Mapping Complate..."
-ms.plugin.manager.scan: "Scanning Plugins in {folder} ..."
+ms.plugin.manager.scan: "Scanner {scanner} Scanning Plugins in {folder} ..."
+ms.plugin.manager.scan.finish: "Scanner {scanner} Found {size} Plugins in {folder} Start Build..."
 ms.plugin.manager.initialize.error: "§6Plugin §b{name} §6initialize error §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} version {version} by {author}"
 ms.plugin.manager.stage.exec: "[{plugin}] Exec {name} Stage {stage} When servers is {servers}..."
@@ -39,6 +40,7 @@ ms.plugin.manager.stage.exec.error: "§6Plugin §b{plugin} §6exec §d{executor}
 ms.plugin.manager.stage.load: "Loading"
 ms.plugin.manager.stage.enable: "Enabling"
 ms.plugin.manager.stage.disable: "Disabling"
+ms.plugin.manager.build: "Plugin {name}({version}) Build Finish source: {file}({scanner}) loader: {loader} Cost: {cost}s."
 ms.plugin.manager.build.error: "§6Load Plugin From §b{file} §6failed. §4Error: §c{error}"
 ms.plugin.manager.build.update: "Auto Update Plugin {name} ..."
 ms.plugin.manager.build.not.extends: "§4Found error plugin §b{source} §4it's not extends interfaces.Plugin, the plugin will be ignore!"

packages/i18n/languages/zh_cn.yml

@@ -1,6 +1,6 @@
 ms.i18n.completed: "国际化组件 初始化完成 当前语言: 简体中文"
-ms.ployfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
-ms.ployfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
+ms.polyfill.initialize: "加载 Java Nashorn 补丁. 请稍候..."
+ms.polyfill.completed: "Java Nashorn 补丁 加载完成... 耗时 ({time}s)!"
 
 ms.core.ioc.initialize: "初始化 MiaoScript IOC 容器 {scope}/container. 请稍候..."
 ms.core.ioc.completed: "MiaoScript IOC 容器 {scope}/container 加载完成 耗时({time}s)"
@@ -10,9 +10,9 @@ ms.core.package.initialize: "初始化 MiaoScript 扩展 {scope}/core {scope}/{t
 ms.core.package.completed: "MiaoScript 扩展 {scope}/core {scope}/{type} {scope}/plugin 加载完成 耗时({time}s)"
 ms.core.plugin.initialize: "MiaoScript 开始引导插件系统. 请稍候..."
 ms.core.plugin.completed: "MiaoScript 插件加载完毕 耗时({time}s)!"
-ms.core.engine.completed: "MiaoScript 脚本引擎 {version} 加载完毕... 耗时({time}s)!"
+ms.core.engine.completed: "MiaoScript 框架 {loader} 引擎 {version} 加载完毕... 耗时({time}s)!"
 ms.core.engine.disable: "MiaoScript 关闭脚本引擎 请稍候..."
-ms.core.engine.disable.finish: "MiaoScript 脚本引擎 {version} 关闭完成... 耗时({time}s)!"
+ms.core.engine.disable.finish: "MiaoScript 框架 {loader} 引擎 {version} 关闭完成... 耗时({time}s)!"
 ms.core.engine.disable.abnormal: "引擎异常启动或初始化未完成 跳过关闭流程..."
 
 ms.api.event.resource.not.found: "无法映射事件 未找到资源文件 {resource}!"
@@ -27,12 +27,15 @@ 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}..."
+ms.api.command.execute.slow: "§c注意! §6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6命令 §c耗时 §4{cost}ms !"
 ms.api.command.execute.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6命令时发生异常 §4{ex}"
+ms.api.command.tab.completer.slow: "§c注意! §6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全 §c耗时 §4{cost}ms !"
 ms.api.command.tab.completer.error: "§6玩家 §a{player} §6执行 §b{plugin} §6插件 §d{command} {args} §6补全时发生异常 §4{ex}"
 
 ms.plugin.initialize: "初始化 MiaoScript 插件系统: 实例: {plugin} 加载器: {loader}..."
 ms.plugin.event.map: "总计 {count} 个 {type} 事件 映射完成..."
-ms.plugin.manager.scan: "扫描 {folder} 文件夹中插件..."
+ms.plugin.manager.scan: "扫描器 {scanner} 扫描 {folder} 中的插件..."
+ms.plugin.manager.scan.finish: "扫描器 {scanner} 在 {folder} 中 发现 {size} 个插件 开始构建..."
 ms.plugin.manager.initialize.error: "§6插件 §b{name} §6初始化错误 §4{ex}"
 ms.plugin.manager.stage: "{stage} {plugin} 版本 {version} 作者 {author}"
 ms.plugin.manager.stage.exec: "[{plugin}] 执行 {stage} 阶段函数 {name} 匹配类型 {servers}..."
@@ -40,6 +43,7 @@ ms.plugin.manager.stage.exec.error: "§6插件 §b{plugin} §6执行 §d{executo
 ms.plugin.manager.stage.load: "加载"
 ms.plugin.manager.stage.enable: "启用"
 ms.plugin.manager.stage.disable: "关闭"
+ms.plugin.manager.build: "插件 {name}({version}) 构建完成 来源: {file}({scanner}) 引导: {loader} 构建耗时: {cost}s."
 ms.plugin.manager.build.error: "§6从文件 §b{file} §6加载插件失败 §4错误: §c{error}"
 ms.plugin.manager.build.update: "自动更新插件 {name} ..."
 ms.plugin.manager.build.not.extends: "§4发现错误的插件 §b{source} §4未继承接口 interfaces.Plugin, 将不会被载入到服务器!"

packages/i18n/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ccms/i18n",
-    "version": "0.10.0",
+    "version": "0.19.0",
     "description": "MiaoScript i18n package",
     "keywords": [
         "miaoscript",
@@ -19,14 +19,14 @@
         "test": "echo \"Error: run tests from root\" && exit 1"
     },
     "devDependencies": {
-        "@ccms/nashorn": "^0.10.0",
-        "@types/js-yaml": "^3.12.5",
+        "@ccms/nashorn": "^0.19.0",
+        "@types/js-yaml": "^4.0.5",
         "reflect-metadata": "^0.1.13",
         "rimraf": "^3.0.2",
-        "typescript": "^4.0.3"
+        "typescript": "^4.5.5"
     },
     "dependencies": {
-        "js-yaml": "^3.14.0"
+        "js-yaml": "^4.1.0"
     },
     "gitHead": "781524f83e52cad26d7c480513e3c525df867121"
 }

packages/i18n/src/index.ts

@@ -1,13 +1,13 @@
 /// <reference types="@ccms/nashorn" />
 import * as yaml from 'js-yaml'
 
-const File = Java.type("java.io.File");
-const separatorChar = File.separatorChar;
+const File = Java.type("java.io.File")
+const separatorChar = File.separatorChar
 type TranslateParam = { [key: string]: any }
 
 declare global {
     interface Console {
-        i18n(name: string, param?: TranslateParam);
+        i18n(name: string, param?: TranslateParam)
     }
 }
 
@@ -23,20 +23,20 @@ export class Translate {
 
     constructor(root: string | TranslateContent) {
         if (typeof root == 'string') {
-            this.root = root;
+            this.root = root
         } else {
-            this.langMap = root.langMap;
-            this.fallbackMap = root.fallbackMap || {};
+            this.langMap = root.langMap
+            this.fallbackMap = root.fallbackMap || {}
         }
     }
 
     translate(name: string, param?: TranslateParam) {
-        let langText: string = this.langMap[name] || this.fallbackMap[name];
+        let langText: string = this.langMap[name] || this.fallbackMap[name]
         if (!langText) { return '[WARN] @ccms/i18n miss lang translate: ' + name }
         for (const key in param) {
             langText = langText.replace(new RegExp("{" + key + "}", 'gm'), param[key])
         }
-        return langText;
+        return langText
     }
 
     initialize(lang: string = 'zh_cn', fallback: string = 'zh_cn') {
@@ -49,8 +49,8 @@ export class Translate {
     }
 
     readYamlFile(dir: string, name: string) {
-        let langFile = this.concat(dir, 'languages', name + '.yml');
-        return this.exists(langFile) && yaml.safeLoad(base.read(langFile))
+        let langFile = this.concat(dir, 'languages', name + '.yml')
+        return this.exists(langFile) && yaml.load(base.read(langFile))
     }
 
     concat(...args: string[]) {

packages/keyvalue/package.json

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

packages/molang/.gitignore

@@ -0,0 +1,6 @@
+node_modules
+perf/*
+
+
+tsconfig.tsbuildinfo
+.DS_STORE

packages/molang/package.json

@@ -0,0 +1,29 @@
+{
+    "name": "@ccms/molang",
+    "version": "0.19.0",
+    "description": "A fast parser for Minecraft's MoLang",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "scripts": {
+        "clean": "rimraf dist",
+        "watch": "tsc --watch",
+        "build": "yarn clean && tsc",
+        "test": "echo \"Error: run tests from root\" && exit 1"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/solvedDev/MoLang.git"
+    },
+    "author": "solvedDev",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/solvedDev/MoLang/issues"
+    },
+    "homepage": "https://github.com/solvedDev/MoLang#readme",
+    "devDependencies": {
+        "@types/node": "^17.0.17",
+        "rimraf": "^3.0.2",
+        "tslib": "^2.3.1",
+        "typescript": "^4.5.5"
+    }
+}

packages/molang/src/MoLang.ts

@@ -0,0 +1,129 @@
+import { ExecutionEnvironment } from './env/env'
+import { IExpression, IParserConfig } from './main'
+import { StaticExpression } from './parser/expressions/static'
+import { StringExpression } from './parser/expressions/string'
+import { MoLangParser } from './parser/molang'
+
+export class MoLang {
+	protected expressionCache: Record<string, IExpression> = {}
+	protected totalCacheEntries = 0
+	protected executionEnvironment!: ExecutionEnvironment
+
+	protected parser: MoLangParser
+
+	constructor(
+		env: Record<string, unknown> = {},
+		protected config: Partial<IParserConfig> = {}
+	) {
+		if (config.useOptimizer === undefined) this.config.useOptimizer = true
+		if (config.useCache === undefined) this.config.useCache = true
+		if (config.earlyReturnsSkipParsing === undefined)
+			this.config.earlyReturnsSkipParsing = true
+		if (config.earlyReturnsSkipTokenization === undefined)
+			this.config.earlyReturnsSkipTokenization = true
+		if (config.convertUndefined === undefined)
+			this.config.convertUndefined = false
+
+		this.parser = new MoLangParser({
+			...this.config,
+			tokenizer: undefined,
+		})
+
+		this.updateExecutionEnv(env)
+	}
+
+	updateConfig(newConfig: Partial<IParserConfig>) {
+		newConfig = Object.assign(this.config, newConfig)
+
+		if (newConfig.tokenizer) this.parser.setTokenizer(newConfig.tokenizer)
+		this.parser.updateConfig({ ...this.config, tokenizer: undefined })
+		this.executionEnvironment.updateConfig(newConfig)
+	}
+	updateExecutionEnv(env: Record<string, unknown>, isFlat = false) {
+		this.executionEnvironment = new ExecutionEnvironment(env, {
+			useRadians: this.config.useRadians,
+			convertUndefined: this.config.convertUndefined,
+			isFlat,
+			variableHandler: this.config.variableHandler,
+		})
+		this.parser.setExecutionEnvironment(this.executionEnvironment)
+	}
+	/**
+	 * Clears the MoLang expression cache
+	 */
+	clearCache() {
+		this.expressionCache = {}
+		this.totalCacheEntries = 0
+	}
+
+	/**
+	 * Execute the given MoLang string `expression`
+	 * @param expression The MoLang string to execute
+	 *
+	 * @returns The value the MoLang expression corresponds to
+	 */
+	execute(expression: string) {
+		this.parser.setExecutionEnvironment(this.executionEnvironment)
+		const abstractSyntaxTree = this.parse(expression)
+
+		const result = abstractSyntaxTree.eval()
+		if (result === undefined) return 0
+		if (typeof result === 'boolean') return Number(result)
+		return result
+	}
+	/**
+	 * Execute the given MoLang string `expression`
+	 * In case of errors, return 0
+	 * @param expression The MoLang string to execute
+	 *
+	 * @returns The value the MoLang expression corresponds to and 0 if the statement is invalid
+	 */
+	executeAndCatch(expression: string) {
+		try {
+			return this.execute(expression)
+		} catch {
+			return 0
+		}
+	}
+
+	/**
+	 * Parse the given MoLang string `expression`
+	 * @param expression The MoLang string to parse
+	 *
+	 * @returns An AST that corresponds to the MoLang expression
+	 */
+	parse(expression: string): IExpression {
+		if (this.config.useCache ?? true) {
+			const abstractSyntaxTree = this.expressionCache[expression]
+			if (abstractSyntaxTree) return abstractSyntaxTree
+		}
+
+		this.parser.init(expression)
+		let abstractSyntaxTree = this.parser.parseExpression()
+		if ((this.config.useOptimizer ?? true) && abstractSyntaxTree.isStatic())
+			abstractSyntaxTree = new StaticExpression(abstractSyntaxTree.eval())
+		// console.log(JSON.stringify(abstractSyntaxTree, null, '  '))
+
+		if (this.config.useCache ?? true) {
+			if (this.totalCacheEntries > (this.config.maxCacheSize || 256))
+				this.clearCache()
+
+			this.expressionCache[expression] = abstractSyntaxTree
+			this.totalCacheEntries++
+		}
+
+		return abstractSyntaxTree
+	}
+
+	resolveStatic(ast: IExpression) {
+		ast.walk((expr) => {
+			if (expr instanceof StringExpression) return
+
+			if (expr.isStatic()) return new StaticExpression(expr.eval())
+		})
+	}
+
+	getParser() {
+		return this.parser
+	}
+}

packages/molang/src/custom/function.ts

@@ -0,0 +1,93 @@
+import { Parser } from '../parser/parse'
+import { Token } from '../parser/../tokenizer/token'
+import { IPrefixParselet } from '../parser/parselets/prefix'
+import { Expression, IExpression } from '../parser/expression'
+import { StringExpression } from '../parser/expressions/string'
+import { StatementExpression } from '../parser/expressions/statement'
+import { CustomMoLangParser } from './main'
+import { GroupExpression } from '../parser/expressions/group'
+
+export class CustomFunctionParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		parser.consume('LEFT_PARENT')
+		if (parser.match('RIGHT_PARENT'))
+			throw new Error(`function() called without arguments`)
+
+		let args: string[] = []
+		let functionBody: IExpression | undefined
+		let functionName: string | undefined
+		do {
+			const expr = parser.parseExpression()
+			if (expr instanceof StringExpression) {
+				if (!functionName) functionName = <string>expr.eval()
+				else args.push(<string>expr.eval())
+			} else if (
+				expr instanceof StatementExpression ||
+				expr instanceof GroupExpression
+			) {
+				functionBody = expr
+			} else {
+				throw new Error(
+					`Unexpected expresion: found "${expr.constructor.name}"`
+				)
+			}
+		} while (parser.match('COMMA'))
+		parser.consume('RIGHT_PARENT')
+
+		if (!functionName)
+			throw new Error(
+				`Missing function() name (argument 1); found "${functionName}"`
+			)
+		if (!functionBody)
+			throw new Error(
+				`Missing function() body (argument ${args.length + 2})`
+			)
+
+		return new CustomFunctionExpression(
+			(<CustomMoLangParser>parser).functions,
+			functionName,
+			args,
+			functionBody
+		)
+	}
+}
+
+class CustomFunctionExpression extends Expression {
+	type = 'CustomFunctionExpression'
+	constructor(
+		functions: Map<string, [string[], string]>,
+		functionName: string,
+		args: string[],
+		protected functionBody: IExpression
+	) {
+		super()
+		functions.set(functionName, [
+			args,
+			functionBody instanceof GroupExpression
+				? functionBody.allExpressions[0].toString()
+				: functionBody.toString(),
+		])
+	}
+
+	get allExpressions() {
+		return [this.functionBody]
+	}
+	setExpressionAt(_: number, expr: IExpression) {
+		this.functionBody = expr
+	}
+
+	get isReturn() {
+		// Scopes inside of functions may use return statements
+		return false
+	}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return 0
+	}
+}

packages/molang/src/custom/main.ts

@@ -0,0 +1,229 @@
+import { ExecutionEnvironment } from '../env/env'
+import { IParserConfig } from '../main'
+import { MoLangParser } from '../parser/molang'
+import { Tokenizer } from '../tokenizer/Tokenizer'
+import { CustomFunctionParselet } from './function'
+import { MoLang } from '../MoLang'
+import { StatementExpression } from '../parser/expressions/statement'
+import { transformStatement } from './transformStatement'
+import { NameExpression } from '../parser/expressions/name'
+import { ReturnExpression } from '../parser/expressions/return'
+import { GenericOperatorExpression } from '../parser/expressions/genericOperator'
+import { TernaryExpression } from '../parser/expressions/ternary'
+import { IExpression } from '../parser/expression'
+import { VoidExpression } from '../parser/expressions/void'
+import { GroupExpression } from '../parser/expressions/group'
+
+export class CustomMoLangParser extends MoLangParser {
+	public readonly functions = new Map<string, [string[], string]>()
+
+	constructor(config: Partial<IParserConfig>) {
+		super(config)
+		this.registerPrefix('FUNCTION', new CustomFunctionParselet())
+	}
+
+	reset() {
+		this.functions.clear()
+	}
+}
+
+export class CustomMoLang {
+	protected parser: CustomMoLangParser
+
+	constructor(env: any) {
+		this.parser = new CustomMoLangParser({
+			useCache: false,
+			useOptimizer: true,
+			useAgressiveStaticOptimizer: true,
+			keepGroups: true,
+			earlyReturnsSkipParsing: false,
+			earlyReturnsSkipTokenization: false,
+		})
+		this.parser.setExecutionEnvironment(
+			new ExecutionEnvironment(this.parser, env)
+		)
+		this.parser.setTokenizer(new Tokenizer(new Set(['function'])))
+	}
+
+	get functions() {
+		return this.parser.functions
+	}
+
+	parse(expression: string) {
+		this.parser.init(expression)
+		const abstractSyntaxTree = this.parser.parseExpression()
+
+		return abstractSyntaxTree
+	}
+
+	transform(source: string) {
+		const molang = new MoLang(
+			{},
+			{
+				useCache: false,
+				keepGroups: true,
+				useOptimizer: true,
+				useAgressiveStaticOptimizer: true,
+				earlyReturnsSkipParsing: true,
+				earlyReturnsSkipTokenization: false,
+			}
+		)
+
+		let totalScoped = 0
+		let ast = molang.parse(source)
+
+		let isComplexExpression = false
+		if (ast instanceof StatementExpression) {
+			isComplexExpression = true
+		}
+
+		let containsComplexExpressions = false
+		ast = ast.walk((expr: any) => {
+			// Only run code on function expressions which start with "f." or "function."
+			if (
+				expr.type !== 'FunctionExpression' ||
+				(!expr.name.name.startsWith?.('f.') &&
+					!expr.name.name.startsWith?.('function.'))
+			)
+				return
+
+			const nameExpr = expr.name
+			const functionName = nameExpr.name.replace(/(f|function)\./g, '')
+			const argValues = expr.args
+
+			let [args, functionBody] = this.functions.get(functionName) ?? []
+			if (!functionBody || !args) return
+
+			// Insert argument values
+			functionBody = functionBody.replace(
+				/(a|arg)\.(\w+)/g,
+				(match, prefix, argName) => {
+					const val =
+						argValues[args!.indexOf(argName)]?.toString() ?? '0'
+
+					return val.replace(/(t|temp)\./, 'outer_temp.')
+				}
+			)
+
+			let funcAst = transformStatement(molang.parse(functionBody))
+			if (funcAst instanceof StatementExpression) {
+				funcAst = molang.parse(`({${functionBody}}+t.return_value)`)
+
+				containsComplexExpressions = true
+			}
+
+			const varNameMap = new Map<string, string>()
+			funcAst = funcAst.walk((expr) => {
+				if (expr instanceof NameExpression) {
+					const fullName = expr.toString()
+					// Remove "a."/"t."/etc. from var name
+					let tmp = fullName.split('.')
+					const varType = tmp.shift()
+					const varName = tmp.join('.')
+
+					if (varType === 't' || varType === 'temp') {
+						// Scope temp./t. variables to functions
+						let newName = varNameMap.get(fullName)
+						if (!newName) {
+							newName = `t.__scvar${totalScoped++}`
+							varNameMap.set(fullName, newName)
+						}
+
+						expr.setName(newName)
+					} else if (varType === 'outer_temp') {
+						expr.setName(`t.${varName}`)
+					}
+
+					return undefined
+				} else if (expr instanceof ReturnExpression) {
+					const nameExpr = new NameExpression(
+						molang.getParser().executionEnv,
+						't.return_value'
+					)
+					const returnValExpr = expr.allExpressions[0]
+
+					return new GenericOperatorExpression(
+						nameExpr,
+						returnValExpr,
+						'=',
+						() => {
+							nameExpr.setPointer(returnValExpr.eval())
+						}
+					)
+				} else if (expr instanceof StatementExpression) {
+					// Make early returns work correctly by adjusting ternary statements which contain return statements
+					const expressions: IExpression[] = []
+
+					for (let i = 0; i < expr.allExpressions.length; i++) {
+						const currExpr = expr.allExpressions[i]
+
+						if (
+							currExpr instanceof TernaryExpression &&
+							currExpr.hasReturn
+						) {
+							handleTernary(
+								currExpr,
+								expr.allExpressions.slice(i + 1)
+							)
+
+							expressions.push(currExpr)
+							break
+						} else if (currExpr.isReturn) {
+							expressions.push(currExpr)
+							break
+						}
+
+						expressions.push(currExpr)
+					}
+
+					return new StatementExpression(expressions)
+				}
+			})
+
+			return funcAst
+		})
+
+		const finalAst = molang.parse(ast.toString())
+		molang.resolveStatic(finalAst)
+		return !isComplexExpression && containsComplexExpressions
+			? `return ${finalAst.toString()};`
+			: finalAst.toString()
+	}
+
+	reset() {
+		this.functions.clear()
+	}
+}
+
+function handleTernary(
+	returnTernary: TernaryExpression,
+	currentExpressions: IExpression[]
+) {
+	// If & else branch end with return statements -> we can omit everything after the ternary
+	if (returnTernary.isReturn) return
+
+	const notReturningBranchIndex = returnTernary.allExpressions[2].isReturn
+		? 1
+		: 2
+	const notReturningBranch =
+		returnTernary.allExpressions[notReturningBranchIndex]
+
+	if (!(notReturningBranch instanceof VoidExpression)) {
+		if (
+			notReturningBranch instanceof GroupExpression &&
+			notReturningBranch.allExpressions[0] instanceof StatementExpression
+		) {
+			currentExpressions.unshift(...notReturningBranch.allExpressions)
+		} else {
+			currentExpressions.unshift(notReturningBranch)
+		}
+	}
+	if (currentExpressions.length > 0)
+		returnTernary.setExpressionAt(
+			notReturningBranchIndex,
+			new GroupExpression(
+				new StatementExpression(currentExpressions),
+				'{}'
+			)
+		)
+}

packages/molang/src/custom/transformStatement.ts

@@ -0,0 +1,19 @@
+import { IExpression } from '../parser/expression'
+import { GroupExpression } from '../parser/expressions/group'
+import { ReturnExpression } from '../parser/expressions/return'
+import { StatementExpression } from '../parser/expressions/statement'
+
+export function transformStatement(expression: IExpression) {
+	if (expression instanceof ReturnExpression)
+		return new GroupExpression(expression.allExpressions[0], '()')
+	if (!(expression instanceof StatementExpression)) return expression
+	if (expression.allExpressions.length > 1) return expression
+
+	// Only one statement, test whether it is a return statement
+	const expr = expression.allExpressions[0]
+	if (expr instanceof ReturnExpression) {
+		return new GroupExpression(expr.allExpressions[0], '()')
+	} else {
+		return expression
+	}
+}

packages/molang/src/env/env.ts

@@ -0,0 +1,143 @@
+import { standardEnv } from './standardEnv'
+
+export type TVariableHandler = (
+	variableName: string,
+	variables: Record<string, unknown>
+) => unknown
+
+export interface IEnvConfig {
+	useRadians?: boolean
+	convertUndefined?: boolean
+	variableHandler?: TVariableHandler
+	isFlat?: boolean
+}
+
+export class ExecutionEnvironment {
+	protected env: Record<string, any>
+
+	constructor(env: Record<string, any>, public readonly config: IEnvConfig) {
+		if (!env) throw new Error(`Provided environment must be an object`)
+
+		if (config.isFlat)
+			this.env = Object.assign(
+				env,
+				standardEnv(config.useRadians ?? false)
+			)
+		else
+			this.env = {
+				...standardEnv(config.useRadians ?? false),
+				...this.flattenEnv(env),
+			}
+	}
+
+	updateConfig({
+		variableHandler,
+		convertUndefined,
+		useRadians,
+	}: IEnvConfig) {
+		if (convertUndefined !== undefined)
+			this.config.convertUndefined = convertUndefined
+		if (typeof variableHandler === 'function')
+			this.config.variableHandler = variableHandler
+
+		if (!!this.config.useRadians !== !!useRadians) {
+			this.env = Object.assign(this.env, standardEnv(!!useRadians))
+		}
+	}
+
+	protected flattenEnv(
+		newEnv: Record<string, any>,
+		addKey = '',
+		current: any = {}
+	) {
+		for (let key in newEnv) {
+			if (key[1] === '.') {
+				switch (key[0]) {
+					case 'q':
+						key = 'query' + key.substring(1, key.length)
+						break
+					case 't':
+						key = 'temp' + key.substring(1, key.length)
+						break
+					case 'v':
+						key = 'variable' + key.substring(1, key.length)
+						break
+					case 'c':
+						key = 'context' + key.substring(1, key.length)
+						break
+					case 'f':
+						key = 'function' + key.substring(1, key.length)
+						break
+				}
+			}
+
+			if (newEnv[key].__isContext) {
+				current[`${addKey}${key}`] = newEnv[key].env
+			} else if (
+				typeof newEnv[key] === 'object' &&
+				!Array.isArray(newEnv[key])
+			) {
+				this.flattenEnv(newEnv[key], `${addKey}${key}.`, current)
+			} else {
+				current[`${addKey}${key}`] = newEnv[key]
+			}
+		}
+
+		return current
+	}
+
+	setAt(lookup: string, value: unknown) {
+		if (lookup[1] === '.') {
+			switch (lookup[0]) {
+				case 'q':
+					lookup = 'query' + lookup.substring(1, lookup.length)
+					break
+				case 't':
+					lookup = 'temp' + lookup.substring(1, lookup.length)
+					break
+				case 'v':
+					lookup = 'variable' + lookup.substring(1, lookup.length)
+					break
+				case 'c':
+					lookup = 'context' + lookup.substring(1, lookup.length)
+					break
+				case 'f':
+					lookup = 'function' + lookup.substring(1, lookup.length)
+					break
+			}
+		}
+
+		return (this.env[lookup] = value)
+	}
+
+	getFrom(lookup: string) {
+		if (lookup[1] === '.') {
+			switch (lookup[0]) {
+				case 'q':
+					lookup = 'query' + lookup.substring(1, lookup.length)
+					break
+				case 't':
+					lookup = 'temp' + lookup.substring(1, lookup.length)
+					break
+				case 'v':
+					lookup = 'variable' + lookup.substring(1, lookup.length)
+					break
+				case 'c':
+					lookup = 'context' + lookup.substring(1, lookup.length)
+					break
+				case 'f':
+					lookup = 'function' + lookup.substring(1, lookup.length)
+					break
+			}
+		}
+
+		const res =
+			this.env[lookup] ?? this.config.variableHandler?.(lookup, this.env)
+		return res === undefined && this.config.convertUndefined ? 0 : res
+	}
+}
+
+export class Context {
+	public readonly __isContext = true
+	constructor(public readonly env: any) {}
+}

packages/molang/src/env/math.ts

@@ -0,0 +1,86 @@
+const clamp = (value: number, min: number, max: number) => {
+	if (typeof value !== 'number' || Number.isNaN(value)) return min
+	else if (value > max) return max
+	else if (value < min) return min
+	return value
+}
+const dieRoll = (sum: number, low: number, high: number) => {
+	let i = 0
+	let total = 0
+	while (i < sum) total += random(low, high)
+	return total
+}
+const dieRollInt = (sum: number, low: number, high: number) => {
+	let i = 0
+	let total = 0
+	while (i < sum) total += randomInt(low, high)
+	return total
+}
+const hermiteBlend = (value: number) => 3 * value ** 2 - 2 * value ** 3
+const lerp = (start: number, end: number, amount: number) => {
+	if (amount < 0) amount = 0
+	else if (amount > 1) amount = 1
+
+	return start + (end - start) * amount
+}
+// Written by @JannisX11 (https://github.com/JannisX11/MolangJS/blob/master/molang.js#L383); modified for usage inside of this MoLang parser
+const lerprotate = (start: number, end: number, amount: number) => {
+	const radify = (n: number) => (((n + 180) % 360) + 180) % 360
+	start = radify(start)
+	end = radify(end)
+	if (start > end) {
+		let tmp = start
+		start = end
+		end = tmp
+	}
+
+	if (end - start > 180) return radify(end + amount * (360 - (end - start)))
+	else return start + amount * (end - start)
+}
+const mod = (value: number, denominator: number) => value % denominator
+const random = (low: number, high: number) => low + Math.random() * (high - low)
+const randomInt = (low: number, high: number) =>
+	Math.round(low + Math.random() * (high - low))
+
+const minAngle = (value: number) => {
+	value = value % 360
+	value = (value + 360) % 360
+
+	if (value > 179) value -= 360
+	return value
+}
+
+export const MoLangMathLib = (useRadians: boolean) => {
+	const degRadFactor = useRadians ? 1 : Math.PI / 180
+
+	return {
+		'math.abs': Math.abs,
+		'math.acos': (x: number) => Math.acos(x) / degRadFactor,
+		'math.asin': (x: number) => Math.asin(x) / degRadFactor,
+		'math.atan': (x: number) => Math.atan(x) / degRadFactor,
+		'math.atan2': (y: number, x: number) => Math.atan2(y, x) / degRadFactor,
+		'math.ceil': Math.ceil,
+		'math.clamp': clamp,
+		'math.cos': (x: number) => Math.cos(x * degRadFactor),
+		'math.die_roll': dieRoll,
+		'math.die_roll_integer': dieRollInt,
+		'math.exp': Math.exp,
+		'math.floor': Math.floor,
+		'math.hermite_blend': hermiteBlend,
+		'math.lerp': lerp,
+		'math.lerp_rotate': lerprotate,
+		'math.ln': Math.log,
+		'math.max': Math.max,
+		'math.min': Math.min,
+		'math.min_angle': minAngle,
+		'math.mod': mod,
+		'math.pi': Math.PI,
+		'math.pow': Math.pow,
+		'math.random': random,
+		'math.random_integer': randomInt,
+		'math.round': Math.round,
+		'math.sin': (x: number) => Math.sin(x * degRadFactor),
+		'math.sqrt': Math.sqrt,
+		'math.trunc': Math.trunc,
+	}
+}

packages/molang/src/env/queries.ts

@@ -0,0 +1,25 @@
+const inRange = (value: number, min: number, max: number) => {
+	// Check that value, min and max are numbers
+	if (
+		typeof value !== 'number' ||
+		typeof min !== 'number' ||
+		typeof max !== 'number'
+	) {
+		console.error('"query.in_range": value, min and max must be numbers')
+		return false
+	}
+
+	return value >= min && value <= max
+}
+
+const all = (mustMatch: unknown, ...values: unknown[]) =>
+	values.every((v) => v === mustMatch)
+
+const any = (mustMatch: unknown, ...values: unknown[]) =>
+	values.some((v) => v === mustMatch)
+
+export const standardQueries = {
+	'query.in_range': inRange,
+	'query.all': all,
+	'query.any': any,
+}

packages/molang/src/env/standardEnv.ts

@@ -0,0 +1,7 @@
+import { MoLangMathLib } from './math'
+import { standardQueries } from './queries'
+
+export const standardEnv = (useRadians: boolean) => ({
+	...MoLangMathLib(useRadians),
+	...standardQueries,
+})

packages/molang/src/index.ts

@@ -0,0 +1 @@
+export * from './main'

packages/molang/src/main.ts

@@ -0,0 +1,91 @@
+import { TVariableHandler } from './env/env'
+import { Tokenizer } from './tokenizer/Tokenizer'
+
+/**
+ * How the parser and interpreter should handle your MoLang expression
+ */
+
+export interface IParserConfig {
+	/**
+	 * Whether a cache should be used to speed up executing MoLang.
+	 * The cache saves an AST for every parsed expression.
+	 * This allows us to skip the tokenization & parsing step before executing known MoLang expressions
+	 *
+	 * Default: true
+	 */
+	useCache: boolean
+	/**
+	 * How many expressions can be cached. After reaching `maxCacheSize`, the whole cache is cleared automatically.
+	 * Can be set to `Infinity` to remove the limit completely
+	 *
+	 * Default: 256
+	 */
+	maxCacheSize: number
+	/**
+	 * The optimizer can drastically speed up parsing & executing MoLang.
+	 * It enables skipping of unreachable statements, pre-evaluating static expressions and skipping of statements with no effect
+	 * when used together with the `useAgressiveStaticOptimizer` option
+	 *
+	 * Default: true
+	 */
+	useOptimizer: boolean
+	/**
+	 * Skip execution of statements with no effect
+	 * when used together with the `useOptimizer` option
+	 *
+	 * Default: true
+	 */
+	useAgressiveStaticOptimizer: boolean
+
+	/**
+	 * This options makes early return statements skip all parsing work completely
+	 *
+	 * Default: true
+	 */
+	earlyReturnsSkipParsing: boolean
+	/**
+	 * This options makes early return statements skip all tokenization work completely if earlyReturnsSkipParsing is set to true
+	 *
+	 * Default: true
+	 */
+	earlyReturnsSkipTokenization: boolean
+	/**
+	 * Tokenizer to use for tokenizing the expression
+	 */
+	tokenizer: Tokenizer
+	/**
+	 * Create expression instances for brackets ("()", "{}")
+	 *
+	 * This should only be set to true if you want to use the .toString() method of an expression
+	 * or you want to iterate over the whole AST
+	 *
+	 * Default: false
+	 */
+	keepGroups: boolean
+
+	/**
+	 * Whether to convert undefined variables to "0"
+	 *
+	 * Default: false
+	 */
+	convertUndefined: boolean
+
+	/**
+	 * Use radians instead of degrees for trigonometric functions
+	 *
+	 * Default: false
+	 */
+	useRadians: boolean
+
+	/**
+	 * Resolve undefined variables
+	 */
+	variableHandler: TVariableHandler
+}
+
+export { Tokenizer } from './tokenizer/Tokenizer'
+export { IExpression } from './parser/expression'
+export { CustomMoLang } from './custom/main'
+export { MoLang } from './MoLang'
+export * as expressions from './parser/expressions/index'
+export { Context } from './env/env'

packages/molang/src/parser/expression.ts

@@ -0,0 +1,57 @@
+/**
+ * Interface that describes an AST Expression
+ */
+export interface IExpression {
+	readonly type: string
+	readonly isReturn?: boolean
+	readonly isBreak?: boolean
+	readonly isContinue?: boolean
+	readonly allExpressions: IExpression[]
+
+	setFunctionCall?: (value: boolean) => void
+	setPointer?: (value: unknown) => void
+	setExpressionAt(index: number, expr: IExpression): void
+	eval(): unknown
+	isStatic(): boolean
+	walk(cb: TIterateCallback): IExpression
+	iterate(cb: TIterateCallback, visited: Set<IExpression>): void
+}
+
+export abstract class Expression implements IExpression {
+	public abstract readonly type: string
+
+	abstract eval(): unknown
+	abstract isStatic(): boolean
+
+	toString() {
+		return `${this.eval()}`
+	}
+
+	abstract allExpressions: IExpression[]
+	abstract setExpressionAt(index: number, expr: IExpression): void
+
+	walk(cb: TIterateCallback, visited = new Set<IExpression>()): IExpression {
+		let expr = cb(this) ?? this
+
+		expr.iterate(cb, visited)
+
+		return expr
+	}
+	iterate(cb: TIterateCallback, visited: Set<IExpression>) {
+		for (let i = 0; i < this.allExpressions.length; i++) {
+			const originalExpr = this.allExpressions[i]
+			if (visited.has(originalExpr)) continue
+			else visited.add(originalExpr)
+
+			const expr = cb(originalExpr) ?? originalExpr
+
+			if (expr !== originalExpr && visited.has(expr)) continue
+			else visited.add(expr)
+
+			this.setExpressionAt(i, expr)
+			expr.iterate(cb, visited)
+		}
+	}
+}
+
+export type TIterateCallback = (expr: IExpression) => IExpression | undefined

packages/molang/src/parser/expressions/arrayAccess.ts

@@ -0,0 +1,32 @@
+import { Expression, IExpression } from '../expression'
+
+export class ArrayAccessExpression extends Expression {
+	type = 'ArrayAccessExpression'
+	constructor(protected name: IExpression, protected lookup: IExpression) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.name, this.lookup]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (index === 0) this.name = expr
+		else if (index === 1) this.lookup = expr
+	}
+
+	isStatic() {
+		return false
+	}
+
+	setPointer(value: unknown) {
+		;(<any>this.name.eval())[<number>this.lookup.eval()] = value
+	}
+
+	eval() {
+		return (<any>this.name.eval())[<number>this.lookup.eval()]
+	}
+
+	toString() {
+		return `${this.name.toString()}[${this.lookup.toString()}]`
+	}
+}

packages/molang/src/parser/expressions/boolean.ts

@@ -0,0 +1,21 @@
+import { Expression } from '../expression'
+
+export class BooleanExpression extends Expression {
+	type = 'BooleanExpression'
+	constructor(protected value: boolean) {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return this.value
+	}
+}

packages/molang/src/parser/expressions/break.ts

@@ -0,0 +1,26 @@
+import { Expression } from '../expression'
+
+export class BreakExpression extends Expression {
+	type = 'BreakExpression'
+	isBreak = true
+
+	constructor() {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return false
+	}
+
+	eval() {
+		return 0
+	}
+	isString() {
+		return 'break'
+	}
+}

packages/molang/src/parser/expressions/contextSwitch.ts

@@ -0,0 +1,48 @@
+import { ExecutionEnvironment } from '../../env/env'
+import { Expression, IExpression } from '../expression'
+import { NameExpression } from './name'
+
+export class ContextSwitchExpression extends Expression {
+	type = 'NameExpression'
+
+	constructor(
+		protected leftExpr: NameExpression,
+		protected rightExpr: NameExpression
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.leftExpr, this.rightExpr]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (!(expr instanceof NameExpression))
+			throw new Error(
+				`Cannot use context switch operator "->" on ${expr.type}`
+			)
+
+		if (index === 0) this.leftExpr = expr
+		else if (index === 1) this.rightExpr = expr
+	}
+
+	isStatic() {
+		return false
+	}
+
+	eval() {
+		const context = this.leftExpr.eval()
+		if (typeof context !== 'object') return 0
+
+		this.rightExpr.setExecutionEnv(
+			new ExecutionEnvironment(
+				context,
+				this.rightExpr.executionEnv.config
+			)
+		)
+		return this.rightExpr.eval()
+	}
+
+	toString() {
+		return `${this.leftExpr.toString()}->${this.rightExpr.toString()}`
+	}
+}

packages/molang/src/parser/expressions/continue.ts

@@ -0,0 +1,26 @@
+import { Expression } from '../expression'
+
+export class ContinueExpression extends Expression {
+	type = 'ContinueExpression'
+	isContinue = true
+
+	constructor() {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return false
+	}
+
+	eval() {
+		return 0
+	}
+	toString() {
+		return 'continue'
+	}
+}

packages/molang/src/parser/expressions/forEach.ts

@@ -0,0 +1,63 @@
+import { Expression, IExpression } from '../expression'
+
+export class ForEachExpression extends Expression {
+	type = 'ForEachExpression'
+
+	constructor(
+		protected variable: IExpression,
+		protected arrayExpression: IExpression,
+		protected expression: IExpression
+	) {
+		super()
+		if (!this.variable.setPointer)
+			throw new Error(
+				`First for_each() argument must be a variable, received "${typeof this.variable.eval()}"`
+			)
+	}
+
+	get isReturn() {
+		return this.expression.isReturn
+	}
+	get allExpressions() {
+		return [this.variable, this.arrayExpression, this.expression]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (index === 0) this.variable = expr
+		else if (index === 1) this.arrayExpression = expr
+		else if (index === 2) this.expression = expr
+	}
+
+	isStatic() {
+		return (
+			this.variable.isStatic() &&
+			this.arrayExpression.isStatic() &&
+			this.expression.isStatic()
+		)
+	}
+
+	eval() {
+		const array = this.arrayExpression.eval()
+		if (!Array.isArray(array))
+			throw new Error(
+				`Second for_each() argument must be an array, received "${typeof array}"`
+			)
+
+		let i = 0
+		while (i < array.length) {
+			// Error detection for this.variable is part of the constructor
+			this.variable.setPointer?.(array[i++])
+
+			const res = this.expression.eval()
+
+			if (this.expression.isBreak) break
+			else if (this.expression.isContinue) continue
+			else if (this.expression.isReturn) return res
+		}
+
+		return 0
+	}
+
+	toString() {
+		return `loop(${this.variable.toString()},${this.arrayExpression.toString()},${this.expression.toString()})`
+	}
+}

packages/molang/src/parser/expressions/function.ts

@@ -0,0 +1,46 @@
+import { NameExpression } from './name'
+import { Expression, IExpression } from '../expression'
+
+export class FunctionExpression extends Expression {
+	type = 'FunctionExpression'
+
+	constructor(protected name: IExpression, protected args: IExpression[]) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.name, ...this.args]
+	}
+	setExpressionAt(index: number, expr: Expression) {
+		if (index === 0) this.name = expr
+		else if (index > 0) this.args[index - 1] = expr
+	}
+
+	isStatic() {
+		return false
+	}
+
+	eval() {
+		const args: unknown[] = []
+		let i = 0
+		while (i < this.args.length) args.push(this.args[i++].eval())
+
+		const func = <(...args: unknown[]) => unknown>this.name.eval()
+		if (typeof func !== 'function')
+			throw new Error(
+				`${(<NameExpression>this.name).toString()} is not callable!`
+			)
+		return func(...args)
+	}
+
+	toString() {
+		let str = `${this.name.toString()}(`
+		for (let i = 0; i < this.args.length; i++) {
+			str += `${this.args[i].toString()}${
+				i + 1 < this.args.length ? ',' : ''
+			}`
+		}
+
+		return `${str})`
+	}
+}

packages/molang/src/parser/expressions/genericOperator.ts

@@ -0,0 +1,37 @@
+import { Expression, IExpression } from '../expression'
+
+export class GenericOperatorExpression extends Expression {
+	type = 'GenericOperatorExpression'
+
+	constructor(
+		protected left: IExpression,
+		protected right: IExpression,
+		protected operator: string,
+		protected evalHelper: (
+			leftExpression: IExpression,
+			rightExpression: IExpression
+		) => unknown
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.left, this.right]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (index === 0) this.left = expr
+		else if (index === 1) this.right = expr
+	}
+
+	isStatic() {
+		return this.left.isStatic() && this.right.isStatic()
+	}
+
+	eval() {
+		return this.evalHelper(this.left, this.right)
+	}
+
+	toString() {
+		return `${this.left.toString()}${this.operator}${this.right.toString()}`
+	}
+}

packages/molang/src/parser/expressions/group.ts

@@ -0,0 +1,38 @@
+import { Expression, IExpression } from '../expression'
+
+export class GroupExpression extends Expression {
+	type = 'GroupExpression'
+
+	constructor(protected expression: IExpression, protected brackets: string) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.expression]
+	}
+	setExpressionAt(_: number, expr: IExpression) {
+		this.expression = expr
+	}
+
+	isStatic() {
+		return this.expression.isStatic()
+	}
+	get isReturn() {
+		return this.expression.isReturn
+	}
+	get isBreak() {
+		return this.expression.isBreak
+	}
+	get isContinue() {
+		return this.expression.isContinue
+	}
+
+	eval() {
+		return this.expression.eval()
+	}
+	toString() {
+		return `${this.brackets[0]}${this.expression.toString()}${
+			this.brackets[1]
+		}`
+	}
+}

packages/molang/src/parser/expressions/index.ts

@@ -0,0 +1,19 @@
+export { ArrayAccessExpression } from './arrayAccess'
+export { BooleanExpression } from './boolean'
+export { BreakExpression } from './break'
+export { ContinueExpression } from './continue'
+export { ForEachExpression } from './forEach'
+export { FunctionExpression } from './function'
+export { GenericOperatorExpression } from './genericOperator'
+export { GroupExpression } from './group'
+export { LoopExpression } from './loop'
+export { NameExpression } from './name'
+export { NumberExpression } from './number'
+export { PostfixExpression } from './postfix'
+export { PrefixExpression } from './prefix'
+export { ReturnExpression } from './return'
+export { StatementExpression } from './statement'
+export { StaticExpression } from './static'
+export { StringExpression } from './string'
+export { TernaryExpression } from './ternary'
+export { VoidExpression } from './void'

packages/molang/src/parser/expressions/loop.ts

@@ -0,0 +1,56 @@
+import { Expression, IExpression } from '../expression'
+
+export class LoopExpression extends Expression {
+	type = 'LoopExpression'
+
+	constructor(
+		protected count: IExpression,
+		protected expression: IExpression
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.count, this.expression]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (index === 0) this.count = expr
+		else if (index === 1) this.expression = expr
+	}
+
+	get isReturn() {
+		return this.expression.isReturn
+	}
+
+	isStatic() {
+		return this.count.isStatic() && this.expression.isStatic()
+	}
+
+	eval() {
+		const repeatCount = Number(this.count.eval())
+		if (Number.isNaN(repeatCount))
+			throw new Error(
+				`First loop() argument must be of type number, received "${typeof this.count.eval()}"`
+			)
+		if (repeatCount > 1024)
+			throw new Error(
+				`Cannot loop more than 1024x times, received "${repeatCount}"`
+			)
+
+		let i = 0
+		while (i < repeatCount) {
+			i++
+			const res = this.expression.eval()
+
+			if (this.expression.isBreak) break
+			else if (this.expression.isContinue) continue
+			else if (this.expression.isReturn) return res
+		}
+
+		return 0
+	}
+
+	toString() {
+		return `loop(${this.count.toString()},${this.expression.toString()})`
+	}
+}

packages/molang/src/parser/expressions/name.ts

@@ -0,0 +1,47 @@
+import { ExecutionEnvironment } from '../../env/env'
+import { Expression } from '../expression'
+
+export class NameExpression extends Expression {
+	type = 'NameExpression'
+
+	constructor(
+		public executionEnv: ExecutionEnvironment,
+		protected name: string,
+		protected isFunctionCall = false
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return false
+	}
+
+	setPointer(value: unknown) {
+		this.executionEnv.setAt(this.name, value)
+	}
+
+	setFunctionCall(value = true) {
+		this.isFunctionCall = value
+	}
+	setName(name: string) {
+		this.name = name
+	}
+	setExecutionEnv(executionEnv: ExecutionEnvironment) {
+		this.executionEnv = executionEnv
+	}
+
+	eval() {
+		const value = this.executionEnv.getFrom(this.name)
+		if (!this.isFunctionCall && typeof value === 'function') return value()
+		return value
+	}
+
+	toString() {
+		return this.name
+	}
+}

packages/molang/src/parser/expressions/number.ts

@@ -0,0 +1,25 @@
+import { Expression } from '../expression'
+
+export class NumberExpression extends Expression {
+	type = 'NumberExpression'
+
+	constructor(protected value: number) {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return this.value
+	}
+	toString() {
+		return '' + this.value
+	}
+}

packages/molang/src/parser/expressions/postfix.ts

@@ -0,0 +1,32 @@
+import { TTokenType } from '../../tokenizer/token'
+import { Expression, IExpression } from '../expression'
+
+export class PostfixExpression extends Expression {
+	type = 'PostfixExpression'
+
+	constructor(
+		protected expression: IExpression,
+		protected tokenType: TTokenType
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.expression]
+	}
+	setExpressionAt(_: number, expr: IExpression) {
+		this.expression = expr
+	}
+
+	isStatic() {
+		return this.expression.isStatic()
+	}
+
+	eval() {
+		switch (this.tokenType) {
+			case 'X': {
+				// DO SOMETHING
+			}
+		}
+	}
+}

packages/molang/src/parser/expressions/prefix.ts

@@ -0,0 +1,57 @@
+import { TTokenType } from '../../tokenizer/token'
+import { Expression, IExpression } from '../expression'
+
+export class PrefixExpression extends Expression {
+	type = 'PrefixExpression'
+
+	constructor(
+		protected tokenType: TTokenType,
+		protected expression: IExpression
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.expression]
+	}
+	setExpressionAt(_: number, expr: IExpression) {
+		this.expression = expr
+	}
+
+	isStatic() {
+		return this.expression.isStatic()
+	}
+
+	eval() {
+		const value = this.expression.eval()
+
+		if (typeof value !== 'number')
+			throw new Error(
+				`Cannot use "${
+					this.tokenType
+				}" operator in front of ${typeof value} "${value}"`
+			)
+
+		switch (this.tokenType) {
+			case 'MINUS': {
+				return -value
+			}
+			case 'BANG': {
+				return !value
+			}
+		}
+	}
+
+	toString() {
+		switch (this.tokenType) {
+			case 'MINUS': {
+				return `-${this.expression.toString()}`
+			}
+			case 'BANG': {
+				return `!${this.expression.toString()}`
+			}
+		}
+
+		throw new Error(`Unknown prefix operator: "${this.tokenType}"`)
+	}
+}

packages/molang/src/parser/expressions/return.ts

@@ -0,0 +1,29 @@
+import { Expression, IExpression } from '../expression'
+
+export class ReturnExpression extends Expression {
+	type = 'ReturnExpression'
+	isReturn = true
+
+	constructor(protected expression: IExpression) {
+		super()
+	}
+
+	get allExpressions() {
+		return [this.expression]
+	}
+	setExpressionAt(_: number, expr: IExpression) {
+		this.expression = expr
+	}
+
+	isStatic() {
+		return false
+	}
+
+	eval() {
+		return this.expression.eval()
+	}
+
+	toString() {
+		return `return ${this.expression.toString()}`
+	}
+}

packages/molang/src/parser/expressions/statement.ts

@@ -0,0 +1,102 @@
+import { Expression, IExpression } from '../expression'
+import { StaticExpression } from './static'
+import { VoidExpression } from './void'
+
+export class StatementExpression extends Expression {
+	type = 'StatementExpression'
+	protected didReturn?: boolean = undefined
+	protected wasLoopBroken = false
+	protected wasLoopContinued = false
+
+	constructor(protected expressions: IExpression[]) {
+		super()
+	}
+
+	get allExpressions() {
+		return this.expressions
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		this.expressions[index] = expr
+	}
+
+	get isReturn() {
+		if (this.didReturn !== undefined) return this.didReturn
+
+		// This breaks scope vs. statement parsing for some reason
+		let i = 0
+		while (i < this.expressions.length) {
+			const expr = this.expressions[i]
+
+			if (expr.isBreak) return false
+			if (expr.isContinue) return false
+			if (expr.isReturn) {
+				this.didReturn = true
+				return true
+			}
+			i++
+		}
+		this.didReturn = false
+		return false
+	}
+
+	get isBreak() {
+		if (this.wasLoopBroken) {
+			this.wasLoopBroken = false
+			return true
+		}
+		return false
+	}
+	get isContinue() {
+		if (this.wasLoopContinued) {
+			this.wasLoopContinued = false
+			return true
+		}
+		return false
+	}
+
+	isStatic() {
+		let i = 0
+		while (i < this.expressions.length) {
+			if (!this.expressions[i].isStatic()) return false
+			i++
+		}
+		return true
+	}
+
+	eval() {
+		this.didReturn = false
+		this.wasLoopBroken = false
+		this.wasLoopContinued = false
+		let i = 0
+		while (i < this.expressions.length) {
+			let res = this.expressions[i].eval()
+
+			if (this.expressions[i].isReturn) {
+				this.didReturn = true
+				return res
+			} else if (this.expressions[i].isContinue) {
+				this.wasLoopContinued = true
+				return
+			} else if (this.expressions[i].isBreak) {
+				this.wasLoopBroken = true
+				return
+			}
+			i++
+		}
+		return 0
+	}
+
+	toString() {
+		let str = ''
+		for (const expr of this.expressions) {
+			if (
+				expr instanceof VoidExpression ||
+				(expr instanceof StaticExpression && !expr.isReturn)
+			)
+				continue
+			str += `${expr.toString()};`
+		}
+
+		return str
+	}
+}

packages/molang/src/parser/expressions/static.ts

@@ -0,0 +1,28 @@
+import { Expression } from '../expression'
+
+export class StaticExpression extends Expression {
+	type = 'StaticExpression'
+	constructor(protected value: unknown, public readonly isReturn = false) {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return this.value
+	}
+	toString() {
+		let val = this.value
+		if (typeof val === 'string') val = `'${val}'`
+
+		if (this.isReturn) return `return ${val}`
+		return '' + val
+	}
+}

packages/molang/src/parser/expressions/string.ts

@@ -0,0 +1,26 @@
+import { Expression } from '../expression'
+
+export class StringExpression extends Expression {
+	type = 'StringExpression'
+
+	constructor(protected name: string) {
+		super()
+	}
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return this.name.substring(1, this.name.length - 1)
+	}
+
+	toString() {
+		return this.name
+	}
+}

packages/molang/src/parser/expressions/ternary.ts

@@ -0,0 +1,79 @@
+import { Expression, IExpression } from '../expression'
+import { VoidExpression } from './void'
+
+export class TernaryExpression extends Expression {
+	type = 'TernaryExpression'
+	protected leftResult: unknown
+
+	constructor(
+		protected leftExpression: IExpression,
+		protected thenExpression: IExpression,
+		protected elseExpression: IExpression
+	) {
+		super()
+	}
+
+	get allExpressions() {
+		if (this.leftExpression.isStatic())
+			return [
+				this.leftExpression,
+				this.leftExpression.eval()
+					? this.thenExpression
+					: this.elseExpression,
+			]
+		return [this.leftExpression, this.thenExpression, this.elseExpression]
+	}
+	setExpressionAt(index: number, expr: IExpression) {
+		if (index === 0) this.leftExpression = expr
+		else if (index === 1) this.thenExpression = expr
+		else if (index === 2) this.elseExpression = expr
+	}
+
+	get isReturn() {
+		if (this.leftResult === undefined)
+			return this.thenExpression.isReturn && this.elseExpression.isReturn
+		return this.leftResult
+			? this.thenExpression.isReturn
+			: this.elseExpression.isReturn
+	}
+	get hasReturn() {
+		return this.thenExpression.isReturn || this.elseExpression.isReturn
+	}
+	get isContinue() {
+		if (this.leftResult === undefined)
+			return (
+				this.thenExpression.isContinue && this.elseExpression.isContinue
+			)
+		return this.leftResult
+			? this.thenExpression.isContinue
+			: this.elseExpression.isContinue
+	}
+	get isBreak() {
+		if (this.leftResult === undefined)
+			return this.thenExpression.isBreak && this.elseExpression.isBreak
+		return this.leftResult
+			? this.thenExpression.isBreak
+			: this.elseExpression.isBreak
+	}
+
+	isStatic() {
+		return (
+			this.leftExpression.isStatic() &&
+			this.thenExpression.isStatic() &&
+			this.elseExpression.isStatic()
+		)
+	}
+
+	eval() {
+		this.leftResult = this.leftExpression.eval()
+		return this.leftResult
+			? this.thenExpression.eval()
+			: this.elseExpression.eval()
+	}
+
+	toString() {
+		if (this.elseExpression instanceof VoidExpression)
+			return `${this.leftExpression.toString()}?${this.thenExpression.toString()}`
+		return `${this.leftExpression.toString()}?${this.thenExpression.toString()}:${this.elseExpression.toString()}`
+	}
+}

packages/molang/src/parser/expressions/void.ts

@@ -0,0 +1,21 @@
+import { Expression } from '../expression'
+
+export class VoidExpression extends Expression {
+	type = 'VoidExpression'
+
+	get allExpressions() {
+		return []
+	}
+	setExpressionAt() {}
+
+	isStatic() {
+		return true
+	}
+
+	eval() {
+		return 0
+	}
+	toString() {
+		return ''
+	}
+}

packages/molang/src/parser/molang.ts

@@ -0,0 +1,88 @@
+import { Parser } from './parse'
+import { BinaryOperator } from './parselets/binaryOperator'
+import { EPrecedence } from './precedence'
+import { PrefixOperator } from './parselets/prefix'
+import { NumberParselet } from './parselets/number'
+import { NameParselet } from './parselets/name'
+import { GroupParselet } from './parselets/groupParselet'
+import { ReturnParselet } from './parselets/return'
+import { StatementParselet } from './parselets/statement'
+import { StringParselet } from './parselets/string'
+import { FunctionParselet } from './parselets/function'
+import { ArrayAccessParselet } from './parselets/arrayAccess'
+import { ScopeParselet } from './parselets/scope'
+import { LoopParselet } from './parselets/loop'
+import { ForEachParselet } from './parselets/forEach'
+import { ContinueParselet } from './parselets/continue'
+import { BreakParselet } from './parselets/break'
+import { BooleanParselet } from './parselets/boolean'
+import { IParserConfig } from '../main'
+import { EqualsOperator } from './parselets/equals'
+import { NotEqualsOperator } from './parselets/notEquals'
+import { AndOperator } from './parselets/andOperator'
+import { OrOperator } from './parselets/orOperator'
+import { SmallerOperator } from './parselets/smallerOperator'
+import { GreaterOperator } from './parselets/greaterOperator'
+import { QuestionOperator } from './parselets/questionOperator'
+
+export class MoLangParser extends Parser {
+	constructor(config: Partial<IParserConfig>) {
+		super(config)
+
+		//Special parselets
+		this.registerPrefix('NAME', new NameParselet())
+		this.registerPrefix('STRING', new StringParselet())
+		this.registerPrefix('NUMBER', new NumberParselet())
+		this.registerPrefix('TRUE', new BooleanParselet(EPrecedence.PREFIX))
+		this.registerPrefix('FALSE', new BooleanParselet(EPrecedence.PREFIX))
+		this.registerPrefix('RETURN', new ReturnParselet())
+		this.registerPrefix('CONTINUE', new ContinueParselet())
+		this.registerPrefix('BREAK', new BreakParselet())
+		this.registerPrefix('LOOP', new LoopParselet())
+		this.registerPrefix('FOR_EACH', new ForEachParselet())
+		this.registerInfix(
+			'QUESTION',
+			new QuestionOperator(EPrecedence.CONDITIONAL)
+		)
+		this.registerPrefix('LEFT_PARENT', new GroupParselet())
+		this.registerInfix(
+			'LEFT_PARENT',
+			new FunctionParselet(EPrecedence.FUNCTION)
+		)
+		this.registerInfix(
+			'ARRAY_LEFT',
+			new ArrayAccessParselet(EPrecedence.ARRAY_ACCESS)
+		)
+		this.registerPrefix('CURLY_LEFT', new ScopeParselet(EPrecedence.SCOPE))
+		this.registerInfix(
+			'SEMICOLON',
+			new StatementParselet(EPrecedence.STATEMENT)
+		)
+
+		//Prefix parselets
+		this.registerPrefix('MINUS', new PrefixOperator(EPrecedence.PREFIX))
+		this.registerPrefix('BANG', new PrefixOperator(EPrecedence.PREFIX))
+
+		//Postfix parselets
+		//Nothing here yet
+
+		//Infix parselets
+		this.registerInfix('PLUS', new BinaryOperator(EPrecedence.SUM))
+		this.registerInfix('MINUS', new BinaryOperator(EPrecedence.SUM))
+		this.registerInfix('ASTERISK', new BinaryOperator(EPrecedence.PRODUCT))
+		this.registerInfix('SLASH', new BinaryOperator(EPrecedence.PRODUCT))
+		this.registerInfix(
+			'EQUALS',
+			new EqualsOperator(EPrecedence.EQUALS_COMPARE)
+		)
+		this.registerInfix(
+			'BANG',
+			new NotEqualsOperator(EPrecedence.EQUALS_COMPARE)
+		)
+		this.registerInfix('GREATER', new GreaterOperator(EPrecedence.COMPARE))
+		this.registerInfix('SMALLER', new SmallerOperator(EPrecedence.COMPARE))
+		this.registerInfix('AND', new AndOperator(EPrecedence.AND))
+		this.registerInfix('OR', new OrOperator(EPrecedence.OR))
+		this.registerInfix('ASSIGN', new BinaryOperator(EPrecedence.ASSIGNMENT))
+	}
+}

packages/molang/src/parser/parse.ts

@@ -0,0 +1,118 @@
+import { Tokenizer } from '../tokenizer/Tokenizer'
+import { TTokenType, Token } from '../tokenizer/token'
+import { IPrefixParselet } from './parselets/prefix'
+import { IInfixParselet } from './parselets/infix'
+import { IExpression } from './expression'
+import { ExecutionEnvironment } from '../env/env'
+import { IParserConfig } from '../main'
+import { VoidExpression } from './expressions/void'
+
+export class Parser {
+	protected prefixParselets = new Map<TTokenType, IPrefixParselet>()
+	protected infixParselets = new Map<TTokenType, IInfixParselet>()
+	protected readTokens: Token[] = []
+	protected tokenIterator = new Tokenizer()
+	executionEnv!: ExecutionEnvironment
+
+	constructor(public config: Partial<IParserConfig>) {}
+
+	updateConfig(config: Partial<IParserConfig>) {
+		this.config = config
+	}
+
+	init(expression: string) {
+		this.tokenIterator.init(expression)
+		this.readTokens = []
+	}
+	setTokenizer(tokenizer: Tokenizer) {
+		this.tokenIterator = tokenizer
+	}
+	setExecutionEnvironment(executionEnv: ExecutionEnvironment) {
+		this.executionEnv = executionEnv
+	}
+
+	parseExpression(precedence = 0): IExpression {
+		let token = this.consume()
+		if (token.getType() === 'EOF') return new VoidExpression()
+
+		const prefix = this.prefixParselets.get(token.getType())
+		if (!prefix) {
+			throw new Error(
+				`Cannot parse ${token.getType()} expression "${token.getType()}"`
+			)
+		}
+
+		let expressionLeft = prefix.parse(this, token)
+		return this.parseInfixExpression(expressionLeft, precedence)
+	}
+
+	parseInfixExpression(expressionLeft: IExpression, precedence = 0) {
+		let token
+
+		while (this.getPrecedence() > precedence) {
+			token = this.consume()
+			let tokenType = token.getType()
+			if (tokenType === 'EQUALS' && !this.match('EQUALS')) {
+				tokenType = 'ASSIGN'
+			}
+
+			const infix = <IInfixParselet>this.infixParselets.get(tokenType)
+			if (!infix)
+				throw new Error(`Unknown infix parselet: "${tokenType}"`)
+			expressionLeft = infix.parse(this, expressionLeft, token)
+		}
+
+		return expressionLeft
+	}
+
+	getPrecedence() {
+		const parselet = this.infixParselets.get(this.lookAhead(0).getType())
+		return parselet?.precedence ?? 0
+	}
+
+	consume(expected?: TTokenType) {
+		//Sets the lastLineNumber & startColumn before consuming next token
+		//Used for getting the exact location an error occurs
+		// this.tokenIterator.step()
+
+		const token = this.lookAhead(0)
+
+		if (expected && token.getType() !== expected) {
+			throw new Error(
+				`Expected token "${expected}" and found "${token.getType()}"`
+			)
+		}
+
+		this.readTokens.shift()!
+		return token
+	}
+
+	match(expected: TTokenType, consume = true) {
+		const token = this.lookAhead(0)
+		if (token.getType() !== expected) return false
+
+		if (consume) this.consume()
+		return true
+	}
+
+	lookAhead(distance: number) {
+		while (distance >= this.readTokens.length)
+			this.readTokens.push(this.tokenIterator.next())
+
+		return this.readTokens[distance]
+	}
+
+	registerInfix(tokenType: TTokenType, infixParselet: IInfixParselet) {
+		this.infixParselets.set(tokenType, infixParselet)
+	}
+	registerPrefix(tokenType: TTokenType, prefixParselet: IPrefixParselet) {
+		this.prefixParselets.set(tokenType, prefixParselet)
+	}
+
+	getInfix(tokenType: TTokenType) {
+		return this.infixParselets.get(tokenType)
+	}
+	getPrefix(tokenType: TTokenType) {
+		return this.prefixParselets.get(tokenType)
+	}
+}

packages/molang/src/parser/parselets/andOperator.ts

@@ -0,0 +1,21 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IExpression } from '../expression'
+import { GenericOperatorExpression } from '../expressions/genericOperator'
+import { IInfixParselet } from './infix'
+
+export class AndOperator implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, leftExpression: IExpression, token: Token) {
+		if (parser.match('AND'))
+			return new GenericOperatorExpression(
+				leftExpression,
+				parser.parseExpression(this.precedence),
+				'&&',
+				(leftExpression: IExpression, rightExpression: IExpression) =>
+					leftExpression.eval() && rightExpression.eval()
+			)
+		else throw new Error(`"&" not followed by another "&"`)
+	}
+}

packages/molang/src/parser/parselets/arrayAccess.ts

@@ -0,0 +1,22 @@
+import { Token } from '../../tokenizer/token'
+import { Parser } from '../parse'
+import { IInfixParselet } from './infix'
+import { IExpression } from '../expression'
+import { ArrayAccessExpression } from '../expressions/arrayAccess'
+
+export class ArrayAccessParselet implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, left: IExpression, token: Token) {
+		const expr = parser.parseExpression(this.precedence - 1)
+
+		if (!left.setPointer) throw new Error(`"${left.type}" is not an array`)
+
+		if (!parser.match('ARRAY_RIGHT'))
+			throw new Error(
+				`No closing bracket for opening bracket "[${expr.eval()}"`
+			)
+
+		return new ArrayAccessExpression(left, expr)
+	}
+}

packages/molang/src/parser/parselets/binaryOperator.ts

@@ -0,0 +1,134 @@
+import { IInfixParselet } from './infix'
+import { Parser } from '../parse'
+import { IExpression } from '../expression'
+import { Token } from '../../tokenizer/token'
+import { GenericOperatorExpression } from '../expressions/genericOperator'
+
+const plusHelper = (
+	leftExpression: IExpression,
+	rightExpression: IExpression
+) => {
+	const leftValue = leftExpression.eval()
+	const rightValue = rightExpression.eval()
+	if (
+		!(typeof leftValue === 'number' || typeof leftValue === 'boolean') ||
+		!(typeof rightValue === 'number' || typeof rightValue === 'boolean')
+	)
+		throw new Error(
+			`Cannot use numeric operators for expression "${leftValue} + ${rightValue}"`
+		)
+	//@ts-ignore
+	return leftValue + rightValue
+}
+const minusHelper = (
+	leftExpression: IExpression,
+	rightExpression: IExpression
+) => {
+	const leftValue = leftExpression.eval()
+	const rightValue = rightExpression.eval()
+	if (
+		!(typeof leftValue === 'number' || typeof leftValue === 'boolean') ||
+		!(typeof rightValue === 'number' || typeof rightValue === 'boolean')
+	)
+		throw new Error(
+			`Cannot use numeric operators for expression "${leftValue} - ${rightValue}"`
+		)
+	//@ts-ignore
+	return leftValue - rightValue
+}
+const divideHelper = (
+	leftExpression: IExpression,
+	rightExpression: IExpression
+) => {
+	const leftValue = leftExpression.eval()
+	const rightValue = rightExpression.eval()
+	if (
+		!(typeof leftValue === 'number' || typeof leftValue === 'boolean') ||
+		!(typeof rightValue === 'number' || typeof rightValue === 'boolean')
+	)
+		throw new Error(
+			`Cannot use numeric operators for expression "${leftValue} / ${rightValue}"`
+		)
+	//@ts-ignore
+	return leftValue / rightValue
+}
+const multiplyHelper = (
+	leftExpression: IExpression,
+	rightExpression: IExpression
+) => {
+	const leftValue = leftExpression.eval()
+	const rightValue = rightExpression.eval()
+	if (
+		!(typeof leftValue === 'number' || typeof leftValue === 'boolean') ||
+		!(typeof rightValue === 'number' || typeof rightValue === 'boolean')
+	)
+		throw new Error(
+			`Cannot use numeric operators for expression "${leftValue} * ${rightValue}"`
+		)
+	//@ts-ignore
+	return leftValue * rightValue
+}
+const assignHelper = (
+	leftExpression: IExpression,
+	rightExpression: IExpression
+) => {
+	if (leftExpression.setPointer) {
+		leftExpression.setPointer(rightExpression.eval())
+		return 0
+	} else {
+		throw Error(`Cannot assign to ${leftExpression.type}`)
+	}
+}
+
+export class BinaryOperator implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, leftExpression: IExpression, token: Token) {
+		const rightExpression = parser.parseExpression(this.precedence)
+		// return new AdditionExpression(leftExpression, rightExpression)
+
+		const tokenText = token.getText()
+
+		switch (tokenText) {
+			case '+':
+				return new GenericOperatorExpression(
+					leftExpression,
+					rightExpression,
+					tokenText,
+					plusHelper
+				)
+			case '-':
+				return new GenericOperatorExpression(
+					leftExpression,
+					rightExpression,
+					tokenText,
+					minusHelper
+				)
+			case '*':
+				return new GenericOperatorExpression(
+					leftExpression,
+					rightExpression,
+					tokenText,
+					multiplyHelper
+				)
+			case '/':
+				return new GenericOperatorExpression(
+					leftExpression,
+					rightExpression,
+					tokenText,
+					divideHelper
+				)
+			case '=': {
+				return new GenericOperatorExpression(
+					leftExpression,
+					rightExpression,
+					'=',
+					assignHelper
+				)
+			}
+
+			default:
+				throw new Error(`Operator not implemented`)
+		}
+	}
+}

packages/molang/src/parser/parselets/boolean.ts

@@ -0,0 +1,12 @@
+import { IPrefixParselet } from './prefix'
+import { Token } from '../../tokenizer/token'
+import { Parser } from '../parse'
+import { BooleanExpression } from '../expressions/boolean'
+
+export class BooleanParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		return new BooleanExpression(token.getText() === 'true')
+	}
+}

packages/molang/src/parser/parselets/break.ts

@@ -0,0 +1,12 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IPrefixParselet } from './prefix'
+import { BreakExpression } from '../expressions/break'
+
+export class BreakParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		return new BreakExpression()
+	}
+}

packages/molang/src/parser/parselets/continue.ts

@@ -0,0 +1,12 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IPrefixParselet } from './prefix'
+import { ContinueExpression } from '../expressions/continue'
+
+export class ContinueParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		return new ContinueExpression()
+	}
+}

packages/molang/src/parser/parselets/equals.ts

@@ -0,0 +1,19 @@
+import { Parser } from '../../parser/parse'
+import { Token } from '../../tokenizer/token'
+import { IExpression } from '../expression'
+import { GenericOperatorExpression } from '../expressions/genericOperator'
+import { IInfixParselet } from './infix'
+
+export class EqualsOperator implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, leftExpression: IExpression, token: Token) {
+		return new GenericOperatorExpression(
+			leftExpression,
+			parser.parseExpression(this.precedence),
+			'==',
+			(leftExpression: IExpression, rightExpression: IExpression) =>
+				leftExpression.eval() === rightExpression.eval()
+		)
+	}
+}

packages/molang/src/parser/parselets/forEach.ts

@@ -0,0 +1,29 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IPrefixParselet } from './prefix'
+import { IExpression } from '../expression'
+import { ForEachExpression } from '../expressions/forEach'
+
+export class ForEachParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		parser.consume('LEFT_PARENT')
+		const args: IExpression[] = []
+
+		if (parser.match('RIGHT_PARENT'))
+			throw new Error(`for_each() called without arguments`)
+
+		do {
+			args.push(parser.parseExpression())
+		} while (parser.match('COMMA'))
+		parser.consume('RIGHT_PARENT')
+
+		if (args.length !== 3)
+			throw new Error(
+				`There must be exactly three for_each() arguments; found ${args.length}`
+			)
+
+		return new ForEachExpression(args[0], args[1], args[2])
+	}
+}

packages/molang/src/parser/parselets/function.ts

@@ -0,0 +1,26 @@
+import { Token } from '../../tokenizer/token'
+import { Parser } from '../parse'
+import { IInfixParselet } from './infix'
+import { IExpression } from '../expression'
+import { FunctionExpression } from '../expressions/function'
+
+export class FunctionParselet implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, left: IExpression, token: Token) {
+		const args: IExpression[] = []
+
+		if (!left.setFunctionCall)
+			throw new Error(`${left.type} is not callable!`)
+		left.setFunctionCall(true)
+
+		if (!parser.match('RIGHT_PARENT')) {
+			do {
+				args.push(parser.parseExpression())
+			} while (parser.match('COMMA'))
+			parser.consume('RIGHT_PARENT')
+		}
+
+		return new FunctionExpression(left, args)
+	}
+}

packages/molang/src/parser/parselets/greaterOperator.ts

@@ -0,0 +1,31 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IExpression } from '../expression'
+import { GenericOperatorExpression } from '../expressions/genericOperator'
+import { IInfixParselet } from './infix'
+
+export class GreaterOperator implements IInfixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, leftExpression: IExpression, token: Token) {
+		if (parser.match('EQUALS'))
+			return new GenericOperatorExpression(
+				leftExpression,
+				parser.parseExpression(this.precedence),
+				'>=',
+				(leftExpression: IExpression, rightExpression: IExpression) =>
+					// @ts-ignore
+					leftExpression.eval() >= rightExpression.eval()
+			)
+		else {
+			return new GenericOperatorExpression(
+				leftExpression,
+				parser.parseExpression(this.precedence),
+				'>',
+				(leftExpression: IExpression, rightExpression: IExpression) =>
+					// @ts-ignore
+					leftExpression.eval() > rightExpression.eval()
+			)
+		}
+	}
+}

packages/molang/src/parser/parselets/groupParselet.ts

@@ -0,0 +1,18 @@
+import { IPrefixParselet } from './prefix'
+import { Token } from '../../tokenizer/token'
+import { Parser } from '../parse'
+import { GroupExpression } from '../expressions/group'
+
+export class GroupParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		const expression = parser.parseExpression(this.precedence)
+		parser.consume('RIGHT_PARENT')
+
+		if (parser.config.keepGroups)
+			return new GroupExpression(expression, '()')
+
+		return expression
+	}
+}

packages/molang/src/parser/parselets/infix.ts

@@ -0,0 +1,8 @@
+import { Parser } from '../parse'
+import { IExpression } from '../expression'
+import { Token } from '../../tokenizer/token'
+
+export interface IInfixParselet {
+	readonly precedence: number
+	parse: (parser: Parser, left: IExpression, token: Token) => IExpression
+}

packages/molang/src/parser/parselets/loop.ts

@@ -0,0 +1,29 @@
+import { Parser } from '../parse'
+import { Token } from '../../tokenizer/token'
+import { IPrefixParselet } from './prefix'
+import { IExpression } from '../expression'
+import { LoopExpression } from '../expressions/loop'
+
+export class LoopParselet implements IPrefixParselet {
+	constructor(public precedence = 0) {}
+
+	parse(parser: Parser, token: Token) {
+		parser.consume('LEFT_PARENT')
+		const args: IExpression[] = []
+
+		if (parser.match('RIGHT_PARENT'))
+			throw new Error(`loop() called without arguments`)
+
+		do {
+			args.push(parser.parseExpression())
+		} while (parser.match('COMMA'))
+		parser.consume('RIGHT_PARENT')
+
+		if (args.length !== 2)
+			throw new Error(
+				`There must be exactly two loop() arguments; found ${args.length}`
+			)
+
+		return new LoopExpression(args[0], args[1])
+	}
+}