+ hudozka-data package; /api/v1/feed -> /api/v1/timeline; other updates

This commit is contained in:
tmshv committed 2016-03-26 17:33:22 +03:00
1 parent d0878ec296
commit b96d66591f
14 files changed
+84 -59

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
node_modules/
lib/
.idea/
+18
View File
@@ -0,0 +1,18 @@
{
"name": "hudozka-data",
"private": true,
"version": "0.0.1",
"description": "",
"main": "lib/index.js",
"scripts": {
"compile": "babel --presets es2015,stage-0 src/ -d lib/",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"devDependencies": {
"babel-cli": "^6.6.5",
"babel-preset-es2015": "^6.6.0",
"babel-preset-stage-0": "^6.5.0"
}
}
@@ -1,23 +1,21 @@
import {EventEmitter} from 'events';
import {collection} from '../core/db';
export default class Data extends EventEmitter {
constructor(storeName) {
constructor(store) {
super();
this.save = true;
this.name = storeName;
this.store = collection(storeName);
this.store = store;
}
update(document){
update(document) {
this.emit('update', document);
}
disableSaving(){
disableSaving() {
this.save = false;
}
enableSaving(){
enableSaving() {
this.save = true;
}
}
+7
View File
@@ -0,0 +1,7 @@
import Timeline from './Timeline';
export default class DataManager {
constructor(stores) {
this.timeline = new Timeline(stores.timeline);
}
}
@@ -1,10 +1,6 @@
import Data from './Data';
export default class Feed extends Data {
constructor() {
super('timeline');
}
export default class Timeline extends Data {
add(post) {
let savePost = async(post) => {
const id = post.id;
@@ -28,12 +24,4 @@ export default class Feed extends Data {
return add(post);
}
read(id) {
}
portion() {
}
}
+2
View File
@@ -0,0 +1,2 @@
import DataManager from './DataManager';
export default DataManager;
+3
View File
@@ -24,6 +24,7 @@
"babel-preset-stage-0": "^6.5.0",
"co": "^4.4.0",
"ejson": "^2.1.2",
"hudozka-data": "file:modules/hudozka-data",
"instagram-node": "^0.5.1",
"koa": "^2.0.0-alpha.3",
"koa-bodyparser": "^3.0.0",
@@ -33,7 +34,9 @@
"koa-etag": "^2.0.0",
"koa-helmet": "^1.0.0",
"koa-logger": "^2.0.0",
"koa-mount": "^2.0.0",
"koa-prerender": "^1.0.3",
"koa-query": "0.0.2",
"koa-route": "^3.1.0",
"koa-static": "^3.0.0",
"mongodb": "^2.1.11",
+1 -1
View File
@@ -2,6 +2,6 @@ import EndPoint from './EndPoint';
export default class Feed extends EndPoint {
add(post) {
return this.request.request('PUT', '/feed', post);
return this.request.request('PUT', '/timeline', post);
}
}
+10 -11
View File
@@ -2,26 +2,25 @@ import {put} from 'koa-route';
import compose from 'koa-compose';
import {ensureServiceAuth} from '../middlewares/ensureServiceAuth';
import {ejson} from '../middlewares/ejson';
import {queryValue, booleanify} from '../middlewares/queryValue';
import query from 'koa-query';
import {toBoolean} from 'koa-query';
import data from '../data';
export function add() {
return put('/api/v1/feed', compose([
export function add(auth, store) {
return put('/timeline', compose([
ensureServiceAuth(),
ejson(),
queryValue({
save: booleanify()
query({
save: toBoolean()
}),
async(ctx) => {
let doSave = ctx.request.query.save || true;
let post = ctx.request.body;
try {
if(!doSave) data.feed.disableSaving();
let result = await data.feed.add(post);
if(!doSave) data.feed.enableSaving();
if(!doSave) store.timeline.disableSaving();
let result = await store.timeline.add(post);
if(!doSave) store.timeline.enableSaving();
ctx.body = result;
} catch (e) {
ctx.status = 400;
+2 -2
View File
@@ -1,8 +1,8 @@
import {add as feedAdd} from './feed';
import compose from 'koa-compose';
export default function () {
export default function (auth, store) {
return compose([
feedAdd()
feedAdd(auth, store)
]);
};
-5
View File
@@ -1,5 +0,0 @@
import Feed from './Feed';
export default {
feed: new Feed()
};
+16 -8
View File
@@ -1,21 +1,29 @@
import 'babel-polyfill';
import config from './config';
import {connect} from './core/db';
import {connect, collection} from './core/db';
import io from './io';
import server from './server';
import DataManager from 'hudozka-data';
// var DataManager = require('hudozka-data').default;
function main() {
async function loop(){
async function loop() {
await connect(config.db.uri);
try{
var server = require('./server').default;
var io = require('./io').default;
try {
let data = new DataManager({
timeline: collection('timeline')
});
let app = server(data);
io(app, data);
var app = server();
io(app);
app.listen(config.port);
}catch(e){
} catch (e) {
console.error(e.stack);
return;
}
console.log(`Start listening ${config.port}`);
+6 -8
View File
@@ -1,7 +1,6 @@
import socketIO from 'socket.io';
import data from './data';
export default function(server) {
export default function(server, store) {
let io = socketIO(server);
io.on('connection', socket => {
// console.log('a user connected');
@@ -18,11 +17,10 @@ export default function(server) {
});
let transfer = name => i => io.emit(name, i);
let feed = transfer('feed');
let timeline = transfer('timeline');
data.feed.on('update', feed);
data.feed.on('update', i => {
console.log(`io update ${JSON.stringify(i, null, '\t')}`);
});
store.timeline.on('update', timeline);
// store.timeline.on('update', i => {
// console.log(`io update ${JSON.stringify(i, null, '\t')}`);
// });
}
+8 -2
View File
@@ -8,6 +8,7 @@ import conditional from 'koa-conditional-get';
import etag from 'koa-etag';
import prerender from 'koa-prerender';
import helmet from 'koa-helmet';
import mount from 'koa-mount';
import bodyParser from 'koa-bodyparser';
import config from './config';
@@ -15,11 +16,12 @@ import {redirectionTable} from './config';
import {routes, queryObject} from './routes';
import api from './api';
import {redirect} from './routes/redirect';
import {checkAuth} from './core/service';
const dirPublic = path.join(__dirname, '../public');
const dirTemplates = path.join(__dirname, 'templates');
export default function(){
export default function(store){
const $ = convert;
const app = new Koa();
@@ -31,7 +33,7 @@ export default function(){
}
}));
app.use(logger());
app.use(api());
app.use(apis(store));
app.use($(conditional()));
app.use($(etag()));
app.use(prerenderRmFragment());
@@ -46,6 +48,10 @@ export default function(){
return Server(app.callback());
}
function apis(store){
return mount('/api/v1', api(checkAuth, store));
}
function prerenderRmFragment(){
return async (ctx, next) => {
await next();