ANDROID: file manager webui (wip)

chrisws · chrisws · commit b891bea85ab8 · 2022-07-15T20:51:08.000+10:00
diff --git a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/WebServer.java b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/WebServer.java
@@ -58,6 +58,7 @@ public void run() {
   protected abstract Response getResponse(String path, boolean asset) throws IOException;
   protected abstract void log(String message, Exception exception);
   protected abstract void log(String message);
+  protected abstract boolean saveFile(String fileName, String content);
 
   /**
    * Returns the HTTP headers from the given stream
@@ -204,35 +205,18 @@ private Response handleFileList() throws IOException {
   }
 
   /**
-   * Handler for GET requests
+   * Handler for file uploads
    */
-  private void handleGet(Socket socket, String token, List<String> headers, String url,
-                         Map<String, Collection<String>> parameters) throws IOException {
-    if (url.startsWith("/api/download?")) {
-      if (hasTokenCookie(headers, token)) {
-        handleDownload(parameters).send(socket, null);
-      }
-    } else {
-      handleWebResponse(url).send(socket, null);
-    }
-  }
-
-  /**
-   * Handler for POST requests
-   */
-  private void handlePost(Socket socket, String token, String url,
-                          Map<String, String> parameters) throws IOException {
-    String userToken = parameters.get(TOKEN);
-    log("userToken=" + userToken);
-    if (token.equals(userToken)) {
-      if (url.startsWith("/api/files")) {
-        handleFileList().send(socket, token);
-      }
-      log("Sent POST response");
-    } else {
-      log("Invalid token");
-      handleError("invalid token").send(socket, null);
-    }
+  private Response handleUpload(Map<String, String> parameters) throws UnsupportedEncodingException {
+    String fileName = parameters.get("fileName");
+    String content = parameters.get("data");
+    boolean result = saveFile(fileName, content);
+    JsonBuilder json = new JsonBuilder();
+    json.append('{');
+    json.append("success", Boolean.toString(result), false);
+    json.append('}');
+    byte[] output = json.getBytes();
+    return new Response(new ByteArrayInputStream(output), output.length);
   }
 
   /**
@@ -250,20 +234,6 @@ private Response handleWebResponse(String asset) throws IOException {
     return getResponse(path, true);
   }
 
-  /**
-   * Inspects the headers to ensure the token cookie is present
-   */
-  private boolean hasTokenCookie(List<String> headers, String token) {
-    boolean result = false;
-    for (String header : headers) {
-      if (header.startsWith("Cookie: ") && header.contains(TOKEN) && header.contains(token)) {
-        result = true;
-        break;
-      }
-    }
-    return result;
-  }
-
   /**
    * WebServer main loop to be run in a separate thread
    */
@@ -284,21 +254,8 @@ private void runServer(final int socketNum, final String token) throws IOExcepti
         socket = serverSocket.accept();
         log("Accepted connection from " + socket.getRemoteSocketAddress().toString());
         inputStream = new DataInputStream(socket.getInputStream());
-        List<String> headers = getHeaders(inputStream);
-        if (!headers.isEmpty()) {
-          String line = headers.get(0);
-          log(line);
-          String[] fields = line.split("\\s");
-          if ("GET".equals(fields[0]) && fields.length > 1) {
-            Map<String, Collection<String>> parameters = getParameters(fields[1]);
-            handleGet(socket, token, headers, fields[1], parameters);
-          } else if ("POST".equals(fields[0]) && fields.length > 1) {
-            Map<String, String> parameters = getPostData(inputStream, line);
-            handlePost(socket, token, fields[1], parameters);
-          } else {
-            log("Invalid request");
-          }
-        }
+        Request request = new Request(socket, getHeaders(inputStream));
+        request.invoke(inputStream, token);
       } catch (Throwable e) {
         log("Server failed");
         break;
@@ -371,6 +328,93 @@ byte[] getBytes() throws UnsupportedEncodingException {
     }
   }
 
+  /**
+   * Server Request
+   */
+  public class Request {
+    Socket socket;
+    String method;
+    String url;
+    String token;
+    List<String> headers;
+
+    public Request(Socket socket, List<String> headers) {
+      String[] fields = headers.get(0).split("\\s");
+      this.socket = socket;
+      this.headers = headers;
+      this.token = getToken(headers);
+      if (fields.length > 1) {
+        this.method = fields[0];
+        this.url = fields[1];
+      } else {
+        this.method = null;
+        this.url = null;
+      }
+    }
+
+    public void invoke(InputStream inputStream, String tokenKey) throws IOException {
+      if (!headers.isEmpty()) {
+        log(url);
+        if ("GET".equals(method)) {
+          handleGet(getParameters(url), tokenKey);
+        } else if ("POST".equals(method)) {
+          handlePost(getPostData(inputStream, url), tokenKey);
+        } else {
+          log("Invalid request");
+        }
+      }
+    }
+
+    private String getToken(List<String> headers) {
+      String result = null;
+      for (String header : headers) {
+        if (header.startsWith("cookie:")) {
+          String[] fields = header.split(":");
+          if (fields.length == 2) {
+            fields = fields[1].split("=");
+            if (fields.length == 2 && TOKEN.equals(fields[0].trim())) {
+              result = fields[1];
+              break;
+            }
+          }
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Handler for GET requests
+     */
+    private void handleGet(Map<String, Collection<String>> parameters, String tokenKey) throws IOException {
+      if (url.startsWith("/api/download?")) {
+        if (tokenKey.equals(token)) {
+          handleDownload(parameters).send(socket, null);
+        }
+      } else {
+        handleWebResponse(url).send(socket, null);
+      }
+    }
+
+    /**
+     * Handler for POST requests
+     */
+    private void handlePost(Map<String, String> parameters, String tokenKey) throws IOException {
+      String userToken = parameters.getOrDefault(TOKEN, token);
+      log("userToken=" + userToken);
+      if (tokenKey.equals(userToken)) {
+        if (url.startsWith("/api/files")) {
+          handleFileList().send(socket, token);
+        } else if (url.startsWith("/api/upload")) {
+          handleUpload(parameters).send(socket, token);
+        }
+        log("Sent POST response");
+      } else {
+        log("Invalid token");
+        handleError("invalid token").send(socket, null);
+      }
+    }
+  }
+
   /**
    * Server response data
    */
diff --git a/src/platform/android/webui/server/src/main/java/net/sourceforge/smallbasic/Server.java b/src/platform/android/webui/server/src/main/java/net/sourceforge/smallbasic/Server.java
@@ -49,6 +49,11 @@ protected void log(String message) {
         System.err.println(message);
       }
 
+      @Override
+      protected boolean saveFile(String fileName, String content) {
+        return true;
+      }
+
       @Override
       protected void log(String message, Exception exception) {
         System.err.println(message);
diff --git a/src/platform/android/webui/src/App.js b/src/platform/android/webui/src/App.js
@@ -1,5 +1,4 @@
 import {
-  useEffect,
   useState
 } from 'react';
 
@@ -22,7 +21,8 @@ import {
 } from '@mui/x-data-grid';
 
 import {
-  Download as DownloadIcon
+  Download as DownloadIcon,
+  Upload as UploadIcon
 } from '@mui/icons-material';
 
 import {
@@ -67,6 +67,40 @@ function getFetchHeader(body) {
   };
 }
 
+function getFiles(token, success, fail) {
+  fetch('/api/files', getFetchHeader("token=" + token))
+    .then(response => response.json())
+    .then(success)
+    .catch(fail);
+}
+
+function upload(name, data, success, fail) {
+  let body = "fileName=" + encodeURIComponent(name) + "&data=" + encodeURIComponent(data);
+  fetch('/api/upload', getFetchHeader(body))
+    .then(response => response.json())
+    .then(success)
+    .catch(fail);
+}
+
+function copyFiles(event, token, success, fail) {
+  const fileReader = new FileReader();
+  const input = event.target;
+  const files = input.files;
+  let index = 0;
+  fileReader.onload = () => {
+    upload(files[index].name, fileReader.result, () => {
+      if (++index < files.length) {
+        fileReader.readAsText(files[index]);
+      } else {
+        getFiles(token, success, fail);
+        // reset input control
+        input.value = input.defaultValue;
+      }
+    }, fail);
+  };
+  fileReader.readAsText(files[index]);
+}
+
 function GridToolbarDownload(props) {
   let color = useTheme().palette.primary.main;
   let args = "";
@@ -89,11 +123,31 @@ function GridToolbarDownload(props) {
   );
 }
 
+function GridToolbarUpload(props) {
+  const handleUpload = (event) => {
+    copyFiles(event, props.token, (newRows) => {
+      props.setRows(newRows);
+    }, (error) => {
+      // show toast message
+      console.log(error);
+    });
+  };
+
+  return (
+    <Button color="primary" size="small" component="label" sx={{marginLeft: '-4px'}}>
+      <input accept=".bas" hidden multiple type="file" onChange={handleUpload}/>
+      <UploadIcon />
+      UPLOAD
+    </Button>
+  );
+}
+
 function AppToolbar(props) {
   return (
     <GridToolbarContainer>
       <GridToolbarFilterButton />
       <GridToolbarDensitySelector />
+      <GridToolbarUpload {...props}/>
       <GridToolbarDownload {...props}/>
     </GridToolbarContainer>
   );
@@ -102,12 +156,19 @@ function AppToolbar(props) {
 function FileList(props) {
   const [selectionModel, setSelectionModel] = useState([]);
 
+  const toolbarProps = {
+    selections: selectionModel,
+    setRows: props.setRows,
+    rows: props.rows,
+    token: props.token,
+  };
+
   return (
     <DataGrid rows={props.rows}
               columns={columns}
               pageSize={5}
               components={{Toolbar: AppToolbar}}
-              componentsProps={{toolbar: {selections: selectionModel, rows: props.rows}}}
+              componentsProps={{toolbar: toolbarProps}}
               onSelectionModelChange={(model) => setSelectionModel(model)}
               selectionModel={selectionModel}
               rowsPerPageOptions={[5]}
@@ -121,19 +182,12 @@ function TokenInput(props) {
   const [error, setError] = useState(false);
 
   const onClick = () => {
-    const validate = async () => {
-      let response = await fetch('/api/files', getFetchHeader("token=" + token));
-      let data = await response.json();
-      if (data.error) {
-        setError(true);
-      } else {
-        props.setRows(data);
-        props.setToken(token);
-      }
-    };
-    if (token) {
-      validate().catch(console.error);
-    }
+    getFiles(token, (data) => {
+      props.setRows(data);
+      props.setToken(token);
+    }, () => {
+      setError(true);
+    });
   };
 
   const onChange = (event) => {
@@ -162,6 +216,7 @@ function TokenInput(props) {
                      onChange={onChange}
                      onKeyPress={onKeyPress}
                      helperText={helperText}
+                     autoFocus
                      label="Enter your access token"/>
         </Box>
         <Box>
@@ -178,7 +233,7 @@ export default function App() {
 
   let content;
   if (token) {
-    content = <FileList rows={rows}/>;
+    content = <FileList setRows={setRows} rows={rows} token={token} />;
   } else {
     content = <TokenInput setRows={setRows} setToken={setToken} token={token}/>;
   }
