Switch from form-data to restler, a lot better :thumbs_up:

This commit is contained in:
Mahdi Dibaiee 2015-07-03 02:19:36 +04:30
parent 5336bfece8
commit e2d34118da
10 changed files with 268 additions and 129 deletions

View File

@ -14,6 +14,16 @@ The code is well documented. I'm trying to integrate JSDoc / ESDoc into our repo
--- ---
If you are using `babel/polyfill` and you get an error requiring this modules, try:
```javascript
require('telegram-api/build');
```
This will bypass the `babel/polyfill` required by the module.
---
All Telegram API methods are accessible through `api` property of bots. All Telegram API methods are accessible through `api` property of bots.
```javascript ```javascript

View File

@ -8,103 +8,28 @@ exports.getBody = getBody;
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
var _https = require('https'); var _restler = require('restler');
var _https2 = _interopRequireDefault(_https); var _restler2 = _interopRequireDefault(_restler);
var _qs = require('qs');
var _qs2 = _interopRequireDefault(_qs);
var _formData = require('form-data');
var _formData2 = _interopRequireDefault(_formData);
function fetch(path) { function fetch(path) {
var data = arguments[1] === undefined ? { test: 1 } : arguments[1]; var data = arguments[1] === undefined ? {} : arguments[1];
var form = new _formData2['default']();
var keys = Object.keys(data);
var _iteratorNormalCompletion = true;
var _didIteratorError = false;
var _iteratorError = undefined;
try {
for (var _iterator = keys[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
var key = _step.value;
console.log(key, data[key]);
form.append(key, data[key]);
}
} catch (err) {
_didIteratorError = true;
_iteratorError = err;
} finally {
try {
if (!_iteratorNormalCompletion && _iterator['return']) {
_iterator['return']();
}
} finally {
if (_didIteratorError) {
throw _iteratorError;
}
}
}
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
form.getLength(function (err, length) { var method = Object.keys(data).length ? 'POST' : 'GET';
if (err) { var multipart = method === 'POST' ? true : false;
return reject(err);
}
form.submit({ _restler2['default'].request('https://api.telegram.org/bot' + path, {
protocol: 'https:', data: data, method: method, multipart: multipart
host: 'api.telegram.org', }).on('complete', function (response) {
path: '/bot' + path,
headers: {
'Content-Length': length
}
}, function (error, response) {
if (error) {
return reject(error);
}
return getBody(response).then(function (body) {
try { try {
var json = JSON.parse(body); var json = JSON.parse(response);
resolve(json); resolve(json);
} catch (e) { } catch (e) {
reject(e); reject(e);
} }
})['catch'](reject);
}); });
}); });
});
// console.log(form.getHeaders());
// return new Promise((resolve, reject) => {
// const req = https.request({
// hostname: 'api.telegram.org',
// method: keys.length ? 'POST' : 'GET',
// path: '/bot' + path,
// headers: form.getHeaders()
// }, response => {
// return getBody(response).then(res => {
// console.log(res);
// try {
// let json = JSON.parse(res);
// resolve(json);
// } catch(e) {
// reject(e);
// }
// }).catch(reject);
// });
//
// form.pipe(req);
// }).catch(err => {
// console.error('Error sending request', err);
// });
} }
function getBody(stream) { function getBody(stream) {

View File

@ -14,8 +14,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; } function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
require('babel/polyfill');
var _api = require('./api'); var _api = require('./api');
var _api2 = _interopRequireDefault(_api); var _api2 = _interopRequireDefault(_api);

137
build/types/File.js Normal file
View File

@ -0,0 +1,137 @@
'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
});
var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
var _get = function get(_x2, _x3, _x4) { var _again = true; _function: while (_again) { var object = _x2, property = _x3, receiver = _x4; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x2 = parent; _x3 = property; _x4 = receiver; _again = true; continue _function; } } else if ('value' in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } };
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
function _inherits(subClass, superClass) { if (typeof superClass !== 'function' && superClass !== null) { throw new TypeError('Super expression must either be null or a function, not ' + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) subClass.__proto__ = superClass; }
var _Base2 = require('./Base');
var _Base3 = _interopRequireDefault(_Base2);
var _mime = require('mime');
var _mime2 = _interopRequireDefault(_mime);
var TYPES = ['photo', 'video', 'document', 'audio'];
/**
* File class, used to send pictures/movies/audios/documents to chat
*/
var File = (function (_Base) {
/**
* Create a new file instance
* @param {object} properties File properties, as defined by Telegram API
*/
function File() {
var properties = arguments[0] === undefined ? {} : arguments[0];
_classCallCheck(this, File);
_get(Object.getPrototypeOf(File.prototype), 'constructor', this).call(this, 'sendMessage');
this.properties = properties;
this._keyboard = new _Base3['default']();
}
_inherits(File, _Base);
_createClass(File, [{
key: 'to',
/**
* Set chat_id of the message
* @param {number} chat
* @return {object} returns the message object
*/
value: function to(chat) {
this.properties.chat_id = chat;
return this;
}
}, {
key: 'file',
/**
* Set file of the message
* @param {ReadableStream} stream File Stream
* @param {string} fileType (optional) if the first argument is a
* file_id string, this option indicates file type
* @return {object} returns the message object
*/
value: function file(stream, fileType) {
if (typeof stream === 'string') {
this.properties[fileType] = stream;
}
var type = _mime2['default'].lookup(stream.path).split('/')[0];
if (type === 'image') {
type = 'photo';
}
if (TYPES.indexOf(type) === -1) {
type = 'document';
}
this.properties[type] = stream;
return this;
}
}, {
key: 'caption',
/**
* Set caption for photos
* @param {string} text caption's text
* @return {object} returns the message object
*/
value: function caption(text) {
this.properties.caption = text;
return this;
}
}, {
key: 'reply',
/**
* Set reply_to_message_id of the message
* @param {number} id message_id of the message to reply to
* @return {object} returns the message object
*/
value: function reply(id) {
this.properties.reply_to_message_id = id;
return this;
}
}, {
key: 'keyboard',
/**
* Sets keyboard of the message
* The value of reply_markup is set to the sanitized keyboard properties
* i.e. reply_markup = JSON.stringify(kb.getProperties())
* @param {object} kb A Keyboard instance
* @return {object} returns the message object
*/
value: function keyboard(kb) {
this._keyboard = kb;
return this;
}
// This class inherits Base's send method
}]);
return File;
})(_Base3['default']);
exports['default'] = File;
module.exports = exports['default'];

View File

@ -5,7 +5,7 @@ var Message = require('telegram-api/types/Message');
var Question = require('telegram-api/types/Question'); var Question = require('telegram-api/types/Question');
var bot = new Bot({ var bot = new Bot({
token: 'YOUR_KEY' token: '121143906:AAE6pcpBoARNZZjr3fUpvKuLInJ5Eee5Ajk'
}); });
bot.start().catch(err => { bot.start().catch(err => {

View File

@ -1,41 +1,19 @@
import FormData from 'form-data'; import restler from 'restler';
export default function fetch(path, data = {}) { export default function fetch(path, data = {}) {
const form = new FormData();
const keys = Object.keys(data);
for (let key of keys) {
form.append(key, data[key]);
}
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
form.getLength((err, length) => { const method = Object.keys(data).length ? 'POST' : 'GET';
if (err) { const multipart = method === 'POST' ? true : false;
return reject(err);
}
form.submit({ restler.request('https://api.telegram.org/bot' + path, {
protocol: 'https:', data, method, multipart
host: 'api.telegram.org', }).on('complete', response => {
path: '/bot' + path,
headers: {
'Content-Length': length
}
}, (error, response) => {
if (error) {
return reject(error);
}
return getBody(response).then(body => {
try { try {
let json = JSON.parse(body); let json = JSON.parse(response);
resolve(json); resolve(json);
} catch(e) { } catch(e) {
reject(e); reject(e);
} }
}).catch(reject);
});
}); });
}); });
} }

View File

@ -1,4 +1,3 @@
import 'babel/polyfill';
import API from './api'; import API from './api';
import webhook from './webhook'; import webhook from './webhook';
import poll from './poll'; import poll from './poll';

90
lib/types/File.js Normal file
View File

@ -0,0 +1,90 @@
import Base from './Base';
import mime from 'mime';
const TYPES = ['photo', 'video', 'document', 'audio'];
/**
* File class, used to send pictures/movies/audios/documents to chat
*/
export default class File extends Base {
/**
* Create a new file instance
* @param {object} properties File properties, as defined by Telegram API
*/
constructor(properties = {}) {
super('sendMessage');
this.properties = properties;
this._keyboard = new Base();
}
/**
* Set chat_id of the message
* @param {number} chat
* @return {object} returns the message object
*/
to(chat) {
this.properties.chat_id = chat;
return this;
}
/**
* Set file of the message
* @param {ReadableStream} stream File Stream
* @param {string} fileType (optional) if the first argument is a
* file_id string, this option indicates file type
* @return {object} returns the message object
*/
file(stream, fileType) {
if (typeof stream === 'string') {
this.properties[fileType] = stream;
}
let type = mime.lookup(stream.path).split('/')[0];
if (type === 'image') {
type = 'photo';
}
if (TYPES.indexOf(type) === -1) {
type = 'document';
}
this.properties[type] = stream;
return this;
}
/**
* Set caption for photos
* @param {string} text caption's text
* @return {object} returns the message object
*/
caption(text) {
this.properties.caption = text;
return this;
}
/**
* Set reply_to_message_id of the message
* @param {number} id message_id of the message to reply to
* @return {object} returns the message object
*/
reply(id) {
this.properties.reply_to_message_id = id;
return this;
}
/**
* Sets keyboard of the message
* The value of reply_markup is set to the sanitized keyboard properties
* i.e. reply_markup = JSON.stringify(kb.getProperties())
* @param {object} kb A Keyboard instance
* @return {object} returns the message object
*/
keyboard(kb) {
this._keyboard = kb;
return this;
}
// This class inherits Base's send method
}

View File

@ -31,12 +31,13 @@
"homepage": "https://github.com/mdibaiee/node-telegram-api", "homepage": "https://github.com/mdibaiee/node-telegram-api",
"dependencies": { "dependencies": {
"babel": "^5.6.14", "babel": "^5.6.14",
"form-data": "^1.0.0-rc1",
"grunt": "^0.4.5", "grunt": "^0.4.5",
"grunt-babel": "^5.0.1", "grunt-babel": "^5.0.1",
"grunt-contrib-symlink": "^0.3.0", "grunt-contrib-symlink": "^0.3.0",
"grunt-contrib-watch": "^0.6.1", "grunt-contrib-watch": "^0.6.1",
"grunt-eslint": "^16.0.0", "grunt-eslint": "^16.0.0",
"qs": "^3.1.0" "mime": "^1.3.4",
"qs": "^3.1.0",
"restler": "^3.3.0"
} }
} }

1
types/File.js Symbolic link
View File

@ -0,0 +1 @@
../build/types/File.js