@arcote.tech/arc-host 0.7.14 → 0.7.16

package/dist/index.js

@@ -4677,88 +4677,6 @@ function queryHandler(ch) {
     }
   };
 }
-var streamIdCounter = 0;
-var streamConnections = new Map;
-function streamHandler(ch) {
-  return (_req, url, ctx) => {
-    if (!url.pathname.startsWith("/stream/") || _req.method !== "GET")
-      return null;
-    const viewName = url.pathname.split("/stream/")[1];
-    if (!viewName) {
-      return new Response("Invalid stream path", {
-        status: 400,
-        headers: ctx.corsHeaders
-      });
-    }
-    const findOptions = {};
-    const whereParam = url.searchParams.get("where");
-    if (whereParam) {
-      try {
-        findOptions.where = JSON.parse(whereParam);
-      } catch {
-        return new Response("Invalid 'where' parameter", {
-          status: 400,
-          headers: ctx.corsHeaders
-        });
-      }
-    }
-    const orderByParam = url.searchParams.get("orderBy");
-    if (orderByParam) {
-      try {
-        findOptions.orderBy = JSON.parse(orderByParam);
-      } catch {
-        return new Response("Invalid 'orderBy' parameter", {
-          status: 400,
-          headers: ctx.corsHeaders
-        });
-      }
-    }
-    const limitParam = url.searchParams.get("limit");
-    if (limitParam)
-      findOptions.limit = parseInt(limitParam, 10);
-    const streamId = `stream_${++streamIdCounter}_${Date.now()}`;
-    const rawToken = ctx.rawToken;
-    const stream = new ReadableStream({
-      start(controller) {
-        const scoped = new ScopedModel2(ch.getModel(), "stream");
-        if (rawToken)
-          scoped.setToken(rawToken);
-        const descriptor = { element: viewName, method: "find", args: [findOptions] };
-        const sendData = async () => {
-          try {
-            const data = await scoped.callQuery(descriptor);
-            controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify({ type: "data", data })}
-
-`));
-          } catch {
-            unsubscribe();
-          }
-        };
-        sendData();
-        const unsubscribe = ch.getEventPublisher().subscribe("*", () => sendData());
-        streamConnections.set(streamId, { id: streamId, controller, unsubscribe });
-        controller.enqueue(new TextEncoder().encode(`data: ${JSON.stringify({ type: "connected", streamId })}
-
-`));
-      },
-      cancel() {
-        const conn = streamConnections.get(streamId);
-        if (conn) {
-          conn.unsubscribe();
-          streamConnections.delete(streamId);
-        }
-      }
-    });
-    return new Response(stream, {
-      headers: {
-        ...ctx.corsHeaders,
-        "Content-Type": "text/event-stream",
-        "Cache-Control": "no-cache",
-        Connection: "keep-alive"
-      }
-    });
-  };
-}
 function eventSyncHandler(ch) {
   return async (req, url, ctx) => {
     if (url.pathname !== "/sync/events" || req.method !== "POST")
@@ -4859,25 +4777,19 @@ function arcHttpHandlers(ch, cm) {
     healthHandler(cm),
     commandHandler(ch),
     queryHandler(ch),
-    streamHandler(ch),
     eventSyncHandler(ch),
     routeHandler(ch)
   ];
 }
-function cleanupStreams() {
-  for (const conn of streamConnections.values())
-    conn.unsubscribe();
-  streamConnections.clear();
-}
 // src/middleware/ws.ts
-import { ScopedModel as ScopedModel3 } from "@arcote.tech/arc";
-var clientViewSubs = new Map;
+import { LiveQuery } from "@arcote.tech/arc";
+var clientQuerySubs = new Map;
 function cleanupClientSubs(clientId) {
-  const subs = clientViewSubs.get(clientId);
+  const subs = clientQuerySubs.get(clientId);
   if (subs) {
-    for (const unsub of subs.values())
-      unsub();
-    clientViewSubs.delete(clientId);
+    for (const live of subs.values())
+      live.stop();
+    clientQuerySubs.delete(clientId);
   }
 }
 function scopeAuthHandler() {
@@ -4903,6 +4815,8 @@ function syncEventsHandler() {
     for (const c of ctx.connectionManager.getAllClients()) {
       if (c.id === client.id)
         continue;
+      if (!c.wantsEventSync)
+        continue;
       const clientTokens = ctx.connectionManager.getAllScopeTokens(c.id);
       const authorized = filterEventsForTokens(clientTokens, persisted, ctx.contextHandler.getEventDefinitions());
       if (authorized.length > 0) {
@@ -4925,6 +4839,7 @@ function requestSyncHandler() {
   return async (client, message, ctx) => {
     if (message.type !== "request-sync")
       return false;
+    client.wantsEventSync = true;
     const allTokens = ctx.connectionManager.getAllScopeTokens(client.id);
     const token = allTokens.length > 0 ? allTokens[0] : null;
     const events = await ctx.contextHandler.getEventsSince(message.lastHostEventId, token);
@@ -4976,70 +4891,58 @@ function executeCommandHandler() {
 function querySubscriptionHandler() {
   return async (client, message, ctx) => {
     if (message.type === "subscribe-query") {
-      const { subscriptionId, descriptor, scope } = message;
-      const scopeToken = scope ? client.scopeTokens.get(scope) : null;
+      const { subscriptionId, descriptor } = message;
+      const scope = message.scope ?? "default";
+      const scopeToken = client.scopeTokens.get(scope) ?? null;
       let rawToken = scopeToken?.raw ?? null;
       if (!rawToken && client.scopeTokens.size > 0) {
         rawToken = client.scopeTokens.values().next().value.raw;
       }
-      const scoped = new ScopedModel3(ctx.contextHandler.getModel(), scope ?? "default");
-      if (rawToken)
-        scoped.setToken(rawToken);
-      let lastResultJson = "";
-      const sendData = async () => {
-        try {
-          const data = await scoped.callQuery(descriptor);
-          const json = JSON.stringify(data ?? null);
-          if (json === lastResultJson)
-            return;
-          lastResultJson = json;
+      clientQuerySubs.get(client.id)?.get(subscriptionId)?.stop();
+      const live = new LiveQuery(ctx.contextHandler.getModel(), descriptor, scope, rawToken, (update) => {
+        if (update.type === "changes") {
           ctx.connectionManager.sendToClient(client.id, {
-            type: "query-data",
+            type: "query-changes",
             subscriptionId,
-            data: data ?? null
+            changes: update.changes
+          });
+        } else {
+          ctx.connectionManager.sendToClient(client.id, {
+            type: "query-snapshot",
+            subscriptionId,
+            result: update.result ?? null
           });
-        } catch (err) {
-          console.error(`[Arc] Query subscription error:`, err);
-        }
-      };
-      sendData();
-      const element = ctx.contextHandler.getModel().context.get(descriptor.element);
-      const handlers = element?.getHandlers?.();
-      const eventTypes = handlers ? Object.keys(handlers) : [];
-      let debounceTimer;
-      const debouncedSend = () => {
-        if (debounceTimer)
-          clearTimeout(debounceTimer);
-        debounceTimer = setTimeout(() => sendData(), 50);
-      };
-      const unsubscribes = [];
-      if (eventTypes.length > 0) {
-        for (const eventType of eventTypes) {
-          unsubscribes.push(ctx.contextHandler.getEventPublisher().subscribe(eventType, debouncedSend));
         }
-      } else {
-        unsubscribes.push(ctx.contextHandler.getEventPublisher().subscribe("*", debouncedSend));
+      });
+      if (!clientQuerySubs.has(client.id)) {
+        clientQuerySubs.set(client.id, new Map);
       }
-      const cleanup = () => {
-        if (debounceTimer)
-          clearTimeout(debounceTimer);
-        for (const unsub of unsubscribes)
-          unsub();
-      };
-      if (!clientViewSubs.has(client.id)) {
-        clientViewSubs.set(client.id, new Map);
+      clientQuerySubs.get(client.id).set(subscriptionId, live);
+      try {
+        const result = await live.start();
+        ctx.connectionManager.sendToClient(client.id, {
+          type: "query-snapshot",
+          subscriptionId,
+          result: result ?? null
+        });
+        live.flush();
+      } catch (err) {
+        live.stop();
+        clientQuerySubs.get(client.id)?.delete(subscriptionId);
+        console.error(`[Arc] Query subscription error (${descriptor?.element}.${descriptor?.method}):`, err);
+        ctx.connectionManager.sendToClient(client.id, {
+          type: "error",
+          message: `Failed to subscribe to query "${descriptor?.element}.${descriptor?.method}"`
+        });
       }
-      clientViewSubs.get(client.id).set(subscriptionId, cleanup);
       return true;
     }
     if (message.type === "unsubscribe-query") {
-      const subs = clientViewSubs.get(client.id);
-      if (subs) {
-        const unsub = subs.get(message.subscriptionId);
-        if (unsub) {
-          unsub();
-          subs.delete(message.subscriptionId);
-        }
+      const subs = clientQuerySubs.get(client.id);
+      const live = subs?.get(message.subscriptionId);
+      if (live) {
+        live.stop();
+        subs.delete(message.subscriptionId);
       }
       return true;
     }
@@ -5235,7 +5138,6 @@ async function createArcServer(config) {
     cronScheduler,
     stop: () => {
       cronScheduler.stop();
-      cleanupStreams();
       server.stop();
     }
   };
@@ -5249,7 +5151,6 @@ function hostLiveModel(context, dbAdapterFactory) {
 }
 export {
   syncEventsHandler,
-  streamHandler,
   scopeAuthHandler,
   routeHandler,
   requestSyncHandler,
@@ -5263,7 +5164,6 @@ export {
   eventSyncHandler,
   createArcServer,
   commandHandler,
-  cleanupStreams,
   cleanupClientSubs,
   canTokenReceiveEvent,
   canTokenEmitEvent,
@@ -5274,5 +5174,5 @@ export {
   ConnectionManager
 };
 
-//# debugId=D9115398B339A37F64756E2164756E21
+//# debugId=5FB48DB48B7AE0DA64756E2164756E21
 //# sourceMappingURL=index.js.map