@dxos/functions-runtime-cloudflare 0.8.4-main.70d3990 → 0.8.4-main.765dc60934

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@dxos/functions-runtime-cloudflare",
-  "version": "0.8.4-main.70d3990",
+  "version": "0.8.4-main.765dc60934",
   "description": "Functions runtime for Cloudflare.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "info@dxos.org",
   "sideEffects": false,
   "type": "module",
@@ -23,22 +27,23 @@
     "src"
   ],
   "dependencies": {
-    "effect": "3.18.3",
-    "@dxos/codec-protobuf": "0.8.4-main.70d3990",
-    "@dxos/debug": "0.8.4-main.70d3990",
-    "@dxos/context": "0.8.4-main.70d3990",
-    "@dxos/echo": "0.8.4-main.70d3990",
-    "@dxos/invariant": "0.8.4-main.70d3990",
-    "@dxos/log": "0.8.4-main.70d3990",
-    "@dxos/keys": "0.8.4-main.70d3990",
-    "@dxos/util": "0.8.4-main.70d3990",
-    "@dxos/echo-protocol": "0.8.4-main.70d3990",
-    "@dxos/protocols": "0.8.4-main.70d3990",
-    "@dxos/echo-db": "0.8.4-main.70d3990"
+    "effect": "3.20.0",
+    "@dxos/debug": "0.8.4-main.765dc60934",
+    "@dxos/codec-protobuf": "0.8.4-main.765dc60934",
+    "@dxos/echo-protocol": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/errors": "0.8.4-main.765dc60934",
+    "@dxos/echo-db": "0.8.4-main.765dc60934",
+    "@dxos/keys": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
-    "@cloudflare/workers-types": "4.20251106.1",
-    "@dxos/types": "0.8.4-main.70d3990"
+    "@cloudflare/workers-types": "^4.20260302.0",
+    "@dxos/types": "0.8.4-main.765dc60934"
   },
   "publishConfig": {
     "access": "public"

package/src/functions-client.ts

@@ -14,6 +14,7 @@ import { SpaceProxy } from './space-proxy';
 type Services = {
   dataService: EdgeFunctionEnv.DataService;
   queueService: EdgeFunctionEnv.QueueService;
+  functionsAiService: EdgeFunctionEnv.FunctionsAiService;
 };
 
 /**
@@ -23,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>();
 
@@ -31,7 +32,12 @@ export class FunctionsClient extends Resource {
     super();
     invariant(typeof services.dataService !== 'undefined', 'DataService is required');
     invariant(typeof services.queueService !== 'undefined', 'QueueService is required');
-    this._serviceContainer = new ServiceContainer(this._executionContext, services.dataService, services.queueService);
+    this._serviceContainer = new ServiceContainer(
+      this._executionContext,
+      services.dataService,
+      services.queueService,
+      services.functionsAiService,
+    );
     this._echoClient = new EchoClient({});
   }
 
@@ -69,13 +75,8 @@ export const createClientFromEnv = async (env: any): Promise<FunctionsClient> =>
   const client = new FunctionsClient({
     dataService: env.DATA_SERVICE,
     queueService: env.QUEUE_SERVICE,
+    functionsAiService: env.FUNCTIONS_AI_SERVICE,
   });
   await client.open();
   return client;
 };
-
-/**
- - Provides data access capabilities for user functions.
- - No real-time replication or reactive queries -- function receives a snapshot.
- - Function event contains the metadata but doesn't need to include the data.
- */

package/src/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './functions-client';
 export * from './internal';
 export * from './types';
 export * from './wrap-handler-for-cloudflare';
+export * from './logger';

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

@@ -5,12 +5,15 @@
 import type { RequestOptions } from '@dxos/codec-protobuf';
 import { Stream } from '@dxos/codec-protobuf/stream';
 import { raise } from '@dxos/debug';
+import { NotImplementedError, RuntimeServiceError } from '@dxos/errors';
 import { invariant } from '@dxos/invariant';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type EdgeFunctionEnv } from '@dxos/protocols';
 import type {
   BatchedDocumentUpdates,
+  CreateDocumentRequest,
+  CreateDocumentResponse,
   DataService as DataServiceProto,
   GetDocumentHeadsRequest,
   GetDocumentHeadsResponse,
@@ -21,11 +24,13 @@ import type {
   UpdateSubscriptionRequest,
 } from '@dxos/protocols/proto/dxos/echo/service';
 
+import { copyUint8Array } from './utils';
+
 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,
   ) {}
 
@@ -40,54 +45,104 @@ export class DataServiceImpl implements DataServiceProto {
     });
   }
 
