@use-tusk/drift-node-sdk 0.1.0 → 0.1.2

package/dist/index.d.cts

@@ -77,7 +77,7 @@ interface TuskDriftPublicAPI {
    *
    * @example
    * ```typescript
-   * import { TuskDrift } from 'tusk-drift-sdk';
+   * import  { TuskDrift } from "@use-tusk/drift-node-sdk"
    *
    * TuskDrift.initialize({
    *   apiKey: 'your-api-key',

package/dist/index.d.ts

@@ -80,7 +80,7 @@ interface TuskDriftPublicAPI {
    *
    * @example
    * ```typescript
-   * import { TuskDrift } from 'tusk-drift-sdk';
+   * import  { TuskDrift } from "@use-tusk/drift-node-sdk"
    *
    * TuskDrift.initialize({
    *   apiKey: 'your-api-key',

package/dist/index.js

@@ -6,6 +6,7 @@ import * as path$1 from "path";
 import path, { normalize } from "path";
 import { satisfies } from "semver";
 import { Hook } from "require-in-the-middle";
+import { Hook as Hook$1 } from "import-in-the-middle";
 import { Struct, Value } from "@use-tusk/drift-schemas/google/protobuf/struct";
 import { SpanKind, SpanStatusCode, context, createContextKey, trace } from "@opentelemetry/api";
 import { PackageType, Span, SpanKind as SpanKind$1, StatusCode } from "@use-tusk/drift-schemas/core/span";
@@ -72,7 +73,7 @@ var TdInstrumentationAbstract = class {
 
 //#endregion
 //#region package.json
-var version = "0.1.0";
+var version = "0.1.2";
 
 //#endregion
 //#region src/version.ts
@@ -397,10 +398,11 @@ function sendUnpatchedDependencyAlert({ method, spanId, traceId, stackTrace }) {
 
 //#endregion
 //#region src/instrumentation/core/baseClasses/TdInstrumentationBase.ts
-var TdInstrumentationBase = class extends TdInstrumentationAbstract {
+var TdInstrumentationBase = class TdInstrumentationBase extends TdInstrumentationAbstract {
 	constructor(instrumentationName, config = {}) {
 		super(instrumentationName, config);
 		this._modules = [];
+		this._hooks = [];
 		this._enabled = false;
 		let modules = this.init();
 		if (modules && !Array.isArray(modules)) modules = [modules];
@@ -441,12 +443,35 @@ var TdInstrumentationBase = class extends TdInstrumentationAbstract {
 			const onRequire = (exports$1, name, baseDir) => {
 				return this._onRequire(module$1, exports$1, name, baseDir);
 			};
-			new Hook([module$1.name], { internals: true }, onRequire);
+			const hookFn = (exports$1, name, baseDir) => {
+				if (!baseDir && path.isAbsolute(name)) {
+					const parsedPath = path.parse(name);
+					name = parsedPath.name;
+					baseDir = parsedPath.dir;
+				}
+				return this._onRequire(module$1, exports$1, name, baseDir || void 0);
+			};
+			const cjsHook = new Hook([module$1.name], { internals: true }, onRequire);
+			this._hooks.push(cjsHook);
+			const esmHook = new Hook$1([module$1.name], { internals: false }, hookFn);
+			this._hooks.push(esmHook);
 		}
 	}
 	isEnabled() {
 		return this._enabled;
 	}
+	/**
+	* Mark a module as patched.
+	*/
+	markModuleAsPatched(moduleExports) {
+		TdInstrumentationBase._patchedModules.add(moduleExports);
+	}
+	/**
+	* Check if a module has already been patched.
+	*/
+	isModulePatched(moduleExports) {
+		return TdInstrumentationBase._patchedModules.has(moduleExports);
+	}
 	_onRequire(module$1, exports$1, name, baseDir) {
 		if (!baseDir) {
 			if (typeof module$1.patch === "function") {
@@ -509,6 +534,7 @@ var TdInstrumentationBase = class extends TdInstrumentationAbstract {
 		}, exports$1);
 	}
 };
+TdInstrumentationBase._patchedModules = /* @__PURE__ */ new WeakSet();
 
 //#endregion
 //#region src/instrumentation/core/baseClasses/TdInstrumentationNodeModule.ts
@@ -1913,6 +1939,7 @@ function wrap(target, propertyName, wrapper) {
 	wrapped._original = original;
 	wrapped._propertyName = propertyName;
 	target[propertyName] = wrapped;
+	return wrapped;
 }
 
 //#endregion
@@ -2195,18 +2222,25 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 	_patchHttpModule(httpModule, protocol) {
 		const protocolUpper = protocol.toUpperCase();
 		logger.debug(`[HttpInstrumentation] Patching ${protocolUpper} module in ${this.mode} mode`);
-		if (httpModule._tdPatched) {
+		if (this.isModulePatched(httpModule)) {
 			logger.debug(`[HttpInstrumentation] ${protocolUpper} module already patched, skipping`);
 			return httpModule;
 		}
-		this._wrap(httpModule, "request", this._getRequestPatchFn(protocol));
-		this._wrap(httpModule, "get", this._getGetPatchFn(protocol));
+		if (httpModule[Symbol.toStringTag] === "Module") {
+			if (httpModule.default) {
+				this._wrap(httpModule.default, "request", this._getRequestPatchFn(protocol));
+				this._wrap(httpModule.default, "get", this._getGetPatchFn(protocol));
+			}
+		} else {
+			this._wrap(httpModule, "request", this._getRequestPatchFn(protocol));
+			this._wrap(httpModule, "get", this._getGetPatchFn(protocol));
+		}
 		const HttpServer = httpModule.Server;
 		if (HttpServer && HttpServer.prototype) {
 			this._wrap(HttpServer.prototype, "emit", this._getServerEmitPatchFn(protocol));
 			logger.debug(`[HttpInstrumentation] Wrapped Server.prototype.emit for ${protocolUpper}`);
 		}
-		httpModule._tdPatched = true;
+		this.markModuleAsPatched(httpModule);
 		logger.debug(`[HttpInstrumentation] ${protocolUpper} module patching complete`);
 		return httpModule;
 	}
@@ -2551,7 +2585,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 			}
 		});
 	}
-	_captureClientRequestBody(req, spanInfo, inputValue, schemaMerges) {
+	_captureClientRequestBody(req, spanInfo, inputValue, schemaMerges, onBodyCaptured) {
 		const requestBodyChunks = [];
 		let requestBodyCaptured = false;
 		const originalWrite = req.write?.bind(req);
@@ -2573,6 +2607,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 							body: encodedBody,
 							bodySize: bodyBuffer.length
 						};
+						if (onBodyCaptured) onBodyCaptured(updatedInputValue);
 						SpanUtils.addSpanAttributes(spanInfo.span, {
 							inputValue: updatedInputValue,
 							inputSchemaMerges: {
@@ -2594,7 +2629,10 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 	}
 	_handleOutboundRequestInSpan(originalRequest, args, spanInfo, inputValue, schemaMerges) {
 		const req = originalRequest.apply(this, args);
-		this._captureClientRequestBody(req, spanInfo, inputValue, schemaMerges);
+		let completeInputValue = inputValue;
+		this._captureClientRequestBody(req, spanInfo, inputValue, schemaMerges, (updatedInputValue) => {
+			completeInputValue = updatedInputValue;
+		});
 		req.on("response", (res) => {
 			logger.debug(`[HttpInstrumentation] HTTP response received: ${res.statusCode} (${SpanUtils.getTraceInfo()})`);
 			const outputValue = {
@@ -2634,7 +2672,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 								},
 								headers: { matchImportance: 0 }
 							},
-							inputValue
+							inputValue: completeInputValue
 						});
 					} catch (error) {
 						logger.error(`[HttpInstrumentation] Error processing response body:`, error);
@@ -2652,7 +2690,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 						},
 						headers: { matchImportance: 0 }
 					},
-					inputValue
+					inputValue: completeInputValue
 				});
 			} catch (error) {
 				logger.error(`[HttpInstrumentation] Error adding output attributes to span:`, error);
@@ -2895,7 +2933,7 @@ var HttpInstrumentation = class extends TdInstrumentationBase {
 		return fallback;
 	}
 	_wrap(target, propertyName, wrapper) {
-		wrap(target, propertyName, wrapper);
+		return wrap(target, propertyName, wrapper);
 	}
 };
 
@@ -3290,7 +3328,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 	}
 	_patchPgModule(pgModule) {
 		logger.debug(`[PgInstrumentation] Patching PG module in ${this.mode} mode`);
-		if (pgModule._tdPatched) {
+		if (this.isModulePatched(pgModule)) {
 			logger.debug(`[PgInstrumentation] PG module already patched, skipping`);
 			return pgModule;
 		}
@@ -3302,7 +3340,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			this._wrap(pgModule.Client.prototype, "connect", this._getConnectPatchFn("client"));
 			logger.debug(`[PgInstrumentation] Wrapped Client.prototype.connect`);
 		}
-		pgModule._tdPatched = true;
+		this.markModuleAsPatched(pgModule);
 		logger.debug(`[PgInstrumentation] PG module patching complete`);
 		return pgModule;
 	}
@@ -3624,7 +3662,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 		SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
 	}
 	_patchPgPoolModule(pgPoolModule) {
-		if (pgPoolModule._tdPatched) {
+		if (this.isModulePatched(pgPoolModule)) {
 			logger.debug(`[PgInstrumentation] PG Pool module already patched, skipping`);
 			return pgPoolModule;
 		}
@@ -3636,7 +3674,7 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 			this._wrap(pgPoolModule.prototype, "connect", this._getPoolConnectPatchFn());
 			logger.debug(`[PgInstrumentation] Wrapped Pool.prototype.connect`);
 		}
-		pgPoolModule._tdPatched = true;
+		this.markModuleAsPatched(pgPoolModule);
 		logger.debug(`[PgInstrumentation] PG Pool module patching complete`);
 		return pgPoolModule;
 	}
