Skip to content
Snippets Groups Projects
Commit 48e52ce0 authored by Ulf Seltmann's avatar Ulf Seltmann
Browse files

first working version

parent db4d5e94
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
data/apis 0 → 100644
+ 1
− 0
View file @ 48e52ce0
This diff is collapsed.
lib/cache.js
+ 89
− 30
View file @ 48e52ce0
...@@ -11,27 +11,61 @@ Object.defineProperty(exports, "__esModule", { value: true }); ...@@ -11,27 +11,61 @@ Object.defineProperty(exports, "__esModule", { value: true });
const debugFactory = require("debug"); const debugFactory = require("debug");
const NodeCache = require("node-cache"); const NodeCache = require("node-cache");
const crypto = require("crypto"); const crypto = require("crypto");
const fs = require("fs");
const path = require("path");
const endpoint_1 = require("./endpoint"); const endpoint_1 = require("./endpoint");
const debug = debugFactory('decap:cache'); const debug = debugFactory('decap:cache');
var Register; class Register {
(function (Register) { constructor(storage, name) {
const cacheRegister = {}; this.storage = storage;
Register.getByName = (name) => { this.name = name;
if (!cacheRegister[name]) this.cacheRegister = {};
throw new Error(`no endpoint registered for "${name}"`); this.get = (name) => {
return cacheRegister[name]; if (!this.cacheRegister[name])
}; throw new Error(`no endpoint registered for "${name}"`);
Register.register = (name, serverUrl) => { return this.cacheRegister[name];
const endpoint = new endpoint_1.Endpoint(serverUrl); };
const nodeCache = new NodeCache(); this.add = (name, serverUrl) => {
cacheRegister[name] = new Cache(endpoint, nodeCache); const endpoint = new endpoint_1.Endpoint(serverUrl);
}; const nodeCache = new NodeCache();
})(Register = exports.Register || (exports.Register = {})); this.cacheRegister[name] = new Cache();
this.cacheRegister[name].setCache(nodeCache).setEndpoint(endpoint);
};
this.save = () => {
const data = Object.keys(this.cacheRegister).map((name) => {
return {
name: name,
data: this.cacheRegister[name].toObject()
};
});
fs.writeFileSync(path.resolve(this.storage, this.name), JSON.stringify(data), { encoding: 'utf8', flag: 'w' });
debug('register ${this.name} saved to ${this.storage}');
};
this.restore = () => __awaiter(this, void 0, void 0, function* () {
const data = JSON.parse(fs.readFileSync(path.resolve(this.storage, this.name), { encoding: 'utf8' }));
data.map((cache) => {
this.cacheRegister[cache.name] = new Cache();
this.cacheRegister[cache.name].fromObject(cache.data);
});
debug('register ${this.name} restored from ${this.storage}');
});
fs.existsSync(storage) || fs.mkdirSync(storage);
}
}
exports.Register = Register;
class Cache { class Cache {
constructor(endpoint, realCache) { constructor(endpoint, realCache) {
this.endpoint = endpoint; this.endpoint = endpoint;
this.realCache = realCache; this.realCache = realCache;
} }
setEndpoint(endpoint) {
this.endpoint = endpoint;
return this;
}
setCache(realCache) {
this.realCache = realCache;
return this;
}
get(hash, path) { get(hash, path) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
let value = this.realCache.get(hash); let value = this.realCache.get(hash);
...@@ -52,24 +86,49 @@ class Cache { ...@@ -52,24 +86,49 @@ class Cache {
return value; return value;
}); });
} }
toObject() {
const data = {
endPoint: this.endpoint.toObject(),
cache: []
};
this.realCache.keys().map((hash) => {
data.cache.push({
hash: hash,
data: this.realCache.get(hash)
});
});
return data;
}
fromObject(data) {
const endpoint = new endpoint_1.Endpoint();
const realCache = new NodeCache();
endpoint.fromObject(data.endPoint);
this.setEndpoint(endpoint);
data.cache.map((item) => {
realCache.set(item.hash, item.data);
});
this.setCache(realCache);
}
} }
exports.Cache = Cache; exports.Cache = Cache;
function Middleware(req, res, next) { function Middleware(register) {
return __awaiter(this, void 0, void 0, function* () { return function (req, res, next) {
const pattern = new RegExp('^/([^/]+)(.*)$'); return __awaiter(this, void 0, void 0, function* () {
const match = req.url.match(pattern); const pattern = new RegExp('^/([^/]+)(.*)$');
try { const match = req.url.match(pattern);
const cache = Register.getByName(match[1]); try {
const uniQueryString = Object.keys(req.query).sort().map(function (key) { return `${key}=${req.query[key]}`; }).join('&'); const cache = register.get(match[1]);
const hash = crypto.createHash('sha1').update(req.path + uniQueryString).digest('base64'); const uniQueryString = Object.keys(req.query).sort().map(function (key) { return `${key}=${req.query[key]}`; }).join('&');
const value = yield cache.get(hash, match[2]); const hash = crypto.createHash('sha1').update(req.path + uniQueryString).digest('base64');
res.setHeader('content-type', value.contentType); const value = yield cache.get(hash, match[2]);
res.send(value.data); res.setHeader('content-type', value.contentType);
} res.send(value.data);
catch (err) { }
next(err); catch (err) {
} next(err);
}); }
});
};
} }
exports.Middleware = Middleware; exports.Middleware = Middleware;
//# sourceMappingURL=cache.js.map //# sourceMappingURL=cache.js.map
\ No newline at end of file
lib/endpoint.js
+ 9
− 0
View file @ 48e52ce0
...@@ -6,6 +6,15 @@ class Endpoint { ...@@ -6,6 +6,15 @@ class Endpoint {
constructor(serverUrl) { constructor(serverUrl) {
this.serverUrl = serverUrl; this.serverUrl = serverUrl;
} }
setEndpoint(serverUrl) {
this.serverUrl = serverUrl;
}
toObject() {
return { serverUrl: this.serverUrl };
}
fromObject(data) {
this.setEndpoint(data.serverUrl);
}
request(uriPath, value) { request(uriPath, value) {
const deferred = Q.defer(); const deferred = Q.defer();
const req = https.request(this.serverUrl + uriPath, (res) => { const req = https.request(this.serverUrl + uriPath, (res) => {
......
lib/index.js
+ 11
− 9
View file @ 48e52ce0
...@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true }); ...@@ -3,22 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
const express = require("express"); const express = require("express");
const compression = require("compression"); const compression = require("compression");
const debugFactory = require("debug"); const debugFactory = require("debug");
const path = require("path");
// import endpointFactory from './endpoint'; // import endpointFactory from './endpoint';
const cache = require("./cache"); const cache = require("./cache");
const debug = debugFactory('decap:index'); const debug = debugFactory('decap:index');
// import cacheInterface from './cache';
// import adminInterface from './admin';
const app = express(); const app = express();
const storagePath = process.env.DATA_DIR || path.resolve(process.cwd(), 'data');
const register = new cache.Register(storagePath, 'apis');
register.restore();
app.use(compression()); app.use(compression());
// restore from persistent memory after startup app.use(cache.Middleware(register));
// app.get('/admin', adminInterface);
// app.get('*', apicacheInterface)
cache.Register.register('amsl', 'https://live.amsl.technology/inhouseservices/');
app.use(cache.Middleware);
const server = app.listen(3000, () => { const server = app.listen(3000, () => {
debug('server up and running'); debug('server up and running');
}); });
server.on('close', () => { app.get('/admin/add/:registerName', (req, res, next) => {
debug('closing'); });
process.stdin.resume();
process.on('SIGTERM', () => {
register.save();
process.exit();
}); });
//# sourceMappingURL=index.js.map //# sourceMappingURL=index.js.map
\ No newline at end of file
src/cache.ts
+ 101
− 24
View file @ 48e52ce0
...@@ -2,31 +2,76 @@ import * as debugFactory from 'debug'; ...@@ -2,31 +2,76 @@ import * as debugFactory from 'debug';
import * as express from 'express'; import * as express from 'express';
import * as NodeCache from 'node-cache'; import * as NodeCache from 'node-cache';
import * as crypto from 'crypto'; import * as crypto from 'crypto';
import * as fs from 'fs';
import * as path from 'path';
import * as Q from 'q';
import { Endpoint, EndpointValue } from './endpoint'; import { Endpoint, EndpointValue } from './endpoint';
const debug = debugFactory('decap:cache'); const debug = debugFactory('decap:cache');
export namespace Register { interface MiddlewareFunction {
const cacheRegister:{[key: string]: Cache} = {}; (req: express.Request, res: express.Response, next: express.NextFunction): Promise<void>
}
export class Register {
cacheRegister: { [key: string]: Cache } = {};
constructor(private storage: string, public name: string) {
fs.existsSync(storage) || fs.mkdirSync(storage);
}
export let getByName = (name: string): Cache => { get = (name: string): Cache => {
if (!cacheRegister[name]) throw new Error(`no endpoint registered for "${name}"`); if (!this.cacheRegister[name]) throw new Error(`no endpoint registered for "${name}"`);
return cacheRegister[name]; return this.cacheRegister[name];
} }
export let register = (name: string, serverUrl) => { add = (name: string, serverUrl) => {
const endpoint:Endpoint = new Endpoint(serverUrl); const endpoint: Endpoint = new Endpoint(serverUrl);
const nodeCache:NodeCache = new NodeCache() const nodeCache: NodeCache = new NodeCache()
cacheRegister[name] = new Cache(endpoint, nodeCache); this.cacheRegister[name] = new Cache();
this.cacheRegister[name].setCache(nodeCache).setEndpoint(endpoint);
}
save = () => {
const data = Object.keys(this.cacheRegister).map((name) => {
return {
name: name,
data: this.cacheRegister[name].toObject()
}
});
fs.writeFileSync(path.resolve(this.storage, this.name), JSON.stringify(data), {encoding: 'utf8', flag: 'w'});
debug('register ${this.name} saved to ${this.storage}');
}
restore = async (): Promise<void> => {
const data = JSON.parse(fs.readFileSync(path.resolve(this.storage, this.name), { encoding: 'utf8' }));
data.map((cache) => {
this.cacheRegister[cache.name] = new Cache();
this.cacheRegister[cache.name].fromObject(cache.data);
});
debug('register ${this.name} restored from ${this.storage}');
} }
} }
export class Cache { export class Cache {
constructor (private endpoint: Endpoint, private realCache: NodeCache) { constructor(private endpoint?: Endpoint, private realCache?: NodeCache) {
}
setEndpoint(endpoint: Endpoint): this {
this.endpoint = endpoint;
return this;
}
setCache(realCache: NodeCache): this {
this.realCache = realCache;
return this;
} }
async get(hash: string, path: string): Promise<EndpointValue> { async get(hash: string, path: string): Promise<EndpointValue> {
let value:EndpointValue|undefined = this.realCache.get(hash); let value: EndpointValue | undefined = this.realCache.get(hash);
if (value == undefined) { if (value == undefined) {
debug(`no cache hit. fetching ${path}`); debug(`no cache hit. fetching ${path}`);
value = { value = {
...@@ -42,21 +87,53 @@ export class Cache { ...@@ -42,21 +87,53 @@ export class Cache {
} }
return value; return value;
} }
}
export async function Middleware(req: express.Request, res: express.Response, next: express.NextFunction) { toObject() {
const pattern = new RegExp('^/([^/]+)(.*)$'); const data = {
const match = req.url.match(pattern); endPoint: this.endpoint.toObject(),
cache: []
}
this.realCache.keys().map((hash) => {
data.cache.push({
hash: hash,
data: this.realCache.get(hash)
});
});
return data;
}
fromObject(data) {
const endpoint = new Endpoint();
const realCache = new NodeCache()
endpoint.fromObject(data.endPoint);
try { this.setEndpoint(endpoint);
const cache = Register.getByName(match[1]);
const uniQueryString = Object.keys(req.query).sort().map(function (key) { return `${key}=${req.query[key]}` }).join('&'); data.cache.map((item) => {
const hash = crypto.createHash('sha1').update(req.path + uniQueryString).digest('base64'); realCache.set(item.hash, item.data);
const value = await cache.get(hash, match[2]); });
res.setHeader('content-type', value.contentType)
res.send(value.data); this.setCache(realCache);
} catch (err) {
next(err);
} }
} }
export function Middleware(register): MiddlewareFunction {
return async function (req: express.Request, res: express.Response, next: express.NextFunction): Promise<void> {
const pattern = new RegExp('^/([^/]+)(.*)$');
const match = req.url.match(pattern);
try {
const cache = register.get(match[1]);
const uniQueryString = Object.keys(req.query).sort().map(function (key) { return `${key}=${req.query[key]}` }).join('&');
const hash = crypto.createHash('sha1').update(req.path + uniQueryString).digest('base64');
const value = await cache.get(hash, match[2]);
res.setHeader('content-type', value.contentType)
res.send(value.data);
} catch (err) {
next(err);
}
}
}
src/endpoint.ts
+ 13
− 1
View file @ 48e52ce0
...@@ -9,7 +9,19 @@ export interface EndpointValue { ...@@ -9,7 +9,19 @@ export interface EndpointValue {
export class Endpoint { export class Endpoint {
constructor(private serverUrl:string) { constructor(private serverUrl?:string) {
}
setEndpoint(serverUrl: string) {
this.serverUrl = serverUrl;
}
toObject() {
return {serverUrl: this.serverUrl};
}
fromObject (data) {
this.setEndpoint(data.serverUrl);
} }
public request(uriPath:string, value:EndpointValue): Promise<void>{ public request(uriPath:string, value:EndpointValue): Promise<void>{
......
src/index.ts
+ 16
− 21
View file @ 48e52ce0
import * as express from 'express'; import * as express from 'express';
import * as compression from 'compression'; import * as compression from 'compression';
import * as debugFactory from 'debug'; import * as debugFactory from 'debug';
import * as https from 'https'; import * as path from 'path';
import * as NodeCache from 'node-cache';
import * as Url from 'url';
import * as crypto from 'crypto';
import * as stream from 'stream';
import * as Q from 'q';
// import endpointFactory from './endpoint'; // import endpointFactory from './endpoint';
import * as cache from './cache'; import * as cache from './cache';
const debug = debugFactory('decap:index'); const debug = debugFactory('decap:index');
// import cacheInterface from './cache';
// import adminInterface from './admin';
const app = express(); const app = express();
const storagePath = process.env.DATA_DIR || path.resolve(process.cwd(), 'data');
app.use(compression()); const register = new cache.Register(storagePath, 'apis');
// restore from persistent memory after startup
// app.get('/admin', adminInterface);
// app.get('*', apicacheInterface)
cache.Register.register('amsl', 'https://live.amsl.technology/inhouseservices/'); register.restore();
app.use(cache.Middleware); app.use(compression());
app.use(cache.Middleware(register));
const server = app.listen(3000, () => { const server = app.listen(3000, () => {
debug('server up and running'); debug('server up and running');
}); });
server.on('close', () => { app.get('/admin/add/:registerName', (req, res, next) => {
debug('closing');
}) });
\ No newline at end of file
process.stdin.resume();
process.on('SIGTERM', () => {
register.save();
process.exit();
});
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment