major refactor: on switching to a local cmd app (#560)

Author: lihebi

apps/desktop-api/package.json

@@ -11,12 +11,14 @@
   "dependencies": {
     "@apollo/client": "^3.7.1",
     "@codepod/prisma": "workspace:*",
+    "@codepod/yjs": "workspace:^",
     "@kubernetes/client-node": "^0.17.1",
     "@prisma/client": "4.3.1",
     "apollo-server": "^3.5.0",
     "apollo-server-core": "^3.10.3",
     "apollo-server-express": "3.10.2",
     "bcryptjs": "^2.4.3",
+    "cors": "^2.8.5",
     "dockerode": "^3.3.1",
     "express": "^4.18.2",
     "google-auth-library": "^8.7.0",

apps/desktop-api/src/run.ts

@@ -1,3 +1,3 @@
 import { startServer } from "./server";
 
-startServer({ port: 4001 });
+startServer({ port: 4000 });

apps/desktop-api/src/server.ts

@@ -1,185 +1,42 @@
 import express from "express";
 import http from "http";
-import fs from "fs";
+import { WebSocketServer } from "ws";
 
-import { ApolloServer, gql } from "apollo-server-express";
+import { createSetupWSConnection } from "@codepod/yjs";
+import { bindState, writeState } from "./yjs-blob";
 
-import { ApolloServerPluginLandingPageLocalDefault } from "apollo-server-core";
-
-import { customAlphabet } from "nanoid/async";
-import { lowercase, numbers } from "nanoid-dictionary";
-
-const nanoid = customAlphabet(lowercase + numbers, 20);
-
-export const typeDefs = gql`
-  type User {
-    id: ID!
-    username: String
-    email: String!
-    password: String!
-    firstname: String!
-    lastname: String!
-  }
-
-  type Repo {
-    id: ID!
-    name: String
-    userId: ID!
-    stargazers: [User]
-    collaborators: [User]
-    public: Boolean
-    createdAt: String
-    updatedAt: String
-    accessedAt: String
-  }
-
-  type Query {
-    hello: String
-    me: User
-    repo(id: String!): Repo
-    getDashboardRepos: [Repo]
-  }
-
-  type Mutation {
-    world: String
-    createRepo: Repo
-    updateRepo(id: ID!, name: String!): Boolean
-    deleteRepo(id: ID!): Boolean
-    star(repoId: ID!): Boolean
-    unstar(repoId: ID!): Boolean
-  }
-`;
-
-const CODEPOD_ROOT = "/var/codepod";
-const repoDirs = `${CODEPOD_ROOT}/repos`;
-
-export const resolvers = {
-  Query: {
-    hello: () => {
-      return "Hello world!";
-    },
-    // TODO Dummy Data
-    me: () => {
-      return {
-        id: "localUser",
-        username: "localUser",
-        email: "",
-        firstname: "Local",
-        lastname: "User",
-      };
-    },
-    getDashboardRepos: () => {
-      if (!fs.existsSync(repoDirs)) fs.mkdirSync(repoDirs);
-      // list folders in repoDirs
-      const dirs = fs.readdirSync(repoDirs);
-      // read meta data from dirs
-      const repos = dirs.map((dir) => {
-        const meta = JSON.parse(
-          fs.readFileSync(`${repoDirs}/${dir}/meta.json`, "utf8")
-        );
-        return {
-          id: meta.id,
-          name: meta.name,
-          userId: meta.userId,
-          stargazers: (meta.stargazers || []).map((id) => ({ id })),
-          collaborators: [],
-          public: meta.public,
-          createdAt: meta.createdAt,
-          updatedAt: meta.updatedAt,
-          accessedAt: meta.accessedAt,
-        };
-      });
-      return repos;
-    },
-    repo: (_, { id }) => {
-      // read meta data from dirs
-      const meta = JSON.parse(
-        fs.readFileSync(`${repoDirs}/${id}/meta.json`, "utf8")
-      );
-      // update the accessedAt time
-      meta.accessedAt = new Date().getTime();
-      fs.writeFileSync(`${repoDirs}/${id}/meta.json`, JSON.stringify(meta));
-      return {
-        id: meta.id,
-        name: meta.name,
-        userId: meta.userId,
-        stargazers: (meta.stargazers || []).map((id) => ({ id })),
-        collaborators: [],
-        public: meta.public,
-        createdAt: meta.createdAt,
-        updatedAt: meta.updatedAt,
-        accessedAt: meta.accessedAt,
-      };
-    },
-  },
-  Mutation: {
-    world: () => {
-      return "World!";
-    },
-    // TODO fill APIs
-    createRepo: async () => {
-      const id = await nanoid();
-      // Integer representing the number of milliseconds that have elapsed since the Unix epoch.
-      const time = new Date().getTime();
-      const meta = {
-        id,
-        name: null,
-        userId: "localUser",
-        public: false,
-        stargazers: [],
-        collaborators: [],
-        createdAt: time,
-        updatedAt: time,
-        accessedAt: time,
-      };
-      if (!fs.existsSync(repoDirs)) fs.mkdirSync(repoDirs);
-      fs.mkdirSync(`${repoDirs}/${id}`);
-      fs.writeFileSync(`${repoDirs}/${id}/meta.json`, JSON.stringify(meta));
-      return meta;
-    },
-    updateRepo: (_, { id, name }) => {
-      const meta = JSON.parse(
-        fs.readFileSync(`${repoDirs}/${id}/meta.json`, "utf8")
-      );
-      meta.name = name;
-      fs.writeFileSync(`${repoDirs}/${id}/meta.json`, JSON.stringify(meta));
-      return true;
-    },
-    deleteRepo: (_, { id }) => {
-      fs.rmdirSync(`${repoDirs}/${id}`, { recursive: true });
-      return true;
-    },
-    star: (_, { repoId }) => {
-      const meta = JSON.parse(
-        fs.readFileSync(`${repoDirs}/${repoId}/meta.json`, "utf8")
-      );
-      meta.stargazers = ["localUser"];
-      fs.writeFileSync(`${repoDirs}/${repoId}/meta.json`, JSON.stringify(meta));
-      return true;
-    },
-    unstar: (_, { repoId }) => {
-      const meta = JSON.parse(
-        fs.readFileSync(`${repoDirs}/${repoId}/meta.json`, "utf8")
-      );
-      meta.stargazers = [];
-      fs.writeFileSync(`${repoDirs}/${repoId}/meta.json`, JSON.stringify(meta));
-      return true;
-    },
-  },
-};
+import cors from "cors";
 
 export async function startServer({ port }) {
-  const apollo = new ApolloServer({
-    typeDefs,
-    resolvers,
-    plugins: [ApolloServerPluginLandingPageLocalDefault({ embed: true })],
+  const app = express();
+  app.use(express.json({ limit: "20mb" }));
+  // support cors
+  app.use(cors());
+  // serve static files generated from UI
+  app.use(express.static("../../packages/ui/dist"));
+
+  const http_server = http.createServer(app);
+
+  // Yjs websocket
+  const wss = new WebSocketServer({ noServer: true });
+
+  wss.on("connection", (...args) =>
+    createSetupWSConnection(bindState, writeState)(...args)
+  );
+
+  http_server.on("upgrade", async (request, socket, head) => {
+    // You may check auth of request here..
+    // See https://github.com/websockets/ws#client-authentication
+    if (request.url) {
+      wss.handleUpgrade(request, socket, head, function done(ws) {
+        wss.emit("connection", ws, request, { readOnly: false });
+      });
+      return;
+    }
+    socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
+    socket.destroy();
+    return;
   });
-  const expapp = express();
-  expapp.use(express.json({ limit: "20mb" }));
-  const http_server = http.createServer(expapp);
-
-  await apollo.start();
-  apollo.applyMiddleware({ app: expapp });
 
   http_server.listen({ port }, () => {
     console.log(`🚀 Server ready at http://localhost:${port}`);

apps/desktop-yjs/src/yjs-blob.ts renamed to apps/desktop-api/src/yjs-blob.ts

@@ -19,7 +19,6 @@
 
 import fs from "fs";
 import Y from "yjs";
-import { Node as ReactflowNode, Edge as ReactflowEdge } from "reactflow";
 
 import debounce from "lodash/debounce";
 
@@ -51,18 +50,12 @@ function getDebouncedCallback(key) {
   return debounceRegistry.get(key);
 }
 
-type NodeData = {
-  level: number;
-  name?: string;
-};
-
-const CODEPOD_ROOT = "/var/codepod";
-const repoDirs = `${CODEPOD_ROOT}/repos`;
+// FIXME hard-coded path.
+const blobDir = "/tmp/example-repo";
 
 async function handleSaveBlob({ repoId, yDocBlob }) {
   console.log("save blob", repoId, yDocBlob.length);
   // create the yjs-blob folder if not exists
-  const blobDir = `${repoDirs}/${repoId}`;
   if (!fs.existsSync(blobDir)) {
     fs.mkdirSync(blobDir);
   }
@@ -93,9 +86,9 @@ function setupObserversToDB(ydoc: Y.Doc, repoId: string) {
     });
   }
   const rootMap = ydoc.getMap("rootMap");
-  const nodesMap = rootMap.get("nodesMap") as Y.Map<ReactflowNode<NodeData>>;
+  const nodesMap = rootMap.get("nodesMap") as Y.Map<any>;
   nodesMap.observe(observer);
-  const edgesMap = rootMap.get("edgesMap") as Y.Map<ReactflowEdge>;
+  const edgesMap = rootMap.get("edgesMap") as Y.Map<any>;
   edgesMap.observe(observer);
   const codeMap = rootMap.get("codeMap") as Y.Map<Y.Text>;
   codeMap.observeDeep(observer);
@@ -112,16 +105,15 @@ async function loadFromFS(ydoc: Y.Doc, repoId: string) {
   // load from the database and write to the ydoc
   console.log("=== loadFromFS");
   // read the blob from file system
-  const blobDir = `${repoDirs}/${repoId}`;
   const binFile = `${blobDir}/yjs.bin`;
   if (fs.existsSync(binFile)) {
     const yDocBlob = fs.readFileSync(binFile);
     Y.applyUpdate(ydoc, yDocBlob);
   } else {
     // init the ydoc
     const rootMap = ydoc.getMap("rootMap");
-    rootMap.set("nodesMap", new Y.Map<ReactflowNode<NodeData>>());
-    rootMap.set("edgesMap", new Y.Map<ReactflowEdge>());
+    rootMap.set("nodesMap", new Y.Map<any>());
+    rootMap.set("edgesMap", new Y.Map<any>());
     rootMap.set("codeMap", new Y.Map<Y.Text>());
     rootMap.set("richMap", new Y.Map<Y.XmlFragment>());
     rootMap.set("resultMap", new Y.Map<any>());