@dxos/functions 0.8.3 → 0.8.4-main.1da679c

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (161) hide show
  1. package/dist/lib/browser/bundler/index.mjs +73 -44
  2. package/dist/lib/browser/bundler/index.mjs.map +3 -3
  3. package/dist/lib/browser/chunk-D2XO7XXY.mjs +611 -0
  4. package/dist/lib/browser/chunk-D2XO7XXY.mjs.map +7 -0
  5. package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
  6. package/dist/lib/browser/chunk-J5LGTIGS.mjs.map +7 -0
  7. package/dist/lib/browser/edge/index.mjs +24 -10
  8. package/dist/lib/browser/edge/index.mjs.map +3 -3
  9. package/dist/lib/browser/index.mjs +981 -137
  10. package/dist/lib/browser/index.mjs.map +4 -4
  11. package/dist/lib/browser/meta.json +1 -1
  12. package/dist/lib/browser/testing/index.mjs +110 -9
  13. package/dist/lib/browser/testing/index.mjs.map +4 -4
  14. package/dist/lib/node-esm/bundler/index.mjs +72 -44
  15. package/dist/lib/node-esm/bundler/index.mjs.map +3 -3
  16. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +11 -0
  17. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs.map +7 -0
  18. package/dist/lib/node-esm/chunk-Z4CJ62WS.mjs +613 -0
  19. package/dist/lib/node-esm/chunk-Z4CJ62WS.mjs.map +7 -0
  20. package/dist/lib/node-esm/edge/index.mjs +23 -10
  21. package/dist/lib/node-esm/edge/index.mjs.map +3 -3
  22. package/dist/lib/node-esm/index.mjs +981 -137
  23. package/dist/lib/node-esm/index.mjs.map +4 -4
  24. package/dist/lib/node-esm/meta.json +1 -1
  25. package/dist/lib/node-esm/testing/index.mjs +110 -9
  26. package/dist/lib/node-esm/testing/index.mjs.map +4 -4
  27. package/dist/types/src/bundler/bundler.d.ts +12 -14
  28. package/dist/types/src/bundler/bundler.d.ts.map +1 -1
  29. package/dist/types/src/edge/functions.d.ts +4 -3
  30. package/dist/types/src/edge/functions.d.ts.map +1 -1
  31. package/dist/types/src/errors.d.ts +137 -0
  32. package/dist/types/src/errors.d.ts.map +1 -0
  33. package/dist/types/src/examples/fib.d.ts +7 -0
  34. package/dist/types/src/examples/fib.d.ts.map +1 -0
  35. package/dist/types/src/examples/index.d.ts +4 -0
  36. package/dist/types/src/examples/index.d.ts.map +1 -0
  37. package/dist/types/src/examples/reply.d.ts +3 -0
  38. package/dist/types/src/examples/reply.d.ts.map +1 -0
  39. package/dist/types/src/examples/sleep.d.ts +5 -0
  40. package/dist/types/src/examples/sleep.d.ts.map +1 -0
  41. package/dist/types/src/executor/executor.d.ts +4 -1
  42. package/dist/types/src/executor/executor.d.ts.map +1 -1
  43. package/dist/types/src/handler.d.ts +46 -16
  44. package/dist/types/src/handler.d.ts.map +1 -1
  45. package/dist/types/src/index.d.ts +3 -0
  46. package/dist/types/src/index.d.ts.map +1 -1
  47. package/dist/types/src/schema.d.ts +8 -3
  48. package/dist/types/src/schema.d.ts.map +1 -1
  49. package/dist/types/src/services/credentials.d.ts +18 -4
  50. package/dist/types/src/services/credentials.d.ts.map +1 -1
  51. package/dist/types/src/services/database.d.ts +55 -3
  52. package/dist/types/src/services/database.d.ts.map +1 -1
  53. package/dist/types/src/services/event-logger.d.ts +65 -30
  54. package/dist/types/src/services/event-logger.d.ts.map +1 -1
  55. package/dist/types/src/services/index.d.ts +2 -2
  56. package/dist/types/src/services/index.d.ts.map +1 -1
  57. package/dist/types/src/services/local-function-execution.d.ts +25 -0
  58. package/dist/types/src/services/local-function-execution.d.ts.map +1 -0
  59. package/dist/types/src/services/queues.d.ts +33 -6
  60. package/dist/types/src/services/queues.d.ts.map +1 -1
  61. package/dist/types/src/services/remote-function-execution-service.d.ts +15 -0
  62. package/dist/types/src/services/remote-function-execution-service.d.ts.map +1 -0
  63. package/dist/types/src/services/service-container.d.ts +29 -17
  64. package/dist/types/src/services/service-container.d.ts.map +1 -1
  65. package/dist/types/src/services/service-registry.d.ts +29 -0
  66. package/dist/types/src/services/service-registry.d.ts.map +1 -0
  67. package/dist/types/src/services/service-registry.test.d.ts +2 -0
  68. package/dist/types/src/services/service-registry.test.d.ts.map +1 -0
  69. package/dist/types/src/services/tracing.d.ts +46 -4
  70. package/dist/types/src/services/tracing.d.ts.map +1 -1
  71. package/dist/types/src/testing/index.d.ts +1 -0
  72. package/dist/types/src/testing/index.d.ts.map +1 -1
  73. package/dist/types/src/testing/layer.d.ts +15 -0
  74. package/dist/types/src/testing/layer.d.ts.map +1 -0
  75. package/dist/types/src/testing/logger.d.ts +3 -3
  76. package/dist/types/src/testing/logger.d.ts.map +1 -1
  77. package/dist/types/src/testing/persist-database.test.d.ts +2 -0
  78. package/dist/types/src/testing/persist-database.test.d.ts.map +1 -0
  79. package/dist/types/src/testing/services.d.ts +55 -9
  80. package/dist/types/src/testing/services.d.ts.map +1 -1
  81. package/dist/types/src/trace.d.ts +20 -22
  82. package/dist/types/src/trace.d.ts.map +1 -1
  83. package/dist/types/src/translations.d.ts +9 -9
  84. package/dist/types/src/translations.d.ts.map +1 -1
  85. package/dist/types/src/triggers/index.d.ts +4 -0
  86. package/dist/types/src/triggers/index.d.ts.map +1 -0
  87. package/dist/types/src/triggers/input-builder.d.ts +3 -0
  88. package/dist/types/src/triggers/input-builder.d.ts.map +1 -0
  89. package/dist/types/src/triggers/invocation-tracer.d.ts +35 -0
  90. package/dist/types/src/triggers/invocation-tracer.d.ts.map +1 -0
  91. package/dist/types/src/triggers/trigger-dispatcher.d.ts +75 -0
  92. package/dist/types/src/triggers/trigger-dispatcher.d.ts.map +1 -0
  93. package/dist/types/src/triggers/trigger-dispatcher.test.d.ts +2 -0
  94. package/dist/types/src/triggers/trigger-dispatcher.test.d.ts.map +1 -0
  95. package/dist/types/src/triggers/trigger-state-store.d.ts +27 -0
  96. package/dist/types/src/triggers/trigger-state-store.d.ts.map +1 -0
  97. package/dist/types/src/types.d.ts +55 -245
  98. package/dist/types/src/types.d.ts.map +1 -1
  99. package/dist/types/src/url.d.ts +10 -6
  100. package/dist/types/src/url.d.ts.map +1 -1
  101. package/dist/types/tsconfig.tsbuildinfo +1 -1
  102. package/package.json +35 -25
  103. package/src/bundler/bundler.test.ts +9 -10
  104. package/src/bundler/bundler.ts +56 -35
  105. package/src/edge/functions.ts +9 -6
  106. package/src/errors.ts +21 -0
  107. package/src/examples/fib.ts +30 -0
  108. package/src/examples/index.ts +7 -0
  109. package/src/examples/reply.ts +18 -0
  110. package/src/examples/sleep.ts +22 -0
  111. package/src/executor/executor.ts +22 -15
  112. package/src/handler.ts +117 -27
  113. package/src/index.ts +3 -2
  114. package/src/schema.ts +11 -0
  115. package/src/services/credentials.ts +87 -5
  116. package/src/services/database.ts +146 -3
  117. package/src/services/event-logger.ts +68 -37
  118. package/src/services/index.ts +2 -2
  119. package/src/services/local-function-execution.ts +127 -0
  120. package/src/services/queues.ts +56 -11
  121. package/src/services/remote-function-execution-service.ts +46 -0
  122. package/src/services/service-container.ts +47 -42
  123. package/src/services/service-registry.test.ts +42 -0
  124. package/src/services/service-registry.ts +59 -0
  125. package/src/services/tracing.ts +118 -5
  126. package/src/testing/index.ts +1 -0
  127. package/src/testing/layer.ts +111 -0
  128. package/src/testing/logger.ts +4 -4
  129. package/src/testing/persist-database.test.ts +87 -0
  130. package/src/testing/services.ts +97 -14
  131. package/src/trace.ts +17 -19
  132. package/src/translations.ts +4 -4
  133. package/src/triggers/index.ts +7 -0
  134. package/src/triggers/input-builder.ts +35 -0
  135. package/src/triggers/invocation-tracer.ts +99 -0
  136. package/src/triggers/trigger-dispatcher.test.ts +652 -0
  137. package/src/triggers/trigger-dispatcher.ts +516 -0
  138. package/src/triggers/trigger-state-store.ts +60 -0
  139. package/src/types.ts +39 -36
  140. package/src/url.ts +13 -10
  141. package/dist/lib/browser/chunk-WEFZUEL2.mjs +0 -300
  142. package/dist/lib/browser/chunk-WEFZUEL2.mjs.map +0 -7
  143. package/dist/lib/node/bundler/index.cjs +0 -260
  144. package/dist/lib/node/bundler/index.cjs.map +0 -7
  145. package/dist/lib/node/chunk-IJAE7FZK.cjs +0 -320
  146. package/dist/lib/node/chunk-IJAE7FZK.cjs.map +0 -7
  147. package/dist/lib/node/edge/index.cjs +0 -94
  148. package/dist/lib/node/edge/index.cjs.map +0 -7
  149. package/dist/lib/node/index.cjs +0 -522
  150. package/dist/lib/node/index.cjs.map +0 -7
  151. package/dist/lib/node/meta.json +0 -1
  152. package/dist/lib/node/testing/index.cjs +0 -43
  153. package/dist/lib/node/testing/index.cjs.map +0 -7
  154. package/dist/lib/node-esm/chunk-LIYPMWNQ.mjs +0 -302
  155. package/dist/lib/node-esm/chunk-LIYPMWNQ.mjs.map +0 -7
  156. package/dist/types/src/services/ai.d.ts +0 -12
  157. package/dist/types/src/services/ai.d.ts.map +0 -1
  158. package/dist/types/src/services/function-call-service.d.ts +0 -16
  159. package/dist/types/src/services/function-call-service.d.ts.map +0 -1
  160. package/src/services/ai.ts +0 -32
  161. package/src/services/function-call-service.ts +0 -64
