ueberdb2 1.4.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/npmpublish.yml +103 -0
- package/.travis.yml +46 -0
- package/CHANGELOG.md +167 -0
- package/CONTRIBUTING.md +103 -0
- package/LICENSE +202 -0
- package/README.md +356 -0
- package/SECURITY.md +5 -0
- package/databases/cassandra_db.js +250 -0
- package/databases/couch_db.js +201 -0
- package/databases/dirty_db.js +80 -0
- package/databases/dirty_git_db.js +78 -0
- package/databases/elasticsearch_db.js +288 -0
- package/databases/mock_db.js +42 -0
- package/databases/mongodb_db.js +136 -0
- package/databases/mssql_db.js +218 -0
- package/databases/mysql_db.js +178 -0
- package/databases/postgres_db.js +198 -0
- package/databases/postgrespool_db.js +11 -0
- package/databases/redis_db.js +128 -0
- package/databases/rethink_db.js +98 -0
- package/databases/sqlite_db.js +158 -0
- package/index.js +191 -0
- package/lib/AbstractDatabase.js +32 -0
- package/lib/CacheAndBufferLayer.js +610 -0
- package/package.json +122 -0
- package/test/lib/databases.js +62 -0
- package/test/lib/mysql.sql +84 -0
- package/test/test.js +312 -0
- package/test/test_bulk.js +71 -0
- package/test/test_lru.js +145 -0
- package/test/test_metrics.js +733 -0
- package/test/test_mysql.js +68 -0
- package/test/test_postgres.js +17 -0
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
name: Node.js Package
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
push:
|
|
6
|
+
branches:
|
|
7
|
+
- main
|
|
8
|
+
- master
|
|
9
|
+
|
|
10
|
+
jobs:
|
|
11
|
+
test:
|
|
12
|
+
runs-on: ubuntu-latest
|
|
13
|
+
services:
|
|
14
|
+
couchdb:
|
|
15
|
+
image: couchdb
|
|
16
|
+
ports:
|
|
17
|
+
- 5984:5984
|
|
18
|
+
env:
|
|
19
|
+
COUCHDB_USER: ueberdb
|
|
20
|
+
COUCHDB_PASSWORD: ueberdb
|
|
21
|
+
mongo:
|
|
22
|
+
image: mongo
|
|
23
|
+
ports:
|
|
24
|
+
- 27017:27017
|
|
25
|
+
mysql:
|
|
26
|
+
# The default authentication used in MySQL 8.0 isn't supported by the
|
|
27
|
+
# mysql npm package: https://github.com/mysqljs/mysql/issues/2002
|
|
28
|
+
image: mariadb
|
|
29
|
+
ports:
|
|
30
|
+
- 3306:3306
|
|
31
|
+
env:
|
|
32
|
+
MYSQL_ROOT_PASSWORD: password
|
|
33
|
+
MYSQL_USER: ueberdb
|
|
34
|
+
MYSQL_PASSWORD: ueberdb
|
|
35
|
+
MYSQL_DATABASE: ueberdb
|
|
36
|
+
postgres:
|
|
37
|
+
image: postgres
|
|
38
|
+
ports:
|
|
39
|
+
- 5432:5432
|
|
40
|
+
env:
|
|
41
|
+
POSTGRES_USER: ueberdb
|
|
42
|
+
POSTGRES_PASSWORD: ueberdb
|
|
43
|
+
POSTGRES_DB: ueberdb
|
|
44
|
+
options: >-
|
|
45
|
+
--health-cmd="pg_isready -d postgresql://ueberdb:ueberdb@127.0.0.1/ueberdb"
|
|
46
|
+
--health-interval=10s
|
|
47
|
+
--health-timeout=5s
|
|
48
|
+
--health-retries=5
|
|
49
|
+
redis:
|
|
50
|
+
image: redis
|
|
51
|
+
ports:
|
|
52
|
+
- 6379:6379
|
|
53
|
+
timeout-minutes: 10
|
|
54
|
+
steps:
|
|
55
|
+
- uses: actions/checkout@v2
|
|
56
|
+
- uses: actions/setup-node@v1
|
|
57
|
+
with:
|
|
58
|
+
node-version: 12
|
|
59
|
+
- run: npm ci
|
|
60
|
+
# Optional dependencies must be installed manually.
|
|
61
|
+
- run: npm i sqlite3
|
|
62
|
+
|
|
63
|
+
# Verify databases are reachable.
|
|
64
|
+
- name: MySQL client and server check
|
|
65
|
+
run: |
|
|
66
|
+
mysql --version &&
|
|
67
|
+
mysql -h 127.0.0.1 -u ueberdb -pueberdb -e "SHOW TABLES;" ueberdb
|
|
68
|
+
- name: PostgreSQL client and server check
|
|
69
|
+
run: |
|
|
70
|
+
psql --version &&
|
|
71
|
+
psql -d postgresql://ueberdb:ueberdb@127.0.0.1/ueberdb -c '\dt'
|
|
72
|
+
|
|
73
|
+
- run: npm test
|
|
74
|
+
- run: npm run lint
|
|
75
|
+
|
|
76
|
+
publish-npm:
|
|
77
|
+
if: github.event_name == 'push'
|
|
78
|
+
needs: test
|
|
79
|
+
runs-on: ubuntu-latest
|
|
80
|
+
steps:
|
|
81
|
+
- uses: actions/checkout@v2
|
|
82
|
+
- uses: actions/setup-node@v1
|
|
83
|
+
with:
|
|
84
|
+
node-version: 12
|
|
85
|
+
registry-url: https://registry.npmjs.org/
|
|
86
|
+
- run: git config user.name 'github-actions[bot]'
|
|
87
|
+
- run: git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
|
|
88
|
+
- run: npm ci
|
|
89
|
+
- run: npm version patch
|
|
90
|
+
- run: git push --follow-tags
|
|
91
|
+
# `npm publish` must come after `git push` otherwise there is a race
|
|
92
|
+
# condition: If two PRs are merged back-to-back then master/main will be
|
|
93
|
+
# updated with the commits from the second PR before the first PR's
|
|
94
|
+
# workflow has a chance to push the commit generated by `npm version
|
|
95
|
+
# patch`. This causes the first PR's `git push` step to fail after the
|
|
96
|
+
# package has already been published, which in turn will cause all future
|
|
97
|
+
# workflow runs to fail because they will all attempt to use the same
|
|
98
|
+
# already-used version number. By running `npm publish` after `git push`,
|
|
99
|
+
# back-to-back merges will cause the first merge's workflow to fail but
|
|
100
|
+
# the second's will succeed.
|
|
101
|
+
- run: npm publish
|
|
102
|
+
env:
|
|
103
|
+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
|
package/.travis.yml
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
language: node_js
|
|
2
|
+
|
|
3
|
+
node_js:
|
|
4
|
+
- 14
|
|
5
|
+
|
|
6
|
+
services:
|
|
7
|
+
- docker
|
|
8
|
+
- mysql
|
|
9
|
+
- postgresql
|
|
10
|
+
- couchdb
|
|
11
|
+
- sqlite3
|
|
12
|
+
- redis
|
|
13
|
+
- cassandra
|
|
14
|
+
- elasticsearch
|
|
15
|
+
- mongodb
|
|
16
|
+
- rethinkdb
|
|
17
|
+
|
|
18
|
+
before_install:
|
|
19
|
+
- mysql -e 'CREATE DATABASE ueberdb;'
|
|
20
|
+
- mysql -e 'CREATE USER "ueberdb"@"localhost" identified by "ueberdb";'
|
|
21
|
+
- mysql -e "ALTER DATABASE ueberdb CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;"
|
|
22
|
+
- mysql -e "grant CREATE,ALTER,SELECT,INSERT,UPDATE,DELETE on ueberdb.* to 'ueberdb'@'localhost';"
|
|
23
|
+
- mysql -e "CREATE TABLE \`store\` (\`key\` varchar(100) COLLATE utf8mb4_bin NOT NULL DEFAULT '',\`value\` longtext COLLATE utf8mb4_bin NOT NULL,PRIMARY KEY (\`key\`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;" ueberdb
|
|
24
|
+
# - cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf
|
|
25
|
+
|
|
26
|
+
#addons:
|
|
27
|
+
# rethinkdb: '2.3.4'
|
|
28
|
+
|
|
29
|
+
# Brings in procedure required for creating large data set
|
|
30
|
+
- mysql ueberdb < test/lib/mysql.sql
|
|
31
|
+
- mysql ueberdb -e 'CALL generate_data();';
|
|
32
|
+
- psql -c 'create database ueberdb;' -U postgres
|
|
33
|
+
# - psql -c "grant CREATE,ALTER,SELECT,INSERT,UPDATE,DELETE on ueberdb.* to 'ueberdb'@'localhost';" -U postgres
|
|
34
|
+
|
|
35
|
+
install:
|
|
36
|
+
- "export GIT_HASH=$(git rev-parse --verify --short HEAD)"
|
|
37
|
+
|
|
38
|
+
jobs:
|
|
39
|
+
include:
|
|
40
|
+
- name: "Run the Backend tests"
|
|
41
|
+
install:
|
|
42
|
+
- "npm install"
|
|
43
|
+
|
|
44
|
+
notifications:
|
|
45
|
+
email:
|
|
46
|
+
- john@mclear.co.uk
|
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,167 @@
|
|
|
1
|
+
# Notable Changes
|
|
2
|
+
|
|
3
|
+
## v1.4.16
|
|
4
|
+
|
|
5
|
+
* `postgres`: You can now provide a connection string instead of a settings
|
|
6
|
+
object. For example:
|
|
7
|
+
```javascript
|
|
8
|
+
const db = new ueberdb.Database('postgres', 'postgres://user:password@host/dbname');
|
|
9
|
+
```
|
|
10
|
+
|
|
11
|
+
## v1.4.15
|
|
12
|
+
|
|
13
|
+
* `postgres`, `postgrespool`: The `postgrespool` database driver was renamed to
|
|
14
|
+
`postgres`, replacing the old `postgres` driver. The old `postgrespool` name
|
|
15
|
+
is still usable, but is deprecated. For users of the old `postgres` driver,
|
|
16
|
+
this change increases the number of concurrent database connections. You may
|
|
17
|
+
need to increase your configured connection limit.
|
|
18
|
+
* `sqlite`: Updated `sqlite3` to 5.0.2.
|
|
19
|
+
|
|
20
|
+
## v1.4.14
|
|
21
|
+
|
|
22
|
+
Updated dependencies:
|
|
23
|
+
* `cassandra`: Updated `cassandra-driver` to 4.6.3.
|
|
24
|
+
* `couch`: Updated `nano` to 9.0.3.
|
|
25
|
+
* `dirty`: Updated `dirty` to 1.1.3.
|
|
26
|
+
* `dirty_git`: Updated `simple-git` to 2.45.0.
|
|
27
|
+
* `mongodb`: Updated `mongodb` to 3.6.11.
|
|
28
|
+
* `mssql`: Updated `mssql` to 7.2.1.
|
|
29
|
+
* `postgres`, `postgrespool`: Updated `pg` to 8.7.1.
|
|
30
|
+
|
|
31
|
+
## v1.4.13
|
|
32
|
+
|
|
33
|
+
* `mongodb`: The `dbName` setting has been renamed to `database` for consistency
|
|
34
|
+
with other database drivers. The `dbName` setting will continue to work (for
|
|
35
|
+
backwards compatibility), but it is deprecated and is ignored if `database` is
|
|
36
|
+
set.
|
|
37
|
+
* `mongodb`: The `database` (formerly `dbName`) setting is now optional. If it
|
|
38
|
+
is not specified, the database name embedded in the `url` setting is used.
|
|
39
|
+
|
|
40
|
+
## v1.4.8
|
|
41
|
+
|
|
42
|
+
* `redis`: Updated `redis` dependency to 3.1.2.
|
|
43
|
+
|
|
44
|
+
## v1.4.7
|
|
45
|
+
|
|
46
|
+
* Each write operation in a bulk write batch is now retried if the bulk write
|
|
47
|
+
fails.
|
|
48
|
+
* Fixed write metrics for `setSub()` read failures.
|
|
49
|
+
|
|
50
|
+
## v1.4.6
|
|
51
|
+
|
|
52
|
+
* `mysql`: Use a connection pool to improve performance and simplify the code.
|
|
53
|
+
|
|
54
|
+
## v1.4.5
|
|
55
|
+
|
|
56
|
+
* `mysql`: Reconnect on fatal error.
|
|
57
|
+
* `mysql`: Log MySQL errors.
|
|
58
|
+
|
|
59
|
+
## v1.4.4
|
|
60
|
+
|
|
61
|
+
* New experimental setting to limit the number of operations written at a time
|
|
62
|
+
when flushing outstanding writes.
|
|
63
|
+
* `mysql`: Bulk writes are limited to 100 changes at a time to avoid query
|
|
64
|
+
timeouts.
|
|
65
|
+
* `mysql`: Raised default cache size from 500 entries to 10000.
|
|
66
|
+
|
|
67
|
+
## v1.4.2
|
|
68
|
+
|
|
69
|
+
* Refined the experimental read and write metrics.
|
|
70
|
+
|
|
71
|
+
## v1.4.1
|
|
72
|
+
|
|
73
|
+
* The two callback arguments in `remove()`, `set()`, and `setSub()` have
|
|
74
|
+
changed: Instead of a callback that is called after the write is buffered and
|
|
75
|
+
another callback that is called after the write is committed, both callbacks
|
|
76
|
+
are now called after the write is committed. Futhermore, the second callback
|
|
77
|
+
argument is now deprecated.
|
|
78
|
+
* Modernized record locking.
|
|
79
|
+
* Experimental metrics for reads, writes, and locking.
|
|
80
|
+
|
|
81
|
+
## v1.3.2
|
|
82
|
+
|
|
83
|
+
* `dirty`: Updated `dirty` dependency.
|
|
84
|
+
|
|
85
|
+
## v1.3.1
|
|
86
|
+
|
|
87
|
+
* `redis`: The database config object is now passed directly to the `redis`
|
|
88
|
+
package. For details, see
|
|
89
|
+
https://www.npmjs.com/package/redis/v/3.0.2#options-object-properties.
|
|
90
|
+
Old-style settings objects (where the `redis` options are in the
|
|
91
|
+
`client_options` property) are still supported but deprecated.
|
|
92
|
+
|
|
93
|
+
## v1.2.9
|
|
94
|
+
|
|
95
|
+
* `dirty`: Workaround for a bug in the upstream `dirty` driver.
|
|
96
|
+
|
|
97
|
+
## v1.2.7
|
|
98
|
+
|
|
99
|
+
* `redis`: Experimental support for passing the settings object directly to the
|
|
100
|
+
`redis` package.
|
|
101
|
+
|
|
102
|
+
## v1.2.6
|
|
103
|
+
|
|
104
|
+
* `redis`: Fixed "Callback was already called" exception during init.
|
|
105
|
+
|
|
106
|
+
## v1.2.5
|
|
107
|
+
|
|
108
|
+
* All: Fixed a major bug introduced in v1.1.10 that caused `setSub()` to
|
|
109
|
+
silently discard changes.
|
|
110
|
+
* All: Fixed a bug that prevented cache entries from being marked as most
|
|
111
|
+
recently used.
|
|
112
|
+
|
|
113
|
+
## v1.2.4
|
|
114
|
+
|
|
115
|
+
* `mssql`: Updated `mssql` dependency.
|
|
116
|
+
* `dirty_git`: Updated `simple-git` dependency.
|
|
117
|
+
* `sqlite`: Updated `sqlite3` dependency.
|
|
118
|
+
|
|
119
|
+
## v1.2.3
|
|
120
|
+
|
|
121
|
+
* `mssql`: Updated `mssql` dependency.
|
|
122
|
+
|
|
123
|
+
## v1.2.2
|
|
124
|
+
|
|
125
|
+
* All: Fixed minor `setSub()` corner cases.
|
|
126
|
+
|
|
127
|
+
## v1.2.1
|
|
128
|
+
|
|
129
|
+
* New `flush()` method.
|
|
130
|
+
* The `doShutdown()` method is deprecated. Use `flush()` instead.
|
|
131
|
+
* The `close()` method now flushes unwritten entries before closing the database
|
|
132
|
+
connection.
|
|
133
|
+
* Bug fix: `null`/`undefined` is no longer cached if there is an error reading
|
|
134
|
+
from the database.
|
|
135
|
+
|
|
136
|
+
## v1.1.10
|
|
137
|
+
|
|
138
|
+
* Major performance improvement: The caching logic was rewritten with much more
|
|
139
|
+
efficient algorithms. Also: Scans for entries to evict is performed less
|
|
140
|
+
often. Depending on your workload you might observe a slight memory usage
|
|
141
|
+
increase.
|
|
142
|
+
|
|
143
|
+
## v1.1.7
|
|
144
|
+
|
|
145
|
+
* `mysql` dependency bumped to 7.0.0-alpha4 to avoid a security vulnerability in
|
|
146
|
+
one of its indirect dependencies.
|
|
147
|
+
|
|
148
|
+
## v1.1.6
|
|
149
|
+
|
|
150
|
+
* Bug fix: When write buffering is disabled, reads of keys with values that were
|
|
151
|
+
changed but not yet written to the underlying database used to return the
|
|
152
|
+
previous value. Now the updated value is returned.
|
|
153
|
+
* Minor performance improvement: Setting a key to the same value no longer
|
|
154
|
+
triggers a database write.
|
|
155
|
+
|
|
156
|
+
## v1.1.5
|
|
157
|
+
|
|
158
|
+
* Minor performance improvement: Debug log message strings are no longer
|
|
159
|
+
generated if debug logging is not enabled.
|
|
160
|
+
|
|
161
|
+
## v1.1.1
|
|
162
|
+
|
|
163
|
+
* The `database()` constructor is deprecated; use `Database()` instead.
|
|
164
|
+
|
|
165
|
+
## Older
|
|
166
|
+
|
|
167
|
+
See the Git history.
|
package/CONTRIBUTING.md
ADDED
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
# Contributor Guidelines
|
|
2
|
+
(Please talk to people on the mailing list before you change this page, see our section on [how to get in touch](https://github.com/ether/etherpad-lite#get-in-touch))
|
|
3
|
+
|
|
4
|
+
## Pull requests
|
|
5
|
+
|
|
6
|
+
* the commit series in the PR should be _linear_ (it **should not contain merge commits**). This is necessary because we want to be able to [bisect](https://en.wikipedia.org/wiki/Bisection_(software_engineering)) bugs easily. Rewrite history/perform a rebase if necessary
|
|
7
|
+
* PRs should be issued against the **develop** branch: we never pull directly into **master**
|
|
8
|
+
* PRs **should not have conflicts** with develop. If there are, please resolve them rebasing and force-pushing
|
|
9
|
+
* when preparing your PR, please make sure that you have included the relevant **changes to the documentation** (preferably with usage examples)
|
|
10
|
+
* contain meaningful and detailed **commit messages** in the form:
|
|
11
|
+
```
|
|
12
|
+
submodule: description
|
|
13
|
+
|
|
14
|
+
longer description of the change you have made, eventually mentioning the
|
|
15
|
+
number of the issue that is being fixed, in the form: Fixes #someIssueNumber
|
|
16
|
+
```
|
|
17
|
+
* if the PR is a **bug fix**:
|
|
18
|
+
* the first commit in the series must be a test that shows the failure
|
|
19
|
+
* subsequent commits will fix the bug and make the test pass
|
|
20
|
+
* the final commit message should include the text `Fixes: #xxx` to link it to its bug report
|
|
21
|
+
* think about stability: code has to be backwards compatible as much as possible. Always **assume your code will be run with an older version of the DB/config file**
|
|
22
|
+
* if you want to remove a feature, **deprecate it instead**:
|
|
23
|
+
* write an issue with your deprecation plan
|
|
24
|
+
* output a `WARN` in the log informing that the feature is going to be removed
|
|
25
|
+
* remove the feature in the next version
|
|
26
|
+
* if you want to add a new feature, put it under a **feature flag**:
|
|
27
|
+
* once the new feature has reached a minimal level of stability, do a PR for it, so it can be integrated early
|
|
28
|
+
* expose a mechanism for enabling/disabling the feature
|
|
29
|
+
* the new feature should be **disabled** by default. With the feature disabled, the code path should be exactly the same as before your contribution. This is a __necessary condition__ for early integration
|
|
30
|
+
* think of the PR not as something that __you wrote__, but as something that __someone else is going to read__. The commit series in the PR should tell a novice developer the story of your thoughts when developing it
|
|
31
|
+
|
|
32
|
+
## How to write a bug report
|
|
33
|
+
|
|
34
|
+
* Please be polite, we all are humans and problems can occur.
|
|
35
|
+
* Please add as much information as possible, for example
|
|
36
|
+
* client os(s) and version(s)
|
|
37
|
+
* browser(s) and version(s), is the problem reproducible on different clients
|
|
38
|
+
* special environments like firewalls or antivirus
|
|
39
|
+
* host os and version
|
|
40
|
+
* npm and nodejs version
|
|
41
|
+
* Logfiles if available
|
|
42
|
+
* steps to reproduce
|
|
43
|
+
* what you expected to happen
|
|
44
|
+
* what actually happened
|
|
45
|
+
* Please format logfiles and code examples with markdown see github Markdown help below the issue textarea for more information.
|
|
46
|
+
|
|
47
|
+
## General goals of UeberDB
|
|
48
|
+
To make sure everybody is going in the same direction:
|
|
49
|
+
* easy to install for admins and easy to use for people
|
|
50
|
+
* easy to integrate into other apps, but also usable as standalone
|
|
51
|
+
* lightweight and scalable
|
|
52
|
+
* extensible, as much functionality should be extendable with plugins so changes don't have to be done in core.
|
|
53
|
+
|
|
54
|
+
## How to work with git?
|
|
55
|
+
* Don't work in your master branch.
|
|
56
|
+
* Make a new branch for every feature you're working on. (This ensures that you can work you can do lots of small, independent pull requests instead of one big one with complete different features)
|
|
57
|
+
* Don't use the online edit function of github (this only creates ugly and not working commits!)
|
|
58
|
+
* Try to make clean commits that are easy readable (including descriptive commit messages!)
|
|
59
|
+
* Test before you push. Sounds easy, it isn't!
|
|
60
|
+
* Don't check in stuff that gets generated during build or runtime
|
|
61
|
+
* Make small pull requests that are easy to review but make sure they do add value by themselves / individually
|
|
62
|
+
|
|
63
|
+
## Coding style
|
|
64
|
+
* Do write comments. (You don't have to comment every line, but if you come up with something that's a bit complex/weird, just leave a comment. Bear in mind that you will probably leave the project at some point and that other people will read your code. Undocumented huge amounts of code are worthless!)
|
|
65
|
+
* Never ever use tabs
|
|
66
|
+
* Indentation: JS/CSS: 2 spaces; HTML: 4 spaces
|
|
67
|
+
* Don't overengineer. Don't try to solve any possible problem in one step, but try to solve problems as easy as possible and improve the solution over time!
|
|
68
|
+
* Do generalize sooner or later! (if an old solution, quickly hacked together, poses more problems than it solves today, refactor it!)
|
|
69
|
+
* Keep it compatible. Do not introduce changes to the public API, db schema or configurations too lightly. Don't make incompatible changes without good reasons!
|
|
70
|
+
* If you do make changes, document them! (see below)
|
|
71
|
+
* Use protocol independent urls "//"
|
|
72
|
+
|
|
73
|
+
## Branching model / git workflow
|
|
74
|
+
see git flow http://nvie.com/posts/a-successful-git-branching-model/
|
|
75
|
+
|
|
76
|
+
### `master` branch
|
|
77
|
+
* the stable
|
|
78
|
+
* This is the branch everyone should use for production stuff
|
|
79
|
+
|
|
80
|
+
### feature branches (in your own repos)
|
|
81
|
+
* these are the branches where you develop your features in
|
|
82
|
+
* If it's ready to go out, it will be merged into develop
|
|
83
|
+
|
|
84
|
+
Over the time we pull features from feature branches into the develop branch. Every month we pull from develop into master. Bugs in master get fixed in hotfix branches. These branches will get merged into master AND develop. There should never be commits in master that aren't in develop
|
|
85
|
+
|
|
86
|
+
## Testing
|
|
87
|
+
Front-end tests are found in the `tests/frontend/` folder in the repository. Run them by pointing your browser to `<yourdomainhere>/tests/frontend`.
|
|
88
|
+
|
|
89
|
+
Back-end tests can be run via `npm test`.
|
|
90
|
+
|
|
91
|
+
## Things you can help with
|
|
92
|
+
The Etherpad Foundation is much more than software. So if you aren't a developer then worry not, there is still a LOT you can do! A big part of what we do is community engagement. You can help in the following ways
|
|
93
|
+
* Triage bugs (applying labels) and confirming their existence
|
|
94
|
+
* Testing fixes (simply applying them and seeing if it fixes your issue or not) - Some git experience required
|
|
95
|
+
* Notifying large site admins of new releases
|
|
96
|
+
* Writing Changelogs for releases
|
|
97
|
+
* Creating Windows packages
|
|
98
|
+
* Creating releases
|
|
99
|
+
* Bumping dependencies periodically and checking they don't break anything
|
|
100
|
+
* Write proposals for grants
|
|
101
|
+
* Co-Author and Publish CVEs
|
|
102
|
+
* Work with SFC to maintain legal side of project
|
|
103
|
+
|
package/LICENSE
ADDED
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
5
|
+
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
7
|
+
|
|
8
|
+
1. Definitions.
|
|
9
|
+
|
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
12
|
+
|
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
14
|
+
the copyright owner that is granting the License.
|
|
15
|
+
|
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
17
|
+
other entities that control, are controlled by, or are under common
|
|
18
|
+
control with that entity. For the purposes of this definition,
|
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
20
|
+
direction or management of such entity, whether by contract or
|
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
23
|
+
|
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
25
|
+
exercising permissions granted by this License.
|
|
26
|
+
|
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
28
|
+
including but not limited to software source code, documentation
|
|
29
|
+
source, and configuration files.
|
|
30
|
+
|
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
|
32
|
+
transformation or translation of a Source form, including but
|
|
33
|
+
not limited to compiled object code, generated documentation,
|
|
34
|
+
and conversions to other media types.
|
|
35
|
+
|
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
37
|
+
Object form, made available under the License, as indicated by a
|
|
38
|
+
copyright notice that is included in or attached to the work
|
|
39
|
+
(an example is provided in the Appendix below).
|
|
40
|
+
|
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
47
|
+
the Work and Derivative Works thereof.
|
|
48
|
+
|
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
|
50
|
+
the original version of the Work and any modifications or additions
|
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
62
|
+
|
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
65
|
+
subsequently incorporated within the Work.
|
|
66
|
+
|
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
|
73
|
+
|
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
79
|
+
where such license applies only to those patent claims licensable
|
|
80
|
+
by such Contributor that are necessarily infringed by their
|
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
83
|
+
institute patent litigation against any entity (including a
|
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
86
|
+
or contributory patent infringement, then any patent licenses
|
|
87
|
+
granted to You under this License for that Work shall terminate
|
|
88
|
+
as of the date such litigation is filed.
|
|
89
|
+
|
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
92
|
+
modifications, and in Source or Object form, provided that You
|
|
93
|
+
meet the following conditions:
|
|
94
|
+
|
|
95
|
+
(a) You must give any other recipients of the Work or
|
|
96
|
+
Derivative Works a copy of this License; and
|
|
97
|
+
|
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
|
99
|
+
stating that You changed the files; and
|
|
100
|
+
|
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
|
103
|
+
attribution notices from the Source form of the Work,
|
|
104
|
+
excluding those notices that do not pertain to any part of
|
|
105
|
+
the Derivative Works; and
|
|
106
|
+
|
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
|
109
|
+
include a readable copy of the attribution notices contained
|
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
|
112
|
+
of the following places: within a NOTICE text file distributed
|
|
113
|
+
as part of the Derivative Works; within the Source form or
|
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
|
115
|
+
within a display generated by the Derivative Works, if and
|
|
116
|
+
wherever such third-party notices normally appear. The contents
|
|
117
|
+
of the NOTICE file are for informational purposes only and
|
|
118
|
+
do not modify the License. You may add Your own attribution
|
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
121
|
+
that such additional attribution notices cannot be construed
|
|
122
|
+
as modifying the License.
|
|
123
|
+
|
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
|
125
|
+
may provide additional or different license terms and conditions
|
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
129
|
+
the conditions stated in this License.
|
|
130
|
+
|
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
134
|
+
this License, without any additional terms or conditions.
|
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
136
|
+
the terms of any separate license agreement you may have executed
|
|
137
|
+
with Licensor regarding such Contributions.
|
|
138
|
+
|
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
141
|
+
except as required for reasonable and customary use in describing the
|
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
143
|
+
|
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
|
153
|
+
|
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
|
159
|
+
incidental, or consequential damages of any character arising as a
|
|
160
|
+
result of this License or out of the use or inability to use the
|
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
163
|
+
other commercial damages or losses), even if such Contributor
|
|
164
|
+
has been advised of the possibility of such damages.
|
|
165
|
+
|
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
169
|
+
or other liability obligations and/or rights consistent with this
|
|
170
|
+
License. However, in accepting such obligations, You may act only
|
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
175
|
+
of your accepting any such warranty or additional liability.
|
|
176
|
+
|
|
177
|
+
END OF TERMS AND CONDITIONS
|
|
178
|
+
|
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
180
|
+
|
|
181
|
+
To apply the Apache License to your work, attach the following
|
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
183
|
+
replaced with your own identifying information. (Don't include
|
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
185
|
+
comment syntax for the file format. We also recommend that a
|
|
186
|
+
file or class name and description of purpose be included on the
|
|
187
|
+
same "printed page" as the copyright notice for easier
|
|
188
|
+
identification within third-party archives.
|
|
189
|
+
|
|
190
|
+
Copyright 2020 The Etherpad Foundation
|
|
191
|
+
|
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
|
+
you may not use this file except in compliance with the License.
|
|
194
|
+
You may obtain a copy of the License at
|
|
195
|
+
|
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
197
|
+
|
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
201
|
+
See the License for the specific language governing permissions and
|
|
202
|
+
limitations under the License.
|