@dxos/functions-runtime-cloudflare 0.8.4-main.ef1bc66f44 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions-runtime-cloudflare",
-  "version": "0.8.4-main.ef1bc66f44",
+  "version": "0.8.4-main.fcfe5033a5",
   "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.16",
-    "@dxos/codec-protobuf": "0.8.4-main.ef1bc66f44",
-    "@dxos/debug": "0.8.4-main.ef1bc66f44",
-    "@dxos/echo": "0.8.4-main.ef1bc66f44",
-    "@dxos/context": "0.8.4-main.ef1bc66f44",
-    "@dxos/echo-protocol": "0.8.4-main.ef1bc66f44",
-    "@dxos/errors": "0.8.4-main.ef1bc66f44",
-    "@dxos/invariant": "0.8.4-main.ef1bc66f44",
-    "@dxos/keys": "0.8.4-main.ef1bc66f44",
-    "@dxos/echo-db": "0.8.4-main.ef1bc66f44",
-    "@dxos/log": "0.8.4-main.ef1bc66f44",
-    "@dxos/protocols": "0.8.4-main.ef1bc66f44",
-    "@dxos/util": "0.8.4-main.ef1bc66f44"
+    "effect": "3.20.0",
+    "@dxos/context": "0.8.4-main.fcfe5033a5",
+    "@dxos/codec-protobuf": "0.8.4-main.fcfe5033a5",
+    "@dxos/debug": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo-protocol": "0.8.4-main.fcfe5033a5",
+    "@dxos/invariant": "0.8.4-main.fcfe5033a5",
+    "@dxos/errors": "0.8.4-main.fcfe5033a5",
+    "@dxos/keys": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo-db": "0.8.4-main.fcfe5033a5",
+    "@dxos/protocols": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20251210.0",
-    "@dxos/types": "0.8.4-main.ef1bc66f44"
+    "@cloudflare/workers-types": "^4.20260302.0",
+    "@dxos/types": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/functions-client.ts

@@ -24,7 +24,7 @@ type Services = {
 export class FunctionsClient extends Resource {
   private readonly _serviceContainer;
   private readonly _echoClient;
-  private readonly _executionContext: EdgeFunctionEnv.ExecutionContext = {};
+  private readonly _executionContext: EdgeFunctionEnv.TraceContext = {};
 
   private readonly _spaces = new Map<SpaceId, SpaceProxy>();
 

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

@@ -30,7 +30,7 @@ export class DataServiceImpl implements DataServiceProto {
   private dataSubscriptions = new Map<string, { spaceId: SpaceId; next: (msg: BatchedDocumentUpdates) => void }>();
 
   constructor(
-    private _executionContext: EdgeFunctionEnv.ExecutionContext,
+    private _executionContext: EdgeFunctionEnv.TraceContext,
     private _dataService: EdgeFunctionEnv.DataService,
   ) {}
 
@@ -80,7 +80,8 @@ export class DataServiceImpl implements DataServiceProto {
   }
 
   async createDocument({ spaceId, initialValue }: CreateDocumentRequest): Promise<CreateDocumentResponse> {
-    using response = await this._dataService.createDocument(this._executionContext, { spaceId, initialValue });
+    invariant(SpaceId.isValid(spaceId));
+    using response = await this._dataService.createDocument(this._executionContext, spaceId, initialValue);
     return { documentId: response.documentId };
   }
 

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

@@ -2,71 +2,36 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
-
 import { Stream } from '@dxos/codec-protobuf/stream';
-import { QueryAST } from '@dxos/echo-protocol';
 import { NotImplementedError, RuntimeServiceError } from '@dxos/errors';
-import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
-import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type EdgeFunctionEnv } from '@dxos/protocols';
-import {
-  type QueryRequest,
-  type QueryResponse,
-  type QueryResult as QueryResultProto,
-  type QueryService as QueryServiceProto,
-} from '@dxos/protocols/proto/dxos/echo/query';
-
-import { queryToDataServiceRequest } from './adapter';
-import { copyUint8Array } from './utils';
+import { type QueryRequest, type QueryResponse, type QueryService } from '@dxos/protocols/proto/dxos/echo/query';
 
-export class QueryServiceImpl implements QueryServiceProto {
+export class QueryServiceImpl implements QueryService {
   private _queryCount = 0;
 
   constructor(
-    private readonly _executionContext: EdgeFunctionEnv.ExecutionContext,
+    private readonly _executionContext: EdgeFunctionEnv.TraceContext,
     private readonly _dataService: EdgeFunctionEnv.DataService,
   ) {}
 
   execQuery(request: QueryRequest): Stream<QueryResponse> {
     log.info('execQuery', { request });
-    const query = QueryAST.Query.pipe(Schema.decodeUnknownSync)(JSON.parse(request.query));
-    const requestedSpaceIds = getTargetSpacesForQuery(query);
-    invariant(requestedSpaceIds.length === 1, 'Only one space is supported');
-    const spaceId = requestedSpaceIds[0];
 
     return Stream.fromPromise<QueryResponse>(
       (async () => {
         try {
           this._queryCount++;
-          log.info('begin query', { spaceId });
-          using queryResponse = await this._dataService.queryDocuments(
-            this._executionContext,
-            queryToDataServiceRequest(query),
-          );
-          log.info('query response', { spaceId, filter: request.filter, resultCount: queryResponse.results.length });
-          return {
-            results: queryResponse.results.map(
-              (object): QueryResultProto => ({
-                id: object.objectId,
-                spaceId,
-                spaceKey: PublicKey.ZERO,
-                documentId: object.document.documentId,
-                // Rank 1 for predicate matches where ranking is not determined.
-                rank: 1,
-                // Copy returned object to avoid hanging RPC stub.
-                // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
-                documentAutomerge: copyUint8Array(object.document.data),
-              }),
-            ),
-          } satisfies QueryResponse;
+          log.info('begin query', { request });
+          using queryResponse = await this._dataService.execQuery(this._executionContext, request);
+          log.info('query response', { resultCount: queryResponse.results?.length });
+          return structuredClone(queryResponse);
         } catch (error) {
           log.error('query failed', { err: error });
           throw new RuntimeServiceError({
             message: `Query execution failed (queryCount=${this._queryCount})`,
-            context: { spaceId, filter: request.filter, queryCount: this._queryCount },
+            context: { queryCount: this._queryCount },
             cause: error,
           });
         }
@@ -86,22 +51,3 @@ export class QueryServiceImpl implements QueryServiceProto {
     });
   }
 }
-
-/**
- * Lists spaces this query will select from.
- */
-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) {
-          spaces.add(SpaceId.make(spaceId));
-        }
-      }
-    }
-  };
-  QueryAST.visit(query, visitor);
-  return [...spaces];
-};

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