@@ -3747,6 +3785,17 @@ var PgInstrumentation = class extends TdInstrumentationBase {
 	}
 };
 
+//#endregion
+//#region src/instrumentation/libraries/postgres/types.ts
+function isPostgresOutputValueType(value) {
+	return value !== null && value !== void 0 && typeof value === "object" && "_tdOriginalFormat" in value && Object.values(PostgresReturnType).includes(value._tdOriginalFormat);
+}
+let PostgresReturnType = /* @__PURE__ */ function(PostgresReturnType$1) {
+	PostgresReturnType$1["ARRAY"] = "array";
+	PostgresReturnType$1["OBJECT"] = "object";
+	return PostgresReturnType$1;
+}({});
+
 //#endregion
 //#region src/instrumentation/libraries/postgres/Instrumentation.ts
 var PostgresInstrumentation = class extends TdInstrumentationBase {
@@ -3765,25 +3814,41 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	}
 	_patchPostgresModule(postgresModule) {
 		logger.debug(`[PostgresInstrumentation] Patching Postgres module in ${this.mode} mode`);
-		if (postgresModule._tdPatched) {
+		if (this.isModulePatched(postgresModule)) {
 			logger.debug(`[PostgresInstrumentation] Postgres module already patched, skipping`);
 			return postgresModule;
 		}
-		if (typeof postgresModule === "function") {
+		const self$1 = this;
+		if (postgresModule[Symbol.toStringTag] === "Module") {
+			logger.debug(`[PostgresInstrumentation] Wrapping ESM default export`);
+			this._wrap(postgresModule, "default", (originalFunction) => {
+				return function(...args) {
+					return self$1._handlePostgresConnection(originalFunction, args);
+				};
+			});
+		} else {
+			logger.debug(`[PostgresInstrumentation] Module is a function (CJS style)`);
 			const originalFunction = postgresModule;
-			const self$1 = this;
 			const wrappedFunction = function(...args) {
+				logger.debug(`[PostgresInstrumentation] Wrapped postgres() (CJS) called with args:`, args);
 				return self$1._handlePostgresConnection(originalFunction, args);
 			};
 			Object.setPrototypeOf(wrappedFunction, Object.getPrototypeOf(originalFunction));
 			Object.defineProperty(wrappedFunction, "name", { value: originalFunction.name });
+			for (const key in originalFunction) if (originalFunction.hasOwnProperty(key)) wrappedFunction[key] = originalFunction[key];
+			Object.getOwnPropertyNames(originalFunction).forEach((key) => {
+				if (key !== "prototype" && key !== "length" && key !== "name") {
+					const descriptor = Object.getOwnPropertyDescriptor(originalFunction, key);
+					if (descriptor) Object.defineProperty(wrappedFunction, key, descriptor);
+				}
+			});
 			postgresModule = wrappedFunction;
 		}
 		if (postgresModule.sql && typeof postgresModule.sql === "function") {
 			this._wrap(postgresModule, "sql", this._getSqlPatchFn());
 			logger.debug(`[PostgresInstrumentation] Wrapped sql function`);
 		}
-		postgresModule._tdPatched = true;
+		this.markModuleAsPatched(postgresModule);
 		logger.debug(`[PostgresInstrumentation] Postgres module patching complete`);
 		return postgresModule;
 	}
@@ -4245,8 +4310,8 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 		const isResultObject = processedResult && typeof processedResult === "object" && "rows" in processedResult;
 		const rows = isResultObject ? processedResult.rows || [] : processedResult || [];
 		return Object.assign(rows, {
-			command: isResultObject ? processedResult.command : "SELECT",
-			count: isResultObject ? processedResult.count : rows.length
+			command: isResultObject ? processedResult.command : void 0,
+			count: isResultObject ? processedResult.count : void 0
 		});
 	}
 	async handleReplayUnsafeQuery({ inputValue, spanInfo, submodule, name }) {
@@ -4297,8 +4362,8 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 					return Object.values(row);
 				});
 				return Object.assign(valueArrays, {
-					command: isResultObject ? result.command : "SELECT",
-					count: isResultObject ? result.count : valueArrays.length
+					command: isResultObject ? result.command : void 0,
+					count: isResultObject ? result.count : void 0
 				});
 			});
 		} });