-  async updateSubscription({ subscriptionId, addIds, removeIds }: UpdateSubscriptionRequest): Promise<void> {
-    const sub = this.dataSubscriptions.get(subscriptionId) ?? raise(new Error('Subscription not found'));
+  async updateSubscription({ subscriptionId, addIds }: UpdateSubscriptionRequest): Promise<void> {
+    const sub =
+      this.dataSubscriptions.get(subscriptionId) ??
+      raise(
+        new RuntimeServiceError({
+          message: 'Subscription not found.',
+          context: { subscriptionId },
+        }),
+      );
 
     if (addIds) {
       log.info('request documents', { count: addIds.length });
       // TODO(dmaretskyi): Batch.
       for (const documentId of addIds) {
-        const document = await this._dataService.getDocument(this._executionContext, sub.spaceId, documentId);
+        using document = await this._dataService.getDocument(this._executionContext, sub.spaceId, documentId);
         log.info('document loaded', { documentId, spaceId: sub.spaceId, found: !!document });
         if (!document) {
           log.warn('not found', { documentId });
           continue;
         }
-        sub.next({ updates: [{ documentId, mutation: document.data }] });
+        sub.next({
+          updates: [
+            {
+              documentId,
+              // Copy returned object to avoid hanging RPC stub
+              // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
+              mutation: copyUint8Array(document.data),
+            },
+          ],
+        });
       }
     }
   }
 
+  async createDocument({ spaceId, initialValue }: CreateDocumentRequest): Promise<CreateDocumentResponse> {
+    invariant(SpaceId.isValid(spaceId));
+    using response = await this._dataService.createDocument(this._executionContext, spaceId, initialValue);
+    return { documentId: response.documentId };
+  }
+
   async update({ updates, subscriptionId }: UpdateRequest): Promise<void> {
-    const sub = this.dataSubscriptions.get(subscriptionId) ?? raise(new Error('Subscription not found'));
+    const sub =
+      this.dataSubscriptions.get(subscriptionId) ??
+      raise(
+        new RuntimeServiceError({
+          message: 'Subscription not found.',
+          context: { subscriptionId },
+        }),
+      );
     // TODO(dmaretskyi): Batch.
-    for (const update of updates ?? []) {
-      await this._dataService.changeDocument(this._executionContext, sub.spaceId, update.documentId, update.mutation);
+    try {
+      for (const update of updates ?? []) {
+        // Mutation-less updates (e.g. `requesting: true` transition signals from the worker) carry no
+        // bytes to apply; this runtime only forwards real document writes.
+        if (!update.mutation) {
+          continue;
+        }
+        await this._dataService.changeDocument(this._executionContext, sub.spaceId, update.documentId, update.mutation);
+      }
+    } catch (error) {
+      throw RuntimeServiceError.wrap({
+        message: 'Failed to apply document updates.',
+        context: { subscriptionId },
+        ifTypeDiffers: true,
+      })(error);
     }
-    throw new Error('Method not implemented.');
   }
 
   async flush(): Promise<void> {
     // No-op.
   }
 
-  subscribeSpaceSyncState(request: GetSpaceSyncStateRequest, options?: RequestOptions): Stream<SpaceSyncState> {
-    throw new Error('Method not implemented.');
+  subscribeSpaceSyncState(_request: GetSpaceSyncStateRequest, _options?: RequestOptions): Stream<SpaceSyncState> {
+    throw new NotImplementedError({
+      message: 'subscribeSpaceSyncState is not implemented.',
+    });
   }
 
-  async getDocumentHeads({ documentIds }: GetDocumentHeadsRequest): Promise<GetDocumentHeadsResponse> {
-    throw new Error('Method not implemented.');
+  async getDocumentHeads({ documentIds: _documentIds }: GetDocumentHeadsRequest): Promise<GetDocumentHeadsResponse> {
+    throw new NotImplementedError({
+      message: 'getDocumentHeads is not implemented.',
+    });
   }
 
-  async reIndexHeads({ documentIds }: ReIndexHeadsRequest): Promise<void> {
-    throw new Error('Method not implemented.');
+  async reIndexHeads({ documentIds: _documentIds }: ReIndexHeadsRequest): Promise<void> {
+    throw new NotImplementedError({
+      message: 'reIndexHeads is not implemented.',
+    });
   }
 
   async updateIndexes(): Promise<void> {
-    throw new Error('Method not implemented.');
+    log.verbose('updateIndexes called, but it is a no-op in EDGE env.');
+    // No-op.
   }
 
-  async waitUntilHeadsReplicated({ heads }: { heads: any }): Promise<void> {
-    throw new Error('Method not implemented.');
+  async waitUntilHeadsReplicated({ heads: _heads }: { heads: any }): Promise<void> {
+    throw new NotImplementedError({
+      message: 'waitUntilHeadsReplicated is not implemented.',
+    });
   }
 }

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

@@ -2,90 +2,52 @@
 // Copyright 2024 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
-
 import { Stream } from '@dxos/codec-protobuf/stream';
-import { QueryAST } from '@dxos/echo-protocol';
-import { invariant } from '@dxos/invariant';
-import { PublicKey } from '@dxos/keys';
-import { SpaceId } from '@dxos/keys';
+import { NotImplementedError, RuntimeServiceError } from '@dxos/errors';
 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 { type QueryRequest, type QueryResponse, type QueryService } from '@dxos/protocols/proto/dxos/echo/query';
 
-import { queryToDataServiceRequest } from './adapter';
+export class QueryServiceImpl implements QueryService {
+  private _queryCount = 0;
 
-export class QueryServiceImpl implements QueryServiceProto {
   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 {
-          log.info('begin query', { spaceId });
-          const 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: 0,
-                documentAutomerge: object.document.data,
-              }),
-            ),
-          } satisfies QueryResponse;
-        } catch (err) {
-          log.error('query failed', { err });
-          throw err;
+          this._queryCount++;
+          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: { queryCount: this._queryCount },
+            cause: error,
+          });
         }
       })(),
     );
   }
 
   async reindex() {
-    throw new Error('Method not implemented.');
+    throw new NotImplementedError({
+      message: 'Reindex is not implemented.',
+    });
   }
 
   async setConfig() {
-    throw new Error('Method not implemented.');
+    throw new NotImplementedError({
+      message: 'SetConfig is not implemented.',
+    });
   }
 }
