Fix #91

Author: nicdex

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "node-eventstore-client",
-  "version": "0.2.13",
+  "version": "0.2.14",
   "description": "A port of the EventStore .Net ClientAPI to Node.js",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,13 +9,13 @@
   },
   "engineStrict": true,
   "scripts": {
-    "clean": "rm lib/dist.js",
+    "clean": "rm -f lib/dist.js",
     "prebuild": "npm run clean",
-    "build": "webpack",
+    "build": "webpack -o ./lib/dist.js",
     "pretest": "npm run build",
     "test": "nodeunit",
     "test-debug": "TESTS_VERBOSE_LOGGING=1 nodeunit",
-    "prepublish": "npm run build && npm run gendocs",
+    "prepublishOnly": "npm run build && npm run gendocs",
     "gendocs": "rm -rf docs && jsdoc src -r -d docs"
   },
   "files": [

package.json

@@ -1,15 +1,17 @@
 /*eslint-disable block-scoped-var, id-length, no-control-regex, no-magic-numbers, no-prototype-builtins, no-redeclare, no-shadow, no-var, sort-vars*/
 (function(global, factory) { /* global define, require, module */
 
-    /* AMD */ if (typeof define === 'function' && define.amd)
-        define(["protobufjs/minimal"], factory);
+    /* CommonJS */if (typeof require === 'function' && typeof module === 'object' && module && module.exports)
+        module.exports = factory(require("protobufjs/minimal"), require("../utils/modules"));
 
-    /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports)
-        module.exports = factory(require("protobufjs/minimal"));
-
-})(this, function($protobuf) {
+})(this, function($protobuf, $moduleUtil) {
     "use strict";
 
+    // This fixes bug #91 by giving us an isolate copy of protobufjs library so any tampering with it doesn't affect us
+    var old = $moduleUtil.uncache(require.resolve('protobufjs/minimal'));
+    $protobuf = require('protobufjs/minimal');
+    $moduleUtil.recache(old);
+
     // Common aliases
     var $Reader = $protobuf.Reader, $Writer = $protobuf.Writer, $util = $protobuf.util;
 

src/messages/messages.js

@@ -0,0 +1,17 @@
+exports.uncache = function uncache(id) {
+  var mod = require.cache[id];
+  if (!mod) return;
+  delete require.cache[id];
+  if (mod.children)
+    for(var i = 0; i < mod.children.length; i++)
+      uncache(mod.children[i].id);
+  return mod;
+};
+
+exports.recache = function recache(mod) {
+  if (require.cache[mod.id] === mod) return;
+  require.cache[mod.id] = mod;
+  if (mod.children)
+    for(var i = 0; i < mod.children.length; i++)
+      recache(mod.children[i]);
+};

src/utils/modules.js

@@ -5,6 +5,11 @@ var client = require('../../lib/dist');
 var FileLogger = require('../../src/common/log/fileLogger');
 var NoopLogger = require('../../src/common/log/noopLogger');
 
+// Make sure we mess with protobufjs setup for bug #91
+var protobufJS = require('protobufjs');
+protobufJS.util.Long = undefined;
+protobufJS.configure();
+
 var settings = {
   log: new NoopLogger()
 };