@arcote.tech/arc-host 0.7.15 → 0.7.16

package/dist/index.js

@@ -4782,66 +4782,14 @@ function arcHttpHandlers(ch, cm) {
   ];
 }
 // src/middleware/ws.ts
-import {
-  ScopedModel as ScopedModel3,
-  ScopedStore,
-  checkItemMatchesWhere
-} from "@arcote.tech/arc";
-var viewSubscribers = new Map;
+import { LiveQuery } from "@arcote.tech/arc";
+var clientQuerySubs = new Map;
 function cleanupClientSubs(clientId) {
-  const prefix = `${clientId}:`;
-  for (const subs of viewSubscribers.values()) {
-    for (const key of subs.keys()) {
-      if (key.startsWith(prefix))
-        subs.delete(key);
-    }
-  }
-}
-function filterChangeForSubscriber(change, restrictions) {
-  const newMatches = change.newRow !== null && (restrictions === null || checkItemMatchesWhere(change.newRow, restrictions));
-  if (newMatches) {
-    return { type: "set", id: change.id, item: change.newRow };
-  }
-  const oldMatches = change.oldRow !== null && (restrictions === null || checkItemMatchesWhere(change.oldRow, restrictions));
-  if (oldMatches) {
-    return { type: "delete", id: change.id, item: null };
-  }
-  return null;
-}
-function broadcastViewChanges(committed, connectionManager) {
-  const byStore = new Map;
-  for (const change of committed) {
-    let list = byStore.get(change.store);
-    if (!list) {
-      list = [];
-      byStore.set(change.store, list);
-    }
-    list.push(change);
-  }
-  for (const [viewName, changes] of byStore) {
-    const subs = viewSubscribers.get(viewName);
-    if (!subs || subs.size === 0)
-      continue;
-    for (const sub of subs.values()) {
-      const filtered = [];
-      for (const change of changes) {
-        const wireChange = filterChangeForSubscriber(change, sub.restrictions);
-        if (wireChange)
-          filtered.push(wireChange);
-      }
-      if (filtered.length === 0)
-        continue;
-      if (sub.buffer) {
-        sub.buffer.push(...filtered);
-        continue;
-      }
-      connectionManager.sendToClient(sub.clientId, {
-        type: "view-changes",
-        element: viewName,
-        scope: sub.scope,
-        changes: filtered
-      });
-    }
+  const subs = clientQuerySubs.get(clientId);
+  if (subs) {
+    for (const live of subs.values())
+      live.stop();
+    clientQuerySubs.delete(clientId);
   }
 }
 function scopeAuthHandler() {
@@ -4940,82 +4888,62 @@ function executeCommandHandler() {
     return true;
   };
 }
-function viewSubscriptionHandler() {
+function querySubscriptionHandler() {
   return async (client, message, ctx) => {
-    if (message.type === "subscribe-view") {
-      const { element: elementName } = message;
+    if (message.type === "subscribe-query") {
+      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);
-      if (rawToken)
-        scoped.setToken(rawToken);
-      const element = ctx.contextHandler.getModel().context.get(elementName);
-      if (!element || typeof element.getRestrictionsFor !== "function") {
-        ctx.connectionManager.sendToClient(client.id, {
-          type: "error",
-          message: `Cannot subscribe to view "${elementName}": unknown element`
-        });
-        return true;
-      }
-      const { restrictions, denied } = element.getRestrictionsFor(scoped.getAdapters());
-      const subKey = `${client.id}:${scope}`;
-      if (denied) {
-        viewSubscribers.get(elementName)?.delete(subKey);
-        ctx.connectionManager.sendToClient(client.id, {
-          type: "view-snapshot",
-          element: elementName,
-          scope,
-          items: []
-        });
-        return true;
-      }
-      const subscriber = {
-        clientId: client.id,
-        scope,
-        restrictions,
-        buffer: []
-      };
-      if (!viewSubscribers.has(elementName)) {
-        viewSubscribers.set(elementName, new Map);
+      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-changes",
+            subscriptionId,
+            changes: update.changes
+          });
+        } else {
+          ctx.connectionManager.sendToClient(client.id, {
+            type: "query-snapshot",
+            subscriptionId,
+            result: update.result ?? null
+          });
+        }
+      });
+      if (!clientQuerySubs.has(client.id)) {
+        clientQuerySubs.set(client.id, new Map);
       }
-      viewSubscribers.get(elementName).set(subKey, subscriber);
+      clientQuerySubs.get(client.id).set(subscriptionId, live);
       try {
-        const store = ctx.contextHandler.getDataStorage().getStore(elementName);
-        const items = restrictions ? await new ScopedStore(store, restrictions, false).find({}) : await store.find({});
+        const result = await live.start();
         ctx.connectionManager.sendToClient(client.id, {
-          type: "view-snapshot",
-          element: elementName,
-          scope,
-          items
+          type: "query-snapshot",
+          subscriptionId,
+          result: result ?? null
         });
+        live.flush();
       } catch (err) {
-        viewSubscribers.get(elementName)?.delete(subKey);
-        console.error(`[Arc] View subscription error (${elementName}):`, 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 view "${elementName}"`
-        });
-        return true;
-      }
-      const buffered = subscriber.buffer;
-      subscriber.buffer = null;
-      if (buffered.length > 0) {
-        ctx.connectionManager.sendToClient(client.id, {
-          type: "view-changes",
-          element: elementName,
-          scope,
-          changes: buffered
+          message: `Failed to subscribe to query "${descriptor?.element}.${descriptor?.method}"`
         });
       }
       return true;
     }
-    if (message.type === "unsubscribe-view") {
-      const scope = message.scope ?? "default";
-      viewSubscribers.get(message.element)?.delete(`${client.id}:${scope}`);
+    if (message.type === "unsubscribe-query") {
+      const subs = clientQuerySubs.get(client.id);
+      const live = subs?.get(message.subscriptionId);
+      if (live) {
+        live.stop();
+        subs.delete(message.subscriptionId);
+      }
       return true;
     }
     return false;
@@ -5027,7 +4955,7 @@ function arcWsHandlers() {
     syncEventsHandler(),
     requestSyncHandler(),
     executeCommandHandler(),
-    viewSubscriptionHandler()
+    querySubscriptionHandler()
   ];
 }
 // src/create-server.ts
@@ -5040,7 +4968,6 @@ async function createArcServer(config) {
   const cronScheduler = new CronScheduler(contextHandler);
   cronScheduler.start();
   const connectionManager = new ConnectionManager;
-  contextHandler.getEventPublisher().onViewChanges((changes) => broadcastViewChanges(changes, connectionManager));
   function buildCorsHeaders(req) {
     const origin = req?.headers.get("Origin") || "*";
     return {
@@ -5223,11 +5150,11 @@ function hostLiveModel(context, dbAdapterFactory) {
   });
 }
 export {
-  viewSubscriptionHandler,
   syncEventsHandler,
   scopeAuthHandler,
   routeHandler,
   requestSyncHandler,
+  querySubscriptionHandler,
   queryHandler,
   hostLiveModel,
   healthHandler,
@@ -5240,7 +5167,6 @@ export {
   cleanupClientSubs,
   canTokenReceiveEvent,
   canTokenEmitEvent,
-  broadcastViewChanges,
   arcWsHandlers,
   arcHttpHandlers,
   CronScheduler,
@@ -5248,5 +5174,5 @@ export {
   ConnectionManager
 };
 
-//# debugId=094B6B350E52DB8A64756E2164756E21
+//# debugId=5FB48DB48B7AE0DA64756E2164756E21
 //# sourceMappingURL=index.js.map