Reflect

.github/workflows/main.yml

@@ -46,3 +46,23 @@ jobs:
       - uses: cloudflare/[email protected]
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
+  deploy-reflect:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: "npm"
+
+      - name: npm install
+        run: |
+          npm install
+
+      - name: publish
+        env:
+          REFLECT_AUTH_KEY: ${{ secrets.REFLECT_AUTH_KEY }}
+        run: |
+          npx reflect publish --auth-key-from-env=REFLECT_AUTH_KEY

app/s/[studio]/s/[space]/[display_name]/join/JoinSpace.tsx

@@ -13,6 +13,9 @@ import { SpaceCard, SpaceData } from "components/SpacesList";
 import { Divider } from "components/Layout";
 import { WORKER_URL } from "src/constants";
 import { useSearchParams } from "next/dist/client/components/navigation";
+import { makeReflect } from "components/ReplicacheProvider";
+import { ulid } from "src/ulid";
+
 export function JoinSpace({ space_id }: { space_id: string }) {
   let id = useSpaceID();
   let { session, authToken } = useAuth();
@@ -22,12 +25,23 @@ export function JoinSpace({ space_id }: { space_id: string }) {
   let { data } = useSpaceData({ space_id });
 
   const onClick = async () => {
-    if (!authToken || !code || !id) return;
+    if (!authToken || !code || !id || !session.user) return;
     let data = await spaceAPI(`${WORKER_URL}/space/${id}`, "join", {
       authToken,
       code,
     });
     if (data.success) {
+      let reflect = makeReflect({
+        roomID: id,
+        authToken,
+        userID: session.user.id,
+      });
+      if (session.session)
+        await reflect.mutate.joinSpace({
+          memberEntity: ulid(),
+          username: session.session.username,
+          studio: session.session.studio,
+        });
       router.push(`/s/${query?.studio}/s/${query?.space}`);
     }
   };

app/setup/SetupForm.tsx

@@ -12,6 +12,8 @@ import { WORKER_URL } from "src/constants";
 import { supabaseBrowserClient } from "supabase/clients";
 import Image from "next/image";
 import spotIllo from "public/img/spotIllustration/welcome.png";
+import { makeReflect } from "components/ReplicacheProvider";
+import { ulid } from "src/ulid";
 
 export function SignupPageForm() {
   let router = useRouter();
@@ -59,9 +61,20 @@ export function SignupPageForm() {
         else router.push(`/s/${data.username}`);
       }
     }
+
     if (res.success) {
       let { data } = await supabase.auth.refreshSession();
-      if (data.session) {
+      if (data.user && data.session) {
+        let reflect = makeReflect({
+          roomID: data.user?.user_metadata.studio,
+          authToken: tokens,
+          userID: data.user.id,
+        });
+        reflect.mutate.joinSpace({
+          memberEntity: ulid(),
+          username: data.user?.user_metadata.username,
+          studio: data.user?.user_metadata.studio,
+        });
         await supabase.auth.setSession(data?.session);
         if (redirectTo) router.push(redirectTo);
         else router.push(`/s/${data.user?.user_metadata.username}`);

app/studio/[studio_id]/space/StudioPresenceHandler.tsx

@@ -1,12 +1,9 @@
 "use client";
-import { useMeetingState } from "@daily-co/daily-react";
-import { ref } from "data/Facts";
 import { useMutations } from "hooks/useReplicache";
 import { useRoom } from "hooks/useUIState";
-import { useAtomValue } from "jotai";
 import { useEffect } from "react";
 import { ulid } from "src/ulid";
-import { SpaceProvider, socketStateAtom } from "components/ReplicacheProvider";
+import { SpaceProvider } from "components/ReplicacheProvider";
 import { SpaceData } from "components/SpacesList";
 import { useParams } from "next/navigation";
 
@@ -46,22 +43,18 @@ export const SpacePageStudioPresenceHandler = (props: { space: SpaceData }) => {
   );
 };
 export const PresenceHandler = (props: { space_do_id: string }) => {
-  let { rep, mutate, authorized, memberEntity, client, permissions } =
-    useMutations();
+  let { rep, mutate, authorized, memberEntity, client } = useMutations();
   let room = useRoom();
-  let socketState = useAtomValue(socketStateAtom);
 
   useEffect(() => {
-    if (!authorized || !rep || !memberEntity || socketState !== "connected")
-      return;
-    rep.clientID.then((clientID) => {
-      mutate("initializeClient", {
-        clientID,
-        clientEntity: ulid(),
-        memberEntity: memberEntity as string,
-      });
+    if (!authorized || !rep || !memberEntity) return;
+
+    mutate("initializeClient", {
+      clientID: rep.clientID,
+      clientEntity: ulid(),
+      memberEntity: memberEntity as string,
     });
-  }, [rep, authorized, memberEntity, socketState, mutate]);
+  }, [rep, authorized, memberEntity, mutate]);
 
   useEffect(() => {
     if (!client?.entity || !authorized) return;

backend/SpaceDurableObject/fact_store.ts

@@ -158,7 +158,7 @@ export const store = (storage: BasicStorage, ctx: { id: string }) => {
     },
   };
 
-  let context: Omit<MutationContext, "runOnServer"> = {
+  let context: Omit<MutationContext, "runOnServer" | "tx"> = {
     scanIndex,
     updateFact: async (id, data) => {
       return lock.withLock(async () => {

backend/SpaceDurableObject/index.ts

@@ -7,19 +7,15 @@ import { delete_file_upload_route } from "./routes/delete_file_upload";
 import { get_share_code_route } from "./routes/get_share_code";
 import { join_route } from "./routes/join";
 import { pullRoute } from "./routes/pull";
-import { push_route } from "./routes/push";
 import { connect } from "./socket";
 import { handleFileUpload } from "./upload_file";
 import { migrations } from "./migrations";
 import { delete_self_route } from "./routes/delete_self";
 import { get_daily_token_route } from "./routes/get_daily_token";
-import { post_feed_route } from "./routes/post_feed";
-import { get_card_data_route } from "./routes/get_card_data";
 import type { WebSocket as DOWebSocket } from "@cloudflare/workers-types";
 import { createClient } from "backend/lib/supabase";
 
 export type Env = {
-  factStore: ReturnType<typeof store>;
   storage: DurableObjectStorage;
   state: DurableObjectState;
   poke: () => void;
@@ -30,16 +26,13 @@ export type Env = {
 };
 
 let routes = [
-  get_card_data_route,
   pullRoute,
-  push_route,
   claimRoute,
   get_share_code_route,
   join_route,
   delete_file_upload_route,
   delete_self_route,
   get_daily_token_route,
-  post_feed_route,
 ];
 export type SpaceRoutes = typeof routes;
 let router = makeRouter(routes);

backend/SpaceDurableObject/lib/isMember.ts

@@ -24,3 +24,7 @@ export async function isUserMember(
       isMember.members_in_studios.length > 0)
   );
 }
+
+export function isAuthorized(env: Env, userID: string) {
+  return env.id === userID;
+}

backend/SpaceDurableObject/migrations/2023-02-02.ts

@@ -11,6 +11,7 @@ export default {
     let promptRoom = rooms.find((r) => r.value === "prompts");
     if (promptRoom) {
       await fact_store.updateFact(promptRoom.id, {
+        //@ts-ignore
         attribute: "promptroom/name",
         value: "Prompt Pool",
       });

backend/SpaceDurableObject/migrations/2023-09-04.ts

@@ -8,6 +8,7 @@ export default {
     let fact_store = store(storage, { id: "" });
     let members = await fact_store.scanIndex.aev("space/member");
     for (let member of members) {
+      //@ts-ignore
       let color = await getMemberColor(fact_store);
       await fact_store.assertFact({
         entity: member.entity,