@whatwg-node/server 0.10.0 → 0.10.1

package/cjs/createServerAdapter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createServerAdapter = createServerAdapter;
 const tslib_1 = require("tslib");
-const instruments_1 = require("@envelop/instruments");
+const instrumentation_1 = require("@envelop/instrumentation");
 const disposablestack_1 = require("@whatwg-node/disposablestack");
 const DefaultFetchAPI = tslib_1.__importStar(require("@whatwg-node/fetch"));
 const promise_helpers_1 = require("@whatwg-node/promise-helpers");
@@ -28,7 +28,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         : serverAdapterBaseObject.handle;
     const onRequestHooks = [];
     const onResponseHooks = [];
-    let instruments;
+    let instrumentation;
     const waitUntilPromises = new Set();
     let _disposableStack;
     function ensureDisposableStack() {
@@ -64,8 +64,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     }
     if (options?.plugins != null) {
         for (const plugin of options.plugins) {
-            if (plugin.instruments) {
-                instruments = instruments ? (0, instruments_1.chain)(instruments, plugin.instruments) : plugin.instruments;
+            if (plugin.instrumentation) {
+                instrumentation = instrumentation
+                    ? (0, instrumentation_1.chain)(instrumentation, plugin.instrumentation)
+                    : plugin.instrumentation;
             }
             if (plugin.onRequest) {
                 onRequestHooks.push(plugin.onRequest);
@@ -141,10 +143,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             })), handleEarlyResponse);
         }
         : givenHandleRequest;
-    if (instruments?.request) {
+    if (instrumentation?.request) {
         const originalRequestHandler = handleRequest;
         handleRequest = (request, initialContext) => {
-            return (0, instruments_1.getInstrumented)({ request }).asyncFn(instruments.request, originalRequestHandler)(request, initialContext);
+            return (0, instrumentation_1.getInstrumented)({ request }).asyncFn(instrumentation.request, originalRequestHandler)(request, initialContext);
         };
     }
     // TODO: Remove this on the next major version

package/cjs/index.js

@@ -14,4 +14,4 @@ var fetch_1 = require("@whatwg-node/fetch");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return fetch_1.Response; } });
 var disposablestack_1 = require("@whatwg-node/disposablestack");
 Object.defineProperty(exports, "DisposableSymbols", { enumerable: true, get: function () { return disposablestack_1.DisposableSymbols; } });
-tslib_1.__exportStar(require("@envelop/instruments"), exports);
+tslib_1.__exportStar(require("@envelop/instrumentation"), exports);

package/esm/createServerAdapter.js

@@ -1,4 +1,4 @@
-import { chain, getInstrumented } from '@envelop/instruments';
+import { chain, getInstrumented } from '@envelop/instrumentation';
 import { AsyncDisposableStack, DisposableSymbols } from '@whatwg-node/disposablestack';
 import * as DefaultFetchAPI from '@whatwg-node/fetch';
 import { handleMaybePromise } from '@whatwg-node/promise-helpers';
