Skip to content
This repository has been archived by the owner on Sep 2, 2021. It is now read-only.

[PROTOTYPE] Local HTTP-served static files, vs. file: protocol #475

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions appshell/node-core/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ maxerr: 50, node: true */

var fs = require("fs"),
http = require("http"),
path = require("path"),
WebSocket = require("./thirdparty/ws"),
connect = require("./thirdparty/connect"),
EventEmitter = require("events").EventEmitter,
Logger = require("./Logger"),
ConnectionManager = require("./ConnectionManager"),
Expand Down Expand Up @@ -97,31 +99,38 @@ maxerr: 50, node: true */
* Starts the server.
*/
function start() {
var app = connect(),
devPath = path.resolve(__dirname + "/../dev/src"),
installPath = path.resolve(__dirname + "/../www");

function nodeApiHandler(req, res, next) {
var isGet = req.method === "GET",
isApiCall = (req.url === "/api" || req.url.indexOf("/api/") === 0);

if (isGet && isApiCall) {
res.setHeader("Content-Type", "application/json");
res.end(
JSON.stringify(DomainManager.getDomainDescriptions(),
null,
4)
);
} else {
next();
}
}

// TODO fs.exists(devPath) and fs.exists(installPath)
// Legacy /api handler for DomainManager
app.use(nodeApiHandler);
app.use(connect["static"](devPath));
app.use(connect.directory(devPath));

function sendCommandToParentProcess() {
var cmd = "\n\n" + (_commandCount++) + "|"
+ Array.prototype.join.call(arguments, "|") + "\n\n";
process.stdout.write(cmd);
}

function httpRequestHandler(req, res) {
if (req.method === "GET") {
if (req.url === "/api" || req.url.indexOf("/api/") === 0) {
res.setHeader("Content-Type", "application/json");
res.end(
JSON.stringify(DomainManager.getDomainDescriptions(),
null,
4)
);
} else {
res.setHeader("Content-Type", "text/plain");
res.end("Brackets-Shell Server\n");
}
} else { // Not a GET request
res.statusCode = 501;
res.end();
}
}

function setupStdin() {
// re-enable getting events from stdin
try {
Expand Down Expand Up @@ -180,15 +189,15 @@ maxerr: 50, node: true */
}, timeout);
}

httpServer = http.createServer(httpRequestHandler);
httpServer = http.createServer(app);

httpServer.on("error", function () {
if (callback) {
callback("ERR_CREATE_SERVER", null);
}
});

