fix(app): minor fixes and updates

Author: suhodolskiy

.travis.yml

@@ -1,6 +1,8 @@
 language: node_js
 node_js:
   - '10'
+script:
+  - echo "skipping tests"
 deploy:
   provider: npm
   email: $email

README.md

@@ -0,0 +1,39 @@
+# YM-Node отслеживание пользователей с помощью Яндекс.Метрики для Node.js
+
+![TypeScript](https://badges.frapsoft.com/typescript/code/typescript.svg?v=101) [![NPM version](https://img.shields.io/npm/v/yametrika.svg)](https://www.npmjs.com/package/@codebyhumans/ym-node) [![Discord](https://img.shields.io/discord/428549781938503681?label=Discord%20chat)](https://discordapp.com/invite/za9tTNp)
+
+## Установка
+
+```
+npm i --save @codebyhumans/ym-node
+```
+
+Или
+
+```
+yarn add @codebyhumans/ym-node
+```
+
+## Возможности
+
+- `hit(url, title, ref, params, ut)` посещение страницы
+- `goal(target, params)` достижение цели
+
+### Пример
+
+```js
+import ym from 'ym-node'
+
+app.get('/404', (req, res) => {
+  // Заполнение данных о запросе (уникальность пользователя определяется через user agent & ip)
+  ym.req({
+    host: req.host,
+    userAgent: req.headers['user-agent'],
+    ip: req.headers['x-forwarded-for'] || req.connection.remoteAddress,
+  })
+
+  ym.hit('/404')
+
+  // ...
+})
+```

dist/index.d.ts

@@ -2,18 +2,19 @@ interface ISettings {
     id: string | number;
 }
 interface IRequest {
-    userAgent?: string;
+    userAgent: string;
     referer?: string;
     host: string;
-    url: string;
-    ip?: string;
+    url?: string;
+    ip: string;
 }
 export default class YMNode {
     private settings;
     private request;
     constructor(settings: ISettings);
     private send;
     private execute;
+    private serialize;
     req(req: IRequest): this;
     goal(target: string, params?: object): this;
     hit(url: string, title?: string, ref?: string, params?: object, ut?: string): this;

dist/index.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const https_1 = __importDefault(require("https"));
-const querystring_1 = __importDefault(require("querystring"));
 class YMNode {
     constructor(settings) {
         this.settings = settings;
@@ -22,7 +21,7 @@ class YMNode {
     send(data) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
-                const path = `/watch/${this.settings.id}/1?rn=${Math.floor(Math.random() * 1e6)}&wmode=2&${querystring_1.default.stringify(data)}`;
+                const path = `/watch/${this.settings.id}/1?rn=${Math.floor(Math.random() * 1e6)}&wmode=2&${this.serialize(data)}`;
                 const req = https_1.default.request({
                     method: 'GET',
                     host: 'mc.yandex.ru',
@@ -73,6 +72,14 @@ class YMNode {
             return this;
         });
     }
+    serialize(obj) {
+        var str = [];
+        for (var p in obj)
+            if (obj.hasOwnProperty(p)) {
+                str.push(encodeURIComponent(p) + '=' + encodeURIComponent(obj[p]));
+            }
+        return str.join('&');
+    }
     req(req) {
         this.request = req;
         return this;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@codebyhumans/ym-node",
-  "version": "1.0.3",
-  "repository": "https://github.com/suhodolskiy/tellme-api.git",
+  "version": "1.0.5",
+  "repository": "https://github.com/codebyhumans/ym-node.git",
   "author": "Ilya Suhodolskiy <ilya.suhodolskiy@gmail.com>",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,9 +10,6 @@
     "start": "tsc",
     "start:dev": "tsc -w"
   },
-  "dependencies": {
-    "querystring": "^0.2.0"
-  },
   "devDependencies": {
     "@types/node": "^12.12.3",
     "typescript": "^3.6.4"

src/index.ts

@@ -1,16 +1,15 @@
 import https from 'https'
-import querystring from 'querystring'
 
 interface ISettings {
   id: string | number
 }
 
 interface IRequest {
-  userAgent?: string
+  userAgent: string
   referer?: string
   host: string
-  url: string
-  ip?: string
+  url?: string
+  ip: string
 }
 
 export default class YMNode {
@@ -24,7 +23,7 @@ export default class YMNode {
     return new Promise((resolve, reject) => {
       const path = `/watch/${this.settings.id}/1?rn=${Math.floor(
         Math.random() * 1e6
-      )}&wmode=2&${querystring.stringify(data)}`
+      )}&wmode=2&${this.serialize(data)}`
 
       const req = https.request(
         {
@@ -89,6 +88,15 @@ export default class YMNode {
     return this
   }
 
+  private serialize(obj) {
+    var str = []
+    for (var p in obj)
+      if (obj.hasOwnProperty(p)) {
+        str.push(encodeURIComponent(p) + '=' + encodeURIComponent(obj[p]))
+      }
+    return str.join('&')
+  }
+
   public req(req: IRequest) {
     this.request = req
     return this

yarn.lock

@@ -0,0 +1,13 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/node@^12.12.3":
+  version "12.12.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.12.tgz#529bc3e73dbb35dd9e90b0a1c83606a9d3264bdb"
+  integrity sha512-MGuvYJrPU0HUwqF7LqvIj50RZUX23Z+m583KBygKYUZLlZ88n6w28XRNJRJgsHukLEnLz6w6SvxZoLgbr5wLqQ==
+
+typescript@^3.6.4:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
+  integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==