@arcote.tech/arc-cli 0.7.14 → 0.7.15

package/dist/index.js

@@ -14720,7 +14720,7 @@ class DataStorage {
   }
 }
 
-class ScopedStore {
+class ScopedStore2 {
   #inner;
   #restrictions;
   #canWrite;
@@ -15082,7 +15082,7 @@ function resolveQueryChange(currentResult, event3, options) {
     }
     return false;
   }
-  const shouldBeInResult = checkItemMatchesWhere(event3.item, options.where);
+  const shouldBeInResult = checkItemMatchesWhere2(event3.item, options.where);
   if (isInCurrentResult && shouldBeInResult) {
     const newResult = currentResult.toSpliced(index, 1, event3.item);
     return applyOrderByAndLimit(newResult, options);
@@ -15094,7 +15094,7 @@ function resolveQueryChange(currentResult, event3, options) {
   }
   return false;
 }
-function checkItemMatchesWhere(item, where) {
+function checkItemMatchesWhere2(item, where) {
   if (!where) {
     return true;
   }
@@ -15683,7 +15683,7 @@ class StreamingStore {
   find(options = {}) {
     let results = Array.from(this.data.values());
     if (options.where) {
-      results = results.filter((item) => checkItemMatchesWhere(item, options.where));
+      results = results.filter((item) => checkItemMatchesWhere2(item, options.where));
     }
     return applyOrderByAndLimit(results, options);
   }
@@ -18862,7 +18862,7 @@ var init_dist = __esm(() => {
         throw new Error(`Scope violation: access denied to store "${storeName}" (not declared in query/mutate)`);
       }
       const inner = this.#inner.getStore(storeName);
-      return new ScopedStore(inner, this.#restrictions, permission === "read-write");
+      return new ScopedStore2(inner, this.#restrictions, permission === "read-write");
     }
     fork() {
       return this.#inner.fork();
@@ -22112,7 +22112,7 @@ class DataStorage2 {
   }
 }
 
-class ScopedStore2 {
+class ScopedStore3 {
   #inner;
   #restrictions;
   #canWrite;
@@ -22474,7 +22474,7 @@ function resolveQueryChange2(currentResult, event3, options) {
     }
     return false;
   }
-  const shouldBeInResult = checkItemMatchesWhere2(event3.item, options.where);
+  const shouldBeInResult = checkItemMatchesWhere3(event3.item, options.where);
   if (isInCurrentResult && shouldBeInResult) {
     const newResult = currentResult.toSpliced(index, 1, event3.item);
     return applyOrderByAndLimit2(newResult, options);
@@ -22486,7 +22486,7 @@ function resolveQueryChange2(currentResult, event3, options) {
   }
   return false;
 }
-function checkItemMatchesWhere2(item, where) {
+function checkItemMatchesWhere3(item, where) {
   if (!where) {
     return true;
   }
@@ -23075,7 +23075,7 @@ class StreamingStore2 {
   find(options = {}) {
     let results = Array.from(this.data.values());
     if (options.where) {
-      results = results.filter((item) => checkItemMatchesWhere2(item, options.where));
+      results = results.filter((item) => checkItemMatchesWhere3(item, options.where));
     }
     return applyOrderByAndLimit2(results, options);
   }
@@ -24689,7 +24689,7 @@ var init_dist2 = __esm(() => {
         throw new Error(`Scope violation: access denied to store "${storeName}" (not declared in query/mutate)`);
       }
       const inner = this.#inner.getStore(storeName);
-      return new ScopedStore2(inner, this.#restrictions, permission === "read-write");
+      return new ScopedStore3(inner, this.#restrictions, permission === "read-write");
     }
     fork() {
       return this.#inner.fork();
@@ -39950,88 +39950,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 stream2 = 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(stream2, {
-      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")
@@ -40132,25 +40050,71 @@ 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();
-}
 // ../host/src/middleware/ws.ts
-import { ScopedModel as ScopedModel3 } from "@arcote.tech/arc";
-var clientViewSubs = new Map;
+import {
+  ScopedModel as ScopedModel3,
+  ScopedStore,
+  checkItemMatchesWhere
+} from "@arcote.tech/arc";
+var viewSubscribers = new Map;
 function cleanupClientSubs(clientId) {
-  const subs = clientViewSubs.get(clientId);
-  if (subs) {
-    for (const unsub of subs.values())
-      unsub();
-    clientViewSubs.delete(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
+      });
+    }
   }
 }
 function scopeAuthHandler() {
@@ -40176,6 +40140,8 @@ function syncEventsHandler() {
     for (const c2 of ctx.connectionManager.getAllClients()) {
       if (c2.id === client.id)
         continue;
+      if (!c2.wantsEventSync)
+        continue;
       const clientTokens = ctx.connectionManager.getAllScopeTokens(c2.id);
       const authorized = filterEventsForTokens(clientTokens, persisted, ctx.contextHandler.getEventDefinitions());
       if (authorized.length > 0) {
@@ -40198,6 +40164,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);
@@ -40246,74 +40213,82 @@ function executeCommandHandler() {
     return true;
   };
 }
-function querySubscriptionHandler() {
+function viewSubscriptionHandler() {
   return async (client, message, ctx) => {
-    if (message.type === "subscribe-query") {
-      const { subscriptionId, descriptor, scope } = message;
-      const scopeToken = scope ? client.scopeTokens.get(scope) : null;
+    if (message.type === "subscribe-view") {
+      const { element: elementName } = 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");
+      const scoped = new ScopedModel3(ctx.contextHandler.getModel(), scope);
       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;
-          ctx.connectionManager.sendToClient(client.id, {
-            type: "query-data",
-            subscriptionId,
-            data: data ?? null
-          });
-        } catch (err3) {
-          console.error(`[Arc] Query subscription error:`, err3);
-        }
-      };
-      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));
+      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 cleanup = () => {
-        if (debounceTimer)
-          clearTimeout(debounceTimer);
-        for (const unsub of unsubscribes)
-          unsub();
+      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 (!clientViewSubs.has(client.id)) {
-        clientViewSubs.set(client.id, new Map);
+      if (!viewSubscribers.has(elementName)) {
+        viewSubscribers.set(elementName, new Map);
+      }
+      viewSubscribers.get(elementName).set(subKey, subscriber);
+      try {
+        const store = ctx.contextHandler.getDataStorage().getStore(elementName);
+        const items = restrictions ? await new ScopedStore(store, restrictions, false).find({}) : await store.find({});
+        ctx.connectionManager.sendToClient(client.id, {
+          type: "view-snapshot",
+          element: elementName,
+          scope,
+          items
+        });
+      } catch (err3) {
+        viewSubscribers.get(elementName)?.delete(subKey);
+        console.error(`[Arc] View subscription error (${elementName}):`, err3);
+        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
+        });
       }
-      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);
-        }
-      }
+    if (message.type === "unsubscribe-view") {
+      const scope = message.scope ?? "default";
+      viewSubscribers.get(message.element)?.delete(`${client.id}:${scope}`);
       return true;
     }
     return false;
@@ -40325,7 +40300,7 @@ function arcWsHandlers() {
     syncEventsHandler(),
     requestSyncHandler(),
     executeCommandHandler(),
-    querySubscriptionHandler()
+    viewSubscriptionHandler()
   ];
 }
 // ../host/src/create-server.ts
@@ -40338,6 +40313,7 @@ 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 {
@@ -40508,7 +40484,6 @@ async function createArcServer(config) {
     cronScheduler,
     stop: () => {
       cronScheduler.stop();
-      cleanupStreams();
       server.stop();
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-cli",
-  "version": "0.7.14",
+  "version": "0.7.15",
   "description": "CLI tool for Arc framework",
   "module": "index.ts",
   "main": "dist/index.js",
@@ -12,13 +12,13 @@
     "build": "bun build --target=bun ./src/index.ts --outdir=dist --external @arcote.tech/arc --external @arcote.tech/arc-ds --external @arcote.tech/arc-react --external @arcote.tech/platform --external '@opentelemetry/*' && chmod +x dist/index.js"
   },
   "dependencies": {
-    "@arcote.tech/arc": "^0.7.14",
-    "@arcote.tech/arc-ds": "^0.7.14",
-    "@arcote.tech/arc-react": "^0.7.14",
-    "@arcote.tech/arc-host": "^0.7.14",
-    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.14",
-    "@arcote.tech/arc-adapter-db-postgres": "^0.7.14",
-    "@arcote.tech/arc-otel": "^0.7.14",
+    "@arcote.tech/arc": "^0.7.15",
+    "@arcote.tech/arc-ds": "^0.7.15",
+    "@arcote.tech/arc-react": "^0.7.15",
+    "@arcote.tech/arc-host": "^0.7.15",
+    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.15",
+    "@arcote.tech/arc-adapter-db-postgres": "^0.7.15",
+    "@arcote.tech/arc-otel": "^0.7.15",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.57.0",
     "@opentelemetry/core": "^1.30.0",
@@ -31,7 +31,7 @@
     "@opentelemetry/sdk-trace-base": "^1.30.0",
     "@opentelemetry/sdk-trace-node": "^1.30.0",
     "@opentelemetry/semantic-conventions": "^1.27.0",
-    "@arcote.tech/platform": "^0.7.14",
+    "@arcote.tech/platform": "^0.7.15",
     "@clack/prompts": "^0.9.0",
     "commander": "^11.1.0",
     "chokidar": "^3.5.3",

package/src/platform/server.ts

@@ -1,6 +1,5 @@
 import {
   cleanupClientSubs,
-  cleanupStreams,
   createArcServer,
   ContextHandler,
   ConnectionManager,