fix: few fixes before releasing

package.json

@@ -2,9 +2,9 @@
   "name": "@pm2/io",
   "version": "2.4.7",
   "description": "PM2.io NodeJS APM",
-  "main": "build/main/src/index.js",
-  "typings": "build/main/src/index.d.ts",
-  "types": "build/main/src/index.d.ts",
+  "main": "build/main/index.js",
+  "typings": "build/main/index.d.ts",
+  "types": "build/main/index.d.ts",
   "module": "build/module/index.js",
   "repository": "https://github.com/keymetrics/pm2-io-apm",
   "author": {

src/configuration.ts

@@ -7,9 +7,6 @@ import * as path from 'path'
 import * as fs from 'fs'
 import * as util from 'util'
 
-const prefix = __dirname.replace(/\\/g,'/').indexOf('/build/') >= 0 ? '../../../' : '../'
-const pkg = require(prefix + '/package.json')
-
 export default class Configuration {
 
   static configureModule (opts) {
@@ -49,7 +46,13 @@ export default class Configuration {
     if (!conf.module_conf) {
       conf.module_conf = {}
     }
-    conf.pmx_version = pkg.version || null
+
+    try {
+      const pkg = require('../package.json')
+      conf.pmx_version = pkg.version || null
+    } catch (err) {
+      // ignore
+    }
 
     if (conf.isModule === true) {
       /**

src/index.ts

@@ -7,4 +7,4 @@ const isAlreadyHere = (Object.getOwnPropertySymbols(global).indexOf(IO_KEY) > -1
 const io: PMX = isAlreadyHere ? global[IO_KEY] as PMX : new PMX().init()
 global[IO_KEY] = io
 
-export default io
+export = io

src/metrics/httpMetrics.ts

@@ -184,10 +184,10 @@ export default class HttpMetrics implements MetricInterface {
         // we first require the target module
         const returned = original.apply(original, arguments)
         // if it's a modue that we want to patch, install the patch on top of it
-        if (file === 'http') {
+        if (file === 'http' && self.modules['http'] === undefined) {
           self.registerHttpMetric()
           self.hookHttp(returned, file)
-        } else if (file === 'https') {
+        } else if (file === 'https' && self.modules['https'] === undefined) {
           self.registerHttpsMetric()
           self.hookHttp(returned, file)
         }

test/api.spec.ts

@@ -5,7 +5,7 @@ import * as semver from 'semver'
 import { resolve } from 'path'
 
 import { exec, fork } from 'child_process'
-import pmx from '../src'
+import * as pmx from '../src'
 
 const launch = (fixture) => {
   return fork(resolve(__dirname, fixture), [], {

test/fixtures/apiActionsChild.ts

@@ -1,4 +1,4 @@
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 pmx.action('testAction', function (reply) {
   reply({ data: 'testActionReply' })

test/fixtures/apiActionsJsonChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 // @ts-ignore
 pmx.action({

test/fixtures/apiBackwardActionsChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 pmx.init({
   actions: {

test/fixtures/apiBackwardConfChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 let timer
 let server
 

test/fixtures/apiBackwardEventChild.ts

@@ -1,4 +1,4 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 pmx.emit('myEvent', { prop1: 'value1' })

test/fixtures/apiBackwardExpressChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 const express = require('express')
 const app = express()

test/fixtures/apiInitModuleChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 process.env.fixtures = JSON.stringify({
   envVar: 'value',

test/fixtures/apiKoaErrorHandler.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 const Koa = require('koa')
 const app = new Koa()

test/fixtures/apiMetricsChild.ts

@@ -1,5 +1,5 @@
 
-import io from '../../src'
+import * as io from '../../src'
 import { MetricType } from '../../src/services/metrics'
 
 const [ one, two, three ] = io.metrics(

test/fixtures/apiNotifyChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src/index'
+import * as pmx from '../../src/index'
 
 pmx.init()
 pmx.notifyError(new Error('myNotify'))

test/fixtures/apiOnExitChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 pmx.onExit(function () {
   if (process && process.send) process.send('callback')

test/fixtures/apiOnExitExceptionChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../src'
+import * as pmx from '../../src'
 
 pmx.onExit(function () {
   if (process && process.send) process.send('callback')

test/fixtures/autoExitChild.ts

@@ -1,4 +1,4 @@
 
-import io from '../../src'
+import * as io from '../../src'
 
 io.init()

test/fixtures/features/eventLoopInspectorChild.ts

@@ -1,4 +1,4 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   actions: {
     eventLoopDump: true

test/fixtures/features/eventsChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 
 pmx.init({
   profiling: true

test/fixtures/features/profilingChild.ts

@@ -1,5 +1,5 @@
 
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   profiling: true
 })

test/fixtures/metrics/gcv8Child.ts

@@ -1,4 +1,4 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   metrics: {
     eventLoop: true,

test/fixtures/metrics/httpWrapperChild.ts

@@ -1,4 +1,4 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   metrics: {
     eventLoop: true,

test/fixtures/metrics/networkChild.ts

@@ -1,4 +1,4 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   metrics: {
     eventLoop: true,

test/fixtures/metrics/networkWithoutDownloadChild.ts

@@ -1,4 +1,4 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   metrics: {
     network: {

test/fixtures/metrics/tracingChild.ts

@@ -1,8 +1,9 @@
-import pmx from '../../../src'
+import * as pmx from '../../../src'
 pmx.init({
   tracing: true
 })
 
+// @ts-ignore added in ci only
 import * as express from 'express'
 const app = express()
 

tsconfig.json

@@ -11,17 +11,16 @@
     "inlineSourceMap": true,
     "traceResolution": false,
     "downlevelIteration": true,
+    "resolveJsonModule": true,
+    "removeComments": true,
     "lib" : [
       "es6"
     ],
     "types": [
       "node",
       "mocha"
     ],
-    "baseUrl": ".", // required for "paths"
-    "paths": {
-      "pmx-2": ["src/index.ts"] // write tests without relative paths
-    }
+    "baseUrl": "." // required for "paths"
   },
   "include": [
     "src/**/*.ts"