@dxos/functions-runtime-cloudflare 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/package.json

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

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

@@ -63,4 +63,8 @@ export class QueueServiceImpl implements FeedProtocol.QueueService {
   async syncQueue(_: FeedProtocol.SyncQueueRequest): Promise<void> {
     // No-op in Cloudflare runtime.
   }
+
+  async getSyncState(_: FeedProtocol.GetSyncStateRequest): Promise<FeedProtocol.GetSyncStateResponse> {
+    return { namespaces: [] };
+  }
 }

package/src/internal/service-container.ts

@@ -3,7 +3,7 @@
 //
 
 import { type AnyEntity } from '@dxos/echo/internal';
-import { type DXN, type SpaceId } from '@dxos/keys';
+import { EID, type SpaceId } from '@dxos/keys';
 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';
@@ -53,17 +53,15 @@ export class ServiceContainer {
     };
   }
 
-  async queryQueue(queue: DXN): Promise<FeedProtocol.QueryResult> {
-    const parts = queue.asQueueDXN();
-    if (!parts) {
-      throw new Error('Invalid queue DXN');
+  async queryQueue(queue: EID.EID): Promise<FeedProtocol.QueryResult> {
+    const spaceId = EID.getSpaceId(queue);
+    const queueId = EID.getEntityId(queue);
+    if (!spaceId || !queueId) {
+      throw new Error('Invalid queue EID');
     }
-
-    const { subspaceTag, spaceId, queueId } = parts;
     const result = await this._queueService.queryQueue(this._executionContext, {
       query: {
         spaceId,
-        queuesNamespace: subspaceTag,
         queueIds: [queueId],
       },
     });
@@ -75,15 +73,15 @@ export class ServiceContainer {
     };
   }
 
-  async insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void> {
-    const parts = queue.asQueueDXN();
-    if (!parts) {
-      throw new Error('Invalid queue DXN');
+  async insertIntoQueue(queue: EID.EID, objects: AnyEntity[]): Promise<void> {
+    const spaceId = EID.getSpaceId(queue);
+    const queueId = EID.getEntityId(queue);
+    if (!spaceId || !queueId) {
+      throw new Error('Invalid queue EID');
     }
-
-    const { subspaceTag, spaceId, queueId } = parts;
+    // TODO(dmaretskyi): EID does not encode the subspaceTag — defaulting to 'data'.
     await this._queueService.insertIntoQueue(this._executionContext, {
-      subspaceTag,
+      subspaceTag: 'data',
       spaceId,
       queueId,
       objects: objects.map((obj) => JSON.stringify(obj)),

package/src/queues-api.ts

@@ -3,8 +3,8 @@
 //
 
 import { type AnyEntity } from '@dxos/echo/internal';
-import type { DXN, SpaceId } from '@dxos/keys';
-import { log } from '@dxos/log';
+import { type EID, type SpaceId } from '@dxos/keys';
+import { type FeedProtocol } from '@dxos/protocols';
 
 import type { ServiceContainer } from './internal';
 
@@ -20,8 +20,8 @@ export interface QueuesQueryResult {
  * @deprecated
  */
 export interface QueuesAPI {
-  queryQueue(queue: DXN, options?: {}): Promise<QueuesQueryResult>;
-  insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void>;
+  queryQueue(queue: EID.EID, options?: {}): Promise<FeedProtocol.QueryResult>;
+  insertIntoQueue(queue: EID.EID, objects: AnyEntity[]): Promise<void>;
 }
 
 /**
@@ -33,24 +33,11 @@ export class QueuesAPIImpl implements QueuesAPI {
     private readonly _spaceId: SpaceId,
   ) {}
 
-  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,
-    };
+  queryQueue(queue: EID.EID, options?: {}): Promise<FeedProtocol.QueryResult> {
+    return this._serviceContainer.queryQueue(queue);
   }
 
-  insertIntoQueue(queue: DXN, objects: AnyEntity[]): Promise<void> {
+  insertIntoQueue(queue: EID.EID, objects: AnyEntity[]): Promise<void> {
     // TODO(dmaretskyi): Ugly.
     return this._serviceContainer.insertIntoQueue(queue, JSON.parse(JSON.stringify(objects)));
   }