@dxos/functions 0.8.2-main.2f9c567 → 0.8.2-main.30e4dbb

package/dist/types/src/url.d.ts

@@ -6,7 +6,7 @@ export declare const setUserFunctionUrlInMetadata: (meta: ObjectMeta, functionUr
 /**
  * NOTE: functionId is backend ID, not ECHO object id.
  */
-export declare const makeFunctionUrl: (spaceId: SpaceId, fn: {
+export declare const makeFunctionUrl: (fn: {
     functionId: string;
 }) => string;
 export declare const getInvocationUrl: (functionUrl: string, edgeUrl: string, options?: InvocationOptions) => string;

package/dist/types/src/url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/url.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAK1C,eAAO,MAAM,yBAAyB,qCAAqC,CAAC;AAM5E,eAAO,MAAM,4BAA4B,SAAU,UAAU,uBAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,SAAU,UAAU,eAAe,MAAM,SASjF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,YAAa,OAAO,MAAM;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,WAAmC,CAAC;AAEhH,eAAO,MAAM,gBAAgB,gBAAiB,MAAM,WAAW,MAAM,YAAW,iBAAiB,WAUhG,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}
+{"version":3,"file":"url.d.ts","sourceRoot":"","sources":["../../../src/url.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAK1C,eAAO,MAAM,yBAAyB,qCAAqC,CAAC;AAM5E,eAAO,MAAM,4BAA4B,GAAI,MAAM,UAAU,uBAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,MAAM,UAAU,EAAE,aAAa,MAAM,SASjF,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,eAAe,GAAI,IAAI;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,WAAwB,CAAC;AAEnF,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,EAAE,SAAS,MAAM,EAAE,UAAS,iBAAsB,WAUrG,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/functions",
-  "version": "0.8.2-main.2f9c567",
+  "version": "0.8.2-main.30e4dbb",
   "description": "Functions API and runtime.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -51,28 +51,28 @@
     "get-port-please": "^3.1.1",
     "iso-did": "^1.6.0",
     "ws": "^8.14.2",
-    "@dxos/assistant": "0.8.2-main.2f9c567",
-    "@dxos/async": "0.8.2-main.2f9c567",
-    "@dxos/client": "0.8.2-main.2f9c567",
-    "@dxos/context": "0.8.2-main.2f9c567",
-    "@dxos/echo-db": "0.8.2-main.2f9c567",
-    "@dxos/echo-schema": "0.8.2-main.2f9c567",
-    "@dxos/echo-protocol": "0.8.2-main.2f9c567",
-    "@dxos/edge-client": "0.8.2-main.2f9c567",
-    "@dxos/crypto": "0.8.2-main.2f9c567",
-    "@dxos/invariant": "0.8.2-main.2f9c567",
-    "@dxos/keys": "0.8.2-main.2f9c567",
-    "@dxos/log": "0.8.2-main.2f9c567",
-    "@dxos/node-std": "0.8.2-main.2f9c567",
-    "@dxos/live-object": "0.8.2-main.2f9c567",
-    "@dxos/protocols": "0.8.2-main.2f9c567",
-    "@dxos/schema": "0.8.2-main.2f9c567",
-    "@dxos/util": "0.8.2-main.2f9c567"
+    "@dxos/assistant": "0.8.2-main.30e4dbb",
+    "@dxos/client": "0.8.2-main.30e4dbb",
+    "@dxos/context": "0.8.2-main.30e4dbb",
+    "@dxos/async": "0.8.2-main.30e4dbb",
+    "@dxos/echo-db": "0.8.2-main.30e4dbb",
+    "@dxos/crypto": "0.8.2-main.30e4dbb",
+    "@dxos/echo-protocol": "0.8.2-main.30e4dbb",
+    "@dxos/echo-schema": "0.8.2-main.30e4dbb",
+    "@dxos/invariant": "0.8.2-main.30e4dbb",
+    "@dxos/live-object": "0.8.2-main.30e4dbb",
+    "@dxos/edge-client": "0.8.2-main.30e4dbb",
+    "@dxos/keys": "0.8.2-main.30e4dbb",
+    "@dxos/log": "0.8.2-main.30e4dbb",
+    "@dxos/node-std": "0.8.2-main.30e4dbb",
+    "@dxos/protocols": "0.8.2-main.30e4dbb",
+    "@dxos/schema": "0.8.2-main.30e4dbb",
+    "@dxos/util": "0.8.2-main.30e4dbb"
   },
   "devDependencies": {
     "@types/express": "^4.17.17",
     "@types/ws": "^7.4.0",
-    "@dxos/agent": "0.8.2-main.2f9c567"
+    "@dxos/agent": "0.8.2-main.30e4dbb"
   },
   "publishConfig": {
     "access": "public"

package/src/edge/functions.ts

@@ -8,13 +8,12 @@ import { type Client } from '@dxos/client';
 import { createEdgeIdentity } from '@dxos/client/edge';
 import { EdgeHttpClient } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
-import type { PublicKey, SpaceId } from '@dxos/keys';
+import type { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type UploadFunctionResponseBody } from '@dxos/protocols';
 
 export type UploadWorkerArgs = {
   client: Client;
-  spaceId: SpaceId;
   source: string;
   version: string;
   name?: string;
@@ -23,7 +22,6 @@ export type UploadWorkerArgs = {
 
 export const uploadWorkerFunction = async ({
   client,
-  spaceId,
   version,
   source,
   name,
@@ -34,7 +32,7 @@ export const uploadWorkerFunction = async ({
   const edgeClient = new EdgeHttpClient(edgeUrl);
   const edgeIdentity = createEdgeIdentity(client);
   edgeClient.setIdentity(edgeIdentity);
-  const response = await edgeClient.uploadFunction({ spaceId, functionId }, { name, version, script: source });
+  const response = await edgeClient.uploadFunction({ functionId }, { name, version, script: source });
 
   // TODO(burdon): Edge service log.
   log.info('Uploaded', {

package/src/handler.ts

@@ -2,10 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { type Effect } from 'effect';
 
 import { type AIServiceClient } from '@dxos/assistant';
+// import { type Space } from '@dxos/client/echo';
 import type { CoreDatabase, EchoDatabase } from '@dxos/echo-db';
 import { type HasId } from '@dxos/echo-schema';
 import { type SpaceId, type DXN } from '@dxos/keys';
@@ -77,20 +78,21 @@ export interface SpaceAPI {
   get queues(): QueuesAPI;
 }
 
+// TODO(wittjosiah): Queues are incompatible.
 const __assertFunctionSpaceIsCompatibleWithTheClientSpace = () => {
-  const _: SpaceAPI = {} as SpaceAPI;
+  // const _: SpaceAPI = {} as Space;
 };
 
 export type FunctionDefinition<T = {}, O = any> = {
   description?: string;
-  inputSchema: S.Schema<T, any>;
-  outputSchema?: S.Schema<O, any>;
+  inputSchema: Schema.Schema<T, any>;
+  outputSchema?: Schema.Schema<O, any>;
   handler: FunctionHandler<T, O>;
 };
 
 // TODO(dmaretskyi): Bind input type to function handler.
 export const defineFunction = <T, O>(params: FunctionDefinition<T, O>): FunctionDefinition<T, O> => {
-  if (!S.isSchema(params.inputSchema)) {
+  if (!Schema.isSchema(params.inputSchema)) {
     throw new Error('Input schema must be a valid schema');
   }
   if (typeof params.handler !== 'function') {
@@ -100,7 +102,7 @@ export const defineFunction = <T, O>(params: FunctionDefinition<T, O>): Function
   return {
     description: params.description,
     inputSchema: params.inputSchema,
-    outputSchema: params.outputSchema ?? S.Any,
+    outputSchema: params.outputSchema ?? Schema.Any,
     handler: params.handler,
   };
 };

package/src/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema as S, SchemaAST } from 'effect';
+import { Schema, SchemaAST } from 'effect';
 
 import { Expando, OptionsAnnotationId, TypedObject, DXN, Ref, RawObject } from '@dxos/echo-schema';
 
@@ -21,84 +21,78 @@ export enum TriggerKind {
   Queue = 'queue',
 }
 
-// TODO(burdon): Rename prop kind.
-const typeLiteralAnnotations = { [SchemaAST.TitleAnnotationId]: 'Type' };
+const kindLiteralAnnotations = { [SchemaAST.TitleAnnotationId]: 'Kind' };
 
 /**
  * Cron timer.
  */
-const TimerTriggerSchema = S.Struct({
-  type: S.Literal(TriggerKind.Timer).annotations(typeLiteralAnnotations),
-  cron: S.String.annotations({
+const TimerTriggerSchema = Schema.Struct({
+  kind: Schema.Literal(TriggerKind.Timer).annotations(kindLiteralAnnotations),
+  cron: Schema.String.annotations({
     [SchemaAST.TitleAnnotationId]: 'Cron',
     [SchemaAST.ExamplesAnnotationId]: ['0 0 * * *'],
   }),
-}).pipe(S.mutable);
+}).pipe(Schema.mutable);
+export type TimerTrigger = Schema.Schema.Type<typeof TimerTriggerSchema>;
 
-export type TimerTrigger = S.Schema.Type<typeof TimerTriggerSchema>;
+const EmailTriggerSchema = Schema.Struct({
+  kind: Schema.Literal(TriggerKind.Email).annotations(kindLiteralAnnotations),
+}).pipe(Schema.mutable);
+export type EmailTrigger = Schema.Schema.Type<typeof EmailTriggerSchema>;
 
-const EmailTriggerSchema = S.Struct({
-  type: S.Literal(TriggerKind.Email).annotations(typeLiteralAnnotations),
-}).pipe(S.mutable);
-
-export type EmailTrigger = S.Schema.Type<typeof EmailTriggerSchema>;
-
-const QueueTriggerSchema = S.Struct({
-  type: S.Literal(TriggerKind.Queue).annotations(typeLiteralAnnotations),
+const QueueTriggerSchema = Schema.Struct({
+  kind: Schema.Literal(TriggerKind.Queue).annotations(kindLiteralAnnotations),
   queue: DXN,
-}).pipe(S.mutable);
-
-export type QueueTrigger = S.Schema.Type<typeof QueueTriggerSchema>;
+}).pipe(Schema.mutable);
+export type QueueTrigger = Schema.Schema.Type<typeof QueueTriggerSchema>;
 
 /**
  * Webhook.
  */
-const WebhookTriggerSchema = S.Struct({
-  type: S.Literal(TriggerKind.Webhook).annotations(typeLiteralAnnotations),
-  method: S.optional(
-    S.String.annotations({
+const WebhookTriggerSchema = Schema.Struct({
+  kind: Schema.Literal(TriggerKind.Webhook).annotations(kindLiteralAnnotations),
+  method: Schema.optional(
+    Schema.String.annotations({
       [SchemaAST.TitleAnnotationId]: 'Method',
       [OptionsAnnotationId]: ['GET', 'POST'],
     }),
   ),
-  port: S.optional(
-    S.Number.annotations({
+  port: Schema.optional(
+    Schema.Number.annotations({
       [SchemaAST.TitleAnnotationId]: 'Port',
     }),
   ),
-}).pipe(S.mutable);
-
-export type WebhookTrigger = S.Schema.Type<typeof WebhookTriggerSchema>;
+}).pipe(Schema.mutable);
+export type WebhookTrigger = Schema.Schema.Type<typeof WebhookTriggerSchema>;
 
 // TODO(burdon): Use ECHO definition (from https://github.com/dxos/dxos/pull/8233).
-const QuerySchema = S.Struct({
-  type: S.optional(S.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Type' })),
-  props: S.optional(S.Record({ key: S.String, value: S.Any })),
+const QuerySchema = Schema.Struct({
+  type: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Type' })),
+  props: Schema.optional(Schema.Record({ key: Schema.String, value: Schema.Any })),
 }).annotations({ [SchemaAST.TitleAnnotationId]: 'Query' });
 
 /**
  * Subscription.
  */
-const SubscriptionTriggerSchema = S.Struct({
-  type: S.Literal(TriggerKind.Subscription).annotations(typeLiteralAnnotations),
+const SubscriptionTriggerSchema = Schema.Struct({
+  kind: Schema.Literal(TriggerKind.Subscription).annotations(kindLiteralAnnotations),
   // TODO(burdon): Define query DSL (from ECHO). Reconcile with Table.Query.
   filter: QuerySchema,
-  options: S.optional(
-    S.Struct({
+  options: Schema.optional(
+    Schema.Struct({
       // Watch changes to object (not just creation).
-      deep: S.optional(S.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Nested' })),
+      deep: Schema.optional(Schema.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Nested' })),
       // Debounce changes (delay in ms).
-      delay: S.optional(S.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Delay' })),
+      delay: Schema.optional(Schema.Number.annotations({ [SchemaAST.TitleAnnotationId]: 'Delay' })),
     }).annotations({ [SchemaAST.TitleAnnotationId]: 'Options' }),
   ),
-}).pipe(S.mutable);
-
-export type SubscriptionTrigger = S.Schema.Type<typeof SubscriptionTriggerSchema>;
+}).pipe(Schema.mutable);
+export type SubscriptionTrigger = Schema.Schema.Type<typeof SubscriptionTriggerSchema>;
 
 /**
  * Trigger schema (discriminated union).
  */
-export const TriggerSchema = S.Union(
+export const TriggerSchema = Schema.Union(
   TimerTriggerSchema,
   WebhookTriggerSchema,
   SubscriptionTriggerSchema,
@@ -107,7 +101,7 @@ export const TriggerSchema = S.Union(
 ).annotations({
   [SchemaAST.TitleAnnotationId]: 'Trigger',
 });
-export type TriggerType = S.Schema.Type<typeof TriggerSchema>;
+export type TriggerType = Schema.Schema.Type<typeof TriggerSchema>;
 
 export type EventType =
   | EmailTriggerOutput
@@ -117,64 +111,66 @@ export type EventType =
   | TimerTriggerOutput;
 
 // TODO(burdon): Reuse trigger schema from @dxos/functions (TriggerType).
-export const EmailTriggerOutput = S.mutable(
-  S.Struct({
-    from: S.String,
-    to: S.String,
-    subject: S.String,
-    created: S.String,
-    body: S.String,
+export const EmailTriggerOutput = Schema.mutable(
+  Schema.Struct({
+    from: Schema.String,
+    to: Schema.String,
+    subject: Schema.String,
+    created: Schema.String,
+    body: Schema.String,
   }),
 );
-export type EmailTriggerOutput = S.Schema.Type<typeof EmailTriggerOutput>;
-
-export const WebhookTriggerOutput = S.mutable(
-  S.Struct({
-    url: S.String,
-    method: S.Literal('GET', 'POST'),
-    headers: S.Record({ key: S.String, value: S.String }),
-    bodyText: S.String,
+export type EmailTriggerOutput = Schema.Schema.Type<typeof EmailTriggerOutput>;
+
+export const WebhookTriggerOutput = Schema.mutable(
+  Schema.Struct({
+    url: Schema.String,
+    method: Schema.Literal('GET', 'POST'),
+    headers: Schema.Record({ key: Schema.String, value: Schema.String }),
+    bodyText: Schema.String,
   }),
 );
-export type WebhookTriggerOutput = S.Schema.Type<typeof WebhookTriggerOutput>;
+export type WebhookTriggerOutput = Schema.Schema.Type<typeof WebhookTriggerOutput>;
 
-export const QueueTriggerOutput = S.mutable(
-  S.Struct({
+export const QueueTriggerOutput = Schema.mutable(
+  Schema.Struct({
     queue: DXN,
-    item: S.Any,
-    cursor: S.String,
+    item: Schema.Any,
+    cursor: Schema.String,
   }),
 );
-export type QueueTriggerOutput = S.Schema.Type<typeof QueueTriggerOutput>;
+export type QueueTriggerOutput = Schema.Schema.Type<typeof QueueTriggerOutput>;
 
-export const SubscriptionTriggerOutput = S.mutable(S.Struct({ type: S.String, changedObjectId: S.String }));
-export type SubscriptionTriggerOutput = S.Schema.Type<typeof SubscriptionTriggerOutput>;
+export const SubscriptionTriggerOutput = Schema.mutable(
+  Schema.Struct({ type: Schema.String, changedObjectId: Schema.String }),
+);
+export type SubscriptionTriggerOutput = Schema.Schema.Type<typeof SubscriptionTriggerOutput>;
 
-export const TimerTriggerOutput = S.mutable(S.Struct({ tick: S.Number }));
-export type TimerTriggerOutput = S.Schema.Type<typeof TimerTriggerOutput>;
+export const TimerTriggerOutput = Schema.mutable(Schema.Struct({ tick: Schema.Number }));
+export type TimerTriggerOutput = Schema.Schema.Type<typeof TimerTriggerOutput>;
 
 /**
  * Function trigger.
  * Function is invoked with the `payload` passed as input data.
  * The event that triggers the function is available in the function context.
  */
-export const FunctionTriggerSchema = S.Struct({
+export const FunctionTriggerSchema = Schema.Struct({
   /**
    * Function or workflow to invoke.
    */
   // TODO(dmaretskyi): Can be a Ref(FunctionType) or Ref(ComputeGraphType).
-  function: S.optional(Ref(Expando).annotations({ [SchemaAST.TitleAnnotationId]: 'Function' })),
+  function: Schema.optional(Ref(Expando).annotations({ [SchemaAST.TitleAnnotationId]: 'Function' })),
 
   /**
-   * Only used for workflows.
+   * Only used for workflowSchema.
    * Specifies the input node in the circuit.
-   * @deprecated Remove and enforce a single input node in all compute graphs.
+   * @deprecated Remove and enforce a single input node in all compute graphSchema.
    */
-  inputNodeId: S.optional(S.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Input Node ID' })),
+  inputNodeId: Schema.optional(Schema.String.annotations({ [SchemaAST.TitleAnnotationId]: 'Input Node ID' })),
 
-  enabled: S.optional(S.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Enabled' })),
+  enabled: Schema.optional(Schema.Boolean.annotations({ [SchemaAST.TitleAnnotationId]: 'Enabled' })),
 
-  spec: S.optional(TriggerSchema),
+  spec: Schema.optional(TriggerSchema),
 
   /**
    * Passed as the input data to the function.
@@ -187,17 +183,17 @@ export const FunctionTriggerSchema = S.Struct({
    *   mailbox: { '/': 'dxn:echo:AAA:ZZZ' }
    * }
    */
-  input: S.optional(S.mutable(S.Record({ key: S.String, value: S.Any }))),
+  input: Schema.optional(Schema.mutable(Schema.Record({ key: Schema.String, value: Schema.Any }))),
 });
 
-export type FunctionTriggerType = S.Schema.Type<typeof FunctionTriggerSchema>;
+export type FunctionTriggerType = Schema.Schema.Type<typeof FunctionTriggerSchema>;
 
 /**
  * Function trigger.
  */
 export class FunctionTrigger extends TypedObject({
   typename: 'dxos.org/type/FunctionTrigger',
-  version: '0.1.0',
+  version: '0.2.0',
 })(FunctionTriggerSchema.fields) {}
 
 // TODO(wittjosiah): Remove?
@@ -205,10 +201,10 @@ export class FunctionTrigger extends TypedObject({
 /**
  * Function manifest file.
  */
-export const FunctionManifestSchema = S.Struct({
-  functions: S.optional(S.mutable(S.Array(RawObject(FunctionType)))),
-  triggers: S.optional(S.mutable(S.Array(RawObject(FunctionTrigger)))),
+export const FunctionManifestSchema = Schema.Struct({
+  functions: Schema.optional(Schema.mutable(Schema.Array(RawObject(FunctionType)))),
+  triggers: Schema.optional(Schema.mutable(Schema.Array(RawObject(FunctionTrigger)))),
 });
-export type FunctionManifest = S.Schema.Type<typeof FunctionManifestSchema>;
+export type FunctionManifest = Schema.Schema.Type<typeof FunctionManifestSchema>;
 
 export const FUNCTION_TYPES = [FunctionType, FunctionTrigger];

package/src/url.ts

@@ -32,7 +32,7 @@ export const setUserFunctionUrlInMetadata = (meta: ObjectMeta, functionUrl: stri
 /**
  * NOTE: functionId is backend ID, not ECHO object id.
  */
-export const makeFunctionUrl = (spaceId: SpaceId, fn: { functionId: string }) => `/${spaceId}/${fn.functionId}`;
+export const makeFunctionUrl = (fn: { functionId: string }) => `/${fn.functionId}`;
 
 export const getInvocationUrl = (functionUrl: string, edgeUrl: string, options: InvocationOptions = {}) => {
   const baseUrl = new URL('functions/', edgeUrl);