Merge pull request #3 from Con-JS-Development/development

conmaster2112 · web-flow · commit abce184e0973 · 2023-05-30T09:47:19.000+02:00
Release Beta 1.0.0
diff --git a/behavior_pack/functions/disable.mcfunction b/behavior_pack/functions/disable.mcfunction
@@ -0,0 +1 @@
+scriptevent con:terminal_disable
diff --git a/behavior_pack/functions/enable.mcfunction b/behavior_pack/functions/enable.mcfunction
@@ -0,0 +1 @@
+scriptevent con:terminal_enable
diff --git a/behavior_pack/manifest.json b/behavior_pack/manifest.json
@@ -2,10 +2,10 @@
 	"format_version": 2,
 	"header": {
 		"name": "Con JS Terminal",
-		"description": "Terminal with JS input by ConMaster2112",
+		"description": "Terminal with JS prompts by ConMaster2112",
 		"uuid": "4997eb94-8968-4158-864b-74f1999192f7",
-		"version": "0.1.1-alpha",
-		"min_engine_version": [1, 20, 0]
+		"version": "1.0.0-beta",
+		"min_engine_version": [1, 20, 10]
 	},
 	"modules": [
 		{
@@ -16,7 +16,7 @@
 		}
 	],
 	"dependencies": [
-		{"module_name": "@minecraft/server","version": "1.3.0-beta"},
+		{"module_name": "@minecraft/server","version": "1.4.0-beta"},
         {"module_name": "@minecraft/server-ui","version": "1.1.0-beta"},
         {"module_name": "@minecraft/server-gametest","version": "1.0.0-beta"}
 	],
diff --git a/behavior_pack/scripts/con-terminal.d.ts b/behavior_pack/scripts/con-terminal.d.ts
@@ -0,0 +1,17 @@
+export declare enum OutputType {
+    SyntaxError = 0,
+    Error = 1,
+    Successfull = 2
+}
+export declare enum LogTypes {
+    log = 0,
+    error = 1,
+    warn = 2
+}
+export declare function TerminalInput<s>(source: s, message: string, scope?: never[], o?: (this: s, type: LogTypes, ...params: any[]) => void): Promise<{
+    type: OutputType;
+    value: any;
+    formatView: string;
+    multicommand: boolean;
+    startTime: number;
+}>;
diff --git a/behavior_pack/scripts/con-terminal.js b/behavior_pack/scripts/con-terminal.js
@@ -1,4 +1,5 @@
-import { system} from "@minecraft/server";
+import { system } from "@minecraft/server";
+const symbolError = Symbol("RunError");
 const AsyncFunctionConstructor = (async function () { }).constructor;
 const GeneratorFunctionConstructor = (function* () { }).constructor;
 const AsyncGeneratorFunctionConstructor = (async function* () { }).constructor;
@@ -25,13 +26,13 @@ const MinecraftModules = [
     { module_name: "@minecraft/server-editor", tag: "editor" },
     { module_name: "@minecraft/server-editor-bindings", tag: "bindings" }
 ];
-var OutputType;
+export var OutputType;
 (function (OutputType) {
     OutputType[OutputType["SyntaxError"] = 0] = "SyntaxError";
     OutputType[OutputType["Error"] = 1] = "Error";
     OutputType[OutputType["Successfull"] = 2] = "Successfull";
 })(OutputType || (OutputType = {}));
