Getting info works as a promise!!!!!!

This commit is contained in:
Alex Janka 2017-06-02 21:16:55 +10:00
parent 2c1956312a
commit 8e4ecd3773
2 changed files with 29 additions and 37 deletions

View file

@ -2,7 +2,7 @@ import express = require('express');
import expresshb = require('express-handlebars');
import http = require('http');
import https = require('https');
import promise = require('promise');
import Promise = require('promise');
import { IPGeoJson } from './ip_geo';
@ -12,22 +12,15 @@ app.engine('handlebars', expresshb({ defaultLayout: 'main' }));
app.set('view engine', 'handlebars');
app.get('/', function (req, res) {
getIpInfo("::ffff:" + "119.17.156.106").done(function (geoinfo: IPGeoJson) {
res.render('home');
getIpInfo("::ffff:" + "119.17.156.106").country; //replace with req.ip
}); //replace with req.ip
});
app.listen(3000);
function getIpInfo(ip: String): IPGeoJson {
var ipinfo: IPGeoJson = {
ip: "",
city: "",
region: "",
country: "",
loc: "",
postal: ""
};
function getIpInfo(ip: String): Promise.IThenable<{}> {
return new Promise(function (resolve, reject) {
var options = {
host: 'ipinfo.io',
port: 443,
@ -37,7 +30,6 @@ function getIpInfo(ip: String): IPGeoJson {
'Content-Type': 'application/json'
}
}
console.log(options.path);
var callback = function (response: http.IncomingMessage) {
var str: string;
@ -48,12 +40,10 @@ function getIpInfo(ip: String): IPGeoJson {
response.on('end', function () {
console.log(str);
ipinfo = <IPGeoJson>JSON.parse(str.slice(9));
console.log(ipinfo.city);
resolve(<IPGeoJson>JSON.parse(str.slice(9)));
});
}
https.get(options, callback);
return ipinfo;
})
}

View file

@ -17,10 +17,12 @@
"@types/express-handlebars": "0.0.29",
"@types/handlebars": "^4.0.32",
"@types/node": "^7.0.23",
"@types/promise": "^7.1.30",
"express": "^4.15.3",
"express-handlebars": "^3.0.0",
"handlebars": "^4.0.10",
"nodemon": "^1.11.0",
"promise": "^7.1.1",
"ts-node": "^3.0.4",
"typescript": "^2.3.4"
},