fix(pencil): Fix sdk version extraction

Author: alexivsn

src/event-manager.ts

@@ -1,7 +1,7 @@
 import IEvent from './events/event';
 import { SecureNativeOptions } from './types/securenative-options';
 import { FetchOptions } from './types/fetch-options';
-import { promiseTimeout } from './utils/utils';
+import { promiseTimeout, getSDKVersion } from './utils/utils';
 import { Logger } from './logger';
 
 export default class EventManager {
@@ -10,12 +10,16 @@ export default class EventManager {
   private sendEnabled: Boolean = false;
   private timeoutId = null;
 
+  
   constructor(private fetcher: any, private options: SecureNativeOptions) {
+    
     this.defaultFetchOptions = {
       url: options.apiUrl,
       options: {
         method: 'post',
         headers: {
+          'SN-Version' : getSDKVersion(),
+          'User-Agent' : 'SecureNative-node.js',
           Authorization: this.options.apiKey,
         },
       },

src/securenative.ts

@@ -35,10 +35,10 @@ export default class SecureNative {
 
   public static init(options: SecureNativeOptions) {
     const defaultOptions = ConfigurationManager.getConfig();
-    const config: SecureNativeOptions = { ...options, ...defaultOptions };
+    const config: SecureNativeOptions = { ...defaultOptions, ...options };
 
     const eventManager = new EventManager(fetch, config);
-    if (options.autoSend) {
+    if (config.autoSend) {
       eventManager.startEventsPersist();
     }
     SecureNative.initialize(eventManager, config);
@@ -48,7 +48,7 @@ export default class SecureNative {
     if (SecureNative.instance) {
       throw new Error('This SDK was already initialized');
     }
-    
+
     const appPkg: Package = PackageManager.getPackage(join(process.cwd(), PACKAGE_FILE_NAME));
     // set default app name
     if (!options.appName) {

src/utils/utils.ts

@@ -6,11 +6,14 @@ import { KeyValuePair } from '../types/key-value-pair';
 import { Logger } from '../logger';
 import { RequestContext } from '../types/request-context';
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http2';
+import { PackageManager } from '../package-manager';
+import { join } from 'path';
 
 const ALGORITHM = 'aes-256-cbc';
 const BLOCK_SIZE = 16;
 const AES_KEY_SIZE = 32;
 const ipHeaders = ['x-forwarded-for', 'x-client-ip', 'x-real-ip', 'x-forwarded', 'x-cluster-client-ip', 'forwarded-for', 'forwarded', 'via'];
+const PACKAGE_FILE_NAME = 'package.json';
 
 const clientIpFromRequest = (req: any) => {
   if (!req) {
@@ -259,6 +262,11 @@ const isModuleExists = (path) => {
   }
 };
 
+const getSDKVersion = () => {
+  const agentPkg = PackageManager.getPackage(join(process.cwd(), '/node_modules/@securenative/agent/', PACKAGE_FILE_NAME));
+  return agentPkg.version;
+};
+
 export {
   clientIpFromRequest,
   remoteIpFromRequest,
@@ -280,4 +288,5 @@ export {
   isModuleExists,
   contextFromRequest,
   mergeRequestContexts,
+  getSDKVersion,
 };