@@ -24,7 +24,7 @@ function createServerAdapter(serverAdapterBaseObject, options) {
         : serverAdapterBaseObject.handle;
     const onRequestHooks = [];
     const onResponseHooks = [];
-    let instruments;
+    let instrumentation;
     const waitUntilPromises = new Set();
     let _disposableStack;
     function ensureDisposableStack() {
@@ -60,8 +60,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
     }
     if (options?.plugins != null) {
         for (const plugin of options.plugins) {
-            if (plugin.instruments) {
-                instruments = instruments ? chain(instruments, plugin.instruments) : plugin.instruments;
+            if (plugin.instrumentation) {
+                instrumentation = instrumentation
+                    ? chain(instrumentation, plugin.instrumentation)
+                    : plugin.instrumentation;
             }
             if (plugin.onRequest) {
                 onRequestHooks.push(plugin.onRequest);
@@ -137,10 +139,10 @@ function createServerAdapter(serverAdapterBaseObject, options) {
             })), handleEarlyResponse);
         }
         : givenHandleRequest;
-    if (instruments?.request) {
+    if (instrumentation?.request) {
         const originalRequestHandler = handleRequest;
         handleRequest = (request, initialContext) => {
-            return getInstrumented({ request }).asyncFn(instruments.request, originalRequestHandler)(request, initialContext);
+            return getInstrumented({ request }).asyncFn(instrumentation.request, originalRequestHandler)(request, initialContext);
         };
     }
     // TODO: Remove this on the next major version

package/esm/index.js

@@ -8,4 +8,4 @@ export * from './plugins/useContentEncoding.js';
 export * from './uwebsockets.js';
 export { Response } from '@whatwg-node/fetch';
 export { DisposableSymbols } from '@whatwg-node/disposablestack';
-export * from '@envelop/instruments';
+export * from '@envelop/instrumentation';

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@whatwg-node/server",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Fetch API compliant HTTP Server adapter",
   "sideEffects": false,
   "dependencies": {
-    "@envelop/instruments": "1.0.0",
+    "@envelop/instrumentation": "^1.0.0",
     "@whatwg-node/disposablestack": "^0.0.6",
     "@whatwg-node/fetch": "^0.10.5",
     "@whatwg-node/promise-helpers": "^1.2.3",

package/typings/index.d.cts

@@ -8,4 +8,4 @@ export * from './plugins/useContentEncoding.cjs';
 export * from './uwebsockets.cjs';
 export { Response } from '@whatwg-node/fetch';
 export { DisposableSymbols } from '@whatwg-node/disposablestack';
-export * from '@envelop/instruments';
+export * from '@envelop/instrumentation';

package/typings/index.d.ts

@@ -8,4 +8,4 @@ export * from './plugins/useContentEncoding.js';
 export * from './uwebsockets.js';
 export { Response } from '@whatwg-node/fetch';
 export { DisposableSymbols } from '@whatwg-node/disposablestack';
-export * from '@envelop/instruments';
+export * from '@envelop/instrumentation';

package/typings/plugins/types.d.cts

@@ -1,10 +1,10 @@
 import { FetchAPI, ServerAdapterRequestHandler, type ServerAdapterInitialContext } from '../types.cjs';
 export interface ServerAdapterPlugin<TServerContext = {}> {
     /**
-     * A tracer insance. It can be used to wrap the entire request handling pipeline (including the
+     * A tracer instance. It can be used to wrap the entire request handling pipeline (including the
      * plugin hooks). It is mostly used for observability (monitoring, tracing, etc...).
      */
-    instruments?: Instruments;
+    instrumentation?: Instrumentation;
     /**
      * This hook is invoked for ANY incoming HTTP request. Here you can manipulate the request,
      * create a short circuit before the request handler takes it over.
@@ -43,7 +43,7 @@ export interface ServerAdapterPlugin<TServerContext = {}> {
      */
     onDispose?: () => PromiseLike<void> | void;
 }
-export type Instruments = {
+export type Instrumentation = {
     /**
      * Run code befor, after or around the handling of each request.
      * This instrument can't modify result or paramters of the request handling.

package/typings/plugins/types.d.ts

@@ -1,10 +1,10 @@
 import { FetchAPI, ServerAdapterRequestHandler, type ServerAdapterInitialContext } from '../types.js';
 export interface ServerAdapterPlugin<TServerContext = {}> {
     /**
-     * A tracer insance. It can be used to wrap the entire request handling pipeline (including the
+     * A tracer instance. It can be used to wrap the entire request handling pipeline (including the
      * plugin hooks). It is mostly used for observability (monitoring, tracing, etc...).
      */
-    instruments?: Instruments;
+    instrumentation?: Instrumentation;
     /**
      * This hook is invoked for ANY incoming HTTP request. Here you can manipulate the request,
      * create a short circuit before the request handler takes it over.
@@ -43,7 +43,7 @@ export interface ServerAdapterPlugin<TServerContext = {}> {
      */
     onDispose?: () => PromiseLike<void> | void;
 }
-export type Instruments = {
+export type Instrumentation = {
     /**
      * Run code befor, after or around the handling of each request.
      * This instrument can't modify result or paramters of the request handling.