@instantdb/core 0.22.90-experimental.drewh-ssr.20312174628.1 → 0.22.90-experimental.drewh-ssr.20347747146.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instantdb/core",
-  "version": "0.22.90-experimental.drewh-ssr.20312174628.1",
+  "version": "0.22.90-experimental.drewh-ssr.20347747146.1",
   "description": "Instant's core local abstraction",
   "homepage": "https://github.com/instantdb/instant/tree/main/client/packages/core",
   "repository": {
@@ -53,7 +53,7 @@
   "dependencies": {
     "mutative": "^1.0.10",
     "uuid": "^11.1.0",
-    "@instantdb/version": "0.22.90-experimental.drewh-ssr.20312174628.1"
+    "@instantdb/version": "0.22.90-experimental.drewh-ssr.20347747146.1"
   },
   "scripts": {
     "test": "vitest",

package/src/Reactor.js

@@ -2048,11 +2048,13 @@ export default class Reactor {
   }
 
   async syncUserToEndpoint(user) {
-    if (this.config.cookieEndpoint) {
+    if (this.config.firstPartyPath) {
       try {
-        fetch(this.config.cookieEndpoint + '/sync-auth', {
+        fetch(this.config.firstPartyPath + '/', {
           method: 'POST',
           body: JSON.stringify({
+            type: 'sync-user',
+            appId: this.config.appId,
             user: user,
           }),
           headers: {

package/src/createRouteHandler.ts

@@ -1,44 +1,56 @@
-export const createInstantRouteHandler = (config: {
-  appId: string;
-  apiURI?: string;
-}) => {
-  async function handleUserSync(req: Request) {
-    const body = await req.json();
-    if (body.user && body.user.refresh_token) {
-      return new Response('sync', {
+import type { User } from './clientTypes.js';
+
+export const createInstantRouteHandler = (config: { appId: string }) => {
+  function createUserSyncResponse(user: User | null) {
+    if (user && user.refresh_token) {
+      return new Response(JSON.stringify({ ok: true }), {
         headers: {
+          'Content-Type': 'application/json',
           // 7 day expiry
-          'Set-Cookie': `instant_user=${JSON.stringify(body.user)}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,
+          'Set-Cookie': `instant_user_${config.appId}=${JSON.stringify(user)}; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=604800`,
         },
       });
     } else {
-      return new Response('sync', {
+      return new Response(JSON.stringify({ ok: true }), {
         headers: {
+          'Content-Type': 'application/json',
           // remove the cookie (some browsers)
-          'Set-Cookie': `instant_user=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=-1`,
+          'Set-Cookie': `instant_user_${config.appId}=; Path=/; HttpOnly; Secure; SameSite=Strict; Max-Age=-1`,
         },
       });
     }
   }
 
+  function errorResponse(status: number, message: string) {
+    return new Response(JSON.stringify({ ok: false, error: message }), {
+      status,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
   return {
-    GET: async (_req: Request) => {
-      return new Response('Method not allowed', {
-        status: 405,
-        statusText: 'Method Not Allowed',
-      });
-    },
     POST: async (req: Request) => {
-      const url = new URL(req.url);
-      const pathname = url.pathname;
-      const route = pathname.split('/')[pathname.split('/').length - 1];
-      switch (route) {
-        case 'sync-auth':
-          return await handleUserSync(req);
+      let body: { type?: string; appId?: string; user?: User | null };
+      try {
+        body = await req.json();
+      } catch {
+        return errorResponse(400, 'Invalid JSON body');
+      }
+
+      if (!body.type) {
+        return errorResponse(400, 'Missing "type" field');
+      }
+
+      if (body.appId !== config.appId) {
+        return errorResponse(403, 'App ID mismatch');
+      }
+
+      switch (body.type) {
+        case 'sync-user':
+          return createUserSyncResponse(body.user ?? null);
+        default:
+          return errorResponse(400, `Unknown type: ${body.type}`);
       }
-      return new Response('Route not found', {
-        status: 404,
-      });
     },
   };
 };

package/src/framework.ts

@@ -134,6 +134,7 @@ export class FrameworkClient {
         entry.error = error;
         entry.promise = null;
       });
+      this.resultMap.set(hash, entry);
       return entry as any;
     }
 

package/src/index.ts

@@ -157,7 +157,7 @@ export type InstantConfig<
   appId: string;
   schema?: S;
   websocketURI?: string;
-  cookieEndpoint?: string;
+  firstPartyPath?: string;
   apiURI?: string;
   devtool?: boolean | DevtoolConfig;
   verbose?: boolean;