EpicCash/epic_explorer
4
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/epic-tech/explorer2.epic.tech-angular8

Browse Source
This commit is contained in:
root 2019-08-09 12:48:15 +05:30
commit ded548e4b2
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -6,14 +6,15 @@
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"lint": "ng lint", "lint": "ng lint",
"copyToLive":"rm -rf live && cp -rf dist live",
"build:client-and-server-bundles": "ng build --prod && ng run explorer2-epic:server:production", "build:client-and-server-bundles": "ng build --prod && ng run explorer2-epic:server:production",
"build:prerender": "npm run build:client-and-server-bundles && npm run compile:server && npm run generate:prerender", "build:prerender": "npm run build:client-and-server-bundles && npm run compile:server && npm run generate:prerender",
"build:ssr": "npm run build:client-and-server-bundles && npm run compile:server && npm run move:build", "build:ssr": "npm run build:client-and-server-bundles && npm run compile:server && npm run move:build && npm run copyToLive",
"compile:server": "tsc -p server.tsconfig.json", "compile:server": "tsc -p server.tsconfig.json",
"move:build": "(cp -r ./server/i18n/ dist/server)", "move:build": "(cp -r ./server/i18n/ dist/server)",
"generate:prerender": "cd dist && node prerender", "generate:prerender": "cd dist && node prerender",
"serve:prerender": "cd dist/browser && http-server", "serve:prerender": "cd dist/browser && http-server",
"serve:ssr": "node dist/server" "serve:ssr": "node live/server"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {

2
server.ts
View File

@ -63,7 +63,7 @@ enableProdMode();
const app = express(); const app = express();
const PORT = process.env.PORT || 4000; const PORT = process.env.PORT || 4000;
const DIST_FOLDER = join(process.cwd(), "dist"); const DIST_FOLDER = join(process.cwd(), "live");
const controllers = [ const controllers = [
new BlockchainBlockController(), new BlockchainBlockController(),

14
server/controllers/BlockchainKernel.ts
View File

@ -28,6 +28,15 @@ export class BlockchainKernelController {
this.IntializeRoutes(); this.IntializeRoutes();
} }
IsJsonString(str) {
try {
var dataJson = JSON.parse(str);
} catch (e) {
return [];
}
return dataJson;
}
public IntializeRoutes() { public IntializeRoutes() {
/** /**
* @swagger * @swagger
@ -505,6 +514,7 @@ export class BlockchainKernelController {
response: Response, response: Response,
next: NextFunction, next: NextFunction,
) => { ) => {
var self = this;
try { try {
http.get('http://116.203.152.58:3413/v1/peers/connected', (resp) => { http.get('http://116.203.152.58:3413/v1/peers/connected', (resp) => {
// console.log('resp resp respresp',resp); // console.log('resp resp respresp',resp);
@ -513,7 +523,8 @@ export class BlockchainKernelController {
// A chunk of data has been recieved. // A chunk of data has been recieved.
resp.on('data', function (chunk) { resp.on('data', function (chunk) {
data += chunk; data += chunk;
let dataJson = JSON.parse(data);
let dataJson = self.IsJsonString(data);
dataJson.forEach(function (value, i) { dataJson.forEach(function (value, i) {
value['id'] = i; value['id'] = i;
}); });
@ -533,6 +544,7 @@ export class BlockchainKernelController {
} }
}; };
private TransactionFee = async ( private TransactionFee = async (
request: Request, request: Request,
response: Response, response: Response,