apitally 0.25.7 → 1.0.0-alpha.1

package/dist/adonisjs/configure.js

@@ -1,54 +1,109 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 import { fileURLToPath } from "node:url";
-import { isValidClientId, isValidEnv } from "../common/paramValidation.js";
+import { DEFAULT_ENV, isValidWriteToken } from "../config.js";
 const STUBS_ROOT = fileURLToPath(new URL("./stubs/", import.meta.url));
+const ENV_FORMAT = /^[a-z0-9-]{1,32}$/;
 async function configure(command) {
-  const clientId = await command.prompt.ask("Apitally client ID", {
-    result(value) {
-      return value.trim().toLowerCase();
-    },
-    validate(value) {
-      return isValidClientId(value);
-    }
+  const writeToken = await command.prompt.ask("Apitally write token", {
+    result: (value) => value.trim(),
+    validate: (value) => isValidWriteToken(value.trim())
   });
-  const env = await command.prompt.ask("Environment name", {
-    default: "dev",
-    result(value) {
-      return value.trim().toLowerCase().replaceAll("_", "-").replaceAll(" ", "-");
-    },
-    validate(value) {
-      return isValidEnv(value);
-    }
+  const env = await command.prompt.ask("Environment", {
+    default: DEFAULT_ENV,
+    result: normalizeEnv,
+    validate: (value) => ENV_FORMAT.test(normalizeEnv(value))
+  });
+  const captureRequestHeaders = await command.prompt.confirm("Capture request headers?", {
+    default: false
+  });
+  const captureRequestBody = await command.prompt.confirm("Capture request bodies?", {
+    default: false
   });
-  const enableRequestLogging = await command.prompt.confirm("Enable request logging?", {
+  const captureResponseBody = await command.prompt.confirm("Capture response bodies?", {
     default: false
   });
   const codemods = await command.createCodemods();
   await codemods.makeUsingStub(STUBS_ROOT, "config/apitally.stub", {
-    enableRequestLogging
+    captureRequestHeaders,
+    captureRequestBody,
+    captureResponseBody
   });
-  await codemods.registerMiddleware("router", [
-    {
-      path: "apitally/adonisjs/middleware"
-    }
-  ]);
   await codemods.updateRcFile((rcFile) => {
     rcFile.addProvider("apitally/adonisjs/provider");
   });
+  await codemods.registerMiddleware("server", [{ path: "apitally/adonisjs/middleware" }]);
   await codemods.defineEnvVariables({
-    APITALLY_CLIENT_ID: clientId,
+    APITALLY_WRITE_TOKEN: writeToken,
     APITALLY_ENV: env
   });
   await codemods.defineEnvValidations({
-    leadingComment: "Variables for configuring the apitally package",
     variables: {
-      APITALLY_CLIENT_ID: "Env.schema.string()",
-      APITALLY_ENV: "Env.schema.string.optional()"
+      APITALLY_WRITE_TOKEN: "Env.schema.string()",
+      APITALLY_ENV: "Env.schema.string()"
     }
   });
+  await updateExceptionHandler(codemods, command);
+}
+function normalizeEnv(value) {
+  return value.trim().toLowerCase().replace(/[ _]/g, "-");
+}
+async function updateExceptionHandler(codemods, command) {
+  const project = await codemods.getTsMorphProject();
+  const handlerPath = command.app.makePath("app/exceptions/handler.ts");
+  const sourceFile = project?.getSourceFile(handlerPath) ?? project?.addSourceFileAtPathIfExists(handlerPath);
+  const handlerClass = sourceFile?.getClasses().find((candidate) => candidate.isDefaultExport());
+  const method = handlerClass?.getMethod("handle");
+  if (method) {
+    const alreadyConfigured = method.getDescendants().some((node) => {
+      if (node.getKindName() !== "CallExpression") {
+        return false;
+      }
+      return node.getExpression().getText() === "captureException";
+    });
+    if (alreadyConfigured) {
+      return;
+    }
+    const parameters = method.getParameters();
+    const statements = method.getStatements();
+    const statement = statements[0];
+    if (method.isAsync() && parameters.length >= 2 && statements.length === 1 && statement?.getKindName() === "ReturnStatement") {
+      const returnExpression = statement.getExpression();
+      const errorName = parameters[0].getName();
+      const contextName = parameters[1].getName();
+      if (returnExpression?.getKindName() === "CallExpression" && returnExpression.getExpression().getText() === "super.handle" && returnExpression.getArguments().map((argument) => argument.getText()).join(",") === `${errorName},${contextName}`) {
+        const importDeclaration = sourceFile?.getImportDeclaration(
+          (candidate) => candidate.getModuleSpecifierValue() === "apitally"
+        );
+        if (importDeclaration) {
+          if (!importDeclaration.getNamedImports().some(
+            (namedImport) => namedImport.getName() === "captureException"
+          )) {
+            importDeclaration.addNamedImport("captureException");
+          }
+        } else {
+          sourceFile?.addImportDeclaration({
+            moduleSpecifier: "apitally",
+            namedImports: ["captureException"]
+          });
+        }
+        method.setBodyText(
+          `const result = await super.handle(${errorName}, ${contextName})
+if (${contextName}.response.getStatus() >= 500) {
+  captureException(${errorName})
+}
+return result`
+        );
+        await sourceFile?.save();
+        return;
+      }
+    }
+  }
+  command.logger.warning(
+    'Could not update "app/exceptions/handler.ts" automatically. Add the following import and method:'
+  );
+  command.logger.info(
+    'import { captureException } from "apitally"\n\nasync handle(error: unknown, ctx: HttpContext) {\n  const result = await super.handle(error, ctx)\n  if (ctx.response.getStatus() >= 500) {\n    captureException(error)\n  }\n  return result\n}'
+  );
 }
-__name(configure, "configure");
 export {
   configure
 };

package/dist/adonisjs/configure.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adonisjs/configure.ts"],"sourcesContent":["/**\n * Allows users to add Apitally to their AdonisJS application using the built-in Ace command.\n */\n\nimport type Configure from \"@adonisjs/core/commands/configure\";\nimport { fileURLToPath } from \"node:url\";\n\nimport { isValidClientId, isValidEnv } from \"../common/paramValidation.js\";\n\nconst STUBS_ROOT = fileURLToPath(new URL(\"./stubs/\", import.meta.url));\n\nexport async function configure(command: Configure) {\n  const clientId = await command.prompt.ask(\"Apitally client ID\", {\n    result(value) {\n      return value.trim().toLowerCase();\n    },\n    validate(value) {\n      return isValidClientId(value);\n    },\n  });\n  const env = await command.prompt.ask(\"Environment name\", {\n    default: \"dev\",\n    result(value) {\n      return value\n        .trim()\n        .toLowerCase()\n        .replaceAll(\"_\", \"-\")\n        .replaceAll(\" \", \"-\");\n    },\n    validate(value) {\n      return isValidEnv(value);\n    },\n  });\n  const enableRequestLogging = await command.prompt.confirm(\n    \"Enable request logging?\",\n    {\n      default: false,\n    },\n  );\n\n  const codemods = await command.createCodemods();\n\n  await codemods.makeUsingStub(STUBS_ROOT, \"config/apitally.stub\", {\n    enableRequestLogging,\n  });\n\n  await codemods.registerMiddleware(\"router\", [\n    {\n      path: \"apitally/adonisjs/middleware\",\n    },\n  ]);\n\n  await codemods.updateRcFile((rcFile: any) => {\n    rcFile.addProvider(\"apitally/adonisjs/provider\");\n  });\n\n  await codemods.defineEnvVariables({\n    APITALLY_CLIENT_ID: clientId,\n    APITALLY_ENV: env,\n  });\n\n  await codemods.defineEnvValidations({\n    leadingComment: \"Variables for configuring the apitally package\",\n    variables: {\n      APITALLY_CLIENT_ID: \"Env.schema.string()\",\n      APITALLY_ENV: \"Env.schema.string.optional()\",\n    },\n  });\n}\n"],"mappings":";;AAKA,SAASA,qBAAqB;AAE9B,SAASC,iBAAiBC,kBAAkB;AAE5C,MAAMC,aAAaH,cAAc,IAAII,IAAI,YAAY,YAAYC,GAAG,CAAA;AAEpE,eAAsBC,UAAUC,SAAkB;AAChD,QAAMC,WAAW,MAAMD,QAAQE,OAAOC,IAAI,sBAAsB;IAC9DC,OAAOC,OAAK;AACV,aAAOA,MAAMC,KAAI,EAAGC,YAAW;IACjC;IACAC,SAASH,OAAK;AACZ,aAAOX,gBAAgBW,KAAAA;IACzB;EACF,CAAA;AACA,QAAMI,MAAM,MAAMT,QAAQE,OAAOC,IAAI,oBAAoB;IACvDO,SAAS;IACTN,OAAOC,OAAK;AACV,aAAOA,MACJC,KAAI,EACJC,YAAW,EACXI,WAAW,KAAK,GAAA,EAChBA,WAAW,KAAK,GAAA;IACrB;IACAH,SAASH,OAAK;AACZ,aAAOV,WAAWU,KAAAA;IACpB;EACF,CAAA;AACA,QAAMO,uBAAuB,MAAMZ,QAAQE,OAAOW,QAChD,2BACA;IACEH,SAAS;EACX,CAAA;AAGF,QAAMI,WAAW,MAAMd,QAAQe,eAAc;AAE7C,QAAMD,SAASE,cAAcpB,YAAY,wBAAwB;IAC/DgB;EACF,CAAA;AAEA,QAAME,SAASG,mBAAmB,UAAU;IAC1C;MACEC,MAAM;IACR;GACD;AAED,QAAMJ,SAASK,aAAa,CAACC,WAAAA;AAC3BA,WAAOC,YAAY,4BAAA;EACrB,CAAA;AAEA,QAAMP,SAASQ,mBAAmB;IAChCC,oBAAoBtB;IACpBuB,cAAcf;EAChB,CAAA;AAEA,QAAMK,SAASW,qBAAqB;IAClCC,gBAAgB;IAChBC,WAAW;MACTJ,oBAAoB;MACpBC,cAAc;IAChB;EACF,CAAA;AACF;AAzDsBzB;","names":["fileURLToPath","isValidClientId","isValidEnv","STUBS_ROOT","URL","url","configure","command","clientId","prompt","ask","result","value","trim","toLowerCase","validate","env","default","replaceAll","enableRequestLogging","confirm","codemods","createCodemods","makeUsingStub","registerMiddleware","path","updateRcFile","rcFile","addProvider","defineEnvVariables","APITALLY_CLIENT_ID","APITALLY_ENV","defineEnvValidations","leadingComment","variables"]}
+{"version":3,"sources":["../../src/adonisjs/configure.ts"],"sourcesContent":["import { fileURLToPath } from \"node:url\";\n\nimport type Configure from \"@adonisjs/core/commands/configure\";\n\nimport { DEFAULT_ENV, isValidWriteToken } from \"../config.js\";\n\nconst STUBS_ROOT = fileURLToPath(new URL(\"./stubs/\", import.meta.url));\nconst ENV_FORMAT = /^[a-z0-9-]{1,32}$/;\n\nexport async function configure(command: Configure): Promise<void> {\n  const writeToken = await command.prompt.ask(\"Apitally write token\", {\n    result: (value) => value.trim(),\n    validate: (value) => isValidWriteToken(value.trim()),\n  });\n  const env = await command.prompt.ask(\"Environment\", {\n    default: DEFAULT_ENV,\n    result: normalizeEnv,\n    validate: (value) => ENV_FORMAT.test(normalizeEnv(value)),\n  });\n  const captureRequestHeaders = await command.prompt.confirm(\"Capture request headers?\", {\n    default: false,\n  });\n  const captureRequestBody = await command.prompt.confirm(\"Capture request bodies?\", {\n    default: false,\n  });\n  const captureResponseBody = await command.prompt.confirm(\"Capture response bodies?\", {\n    default: false,\n  });\n\n  const codemods = await command.createCodemods();\n  await codemods.makeUsingStub(STUBS_ROOT, \"config/apitally.stub\", {\n    captureRequestHeaders,\n    captureRequestBody,\n    captureResponseBody,\n  });\n  await codemods.updateRcFile((rcFile) => {\n    rcFile.addProvider(\"apitally/adonisjs/provider\");\n  });\n  await codemods.registerMiddleware(\"server\", [{ path: \"apitally/adonisjs/middleware\" }]);\n  await codemods.defineEnvVariables({\n    APITALLY_WRITE_TOKEN: writeToken,\n    APITALLY_ENV: env,\n  });\n  await codemods.defineEnvValidations({\n    variables: {\n      APITALLY_WRITE_TOKEN: \"Env.schema.string()\",\n      APITALLY_ENV: \"Env.schema.string()\",\n    },\n  });\n  await updateExceptionHandler(codemods, command);\n}\n\nfunction normalizeEnv(value: string): string {\n  return value.trim().toLowerCase().replace(/[ _]/g, \"-\");\n}\n\nasync function updateExceptionHandler(\n  codemods: Awaited<ReturnType<Configure[\"createCodemods\"]>>,\n  command: Configure,\n): Promise<void> {\n  const project = await codemods.getTsMorphProject();\n  const handlerPath = command.app.makePath(\"app/exceptions/handler.ts\");\n  const sourceFile =\n    project?.getSourceFile(handlerPath) ?? project?.addSourceFileAtPathIfExists(handlerPath);\n  const handlerClass = sourceFile\n    ?.getClasses()\n    .find((candidate: { isDefaultExport: () => boolean }) => candidate.isDefaultExport());\n  const method = handlerClass?.getMethod(\"handle\");\n  if (method) {\n    const alreadyConfigured = method\n      .getDescendants()\n      .some((node: { getKindName: () => string }) => {\n        if (node.getKindName() !== \"CallExpression\") {\n          return false;\n        }\n        return (\n          (node as typeof node & { getExpression: () => { getText: () => string } })\n            .getExpression()\n            .getText() === \"captureException\"\n        );\n      });\n    if (alreadyConfigured) {\n      return;\n    }\n\n    const parameters = method.getParameters();\n    const statements = method.getStatements();\n    const statement = statements[0];\n    if (\n      method.isAsync() &&\n      parameters.length >= 2 &&\n      statements.length === 1 &&\n      statement?.getKindName() === \"ReturnStatement\"\n    ) {\n      const returnExpression = (\n        statement as typeof statement & {\n          getExpression: () =>\n            | {\n                getArguments: () => Array<{ getText: () => string }>;\n                getExpression: () => { getText: () => string };\n                getKindName: () => string;\n              }\n            | undefined;\n        }\n      ).getExpression();\n      const errorName = parameters[0].getName();\n      const contextName = parameters[1].getName();\n      if (\n        returnExpression?.getKindName() === \"CallExpression\" &&\n        returnExpression.getExpression().getText() === \"super.handle\" &&\n        returnExpression\n          .getArguments()\n          .map((argument: { getText: () => string }) => argument.getText())\n          .join(\",\") === `${errorName},${contextName}`\n      ) {\n        const importDeclaration = sourceFile?.getImportDeclaration(\n          (candidate: { getModuleSpecifierValue: () => string }) =>\n            candidate.getModuleSpecifierValue() === \"apitally\",\n        );\n        if (importDeclaration) {\n          if (\n            !importDeclaration\n              .getNamedImports()\n              .some(\n                (namedImport: { getName: () => string }) =>\n                  namedImport.getName() === \"captureException\",\n              )\n          ) {\n            importDeclaration.addNamedImport(\"captureException\");\n          }\n        } else {\n          sourceFile?.addImportDeclaration({\n            moduleSpecifier: \"apitally\",\n            namedImports: [\"captureException\"],\n          });\n        }\n        method.setBodyText(\n          `const result = await super.handle(${errorName}, ${contextName})\\n` +\n            `if (${contextName}.response.getStatus() >= 500) {\\n` +\n            `  captureException(${errorName})\\n` +\n            `}\\n` +\n            `return result`,\n        );\n        await sourceFile?.save();\n        return;\n      }\n    }\n  }\n\n  command.logger.warning(\n    'Could not update \"app/exceptions/handler.ts\" automatically. Add the following import and method:',\n  );\n  command.logger.info(\n    'import { captureException } from \"apitally\"\\n\\n' +\n      \"async handle(error: unknown, ctx: HttpContext) {\\n\" +\n      \"  const result = await super.handle(error, ctx)\\n\" +\n      \"  if (ctx.response.getStatus() >= 500) {\\n\" +\n      \"    captureException(error)\\n\" +\n      \"  }\\n\" +\n      \"  return result\\n\" +\n      \"}\",\n  );\n}\n"],"mappings":"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","names":[]}

package/dist/adonisjs/index.cjs

@@ -3,7 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -19,32 +18,14 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var adonisjs_exports = {};
 __export(adonisjs_exports, {
-  captureError: () => captureError,
-  configure: () => import_configure.configure,
-  defineConfig: () => defineConfig,
-  setConsumer: () => setConsumer
+  defineConfig: () => defineConfig
 });
 module.exports = __toCommonJS(adonisjs_exports);
-var import_configure = require('./configure.cjs');
-function defineConfig(config) {
-  return config;
+function defineConfig(options) {
+  return options;
 }
-__name(defineConfig, "defineConfig");
-function captureError(error, ctx) {
-  if (error instanceof Error) {
-    ctx.apitallyError = error;
-  }
-}
-__name(captureError, "captureError");
-function setConsumer(ctx, consumer) {
-  ctx.apitallyConsumer = consumer || void 0;
-}
-__name(setConsumer, "setConsumer");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  captureError,
-  configure,
-  defineConfig,
-  setConsumer
+  defineConfig
 });
 //# sourceMappingURL=index.cjs.map

package/dist/adonisjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adonisjs/index.ts"],"sourcesContent":["import type { HttpContext } from \"@adonisjs/core/http\";\n\nimport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { configure } from \"./configure.js\";\n\nexport function defineConfig(config: ApitallyConfig) {\n  return config;\n}\n\nexport function captureError(error: unknown, ctx: HttpContext) {\n  if (error instanceof Error) {\n    ctx.apitallyError = error;\n  }\n}\n\nexport function setConsumer(\n  ctx: HttpContext,\n  consumer: ApitallyConsumer | string | null | undefined,\n) {\n  ctx.apitallyConsumer = consumer || undefined;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAIA;;;;;;;;AAAA,uBAA0B;AAEnB,SAASA,aAAaC,QAAsB;AACjD,SAAOA;AACT;AAFgBD;AAIT,SAASE,aAAaC,OAAgBC,KAAgB;AAC3D,MAAID,iBAAiBE,OAAO;AAC1BD,QAAIE,gBAAgBH;EACtB;AACF;AAJgBD;AAMT,SAASK,YACdH,KACAI,UAAsD;AAEtDJ,MAAIK,mBAAmBD,YAAYE;AACrC;AALgBH;","names":["defineConfig","config","captureError","error","ctx","Error","apitallyError","setConsumer","consumer","apitallyConsumer","undefined"]}
+{"version":3,"sources":["../../src/adonisjs/index.ts"],"sourcesContent":["import type { ApitallyOptions } from \"../config.js\";\n\nexport type { ApitallyOptions } from \"../config.js\";\n\nexport function defineConfig(options: ApitallyOptions): ApitallyOptions {\n  return options;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAIO,SAAS,aAAa,SAA2C;AACtE,SAAO;AACT;","names":[]}

package/dist/adonisjs/index.d.cts

@@ -1,18 +1,6 @@
-import { HttpContext } from '@adonisjs/core/http';
-import { ApitallyConfig, ApitallyConsumer } from '../common/types.cjs';
-export { configure } from './configure.cjs';
-import '../common/logging.cjs';
-import 'winston';
-import '../common/requestLogger.cjs';
-import 'node:buffer';
-import 'node:http';
-import '../common/spanCollector.cjs';
+import { ApitallyOptions } from '../config.cjs';
 import '@opentelemetry/sdk-trace-base';
-import '../common/tempGzipFile.cjs';
-import '@adonisjs/core/commands/configure';
 
-declare function defineConfig(config: ApitallyConfig): ApitallyConfig;
-declare function captureError(error: unknown, ctx: HttpContext): void;
-declare function setConsumer(ctx: HttpContext, consumer: ApitallyConsumer | string | null | undefined): void;
+declare function defineConfig(options: ApitallyOptions): ApitallyOptions;
 
-export { ApitallyConfig, ApitallyConsumer, captureError, defineConfig, setConsumer };
+export { ApitallyOptions, defineConfig };

package/dist/adonisjs/index.d.ts

@@ -1,18 +1,6 @@
-import { HttpContext } from '@adonisjs/core/http';
-import { ApitallyConfig, ApitallyConsumer } from '../common/types.js';
-export { configure } from './configure.js';
-import '../common/logging.js';
-import 'winston';
-import '../common/requestLogger.js';
-import 'node:buffer';
-import 'node:http';
-import '../common/spanCollector.js';
+import { ApitallyOptions } from '../config.js';
 import '@opentelemetry/sdk-trace-base';
-import '../common/tempGzipFile.js';
-import '@adonisjs/core/commands/configure';
 
-declare function defineConfig(config: ApitallyConfig): ApitallyConfig;
-declare function captureError(error: unknown, ctx: HttpContext): void;
-declare function setConsumer(ctx: HttpContext, consumer: ApitallyConsumer | string | null | undefined): void;
+declare function defineConfig(options: ApitallyOptions): ApitallyOptions;
 
-export { ApitallyConfig, ApitallyConsumer, captureError, defineConfig, setConsumer };
+export { ApitallyOptions, defineConfig };

package/dist/adonisjs/index.js

@@ -1,24 +1,7 @@
-var __defProp = Object.defineProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
-import { configure } from "./configure.js";
-function defineConfig(config) {
-  return config;
+function defineConfig(options) {
+  return options;
 }
-__name(defineConfig, "defineConfig");
-function captureError(error, ctx) {
-  if (error instanceof Error) {
-    ctx.apitallyError = error;
-  }
-}
-__name(captureError, "captureError");
-function setConsumer(ctx, consumer) {
-  ctx.apitallyConsumer = consumer || void 0;
-}
-__name(setConsumer, "setConsumer");
 export {
-  captureError,
-  configure,
-  defineConfig,
-  setConsumer
+  defineConfig
 };
 //# sourceMappingURL=index.js.map

package/dist/adonisjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adonisjs/index.ts"],"sourcesContent":["import type { HttpContext } from \"@adonisjs/core/http\";\n\nimport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport type { ApitallyConfig, ApitallyConsumer } from \"../common/types.js\";\nexport { configure } from \"./configure.js\";\n\nexport function defineConfig(config: ApitallyConfig) {\n  return config;\n}\n\nexport function captureError(error: unknown, ctx: HttpContext) {\n  if (error instanceof Error) {\n    ctx.apitallyError = error;\n  }\n}\n\nexport function setConsumer(\n  ctx: HttpContext,\n  consumer: ApitallyConsumer | string | null | undefined,\n) {\n  ctx.apitallyConsumer = consumer || undefined;\n}\n"],"mappings":";;AAIA,SAASA,iBAAiB;AAEnB,SAASC,aAAaC,QAAsB;AACjD,SAAOA;AACT;AAFgBD;AAIT,SAASE,aAAaC,OAAgBC,KAAgB;AAC3D,MAAID,iBAAiBE,OAAO;AAC1BD,QAAIE,gBAAgBH;EACtB;AACF;AAJgBD;AAMT,SAASK,YACdH,KACAI,UAAsD;AAEtDJ,MAAIK,mBAAmBD,YAAYE;AACrC;AALgBH;","names":["configure","defineConfig","config","captureError","error","ctx","Error","apitallyError","setConsumer","consumer","apitallyConsumer","undefined"]}
+{"version":3,"sources":["../../src/adonisjs/index.ts"],"sourcesContent":["import type { ApitallyOptions } from \"../config.js\";\n\nexport type { ApitallyOptions } from \"../config.js\";\n\nexport function defineConfig(options: ApitallyOptions): ApitallyOptions {\n  return options;\n}\n"],"mappings":"AAIO,SAAS,aAAa,SAA2C;AACtE,SAAO;AACT;","names":[]}

package/dist/adonisjs/middleware.cjs

@@ -3,7 +3,6 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -22,115 +21,50 @@ __export(middleware_exports, {
   default: () => ApitallyMiddleware
 });
 module.exports = __toCommonJS(middleware_exports);
-var import_node_perf_hooks = require("node:perf_hooks");
-var import_consumerRegistry = require('../common/consumerRegistry.cjs');
-var import_headers = require('../common/headers.cjs');
-var import_requestLogger = require('../common/requestLogger.cjs');
-const _ApitallyMiddleware = class _ApitallyMiddleware {
+var import_api = require("@opentelemetry/api");
+var import_activation = require('../activation.cjs');
+var import_config = require('../config.cjs');
+var import_logger = require('../logger.cjs');
+var import_requestObservation = require('../requestObservation.cjs');
+var import_requestObservationNode = require('../requestObservationNode.cjs');
+const TRACER_NAME = "apitally.adonisjs";
+class ApitallyMiddleware {
   async handle(ctx, next) {
-    const client = await ctx.containerResolver.make("apitallyClient");
-    const logsContext = await ctx.containerResolver.make("apitallyLogsContext");
-    if (!client.isEnabled() || ctx.request.method().toUpperCase() === "OPTIONS") {
-      await next();
-      return;
+    if (!(0, import_activation.isActivated)()) {
+      return next();
     }
-    return logsContext.run([], async () => {
-      var _a, _b;
-      const path = (_a = ctx.route) == null ? void 0 : _a.pattern;
-      const timestamp = Date.now() / 1e3;
-      const startTime = import_node_perf_hooks.performance.now();
-      const spanHandle = client.spanCollector.startSpan();
-      await spanHandle.runInContext(next);
-      const responseTime = import_node_perf_hooks.performance.now() - startTime;
-      spanHandle.setName(`${ctx.request.method()} ${path}`);
-      const spans = spanHandle.end();
-      const traceId = spanHandle.traceId;
-      const requestSize = (0, import_headers.parseContentLength)(ctx.request.header("content-length"));
-      const requestContentType = (_b = ctx.request.header("content-type")) == null ? void 0 : _b.toString();
-      let responseStatus = ctx.response.getStatus();
-      let responseHeaders = ctx.response.getHeaders();
-      let responseSize;
-      let responseContentType;
-      const consumer = ctx.apitallyConsumer ? (0, import_consumerRegistry.consumerFromStringOrObject)(ctx.apitallyConsumer) : null;
-      client.consumerRegistry.addOrUpdateConsumer(consumer);
-      const onWriteHead = /* @__PURE__ */ __name((statusCode, headers) => {
-        var _a2;
-        responseStatus = statusCode;
-        responseHeaders = headers;
-        responseSize = (0, import_headers.parseContentLength)(headers["content-length"]);
-        responseContentType = (_a2 = headers["content-type"]) == null ? void 0 : _a2.toString();
-        if (path) {
-          client.requestCounter.addRequest({
-            consumer: consumer == null ? void 0 : consumer.identifier,
-            method: ctx.request.method(),
-            path,
-            statusCode: responseStatus,
-            responseTime,
-            requestSize,
-            responseSize
-          });
-          if (responseStatus === 422 && ctx.apitallyError && "code" in ctx.apitallyError && "messages" in ctx.apitallyError && ctx.apitallyError.code === "E_VALIDATION_ERROR" && Array.isArray(ctx.apitallyError.messages)) {
-            ctx.apitallyError.messages.forEach((message) => {
-              client.validationErrorCounter.addValidationError({
-                consumer: consumer == null ? void 0 : consumer.identifier,
-                method: ctx.request.method(),
-                path,
-                loc: message.field,
-                msg: message.message,
-                type: message.rule
-              });
-            });
-          }
-          if (responseStatus === 500 && ctx.apitallyError) {
-            client.serverErrorCounter.addServerError({
-              consumer: consumer == null ? void 0 : consumer.identifier,
-              method: ctx.request.method(),
-              path,
-              type: ctx.apitallyError.name,
-              msg: ctx.apitallyError.message,
-              traceback: ctx.apitallyError.stack || ""
-            });
-          }
-        }
-      }, "onWriteHead");
-      const originalWriteHead = ctx.response.response.writeHead;
-      ctx.response.response.writeHead = (...args) => {
-        originalWriteHead.apply(ctx.response.response, args);
-        onWriteHead(args[0], typeof args[1] === "string" ? args[2] : args[1]);
-        return ctx.response.response;
-      };
-      if (client.requestLogger.enabled) {
-        const logs = logsContext.getStore();
-        const onEnd = /* @__PURE__ */ __name((chunk) => {
-          const requestBody = client.requestLogger.config.logRequestBody && client.requestLogger.isSupportedContentType(requestContentType) ? ctx.request.raw() : void 0;
-          const responseBody = client.requestLogger.config.logResponseBody && client.requestLogger.isSupportedContentType(responseContentType) ? chunk : void 0;
-          client.requestLogger.logRequest({
-            timestamp,
-            method: ctx.request.method(),
-            path,
-            url: ctx.request.completeUrl(true),
-            headers: (0, import_requestLogger.convertHeaders)(ctx.request.headers()),
-            size: requestSize,
-            consumer: consumer == null ? void 0 : consumer.identifier,
-            body: requestBody ? Buffer.from(requestBody) : void 0
-          }, {
-            statusCode: responseStatus,
-            responseTime: responseTime / 1e3,
-            headers: (0, import_requestLogger.convertHeaders)(responseHeaders),
-            size: responseSize,
-            body: responseBody ? Buffer.from(responseBody) : void 0
-          }, ctx.apitallyError, logs, spans, traceId);
-        }, "onEnd");
-        const originalEnd = ctx.response.response.end;
-        ctx.response.response.end = (...args) => {
-          originalEnd.apply(ctx.response.response, args);
-          onEnd(typeof args[0] !== "function" ? args[0] : void 0);
-          return ctx.response.response;
-        };
-      }
-    });
+    let requestContext;
+    try {
+      const request = ctx.request.request;
+      const response = ctx.response.response;
+      const started = (0, import_requestObservationNode.startNodeRequestObservation)({ request, tracerName: TRACER_NAME });
+      requestContext = started.requestContext;
+      import_api.context.bind(requestContext, request);
+      import_api.context.bind(requestContext, response);
+      (0, import_requestObservationNode.captureNodeResponse)(
+        response,
+        (0, import_config.getConfig)().captureResponseBody && started.observation.requestRecord.dropReason === void 0,
+        started.observation.requestBodyCapture,
+        (name) => ctx.response.getHeader(name)
+      ).then((completion) => {
+        (0, import_requestObservation.finalizeRequestObservation)({
+          observation: started.observation,
+          completedAtMillis: completion.completedAtMillis,
+          statusCode: response.statusCode,
+          route: ctx.route?.pattern,
+          clientAddress: ctx.request.ip(),
+          requestHeaders: request.headers,
+          responseHeaders: ctx.response.getHeaders(),
+          capturedRequestBody: completion.requestBody,
+          capturedResponseBody: completion
+        });
+      }).catch((error) => {
+        (0, import_logger.logWarning)(`Error in the Apitally middleware: ${String(error)}`);
+      });
+    } catch (error) {
+      (0, import_logger.logWarning)(`Error in the Apitally middleware: ${String(error)}`);
+    }
+    return requestContext ? import_api.context.with(requestContext, next) : next();
   }
-};
-__name(_ApitallyMiddleware, "ApitallyMiddleware");
-let ApitallyMiddleware = _ApitallyMiddleware;
+}
 //# sourceMappingURL=middleware.cjs.map

package/dist/adonisjs/middleware.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/adonisjs/middleware.ts"],"sourcesContent":["import { HttpContext } from \"@adonisjs/core/http\";\nimport { NextFn } from \"@adonisjs/core/types/http\";\nimport { AsyncLocalStorage } from \"node:async_hooks\";\nimport type { OutgoingHttpHeaders } from \"node:http\";\nimport { performance } from \"node:perf_hooks\";\n\nimport type { ApitallyClient } from \"../common/client.js\";\nimport { consumerFromStringOrObject } from \"../common/consumerRegistry.js\";\nimport { parseContentLength } from \"../common/headers.js\";\nimport type { LogRecord } from \"../common/requestLogger.js\";\nimport { convertHeaders } from \"../common/requestLogger.js\";\nimport type { ApitallyConsumer } from \"../common/types.js\";\n\ndeclare module \"@adonisjs/core/http\" {\n  interface HttpContext {\n    apitallyConsumer?: ApitallyConsumer | string;\n    apitallyError?: Error;\n  }\n}\n\nexport default class ApitallyMiddleware {\n  async handle(ctx: HttpContext, next: NextFn) {\n    const client: ApitallyClient =\n      await ctx.containerResolver.make(\"apitallyClient\");\n    const logsContext: AsyncLocalStorage<LogRecord[]> =\n      await ctx.containerResolver.make(\"apitallyLogsContext\");\n\n    if (\n      !client.isEnabled() ||\n      ctx.request.method().toUpperCase() === \"OPTIONS\"\n    ) {\n      await next();\n      return;\n    }\n\n    return logsContext.run([], async () => {\n      const path = ctx.route?.pattern;\n      const timestamp = Date.now() / 1000;\n      const startTime = performance.now();\n\n      const spanHandle = client.spanCollector.startSpan();\n      await spanHandle.runInContext(next);\n\n      const responseTime = performance.now() - startTime;\n      spanHandle.setName(`${ctx.request.method()} ${path}`);\n      const spans = spanHandle.end();\n      const traceId = spanHandle.traceId;\n\n      const requestSize = parseContentLength(\n        ctx.request.header(\"content-length\"),\n      );\n      const requestContentType = ctx.request.header(\"content-type\")?.toString();\n      let responseStatus = ctx.response.getStatus();\n      let responseHeaders = ctx.response.getHeaders();\n      let responseSize: number | undefined;\n      let responseContentType: string | undefined;\n\n      const consumer = ctx.apitallyConsumer\n        ? consumerFromStringOrObject(ctx.apitallyConsumer)\n        : null;\n      client.consumerRegistry.addOrUpdateConsumer(consumer);\n\n      const onWriteHead = (\n        statusCode: number,\n        headers: OutgoingHttpHeaders,\n      ) => {\n        responseStatus = statusCode;\n        responseHeaders = headers;\n        responseSize = parseContentLength(headers[\"content-length\"]);\n        responseContentType = headers[\"content-type\"]?.toString();\n\n        if (path) {\n          client.requestCounter.addRequest({\n            consumer: consumer?.identifier,\n            method: ctx.request.method(),\n            path,\n            statusCode: responseStatus,\n            responseTime,\n            requestSize,\n            responseSize,\n          });\n\n          if (\n            responseStatus === 422 &&\n            ctx.apitallyError &&\n            \"code\" in ctx.apitallyError &&\n            \"messages\" in ctx.apitallyError &&\n            ctx.apitallyError.code === \"E_VALIDATION_ERROR\" &&\n            Array.isArray(ctx.apitallyError.messages)\n          ) {\n            ctx.apitallyError.messages.forEach((message) => {\n              client.validationErrorCounter.addValidationError({\n                consumer: consumer?.identifier,\n                method: ctx.request.method(),\n                path,\n                loc: message.field,\n                msg: message.message,\n                type: message.rule,\n              });\n            });\n          }\n\n          if (responseStatus === 500 && ctx.apitallyError) {\n            client.serverErrorCounter.addServerError({\n              consumer: consumer?.identifier,\n              method: ctx.request.method(),\n              path,\n              type: ctx.apitallyError.name,\n              msg: ctx.apitallyError.message,\n              traceback: ctx.apitallyError.stack || \"\",\n            });\n          }\n        }\n      };\n\n      // Capture the final status code and response headers just before they are sent\n      const originalWriteHead = ctx.response.response.writeHead;\n      ctx.response.response.writeHead = (...args: any) => {\n        originalWriteHead.apply(ctx.response.response, args);\n        onWriteHead(args[0], typeof args[1] === \"string\" ? args[2] : args[1]);\n        return ctx.response.response;\n      };\n\n      if (client.requestLogger.enabled) {\n        const logs = logsContext.getStore();\n\n        const onEnd = (chunk: any) => {\n          const requestBody =\n            client.requestLogger.config.logRequestBody &&\n            client.requestLogger.isSupportedContentType(requestContentType)\n              ? ctx.request.raw()\n              : undefined;\n          const responseBody =\n            client.requestLogger.config.logResponseBody &&\n            client.requestLogger.isSupportedContentType(responseContentType)\n              ? chunk\n              : undefined;\n\n          client.requestLogger.logRequest(\n            {\n              timestamp,\n              method: ctx.request.method(),\n              path,\n              url: ctx.request.completeUrl(true),\n              headers: convertHeaders(ctx.request.headers()),\n              size: requestSize,\n              consumer: consumer?.identifier,\n              body: requestBody ? Buffer.from(requestBody) : undefined,\n            },\n            {\n              statusCode: responseStatus,\n              responseTime: responseTime / 1000,\n              headers: convertHeaders(responseHeaders),\n              size: responseSize,\n              body: responseBody ? Buffer.from(responseBody) : undefined,\n            },\n            ctx.apitallyError,\n            logs,\n            spans,\n            traceId,\n          );\n        };\n\n        // Capture the final response body just before it is sent\n        const originalEnd = ctx.response.response.end;\n        ctx.response.response.end = (...args: any) => {\n          originalEnd.apply(ctx.response.response, args);\n          onEnd(typeof args[0] !== \"function\" ? args[0] : undefined);\n          return ctx.response.response;\n        };\n      }\n    });\n  }\n}\n"],"mappings":"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","names":["ApitallyMiddleware","handle","ctx","next","client","containerResolver","make","logsContext","isEnabled","request","method","toUpperCase","run","path","route","pattern","timestamp","Date","now","startTime","performance","spanHandle","spanCollector","startSpan","runInContext","responseTime","setName","spans","end","traceId","requestSize","parseContentLength","header","requestContentType","toString","responseStatus","response","getStatus","responseHeaders","getHeaders","responseSize","responseContentType","consumer","apitallyConsumer","consumerFromStringOrObject","consumerRegistry","addOrUpdateConsumer","onWriteHead","statusCode","headers","_a","requestCounter","addRequest","identifier","apitallyError","code","Array","isArray","messages","forEach","message","validationErrorCounter","addValidationError","loc","field","msg","type","rule","serverErrorCounter","addServerError","name","traceback","stack","originalWriteHead","writeHead","args","apply","requestLogger","enabled","logs","getStore","onEnd","chunk","requestBody","config","logRequestBody","isSupportedContentType","raw","undefined","responseBody","logResponseBody","logRequest","url","completeUrl","convertHeaders","size","body","Buffer","from","originalEnd"]}
+{"version":3,"sources":["../../src/adonisjs/middleware.ts"],"sourcesContent":["import type { HttpContext } from \"@adonisjs/core/http\";\nimport type { NextFn } from \"@adonisjs/core/types/http\";\nimport { type Context, context } from \"@opentelemetry/api\";\n\nimport { isActivated } from \"../activation.js\";\nimport { getConfig } from \"../config.js\";\nimport { logWarning } from \"../logger.js\";\nimport { finalizeRequestObservation } from \"../requestObservation.js\";\nimport { captureNodeResponse, startNodeRequestObservation } from \"../requestObservationNode.js\";\n\nconst TRACER_NAME = \"apitally.adonisjs\";\n\nexport default class ApitallyMiddleware {\n  async handle(ctx: HttpContext, next: NextFn): Promise<unknown> {\n    if (!isActivated()) {\n      return next();\n    }\n\n    let requestContext: Context | undefined;\n    try {\n      const request = ctx.request.request;\n      const response = ctx.response.response;\n      const started = startNodeRequestObservation({ request, tracerName: TRACER_NAME });\n      requestContext = started.requestContext;\n      context.bind(requestContext, request);\n      context.bind(requestContext, response);\n      captureNodeResponse(\n        response,\n        getConfig().captureResponseBody &&\n          started.observation.requestRecord.dropReason === undefined,\n        started.observation.requestBodyCapture,\n        (name) => ctx.response.getHeader(name),\n      )\n        .then((completion) => {\n          finalizeRequestObservation({\n            observation: started.observation,\n            completedAtMillis: completion.completedAtMillis,\n            statusCode: response.statusCode,\n            route: ctx.route?.pattern,\n            clientAddress: ctx.request.ip(),\n            requestHeaders: request.headers,\n            responseHeaders: ctx.response.getHeaders(),\n            capturedRequestBody: completion.requestBody,\n            capturedResponseBody: completion,\n          });\n        })\n        .catch((error: unknown) => {\n          logWarning(`Error in the Apitally middleware: ${String(error)}`);\n        });\n    } catch (error) {\n      logWarning(`Error in the Apitally middleware: ${String(error)}`);\n    }\n\n    return requestContext ? context.with(requestContext, next) : next();\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,iBAAsC;AAEtC,wBAA4B;AAC5B,oBAA0B;AAC1B,oBAA2B;AAC3B,gCAA2C;AAC3C,oCAAiE;AAEjE,MAAM,cAAc;AAEpB,MAAO,mBAAiC;AAAA,EACtC,MAAM,OAAO,KAAkB,MAAgC;AAC7D,QAAI,KAAC,+BAAY,GAAG;AAClB,aAAO,KAAK;AAAA,IACd;AAEA,QAAI;AACJ,QAAI;AACF,YAAM,UAAU,IAAI,QAAQ;AAC5B,YAAM,WAAW,IAAI,SAAS;AAC9B,YAAM,cAAU,2DAA4B,EAAE,SAAS,YAAY,YAAY,CAAC;AAChF,uBAAiB,QAAQ;AACzB,yBAAQ,KAAK,gBAAgB,OAAO;AACpC,yBAAQ,KAAK,gBAAgB,QAAQ;AACrC;AAAA,QACE;AAAA,YACA,yBAAU,EAAE,uBACV,QAAQ,YAAY,cAAc,eAAe;AAAA,QACnD,QAAQ,YAAY;AAAA,QACpB,CAAC,SAAS,IAAI,SAAS,UAAU,IAAI;AAAA,MACvC,EACG,KAAK,CAAC,eAAe;AACpB,kEAA2B;AAAA,UACzB,aAAa,QAAQ;AAAA,UACrB,mBAAmB,WAAW;AAAA,UAC9B,YAAY,SAAS;AAAA,UACrB,OAAO,IAAI,OAAO;AAAA,UAClB,eAAe,IAAI,QAAQ,GAAG;AAAA,UAC9B,gBAAgB,QAAQ;AAAA,UACxB,iBAAiB,IAAI,SAAS,WAAW;AAAA,UACzC,qBAAqB,WAAW;AAAA,UAChC,sBAAsB;AAAA,QACxB,CAAC;AAAA,MACH,CAAC,EACA,MAAM,CAAC,UAAmB;AACzB,sCAAW,qCAAqC,OAAO,KAAK,CAAC,EAAE;AAAA,MACjE,CAAC;AAAA,IACL,SAAS,OAAO;AACd,oCAAW,qCAAqC,OAAO,KAAK,CAAC,EAAE;AAAA,IACjE;AAEA,WAAO,iBAAiB,mBAAQ,KAAK,gBAAgB,IAAI,IAAI,KAAK;AAAA,EACpE;AACF;","names":[]}

package/dist/adonisjs/middleware.d.cts

@@ -1,23 +1,8 @@
 import { HttpContext } from '@adonisjs/core/http';
 import { NextFn } from '@adonisjs/core/types/http';
-import { ApitallyConsumer } from '../common/types.cjs';
-import '../common/logging.cjs';
-import 'winston';
-import '../common/requestLogger.cjs';
-import 'node:buffer';
-import 'node:http';
-import '../common/spanCollector.cjs';
-import '@opentelemetry/sdk-trace-base';
-import '../common/tempGzipFile.cjs';
 
-declare module "@adonisjs/core/http" {
-    interface HttpContext {
-        apitallyConsumer?: ApitallyConsumer | string;
-        apitallyError?: Error;
-    }
-}
 declare class ApitallyMiddleware {
-    handle(ctx: HttpContext, next: NextFn): Promise<void>;
+    handle(ctx: HttpContext, next: NextFn): Promise<unknown>;
 }
 
 export { ApitallyMiddleware as default };

package/dist/adonisjs/middleware.d.ts

@@ -1,23 +1,8 @@
 import { HttpContext } from '@adonisjs/core/http';
 import { NextFn } from '@adonisjs/core/types/http';
-import { ApitallyConsumer } from '../common/types.js';
-import '../common/logging.js';
-import 'winston';
-import '../common/requestLogger.js';
-import 'node:buffer';
-import 'node:http';
-import '../common/spanCollector.js';
-import '@opentelemetry/sdk-trace-base';
-import '../common/tempGzipFile.js';
 
-declare module "@adonisjs/core/http" {
-    interface HttpContext {
-        apitallyConsumer?: ApitallyConsumer | string;
-        apitallyError?: Error;
-    }
-}
 declare class ApitallyMiddleware {
-    handle(ctx: HttpContext, next: NextFn): Promise<void>;
+    handle(ctx: HttpContext, next: NextFn): Promise<unknown>;
 }
 
 export { ApitallyMiddleware as default };