2410191208

app.py

@@ -1,8 +1,9 @@
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
-from fastapi import APIRouter, FastAPI
+from fastapi import FastAPI, APIRouter
 import base64, json, zipfile, uvicorn
 from strgen import StringGenerator
+from pydantic import BaseModel
 from pathlib import Path
 from io import BytesIO
 from PIL import Image
@@ -11,12 +12,7 @@ app = FastAPI()
 
 app.add_middleware(
     CORSMiddleware,
-    allow_origins=[
-        "http://localhost:3000",
-        "http://localhost:8000",
-        "http://127.0.0.1:3000",
-        "http://127.0.0.1:8000",
-    ],
+    allow_origins=["*"],
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
@@ -24,8 +20,11 @@ app.add_middleware(
 
 router = APIRouter()
 
+class TextRequest(BaseModel): text: str
+
 @router.post('/save')
-def save(data):
+async def save(req_data: TextRequest):
+    data = json.loads(req_data.text)
     zip_buffer = BytesIO()
     
     with zipfile.ZipFile(zip_buffer, 'w') as zip_file:
@@ -41,8 +40,8 @@ def save(data):
     return base64.b64encode(zip_buffer.getvalue()).decode('utf-8')
 
 @router.post('/load')
-def load(zip_data):
-    zip_buffer = BytesIO(base64.b64decode(zip_data))
+async def load(zip_data: TextRequest):
+    zip_buffer = BytesIO(base64.b64decode(zip_data.text))
     data = []
     with zipfile.ZipFile(zip_buffer, 'r') as zip_file:
         data.append(zip_file.open('data.xml').read().decode('utf-8'))
@@ -58,8 +57,8 @@ def load(zip_data):
     return data
 
 @router.post('/sb3')
-def sb3(data):
-    # まず、mmp4.zipからproject.jsonを読み込む
+async def sb3(req_data: TextRequest):
+    data = json.loads(req_data.text)
     with zipfile.ZipFile('mmp4.zip', 'r') as template_zip:
         with template_zip.open('project.json') as f:
             project = json.loads(f.read().decode('utf-8'))
@@ -112,8 +111,8 @@ def sb3(data):
 
     return sb3_base64
 
-app.include_router(router, prefix="/api")
+app.include_router(router, prefix='/api')
 
-if __name__ == "__main__":
-    app.mount("/", StaticFiles(directory=Path('public'), html=True), name='public')
-    uvicorn.run(app, host="0.0.0.0", port=7860)
+if __name__ == '__main__':
+    app.mount('/', StaticFiles(directory=Path('public'), html=True), name='public')
+    uvicorn.run(app, host='0.0.0.0', port=7860)

public/script.js

@@ -118,10 +118,12 @@ const addCos = () => {
 }
 
 const sb3 = async () => {
-    fetch(`/sb3`, {
+    fetch(`/api/sb3`, {
         method: `POST`,
-        body: JSON.stringify([Blockly.JavaScript.workspaceToCode(workspace).split('$')[1], ...costumes])
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ text: JSON.stringify([Blockly.JavaScript.workspaceToCode(workspace).split('$')[1], ...costumes]) })
     })
+        .then(data => data.json())
         .then(sb3Base64 => {
             const sb3Data = Uint8Array.from(atob(sb3Base64), c => c.charCodeAt(0));
 
@@ -133,10 +135,12 @@ const sb3 = async () => {
 };
 
 const save = async () => {
-    fetch(`/save`, {
+    fetch(`/api/save`, {
         method: `POST`,
-        body: JSON.stringify([Blockly.JavaScript.workspaceToCode(workspace).split('$')[1], ...costumes])
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ text: JSON.stringify([Blockly.Xml.domToText(Blockly.Xml.workspaceToDom(workspace)), Blockly.JavaScript.workspaceToCode(workspace), ...costumes]) })
     })
+        .then(data => data.json())
         .then(base64Zip => {
             const zipData = Uint8Array.from(atob(base64Zip), c => c.charCodeAt(0));
 
@@ -156,10 +160,12 @@ const load = async () => {
         const fileReader = new FileReader();
         fileReader.addEventListener(`load`, async () => {
             const base64Data = btoa(String.fromCharCode.apply(null, new Uint8Array(fileReader.result)));
-            fetch(`/load`, {
-                method: `POST`,
-                body: base64Data
+            fetch(`/api/load`, {
+                method: `post`,
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({ text: base64Data })
             })
+                .then(res => res.json())
                 .then(data => {
                     const dom = (new DOMParser()).parseFromString(data[0], `application/xml`);
                     workspace.clear();