@orion-js/echoes 4.4.1 → 4.5.0

package/dist/index.js

@@ -1,14 +1,14 @@
-// src/startService/index.ts
-import { registerRoute } from "@orion-js/http";
-
 // src/config.ts
 var config = {};
 var config_default = config;
 
-// src/startService/KafkaManager.ts
-import { randomUUID } from "crypto";
-import { logger } from "@orion-js/logger";
-import { Kafka } from "kafkajs";
+// src/publish/index.ts
+async function publish(options) {
+  if (!config_default.eventBus) {
+    throw new Error("You must initialize echoes configuration to use publish");
+  }
+  return await config_default.eventBus.publish(options);
+}
 
 // src/echo/deserialize.ts
 function deserialize_default(serializedJavascript) {
@@ -21,14 +21,306 @@ function deserialize_default(serializedJavascript) {
 
 // src/publish/serialize.ts
 import serialize from "serialize-javascript";
-import { clone } from "@orion-js/helpers";
 function serialize_default(data) {
-  const cloned = clone(data);
-  const serialized = serialize(cloned, { ignoreFunction: true });
+  const serialized = serialize(data, { ignoreFunction: true });
   return serialized;
 }
 
+// src/runtime.ts
+import { AsyncLocalStorage } from "async_hooks";
+import { randomUUID } from "crypto";
+
+// src/errors.ts
+var EchoesUserError = class extends Error {
+  isEchoesError = true;
+  isOrionError = true;
+  isUserError = true;
+  code;
+  extra;
+  constructor(code, message, extra) {
+    if (!message) {
+      message = code;
+      code = "error";
+    }
+    super(message);
+    this.name = "EchoesUserError";
+    this.code = code;
+    this.extra = extra;
+  }
+  getInfo() {
+    return { error: this.code, message: this.message, extra: this.extra };
+  }
+};
+var EchoesValidationError = class extends Error {
+  isEchoesError = true;
+  isOrionError = true;
+  isValidationError = true;
+  code = "validationError";
+  validationErrors;
+  labels;
+  constructor(validationErrors, labels = {}) {
+    const printableErrors = Object.entries(validationErrors).map(([key, value]) => `${key}: ${value}`).join(", ");
+    super(`Validation Error: {${printableErrors}}`);
+    this.name = "EchoesValidationError";
+    this.validationErrors = validationErrors;
+    this.labels = Object.fromEntries(
+      Object.keys(validationErrors).filter((key) => labels[key]).map((key) => [key, labels[key]])
+    );
+  }
+  getInfo() {
+    return {
+      error: this.code,
+      message: "Validation Error",
+      validationErrors: this.validationErrors,
+      labels: this.labels
+    };
+  }
+};
+
+// src/runtime.ts
+var defaultLogger = {
+  debug: (message, metadata) => metadata === void 0 ? console.debug(message) : console.debug(message, metadata),
+  info: (message, metadata) => metadata === void 0 ? console.info(message) : console.info(message, metadata),
+  warn: (message, metadata) => metadata === void 0 ? console.warn(message) : console.warn(message, metadata),
+  error: (message, metadata) => metadata === void 0 ? console.error(message) : console.error(message, metadata)
+};
+var runtime = {};
+var contextStorage = new AsyncLocalStorage();
+function configureEchoesRuntime(adapter) {
+  const previous = runtime;
+  runtime = { ...runtime, ...adapter };
+  return () => {
+    runtime = previous;
+  };
+}
+function getEchoesRuntime() {
+  return runtime;
+}
+function getEchoesLogger() {
+  return runtime.logger || defaultLogger;
+}
+function getEchoesContext() {
+  return contextStorage.getStore();
+}
+async function runWithEchoesContext(context, callback) {
+  const contextWithId = { contextId: context.contextId || randomUUID(), ...context };
+  return await contextStorage.run(contextWithId, async () => {
+    if (runtime.runWithContext) {
+      return await runtime.runWithContext(contextWithId, callback);
+    }
+    return await callback();
+  });
+}
+function isSimpleSchemaLike(schema) {
+  return !!schema && typeof schema === "object" && typeof schema.clean === "function" && typeof schema.validate === "function";
+}
+function cloneValue(value) {
+  if (value === null || typeof value !== "object") return value;
+  if (value instanceof Date) return new Date(value.getTime());
+  if (Buffer.isBuffer(value)) return Buffer.from(value);
+  if (Array.isArray(value)) return value.map(cloneValue);
+  const prototype = Object.getPrototypeOf(value);
+  if (prototype !== Object.prototype && prototype !== null) return value;
+  const result = {};
+  for (const [key, child] of Object.entries(value)) {
+    result[key] = cloneValue(child);
+  }
+  return result;
+}
+async function cleanSimpleSchema(schema, value) {
+  const cloned = cloneValue(value);
+  return await schema.clean(cloned, { mutate: false });
+}
+async function cleanEchoesSchema(schema, value) {
+  if (isSimpleSchemaLike(schema)) {
+    return await cleanSimpleSchema(schema, value);
+  }
+  if (runtime.schema) {
+    return await runtime.schema.clean(schema, value);
+  }
+  throw new Error(
+    "Echoes received a schema it cannot execute. Use a SimpleSchema-compatible object or configure an Echoes schema adapter."
+  );
+}
+async function parseEchoesSchema(schema, value) {
+  if (isSimpleSchemaLike(schema)) {
+    const cleaned = await cleanSimpleSchema(schema, value);
+    await schema.validate(cleaned);
+    return cleaned;
+  }
+  if (runtime.schema) {
+    return await runtime.schema.parse(schema, value);
+  }
+  throw new Error(
+    "Echoes received a schema it cannot execute. Use a SimpleSchema-compatible object or configure an Echoes schema adapter."
+  );
+}
+function createEchoesValidationError(info) {
+  return runtime.createValidationError ? runtime.createValidationError(info) : new EchoesValidationError(info.validationErrors || {}, info.labels);
+}
+function createEchoesUserError(info) {
+  return runtime.createUserError ? runtime.createUserError(info) : new EchoesUserError(info.error, info.message, info.extra);
+}
+
+// src/request/getSignature.ts
+import { createHmac } from "crypto";
+
+// src/request/getPassword.ts
+function getEchoesPassword() {
+  var _a, _b;
+  const secret = ((_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.key) || process.env.echoes_password || process.env.ECHOES_PASSWORD;
+  if (!secret) {
+    getEchoesLogger().warn(
+      'Warning: no secret key found for echoes requests. Init echoes or set the env var "echoes_password" or process.env.ECHOES_PASSWORD'
+    );
+  }
+  return secret;
+}
+
+// src/request/getSignature.ts
+function getSignature_default(_body) {
+  const password = getEchoesPassword();
+  return createHmac("sha1", password || "").update("").digest("hex");
+}
+
+// src/request/getURL.ts
+function getURL_default(serviceName) {
+  var _a, _b, _c;
+  if (serviceName.startsWith("http")) return serviceName;
+  const url = (_c = (_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.services) == null ? void 0 : _c[serviceName];
+  if (!url) {
+    throw new Error(`No URL found in echoes config for service ${serviceName}`);
+  }
+  return url;
+}
+
+// src/request/makeRequest.ts
+import http from "http";
+import https from "https";
+async function executeWithRetries(callback, retries = 0, delayMs = 200) {
+  try {
+    return await callback();
+  } catch (error) {
+    if (retries <= 0) throw error;
+    await new Promise((resolve) => setTimeout(resolve, delayMs));
+    return await executeWithRetries(callback, retries - 1, delayMs);
+  }
+}
+async function postJSON(urlValue, data, timeout, redirectsRemaining = 5) {
+  const url = new URL(urlValue);
+  const body = JSON.stringify(data);
+  const transport = url.protocol === "https:" ? https : http;
+  return await new Promise((resolve, reject) => {
+    const request2 = transport.request(
+      url,
+      {
+        method: "POST",
+        headers: {
+          "User-Agent": "Orionjs-Echoes/1.1",
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(body)
+        }
+      },
+      (response) => {
+        const chunks = [];
+        const statusCode = response.statusCode || 0;
+        if (statusCode >= 300 && statusCode < 400 && response.headers.location) {
+          response.resume();
+          if (redirectsRemaining <= 0) {
+            reject(new Error("Echoes request exceeded the redirect limit"));
+            return;
+          }
+          resolve(
+            postJSON(
+              new URL(response.headers.location, url).toString(),
+              data,
+              timeout,
+              redirectsRemaining - 1
+            )
+          );
+          return;
+        }
+        response.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+        response.on("end", () => {
+          try {
+            const responseBody = Buffer.concat(chunks).toString("utf8");
+            if (statusCode < 200 || statusCode >= 300) {
+              reject(new Error(`Request failed with status code ${statusCode}`));
+              return;
+            }
+            resolve({
+              statusCode,
+              data: responseBody ? JSON.parse(responseBody) : {}
+            });
+          } catch (error) {
+            reject(error);
+          }
+        });
+      }
+    );
+    request2.on("error", reject);
+    if (timeout) {
+      request2.setTimeout(timeout, () => {
+        request2.destroy(new Error(`Echoes request timed out after ${timeout}ms`));
+      });
+    }
+    request2.end(body);
+  });
+}
+var makeRequest = async (options) => {
+  return await executeWithRetries(
+    () => postJSON(options.url, options.data, options.timeout),
+    options.retries || 0
+  );
+};
+
+// src/request/index.ts
+async function request(options) {
+  var _a, _b;
+  const { method, service, params } = options;
+  const serializedParams = serialize_default(params);
+  const date = /* @__PURE__ */ new Date();
+  const body = { method, service, serializedParams, date };
+  const signature = getSignature_default(body);
+  try {
+    const requestMaker = ((_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.makeRequest) || makeRequest;
+    const requestOptions = {
+      url: getURL_default(service),
+      retries: options.retries,
+      timeout: options.timeout,
+      data: {
+        body,
+        signature
+      }
+    };
+    const result = await requestMaker(requestOptions);
+    if (result.statusCode !== 200) {
+      throw new Error(`Wrong status code ${result.statusCode}`);
+    }
+    const data = result.data;
+    if (data.error) {
+      const info = data.errorInfo;
+      if (info) {
+        if (data.isValidationError) {
+          throw createEchoesValidationError(info);
+        }
+        if (data.isUserError) {
+          throw createEchoesUserError(info);
+        }
+      }
+      throw new Error(`${data.error}`);
+    }
+    const response = deserialize_default(data.result);
+    return response;
+  } catch (error) {
+    const caught = error;
+    if (caught.isOrionError || caught.isEchoesError) throw caught;
+    throw new Error(`Echoes request network error calling ${service}/${method}: ${caught.message}`);
+  }
+}
+
 // src/startService/KafkaManager.ts
+import { randomUUID as randomUUID2 } from "crypto";
 var HEARTBEAT_INTERVAL_SECONDS = 5;
 var CHECK_JOIN_CONSUMER_INTERVAL_SECONDS = 30;
 var DEFAULT_PARTITIONS_CONSUMED_CONCURRENTLY = 4;
@@ -46,11 +338,21 @@ var KafkaManager = class {
   producerConnected = false;
   interval;
   constructor(options) {
-    this.kafka = new Kafka(options.client);
     this.options = options;
   }
   async start(options) {
     var _a;
+    let kafkaModule;
+    try {
+      kafkaModule = await import("kafkajs");
+    } catch (error) {
+      const wrapped = new Error(
+        "Echoes Kafka transport requires kafkajs to be installed in the application"
+      );
+      wrapped.cause = error;
+      throw wrapped;
+    }
+    this.kafka = new kafkaModule.Kafka(this.options.client);
     this.onEvent = options.onEvent;
     this.subscriptions = new Map(
       options.subscriptions.map((subscription) => [subscription.topic, subscription])
@@ -68,7 +370,7 @@ var KafkaManager = class {
     this.consumer = this.kafka.consumer(this.options.consumer);
     this.consumerStarted = await this.conditionalStart();
     if (this.consumerStarted) return;
-    logger.info("Echoes: Delaying consumer group join, waiting for conditions to be met");
+    getEchoesLogger().info("Echoes: Delaying consumer group join, waiting for conditions to be met");
     this.interval = setInterval(async () => {
       this.consumerStarted = await this.conditionalStart();
       if (this.consumerStarted) clearInterval(this.interval);
@@ -86,7 +388,7 @@ var KafkaManager = class {
         {
           value: serialize_default({ params: options.params }),
           headers: {
-            "echoes-event-id": randomUUID()
+            "echoes-event-id": randomUUID2()
           }
         }
       ]
@@ -94,6 +396,7 @@ var KafkaManager = class {
   }
   async close() {
     var _a, _b;
+    const logger = getEchoesLogger();
     logger.warn("Echoes: Stopping Kafka transport");
     if (this.interval) clearInterval(this.interval);
     await Promise.all([
@@ -104,6 +407,7 @@ var KafkaManager = class {
     this.producerConnected = false;
   }
   async checkJoinConsumerGroupConditions() {
+    const logger = getEchoesLogger();
     const admin = this.kafka.admin();
     try {
       await admin.connect();
@@ -156,6 +460,7 @@ var KafkaManager = class {
     return false;
   }
   async handleMessage(params) {
+    const logger = getEchoesLogger();
     const subscription = this.subscriptions.get(params.topic);
     if (!subscription) {
       logger.warn(`Echoes: Received a message for an unknown topic: ${params.topic}, ignoring it`);
@@ -193,6 +498,9 @@ var KafkaManager = class {
   createReceivedEvent(params) {
     var _a, _b, _c, _d;
     const { message, topic, partition } = params;
+    if (!message.value) {
+      throw new Error(`Echoes received an empty Kafka message for ${topic}`);
+    }
     const data = deserialize_default(message.value.toString());
     const retries = Number.parseInt(((_b = (_a = message.headers) == null ? void 0 : _a.retries) == null ? void 0 : _b.toString()) || "0", 10);
     const timestamp = Number.parseInt(message.timestamp || "", 10);
@@ -209,6 +517,7 @@ var KafkaManager = class {
   }
   async handleRetries(subscription, params, error) {
     var _a, _b;
+    const logger = getEchoesLogger();
     const { message, topic } = params;
     const retries = Number.parseInt(((_b = (_a = message == null ? void 0 : message.headers) == null ? void 0 : _a.retries) == null ? void 0 : _b.toString()) || "0", 10);
     if (subscription.attemptsBeforeDeadLetter === void 0 || subscription.attemptsBeforeDeadLetter === null) {
@@ -217,6 +526,7 @@ var KafkaManager = class {
     const maxRetries = subscription.attemptsBeforeDeadLetter || 0;
     const exceededMaxRetries = retries >= maxRetries;
     const nextTopic = exceededMaxRetries ? `DLQ-${topic}` : topic;
+    if (!message.value) throw error;
     await this.producer.send({
       topic: nextTopic,
       messages: [
@@ -243,7 +553,6 @@ var KafkaManager = class {
 var KafkaManager_default = KafkaManager;
 
 // src/events/EventBus.ts
-import { logger as logger2 } from "@orion-js/logger";
 var EventBus = class {
   echoes;
   transports;
@@ -303,9 +612,10 @@ var EventBus = class {
     await Promise.all(this.startedTransports.map((transport) => transport.close()));
   }
   async handleEvent(event) {
+    const logger = getEchoesLogger();
     const echo2 = this.echoes[event.topic];
     if (!echo2 || echo2.type !== "event") {
-      logger2.warn(`Echoes: Received a message for an unknown topic: ${event.topic}, ignoring it`);
+      logger.warn(`Echoes: Received a message for an unknown topic: ${event.topic}, ignoring it`);
       return;
     }
     if (event.transport === "kafka" && event.context) {
@@ -433,6 +743,14 @@ function createEventBus(options) {
   });
 }
 
+// src/requestsHandler/checkSignature.ts
+function checkSignature_default(body, signature) {
+  const generatedSignature = getSignature_default(body);
+  if (generatedSignature !== signature) {
+    throw new Error("Echoes invalid signature");
+  }
+}
+
 // src/requestsHandler/getEcho.ts
 function getEcho_default(method) {
   const echo2 = config_default.echoes[method];
@@ -445,72 +763,29 @@ function getEcho_default(method) {
   return echo2;
 }
 
-// src/request/getSignature.ts
-import JSSHA from "jssha";
-
-// src/request/getPassword.ts
-import { logger as logger3 } from "@orion-js/logger";
-import { internalGetEnv } from "@orion-js/env";
-function getEchoesPassword() {
-  var _a, _b;
-  const secret = ((_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.key) || internalGetEnv("echoes_password", "ECHOES_PASSWORD");
-  if (!secret) {
-    logger3.warn(
-      'Warning: no secret key found for echoes requests. Init echoes or set the env var "echoes_password" or process.env.ECHOES_PASSWORD'
-    );
-  }
-  return secret;
-}
-
-// src/request/getSignature.ts
-function getSignature_default(body) {
-  const password = getEchoesPassword();
-  const shaObj = new JSSHA("SHA-1", "TEXT");
-  shaObj.setHMACKey(password, "TEXT");
-  shaObj.update(body);
-  return shaObj.getHMAC("HEX");
-}
-
-// src/requestsHandler/checkSignature.ts
-function checkSignature_default(body, signature) {
-  const generatedSignature = getSignature_default(body);
-  if (generatedSignature !== signature) {
-    throw new Error("Echoes invalid signature");
-  }
-}
-
 // src/requestsHandler/index.ts
-import { route } from "@orion-js/http";
-var requestsHandler_default = (options) => route({
+var requestsHandler_default = (options) => ({
   method: "post",
   path: options.requests.handlerPath || "/echoes-services",
-  bodyParser: "json",
-  bodyParserOptions: {
-    limit: "10mb"
-  },
-  async resolve(req) {
+  bodyLimit: "10mb",
+  async handle(requestBody) {
     try {
-      const { body, signature } = req.body;
+      const { body, signature } = requestBody;
       checkSignature_default(body, signature);
       const { method, serializedParams } = body;
       const echo2 = getEcho_default(method);
       const result = await echo2.onRequest(serializedParams);
-      return {
-        body: {
-          result: serialize_default(result)
-        }
-      };
+      return { result: serialize_default(result) };
     } catch (error) {
-      if (!error.getInfo) {
-        console.error("Error at echo requests handler:", error);
+      const caught = error;
+      if (!caught.getInfo) {
+        getEchoesLogger().error("Error at echo requests handler:", { error: caught });
       }
       return {
-        body: {
-          error: error.message,
-          errorInfo: error.getInfo ? error.getInfo() : null,
-          isValidationError: !!error.isValidationError,
-          isUserError: !!error.isUserError
-        }
+        error: caught.message,
+        errorInfo: caught.getInfo ? caught.getInfo() : null,
+        isValidationError: !!caught.isValidationError,
+        isUserError: !!caught.isUserError
       };
     }
   }
@@ -522,7 +797,13 @@ async function startService(options) {
   config_default.echoes = options.echoes;
   if (options.requests) {
     config_default.requests = options.requests;
-    registerRoute(requestsHandler_default(options));
+    const registerHandler = options.requests.registerHandler || getEchoesRuntime().registerRequestHandler;
+    if (!registerHandler) {
+      throw new Error(
+        "Echoes requests require requests.registerHandler in standalone servers. Orion applications can import @orion-js/echoes-orion once during startup."
+      );
+    }
+    await registerHandler(requestsHandler_default(options));
   }
   const nextEventBus = createEventBus(options);
   if (nextEventBus) {
@@ -533,115 +814,22 @@ async function startService(options) {
 }
 async function stopService() {
   if (eventBus) {
-    console.info("Stoping echoes...");
+    const logger = getEchoesLogger();
+    logger.info("Stopping Echoes...");
     await eventBus.close();
     eventBus = null;
     config_default.eventBus = void 0;
-    console.info("Echoes stopped");
-  }
-}
-
-// src/publish/index.ts
-async function publish(options) {
-  if (!config_default.eventBus) {
-    throw new Error("You must initialize echoes configuration to use publish");
-  }
-  return await config_default.eventBus.publish(options);
-}
-
-// src/request/getURL.ts
-function getURL_default(serviceName) {
-  var _a, _b;
-  if (serviceName.startsWith("http")) return serviceName;
-  const url = (_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.services[serviceName];
-  if (!url) {
-    throw new Error(`No URL found in echoes config for service ${serviceName}`);
-  }
-  return url;
-}
-
-// src/request/makeRequest.ts
-import axios from "axios";
-import { executeWithRetries } from "@orion-js/helpers";
-var makeRequest = async (options) => {
-  const result = await executeWithRetries(
-    async () => {
-      return await axios({
-        method: "post",
-        url: options.url,
-        timeout: options.timeout,
-        headers: {
-          "User-Agent": "Orionjs-Echoes/1.1"
-        },
-        data: options.data
-      });
-    },
-    options.retries,
-    200
-  );
-  return {
-    data: result.data,
-    statusCode: result.status
-  };
-};
-
-// src/request/index.ts
-import { ValidationError } from "@orion-js/schema";
-import { UserError } from "@orion-js/helpers";
-async function request(options) {
-  var _a, _b;
-  const { method, service, params } = options;
-  const serializedParams = serialize_default(params);
-  const date = /* @__PURE__ */ new Date();
-  const body = { method, service, serializedParams, date };
-  const signature = getSignature_default(body);
-  try {
-    const requestMaker = ((_b = (_a = config_default) == null ? void 0 : _a.requests) == null ? void 0 : _b.makeRequest) || makeRequest;
-    const requestOptions = {
-      url: getURL_default(service),
-      retries: options.retries,
-      timeout: options.timeout,
-      data: {
-        body,
-        signature
-      }
-    };
-    const result = await requestMaker(requestOptions);
-    if (result.statusCode !== 200) {
-      throw new Error(`Wrong status code ${result.statusCode}`);
-    }
-    const data = result.data;
-    if (data.error) {
-      const info = data.errorInfo;
-      if (info) {
-        if (data.isValidationError) {
-          throw new ValidationError(info.validationErrors);
-        }
-        if (data.isUserError) {
-          throw new UserError(info.error, info.message, info.extra);
-        }
-      }
-      throw new Error(`${data.error}`);
-    }
-    const response = deserialize_default(data.result);
-    return response;
-  } catch (error) {
-    if (error.isOrionError) throw error;
-    throw new Error(`Echoes request network error calling ${service}/${method}: ${error.message}`);
+    logger.info("Echoes stopped");
   }
 }
 
-// src/service/index.ts
-import { runWithOrionAsyncContext } from "@orion-js/logger";
-
 // src/echo/index.ts
-import { clean, cleanAndValidate } from "@orion-js/schema";
 var echo = function createNewEcho(options) {
   const resolve = async (params, context) => {
-    const cleaned = options.params ? await cleanAndValidate(options.params, params) : params ?? {};
+    const cleaned = options.params ? await parseEchoesSchema(options.params, params) : params ?? {};
     const result = await options.resolve(cleaned, context);
     if (options.returns) {
-      return await clean(options.returns, result);
+      return await cleanEchoesSchema(options.returns, result);
     }
     return result;
   };
@@ -668,6 +856,9 @@ var echo = function createNewEcho(options) {
     onMessage: async (messageData) => {
       var _a, _b, _c, _d;
       const { message } = messageData;
+      if (!message.value) {
+        throw new Error(`Echoes received an empty Kafka message for ${messageData.topic}`);
+      }
       const data = deserialize_default(message.value.toString());
       const retries = Number.parseInt(((_b = (_a = message.headers) == null ? void 0 : _a.retries) == null ? void 0 : _b.toString()) || "0", 10);
       const timestamp = Number(message.timestamp);
@@ -698,15 +889,21 @@ function createEchoEvent(options) {
   return echo({ ...options, type: "event" });
 }
 
+// src/schema.ts
+function typedEchoesSchema(schema) {
+  return schema;
+}
+
 // src/service/index.ts
-import { getInstance, Service } from "@orion-js/services";
 var serviceMetadata = /* @__PURE__ */ new WeakMap();
 var echoesMetadata = /* @__PURE__ */ new WeakMap();
 var echoEntriesByClass = /* @__PURE__ */ new Map();
+var standaloneInstances = /* @__PURE__ */ new WeakMap();
 var pendingEchoEntries = {};
 function Echoes() {
   return (target, context) => {
-    Service()(target, context);
+    var _a, _b;
+    (_b = (_a = getEchoesRuntime()).decorateService) == null ? void 0 : _b.call(_a, target, context);
     serviceMetadata.set(target, { _serviceType: "echoes" });
     if (Object.keys(pendingEchoEntries).length > 0) {
       echoEntriesByClass.set(target, pendingEchoEntries);
@@ -723,7 +920,7 @@ function EchoEvent(options = {}) {
         return createEchoEvent({
           ...options,
           resolve: async (params, contextData) => {
-            return await runWithOrionAsyncContext(
+            return await runWithEchoesContext(
               {
                 controllerType: "echo",
                 echoName: propertyKey,
@@ -752,7 +949,7 @@ function EchoRequest(options = {}) {
         return createEchoRequest({
           ...options,
           resolve: async (params, contextData) => {
-            return await runWithOrionAsyncContext(
+            return await runWithEchoesContext(
               {
                 controllerType: "echo",
                 echoName: propertyKey,
@@ -782,7 +979,18 @@ function initializeEchoesIfNeeded(instance) {
   echoesMetadata.set(instance, echoes);
 }
 function getServiceEchoes(target) {
-  const instance = getInstance(target);
+  let instance;
+  if (typeof target !== "function") {
+    instance = target;
+  } else if (getEchoesRuntime().getInstance) {
+    instance = getEchoesRuntime().getInstance(target);
+  } else {
+    instance = standaloneInstances.get(target);
+    if (!instance) {
+      instance = new target();
+      standaloneInstances.set(target, instance);
+    }
+  }
   if (!serviceMetadata.has(instance.constructor)) {
     throw new Error("You must pass a class decorated with @Echoes to getServiceEchoes");
   }
@@ -798,13 +1006,25 @@ export {
   EchoEvent,
   EchoRequest,
   Echoes,
+  EchoesUserError,
+  EchoesValidationError,
+  cleanEchoesSchema,
+  configureEchoesRuntime,
   createEchoEvent,
   createEchoRequest,
+  createEchoesUserError,
+  createEchoesValidationError,
   echo,
+  getEchoesContext,
+  getEchoesLogger,
+  getEchoesRuntime,
   getServiceEchoes,
+  parseEchoesSchema,
   publish,
   request,
+  runWithEchoesContext,
   startService,
-  stopService
+  stopService,
+  typedEchoesSchema
 };
 //# sourceMappingURL=index.js.map