@dxos/protocols 0.8.4-main.c85a9c8dae → 0.8.4-main.d05673bc65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/protocols",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.d05673bc65",
   "description": "Protobuf definitions for DXOS protocols.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -64,19 +64,19 @@
   ],
   "dependencies": {
     "@bufbuild/protobuf": "2.11.0",
-    "@dxos/codec-protobuf": "0.8.4-main.c85a9c8dae",
-    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
-    "@dxos/effect": "0.8.4-main.c85a9c8dae",
-    "@dxos/errors": "0.8.4-main.c85a9c8dae",
-    "@dxos/keys": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae",
-    "@dxos/timeframe": "0.8.4-main.c85a9c8dae"
+    "@dxos/codec-protobuf": "0.8.4-main.d05673bc65",
+    "@dxos/errors": "0.8.4-main.d05673bc65",
+    "@dxos/effect": "0.8.4-main.d05673bc65",
+    "@dxos/invariant": "0.8.4-main.d05673bc65",
+    "@dxos/keys": "0.8.4-main.d05673bc65",
+    "@dxos/util": "0.8.4-main.d05673bc65",
+    "@dxos/timeframe": "0.8.4-main.d05673bc65"
   },
   "devDependencies": {
     "@bufbuild/buf": "1.65.0",
     "@bufbuild/protoc-gen-es": "2.11.0",
     "effect": "3.19.16",
-    "@dxos/protobuf-compiler": "0.8.4-main.c85a9c8dae"
+    "@dxos/protobuf-compiler": "0.8.4-main.d05673bc65"
   },
   "peerDependencies": {
     "effect": "3.19.16"

package/src/FeedProtocol.ts

@@ -12,7 +12,7 @@ export {
   type SyncQueueRequest,
 } from './proto/gen/dxos/client/services.js';
 
-export const KEY_QUEUE_POSITION = 'dxos.org/key/queue-position';
+export const KEY_QUEUE_POSITION = 'org.dxos.key.queue-position';
 
 import * as Schema from 'effect/Schema';
 

package/src/edge/EdgeFunctionEnv.ts

@@ -6,6 +6,7 @@ import { type SpaceId } from '@dxos/keys';
 
 import type * as FeedProtocol from '../FeedProtocol';
 import { type CreateDocumentRequest, type CreateDocumentResponse } from '../proto/gen/dxos/echo/service';
+import { type QueryRequest, type QueryResponse } from '../proto/gen/dxos/echo/query';
 
 /*
 
@@ -68,36 +69,33 @@ export interface Env {
  *
  * NOTE: Currently unused in functions.
  */
-export interface ExecutionContext {}
+export interface TraceContext {}
 
 /**
  * Database API for other CF services like functions.
  */
 export interface DataService {
-  getSpaceMeta(ctx: ExecutionContext, spaceId: SpaceId): Promise<RpcResult<SpaceMeta | undefined>>;
-  getDocument(ctx: ExecutionContext, spaceId: SpaceId, documentId: string): Promise<RpcResult<RawDocument | undefined>>;
+  getSpaceMeta(ctx: TraceContext, spaceId: SpaceId): Promise<RpcResult<SpaceMeta | undefined>>;
+  getDocument(ctx: TraceContext, spaceId: SpaceId, documentId: string): Promise<RpcResult<RawDocument | undefined>>;
 
-  query(ctx: ExecutionContext, request: QueryRequest): Promise<RpcResult<QueryResponse>>;
-  queryDocuments(ctx: ExecutionContext, request: QueryRequest): Promise<RpcResult<QueryDocumentsResponse>>;
-  queryReferences(ctx: ExecutionContext, request: QueryReferencesRequest): Promise<RpcResult<QueryReferencesResponse>>;
-
-  createDocument(ctx: ExecutionContext, request: CreateDocumentRequest): Promise<RpcResult<CreateDocumentResponse>>;
+  execQuery(ctx: TraceContext, request: QueryRequest): Promise<RpcResult<QueryResponse>>;
+  createDocument(ctx: TraceContext, request: CreateDocumentRequest): Promise<RpcResult<CreateDocumentResponse>>;
 
   // TODO(burdon): Update? Return DocumentEntry?
-  changeDocument(ctx: ExecutionContext, spaceId: SpaceId, documentId: string, changes: Uint8Array): Promise<void>;
+  changeDocument(ctx: TraceContext, spaceId: SpaceId, documentId: string, changes: Uint8Array): Promise<void>;
 }
 
 export interface QueueService {
   queryQueue: (
-    ctx: ExecutionContext,
+    ctx: TraceContext,
     request: FeedProtocol.QueryQueueRequest,
   ) => Promise<RpcResult<FeedProtocol.QueryResult>>;
   insertIntoQueue: (
-    ctx: ExecutionContext,
+    ctx: TraceContext,
     request: FeedProtocol.InsertIntoQueueRequest,
   ) => Promise<RpcResult<RpcDisposable>>;
   deleteFromQueue: (
-    ctx: ExecutionContext,
+    ctx: TraceContext,
     request: FeedProtocol.DeleteFromQueueRequest,
   ) => Promise<RpcResult<RpcDisposable>>;
 }
@@ -125,20 +123,6 @@ export type SpaceMeta = {
   rootDocumentId: string;
 };
 
-export type QueryRequest = {
-  spaceId: string;
-  type?: string;
-  where?: Record<string, any>;
-  objectIds?: string[];
-  cursor?: string;
-  limit?: number;
-};
-
-export type QueryResponse = {
-  results: ObjectSnapshot[];
-  cursor?: string;
-};
-
 /**
  * TODO(yaroslav): make Indexer return EchoObject after create() can properly reconstruct an object
  *   from this structure (meta, id and type aren't handled properly)

package/src/proto/dxos/config.proto

@@ -59,7 +59,7 @@ message Module {
   optional string id = 8;   // TODO(burdon): Ensured FQ (e.g., 'dxos.app.xxx')
   optional string name = 1; // TODO(burdon): Replace with id (or key?)
   optional string type = 2; // TODO(burdon): Define namespace (e.g.,
-                            // 'dxos.org/type/frame' vs. 'dxos.type.frame')
+                            // 'org.dxos.type.frame')
 
   // TODO(burdon): Developer info message.