Fixes for CC Tweaked

neumond · neumond · commit 280c134e08d6 · 2020-06-26T15:03:52.000+03:00
diff --git a/README.md b/README.md
@@ -1,19 +1,32 @@
 # Pythonized ComputerCraft API
 
-1. Create module named `examplemod.py`:
+1. Enable localhost in mod server config
+
+    In case of singleplayer it's located inside your saves folder.
+    In case of multiplayer check your server folder.
+
+    Edit `computercraft-server.toml`
+
+    ```toml
+    [[http.rules]]
+		host = "127.0.0.0/8"
+		action = "allow"  # change here deny to allow
+    ```
+
+2. Create module named `examplemod.py`:
 
     ```python
     async def hello(api):
         await api.print('Hello world!')
     ```
 
-2. Start a server:
+3. Start a server:
 
     ```bash
     python -m computercraft.server examplemod
     ```
 
-3. In minecraft, open up any computer and type:
+4. In minecraft, open up any computer and type:
 
     ```bash
     wget http://127.0.0.1:8080/ py
diff --git a/computercraft/back.lua b/computercraft/back.lua
@@ -67,13 +67,13 @@ local function event_queue(task_id, event)
 end
 
 local function fetch_fn()
-    local r = http.post(url..'start/'..os.getComputerID()..'/'..args[1]..'/')
+    local r = http.post(url..'start/'..os.getComputerID()..'/'..args[1]..'/', '')
     if (r == nil or r.getResponseCode() ~= 200) then
         print('Failed to start program '..args[1])
         return
     end
     while true do
-        r = http.post(url..'gettask/'..os.getComputerID()..'/', answer)
+        r = http.post(url..'gettask/'..os.getComputerID()..'/', '')
         if (r == nil or r.getResponseCode() ~= 200) then
             print('Connection broken')
             return
diff --git a/computercraft/server.py b/computercraft/server.py
@@ -193,9 +193,13 @@ async def taskresult(self, request):
     def backdoor(request):
         with open(LUA_FILE, 'r') as f:
             fcont = f.read()
+        h = request.host
+        if ':' not in h:
+            # fix for malformed Host header
+            h += ':{}'.format(request.app['port'])
         fcont = fcont.replace(
             "local url = 'http://127.0.0.1:4343/'",
-            "local url = '{}://{}/'".format(request.scheme, request.host)
+            "local url = '{}://{}/'".format(request.scheme, h)
         )
         return web.Response(text=fcont)
 
@@ -214,16 +218,16 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('module', help='Module used as source for programs')
     parser.add_argument('--host')
-    parser.add_argument('--port', type=int)
+    parser.add_argument('--port', type=int, default=8080)
     args = parser.parse_args()
 
     app_kw = {}
     if args.host is not None:
         app_kw['host'] = args.host
-    if args.port is not None:
-        app_kw['port'] = args.port
+    app_kw['port'] = args.port
 
     app = CCApplication()
+    app['port'] = args.port
     app.initialize(args.module)
     web.run_app(app, **app_kw)
 