httpServer.listen(0, "127.0.0.1", function () {
httpServer.listen(59234, "127.0.0.1", function () {
var wsServer = null;
var address = httpServer.address();
if (address !== null) {
Expand Down Expand Up @@ -259,5 +268,4 @@ maxerr: 50, node: true */
// Public interface
Server.start = start;
Server.stop = stop;

}());
12 changes: 12 additions & 0 deletions appshell/node-core/thirdparty/connect/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
*.markdown
*.md
.git*
Makefile
benchmarks/
docs/
examples/
install.sh
support/
test/
.DS_Store
coverage.html
4 changes: 4 additions & 0 deletions appshell/node-core/thirdparty/connect/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: node_js
node_js:
- "0.8"
- "0.10"
24 changes: 24 additions & 0 deletions appshell/node-core/thirdparty/connect/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
(The MIT License)

Copyright (c) 2010 Sencha Inc.
Copyright (c) 2011 LearnBoost
Copyright (c) 2011 TJ Holowaychuk

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
133 changes: 133 additions & 0 deletions appshell/node-core/thirdparty/connect/Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
[![build status](https://secure.travis-ci.org/senchalabs/connect.png)](http://travis-ci.org/senchalabs/connect)
# Connect

Connect is an extensible HTTP server framework for [node](http://nodejs.org), providing high performance "plugins" known as _middleware_.

Connect is bundled with over _20_ commonly used middleware, including
a logger, session support, cookie parser, and [more](http://senchalabs.github.com/connect). Be sure to view the 2.x [documentation](http://senchalabs.github.com/connect/).

```js
var connect = require('connect')
, http = require('http');

var app = connect()
.use(connect.favicon())
.use(connect.logger('dev'))
.use(connect.static('public'))
.use(connect.directory('public'))
.use(connect.cookieParser())
.use(connect.session({ secret: 'my secret here' }))
.use(function(req, res){
res.end('Hello from Connect!\n');
});

http.createServer(app).listen(3000);
```

## Middleware

- [csrf](http://www.senchalabs.org/connect/csrf.html)
- [basicAuth](http://www.senchalabs.org/connect/basicAuth.html)
- [bodyParser](http://www.senchalabs.org/connect/bodyParser.html)
- [json](http://www.senchalabs.org/connect/json.html)
- [multipart](http://www.senchalabs.org/connect/multipart.html)
- [urlencoded](http://www.senchalabs.org/connect/urlencoded.html)
- [cookieParser](http://www.senchalabs.org/connect/cookieParser.html)
- [directory](http://www.senchalabs.org/connect/directory.html)
- [compress](http://www.senchalabs.org/connect/compress.html)
- [errorHandler](http://www.senchalabs.org/connect/errorHandler.html)
- [favicon](http://www.senchalabs.org/connect/favicon.html)
- [limit](http://www.senchalabs.org/connect/limit.html)
- [logger](http://www.senchalabs.org/connect/logger.html)
- [methodOverride](http://www.senchalabs.org/connect/methodOverride.html)
- [query](http://www.senchalabs.org/connect/query.html)
- [responseTime](http://www.senchalabs.org/connect/responseTime.html)
- [session](http://www.senchalabs.org/connect/session.html)
- [static](http://www.senchalabs.org/connect/static.html)
- [staticCache](http://www.senchalabs.org/connect/staticCache.html)
- [vhost](http://www.senchalabs.org/connect/vhost.html)
- [subdomains](http://www.senchalabs.org/connect/subdomains.html)
- [cookieSession](http://www.senchalabs.org/connect/cookieSession.html)

## Running Tests

first:

$ npm install -d

then:

$ make test

## Authors

Below is the output from [git-summary](http://github.com/visionmedia/git-extras).


project: connect
commits: 2033
active : 301 days
files : 171
authors:
1414 Tj Holowaychuk 69.6%
298 visionmedia 14.7%
191 Tim Caswell 9.4%
51 TJ Holowaychuk 2.5%
10 Ryan Olds 0.5%
8 Astro 0.4%
5 Nathan Rajlich 0.2%
5 Jakub Nešetřil 0.2%
3 Daniel Dickison 0.1%
3 David Rio Deiros 0.1%
3 Alexander Simmerl 0.1%
3 Andreas Lind Petersen 0.1%
2 Aaron Heckmann 0.1%
2 Jacques Crocker 0.1%
2 Fabian Jakobs 0.1%
2 Brian J Brennan 0.1%
2 Adam Malcontenti-Wilson 0.1%
2 Glen Mailer 0.1%
2 James Campos 0.1%
1 Trent Mick 0.0%
1 Troy Kruthoff 0.0%
1 Wei Zhu 0.0%
1 comerc 0.0%
1 darobin 0.0%
1 nateps 0.0%
1 Marco Sanson 0.0%
1 Arthur Taylor 0.0%
1 Aseem Kishore 0.0%
1 Bart Teeuwisse 0.0%
1 Cameron Howey 0.0%
1 Chad Weider 0.0%
1 Craig Barnes 0.0%
1 Eran Hammer-Lahav 0.0%
1 Gregory McWhirter 0.0%
1 Guillermo Rauch 0.0%
1 Jae Kwon 0.0%
1 Jakub Nesetril 0.0%
1 Joshua Peek 0.0%
1 Jxck 0.0%
1 AJ ONeal 0.0%
1 Michael Hemesath 0.0%
1 Morten Siebuhr 0.0%
1 Samori Gorse 0.0%
1 Tom Jensen 0.0%

## Node Compatibility

Connect `< 1.x` is compatible with node 0.2.x


Connect `1.x` is compatible with node 0.4.x


Connect (_master_) `2.x` is compatible with node 0.6.x

## CLA

[http://sencha.com/cla](http://sencha.com/cla)

## License

View the [LICENSE](https://github.com/senchalabs/connect/blob/master/LICENSE) file. The [Silk](http://www.famfamfam.com/lab/icons/silk/) icons used by the `directory` middleware created by/copyright of [FAMFAMFAM](http://www.famfamfam.com/).
4 changes: 4 additions & 0 deletions appshell/node-core/thirdparty/connect/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

module.exports = process.env.CONNECT_COV
? require('./lib-cov/connect')
: require('./lib/connect');
81 changes: 81 additions & 0 deletions appshell/node-core/thirdparty/connect/lib/cache.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

/*!
* Connect - Cache
* Copyright(c) 2011 Sencha Inc.
* MIT Licensed
*/

/**
* Expose `Cache`.
*/

module.exports = Cache;

/**
* LRU cache store.
*
* @param {Number} limit
* @api private
*/

function Cache(limit) {
this.store = {};
this.keys = [];
this.limit = limit;
}

/**
* Touch `key`, promoting the object.
*
* @param {String} key
* @param {Number} i
* @api private
*/

Cache.prototype.touch = function(key, i){
this.keys.splice(i,1);
this.keys.push(key);
};

/**
* Remove `key`.
*
* @param {String} key
* @api private
*/

Cache.prototype.remove = function(key){
delete this.store[key];
};

/**
* Get the object stored for `key`.
*
* @param {String} key
* @return {Array}
* @api private
*/

Cache.prototype.get = function(key){
return this.store[key];
};

/**
* Add a cache `key`.
*
* @param {String} key
* @return {Array}
* @api private
*/

Cache.prototype.add = function(key){
// initialize store
var len = this.keys.push(key);

// limit reached, invalidate LRU
if (len > this.limit) this.remove(this.keys.shift());

var arr = this.store[key] = [];
arr.createdAt = new Date;
return arr;
};
Loading