Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
54529ab1e7 | ||
|
|
e165c5ee2a | ||
|
|
7b3693aff3 | ||
|
|
f75f47646b | ||
|
|
64044123e3 | ||
|
|
a286162ace | ||
|
|
f739f3b5d7 | ||
|
|
f2052f95f8 | ||
|
|
81324dc7d4 | ||
|
|
6599cb20b4 | ||
|
|
74ed9e4107 | ||
|
|
ef6d63c19a | ||
|
|
941dd36e74 |
@@ -2,7 +2,7 @@
|
|||||||
<html>
|
<html>
|
||||||
<body>
|
<body>
|
||||||
<textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
|
<textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
|
||||||
<script src="../bower_components/yjs/y.js"></script>
|
<script src="../bower_components/yjs/y.es6"></script>
|
||||||
<script src="./index.js"></script>
|
<script src="./index.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ We already provide abstract data types for
|
|||||||
|[map](https://github.com/y-js/y-map) | A shared Map implementation. Maps from text to any stringify-able object |
|
|[map](https://github.com/y-js/y-map) | A shared Map implementation. Maps from text to any stringify-able object |
|
||||||
|[array](https://github.com/y-js/y-array) | A shared Array implementation |
|
|[array](https://github.com/y-js/y-array) | A shared Array implementation |
|
||||||
|[xml](https://github.com/y-js/y-xml) | An implementation of the DOM. You can create a two way binding to Browser DOM objects |
|
|[xml](https://github.com/y-js/y-xml) | An implementation of the DOM. You can create a two way binding to Browser DOM objects |
|
||||||
|[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to textareas, input elements, or HTML elements (e.g. *<h1/>*, or *<p/>*). Also supports the [Ace Editor](https://ace.c9.io) |
|
|[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to textareas, input elements, or HTML elements (e.g. <*h1*>, or <*p*>). Also supports the [Ace Editor](https://ace.c9.io) |
|
||||||
|[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to the [Quill Rich Text Editor](http://quilljs.com/)|
|
|[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to the [Quill Rich Text Editor](http://quilljs.com/)|
|
||||||
|
|
||||||
Yjs supports P2P message propagation, and is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.
|
Yjs supports P2P message propagation, and is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.
|
||||||
@@ -49,7 +49,7 @@ Install yjs and its modules with [bower](http://bower.io/), or with [npm](https:
|
|||||||
|
|
||||||
### Bower
|
### Bower
|
||||||
```
|
```
|
||||||
bower install yjs
|
bower install yjs --save
|
||||||
```
|
```
|
||||||
Then you include the libraries directly from the installation folder.
|
Then you include the libraries directly from the installation folder.
|
||||||
```
|
```
|
||||||
|
|||||||
16
bower.json
16
bower.json
@@ -1,19 +1,19 @@
|
|||||||
{
|
{
|
||||||
"name": "yjs",
|
"name": "yjs",
|
||||||
"version": "0.8.16",
|
"version": "9.0.1",
|
||||||
"homepage": "y-js.org",
|
"homepage": "y-js.org",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
"Kevin Jahns <kevin.jahns@rwth-aachen.de>"
|
||||||
],
|
],
|
||||||
"description": "A Framework that enables Real-Time collaboration on arbitrary data structures.",
|
"description": "A Framework for shared editing on any data",
|
||||||
"main": "y.js",
|
"main": "./y.js",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"OT",
|
"OT",
|
||||||
"collaboration",
|
"Collaboration",
|
||||||
"synchronization",
|
"Synchronization",
|
||||||
"sharejs",
|
"Sharejs",
|
||||||
"coweb",
|
"Coweb",
|
||||||
"concurrency"
|
"Concurrency"
|
||||||
],
|
],
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
|||||||
57
y.es6
57
y.es6
@@ -52,6 +52,7 @@ module.exports = function (Y/* :any */) {
|
|||||||
this.broadcastedHB = false
|
this.broadcastedHB = false
|
||||||
this.syncStep2 = Promise.resolve()
|
this.syncStep2 = Promise.resolve()
|
||||||
this.broadcastOpBuffer = []
|
this.broadcastOpBuffer = []
|
||||||
|
this.protocolVersion = 8
|
||||||
}
|
}
|
||||||
reconnect () {
|
reconnect () {
|
||||||
}
|
}
|
||||||
@@ -208,6 +209,18 @@ module.exports = function (Y/* :any */) {
|
|||||||
if (this.debug) {
|
if (this.debug) {
|
||||||
console.log(`receive ${sender} -> ${this.userId}: ${message.type}`, JSON.parse(JSON.stringify(message))) // eslint-disable-line
|
console.log(`receive ${sender} -> ${this.userId}: ${message.type}`, JSON.parse(JSON.stringify(message))) // eslint-disable-line
|
||||||
}
|
}
|
||||||
|
if (message.protocolVersion != null && message.protocolVersion !== this.protocolVersion) {
|
||||||
|
console.error(
|
||||||
|
`You tried to sync with a yjs instance that has a different protocol version
|
||||||
|
(You: ${this.protocolVersion}, Client: ${message.protocolVersion}).
|
||||||
|
The sync was stopped. You need to upgrade your dependencies (especially Yjs & the Connector)!
|
||||||
|
`)
|
||||||
|
this.send(sender, {
|
||||||
|
type: 'sync stop',
|
||||||
|
protocolVersion: this.protocolVersion
|
||||||
|
})
|
||||||
|
return
|
||||||
|
}
|
||||||
if (message.type === 'sync step 1') {
|
if (message.type === 'sync step 1') {
|
||||||
// TODO: make transaction, stream the ops
|
// TODO: make transaction, stream the ops
|
||||||
let conn = this
|
let conn = this
|
||||||
@@ -718,9 +731,17 @@ module.exports = function (Y /* :any */) {
|
|||||||
this.gc2 = this.gc2.filter(filter)
|
this.gc2 = this.gc2.filter(filter)
|
||||||
delete op.gc
|
delete op.gc
|
||||||
}
|
}
|
||||||
destroy () {
|
* destroy () {
|
||||||
clearInterval(this.gcInterval)
|
clearInterval(this.gcInterval)
|
||||||
this.gcInterval = null
|
this.gcInterval = null
|
||||||
|
for (var key in this.initializedTypes) {
|
||||||
|
var type = this.initializedTypes[key]
|
||||||
|
if (type._destroy != null) {
|
||||||
|
type._destroy()
|
||||||
|
} else {
|
||||||
|
console.error('The type you included does not provide destroy functionality, it will remain in memory (updating your packages will help).')
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
setUserId (userId) {
|
setUserId (userId) {
|
||||||
if (!this.userIdPromise.inProgress) {
|
if (!this.userIdPromise.inProgress) {
|
||||||
@@ -756,8 +777,8 @@ module.exports = function (Y /* :any */) {
|
|||||||
* check if was deleted, apply a delete operation after op was applied
|
* check if was deleted, apply a delete operation after op was applied
|
||||||
*/
|
*/
|
||||||
apply (ops) {
|
apply (ops) {
|
||||||
for (var key in ops) {
|
for (var i = 0; i < ops.length; i++) {
|
||||||
var o = ops[key]
|
var o = ops[i]
|
||||||
if (o.id == null || o.id[0] !== this.y.connector.userId) {
|
if (o.id == null || o.id[0] !== this.y.connector.userId) {
|
||||||
var required = Y.Struct[o.struct].requiredOps(o)
|
var required = Y.Struct[o.struct].requiredOps(o)
|
||||||
this.whenOperationsExist(required, o)
|
this.whenOperationsExist(required, o)
|
||||||
@@ -775,8 +796,8 @@ module.exports = function (Y /* :any */) {
|
|||||||
missing: ids.length
|
missing: ids.length
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let key in ids) {
|
for (let i = 0; i < ids.length; i++) {
|
||||||
let id = ids[key]
|
let id = ids[i]
|
||||||
let sid = JSON.stringify(id)
|
let sid = JSON.stringify(id)
|
||||||
let l = this.listenersById[sid]
|
let l = this.listenersById[sid]
|
||||||
if (l == null) {
|
if (l == null) {
|
||||||
@@ -819,8 +840,8 @@ module.exports = function (Y /* :any */) {
|
|||||||
if (op == null) {
|
if (op == null) {
|
||||||
store.listenersById[sid] = l
|
store.listenersById[sid] = l
|
||||||
} else {
|
} else {
|
||||||
for (let key in l) {
|
for (let i = 0; i < l.length; i++) {
|
||||||
let listener = l[key]
|
let listener = l[i]
|
||||||
let o = listener.op
|
let o = listener.op
|
||||||
if (--listener.missing === 0) {
|
if (--listener.missing === 0) {
|
||||||
yield* store.tryExecute.call(this, o)
|
yield* store.tryExecute.call(this, o)
|
||||||
@@ -2252,6 +2273,12 @@ module.exports = function (Y /* : any*/) {
|
|||||||
this.onevent = onevent
|
this.onevent = onevent
|
||||||
this.eventListeners = []
|
this.eventListeners = []
|
||||||
}
|
}
|
||||||
|
destroy () {
|
||||||
|
this.waiting = null
|
||||||
|
this.awaiting = null
|
||||||
|
this.onevent = null
|
||||||
|
this.eventListeners = null
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
Call this when a new operation arrives. It will be executed right away if
|
Call this when a new operation arrives. It will be executed right away if
|
||||||
there are no waiting operations, that you prematurely executed
|
there are no waiting operations, that you prematurely executed
|
||||||
@@ -2697,6 +2724,7 @@ class YConfig {
|
|||||||
db: Y.AbstractDatabase;
|
db: Y.AbstractDatabase;
|
||||||
connector: Y.AbstractConnector;
|
connector: Y.AbstractConnector;
|
||||||
share: {[key: string]: any};
|
share: {[key: string]: any};
|
||||||
|
options: Object;
|
||||||
*/
|
*/
|
||||||
constructor (opts, callback) {
|
constructor (opts, callback) {
|
||||||
this.options = opts
|
this.options = opts
|
||||||
@@ -2734,10 +2762,17 @@ class YConfig {
|
|||||||
return this.connector.reconnect()
|
return this.connector.reconnect()
|
||||||
}
|
}
|
||||||
destroy () {
|
destroy () {
|
||||||
this.disconnect()
|
if (this.connector.destroy != null) {
|
||||||
this.db.destroy()
|
this.connector.destroy()
|
||||||
this.connector = null
|
} else {
|
||||||
this.db = null
|
this.connector.disconnect()
|
||||||
|
}
|
||||||
|
var self = this
|
||||||
|
this.db.requestTransaction(function * () {
|
||||||
|
yield* self.db.destroy()
|
||||||
|
self.connector = null
|
||||||
|
self.db = null
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user