-var LogTypes;
+export var LogTypes;
 (function (LogTypes) {
     LogTypes[LogTypes["log"] = 0] = "log";
     LogTypes[LogTypes["error"] = 1] = "error";
@@ -45,19 +46,15 @@ function consoleLike(type, ...texts) {
 function formatView(type, object) {
     return getView[typeof object](ViewStyle.Full, object);
 }
-export async function TerminalInput(source, message, o = consoleLike) {
-    const a = await RunCode(message, true, { console: { log: o.bind(source, LogTypes.log), warn: o.bind(source, LogTypes.warn), error: o.bind(source, LogTypes.error) }, print: o.bind(source, LogTypes.log), self: source, setTimeout, setInterval, clearInterval: clearRun, clearTimeout: clearRun });
-    const multicommand = a.multicommand;
+export async function TerminalInput(source, message, scope = [], o = consoleLike) {
+    const a = await RunCode(message, true, { console: { log: o.bind(source, LogTypes.log), Map, Set, warn: o.bind(source, LogTypes.warn), error: o.bind(source, LogTypes.error) }, print: o.bind(source, LogTypes.log), self: source, setTimeout, setInterval, clearInterval: clearRun, clearTimeout: clearRun }, ...scope);
+    const { multicommand, startTime } = a;
     if (a.syntaxError)
-        return { type: OutputType.SyntaxError, value: a.syntaxError, formatView: formatView(OutputType.SyntaxError, a.syntaxError), multicommand };
-    try {
-        const output = await a.promise;
-        return { type: OutputType.Successfull, value: output, formatView: formatView(OutputType.Successfull, output), multicommand };
-    }
-    catch (error) {
-        console.warn("It was handled xd, but after the promise returns");
-        return { type: OutputType.Error, value: error, formatView: formatView(OutputType.Error, error), multicommand };
-    }
+        return { type: OutputType.SyntaxError, value: a.syntaxError, formatView: formatView(OutputType.SyntaxError, a.syntaxError), multicommand, startTime };
+    const output = await a.promise;
+    if (typeof output === "object" && output !== null && symbolError in output)
+        return { type: OutputType.Error, value: output[symbolError], formatView: formatView(OutputType.Error, output[symbolError]), multicommand, startTime };
+    return { type: OutputType.Successfull, value: output, formatView: formatView(OutputType.Successfull, output), multicommand, startTime };
 }
 async function RunCode(code, useModules = true, ...scopes) {
     let func, output = { syntaxError: undefined, promise: undefined, multicommand: false };
@@ -71,12 +68,13 @@ async function RunCode(code, useModules = true, ...scopes) {
         return output;
     }
     output.multicommand = func.multicommand ?? false;
-    output.promise = func();
+    output.startTime = Date.now();
+    output.promise = Promise.resolve(func()).catch(er => ({ [symbolError]: er }));
     return output;
 }
 async function BuildAPIScope(...modules) {
     let promises = [];
-    modules.forEach(m => promises.push(import(m.module_name).catch(() => ({}))));
+    modules.forEach(m => promises.push(import(m.module_name).catch(() => null)));
     const dlls = await Promise.all(promises);
     return dlls.map((m, i) => ({ [modules[i].tag]: m }));
 }
@@ -115,7 +113,22 @@ const getView = {
         else if (style === ViewStyle.Short) {
             const names = Object.getOwnPropertyNames(any), symbols = Object.getOwnPropertySymbols(any);
             //@ts-ignore
-            const keys = names.map(k => `§7${k}§r§7: ${getView[typeof any[k]](ViewStyle.Primitive, any[k])}§r`).concat(symbols.map(s => `§r${getView["symbol"](ViewStyle.Primitive, s)}§r§7: ${getView[typeof any[s]](ViewStyle.Primitive, any[s])}`));
+            const keys = names.map(k => {
+                try {
+                    return `§7${k}§r§7: ${getView[typeof any[k]](ViewStyle.Primitive, any[k])}§r`;
+                }
+                catch (error) {
+                    return `§7${k}§r§7: §o(...)§r`;
+                }
+            }).concat(symbols.map(s => {
+                try {
+                    return `§r${getView["symbol"](ViewStyle.Primitive, s)}§r§7: ${getView[typeof any[s]](ViewStyle.Primitive, any[s])}`;
+                }
+                catch (error) {
+                    return `§r${getView["symbol"](ViewStyle.Primitive, s)}§r§7: §o(...)§r`;
+                }
+            }));
+            Object.getOwnPropertyDescriptor;
             const realKeys = keys.slice(0, 5), typeOf = getTypeOfObject(any);
             return `§7${(typeOf == "Object" || typeOf == '') ? "" : typeOf + " "}{${realKeys.join("§7, ")}${keys.length > 5 ? "§r§7, ..." : "§r§7"}}`;
         }
@@ -165,11 +178,17 @@ function buildCompoudView(array, base, object, offSet = "  ", func = false, deep
         }
         else {
             if (get != undefined) {
-                const v = get.call(base);
-                array.push(`${off}§r§7get§r ${typeof key == "string" ? key : getView["symbol"](ViewStyle.Primitive, key)}§7: §r${getView[typeof v](ViewStyle.Short, v)}§r`);
+                let v;
+                try {
+                    v = get.call(base);
+                    array.push(`${off}§r§7get§r ${typeof key == "string" ? key : getView["symbol"](ViewStyle.Primitive, key)}§7: §r${getView[typeof v](ViewStyle.Short, v)}§r`);
+                }
+                catch (error) {
+                    array.push(`${off}§r§7get§r ${typeof key == "string" ? key : getView["symbol"](ViewStyle.Primitive, key)}§7: §o(...)§r`);
+                }
             }
             if (set != undefined)
-                array.push(`${off}§r§7set§r ${typeof key == "string" ? key : getView["symbol"](ViewStyle.Primitive, key)}§7: (...)§r`);
+                array.push(`${off}§r§7set§r ${typeof key == "string" ? key : getView["symbol"](ViewStyle.Primitive, key)}§7: §o(...)§r`);
         }
     }
     if (func)
@@ -182,6 +201,87 @@ function buildCompoudView(array, base, object, offSet = "  ", func = false, deep
         buildCompoudView(array, base, prototype, offSet, typeof prototype === 'function', deepth + 1);
     return array;
 }
+/*
+export function toStringPrimitiveFull(any){
+    switch (typeof any) {
+        case 'object':
+            if(any === null){
+                return "§7§onull";
+            }else if (any instanceof Error) {
+                return `§6${any}\n${any.stack}`;
+            }else{
+                const base = any, names = Object.getOwnPropertyNames(base), symbols = Object.getOwnPropertySymbols(base);
+                const keys = names.filter(a=>(base.__lookupGetter__?.(a) == undefined && base.__lookupSetter__?.(a) == undefined)).map(k=>`§7${k}§r§7: ${toStringPrimitiveShort(base[k])}§r`).concat(symbols.map(s=>`§r${toStringPrimitiveShort(s)}§r§7: ${toStringPrimitiveShort(base[s])}`));
+                const realKeys = keys.slice(0,5), typeOf = getTypeOfObject(base);
+                let output = `§7${(typeOf == "Object" || typeOf == '')?"":typeOf + " "}{${realKeys.join("§7, ")}${keys.length>5?"§r§7, ...":"§r§7"}}§r`;
+                function buildLines(base, offSet = "  "){
+                    const prototype = Object.getPrototypeOf(base);
+                    for (const keyName of Object.getOwnPropertyNames(base)) {
+                        let getter = base.__lookupGetter__?.(keyName);
+                        let setter = base.__lookupSetter__?.(keyName);
+                        if(getter == undefined&&setter == undefined){
+                            output += `\n${offSet}§r${keyName}§7: §r${toStringPrimitive(base[keyName])}`;
+                        } else {
+                            if(getter != undefined) output += `\n${offSet}§7get§r ${keyName}§7: (...)`;
+                            if(setter != undefined) output += `\n${offSet}§7set§r ${keyName}§7: (...)`;
+                        }
+                    }
+                    for (const keySymbol of Object.getOwnPropertySymbols(base)){
+                        let getter = base.__lookupGetter__?.(keySymbol);
+                        let setter = base.__lookupSetter__?.(keySymbol);
+                        if(getter == undefined&&setter == undefined){
+                            output += `\n${offSet}§r${toStringPrimitiveShort(keySymbol)}§7: §r${toStringPrimitive(base[keySymbol])}`;
+                        } else {
+                            if(getter != undefined) output += `\n${offSet}§7get§r ${toStringPrimitiveShort(keySymbol)}§7: (...)`;
+                            if(setter != undefined) output += `\n${offSet}§7set§r ${toStringPrimitiveShort(keySymbol)}§7: (...)`;
+                        }
+                    }
+                    if(prototype != null){
+                        const typOf = getTypeOfObject(prototype);
+                        output += `\n${offSet}§r[[Prototype]]§r§7: ` + (typOf==""?"Object":typOf)
+                        if(prototype != Object.prototype && prototype != Array.prototype && prototype != Map.prototype){
+                            buildLines(prototype, offSet + "  ");
+                        }
+                    }
+                }
+                buildLines(base);
+                return output;
+            }
+        case 'function': return any.toString();
+        case 'symbol': return `§7Symbol(${any.description})`;
+        case 'bigint':
+        case 'number':
+        case 'boolean': return `§3${any.toString()}§r`;
+        case 'undefined': return "§7§oundefined";
+        case 'string': return `§3"${any}"§r`;
+        default:
+            break;
+    }
+}
+export function toStringPrimitive(any: any){
+    switch (typeof any) {
+        case 'object':
+            if(any === null){
+                return "§7§onull§r";
+            }else if (any instanceof Error) {
+                return `§6${any}§r`;
+            }else{
+                const base = any, names = Object.getOwnPropertyNames(base), symbols = Object.getOwnPropertySymbols(base);
+                const keys = names.map(k=>`§7${k}§r§7: ${toStringPrimitiveShort(base[k])}§r`).concat(symbols.map(s=>`§r${toStringPrimitiveShort(s)}§r§7: ${toStringPrimitiveShort(base[s])}`));
+                const realKeys = keys.slice(0,5), typeOf = getTypeOfObject(base);
+                return `§7${(typeOf == "Object" || typeOf == '')?"":typeOf + " "}{${realKeys.join("§7, ")}${keys.length>5?"§r§7, ...":"§r§7"}}`;
+            }
+        case 'function': return toFunctionString(any);
+        case 'symbol': return `Symbol(${any.description})`;
+        case 'bigint':
+        case 'number':
+        case 'boolean': return `§3${any.toString()}§r`;
+        case 'undefined': return "§7§oundefined";
+        case 'string': return `§6"${any}"§r`;
+        default:
+            break;
+    }
+}*/
 function getTypeOfObject(obj) { return (obj[Symbol.toStringTag] ?? ((typeof obj === "function" ? obj.name : undefined) ?? ((obj.constructor?.prototype == obj ? obj.constructor?.name : obj.__proto__?.constructor?.name) ?? ""))); }
 //@ts-ignore
 globalThis[Symbol.toStringTag] = 'GlobalThis';
diff --git a/behavior_pack/scripts/index.js b/behavior_pack/scripts/index.js
@@ -1,12 +1,40 @@
-import { world } from "@minecraft/server";
-import { TerminalInput } from "./con-terminal";
+import { DynamicPropertiesDefinition, MessageSourceType, MinecraftEntityTypes, system, world } from "@minecraft/server";
+import { OutputType, TerminalInput } from "./con-terminal";
+
+const propertyName = "allow_terminal";
 
 world.beforeEvents.chatSend.subscribe(async (ev) => {
-    const { sender, message } = ev;
-    if (message.startsWith('>') && sender.isOp()) {
+    const { sender, message } = ev, reg = message.match(/^( +|)>( +|)/g);
+    if (reg !== null && sender.isOp() && sender.getDynamicProperty(propertyName)) {
         ev.cancel = true;
-        await null;
-        const out = await TerminalInput(sender, message.substring(1));
-        sender.sendMessage(out.formatView);
+        const code = message.substring(reg[0].length);
+        const task = TerminalInput(sender, code,[{system,world,beforeEvents:world.beforeEvents,afterEvents:world.afterEvents,systemEvents:system.events}]).catch(er=>console.error(er,er.stack));
+        sender.sendMessage("  §l§h> §r§7" + code);
+        const out = await task;
+        switch (out.type) {
+            case OutputType.Successfull:
+            case 2:
+                return sender.sendMessage("  §l§q< §r" + out.formatView.replaceAll("\n", "\n    "));
+            case OutputType.SyntaxError:
+            case 0:
+                return sender.sendMessage("  §l§4> §6" + out.value.message);
+            case OutputType.Error:
+            case 1:
+                return sender.sendMessage("  §l§6< §7" + out.value);                                                                     
+            default:
+                break;
+        }
+    }
+});
+world.afterEvents.worldInitialize.subscribe(ev=>ev.propertyRegistry.registerEntityTypeDynamicProperties(new DynamicPropertiesDefinition().defineBoolean(propertyName,false),MinecraftEntityTypes.player))
+system.events.scriptEventReceive.subscribe(ev=>{
+    if(ev.sourceType !== MessageSourceType.clientScript || ev.sourceEntity == null) return;
+    if(ev.id === "con:terminal_enable") {
+        ev.sourceEntity.setDynamicProperty(propertyName, true);
+        ev.sourceEntity.sendMessage("You are now able to use terminal.");
+    }
+    if(ev.id === "con:terminal_disable") {
+        ev.sourceEntity.setDynamicProperty(propertyName, false);
+        ev.sourceEntity.sendMessage("You are no longer able to use terminal.");
     }
-});
+},{namespaces:["con"]});
diff --git a/con-terminal.ts b/con-terminal.ts
diff --git a/package.json b/package.json
diff --git a/tsconfig.json b/tsconfig.json
