sdk-triggerx 0.1.34 → 0.1.36

package/dist/api/jobs.js

@@ -18,6 +18,7 @@ const config_1 = require("../config");
 const validation_1 = require("../utils/validation");
 const errors_1 = require("../utils/errors");
 const SafeWallet_1 = require("../contracts/safe/SafeWallet");
+const traceId_1 = require("../utils/traceId");
 const JOB_ID = '300949528249665590178224313442040528409305273634097553067152835846309150732';
 const DYNAMIC_ARGS_URL = 'https://teal-random-koala-993.mypinata.cloud/ipfs/bafkreif426p7t7takzhw3g6we2h6wsvf27p5jxj3gaiynqf22p3jvhx4la';
 // Helper function to encode multisend batch transactions
@@ -435,6 +436,8 @@ async function createJob(client, params) {
     const args = jobInput.arguments ? JSON.stringify(jobInput.arguments) : '';
     let job_cost_prediction = 0n;
     try {
+        // Generate trace ID for /api/fees request
+        const feesTraceId = (0, traceId_1.generateTraceId)('get', '/api/fees', userAddress);
         const feeRes = await client.get('/api/fees', {
             params: {
                 ipfs_url,
@@ -444,18 +447,21 @@ async function createJob(client, params) {
                 target_function,
                 abi,
                 args,
-            }
+            },
+            headers: {
+                'X-Trace-ID': feesTraceId,
+            },
         });
         // The API returns total fee in wei: { total_fee: "<wei>" } or nested under data
         let totalFeeRaw;
-        if (feeRes && feeRes.current_total_fee !== undefined) {
+        if (feeRes && feeRes.current_total_fee !== undefined && feeRes.current_total_fee !== 0) {
             totalFeeRaw = feeRes.current_total_fee;
         }
-        else if (feeRes && feeRes.data && feeRes.data.current_total_fee !== undefined) {
+        else if (feeRes && feeRes.data && feeRes.data.current_total_fee !== undefined && feeRes.data.current_total_fee !== 0) {
             totalFeeRaw = feeRes.data.current_total_fee;
         }
         maxtotalFeeRaw = feeRes.total_fee;
-        if (totalFeeRaw === undefined) {
+        if (totalFeeRaw === undefined || totalFeeRaw === 0) {
             return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Invalid response from /api/fees: missing total_fee', { response: feeRes }), 'API error');
         }
         // Support both number and string representations of wei
@@ -569,8 +575,14 @@ async function createJob(client, params) {
             ether_balance: typeof jobData.ether_balance === 'bigint' ? Number(jobData.ether_balance) : Number(jobData.ether_balance),
             token_balance: typeof jobData.token_balance === 'bigint' ? Number(jobData.token_balance) : Number(jobData.token_balance),
         };
+        // Generate trace ID for /api/jobs request
+        const jobsTraceId = (0, traceId_1.generateTraceId)('post', '/api/jobs', userAddress);
         const res = await client.post('/api/jobs', [jobDataForApi], {
-            headers: { 'Content-Type': 'application/json', 'X-API-KEY': apiKey },
+            headers: {
+                'Content-Type': 'application/json',
+                'X-API-KEY': apiKey,
+                'X-Trace-ID': jobsTraceId,
+            },
         });
         res.requiredETH = requiredETH;
         res.maxtotalFeeRaw = maxtotalFeeRaw;

package/dist/utils/traceId.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Generate a trace ID for request tracing.
+ * Format: <METHOD>-<ROUTE>-<USER_ADDRESS>-<RANDOMNESS>
+ *
+ * @param method - HTTP method (get, post, put, delete)
+ * @param route - API route being called
+ * @param userAddress - User's wallet address
+ * @returns Formatted trace ID string
+ *
+ * @example
+ * generateTraceId('get', '/api/jobs/user/0x1234567890abcdef', '0x1234567890abcdef')
+ * // Returns: 'get-jobsuser-abcdef-a1b2c3d4'
+ */
+export declare function generateTraceId(method: string, route: string, userAddress: string): string;

package/dist/utils/traceId.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateTraceId = generateTraceId;
+/**
+ * Generate a trace ID for request tracing.
+ * Format: <METHOD>-<ROUTE>-<USER_ADDRESS>-<RANDOMNESS>
+ *
+ * @param method - HTTP method (get, post, put, delete)
+ * @param route - API route being called
+ * @param userAddress - User's wallet address
+ * @returns Formatted trace ID string
+ *
+ * @example
+ * generateTraceId('get', '/api/jobs/user/0x1234567890abcdef', '0x1234567890abcdef')
+ * // Returns: 'get-jobsuser-abcdef-a1b2c3d4'
+ */
+function generateTraceId(method, route, userAddress) {
+    // Normalize method to lowercase
+    const normalizedMethod = method.toLowerCase();
+    // Sanitize route: remove leading slash, api prefix, and special characters
+    // Also remove any address-like segments and truncate
+    let sanitizedRoute = route
+        .replace(/^\/+/, '') // Remove leading slashes
+        .replace(/^api\//, '') // Remove 'api/' prefix
+        .replace(/0x[a-fA-F0-9]+/g, '') // Remove ethereum addresses
+        .replace(/[\/\-_]+/g, '') // Remove slashes, dashes, underscores
+        .toLowerCase();
+    // Truncate route to max 20 chars
+    if (sanitizedRoute.length > 20) {
+        sanitizedRoute = sanitizedRoute.substring(0, 20);
+    }
+    // Extract last 6 characters of user address (without 0x prefix handling)
+    const addressSuffix = userAddress
+        ? userAddress.toLowerCase().slice(-6)
+        : '000000';
+    // Generate randomness using crypto-safe random
+    const randomness = generateRandomSuffix();
+    return `${normalizedMethod}-${sanitizedRoute}-${addressSuffix}-${randomness}`;
+}
+/**
+ * Generate a random suffix for the trace ID.
+ * Uses crypto.randomUUID() if available, falls back to Math.random().
+ */
+function generateRandomSuffix() {
+    // Use crypto.randomUUID() if available (Node.js 14.17+, browsers)
+    if (typeof crypto !== 'undefined' && crypto.randomUUID) {
+        const uuid = crypto.randomUUID();
+        // Take first 8 characters of UUID for shorter trace ID
+        return uuid.replace(/-/g, '').substring(0, 8);
+    }
+    // Fallback to Math.random-based generation
+    return Math.random().toString(36).substring(2, 10);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdk-triggerx",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "SDK for interacting with the TriggerX backend and smart contracts.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -42,4 +42,4 @@
     "ts-jest": "^29.4.5",
     "typescript": "^5.8.3"
   }
-}
+}