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

package/src/space-proxy.ts

@@ -3,7 +3,8 @@
 //
 
 import { Resource } from '@dxos/context';
-import { type CoreDatabase, type EchoClient, type EchoDatabase } from '@dxos/echo-db';
+import { type Database } from '@dxos/echo';
+import { type CoreDatabase, type EchoClient, type EchoDatabaseImpl } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { PublicKey, type SpaceId } from '@dxos/keys';
 
@@ -14,7 +15,7 @@ import { type QueuesAPI, QueuesAPIImpl } from './queues-api';
  * @deprecated
  */
 export class SpaceProxy extends Resource {
-  private _db?: EchoDatabase = undefined;
+  private _db?: EchoDatabaseImpl = undefined;
   private _queuesApi: QueuesAPIImpl;
 
   constructor(
@@ -30,7 +31,7 @@ export class SpaceProxy extends Resource {
     return this._id;
   }
 
-  get db(): EchoDatabase {
+  get db(): Database.Database {
     invariant(this._db);
     return this._db;
   }
@@ -60,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/src/wrap-handler-for-cloudflare.ts

@@ -22,7 +22,6 @@ export const wrapHandlerForCloudflare = (func: FunctionProtocol.Func): ExportedH
     // TODO(mykola): Wrap in withNewExecutionContext;
     // Meta route is used to get the input schema of the function by the functions service.
     if (request.headers.get(FUNCTION_ROUTE_HEADER) === FunctionRouteValue.Meta) {
-      log.info('>>> meta', { func });
       return handleFunctionMetaCall(func, request);
     }
 
@@ -34,7 +33,7 @@ export const wrapHandlerForCloudflare = (func: FunctionProtocol.Func): ExportedH
         }
       }
 
-      const serviceContainer = new ServiceContainer({}, env.DATA_SERVICE, env.QUEUE_SERVICE);
+      const serviceContainer = new ServiceContainer({}, env.DATA_SERVICE, env.QUEUE_SERVICE, env.FUNCTIONS_AI_SERVICE);
       const context = await createFunctionContext({
         serviceContainer,
         contextSpaceId: spaceId as SpaceId | undefined,
@@ -98,14 +97,14 @@ const handleFunctionMetaCall = (functionDefinition: FunctionProtocol.Func, reque
   });
 };
 
-const createFunctionContext = async ({
+export const createFunctionContext = async ({
   serviceContainer,
   contextSpaceId,
 }: {
   serviceContainer: ServiceContainer;
   contextSpaceId: SpaceId | undefined;
 }): Promise<FunctionProtocol.Context> => {
-  const { dataService, queryService, queueService } = await serviceContainer.createServices();
+  const { dataService, queryService, queueService, functionsAiService } = await serviceContainer.createServices();
 
   let spaceKey: string | undefined;
   let rootUrl: string | undefined;
@@ -124,6 +123,7 @@ const createFunctionContext = async ({
       dataService,
       queryService,
       queueService,
+      functionsAiService,
     },
     spaceId: contextSpaceId,
     spaceKey,

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;
-    }
-  }
-};