PyPI - mc-shell - Versions diffs - 0.9.2__tar.gz → 0.9.3__tar.gz - Mend

mc-shell 0.9.2tar.gz → 0.9.3tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (720) hide show

{mc_shell-0.9.2 → mc_shell-0.9.3}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mc-shell
-Version: 0.9.2
+Version: 0.9.3
 Summary: An interactive shell, Blockly editor and control for managing, programming and sharing Minecraft servers.
 License-File: LICENSE
 Author: Jeff

{mc_shell-0.9.2 → mc_shell-0.9.3}/mcshell/__init__.py RENAMED Viewed

@@ -1377,6 +1377,9 @@ class MCShell(Magics):
             # 6. Instantiate the Runner
             runner = module.BlocklyProgramRunner(actions, cancel_event=cancel_event)
+            # --- NEW: Create a mutable container to catch exceptions ---
+            task_error = []
             # 7. Define the Thread Execution Wrapper
             execution_id = f"debug_{file_hash}"
             def run_task():
@@ -1388,10 +1391,12 @@ class MCShell(Magics):
                         pass
                     elif isinstance(e, PermissionError):
                         print(f"\n[Access Denied] {e}")
+                        task_error.append(e)  # Record the failure
                     else:
                         import traceback
                         print(f"\n--- Error executing {execution_id}: {e} ---")
                         traceback.print_exc()
+                        task_error.append(e)  # Record the failure
                 finally:
                     # Automatically remove from running registry when done
                     if execution_id in RUNNING_POWERS:
@@ -1411,15 +1416,25 @@ class MCShell(Magics):
             # --- INSTANT FAILURE DETECTION ---
             # Wait briefly to see if the script immediately aborts (e.g., from a permission error)
-            thread.join(timeout=0.2)
+            thread.join(timeout=0.3)
-            # If the thread died OR the cancel event was tripped by a PermissionError inside a block wrapper
-            if not thread.is_alive() or cancel_event.is_set():
+            # Check our explicit error state, NOT just if the thread is dead
+            if task_error or cancel_event.is_set():
                 if execution_id in RUNNING_POWERS:
                     del RUNNING_POWERS[execution_id]
+                # Your TODO block will now work perfectly here!
+                broken_power_dir = pathlib.Path("./powers/blockcode/broken")
+                broken_power_dir.mkdir(parents=True, exist_ok=True)
+                broken_filepath = broken_power_dir / filename
+                print(f"Broken power saved to: {broken_filepath}")
+                # Move the file
+                import shutil
                 if filepath.exists():
-                    filepath.unlink()
-                # Suppress the success messages so the UI doesn't register it as running
+                    shutil.move(str(filepath), str(broken_filepath))
+                # Suppress the success messages
                 return
             print(f"Successfully saved power to: {filepath}")
@@ -1430,7 +1445,6 @@ class MCShell(Magics):
             print(f"MCED_EXECUTION_ID:{execution_id}")
             print(f"--- To stop it, run: %mc_cancel_power {execution_id} ---")
         except Exception as e:
             import traceback
             print(f"An unexpected error occurred during execution setup: {e}")

{mc_shell-0.9.2 → mc_shell-0.9.3}/mcshell/constants.py RENAMED Viewed

@@ -25,7 +25,7 @@ import pickle
 import time
 import sys
 import uuid
-from typing import List,Optional,Dict,Any
+from typing import List,Optional,Dict,Any,Union
 import threading
 import random