@@ -2,48 +2,43 @@
 // Copyright 2025 DXOS.org
 //
 
-import { NotImplementedError, RuntimeServiceError } from '@dxos/errors';
-import { invariant } from '@dxos/invariant';
+import { RuntimeServiceError } from '@dxos/errors';
 import { type EdgeFunctionEnv, type FeedProtocol } from '@dxos/protocols';
 
 export class QueueServiceImpl implements FeedProtocol.QueueService {
   constructor(
-    protected _ctx: EdgeFunctionEnv.ExecutionContext,
+    protected _ctx: EdgeFunctionEnv.TraceContext,
     private readonly _queueService: EdgeFunctionEnv.QueueService,
   ) {}
+
   async queryQueue(request: FeedProtocol.QueryQueueRequest): Promise<FeedProtocol.QueryResult> {
-    const { query } = request;
-    const { queueIds, ...filter } = query!;
-    const spaceId = query!.spaceId;
-    const queueId = queueIds?.[0];
-    invariant(request.query.queuesNamespace);
     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: FeedProtocol.InsertIntoQueueRequest): Promise<void> {
-    const { subspaceTag, spaceId, queueId, objects } = request;
     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 },
@@ -52,11 +47,20 @@ export class QueueServiceImpl implements FeedProtocol.QueueService {
     }
   }
 
-  deleteFromQueue(request: FeedProtocol.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

@@ -17,7 +17,7 @@ import { QueueServiceImpl } from './queue-service-impl';
  */
 export class ServiceContainer {
   constructor(
-    private readonly _executionContext: EdgeFunctionEnv.ExecutionContext,
+    private readonly _executionContext: EdgeFunctionEnv.TraceContext,
     private readonly _dataService: EdgeFunctionEnv.DataService,
     private readonly _queueService: EdgeFunctionEnv.QueueService,
     private readonly _functionsService: EdgeFunctionEnv.FunctionsAiService,
@@ -54,10 +54,18 @@ export class ServiceContainer {
   }
 
   async queryQueue(queue: DXN): Promise<FeedProtocol.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/
+    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,
@@ -66,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/space-proxy.ts

@@ -61,6 +61,6 @@ export class SpaceProxy extends Resource {
       owningObject: this,
     });
 
-    await this._db.coreDatabase.open({ rootUrl: meta.rootDocumentId });
+    await this._db.coreDatabase.open(this._ctx, { rootUrl: meta.rootDocumentId });
   }
 }

package/dist/types/src/internal/adapter.d.ts

@@ -1,12 +0,0 @@
-import { type QueryAST } from '@dxos/echo-protocol';
-import { type EdgeFunctionEnv } from '@dxos/protocols';
-export declare const queryToDataServiceRequest: (query: QueryAST.Query) => EdgeFunctionEnv.QueryRequest;
-/**
- * Extracts the filter and options from a query.
- * Supports Select(...) and Options(Select(...)) queries.
- */
-export declare const isSimpleSelectionQuery: (query: QueryAST.Query) => {
-    filter: QueryAST.Filter;
-    options?: QueryAST.QueryOptions;
-} | null;
-//# sourceMappingURL=adapter.d.ts.map

package/dist/types/src/internal/adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../../../src/internal/adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,yBAAyB,GAAI,OAAO,QAAQ,CAAC,KAAK,KAAG,eAAe,CAAC,YAajF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GACjC,OAAO,QAAQ,CAAC,KAAK,KACpB;IAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,YAAY,CAAA;CAAE,GAAG,IAgBjE,CAAC"}

package/src/internal/adapter.ts

@@ -1,48 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { failUndefined } from '@dxos/debug';
-import { type QueryAST } from '@dxos/echo-protocol';
-import { invariant } from '@dxos/invariant';
-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');
-  invariant(filter.type === 'object', 'Only object filters are supported');
-
-  const spaceId = options.spaceIds[0];
-  invariant(SpaceId.isValid(spaceId));
-
-  return {
-    spaceId,
-    type: filter.typename ?? undefined,
-    objectIds: [...(filter.id ?? [])],
-  };
-};
-
-/**
- * Extracts the filter and options from a query.
- * Supports Select(...) and Options(Select(...)) queries.
- */
-export const isSimpleSelectionQuery = (
-  query: QueryAST.Query,
-): { filter: QueryAST.Filter; options?: QueryAST.QueryOptions } | null => {
-  switch (query.type) {
-    case 'options': {
-      const maybeFilter = isSimpleSelectionQuery(query.query);
-      if (!maybeFilter) {
-        return null;
-      }
-      return { filter: maybeFilter.filter, options: query.options };
-    }
-    case 'select': {
-      return { filter: query.filter, options: undefined };
-    }
-    default: {
-      return null;
-    }
-  }
-};