upgrade dependencies, preapre for migration to plugin seed

Author: naderio

.gitignore

@@ -8,9 +8,9 @@ demo/node_modules
 *.map
 *.d.ts
 !references.d.ts
-!common.d.ts
 !helpers.d.ts
-!socket.d.ts
+!socketio.common.d.ts
+!index.d.ts
 !typings/*
 typings-*
 out

.npmignore

@@ -1,10 +1,10 @@
 demo/
 demo.server/
+*.map
 *.ts
-!common.d.ts
+!socketio.common.d.ts
 !helpers.d.ts
-!socket.d.ts
-*.map
+!index.d.ts
 *.json
 *.log
 .tmp

README.md

@@ -1,53 +1,62 @@
 nativescript-socket.io
 ======================
 
-Socket.io implementation in NativeScript.
+Socket.IO fully-featured and compliant client implementation for NativeScript.
 
-# State
+# Status
 
-Android and iOS implementations are stable and in sync.
+![Status](https://img.shields.io/badge/status-production--ready-green.svg)
+[![npm](https://img.shields.io/npm/l/nativescript-socket.io.svg?maxAge=1000)](https://github.com/naderio/nativescript-socket.io/blob/master/LICENSE.md)
+[![npm](https://img.shields.io/npm/v/nativescript-socket.io.svg?maxAge=1000)](https://www.npmjs.com/package/nativescript-socket.io)
+[![dependency Status](https://img.shields.io/david/naderio/nativescript-socket.io.svg?maxAge=1000)](https://david-dm.org/naderio/nativescript-socket.io)
+[![devDependency Status](https://img.shields.io/david/dev/naderio/nativescript-socket.io.svg?maxAge=1000)](https://david-dm.org/naderio/nativescript-socket.io)
+[![devDependency Status](https://img.shields.io/david/peer/naderio/nativescript-socket.io.svg?maxAge=1000)](https://david-dm.org/naderio/nativescript-socket.io)
+[![Build Status](https://travis-ci.org/naderio/nativescript-socket.io.svg?branch=master)](https://travis-ci.org/naderio/nativescript-socket.io)
+[![npm](https://img.shields.io/npm/dt/nativescript-socket.io.svg?maxAge=1000)](https://www.npmjs.com/package/nativescript-socket.io)
+
+This library is production-ready. Both Android and iOS implementations are stable and in sync.
 
 Please check [releases and changelog](https://github.com/naderio/nativescript-socket.io/releases) and [roadmap](https://github.com/naderio/nativescript-socket.io/issues/3) for more information.  
 
 # Dependencies
 
 Android: [Socket.IO-client Java](https://github.com/socketio/socket.io-client-java) v1.*
 
-iOS: [Socket.IO-Client-Swift](https://github.com/socketio/socket.io-client-swift) v11.*
+iOS: [Socket.IO-Client-Swift](https://github.com/socketio/socket.io-client-swift) v12.*
 
 # Install
 
-```
+```sh
 tns plugin add nativescript-socket.io
 ```
 
 # Usage
 
-```
-var SocketIO = require('nativescript-socket.io');
+```javascript
+const SocketIO = require('nativescript-socket.io');
 
 SocketIO.enableDebug(); // optionnal
 
 // or use your own debug function
 // SocketIO.enableDebug(myCustomDebugFunction);
 
-var options = {
+const options = {
   query: {
     token: 'SOME_TOKEN_HERE',
   },
 };
 
-var socket = SocketIO.connect('http://somewhere/namespace', options);
+const socketio = SocketIO.connect('http://somewhere/namespace', options);
 
-socket.on('connect', function(){
+socketio.on('connect', function(){
   console.log('connect');
 });
 
-socket.on('hello', function(){
+socketio.on('hello', function(){
   console.log('hello', arguments);
 });
 
-socket.on('request', function(info, ack){
+socketio.on('request', function(info, ack){
   console.log('request', info);
   if (info === 'datetime') {
     ack(new Date());
@@ -58,11 +67,11 @@ socket.on('request', function(info, ack){
   }
 });
 
-socket.emit('hello', {
+socketio.emit('hello', {
   username: 'someone',
 });
 
-socket.emit('hello-ack', {
+socketio.emit('hello-ack', {
   username: 'someone',
 }, function ack(){
   console.log('hello-ack', arguments);
@@ -72,23 +81,28 @@ socket.emit('hello-ack', {
 
 ## Usage with TypeScript
 
-import using either of
+import using either of the following:
+
+```typescript
+import * as SocketIO from "nativescript-socket.io"`
 
-* `import * as SocketIO from "nativescript-socket.io"`
-* `var SocketIO = require("nativescript-socket.io")`
+// OR
+
+const SocketIO = require("nativescript-socket.io")
+```
 
 # Demo
 
 first start the socket.io demo server
 
-```
+```sh
 cd ./demo/server
 npm start
 ```
 
 then build and run the app
 
-```
+```sh
 cd ./demo
 tns run android
 ```

demo.server/index.js

@@ -1,7 +1,7 @@
 // this is a test server to support tests which make requests
 
-var io = require('socket.io');
-var server = io(process.env.ZUUL_PORT || 3210, { pingInterval: 2000 });
+var socketio = require('socket.io');
+var server = socketio(process.env.ZUUL_PORT || 3210, { pingInterval: 2000 });
 var expect = require('expect.js');
 
 var debug = require('./debug')('socket.io');
@@ -22,126 +22,126 @@ server.of('/asd').on('connection', function() {
     // register namespace
 });
 
-server.of('/demo').on('connection', function(socket) {
+server.of('/demo').on('connection', function(soc) {
     debug('connect');
 
-    // debug('socket.handshake', socket.handshake);
+    // debug('soc.handshake', soc.handshake);
 
-    debug('socket.request._query', socket.request._query);
+    debug('soc.request._query', soc.request._query);
 
     // simple test
-    socket.on('hi', function() {
+    soc.on('hi', function() {
         args = Array.prototype.slice.call(arguments);
         debug('on', 'hi', JSON.stringify(Array.from(arguments), null, 2));
         args.unshift('hi');
-        socket.emit.apply(socket, args);
+        soc.emit.apply(soc, args);
     });
 
     // ack tests
-    socket.on('ack', function() {
+    soc.on('ack', function() {
         debug('on', 'ack', JSON.stringify(Array.from(arguments), null, 2));
-        socket.emit('ack', function(a, b) {
+        soc.emit('ack', function(a, b) {
             debug('on', 'ack', 'ack', JSON.stringify(Array.from(arguments), null, 2));
             if (a === 5 && b.test) {
-                socket.emit('got it');
+                soc.emit('got it');
             }
         });
     });
 
-    socket.on('getAckDate', function(data, cb) {
+    soc.on('getAckDate', function(data, cb) {
         debug('on', 'getAckDate', JSON.stringify(Array.from(arguments), null, 2));
         cb(new Date('2017-01-01'));
     });
 
-    socket.on('getDate', function() {
+    soc.on('getDate', function() {
         debug('on', 'getDate', JSON.stringify(Array.from(arguments), null, 2));
-        socket.emit('takeDate', new Date('2017-01-01'));
+        soc.emit('takeDate', new Date('2017-01-01'));
     });
 
-    socket.on('getDateObj', function() {
+    soc.on('getDateObj', function() {
         debug('on', 'getDateObj', JSON.stringify(Array.from(arguments), null, 2));
-        socket.emit('takeDateObj', { date: new Date('2017-01-01') });
+        soc.emit('takeDateObj', { date: new Date('2017-01-01') });
     });
 
-    socket.on('getUtf8', function() {
+    soc.on('getUtf8', function() {
         debug('on', 'getUtf8', JSON.stringify(Array.from(arguments), null, 2));
-        socket.emit('takeUtf8', 'てすと');
-        socket.emit('takeUtf8', 'Я Б Г Д Ж Й');
-        socket.emit('takeUtf8', 'Ä ä Ü ü ß');
-        socket.emit('takeUtf8', 'utf8 — string');
-        socket.emit('takeUtf8', 'utf8 — string');
+        soc.emit('takeUtf8', 'てすと');
+        soc.emit('takeUtf8', 'Я Б Г Д Ж Й');
+        soc.emit('takeUtf8', 'Ä ä Ü ü ß');
+        soc.emit('takeUtf8', 'utf8 — string');
+        soc.emit('takeUtf8', 'utf8 — string');
     });
 
     // false test
-    socket.on('false', function() {
-        socket.emit('false', false);
+    soc.on('false', function() {
+        soc.emit('false', false);
     });
 
     // binary test
-    socket.on('doge', function() {
+    soc.on('doge', function() {
         var buf = new Buffer('asdfasdf', 'utf8');
-        socket.emit('doge', buf);
+        soc.emit('doge', buf);
     });
 
     // expect receiving binary to be buffer
-    socket.on('buffa', function(a) {
-        if (Buffer.isBuffer(a)) socket.emit('buffack');
+    soc.on('buffa', function(a) {
+        if (Buffer.isBuffer(a)) soc.emit('buffack');
     });
 
     // expect receiving binary with mixed JSON
-    socket.on('jsonbuff', function(a) {
+    soc.on('jsonbuff', function(a) {
         expect(a.hello).to.eql('lol');
         expect(Buffer.isBuffer(a.message)).to.be(true);
         expect(a.goodbye).to.eql('gotcha');
-        socket.emit('jsonbuff-ack');
+        soc.emit('jsonbuff-ack');
     });
 
     // expect receiving buffers in order
     var receivedAbuff1 = false;
-    socket.on('abuff1', function(a) {
+    soc.on('abuff1', function(a) {
         expect(Buffer.isBuffer(a)).to.be(true);
         receivedAbuff1 = true;
     });
-    socket.on('abuff2', function(a) {
+    soc.on('abuff2', function(a) {
         expect(receivedAbuff1).to.be(true);
-        socket.emit('abuff2-ack');
+        soc.emit('abuff2-ack');
     });
 
     // expect sent blob to be buffer
-    socket.on('blob', function(a) {
-        if (Buffer.isBuffer(a)) socket.emit('back');
+    soc.on('blob', function(a) {
+        if (Buffer.isBuffer(a)) soc.emit('back');
     });
 
     // expect sent blob mixed with json to be buffer
-    socket.on('jsonblob', function(a) {
+    soc.on('jsonblob', function(a) {
         expect(a.hello).to.eql('lol');
         expect(Buffer.isBuffer(a.message)).to.be(true);
         expect(a.goodbye).to.eql('gotcha');
-        socket.emit('jsonblob-ack');
+        soc.emit('jsonblob-ack');
     });
 
     // expect blobs sent in order to arrive in correct order
     var receivedblob1 = false;
     var receivedblob2 = false;
-    socket.on('blob1', function(a) {
+    soc.on('blob1', function(a) {
         expect(Buffer.isBuffer(a)).to.be(true);
         receivedblob1 = true;
     });
-    socket.on('blob2', function(a) {
+    soc.on('blob2', function(a) {
         expect(receivedblob1).to.be(true);
         expect(a).to.eql('second');
         receivedblob2 = true;
     });
-    socket.on('blob3', function(a) {
+    soc.on('blob3', function(a) {
         expect(Buffer.isBuffer(a)).to.be(true);
         expect(receivedblob1).to.be(true);
         expect(receivedblob2).to.be(true);
-        socket.emit('blob3-ack');
+        soc.emit('blob3-ack');
     });
 
     // emit buffer to base64 receiving browsers
-    socket.on('getbin', function() {
+    soc.on('getbin', function() {
         var buf = new Buffer('asdfasdf', 'utf8');
-        socket.emit('takebin', buf);
+        soc.emit('takebin', buf);
     });
 });

demo.server/package.json

@@ -9,6 +9,6 @@
   "license": "ISC",
   "dependencies": {
     "expect.js": "^0.3.1",
-    "socket.io": "^2.0.3"
+    "socket.io": "^2.0.4"
   }
 }

demo/app/connection.ts

@@ -3,7 +3,7 @@
 import * as SocketIO from 'nativescript-socket.io';
 // import * as SocketIO from './dev';
 
-export var socket = SocketIO.connect('http://192.168.1.111:3210/demo', <SocketIO.SocketOptions>{
+export var socketio = SocketIO.connect('http://192.168.1.111:3210/demo', <SocketIO.SocketOptions>{
     // log: true,
     // secure: false,
     // forceWebsockets: true,