Skip to content
Closed
Show file tree
Hide file tree
Changes from 84 commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
9121baf
Update tested nodejs versions in .travis.yml
gkubisa Apr 18, 2018
4dbefd1
Add .editorconfig
gkubisa Oct 17, 2017
2ef8181
Update mocha
gkubisa Apr 23, 2018
6b687db
Fix Doc.prototype.destroy
gkubisa Apr 18, 2018
1489e36
Fix hasWritePending in op's callback
gkubisa Apr 24, 2018
a4499a5
Implement ephemeral "presence" data sync
gkubisa Apr 16, 2018
33c7264
Execute some callbacks asynchronously
gkubisa Apr 27, 2018
8ff4b33
Don't send presence unnecessarily
gkubisa Apr 30, 2018
0ff380d
Re-sync presence after re-subscribe and re-connect
gkubisa Apr 30, 2018
d67dd6a
Emit presence asynchronously
gkubisa May 1, 2018
e8ec215
Add `submitted` param to `presence` event
gkubisa May 9, 2018
9c291b2
Merge branch 'share/master' into sync-presence
gkubisa Jun 5, 2018
173bf3a
Use the correct variable
gkubisa Jun 13, 2018
054d34d
Small test update
gkubisa Jun 21, 2018
642ded6
Merge branch 'fix-doc-destroy' into sync-presence
gkubisa Jul 12, 2018
56b726b
Make hasPending depend on inflightPresence and pendingPresence
gkubisa Jul 12, 2018
762496a
Remove cached ops without using setTimeout
gkubisa Jul 10, 2018
e4c5e6d
Remove --exit mocha option
gkubisa Jul 20, 2018
428c46a
Workaround for circular dependency
gkubisa Jul 20, 2018
33450ae
Resolve merge conflicts
curran Apr 17, 2019
f43b752
Restore tests to working order
curran Apr 17, 2019
9409429
Remove extraneous .editorconfig
curran Apr 17, 2019
c4cf1b8
Revert extraneous changes in .travis.yml and package.json
curran Apr 17, 2019
237d2ad
Use lolex to make 'expires cached ops' test more stable.
curran Apr 17, 2019
c8d35c5
Move doc.presence to doc.presence.current
curran Apr 17, 2019
3efb82c
Move doc.receivedPresence to doc.presence.received
curran Apr 17, 2019
f0451e3
Move doc.requestReplyPresence to doc.presence.requestReply
curran Apr 17, 2019
5217635
Move doc.cachedOps to doc.presence.cachedOps
curran Apr 17, 2019
ac26dae
Move doc.inflightPresenceSeq to doc.presence.inflightSeq
curran Apr 17, 2019
48acccc
Move doc.inflightPresence to doc.presence.inflight
curran Apr 17, 2019
cab69fb
Move doc.pendingPresence to doc.presence.pending
curran Apr 17, 2019
6a0ecc4
Refactor presence fields into object declaration.
curran Apr 17, 2019
d41c961
Simplify object creation; 'change Object.create(null)' to '{}'.
curran Apr 17, 2019
fc351fa
Introduce enablePresence option. Closes #128
curran Apr 17, 2019
6cd16f3
Misc cleanup, finishing touches.
curran Apr 17, 2019
ad6a528
Split out presence methods into separate module
curran Apr 17, 2019
eaafc98
Move more presence-related logic into presence methods module.
curran Apr 17, 2019
7259f7e
Move presence methods such that they are passed into Backend
curran Apr 18, 2019
09f6415
Migrate hardRollbackPresence to presence instance
curran Apr 18, 2019
23a06c3
Migrate _initializePresence
curran Apr 18, 2019
824346f
Migrate _handlePresence
curran Apr 18, 2019
d6e3e3d
Migrate _processReceivedPresence
curran Apr 18, 2019
0382c03
Migrate processAllReceivedPresence
curran Apr 18, 2019
46d8a1b
Migrate _transformPresence
curran Apr 18, 2019
fc16be7
Migrate pausePresence
curran Apr 18, 2019
9cb5564
Migrate cacheOp
curran Apr 18, 2019
6461a79
Migrate flushPresence
curran Apr 18, 2019
2358022
Migrate transformAllPresence
curran Apr 18, 2019
41a4743
Migrate emitPresence
curran Apr 18, 2019
ba7d880
Migrate submitPresence
curran Apr 18, 2019
3ffd1ab
Migrate _setPresence
curran Apr 18, 2019
6114bad
Clean up intermediate migration steps
curran Apr 18, 2019
19446cd
Convert StatelessPresence to a class
curran Apr 18, 2019
0089f80
Convert StatelessPresence into idiomatic JS class.
curran Apr 18, 2019
2054057
Add test case that doc invokes presence.destroy inside doc.destroy
curran Apr 18, 2019
1a64a06
Introduce DummyPresence, use it by default
curran Apr 18, 2019
47193da
Remove if(this.presence) guards.
curran Apr 18, 2019
b23661c
Optimize cacheOp
curran Apr 18, 2019
521f77b
Split out getPendingPresence logic from hardRollbackPresence.
curran Apr 18, 2019
bdb6424
Clean up DummyPresence
curran Apr 18, 2019
0f3084a
Introduce Presence base class inherited by DummyPresence and Stateles…
curran Apr 18, 2019
41cd2ea
Add Presence base class module
curran Apr 19, 2019
986a695
Start disentangling presence logic from Agent
curran Apr 19, 2019
ac55884
Migrate Agent._createPresence
curran Apr 19, 2019
9187b34
Migrate subscribeToStream
curran Apr 19, 2019
7507731
Migrate _subscribeToQuery
curran Apr 19, 2019
1a1f52a
Migrate handlePresenceMessage
curran Apr 19, 2019
49ff5c2
Use only flushPresence(), not flush(), _handleSubscribe
curran Apr 19, 2019
87aa90b
Disentangle doc internals from flushPresence
curran Apr 19, 2019
2198e8e
Begin disentangling presence logic from connection.js
curran Apr 19, 2019
cf0168d
Decouple sendPresence
curran Apr 19, 2019
4c46a05
Move Presence class to presence.DocPresence
curran Apr 19, 2019
f0b7b97
Rename doc.presence to doc._docPresence
curran Apr 19, 2019
db39b69
Move doc._docPresence.current back to original API doc.presence.
curran Apr 19, 2019
60a567b
Split out implementation of ConnectionPresence.
curran Apr 19, 2019
8b6872e
Refactor ConnectionPresence to idiomatic JS class.
curran Apr 19, 2019
55e1a4d
Split out implementation of AgentPresence.
curran Apr 19, 2019
7a79d98
Refactor AgentPresence to idiomatic JS class.
curran Apr 19, 2019
693492d
Unify isPresenceMessage between ConnectionPresence and AgentPresence
curran Apr 19, 2019
538c3c1
Update README to document presence API
curran Apr 19, 2019
963affa
Iterate README
curran Apr 19, 2019
810175e
Minor cleanup
curran Apr 19, 2019
0724fd7
Migrate backend presence logic to decoupled BackendPresence class.
curran Apr 19, 2019
7af8427
Finishing touches
curran Apr 19, 2019
910b384
fix: repair broken link
severo May 2, 2019
ca4816f
Merge pull request #289 from severo/master
ericyhwang May 3, 2019
406d4e0
Update logger.js
qinyang912 May 9, 2019
7c729d7
fix: change the default logger
qinyang912 May 10, 2019
b0d4277
Merge pull request #290 from qinyang912/master
ericyhwang May 15, 2019
65ce131
1.0.0-beta.23
ericyhwang May 15, 2019
f09ad62
Update rest of examples to @teamwork/websocket-json-stream
ericyhwang May 15, 2019
1ff8798
Merge pull request #291 from share/examples-ws-update
nateps May 15, 2019
2fb0637
Fix broken status indication in textarea example
hamoid May 19, 2019
d210133
Merge pull request #292 from hamoid/patch-1
ericyhwang May 20, 2019
95ae394
Allow options to be passed for `fetch` and `getOps`
May 23, 2019
0b65164
Merge pull request #215 from alecgibson/getops-options
alecgibson Jul 4, 2019
1a7bc3e
Move from `jshint` to `eslint`
Jul 4, 2019
8a05619
Fix indentation linting
Jul 4, 2019
a551de3
Extend Google's ESLint config
Jul 15, 2019
3dfc938
Use `.gitignore` for defining ESLint's ignore pattern
Jul 15, 2019
df5a466
Reset `no-unused-vars` linting rule to default
Jul 15, 2019
40abc17
Review markups
Jul 15, 2019
9851465
Merge pull request #302 from share/eslint
nateps Jul 17, 2019
5cc30e6
Merge: Update branch 'presence-continuation-2' of https://github.com/…
ericyhwang Jul 17, 2019
14b0d31
eslint --fix, plus a bit of manual line wrapping to get under 120 chars
ericyhwang Jul 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ coverage
# Dependency directories
node_modules
package-lock.json
yarn.lock
jspm_packages
33 changes: 33 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tracker](https://github.com/share/sharedb/issues).

- Realtime synchronization of any JSON document
- Concurrent multi-user collaboration
- Realtime synchronization of any ephemeral "presence" data
- Synchronous editing API with asynchronous eventual consistency
- Realtime query subscriptions
- Simple integration with any database - [MongoDB](https://github.com/share/sharedb-mongo), [PostgresQL](https://github.com/share/sharedb-postgres) (experimental)
Expand Down Expand Up @@ -73,6 +74,22 @@ initial data. Then you can submit editing operations on the document (using
OT). Finally you can delete the document with a delete operation. By
default, ShareDB stores all operations forever - nothing is truly deleted.

## User Presence Synchronization

ShareDB supports synchronization of user presence data such as cursor positions and text selections. This feature is opt-in, not enabled by default. To enable this feature, pass a presence implementation as the `presence` option to the ShareDB constructor.

ShareDB includes an implementation of presence called `StatelessPresence`. This provides an implementation of presence that works out of the box, but it has some scalability problems. Each time a client joins a document, this implementation requests current presence information from all other clients, via the server. This approach may be problematic in terms of performance when a large number of users are present on the same document simultaneously. If you don't expect too many simultaneous users per document, `StatelessPresence` should work well. The server does not store any state at all regarding presence (it exists only in clients), hence the name "Stateless Presence".

In `StatelessPresence`, presence data represents a user and is automatically synchronized between all clients subscribed to the same document. Its format is defined by the document's [OT Type](https://github.com/ottypes/docs) (specifically, by [`transformPresence`, `createPresence`, and `comparePresence`](https://github.com/teamwork/ot-docs#optional-properties)). All clients can modify their own presence data and receive a read-only version of other client's data. Presence data is automatically cleared when a client unsubscribes from the document or disconnects. It is also automatically transformed against applied operations, so that it still makes sense in the context of a modified document, for example a cursor position may be automatically advanced when a user types at the beginning of a text document.

To use `StatelessPresence`, pass it into the ShareDB constructor like this:

```js
var ShareDB = require('sharedb');
var statelessPresence = require('sharedb/lib/presence/stateless');
var share = new ShareDB({ presence: statelessPresence })`).
```

## Server API

### Initialization
Expand All @@ -91,6 +108,8 @@ __Options__
* `options.pubsub` _(instance of `ShareDB.PubSub`)_
Notify other ShareDB processes when data changes
through this pub/sub adapter. Defaults to `ShareDB.MemoryPubSub()`.
* `options.presence` _(implementation of presence classes)_
Enable user presence synchronization. The value of `options.presence` option is expected to contain implementations of the classes `DocPresence`, `ConnectionPresence`, `AgentPresence`, and `BackendPresence`. Logic related to presence is encapsulated within these classes, so it is possible develop additional third party presence implementations external to ShareDB.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this API. It feels atypical both of normal JS, and also of this library. I think I'd rather pass in a single presence object which exposes API methods, much like the DB adapters.


#### Database Adapters
* `ShareDB.MemoryDB`, backed by a non-persistent database with no queries
Expand Down Expand Up @@ -308,6 +327,9 @@ Unique document ID
`doc.data` _(Object)_
Document contents. Available after document is fetched or subscribed to.

`doc.presence` _(Object)_
Each property under `doc.presence` contains presence data shared by a client subscribed to this document. The property name is an empty string for this client's data and connection IDs for other clients' data. The structure of the presence object is defined by the OT type of the document (for example, in [ot-rich-text](https://github.com/Teamwork/ot-rich-text#presence) and [@datavis-tech/json0](https://github.com/datavis-tech/json0#presence)).
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I agree with handing this off to the types, because:

  • I'm not sure it's strictly part of "OT", and it feels like a violation of Single Responsibility
  • This relies on us being able to update the type libraries (can we?)
  • There are potentially multiple desired implementations for a given type. Especially if you consider - for example - json0, which can sub-type other arbitrary types. What is a "generic" shape for this presence?

To me, it feels more natural for us to define some sort of separate presence transformers, probably being passed in to the presence constructor option?


`doc.fetch(function(err) {...})`
Populate the fields on `doc` with a snapshot of the document from the server.

Expand Down Expand Up @@ -337,6 +359,9 @@ An operation was applied to the data. `source` will be `false` for ops received
`doc.on('del', function(data, source) {...})`
The document was deleted. Document contents before deletion are passed in as an argument. `source` will be `false` for ops received from the server and defaults to `true` for ops generated locally.

`doc.on('presence', function(srcList, submitted) {...})`
Presence data has changed. `srcList` is an Array of `doc.presence` property names for which values have changed. `submitted` is `true`, if the event is the result of new presence data being submitted by the local or remote user, otherwise it is `false` - eg if the presence data was transformed against an operation or was cleared on unsubscribe, disconnect or roll-back.

`doc.on('error', function(err) {...})`
There was an error fetching the document or applying an operation.

Expand Down Expand Up @@ -370,6 +395,11 @@ Invokes the given callback function after

Note that `whenNothingPending` does NOT wait for pending `model.query()` calls.

`doc.submitPresence(presenceData[, function(err) {...}])`
Set local presence data and publish it for other clients.
`presenceData` structure depends on the document type.
Presence is synchronized only when subscribed to the document.

### Class: `ShareDB.Query`

`query.ready` _(Boolean)_
Expand Down Expand Up @@ -467,6 +497,9 @@ Additional fields may be added to the error object for debugging context dependi
* 4022 - Database adapter does not support queries
* 4023 - Cannot project snapshots of this type
* 4024 - Invalid version
* 4025 - Not subscribed to document
* 4026 - Presence data superseded
* 4027 - OT Type does not support presence

### 5000 - Internal error

Expand Down
13 changes: 13 additions & 0 deletions lib/agent.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ var hat = require('hat');
var util = require('./util');
var types = require('./types');
var logger = require('./logger');
var ShareDBError = require('./error');

/**
* Agent deserializes the wire protocol messages received from the stream and
Expand All @@ -26,6 +27,8 @@ function Agent(backend, stream) {
// Map from queryId -> emitter
this.subscribedQueries = {};

this._agentPresence = new backend.presence.AgentPresence(this);

// We need to track this manually to make sure we don't reply to messages
// after the stream was closed.
this.closed = false;
Expand Down Expand Up @@ -106,6 +109,10 @@ Agent.prototype._subscribeToStream = function(collection, id, stream) {
logger.error('Doc subscription stream error', collection, id, data.error);
return;
}
if (agent._agentPresence.isPresenceMessage(data)) {
agent._agentPresence.processPresenceData(data);
return;
}
if (agent._isOwnOp(collection, data)) return;
agent._sendOp(collection, id, data);
});
Expand All @@ -117,6 +124,7 @@ Agent.prototype._subscribeToStream = function(collection, id, stream) {
if (util.hasKeys(streams)) return;
delete agent.subscribedDocs[collection];
});
this._agentPresence.subscribeToStream(collection, id, stream);
};

Agent.prototype._subscribeToQuery = function(emitter, queryId, collection, query) {
Expand Down Expand Up @@ -288,6 +296,8 @@ Agent.prototype._checkRequest = function(request) {
// Bulk request
if (request.c != null && typeof request.c !== 'string') return 'Invalid collection';
if (typeof request.b !== 'object') return 'Invalid bulk subscribe data';
} else {
return this._agentPresence.checkRequest(request);
}
};

Expand Down Expand Up @@ -325,6 +335,9 @@ Agent.prototype._handleMessage = function(request, callback) {
case 'nt':
return this._fetchSnapshotByTimestamp(request.c, request.d, request.ts, callback);
default:
if (this._agentPresence.isPresenceMessage(request)) {
return this._agentPresence.handlePresenceMessage(request, callback);
}
callback({code: 4000, message: 'Invalid or unknown message'});
}
} catch (err) {
Expand Down
16 changes: 16 additions & 0 deletions lib/backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ var Snapshot = require('./snapshot');
var StreamSocket = require('./stream-socket');
var SubmitRequest = require('./submit-request');
var types = require('./types');
var dummyPresence = require('./presence/dummy');

var warnDeprecatedDoc = true;
var warnDeprecatedAfterSubmit = true;
Expand Down Expand Up @@ -48,6 +49,10 @@ function Backend(options) {
if (!options.disableSpaceDelimitedActions) {
this._shimAfterSubmit();
}

this.presence = options.presence || dummyPresence;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for having this off by default? Performance?


this._backendPresence = new this.presence.BackendPresence(this);
}
module.exports = Backend;
emitter.mixin(Backend);
Expand Down Expand Up @@ -155,6 +160,13 @@ Backend.prototype.connect = function(connection, req) {
// not used internal to ShareDB, but it is handy for server-side only user
// code that may cache state on the agent and read it in middleware
connection.agent = agent;

// Expose the DocPresence passed in through the constructor
// to the Doc class, which has access to the connection.
connection.DocPresence = this.presence.DocPresence;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will only work when the client and the server are on the same box. It's not going to work for the mainline case, where the client resides on a remote machine, and we can't directly access Doc from Backend.


connection._connectionPresence = new this.presence.ConnectionPresence(connection);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I stated above, I don't think this looks "normal". I'd possibly expect something more along the lines of:

presence = this.presence.connectionPresence(connection);


return connection;
};

Expand Down Expand Up @@ -720,6 +732,10 @@ Backend.prototype._buildSnapshotFromOps = function (id, startingSnapshot, ops, c
callback(error, snapshot);
};

Backend.prototype.sendPresence = function(presence, callback) {
this._backendPresence.sendPresence(presence, callback);
};

function pluckIds(snapshots) {
var ids = [];
for (var i = 0; i < snapshots.length; i++) {
Expand Down
6 changes: 6 additions & 0 deletions lib/client/connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ Connection.prototype.handleMessage = function(message) {
return;

default:
if (this._connectionPresence.isPresenceMessage(message)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't like leaning on default for this - why can't we give it its own message type?

return this._connectionPresence.handlePresenceMessage(err, message);
}
logger.warn('Ignoring unrecognized message', message);
}
};
Expand Down Expand Up @@ -424,6 +427,9 @@ Connection.prototype.sendOp = function(doc, op) {
this.send(message);
};

Connection.prototype.sendPresence = function(doc, data, requestReply) {
this._connectionPresence.sendPresence(doc, data, requestReply);
};

/**
* Sends a message down the socket
Expand Down
Loading