Merge pull request #65 from fullstackedorg/android

Android

README.md

@@ -34,8 +34,8 @@ Use some of the most popular tools to rapidly build.
 Available on
 
 -   iOS/iPadOS
+-   Android
 -   MacOS
 -   Windows
 -   Linux
 -   Docker
--   Android `Soon`

build.ts

@@ -29,7 +29,7 @@ if (textBlockToUpdate) {
     throw "Could not find typescript code block to patch.";
 }
 
-const baseFile = "src/js/index.js";
+const baseFile = "src/js/base.js";
 
 esbuild.buildSync({
     entryPoints: ["src/index.ts"],

editor/api/connectivity/index.ts

@@ -151,7 +151,7 @@ const connectivityAPI = {
             ]
                 .flat()
                 .filter(({ peer: { id } }) => {
-                    if (seenPeerID.has(id)) return false;
+                    if (id === me.id || seenPeerID.has(id)) return false;
                     seenPeerID.add(id);
                     return true;
                 });
@@ -226,7 +226,7 @@ const connectivityAPI = {
             rpc().connectivity.advertise.stop();
         }
     },
-    async connect(peerNearby: PeerNearby) {
+    async connect(peerNearby: PeerNearby, verifyAlive = true) {
         for (const peerConnection of peersConnections.values()) {
             // already connected or in the process of connecting
             if (peerConnection.peer?.id === peerNearby.peer?.id) return;
@@ -236,8 +236,7 @@ const connectivityAPI = {
         switch (peerNearby.type) {
             case PEER_ADVERSTISING_METHOD.WEB:
             case PEER_ADVERSTISING_METHOD.BONJOUR:
-                const alive = await verifyWSS(peerNearby);
-                if (!alive) return;
+                if (verifyAlive && !(await verifyWSS(peerNearby))) return;
                 id = crypto.randomUUID();
                 connecterWebSocket.open(id, peerNearby);
                 break;

editor/api/projects/index.ts

@@ -65,8 +65,8 @@ export default {
         const zipFilename = project.title.replace(/\//, "-") + ".zip";
         const out = project.location + "/" + zipFilename;
 
-        if (await rpc().fs.exists(out)) {
-            await rpc().fs.unlink(out);
+        if (await rpc().fs.exists(out, { absolutePath: true })) {
+            await rpc().fs.unlink(out, { absolutePath: true });
         }
 
         const zipData = await zipDirectory(

editor/index.scss

@@ -94,7 +94,7 @@ a {
 }
 
 #splash {
-    height: 100dvh;
+    height: 100vh;
     width: 100%;
     display: flex;
     align-items: center;

editor/packages/installer.ts

@@ -190,7 +190,7 @@ export class PackageInstaller {
                 PackageInstaller.updateProgress(pacakgeInfo.name, {
                     progress: 0,
                     total: -1,
-                    error
+                    error: JSON.stringify(error)
                 });
                 pacakgeInfo.errored = error;
             }

editor/typescript/index.ts

@@ -51,8 +51,20 @@ export class tsWorker {
         this.worker = new Worker("worker-ts.js", { type: "module" });
         this.worker.onmessage = (message) => {
             if (message.data.ready) {
-                this.isReady = true;
-                this.readyAwaiter.forEach((resolve) => resolve());
+                rpc()
+                    .platform()
+                    .then((platform) => {
+                        this.worker.postMessage({ platform });
+                        this.isReady = true;
+                        this.readyAwaiter.forEach((resolve) => resolve());
+                    });
+                return;
+            }
+
+            if (message.data.body) {
+                const { id, body } = message.data;
+                (globalThis as any).Android?.passRequestBody(id, body);
+                this.worker.postMessage({ request_id: id });
                 return;
             }
 

editor/typescript/worker.ts

@@ -15,6 +15,7 @@ import {
 import type { AdapterEditor } from "../rpc";
 import type { rpcSync as rpcSyncFn } from "../../src/index";
 import type rpcFn from "../../src/index";
+import { bindPassRequestBody } from "../../src/android";
 
 const rpc = globalThis.rpc as typeof rpcFn<AdapterEditor>;
 const rpcSync = globalThis.rpcSync as typeof rpcSyncFn<AdapterEditor>;
@@ -34,7 +35,29 @@ function removeSourceObjects(obj: any) {
     return obj;
 }
 
+const passingBodyToMainThread = new Map<number, () => void>();
+
 self.onmessage = (message: MessageEvent) => {
+    if (message.data.request_id) {
+        const resolve = passingBodyToMainThread.get(message.data.request_id);
+        resolve?.();
+        passingBodyToMainThread.delete(message.data.request_id);
+        return;
+    }
+
+    if (message.data.platform) {
+        if (message.data.platform === "android") {
+            bindPassRequestBody((id, body) => {
+                return new Promise<void>((resolve) => {
+                    passingBodyToMainThread.set(id, resolve);
+                    self.postMessage({ id, body });
+                });
+            });
+        }
+
+        return;
+    }
+
     const { id, methodPath, args } = message.data;
 
     let method = methodPath.reduce(

editor/views/esbuild/index.scss

@@ -3,7 +3,7 @@
 @import "../../style/colors";
 
 .esbuild-install {
-    height: 100dvh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     align-items: center;

editor/views/peers/index.ts

@@ -1,6 +1,7 @@
 import {
     PEER_ADVERSTISING_METHOD,
     PEER_CONNECTION_STATE,
+    PEER_CONNECTION_TYPE,
     PeerConnectionPairing
 } from "../../../src/connectivity/types";
 import api from "../../api";
@@ -289,15 +290,18 @@ class Peers {
             const address = addressInput.value;
             const port = portInput.value;
 
-            api.connectivity.connect({
-                peer: {
-                    id: null,
-                    name: `Manual Peer Connection [${address.includes(":") ? `[${address}]` : address}:${port}]`
+            api.connectivity.connect(
+                {
+                    peer: {
+                        id: null,
+                        name: `Manual Peer Connection [${address.includes(":") ? `[${address}]` : address}:${port}]`
+                    },
+                    type: PEER_ADVERSTISING_METHOD.BONJOUR,
+                    addresses: [address],
+                    port: parseInt(port)
                 },
-                type: PEER_ADVERSTISING_METHOD.BONJOUR,
-                addresses: [address],
-                port: parseInt(port)
-            });
+                false
+            );
 
             dialog.remove();
             stackNavigation.lock = false;

editor/views/project/index.scss

@@ -15,7 +15,7 @@ $transition: 0.3s all;
 }
 
 .project {
-    height: 100dvh;
+    height: 100vh;
 
     > .top-bar {
         position: fixed;

package.json

@@ -1,6 +1,6 @@
 {
     "name": "fullstacked-editor",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "scripts": {
         "build": "esbuild build.ts --bundle --outfile=.cache/build.js --platform=node --format=esm --packages=external && node .cache/build.js",
         "start": "npm run build && npm start -w platform/node",
@@ -26,7 +26,7 @@
         "@codemirror/lang-sass": "^6.0.2",
         "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.26.3",
-        "@fullstacked/stack-navigation": "^0.0.0",
+        "@fullstacked/stack-navigation": "^0.0.1",
         "@types/gzip-js": "^0.3.5",
         "@types/node": "^20.12.11",
         "@types/url-parse": "^1.4.11",
@@ -54,4 +54,4 @@
         "url-parse": "^1.5.10",
         "ws": "^8.17.1"
     }
-}
+}

platform/android/esbuild/Makefile

@@ -0,0 +1,40 @@
+# go/Makefile
+
+ESBUILD_DIR = $(CURDIR)/../../../lib/esbuild
+GO_EXEC = $(CURDIR)/../../../lib/go/bin/go
+ANDROID_OUT = $(CURDIR)/../studio/app/src/main/cpp/esbuild
+
+android-arm:
+	cd $(ESBUILD_DIR) && git clean -f && \
+	cp $(CURDIR)/../../ios/esbuild/cmd/* $(ESBUILD_DIR)/cmd/esbuild && \
+	CGO_ENABLED=1 \
+	GOOS=android \
+	GOARCH=arm \
+	CGO_LDFLAGS="-Wl,-soname,esbuild.so" \
+	CC=~/Library/Android/sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/darwin-x86_64/bin/armv7a-linux-androideabi34-clang \
+	$(GO_EXEC) build -buildmode=c-shared -o $(ANDROID_OUT)/armeabi-v7a/esbuild.so ./cmd/esbuild && \
+	cd $(ESBUILD_DIR) && git clean -f
+
+android-arm64:
+	cd $(ESBUILD_DIR) && git clean -f && \
+	cp $(CURDIR)/../../ios/esbuild/cmd/* $(ESBUILD_DIR)/cmd/esbuild && \
+	CGO_ENABLED=1 \
+	GOOS=android \
+	GOARCH=arm64 \
+	CGO_LDFLAGS="-Wl,-soname,esbuild.so" \
+	CC=~/Library/Android/sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android34-clang \
+	$(GO_EXEC) build -buildmode=c-shared -o $(ANDROID_OUT)/arm64-v8a/esbuild.so ./cmd/esbuild && \
+	cd $(ESBUILD_DIR) && git clean -f
+
+android-x86_64:
+	cd $(ESBUILD_DIR) && git clean -f && \
+	cp $(CURDIR)/../../ios/esbuild/cmd/* $(ESBUILD_DIR)/cmd/esbuild && \
+	CGO_ENABLED=1 \
+	GOOS=android \
+	GOARCH=amd64 \
+	CGO_LDFLAGS="-Wl,-soname,esbuild.so" \
+	CC=~/Library/Android/sdk/ndk/26.1.10909125/toolchains/llvm/prebuilt/darwin-x86_64/bin/x86_64-linux-android34-clang \
+	$(GO_EXEC) build -buildmode=c-shared -o $(ANDROID_OUT)/x86_64/esbuild.so ./cmd/esbuild && \
+	cd $(ESBUILD_DIR) && git clean -f
+
+android: android-arm android-arm64 android-x86_64

platform/android/studio/.gitignore

@@ -0,0 +1,16 @@
+*.iml
+.gradle
+.idea
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

platform/android/studio/app/.gitignore

@@ -0,0 +1,3 @@
+/build
+/src/main/cpp/esbuild
+/release