:checkpoint

babelify.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-dirs="server plugins plugin-router plugin-utils test"
+dirs="server plugins router plugin-utils test"
 for path in `find $dirs -name .babelrc | grep -v node_modules`; do
     {
         babel ${path%%.babelrc}src -d ${path%%.babelrc}dist -s true -w

cli/package.json

@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/rethinkdb/horizon#readme",
   "dependencies": {
-    "@horizon/server": "3.0.0-alpha-0",
-    "@horizon/plugin-utils": "3.0.0-alpha-0",
+    "@horizon/server": "3.x",
+    "@horizon/plugin-utils": "3.x",
     "argparse": "^1.0.3",
     "bluebird": "^3.4.1",
     "chalk": "^1.1.3",

client/src/index.js

@@ -5,7 +5,7 @@ import 'rxjs/add/operator/concatMap'
 import 'rxjs/add/operator/map'
 import 'rxjs/add/operator/filter'
 
-import { TermBase } from './ast'
+import { TermBase, addOption } from './ast'
 import { HorizonSocket } from './socket'
 import { authEndpoint, TokenStorage, clearAuthTokens } from './auth'
 import { aggregate, model } from './model'
@@ -54,14 +54,16 @@ function Horizon({
     },
   })
 
+  const request = new TermBase({}, sendRequest)
+
   // This is the object returned by the Horizon function. It's a
   // function so we can construct a collection simply by calling it
   // like horizon('my_collection')
   function horizon(name) {
-    return this.request.collection(name);
+    return request.collection(name);
   }
-  
-  horizon.request = new TermBase({}, sendRequest)
+
+  horizon.request = request;
 
   horizon.currentUser = () =>
     new UserDataTerm(horizon, socket.handshake, socket)
@@ -133,5 +135,6 @@ function subscribeOrObservable(observable) {
 
 Horizon.Socket = HorizonSocket
 Horizon.clearAuthTokens = clearAuthTokens
+Horizon.addOption = addOption
 
 module.exports = Horizon

client/src/socket.js

@@ -110,7 +110,7 @@ export class HorizonSocket extends WebSocketSubject {
   // and cleans up after it when the handshake is cleaned up.
   sendHandshake() {
     if (!this._handshakeSub) {
-      this._handshakeSub = this.makeRequest(this._handshakeMaker())
+      this._handshakeSub = this.makeRequest(this._handshakeMaker(), 'handshake')
         .subscribe({
           next: n => {
             if (n.error) {

examples/express-server/main.js

@@ -2,11 +2,15 @@
 'use strict'
 
 const express = require('express');
-const horizon = require('@horizon/server');
+const horizonRouter = require('@horizon/express-router');
+const horizonDefaultPlugins = require('@horizon-plugins/defaults');
 
 const app = express();
-const http_server = app.listen(8181);
-const options = { auth: { token_secret: 'my_super_secret_secret' } };
-const horizon_server = horizon(http_server, options);
-
+const httpServer = app.listen(8181);
 console.log('Listening on port 8181.');
+
+const hzRouter = horizonRouter(httpServer, {auth: {token_secret: 'hunter2'}});
+
+hzRouter.add(horizonDefaultPlugins).then(() => {
+  console.log('Horizon server ready.');
+});

examples/express-server/package.json

@@ -9,7 +9,9 @@
   "author": "RethinkDB",
   "license": "MIT",
   "dependencies": {
-    "@horizon/server": "^1.0.1",
+    "@horizon/server": "3.x",
+    "@horizon/express-router": "1.x",
+    "@horizon-plugins/defaults": "1.x",
     "express": "^4.13.3"
   },
   "repository": {

examples/hapi-server/main.js

@@ -2,14 +2,24 @@
 'use strict'
 
 const Hapi = require('hapi');
-const horizon = require('@horizon/server');
+const horizonRouter = require('@horizon/hapi-router');
+const horizonDefaultPlugins = require('@horizon-plugins/defaults');
 
 const server = new Hapi.Server();
-server.connection({ port: 8181 });
+server.connection({port: 8181});
+server.start(() => {
+  console.log('Listening on port 8181.');
+});
 
-const http_servers = server.connections.map((c) => c.listener);
-const horizon_server = horizon(http_servers);
+const httpServers = server.connections.map((c) => c.listener);
 
-server.start(() => {
-  console.log(`Listening on port 8181.`);
+const hzRouter = horizonRouter(httpServers, {auth: {token_secret: 'hunter2'}});
+hzRouter.add(horizonDefaultPlugins).then(() => {
+  console.log('Horizon server ready.');
+});
+
+server.route({
+  method: '*',
+  path: '/horizon/{p*}',
+  handler: hzRouter.handler(),
 });

examples/hapi-server/package.json

@@ -9,8 +9,10 @@
   "author": "RethinkDB",
   "license": "MIT",
   "dependencies": {
-    "@horizon/server": "^3.0.0-alpha-0",
-    "hapi": "^12.1.0"
+    "@horizon-plugins/defaults": "1.x",
+    "@horizon/hapi-router": "1.x",
+    "@horizon/server": "3.x",
+    "hapi": "^15.1.1"
   },
   "repository": {
     "type": "git",

examples/http-server/main.js

@@ -0,0 +1,17 @@
+#!/usr/bin/env node
+'use strict'
+
+const express = require('express');
+const horizonRouter = require('@horizon/http-router');
+const horizonDefaultPlugins = require('@horizon-plugins/defaults');
+
+const httpServer = http.createServer();
+httpServer.listen(8181);
+console.log('Listening on port 8181.');
+
+const hzRouter = horizonRouter(httpServer, {auth: {token_secret: 'hunter2'}});
+httpServer.on('request', hzRouter.handler());
+
+hzRouter.add(horizonDefaultPlugins).then(() => {
+  console.log('Horizon server ready.');
+});

examples/http-server/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "basic-http-horizon-example",
+  "version": "0.0.1",
+  "description": "Example of a horizon server within a express server.",
+  "bin": "main.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "RethinkDB",
+  "license": "MIT",
+  "dependencies": {
+    "@horizon/server": "3.x",
+    "@horizon/http-router": "1.x",
+    "@horizon-plugins/defaults": "1.x",
+    "express": "^4.13.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rethinkdb/horizon.git"
+  }
+}

examples/koa-server/package.json

@@ -9,7 +9,9 @@
   "author": "RethinkDB",
   "license": "MIT",
   "dependencies": {
-    "@horizon/server": "^3.0.0-alpha-0",
+    "@horizon/server": "3.x",
+    "@horizon/koa-router": "1.x",
+    "@horizon-plugins/defaults": "1.x",
     "koa": "^1.1.2"
   },
   "repository": {

plugin-utils/package.json

@@ -22,10 +22,10 @@
   },
   "dependencies": {
     "jsonpatch": "^3.0.1",
-    "@horizon/server": "^3.0.0-alpha-0"
+    "@horizon/server": "3.x"
   },
   "peerDependencies": {
-    "@horizon/plugin-router-base": "1.x"
+    "@horizon/base-router": "1.x"
   },
   "devDependencies": {
     "eslint": "^3.1.0",