package/src/handler.ts CHANGED
@@ -2,15 +2,18 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { Schema, type Context, type Effect } from 'effect';
5
+ import { type Context, Effect, Schema, type Types } from 'effect';
6
6
 
7
- import { type AiServiceClient } from '@dxos/ai';
8
- // import { type Space } from '@dxos/client/echo';
9
- import type { CoreDatabase, EchoDatabase } from '@dxos/echo-db';
7
+ import { Obj, Type } from '@dxos/echo';
8
+ import { type EchoDatabase } from '@dxos/echo-db';
10
9
  import { type HasId } from '@dxos/echo-schema';
11
- import { type SpaceId, type DXN } from '@dxos/keys';
10
+ import { assertArgument } from '@dxos/invariant';
11
+ import { type DXN, type SpaceId } from '@dxos/keys';
12
12
  import { type QueryResult } from '@dxos/protocols';
13
13
 
14
+ import { FunctionType } from './schema';
15
+ import { type Services } from './services';
16
+
14
17
  // TODO(burdon): Model after http request. Ref Lambda/OpenFaaS.
15
18
  // https://docs.aws.amazon.com/lambda/latest/dg/typescript-handler.html
16
19
  // https://www.serverless.com/framework/docs/providers/aws/guide/serverless.yml/#functions
