From 6568e118039291546caf3cb499e2c7a9ce2ad188 Mon Sep 17 00:00:00 2001 From: jamesmr89 Date: Tue, 23 Jun 2015 13:28:40 -0700 Subject: [PATCH] fixing paths and missing modules --- index.js | 6 +++--- package.json | 5 +++-- test/index.js | 54 ------------------------------------------------ test/unittest.js | 48 ++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 61 deletions(-) delete mode 100644 test/index.js diff --git a/index.js b/index.js index 95bb916..8042115 100644 --- a/index.js +++ b/index.js @@ -10,9 +10,9 @@ let os = require('os'); let randomBytes = require('crypto').randomBytes; let co = require('co'); let compose = require('koa-compose'); -let SSLGenerator = require('../ssl-generator'); -let debug = require('debug')('../proxy:http'); -let context = require('../lib/context'); +let SSLGenerator = require('ssl-generator'); +let debug = require('debug')('proxy:http'); +let context = require('./lib/context'); let app = ProxyHTTP.prototype; diff --git a/package.json b/package.json index 33ddad8..459bc2a 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,9 @@ "dependencies": { "co": "^4.5.4", "koa-compose": "^2.3.0", - "lodash.defaults": "^3.1.1", - "native-dns": "^0.7.0" + "debug": "^2.2.0", + "ssl-generator": "0.0.1", + "statuses": "^1.2.1" }, "devDependencies": { "istanbul-harmony": "^0.3.15", diff --git a/test/index.js b/test/index.js deleted file mode 100644 index a8ee49d..0000000 --- a/test/index.js +++ /dev/null @@ -1,54 +0,0 @@ -/* -'use strict'; - -let fs = require('fs'); -let ProxyHTTP = require('../'); - -var Store = function MemoryStore() { - var cache = {}; - this.get = function (domain, fn) { - fn(null, cache[domain] || null); - }; - - this.set = function (certKeyData, fn) { - cache[certKeyData.domain] = { - cert: certKeyData.cert, - key: certKeyData.key - }; - fn(); - }; -}; - -let sslConfig = { - ca: { - cert: fs.readFileSync('./test/ca.crt.pem'), - key: fs.readFileSync('./test/ca.key.pem') - }, - csr: { - country: 'US', - state: 'Texas', - locality: 'Longview', - organization: 'Northshore Network Solutions', - organizationUnit: '', - emailAddress: 'support@northshore.io' - }, - ttl: 10000, - store: new Store(), -}; - -let server = ProxyHTTP({ - ssl: sslConfig -}); - -server.use(function *(next) { - console.log(this.req.url); - yield *next; - console.log('done') -}); - -// server.sslGenerator.selfSigned('google.com', function (err, certKey) { -// console.log(err, certKey); -// }); - -server.listen(3128, 3129); -*/ \ No newline at end of file diff --git a/test/unittest.js b/test/unittest.js index f727dab..7ff43de 100644 --- a/test/unittest.js +++ b/test/unittest.js @@ -1,11 +1,55 @@ -var app = require('../index.js'); +'use strict'; +let fs = require('fs'); +let ProxyHTTP = require('../'); +var Store = function MemoryStore() { + var cache = {}; + this.get = function (domain, fn) { + fn(null, cache[domain] || null); + }; + this.set = function (certKeyData, fn) { + cache[certKeyData.domain] = { + cert: certKeyData.cert, + key: certKeyData.key + }; + fn(); + }; +}; +let sslConfig = { + ca: { + cert: fs.readFileSync('./test/ca.crt.pem'), + key: fs.readFileSync('./test/ca.key.pem') + }, + csr: { + country: 'US', + state: 'Texas', + locality: 'Longview', + organization: 'Northshore Network Solutions', + organizationUnit: '', + emailAddress: 'support@northshore.io' + }, + ttl: 10000, + store: new Store(), +}; +let server = ProxyHTTP({ + ssl: sslConfig +}); +server.use(function *(next) { + console.log(this.req.url); + yield *next; + console.log('done') +}); +// server.sslGenerator.selfSigned('google.com', function (err, certKey) { +// console.log(err, certKey); +// }); +server.listen(3128, 3129); + var expect = require('expect.js'); // Begin Unit Tests describe("Sample Test", function () { describe("I don't know", function () { it('should return blah', function (done) { - console.log(app); + console.log(server); done(); }); });