@dxos/functions-runtime-cloudflare 0.8.4-main.bc674ce → 0.8.4-main.c85a9c8dae

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-runtime-cloudflare",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.c85a9c8dae",
   "description": "Functions runtime for Cloudflare.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,23 +27,23 @@
     "src"
   ],
   "dependencies": {
-    "effect": "3.19.11",
-    "@dxos/codec-protobuf": "0.8.4-main.bc674ce",
-    "@dxos/context": "0.8.4-main.bc674ce",
-    "@dxos/debug": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-protocol": "0.8.4-main.bc674ce",
-    "@dxos/errors": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce"
+    "effect": "3.19.16",
+    "@dxos/codec-protobuf": "0.8.4-main.c85a9c8dae",
+    "@dxos/debug": "0.8.4-main.c85a9c8dae",
+    "@dxos/context": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
+    "@dxos/echo-protocol": "0.8.4-main.c85a9c8dae",
+    "@dxos/errors": "0.8.4-main.c85a9c8dae",
+    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
+    "@dxos/keys": "0.8.4-main.c85a9c8dae",
+    "@dxos/log": "0.8.4-main.c85a9c8dae",
+    "@dxos/protocols": "0.8.4-main.c85a9c8dae",
+    "@dxos/util": "0.8.4-main.c85a9c8dae"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20251210.0",
-    "@dxos/types": "0.8.4-main.bc674ce"
+    "@cloudflare/workers-types": "^4.20260302.0",
+    "@dxos/types": "0.8.4-main.c85a9c8dae"
   },
   "publishConfig": {
     "access": "public"

package/src/internal/adapter.ts

@@ -9,11 +9,11 @@ import { SpaceId } from '@dxos/keys';
 import { type EdgeFunctionEnv } from '@dxos/protocols';
 
 export const queryToDataServiceRequest = (query: QueryAST.Query): EdgeFunctionEnv.QueryRequest => {
-  const { filter, options } = isSimpleSelectionQuery(query) ?? failUndefined();
-  invariant(options?.spaceIds?.length === 1, 'Only one space is supported');
+  const { filter, spaceIds } = extractSimpleQuery(query) ?? failUndefined();
+  invariant(spaceIds?.length === 1, 'Only one space is supported');
   invariant(filter.type === 'object', 'Only object filters are supported');
 
-  const spaceId = options.spaceIds[0];
+  const spaceId = spaceIds[0];
   invariant(SpaceId.isValid(spaceId));
 
   return {
@@ -24,22 +24,26 @@ export const queryToDataServiceRequest = (query: QueryAST.Query): EdgeFunctionEn
 };
 
 /**
- * Extracts the filter and options from a query.
- * Supports Select(...) and Options(Select(...)) queries.
+ * Extracts the filter and space IDs from a query.
+ * Supports Select(...), Options(Select(...)), and From(Select(...)) queries.
  */
-export const isSimpleSelectionQuery = (
+const extractSimpleQuery = (
   query: QueryAST.Query,
-): { filter: QueryAST.Filter; options?: QueryAST.QueryOptions } | null => {
+): { filter: QueryAST.Filter; spaceIds?: readonly string[] } | null => {
   switch (query.type) {
     case 'options': {
-      const maybeFilter = isSimpleSelectionQuery(query.query);
-      if (!maybeFilter) {
+      return extractSimpleQuery(query.query);
+    }
+    case 'from': {
+      const inner = extractSimpleQuery(query.query);
+      if (!inner) {
         return null;
       }
-      return { filter: maybeFilter.filter, options: query.options };
+      const spaceIds = query.from._tag === 'scope' ? query.from.scope.spaceIds : undefined;
+      return { filter: inner.filter, spaceIds: spaceIds ?? inner.spaceIds };
     }
     case 'select': {
-      return { filter: query.filter, options: undefined };
+      return { filter: query.filter };
     }
     default: {
       return null;

package/src/internal/query-service-impl.ts

@@ -94,9 +94,9 @@ export const getTargetSpacesForQuery = (query: QueryAST.Query): SpaceId[] => {
   const spaces = new Set<SpaceId>();
 
   const visitor = (node: QueryAST.Query) => {
-    if (node.type === 'options') {
-      if (node.options.spaceIds) {
-        for (const spaceId of node.options.spaceIds) {
+    if (node.type === 'from' && node.from._tag === 'scope') {
+      if (node.from.scope.spaceIds) {
+        for (const spaceId of node.from.scope.spaceIds) {
           spaces.add(SpaceId.make(spaceId));
         }
       }

package/src/internal/queue-service-impl.ts

@@ -2,55 +2,43 @@
 // Copyright 2025 DXOS.org
 //
 
-import { NotImplementedError, RuntimeServiceError } from '@dxos/errors';
-import { invariant } from '@dxos/invariant';
-import { type QueueService as QueueServiceProto } from '@dxos/protocols';
-import type {
-  DeleteFromQueueRequest,
-  EdgeFunctionEnv,
-  InsertIntoQueueRequest,
-  QueryQueueRequest,
-  QueryResult,
-} from '@dxos/protocols';
+import { RuntimeServiceError } from '@dxos/errors';
+import { type EdgeFunctionEnv, type FeedProtocol } from '@dxos/protocols';
 
-export class QueueServiceImpl implements QueueServiceProto {
+export class QueueServiceImpl implements FeedProtocol.QueueService {
   constructor(
     protected _ctx: EdgeFunctionEnv.ExecutionContext,
     private readonly _queueService: EdgeFunctionEnv.QueueService,
   ) {}
-  async queryQueue(request: QueryQueueRequest): Promise<QueryResult> {
-    const { query } = request;
-    const { queueIds, ...filter } = query!;
-    const spaceId = query!.spaceId;
-    const queueId = queueIds?.[0];
-    invariant(request.query.queuesNamespace);
+
+  async queryQueue(request: FeedProtocol.QueryQueueRequest): Promise<FeedProtocol.QueryResult> {
     try {
-      using result = await this._queueService.query(
-        this._ctx,
-        `dxn:queue:${request.query.queuesNamespace}:${spaceId}:${queueId}`,
-        filter,
-      );
+      using result = await this._queueService.queryQueue(this._ctx, request);
+      // Copy to avoid hanging RPC stub (Workers RPC lifecycle).
       return {
-        // Copy returned object to avoid hanging RPC stub
-        // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
         objects: structuredClone(result.objects),
         nextCursor: result.nextCursor,
         prevCursor: result.prevCursor,
       };
     } catch (error) {
+      const { query } = request;
       throw RuntimeServiceError.wrap({
         message: 'Queue query failed.',
-        context: { subspaceTag: request.query.queuesNamespace, spaceId, queueId },
+        context: {
+          subspaceTag: query?.queuesNamespace,
+          spaceId: query?.spaceId,
+          queueId: query?.queueIds?.[0],
+        },
         ifTypeDiffers: true,
       })(error);
     }
   }
 
-  async insertIntoQueue(request: InsertIntoQueueRequest): Promise<void> {
-    const { subspaceTag, spaceId, queueId, objects } = request;
+  async insertIntoQueue(request: FeedProtocol.InsertIntoQueueRequest): Promise<void> {
     try {
-      await this._queueService.append(this._ctx, `dxn:queue:${subspaceTag}:${spaceId}:${queueId}`, objects ?? []);
+      using _ = await this._queueService.insertIntoQueue(this._ctx, request);
     } catch (error) {
+      const { subspaceTag, spaceId, queueId } = request;
       throw RuntimeServiceError.wrap({
         message: 'Queue append failed.',
         context: { subspaceTag, spaceId, queueId },
@@ -59,11 +47,20 @@ export class QueueServiceImpl implements QueueServiceProto {
     }
   }
 
-  deleteFromQueue(request: DeleteFromQueueRequest): Promise<void> {
-    const { subspaceTag, spaceId, queueId } = request;
-    throw new NotImplementedError({
-      message: 'Deleting from queue is not supported.',
-      context: { subspaceTag, spaceId, queueId },
-    });
+  async deleteFromQueue(request: FeedProtocol.DeleteFromQueueRequest): Promise<void> {
+    try {
+      using _ = await this._queueService.deleteFromQueue(this._ctx, request);
+    } catch (error) {
+      const { subspaceTag, spaceId, queueId } = request;
+      throw RuntimeServiceError.wrap({
+        message: 'Queue delete failed.',
+        context: { subspaceTag, spaceId, queueId },
+        ifTypeDiffers: true,
+      })(error);
+    }
+  }
+
+  async syncQueue(_: FeedProtocol.SyncQueueRequest): Promise<void> {
+    // No-op in Cloudflare runtime.
   }
 }

package/src/internal/service-container.ts

@@ -4,9 +4,7 @@
 
 import { type AnyEntity } from '@dxos/echo/internal';
 import { type DXN, type SpaceId } from '@dxos/keys';
-import type { QueryResult } from '@dxos/protocols';
-import { type EdgeFunctionEnv } from '@dxos/protocols';
-import { type QueueService as QueueServiceProto } from '@dxos/protocols';
+import { type EdgeFunctionEnv, type FeedProtocol } from '@dxos/protocols';
 import { type QueryService as QueryServiceProto } from '@dxos/protocols/proto/dxos/echo/query';
 import type { DataService as DataServiceProto } from '@dxos/protocols/proto/dxos/echo/service';
 
@@ -40,7 +38,7 @@ export class ServiceContainer {
   async createServices(): Promise<{
     dataService: DataServiceProto;
     queryService: QueryServiceProto;
-    queueService: QueueServiceProto;
+    queueService: FeedProtocol.QueueService;
     functionsAiService: EdgeFunctionEnv.FunctionsAiService;
   }> {
     const dataService = new DataServiceImpl(this._executionContext, this._dataService);
@@ -55,11 +53,19 @@ export class ServiceContainer {
     };
   }
 
-  async queryQueue(queue: DXN): Promise<QueryResult> {
-    const { spaceId } = queue.asQueueDXN() ?? {};
-    using result = (await this._queueService.query({}, queue.toString(), { spaceId: spaceId! })) as any;
-    // Copy returned object to avoid hanging RPC stub
-    // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
+  async queryQueue(queue: DXN): Promise<FeedProtocol.QueryResult> {
+    const parts = queue.asQueueDXN();
+    if (!parts) {
+      throw new Error('Invalid queue DXN');
+    }
+    const { subspaceTag, spaceId, queueId } = parts;
+    const result = await this._queueService.queryQueue(this._executionContext, {
+      query: {
+        spaceId,
+        queuesNamespace: subspaceTag,
+        queueIds: [queueId],
+      },
+    });
     return {
       objects: structuredClone(result.objects),
       nextCursor: result.nextCursor ?? null,
@@ -68,6 +74,16 @@ export class ServiceContainer {
   }
 
   async insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void> {
-    await this._queueService.append({}, queue.toString(), objects);
+    const parts = queue.asQueueDXN();
+    if (!parts) {
+      throw new Error('Invalid queue DXN');
+    }
+    const { subspaceTag, spaceId, queueId } = parts;
+    await this._queueService.insertIntoQueue(this._executionContext, {
+      subspaceTag,
+      spaceId,
+      queueId,
+      objects: objects as FeedProtocol.InsertIntoQueueRequest['objects'],
+    });
   }
 }

package/src/queues-api.ts

@@ -4,7 +4,7 @@
 
 import { type AnyEntity } from '@dxos/echo/internal';
 import type { DXN, SpaceId } from '@dxos/keys';
-import type { QueryResult } from '@dxos/protocols';
+import { type FeedProtocol } from '@dxos/protocols';
 
 import type { ServiceContainer } from './internal';
 
@@ -14,7 +14,7 @@ import type { ServiceContainer } from './internal';
  * @deprecated
  */
 export interface QueuesAPI {
-  queryQueue(queue: DXN, options?: {}): Promise<QueryResult>;
+  queryQueue(queue: DXN, options?: {}): Promise<FeedProtocol.QueryResult>;
   insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void>;
 }
 
@@ -27,7 +27,7 @@ export class QueuesAPIImpl implements QueuesAPI {
     private readonly _spaceId: SpaceId,
   ) {}
 
-  queryQueue(queue: DXN, options?: {}): Promise<QueryResult> {
+  queryQueue(queue: DXN, options?: {}): Promise<FeedProtocol.QueryResult> {
     return this._serviceContainer.queryQueue(queue);
   }