@@ -31,12 +34,17 @@ export type FunctionHandler<TData = {}, TOutput = any> = (params: {
31
34
  * This will be the payload from the trigger or other data passed into the function in a workflow.
32
35
  */
33
36
  data: TData;
34
- }) => TOutput | Promise<TOutput> | Effect.Effect<TOutput, any>;
37
+ }) => TOutput | Promise<TOutput> | Effect.Effect<TOutput, any, Services>;
35
38
 
36
39
  /**
37
40
  * Function context.
38
41
  */
39
42
  export interface FunctionContext {
43
+ /**
44
+ * Space from which the function was invoked.
45
+ */
46
+ space: SpaceAPI | undefined;
47
+
40
48
  /**
41
49
  * Resolves a service available to the function.
42
50
  * @throws if the service is not available.
@@ -44,13 +52,6 @@ export interface FunctionContext {
44
52
  getService: <T extends Context.Tag<any, any>>(tag: T) => Context.Tag.Service<T>;
45
53
 
46
54
  getSpace: (spaceId: SpaceId) => Promise<SpaceAPI>;
47
-
48
- /**
49
- * Space from which the function was invoked.
50
- */
51
- space: SpaceAPI | undefined;
52
-
53
- ai: AiServiceClient;
54
55
  }
55
56
 