@@ -65,7 +65,6 @@ MC_SERVER_PORT = 25566
 MJ_PLUGIN_PORT = 4721
 MC_APP_PORT = 5001
 MC_SERVER_DATA = {
     'host':MC_SERVER_HOST,
     'port':MC_SERVER_PORT,

{mc_shell-0.9.2 → mc_shell-0.9.3}/mcshell/data/app/index.html RENAMED Viewed

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html lang=en><script type=importmap>{"imports":{"2N3MJ":"/toolbox.f6677982.xml"}}</script><link rel=stylesheet href=/mced.efd4d8e7.css><meta charset=utf-8><title>MC-ED Editor</title><script>const params=new URLSearchParams(window.location.search),auth=params.get("auth");if(auth){sessionStorage.setItem("GUI_AUTH_TOKEN",auth);const t=window.location.protocol+"//"+window.location.host+window.location.pathname;window.history.replaceState({path:t},"",t)}const{fetch:originalFetch}=window;window.fetch=async(...t)=>{let[e,a]=t;if(new URL(e instanceof Request?e.url:e.toString(),window.location.origin).pathname.startsWith("/api/")){(a=a||{}).headers=a.headers||{};let e=sessionStorage.getItem("GUI_AUTH_TOKEN");e&&(a.headers instanceof Headers?a.headers.set("Authorization","Bearer "+e):a.headers.Authorization="Bearer "+e),t[1]=a}return originalFetch(...t)};</script><script src=https://cdn.socket.io/4.7.2/socket.io.min.js></script><style>[x-cloak]{display:none!important}.lobby-overlay{z-index:50000;background:#000000e6;justify-content:center;align-items:center;display:flex;position:fixed;inset:0}.lobby-card{text-align:center;color:#fff;background:#2c2c2e;border-radius:12px;width:90%;max-width:450px;padding:2rem;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,sans-serif;box-shadow:0 4px 6px #0000004d}.lobby-input{color:#fff;box-sizing:border-box;background:#1c1c1e;border:1px solid #444;border-radius:8px;width:100%;margin:15px 0;padding:12px}.lobby-btn{color:#fff;cursor:pointer;background:#0a84ff;border:none;border-radius:8px;width:100%;margin-bottom:10px;padding:12px;font-weight:700}</style><link rel=stylesheet href=/mced.f25b9962.css><body x-data=EditorApp()>
+<!DOCTYPE html><html lang=en><script type=importmap>{"imports":{"2N3MJ":"/toolbox.7ac19860.xml"}}</script><link rel=stylesheet href=/mced.efd4d8e7.css><meta charset=utf-8><title>MC-ED Editor</title><script>const params=new URLSearchParams(window.location.search),auth=params.get("auth");if(auth){sessionStorage.setItem("GUI_AUTH_TOKEN",auth);const t=window.location.protocol+"//"+window.location.host+window.location.pathname;window.history.replaceState({path:t},"",t)}const{fetch:originalFetch}=window;window.fetch=async(...t)=>{let[e,a]=t;if(new URL(e instanceof Request?e.url:e.toString(),window.location.origin).pathname.startsWith("/api/")){(a=a||{}).headers=a.headers||{};let e=sessionStorage.getItem("GUI_AUTH_TOKEN");e&&(a.headers instanceof Headers?a.headers.set("Authorization","Bearer "+e):a.headers.Authorization="Bearer "+e),t[1]=a}return originalFetch(...t)};</script><script src=https://cdn.socket.io/4.7.2/socket.io.min.js></script><style>[x-cloak]{display:none!important}.lobby-overlay{z-index:50000;background:#000000e6;justify-content:center;align-items:center;display:flex;position:fixed;inset:0}.lobby-card{text-align:center;color:#fff;background:#2c2c2e;border-radius:12px;width:90%;max-width:450px;padding:2rem;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,sans-serif;box-shadow:0 4px 6px #0000004d}.lobby-input{color:#fff;box-sizing:border-box;background:#1c1c1e;border:1px solid #444;border-radius:8px;width:100%;margin:15px 0;padding:12px}.lobby-btn{color:#fff;cursor:pointer;background:#0a84ff;border:none;border-radius:8px;width:100%;margin-bottom:10px;padding:12px;font-weight:700}</style><link rel=stylesheet href=/mced.f25b9962.css><body x-data=EditorApp()>
             <div x-cloak x-show="['standby', 'unauthorized', 'terminated'].includes(lobbyState)" class=lobby-overlay>
@@ -164,7 +164,7 @@
             </div>
         </template>
-        <script type=module src=/mced.39dda5d3.js></script>
+        <script type=module src=/mced.b50e98b5.js></script>
         <script>document.addEventListener("alpine:init",()=>{Alpine.data("EditorApp",()=>({isLibraryCollapsed:!0,isCodeCollapsed:!0,keyboardVisible:!1,lobbyState:"loading",lobbyData:null,joinToken:"",joinError:"",isJoining:!1,isSwitchingPorts:!1,init(){this.checkLobbyState();let t=io();t.on("state_changed",t=>{if(t&&"terminated"===t.status){if(this.isJoining||this.isSwitchingPorts)return;this.lobbyState="terminated";return}this.isJoining||this.isSwitchingPorts||this.checkLobbyState()}),t.on("port_switch",t=>{this.isSwitchingPorts=!0,this.isJoining=!0;let i=String(t.new_port);if(i!==(window.location.port||("https:"===window.location.protocol?"443":"80"))){let t=async()=>{try{let t=`${window.location.protocol}//${window.location.hostname}:${i}/api/lobby_data`;await fetch(t,{method:"GET",mode:"no-cors"});let o=sessionStorage.getItem("GUI_AUTH_TOKEN")||"";window.location.href=`${window.location.protocol}//${window.location.hostname}:${i}/?auth=${o}`}catch(i){setTimeout(t,500)}};setTimeout(t,1e3)}}),t.on("reload",()=>{this.isSwitchingPorts||window.location.reload()})},async checkLobbyState(){try{let t=await fetch("/api/lobby_data",{cache:"no-store"});if(t.ok){let i=await t.json(),o=this.lobbyState;this.lobbyState=i.status,this.lobbyData=i,"active"===i.status&&"standby"===o?window.location.href="/":"standby"===i.status&&"active"===o&&window.location.reload()}else this.lobbyState="standby"}catch(t){console.error("Failed to fetch lobby state",t),this.lobbyState="standby"}},async joinWorld(){if(this.joinError="",!this.joinToken.trim()){this.joinError="Please enter a valid token.";return}this.isJoining=!0;try{let t=await fetch("/api/join_world",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify({token:this.joinToken.trim()})});if(t.ok){let i=await t.json();i.gui_token&&sessionStorage.setItem("GUI_AUTH_TOKEN",i.gui_token),this.isSwitchingPorts||(window.location.href="/")}else{this.isJoining=!1;let i=await t.json().catch(()=>({}));this.joinError=i.error||"Failed to connect. Server rejected request."}}catch(t){if(this.isSwitchingPorts)return;this.isJoining=!1,this.joinError="Network error while joining.",console.error(t)}},openControlDeck(){let t=sessionStorage.getItem("GUI_AUTH_TOKEN")||"";window.open(`/control?auth=${t}`,"_blank")}}))});</script>

mc-shell 0.9.2__tar.gz → 0.9.3__tar.gz

mc-shell 0.9.2tar.gz → 0.9.3tar.gz