Change injection strategy to work with Meteor 1.3 / gzip (#18)

gadicc · gadicc · commit ad19c4d9b487 · 2016-03-07T19:09:15.000+02:00
diff --git a/History.md b/History.md
@@ -1,5 +1,10 @@
 # vNEXT
 
+# v1.0.4-rc.0
+
+* Change injection strategy to work with both Meteor 1.3 and earlier.
+  (fixes #17, #18)
+
 # v1.0.3
 
 * Fix broken `Injected.meta()`, thanks @JProgrammer! (#16)
diff --git a/lib/inject-core.js b/lib/inject-core.js
@@ -2,28 +2,35 @@
 // We are simply using this hack because, there is no way to alter
 // Meteor's html content on the server side
 
-var http = Npm.require('http');
-
-var originalWrite = http.OutgoingMessage.prototype.write;
-http.OutgoingMessage.prototype.write = function(chunk, encoding) {
-  //prevent hijacking other http requests
-  if(!this.iInjected &&
-    encoding === undefined && /^<!DOCTYPE html>/.test(chunk)) {
-    chunk = chunk.toString();
-
-    for (id in Inject.rawModHtmlFuncs) {
-      chunk = Inject.rawModHtmlFuncs[id](chunk, this);
-      if (!_.isString(chunk)) {
-        throw new Error('Inject func id "' + id + '" must return HTML, not '
-          + typeof(chunk) + '\n' + JSON.stringify(chunk, null, 2));
+Inject._hijackWrite = function(res) {
+  var originalWrite = res.write;
+  res.write = function(chunk, encoding) {
+    //prevent hijacking other http requests
+    if(!res.iInjected &&
+      encoding === undefined && /^<!DOCTYPE html>/.test(chunk)) {
+      chunk = chunk.toString();
+
+      for (id in Inject.rawModHtmlFuncs) {
+        chunk = Inject.rawModHtmlFuncs[id](chunk, res);
+        if (!_.isString(chunk)) {
+          throw new Error('Inject func id "' + id + '" must return HTML, not '
+            + typeof(chunk) + '\n' + JSON.stringify(chunk, null, 2));
+        }
       }
+
+      res.iInjected = true;
     }
 
-    this.iInjected = true;
-  }
+    originalWrite.call(res, chunk, encoding);
+  };
+}
 
-  originalWrite.call(this, chunk, encoding);
-};
+WebApp.connectHandlers.use(function(req, res, next) {
+  // We only separate this to make testing easier
+  Inject._hijackWrite(res);
+
+  next();
+});
 
 //meteor algorithm to check if this is a meteor serving http request or not
 Inject.appUrl = function(url) {
diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Allow injection of arbitrary data to initial Meteor HTML page",
-  version: "1.0.3",
+  version: "1.0.4-rc.0",
   git: "https://github.com/meteorhacks/meteor-inject-initial.git",
   name: "meteorhacks:inject-initial"
 });
@@ -32,7 +32,7 @@ function configurePackage(api) {
     api.versionsFrom('METEOR@0.9.0');
   }
   
-  api.use('routepolicy', 'server');
+  api.use(['routepolicy', 'webapp'], 'server');
   api.use(['ejson', 'underscore'], ['client','server']);
 
   api.add_files('lib/inject-server.js', 'server');
diff --git a/test/inject-core.js b/test/inject-core.js
@@ -1,3 +1,42 @@
+// This test assumes Inject._hijackWrite is called inside of a
+// a WebApp.connectHandlers.use function (it is).
+
+Tinytest.add(
+  'Inject Core - injecting',
+  function (test, done) {
+    var context = {
+      _header: {},
+      _hadBody: true
+    };
+
+    context.write = function(html) {
+      test.equal(html, "<!DOCTYPE html>ABC</html>");
+    };
+
+    var htmlText = "<!DOCTYPE html>---</html>"
+
+    Inject.rawModHtmlFuncs = {
+      "id1": function(html, res) {
+        test.isTrue(res, context);
+        test.equal(html, htmlText);
+        return html.replace('---', 'ABC');
+      }
+    }
+
+    Inject._hijackWrite(context);
+    context.write(htmlText);
+
+    test.equal(context.iInjected, true);
+    Inject.rawModHtmlFuncs = {};
+  }
+);
+
+
+/*
+
+We no longer override http.OutgoingMessage.prototype.write; instead
+we hijack res.write in connect middleware.
+
 Tinytest.add(
   'Inject Core - injecting',
   function (test, done) {
@@ -23,3 +62,5 @@ Tinytest.add(
     Inject.rawModHtmlFuncs = {};
   }
 );
+
+*/
