codepod-io · lihebi · Oct 27, 2023 · Oct 27, 2023
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -12,19 +12,18 @@
     "codepod": "./build/bin.js"
   },
   "dependencies": {
-    "@codepod/runtime": "workspace:^",
-    "@codepod/ui": "workspace:^",
-    "@codepod/yjs": "workspace:^",
     "@trpc/server": "^10.43.0",
     "commander": "^11.0.0",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "jest": "^29.0.3",
     "lib0": "^0.2.83",
     "lodash": "^4.17.21",
+    "uuid": "^9.0.0",
     "ws": "^8.2.3",
     "y-protocols": "^1.0.5",
     "yjs": "^13.6.7",
+    "zeromq": "6.0.0-beta.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/apps/runtime/src/index.ts → apps/api/src/runtime/index.ts b/apps/runtime/src/index.ts → apps/api/src/runtime/index.ts
diff --git a/apps/runtime/src/run.ts → apps/api/src/runtime/run.ts b/apps/runtime/src/run.ts → apps/api/src/runtime/run.ts
diff --git a/apps/runtime/src/server.ts → apps/api/src/runtime/server.ts b/apps/runtime/src/server.ts → apps/api/src/runtime/server.ts
@@ -3,8 +3,6 @@ import { WebSocket, WebSocketServer } from "ws";
 import express from "express";
 import http from "http";
 
-import { ApolloClient, InMemoryCache } from "@apollo/client/core";
-
 import {
   ZmqWire,
   constructExecuteRequest,
@@ -17,12 +15,6 @@ import {
   handleIOPub_display_data,
 } from "./zmq-utils";
 
-interface TokenInterface {
-  id: string;
-}
-
-const cache: InMemoryCache = new InMemoryCache({});
-
 function bindZMQ(zmq_wire: ZmqWire, socket: WebSocket) {
   zmq_wire.setOnIOPub((topic, msgs) => {
     // console.log("-----", topic, msgs);

diff --git a/apps/runtime/src/zmq-utils.ts → apps/api/src/runtime/zmq-utils.ts b/apps/runtime/src/zmq-utils.ts → apps/api/src/runtime/zmq-utils.ts
diff --git a/apps/api/src/spawner_native.ts b/apps/api/src/spawner_native.ts
@@ -3,7 +3,7 @@ import { writeFileSync } from "fs";
 import net from "net";
 import http from "http";
 
-import { startServer } from "@codepod/runtime";
+import { startServer } from "./runtime/server";
 
 type KernelInfo = {
   // the kernel

diff --git a/apps/api/src/trpc.ts b/apps/api/src/trpc.ts
@@ -7,7 +7,8 @@ import Y from "yjs";
 import WebSocket from "ws";
 import { z } from "zod";
 
-import { WebsocketProvider } from "@codepod/yjs/src/y-websocket";
+// import { WebsocketProvider } from "../../ui/src/lib/y-websocket";
+import { WebsocketProvider } from "./y-websocket";
 
 import { killRuntime, spawnRuntime } from "./spawner_native";
 

diff --git a/packages/yjs/src/y-websocket.js → apps/api/src/y-websocket.js b/packages/yjs/src/y-websocket.js → apps/api/src/y-websocket.js
diff --git a/apps/runtime/Dockerfile b/apps/runtime/Dockerfile
diff --git a/apps/runtime/README.md b/apps/runtime/README.md
diff --git a/apps/runtime/kernel/Dockerfile b/apps/runtime/kernel/Dockerfile
diff --git a/apps/runtime/kernel/codepod.py b/apps/runtime/kernel/codepod.py
diff --git a/apps/runtime/kernel/conn.json b/apps/runtime/kernel/conn.json
diff --git a/apps/runtime/package.json b/apps/runtime/package.json
diff --git a/apps/runtime/tsconfig.json b/apps/runtime/tsconfig.json
diff --git a/apps/ui/package.json b/apps/ui/package.json
@@ -12,7 +12,6 @@
   "dependencies": {
     "@apollo/client": "^3.8.1",
     "@benrbray/prosemirror-math": "^0.2.2",
-    "@codepod/yjs": "workspace:*",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.10.9",
@@ -39,6 +38,7 @@
     "immer": "^10.0.2",
     "katex": "0.13.0",
     "kbar": "^0.1.0-beta.40",
+    "lib0": "^0.2.83",
     "monaco-editor": "^0.34.1",
     "nanoid": "^3.0.0",
     "nanoid-dictionary": "^4.3.0",

diff --git a/apps/ui/src/lib/store/yjsSlice.ts b/apps/ui/src/lib/store/yjsSlice.ts
@@ -5,7 +5,8 @@ import { produce } from "immer";
 
 import { Doc, Transaction } from "yjs";
 import * as Y from "yjs";
-import { WebsocketProvider } from "@codepod/yjs/src/y-websocket";
+// import { WebsocketProvider } from "../y-websocket";
+import { WebsocketProvider } from "../../../../api/src/y-websocket";
 import { addAwarenessStyle } from "../utils/utils";
 import { MyState, Pod } from ".";
 

diff --git a/packages/prisma/.gitignore b/packages/prisma/.gitignore
diff --git a/packages/prisma/package.json b/packages/prisma/package.json