Use libubsub to provide API rather than self-integrating. Bump version to 1.0

Author: zix99

README.md

@@ -4,10 +4,9 @@
 [![npm](https://img.shields.io/npm/v/ubsub.svg)](https://www.npmjs.com/package/ubsub)
 [![npm](https://img.shields.io/npm/l/ubsub.svg)](https://www.npmjs.com/package/ubsub)
 
-The ubsub-client is a nodejs module to easily connect to send and receive events from [UbSub](https://ubsub.io) using sockets and https.
+The ubsub-client is a nodejs module to easily connect to send and receive events from [UbSub](https://ubsub.io) using sockets and https via CLI.
 
-It also provides convenient wrappers to forward HTTP connections behind a NAT, to easily give you an endpoint to forward
-events from the public internet to a local network.
+**NOTICE:** This package is now ONLY the cli.  API and streaming functions have been broken out into [libubsub](https://github.com/ubsub/libubsub)
 
 # Using
 
@@ -94,46 +93,6 @@ Other useful commands include things like:
 For a full list of features, run: `ubsub --help`
 
 
-## Installing for App Use
-
-Installing into your project:
-
-```bash
-npm install --save ubsub
-```
-
-See [examples/](examples/) for some sample uses.
-
-### Listening to a Topic
-
-```js
-const ubsub = require('ubsub')(<user id>, <user secret>, [opts]);
-
-ubsub.listen(<topic id>, (event, rawSocketEvent ) => {
-	console.log('received event ' + JSON.stringify(event));
-});
-```
-
-### Forwarding a Topic to an HTTP endpoint
-
-```js
-const ubsub = require('ubsub')(<user id>, <user secret>, [opts]);
-
-ubsub.forward(<topic id>, 'http://localhost:5000', {..optional axios opts..});
-```
-
-### Sending an Event
-```js
-const ubsub = require('ubsub')(<user id>, <user secret>, [opts]);
-
-ubsub.send('topicId', 'key'/null, { payload: 123 }, [method = 'POST']);
-```
-
-## Options
-
-`reconnectOnError`: Whether or not to reconnect on a fatal error. This is separate from the default SocketIO reconnect. (default: true)
-
-`reconnectOnErrorDelay`: Number of milliseconds to delay the reconnect on error (default: 5000)
 
 # License
 

cmds/authUtil.js

@@ -2,7 +2,7 @@ const os = require('os');
 const fs = require('fs');
 const chalk = require('chalk');
 const _ = require('lodash');
-const Ubsub = require('../index');
+const Ubsub = require('libubsub').streaming;
 
 const CONFIG_PATH = `${os.homedir()}/.ubsub`;
 

cmds/forward.js

@@ -32,6 +32,8 @@ exports.handler = function cmdForward(args) {
             },
           }).then(resp => {
             console.error(chalk.blue(`  Received ${resp.status}`));
+          }).catch(err => {
+            console.error(chalk.red(err.message));
           });
         });
     }).catch(catchError);

cmds/login.js

@@ -1,6 +1,6 @@
 const inquirer = require('inquirer');
 const chalk = require('chalk');
-const Ubsub = require('../index');
+const Ubsub = require('libubsub').streaming;
 const authUtil = require('./authUtil');
 
 exports.command = 'login';

cmds/webhook.js

@@ -23,25 +23,25 @@ exports.handler = function cmdWebhook(args) {
   const api = assertGetClient(args).getApi();
   return api.createTopic(args.name || `Webhook${~~(Math.random() * 1000)}`, !args.keyless)
     .then(topic => {
-      const sock = cmdForward(_.assign({
+      cmdForward(_.assign({
         topic: topic.id,
-      }, args));
+      }, args)).then(sock => {
+        const url = `${api.routerUrl()}/event/${topic.id}${topic.key ? `?key=${topic.key}` : ''}`;
+        console.error(`${chalk.bold('Endpoint')}: ${chalk.underline(url)}`);
 
-      const url = `${api.routerUrl()}/event/${topic.id}${topic.key ? `?key=${topic.key}` : ''}`;
-      console.error(`${chalk.bold('Endpoint')}: ${chalk.underline(url)}`);
-
-      // Hook on to SIGINT for cleanup
-      process.on('SIGINT', () => {
-        sock.close();
-        if (!args.keep) {
-          console.error('Deleting topic...');
-          api.deleteTopic(topic.id)
-            .then(() => process.exit(0))
-            .catch(err => {
-              console.error(err.message);
-              process.exit(1);
-            });
-        } else process.exit(0);
+        // Hook on to SIGINT for cleanup
+        process.on('SIGINT', () => {
+          sock.close();
+          if (!args.keep) {
+            console.error('Deleting topic...');
+            api.deleteTopic(topic.id)
+              .then(() => process.exit(0))
+              .catch(err => {
+                console.error(err.message);
+                process.exit(1);
+              });
+          } else process.exit(0);
+        });
       });
     });
 };