@@ -4308,61 +4373,40 @@ var PostgresInstrumentation = class extends TdInstrumentationBase {
 	* based on common PostgreSQL data patterns.
 	*/
 	convertPostgresTypes(result) {
-		if (!result) return result;
-		if (result && typeof result === "object" && "rows" in result) {
-			const convertedResult = { ...result };
-			if (Array.isArray(result.rows)) convertedResult.rows = result.rows.map((row) => {
-				if (typeof row !== "object" || row === null) return row;
-				const convertedRow = { ...row };
-				Object.keys(row).forEach((fieldName) => {
-					const value = row[fieldName];
-					if (value === null || value === void 0) return;
-					if (typeof value === "string") {
-						if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value)) {
-							const dateObj = new Date(value);
-							if (!isNaN(dateObj.getTime())) convertedRow[fieldName] = dateObj;
-						}
-					}
-				});
-				return convertedRow;
-			});
-			return convertedResult;
+		if (!isPostgresOutputValueType(result)) {
+			logger.error(`[PostgresInstrumentation] output value is not of type PostgresOutputValueType: ${JSON.stringify(result)}`);
+			return;
+		}
+		if (!result) return;
+		const { _tdOriginalFormat: originalFormat,...convertedResult } = result;
+		if (originalFormat === PostgresReturnType.OBJECT) return convertedResult;
+		else if (originalFormat === PostgresReturnType.ARRAY) return convertedResult.rows || [];
+		else {
+			logger.error(`[PostgresInstrumentation] Invalid result format: ${JSON.stringify(result)}`);
+			return;
 		}
-		if (Array.isArray(result)) return result.map((row) => {
-			if (typeof row !== "object" || row === null) return row;
-			const convertedRow = { ...row };
-			Object.keys(row).forEach((fieldName) => {
-				const value = row[fieldName];
-				if (value === null || value === void 0) return;
-				if (typeof value === "string") {
-					if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value)) {
-						const dateObj = new Date(value);
-						if (!isNaN(dateObj.getTime())) convertedRow[fieldName] = dateObj;
-					}
-				}
-			});
-			return convertedRow;
-		});
-		return result;
 	}
 	_addOutputAttributesToSpan(spanInfo, result) {
 		if (!result) return;
 		let outputValue;
-		if (Array.isArray(result)) outputValue = {
-			count: result.length,
-			rows: result,
-			command: "SELECT"
-		};
-		else if (result && typeof result === "object" && "count" in result) outputValue = {
-			count: result.count || 0,
-			rows: result.rows || result,
-			command: result.command || "UNKNOWN"
-		};
-		else outputValue = {
-			count: 1,
-			rows: [result],
-			command: "UNKNOWN"
-		};
+		if (Array.isArray(result)) {
+			logger.debug(`[PostgresInstrumentation] Adding output attributes to span for array result: ${JSON.stringify(result)}`);
+			outputValue = {
+				_tdOriginalFormat: PostgresReturnType.ARRAY,
+				rows: result
+			};
+		} else if (typeof result === "object") {
+			logger.debug(`[PostgresInstrumentation] Adding output attributes to span for object result: ${JSON.stringify(result)}`);
+			outputValue = {
+				_tdOriginalFormat: PostgresReturnType.OBJECT,
+				count: result.count,
+				rows: result.rows,
+				command: result.command
+			};
+		} else {
+			logger.error(`[PostgresInstrumentation] Invalid result format: ${JSON.stringify(result)}`);
+			return;
+		}
 		SpanUtils.addSpanAttributes(spanInfo.span, { outputValue });
 	}
 	_wrap(target, propertyName, wrapper) {
@@ -4396,7 +4440,7 @@ var TcpInstrumentation = class extends TdInstrumentationBase {
 	}
 	_patchNetModule(netModule) {
 		logger.debug(`[TcpInstrumentation] Patching NET module in ${this.mode} mode`);
-		if (netModule._tdPatched) {
+		if (this.isModulePatched(netModule)) {
 			logger.debug(`[TcpInstrumentation] NET module already patched, skipping`);
 			return netModule;
 		}
@@ -4413,7 +4457,7 @@ var TcpInstrumentation = class extends TdInstrumentationBase {
 		netModule.Socket.prototype.write = function(...args) {
 			return self$1._handleTcpCall("write", originalWrite, args, this);
 		};
-		netModule._tdPatched = true;
+		this.markModuleAsPatched(netModule);
 		return netModule;
 	}
 	_logUnpatchedDependency(methodName, currentSpanInfo, socketContext) {
@@ -4476,7 +4520,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 		})];
 	}
 	_patchJsonwebtokenModule(jwtModule) {
-		if (jwtModule._tdPatched) {
+		if (this.isModulePatched(jwtModule)) {
 			logger.debug(`[JsonwebtokenInstrumentation] jsonwebtoken module already patched, skipping`);
 			return jwtModule;
 		}
@@ -4491,7 +4535,7 @@ var JsonwebtokenInstrumentation = class extends TdInstrumentationBase {
 			this._wrap(jwtModule, "sign", this._getSignPatchFn());
 			logger.debug(`[JsonwebtokenInstrumentation] Wrapped jwt.sign`);
 		}
-		jwtModule._tdPatched = true;
+		this.markModuleAsPatched(jwtModule);
 		logger.debug(`[JsonwebtokenInstrumentation] jsonwebtoken module patching complete`);
 		return jwtModule;
 	}
@@ -4889,7 +4933,7 @@ var JwksRsaInstrumentation = class extends TdInstrumentationBase {
 	}
 	_patchJwksRsaModule(jwksModule) {
 		logger.debug(`[JwksRsaInstrumentation] Patching jwks-rsa module, current mode: ${this.tuskDrift.getMode()}`);
-		if (jwksModule._tdPatched) {
+		if (this.isModulePatched(jwksModule)) {
 			logger.debug(`[JwksRsaInstrumentation] jwks-rsa module already patched, skipping`);
 			return jwksModule;
 		}
@@ -4909,7 +4953,7 @@ var JwksRsaInstrumentation = class extends TdInstrumentationBase {
 			};
 			logger.debug(`[JwksRsaInstrumentation] Patched expressJwtSecret method`);
 		}
-		jwksModule._tdPatched = true;
+		this.markModuleAsPatched(jwksModule);
 		logger.debug(`[JwksRsaInstrumentation] jwks-rsa module patching complete`);
 		return jwksModule;
 	}