" + content.items.unlockedMessage.content + "
[Close] "
- });
- $('ul.items').popover('show');
- }
- user.set('stats.exp', stats.exp);
- }
- if (stats.money != null) {
- if (!(typeof money !== "undefined" && money !== null) || money < 0) {
- money = 0.0;
- }
- return user.set('stats.money', stats.money);
- }
-};
-
-score = function(taskId, direction, options) {
- var adjustvalue, delta, exp, hp, lvl, modified, money, num, task, taskObj, taskPath, type, userObj, value, _ref, _ref1, _ref2;
- if (options == null) {
- options = {
- cron: false,
- times: 1
- };
- }
- taskPath = "_user.tasks." + taskId;
- _ref = [model.at(taskPath), model.get(taskPath)], task = _ref[0], taskObj = _ref[1];
- type = taskObj.type, value = taskObj.value;
- userObj = user.get();
- if (!task) {
- _ref1 = userObj.stats, money = _ref1.money, hp = _ref1.hp, exp = _ref1.exp;
- if (direction === "up") {
- modified = expModifier(1);
- money += modified;
- exp += modified;
- } else {
- modified = hpModifier(1);
- hp -= modified;
- }
- updateStats({
- hp: hp,
- exp: exp,
- money: money
- });
- return;
- }
- adjustvalue = type !== 'reward';
- if ((type === 'habit') && (taskObj.up === false || taskObj.down === false)) {
- adjustvalue = false;
- }
- delta = 0;
- _.times(options.times, function(n) {
- var nextDelta;
- nextDelta = taskDeltaFormula(value, direction);
- if (adjustvalue) {
- value += nextDelta;
- }
- return delta += nextDelta;
- });
- if (type === 'habit') {
- if (taskObj.value !== value) {
- task.push('history', {
- date: new Date(),
- value: value
- });
- }
- }
- task.set('value', value);
- if (options.cron) {
- if (type === 'daily') {
- return delta;
- } else {
- return 0;
- }
- }
- _ref2 = userObj.stats, money = _ref2.money, hp = _ref2.hp, exp = _ref2.exp, lvl = _ref2.lvl;
- if (type === 'reward') {
- money -= task.get('value');
- num = parseFloat(task.get('value')).toFixed(2);
- if (money < 0) {
- hp += money;
- money = 0;
- }
- }
- if ((delta > 0 || (type === 'daily' || type === 'todo')) && !options.cron) {
- modified = expModifier(delta);
- exp += modified;
- money += modified;
- } else if (type !== 'reward' && type !== 'todo') {
- modified = hpModifier(delta);
- hp += modified;
- }
- updateStats({
- hp: hp,
- exp: exp,
- money: money
- });
- return delta;
-};
-
-cron = function() {
- var daysPassed, hpTally, lastCron, tallyTask, tasks, today, todoTally;
- today = new Date();
- user.setNull('lastCron', today);
- lastCron = user.get('lastCron');
- daysPassed = helpers.daysBetween(today, lastCron);
- if (daysPassed > 0) {
- todoTally = 0;
- hpTally = 0;
- tallyTask = function(taskObj, callback) {
- var absVal, completed, daysFailed, id, repeat, task, type, value;
- id = taskObj.id, type = taskObj.type, completed = taskObj.completed, repeat = taskObj.repeat;
- if (id == null) {
- return callback('a task had a null id during cron, this should not be happening');
- }
- task = user.at("tasks." + id);
- if (type === 'todo' || type === 'daily') {
- if (!completed) {
- daysFailed = daysPassed;
- if (type === 'daily' && repeat) {
- daysFailed = 0;
- _.times(daysPassed, function(n) {
- var thatDay;
- thatDay = moment().subtract('days', n + 1);
- if (repeat[helpers.dayMapping[thatDay.day()]] === true) {
- return daysFailed++;
- }
- });
- }
- hpTally += score(id, 'down', {
- cron: true,
- times: daysFailed
- });
- }
- value = task.get('value');
- if (type === 'daily') {
- task.push("history", {
- date: today,
- value: value
- });
- } else {
- absVal = completed ? Math.abs(value) : value;
- todoTally += absVal;
- }
- if (type === 'daily') {
- task.pass({
- cron: true
- }).set('completed', false);
- }
- }
- return callback();
- };
- tasks = _.toArray(user.get('tasks'));
- return async.forEach(tasks, tallyTask, function(err) {
- var expTally, lvl;
- user.push('history.todos', {
- date: today,
- value: todoTally
- });
- expTally = user.get('stats.exp');
- lvl = 0;
- while (lvl < (user.get('stats.lvl') - 1)) {
- lvl++;
- expTally += (lvl * 100) / 5;
- }
- user.push('history.exp', {
- date: today,
- value: expTally
- });
- updateStats({
- hp: user.get('stats.hp') + hpTally
- });
- return user.set('lastCron', today);
- });
- }
-};
-
-module.exports = {
- setModel: setModel,
- MODIFIER: MODIFIER,
- score: score,
- cron: cron,
- expModifier: expModifier,
- hpModifier: hpModifier,
- taskDeltaFormula: taskDeltaFormula
-};
diff --git a/lib/server/index.js b/lib/server/index.js
deleted file mode 100644
index a824ab706d..0000000000
--- a/lib/server/index.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// Generated by CoffeeScript 1.4.0
-var MongoStore, ONE_YEAR, app, auth, derby, everyauth, express, expressApp, gzippo, habitrpgMiddleware, http, options, path, priv, publicPath, racer, root, server, serverError, store, strategies;
-
-http = require('http');
-
-path = require('path');
-
-express = require('express');
-
-gzippo = require('gzippo');
-
-derby = require('derby');
-
-app = require('../app');
-
-everyauth = require('everyauth');
-
-serverError = require('./serverError');
-
-MongoStore = require('connect-mongo')(express);
-
-auth = require('derby-auth');
-
-priv = require('./private');
-
-racer = require('derby/node_modules/racer');
-
-racer.io.set('transports', ['xhr-polling']);
-
-if (process.env.NODE_ENV !== 'production') {
- racer.use(racer.logPlugin);
- derby.use(derby.logPlugin);
-}
-
-expressApp = express();
-
-server = http.createServer(expressApp);
-
-module.exports = server;
-
-derby.use(require('racer-db-mongo'));
-
-store = derby.createStore({
- db: {
- type: 'Mongo',
- uri: process.env.NODE_DB_URI
- },
- listen: server
-});
-
-ONE_YEAR = 1000 * 60 * 60 * 24 * 365;
-
-root = path.dirname(path.dirname(__dirname));
-
-publicPath = path.join(root, 'public');
-
-habitrpgMiddleware = function(req, res, next) {
- var model;
- model = req.getModel();
- model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent')));
- model.set('_nodeEnv', process.env.NODE_ENV);
- return next();
-};
-
-strategies = {
- facebook: {
- strategy: require("passport-facebook").Strategy,
- conf: {
- clientID: process.env.FACEBOOK_KEY,
- clientSecret: process.env.FACEBOOK_SECRET
- }
- }
-};
-
-options = {
- domain: "http://localhost:3000",
- allowPurl: true,
- schema: require('../app/schema').newUserObject()
-};
-
-auth.init(expressApp, store, strategies, options);
-
-expressApp.use(express.favicon()).use(gzippo.staticGzip(publicPath, {
- maxAge: ONE_YEAR
-})).use(express.compress()).use(express.bodyParser()).use(express.methodOverride()).use(express.cookieParser()).use(store.sessionMiddleware({
- secret: process.env.SESSION_SECRET || 'YOUR SECRET HERE',
- cookie: {
- maxAge: ONE_YEAR
- },
- store: new MongoStore({
- url: process.env.NODE_DB_URI
- })
-})).use(store.modelMiddleware()).use(priv.middleware).use(habitrpgMiddleware).use(auth.middleware()).use(app.router()).use(expressApp.router).use(serverError(root));
-
-auth.routes();
-
-priv.routes(expressApp);
-
-require('./serverRoutes')(expressApp, root, derby);
-
-expressApp.all('*', function(req) {
- throw "404: " + req.url;
-});
diff --git a/lib/server/private.js b/lib/server/private.js
deleted file mode 100644
index 0197b87658..0000000000
--- a/lib/server/private.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Generated by CoffeeScript 1.4.0
-
-module.exports.middleware = function(req, res, next) {
- return next();
-};
-
-module.exports.app = function(appExports, model) {};
-
-module.exports.routes = function(expressApp) {};
diff --git a/lib/server/serverError.js b/lib/server/serverError.js
deleted file mode 100644
index bd667e8731..0000000000
--- a/lib/server/serverError.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Generated by CoffeeScript 1.4.0
-var derby, isProduction;
-
-derby = require('derby');
-
-isProduction = derby.util.isProduction;
-
-module.exports = function(root) {
- var staticPages;
- staticPages = derby.createStatic(root);
- return function(err, req, res, next) {
- var message, status;
- if (err == null) {
- return next();
- }
- console.log(err.stack ? err.stack : err);
- message = err.message || err.toString();
- status = parseInt(message);
- if (status === 404) {
- return staticPages.render('404', res, {
- url: req.url
- }, 404);
- } else {
- return res.send((400 <= status && status < 600) ? status : 500);
- }
- };
-};
diff --git a/lib/server/serverRoutes.js b/lib/server/serverRoutes.js
deleted file mode 100644
index 96067144fa..0000000000
--- a/lib/server/serverRoutes.js
+++ /dev/null
@@ -1,72 +0,0 @@
-// Generated by CoffeeScript 1.4.0
-var scoring, _;
-
-scoring = require('../app/scoring');
-
-_ = require('underscore');
-
-module.exports = function(expressApp, root, derby) {
- var deprecatedMessage, staticPages;
- staticPages = derby.createStatic(root);
- expressApp.get('/privacy', function(req, res) {
- return staticPages.render('privacy', res);
- });
- expressApp.get('/terms', function(req, res) {
- return staticPages.render('terms', res);
- });
- deprecatedMessage = 'This REST resource is no longer supported, use /users/:uid/tasks/:taskId/:direction instead.';
- expressApp.get('/:uid/up/:score?', function(req, res) {
- return res.send(200, deprecatedMessage);
- });
- expressApp.get('/:uid/down/:score?', function(req, res) {
- return res.send(200, deprecatedMessage);
- });
- return expressApp.post('/users/:uid/tasks/:taskId/:direction', function(req, res) {
- var direction, icon, model, service, taskId, title, uid, _ref, _ref1;
- _ref = req.params, uid = _ref.uid, taskId = _ref.taskId, direction = _ref.direction;
- _ref1 = req.body, title = _ref1.title, service = _ref1.service, icon = _ref1.icon;
- console.log({
- params: req.params,
- body: req.body
- });
- if (direction !== 'up' && direction !== 'down') {
- return res.send(500, ":direction must be 'up' or 'down'");
- }
- model = req.getModel();
- model.session.userId = uid;
- return model.fetch("users." + uid, function(err, user) {
- var delta, result, userObj;
- if (err) {
- return res.send(500, err);
- }
- userObj = user.get();
- if (!(userObj && !_.isEmpty(userObj.stats))) {
- console.log({
- taskId: taskId,
- direction: direction,
- user: userObj,
- error: 'non-user attempted to score'
- });
- return res.send(500, "User " + uid + " not found");
- }
- model.ref('_user', user);
- if (!model.get("_user.tasks." + taskId)) {
- model.refList("_habitList", "_user.tasks", "_user.habitIds");
- model.at('_habitList').push({
- id: taskId,
- type: 'habit',
- text: title || taskId,
- value: 0,
- up: true,
- down: true,
- notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
- });
- }
- scoring.setModel(model);
- delta = scoring.score(taskId, direction);
- result = model.get('_user.stats');
- result.delta = delta;
- return res.send(result);
- });
- });
-};
diff --git a/package.json b/package.json
index 21b8cb1860..c105628d9f 100644
--- a/package.json
+++ b/package.json
@@ -17,12 +17,10 @@
"stripe": "*",
"async": "*",
"underscore": "*",
- "clone": "*"
+ "clone": "*",
+ "coffee-script": "*"
},
"private": true,
- "devDependencies": {
- "coffee-script": ">=1.3.3"
- },
"subdomain": "habitrpg",
"domains": [
"habitrpg.com",
diff --git a/server.js b/server.js
index 4a47ca7429..02ebfebece 100644
--- a/server.js
+++ b/server.js
@@ -1,8 +1,5 @@
-var port = process.env.PORT || 3000;
-if (process.env.NODE_ENV === 'debug' || process.env.NODE_ENV === 'production') {
- // "up" module interferes with node debug & node-inspector. also, nodejitsu (aka, 'production') doesn't like up
- console.log('Running in ' + process.env.NODE_ENV + ': require("./lib/server").listen(' + port + ');');
- require('./lib/server').listen(port);
-} else {
- require('derby').run(__dirname + '/lib/server', port);
-}
\ No newline at end of file
+require('coffee-script') // remove intermediate compilation requirement
+require('./src/server').listen(process.env.PORT || 3000);
+
+// Note: removed "up" module, which is default for development (but interferes with and production + PaaS)
+// Restore to 5310bb0 if I want it back (see https://github.com/codeparty/derby/issues/165#issuecomment-10405693)