-
-/**
- * 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,22 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
-import type { ObjectId, SpaceId } from '@dxos/keys';
-import { type QueueService as QueueServiceProto } from '@dxos/protocols';
-import type { EdgeFunctionEnv, QueryResult, QueueQuery } 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,
+    protected _ctx: EdgeFunctionEnv.TraceContext,
     private readonly _queueService: EdgeFunctionEnv.QueueService,
   ) {}
-  queryQueue(subspaceTag: string, spaceId: SpaceId, { queueId, ...query }: QueueQuery): Promise<QueryResult> {
-    return this._queueService.query(this._ctx, `dxn:queue:${subspaceTag}:${spaceId}:${queueId}`, query);
+
+  async queryQueue(request: FeedProtocol.QueryQueueRequest): Promise<FeedProtocol.QueryResult> {
+    try {
+      using result = await this._queueService.queryQueue(this._ctx, request);
+      // Copy to avoid hanging RPC stub (Workers RPC lifecycle).
+      return {
+        objects: structuredClone(result.objects),
+        nextCursor: result.nextCursor,
+        prevCursor: result.prevCursor,
+      };
+    } catch (error) {
+      const { query } = request;
+      throw RuntimeServiceError.wrap({
+        message: 'Queue query failed.',
+        context: {
+          subspaceTag: query?.queuesNamespace,
+          spaceId: query?.spaceId,
+          queueId: query?.queueIds?.[0],
+        },
+        ifTypeDiffers: true,
+      })(error);
+    }
   }
-  insertIntoQueue(subspaceTag: string, spaceId: SpaceId, queueId: ObjectId, objects: unknown[]): Promise<void> {
-    return this._queueService.append(this._ctx, `dxn:queue:${subspaceTag}:${spaceId}:${queueId}`, objects);
+
+  async insertIntoQueue(request: FeedProtocol.InsertIntoQueueRequest): Promise<void> {
+    try {
+      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 },
+        ifTypeDiffers: true,
+      })(error);
+    }
   }
-  deleteFromQueue(subspaceTag: string, spaceId: SpaceId, queueId: ObjectId, objectIds: ObjectId[]): Promise<void> {
-    throw new Error('Deleting from queue is not supported.');
+
+  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

@@ -2,13 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import type { HasId } from '@dxos/echo/internal';
+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';
+import { type DataService as DataServiceProto } from '@dxos/protocols/proto/dxos/echo/service';
 
 import { DataServiceImpl } from './data-service-impl';
 import { QueryServiceImpl } from './query-service-impl';
@@ -19,19 +17,29 @@ 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,
   ) {}
 
   async getSpaceMeta(spaceId: SpaceId): Promise<EdgeFunctionEnv.SpaceMeta | undefined> {
-    return this._dataService.getSpaceMeta(this._executionContext, spaceId);
+    using result = await this._dataService.getSpaceMeta(this._executionContext, spaceId);
+    // Copy returned object to avoid hanging RPC stub
+    // See https://developers.cloudflare.com/workers/runtime-apis/rpc/lifecycle/
+    return result
+      ? {
+          spaceKey: result.spaceKey,
+          rootDocumentId: result.rootDocumentId,
+        }
+      : undefined;
   }
 
   async createServices(): Promise<{
     dataService: DataServiceProto;
     queryService: QueryServiceProto;
-    queueService: QueueServiceProto;
+    queueService: FeedProtocol.QueueService;
+    functionsAiService: EdgeFunctionEnv.FunctionsAiService;
   }> {
     const dataService = new DataServiceImpl(this._executionContext, this._dataService);
     const queryService = new QueryServiceImpl(this._executionContext, this._dataService);
@@ -41,14 +49,44 @@ export class ServiceContainer {
       dataService,
       queryService,
       queueService,
+      functionsAiService: this._functionsService,
     };
   }
 
-  queryQueue(queue: DXN): Promise<QueryResult> {
-    return this._queueService.query({}, queue.toString(), {});
+  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,
+      prevCursor: result.prevCursor ?? null,
+    };
   }
 
-  insertIntoQueue(queue: DXN, objects: HasId[]): Promise<void> {
-    return this._queueService.append({}, queue.toString(), objects);
+  async insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void> {
+    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.map((obj) => JSON.stringify(obj)),
+    });
   }
 }

package/src/internal/utils.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export const copyUint8Array = (value: Uint8Array): Uint8Array => new Uint8Array(value);

package/src/logger.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+/* eslint-disable no-console */
+
+import { LogLevel, type LogProcessor, log, shouldLog } from '@dxos/log';
+
+export const setupFunctionsLogger = () => {
+  log.runtimeConfig.processors.length = 0;
+  log.runtimeConfig.processors.push(functionLogProcessor);
+};
+
+const functionLogProcessor: LogProcessor = (config, entry) => {
+  if (!shouldLog(entry, config.filters)) {
+    return;
+  }
+
+  const context = entry.computedContext;
+  const error = entry.computedError;
+  const extras = [Object.keys(context).length > 0 ? context : undefined, error].filter((value) => value !== undefined);
+
+  switch (entry.level) {
+    case LogLevel.DEBUG:
+    case LogLevel.TRACE:
+      console.debug(entry.message, ...extras);
+      break;
+    case LogLevel.VERBOSE:
+      console.log(entry.message, ...extras);
+      break;
+    case LogLevel.INFO:
+      console.info(entry.message, ...extras);
+      break;
+    case LogLevel.WARN:
+      console.warn(entry.message, ...extras);
+      break;
+    case LogLevel.ERROR:
+      console.error(entry.message, ...extras);
+      break;
+    default:
+      console.log(entry.message, ...extras);
+      break;
+  }
+};