56
57
  export interface FunctionContextAi {
@@ -74,12 +75,9 @@ export interface QueuesAPI {
74
75
  */
75
76
  export interface SpaceAPI {
76
77
  get id(): SpaceId;
77
- /**
78
- * @deprecated
79
- */
80
- get crud(): CoreDatabase;
81
78
  get db(): EchoDatabase;
82
- // TODO(dmaretskyi): Align with echo api --- queues.get(id).append(items);
79
+
80
+ // TODO(dmaretskyi): Align with echo api: queues.get(id).append(items);
83
81
  get queues(): QueuesAPI;
84
82
  }
85
83
 
@@ -88,26 +86,118 @@ const __assertFunctionSpaceIsCompatibleWithTheClientSpace = () => {
88
86
  // const _: SpaceAPI = {} as Space;
89
87
  };
90
88
 
91
- export type FunctionDefinition<T = {}, O = any> = {
89
+ const typeId = Symbol.for('@dxos/functions/FunctionDefinition');
90
+
91
+ export type FunctionDefinition<T = any, O = any> = {
92
+ [typeId]: true;
93
+ // TODO(dmaretskyi): Use `key` for FQN and `name` for human-readable-name.
94
+ key: string;
95
+ name: string;
92
96
  description?: string;
93
97
  inputSchema: Schema.Schema<T, any>;
94
98
  outputSchema?: Schema.Schema<O, any>;
95
99
  handler: FunctionHandler<T, O>;
96
100
  };
97
101
 
98
- // TODO(dmaretskyi): Bind input type to function handler.
99
- export const defineFunction = <T, O>(params: FunctionDefinition<T, O>): FunctionDefinition<T, O> => {
100
- if (!Schema.isSchema(params.inputSchema)) {
102
+ // TODO(dmaretskyi): Output type doesn't get typechecked.
103
+ export const defineFunction: {
104
+ <I, O>(params: {
105
+ // TODO(dmaretskyi): Make `key` required.
106
+ key?: string;
107
+ name: string;
108
+ description?: string;
109
+ inputSchema: Schema.Schema<I, any>;
110
+ outputSchema?: Schema.Schema<O, any>;
111
+ handler: Types.NoInfer<FunctionHandler<I, O>>;
112
+ }): FunctionDefinition<I, O>;
113
+ } = ({ key, name, description, inputSchema, outputSchema = Schema.Any, handler }) => {
114
+ if (!Schema.isSchema(inputSchema)) {
101
115
  throw new Error('Input schema must be a valid schema');
102
116
  }
103
- if (typeof params.handler !== 'function') {
117
+ if (typeof handler !== 'function') {
104
118
  throw new Error('Handler must be a function');
105
119
  }
106
120
 
121
+ // Captures the function definition location.
122
+ const limit = Error.stackTraceLimit;
123
+ Error.stackTraceLimit = 2;
124
+ const traceError = new Error();
125
+ Error.stackTraceLimit = limit;
126
+ let cache: false | string = false;
127
+ const captureStackTrace = () => {
128
+ if (cache !== false) {
129
+ return cache;
130
+ }
131
+ if (traceError.stack !== undefined) {
132
+ const stack = traceError.stack.split('\n');
133
+ if (stack[2] !== undefined) {
134
+ cache = stack[2].trim();
135
+ return cache;
136
+ }
137
+ }
138
+ };
139
+
140
+ const handlerWithSpan = (...args: any[]) => {
141
+ const result = (handler as any)(...args);
142
+ if (Effect.isEffect(result)) {
143
+ return Effect.withSpan(result, `${key ?? name}`, {
144
+ captureStackTrace,
145
+ });
146
+ }
147
+ return result;
148
+ };
149
+
150
+ return {
151
+ [typeId]: true,
152
+ key: key ?? name,
153
+ name,
154
+ description,
155
+ inputSchema,
156
+ outputSchema,
157
+ handler: handlerWithSpan,
158
+ };
159
+ };
160
+
161
+ export const FunctionDefinition = {
162
+ make: defineFunction,
163
+ isFunction: (value: unknown): value is FunctionDefinition.Any => {
164
+ return typeof value === 'object' && value !== null && Symbol.for('@dxos/functions/FunctionDefinition') in value;
165
+ },
166
+ serialize: (functionDef: FunctionDefinition.Any): FunctionType => {
167
+ assertArgument(FunctionDefinition.isFunction(functionDef), 'functionDef');
168
+ return serializeFunction(functionDef);
169
+ },
170
+ deserialize: (functionObj: FunctionType): FunctionDefinition.Any => {
171
+ assertArgument(Obj.instanceOf(FunctionType, functionObj), 'functionObj');
172
+ return deserializeFunction(functionObj);
173
+ },
174
+ };
175
+ export declare namespace FunctionDefinition {
176
+ export type Any = FunctionDefinition<any, any>;
177
+ export type Input<T extends FunctionDefinition> = T extends FunctionDefinition<infer I, any> ? I : never;
178
+ export type Output<T extends FunctionDefinition> = T extends FunctionDefinition<any, infer O> ? O : never;
179
+ }
180
+
181
+ export const serializeFunction = (functionDef: FunctionDefinition<any, any>): FunctionType =>
182
+ Obj.make(FunctionType, {
183
+ key: functionDef.name,
184
+ name: functionDef.name,
185
+ version: '0.1.0',
186
+ description: functionDef.description,
187
+ inputSchema: Type.toJsonSchema(functionDef.inputSchema),
188
+ outputSchema: !functionDef.outputSchema ? undefined : Type.toJsonSchema(functionDef.outputSchema),
189
+ });
190
+
191
+ export const deserializeFunction = (functionObj: FunctionType): FunctionDefinition<unknown, unknown> => {
107
192
  return {
108
- description: params.description,
109
- inputSchema: params.inputSchema,
110
- outputSchema: params.outputSchema ?? Schema.Any,
111
- handler: params.handler,
193
+ [typeId]: true,
194
+ // TODO(dmaretskyi): Fix key.
195
+ key: functionObj.key ?? functionObj.name,
196
+ name: functionObj.name,
197
+ description: functionObj.description,
198
+ inputSchema: !functionObj.inputSchema ? Schema.Unknown : Type.toEffectSchema(functionObj.inputSchema),
199
+ outputSchema: !functionObj.outputSchema ? undefined : Type.toEffectSchema(functionObj.outputSchema),
200
+ // TODO(dmaretskyi): This should throw error.
201
+ handler: () => {},
112
202
  };
113
203
  };
package/src/index.ts CHANGED
@@ -2,12 +2,13 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
+ export * from './errors';
5
6
  export * from './handler';
6
7
  export * from './schema';
7
8
  export * from './trace';
8
9
  export * from './types';
9
10
  export * from './url';
11
+ export * from './triggers';
10
12
  export * from './services';
11
13
  export * from './executor';
12
-
13
- // Blow up cache
14
+ export * as exampleFunctions from './examples';
package/src/schema.ts CHANGED
@@ -32,6 +32,17 @@ export interface ScriptType extends Schema.Schema.Type<typeof ScriptType> {}
32
32
  * Function deployment.
33
33
  */
34
34
  export const FunctionType = Schema.Struct({
35
+ /**
36
+ * Global registry ID.
37
+ * NOTE: The `key` property refers to the original registry entry.
38
+ */
39
+ // TODO(burdon): Create Format type for DXN-like ids, such as this and schema type.
40
+ // TODO(dmaretskyi): Consider making it part of ECHO meta.
41
+ // TODO(dmaretskyi): Make required.
42
+ key: Schema.optional(Schema.String).annotations({
43
+ description: 'Unique registration key for the blueprint',
44
+ }),
45
+
35
46
  // TODO(burdon): Rename to id/uri?
36
47
  name: Schema.NonEmptyString,
37
48
  version: Schema.String,
@@ -2,22 +2,28 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Context } from 'effect';
5
+ import { HttpClient, HttpClientRequest } from '@effect/platform';
6
+ import { type Config, Context, Effect, Layer, Redacted } from 'effect';
6
7
 
7
- type CredentialQuery = {
8
+ import { Query } from '@dxos/echo';
9
+ import { DataType } from '@dxos/schema';
10
+
11
+ import { DatabaseService } from './database';
12
+
13
+ export type CredentialQuery = {
8
14
  service?: string;
9
15
  };
10
16
 
11
17
  // TODO(dmaretskyi): Unify with other apis.
12
18
  // packages/sdk/schema/src/common/access-token.ts
13
- type ServiceCredential = {
19
+ export type ServiceCredential = {
14
20
  service: string;
15
21
 
16
22
  // TODO(dmaretskyi): Build out.
17
23
  apiKey?: string;
18
24
  };
19
25
 
20
- export class CredentialsService extends Context.Tag('CredentialsService')<
26
+ export class CredentialsService extends Context.Tag('@dxos/functions/CredentialsService')<
21
27
  CredentialsService,
22
28
  {
23
29
  /**
@@ -31,7 +37,71 @@ export class CredentialsService extends Context.Tag('CredentialsService')<
31
37
  */
32
38
  getCredential: (query: CredentialQuery) => Promise<ServiceCredential>;
33
39
  }
34
- >() {}
40
+ >() {
41
+ static getCredential = (query: CredentialQuery): Effect.Effect<ServiceCredential, never, CredentialsService> =>
42
+ Effect.gen(function* () {
43
+ const credentials = yield* CredentialsService;
44
+ return yield* Effect.promise(() => credentials.getCredential(query));
45
+ });
46
+
47
+ static getApiKey = (query: CredentialQuery): Effect.Effect<Redacted.Redacted<string>, never, CredentialsService> =>
48
+ Effect.gen(function* () {
49
+ const credential = yield* CredentialsService.getCredential(query);
50
+ if (!credential.apiKey) {
51
+ throw new Error(`API key not found for service: ${query.service}`);
52
+ }
53
+ return Redacted.make(credential.apiKey);
54
+ });
55
+
56
+ static configuredLayer = (credentials: ServiceCredential[]) =>
57
+ Layer.succeed(CredentialsService, new ConfiguredCredentialsService(credentials));
58
+
59
+ static layerConfig = (credentials: { service: string; apiKey: Config.Config<Redacted.Redacted<string>> }[]) =>
60
+ Layer.effect(
61
+ CredentialsService,
62
+ Effect.gen(function* () {
63
+ const serviceCredentials = yield* Effect.forEach(credentials, ({ service, apiKey }) =>
64
+ Effect.gen(function* () {
65
+ return {
66
+ service,
67
+ apiKey: Redacted.value(yield* apiKey),
68
+ };
69
+ }),
70
+ );
71
+
72
+ return new ConfiguredCredentialsService(serviceCredentials);
73
+ }),
74
+ );
75
+
76
+ static layerFromDatabase = () =>
77
+ Layer.effect(
78
+ CredentialsService,
79
+ Effect.gen(function* () {
80
+ const dbService = yield* DatabaseService;
81
+ const queryCredentials = async (query: CredentialQuery): Promise<ServiceCredential[]> => {
82
+ const { objects: accessTokens } = await dbService.db.query(Query.type(DataType.AccessToken)).run();
83
+ return accessTokens
84
+ .filter((accessToken) => accessToken.source === query.service)
85
+ .map((accessToken) => ({
86
+ service: accessToken.source,
87
+ apiKey: accessToken.token,
88
+ }));
89
+ };
90
+ return {
91
+ getCredential: async (query) => {
92
+ const credentials = await queryCredentials(query);
93
+ if (credentials.length === 0) {
94
+ throw new Error(`Credential not found for service: ${query.service}`);
95
+ }
96
+ return credentials[0];
97
+ },
98
+ queryCredentials: async (query) => {
99
+ return queryCredentials(query);
100
+ },
101
+ };
102
+ }),
103
+ );
104
+ }
35
105
 
36
106
  export class ConfiguredCredentialsService implements Context.Tag.Service<CredentialsService> {
37
107
  constructor(private readonly credentials: ServiceCredential[] = []) {}
@@ -53,3 +123,15 @@ export class ConfiguredCredentialsService implements Context.Tag.Service<Credent
53
123
  return credential;
54
124
  }
55
125
  }
126
+
127
+ /**
128
+ * Maps the request to include the API key from the credential.
129
+ */
130
+ export const withAuthorization = (query: CredentialQuery, kind?: 'Bearer' | 'Basic') =>
131
+ HttpClient.mapRequestEffect(
132
+ Effect.fnUntraced(function* (request) {
133
+ const key = yield* CredentialsService.getApiKey(query).pipe(Effect.map(Redacted.value));
134
+ const authorization = kind ? `${kind} ${key}` : key;
135
+ return HttpClientRequest.setHeader(request, 'Authorization', authorization);
136
+ }),
137
+ );
@@ -2,11 +2,26 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Context, Layer } from 'effect';
5
+ import { Context, Effect, Layer, Option, type Schema } from 'effect';
6
6
 
7
- import type { EchoDatabase } from '@dxos/echo-db';
7
+ import {
8
+ type Filter,
9
+ type Live,
10
+ Obj,
11
+ ObjectNotFoundError,
12
+ type Query,
13
+ type Ref,
14
+ type Relation,
15
+ type Type,
16
+ } from '@dxos/echo';
17
+ import type { EchoDatabase, FlushOptions, OneShotQueryResult, QueryResult, SchemaRegistryQuery } from '@dxos/echo-db';
18
+ import type { SchemaRegistryPreparedQuery } from '@dxos/echo-db';
19
+ import type { EchoSchema } from '@dxos/echo-schema';
20
+ import { promiseWithCauseCapture } from '@dxos/effect';
21
+ import { invariant } from '@dxos/invariant';
22
+ import type { DXN } from '@dxos/keys';
8
23
 
9
- export class DatabaseService extends Context.Tag('DatabaseService')<
24
+ export class DatabaseService extends Context.Tag('@dxos/functions/DatabaseService')<
10
25
  DatabaseService,
11
26
  {
12
27
  readonly db: EchoDatabase;
@@ -25,4 +40,132 @@ export class DatabaseService extends Context.Tag('DatabaseService')<
25
40
  },
26
41
  };
27
42
  };
43
+
44
+ static layer = (db: EchoDatabase): Layer.Layer<DatabaseService> => {
45
+ return Layer.succeed(DatabaseService, DatabaseService.make(db));
46
+ };
47
+
48
+ /**
49
+ * Resolves an object by its DXN.
50
+ */
51
+ static resolve: {
52
+ // No type check.
53
+ (dxn: DXN): Effect.Effect<Obj.Any | Relation.Any, never, DatabaseService>;
54
+ // Check matches schema.
55
+ <S extends Type.Obj.Any | Type.Relation.Any>(
56
+ dxn: DXN,
57
+ schema: S,
58
+ ): Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService>;
59
+ } = (<S extends Type.Obj.Any | Type.Relation.Any>(
60
+ dxn: DXN,
61
+ schema?: S,
62
+ ): Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService> =>
63
+ Effect.gen(function* () {
64
+ const { db } = yield* DatabaseService;
65
+ const object = yield* promiseWithCauseCapture(() =>
66
+ db.graph
67
+ .createRefResolver({
68
+ context: {
69
+ space: db.spaceId,
70
+ },
71
+ })
72
+ .resolve(dxn),
73
+ );
74
+
75
+ if (!object) {
76
+ return yield* Effect.fail(new ObjectNotFoundError(dxn));
77
+ }
78
+ invariant(!schema || Obj.instanceOf(schema, object), 'Object type mismatch.');
79
+ return object as any;
80
+ })) as any;
81
+
82
+ /**
83
+ * Loads an object reference.
84
+ */
85
+ static load: <T>(ref: Ref.Ref<T>) => Effect.Effect<T, ObjectNotFoundError, never> = Effect.fn(function* (ref) {
86
+ const object = yield* promiseWithCauseCapture(() => ref.tryLoad());
87
+ if (!object) {
88
+ return yield* Effect.fail(new ObjectNotFoundError(ref.dxn));
89
+ }
90
+ return object;
91
+ });
92
+
93
+ /**
94
+ * Loads an object reference option.
95
+ */
96
+ // TODO(burdon): Option?
97
+ static loadOption: <T>(ref: Ref.Ref<T>) => Effect.Effect<Option.Option<T>, never, never> = Effect.fn(function* (ref) {
98
+ const object = yield* DatabaseService.load(ref).pipe(
99
+ Effect.catchTag('OBJECT_NOT_FOUND', () => Effect.succeed(undefined)),
100
+ );
101
+ return Option.fromNullable(object);
102
+ });
103
+
104
+ // TODO(burdon): Can we create a proxy for the following methods on EchoDatabase? Use @inheritDoc?
105
+ // TODO(burdon): Figure out how to chain query().run();
106
+
107
+ /**
108
+ * @link EchoDatabase.add
109
+ */
110
+ static add = <T extends Obj.Any | Relation.Any>(obj: T): Effect.Effect<T, never, DatabaseService> =>
111
+ DatabaseService.pipe(Effect.map(({ db }) => db.add(obj)));
112
+
113
+ /**
114
+ * @link EchoDatabase.remove
115
+ */
116
+ static remove = <T extends Obj.Any | Relation.Any>(obj: T): Effect.Effect<void, never, DatabaseService> =>
117
+ DatabaseService.pipe(Effect.map(({ db }) => db.remove(obj)));
118
+
119
+ /**
120
+ * @link EchoDatabase.flush
121
+ */
122
+ static flush = (opts?: FlushOptions) =>
123
+ DatabaseService.pipe(Effect.flatMap(({ db }) => promiseWithCauseCapture(() => db.flush(opts))));
124
+
125
+ /**
126
+ * @link EchoDatabase.getObjectById
127
+ */
128
+ static getObjectById = <T extends Obj.Any | Relation.Any>(
129
+ id: string,
130
+ ): Effect.Effect<Live<T> | undefined, never, DatabaseService> => {
131
+ return DatabaseService.pipe(Effect.map(({ db }) => db.getObjectById(id)));
132
+ };
133
+
134
+ /**
135
+ * Creates a `QueryResult` object that can be subscribed to.
136
+ */
137
+ static query: {
138
+ <Q extends Query.Any>(query: Q): Effect.Effect<QueryResult<Live<Query.Type<Q>>>, never, DatabaseService>;
139
+ <F extends Filter.Any>(filter: F): Effect.Effect<QueryResult<Live<Filter.Type<F>>>, never, DatabaseService>;
140
+ } = (queryOrFilter: Query.Any | Filter.Any) =>
141
+ DatabaseService.pipe(
142
+ Effect.map(({ db }) => db.query(queryOrFilter as any)),
143
+ Effect.withSpan('DatabaseService.query'),
144
+ );
145
+
146
+ /**
147
+ * Executes the query once and returns the results.
148
+ */
149
+ static runQuery: {
150
+ <Q extends Query.Any>(query: Q): Effect.Effect<OneShotQueryResult<Live<Query.Type<Q>>>, never, DatabaseService>;
151
+ <F extends Filter.Any>(filter: F): Effect.Effect<OneShotQueryResult<Live<Filter.Type<F>>>, never, DatabaseService>;
152
+ } = (queryOrFilter: Query.Any | Filter.Any) =>
153
+ DatabaseService.query(queryOrFilter as any).pipe(
154
+ Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())),
155
+ );
156
+
157
+ static schemaQuery = <Q extends SchemaRegistryQuery>(
158
+ query: Q,
159
+ ): Effect.Effect<SchemaRegistryPreparedQuery<EchoSchema>, never, DatabaseService> =>
160
+ DatabaseService.pipe(
161
+ Effect.map(({ db }) => db.schemaRegistry.query(query)),
162
+ Effect.withSpan('DatabaseService.schemaQuery'),
163
+ );
164
+
165
+ static runSchemaQuery = <Q extends SchemaRegistryQuery>(
166
+ query: Q,
167
+ ): Effect.Effect<EchoSchema[], never, DatabaseService> =>
168
+ DatabaseService.schemaQuery(query).pipe(
169
+ Effect.flatMap((queryResult) => promiseWithCauseCapture(() => queryResult.run())),
170
+ );
28
171
  }
@@ -2,53 +2,81 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Effect, Context } from 'effect';
5
+ import { Context, Effect, Layer, Schema } from 'effect';
6
6
 
7
+ import { Obj, Type } from '@dxos/echo';
7
8
  import { invariant } from '@dxos/invariant';
8
- import { log, LogLevel } from '@dxos/log';
9
+ import { LogLevel, log } from '@dxos/log';
9
10
 
10
- export type ComputeEvent =
11
- | {
12
- type: 'begin-compute';
13
- nodeId: string;
14
- inputs: Record<string, any>;
15
- }
16
- | {
17
- type: 'end-compute';
18
- nodeId: string;
19
- outputs: Record<string, any>;
20
- }
21
- | {
22
- type: 'compute-input';
23
- nodeId: string;
24
- property: string;
25
- value: any;
26
- }
27
- | {
28
- type: 'compute-output';
29
- nodeId: string;
30
- property: string;
31
- value: any;
32
- }
33
- | {
34
- type: 'custom';
35
- nodeId: string;
36
- event: any;
37
- };
11
+ import { TracingService } from './tracing';
12
+
13
+ export const ComputeEventPayload = Schema.Union(
14
+ Schema.Struct({
15
+ type: Schema.Literal('begin-compute'),
16
+ nodeId: Schema.String,
17
+ inputs: Schema.Record({ key: Schema.String, value: Schema.Any }),
18
+ }),
19
+ Schema.Struct({
20
+ type: Schema.Literal('end-compute'),
21
+ nodeId: Schema.String,
22
+ outputs: Schema.Record({ key: Schema.String, value: Schema.Any }),
23
+ }),
24
+ Schema.Struct({
25
+ type: Schema.Literal('compute-input'),
26
+ nodeId: Schema.String,
27
+ property: Schema.String,
28
+ value: Schema.Any,
29
+ }),
30
+ Schema.Struct({
31
+ type: Schema.Literal('compute-output'),
32
+ nodeId: Schema.String,
33
+ property: Schema.String,
34
+ value: Schema.Any,
35
+ }),
36
+ Schema.Struct({
37
+ type: Schema.Literal('custom'),
38
+ nodeId: Schema.String,
39
+ event: Schema.Any,
40
+ }),
41
+ );
42
+ export type ComputeEventPayload = Schema.Schema.Type<typeof ComputeEventPayload>;
38
43
 
39
- export class EventLogger extends Context.Tag('EventLogger')<
40
- EventLogger,
41
- { readonly log: (event: ComputeEvent) => void; readonly nodeId: string | undefined }
44
+ export const ComputeEvent = Schema.Struct({
45
+ payload: ComputeEventPayload,
46
+ }).pipe(Type.Obj({ typename: 'dxos.org/type/ComputeEvent', version: '0.1.0' }));
47
+
48
+ /**
49
+ * Logs event for the compute workflows.
50
+ */
51
+ export class ComputeEventLogger extends Context.Tag('@dxos/functions/ComputeEventLogger')<
52
+ ComputeEventLogger,
53
+ { readonly log: (event: ComputeEventPayload) => void; readonly nodeId: string | undefined }
42
54
  >() {
43
- static noop: Context.Tag.Service<EventLogger> = {
55
+ static noop: Context.Tag.Service<ComputeEventLogger> = {
44
56
  log: () => {},
45
57
  nodeId: undefined,
46
58
  };
59
+
60
+ /**
61
+ * Implements ComputeEventLogger using TracingService.
62
+ */
63
+ static layerFromTracing = Layer.effect(
64
+ ComputeEventLogger,
65
+ Effect.gen(function* () {
66
+ const tracing = yield* TracingService;
67
+ return {
68
+ log: (event: ComputeEventPayload) => {
69
+ tracing.write(Obj.make(ComputeEvent, { payload: event }));
70
+ },
71
+ nodeId: undefined,
72
+ };
73
+ }),
74
+ );
47
75
  }
48
76
 
49
77
  export const logCustomEvent = (data: any) =>
50
78
  Effect.gen(function* () {
51
- const logger = yield* EventLogger;
79
+ const logger = yield* ComputeEventLogger;
52
80
  if (!logger.nodeId) {
53
81
  throw new Error('logCustomEvent must be called within a node compute function');
54
82
  }
@@ -67,7 +95,10 @@ export const createDefectLogger = <A, E, R>(): ((self: Effect.Effect<A, E, R>) =
67
95
  }),
68
96
  );
69
97
 
70
- export const createEventLogger = (level: LogLevel, message: string = 'event'): Context.Tag.Service<EventLogger> => {
98
+ export const createEventLogger = (
99
+ level: LogLevel,
100
+ message: string = 'event',
101
+ ): Context.Tag.Service<ComputeEventLogger> => {
71
102
  const logFunction = (
72
103
  {
73
104
  [LogLevel.WARN]: log.warn,
@@ -79,7 +110,7 @@ export const createEventLogger = (level: LogLevel, message: string = 'event'): C
79
110
  )[level];
80
111
  invariant(logFunction);
81
112
  return {
82
- log: (event: ComputeEvent) => {
113
+ log: (event: ComputeEventPayload) => {
83
114
  logFunction(message, event);
84
115
  },
85
116
  nodeId: undefined,
@@ -2,11 +2,11 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- export * from './ai';
6
5
  export * from './database';
7
6
  export * from './queues';
8
7
  export * from './service-container';
9
8
  export * from './credentials';
10
9
  export * from './tracing';
11
10
  export * from './event-logger';
12
- export * from './function-call-service';
11
+ export * from './remote-function-execution-service';
12
+ export * from './local-function-execution';