package/src/queues-api.ts

@@ -2,20 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import type { HasId } from '@dxos/echo/internal';
+import { type AnyEntity } from '@dxos/echo/internal';
 import type { DXN, SpaceId } from '@dxos/keys';
-import type { QueryResult } from '@dxos/protocols';
+import { log } from '@dxos/log';
 
 import type { ServiceContainer } from './internal';
 
+export interface QueuesQueryResult {
+  objects: AnyEntity[];
+  nextCursor: string | null;
+  prevCursor: string | null;
+}
+
 // TODO(dmaretskyi): Temporary API to get the queues working.
 // TODO(dmaretskyi): To be replaced with integrating queues into echo.
 /**
  * @deprecated
  */
 export interface QueuesAPI {
-  queryQueue(queue: DXN, options?: {}): Promise<QueryResult>;
-  insertIntoQueue(queue: DXN, objects: HasId[]): Promise<void>;
+  queryQueue(queue: DXN, options?: {}): Promise<QueuesQueryResult>;
+  insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void>;
 }
 
 /**
@@ -27,11 +33,24 @@ export class QueuesAPIImpl implements QueuesAPI {
     private readonly _spaceId: SpaceId,
   ) {}
 
-  queryQueue(queue: DXN, options?: {}): Promise<QueryResult> {
-    return this._serviceContainer.queryQueue(queue);
+  async queryQueue(queue: DXN, options?: {}): Promise<QueuesQueryResult> {
+    const result = await this._serviceContainer.queryQueue(queue);
+    const objects = (result.objects ?? []).flatMap((encoded): AnyEntity[] => {
+      try {
+        return [JSON.parse(encoded) as AnyEntity];
+      } catch (err) {
+        log.verbose('queue object JSON parse failed; object ignored', { encoded, error: err });
+        return [];
+      }
+    });
+    return {
+      objects,
+      nextCursor: result.nextCursor ?? null,
+      prevCursor: result.prevCursor ?? null,
+    };
   }
 
-  insertIntoQueue(queue: DXN, objects: HasId[]): Promise<void> {
+  insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void> {
     // TODO(dmaretskyi): Ugly.
     return this._serviceContainer.insertIntoQueue(queue, JSON.parse(JSON.stringify(objects)));
   }