Skip to content

Commit 8861ab2

Browse files
committed
0.1.15 - simplifies, removes more wiki related stuff
1 parent f6463de commit 8861ab2

File tree

3 files changed

+9
-43
lines changed

3 files changed

+9
-43
lines changed

index.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11

22
<body>
3-
<script src="https://unpkg.com/@braid.org/diffsync@~0.1.6"></script>
3+
<script src="https://unpkg.com/@braid.org/diffsync"></script>
4+
<textarea id="t" style="width:100%;height:100%"></textarea>
45
<script>
56

6-
var t = document.createElement('textarea')
7-
t.style.width = '100%'
8-
t.style.height = '100%'
9-
document.body.append(t)
10-
117
var ds = diffsync.create_client({
128
ws_url : 'ws://localhost:' + diffsync.port,
139
channel : 'goop4',

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"name": "@braid.org/diffsync",
3-
"version": "0.1.14",
3+
"version": "0.1.15",
44
"main": "diffsync.js",
5-
"bin": {
6-
"diffsync": "./server.js"
7-
},
85
"dependencies": {
96
"better-sqlite3": "^12.2.0",
107
"statebus": "^6.0.125",

server.js

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
#!/usr/bin/env node
2-
31
var diffsync = require(`${__dirname}/diffsync.js`)
42
console.log('diffsync version ' + diffsync.version)
53

6-
// Parse command-line arguments
7-
var [port, cert_file, key_file] = process.argv.slice(2)
8-
port = port ? parseInt(port) : diffsync.port
4+
var port = process.argv[2] ? parseInt(process.argv[2]) : diffsync.port
95

106
var bus = require('statebus')()
117
bus.sqlite_store({save_sync: true})
@@ -34,35 +30,12 @@ for (var key in bus.cache) {
3430
}
3531
}
3632

37-
var fs = require('fs')
38-
var server_args = []
39-
40-
// Only use HTTPS if both cert and key files are provided and exist
41-
var server_type = 'http'
42-
if (cert_file && key_file && fs.existsSync(key_file) && fs.existsSync(cert_file)) {
43-
server_type = 'https'
44-
server_args.unshift({
45-
key : fs.readFileSync(key_file),
46-
cert : fs.readFileSync(cert_file)
47-
})
48-
} else if (cert_file || key_file) {
49-
if (!cert_file || !key_file) {
50-
console.log('Warning: Both cert_file and key_file must be provided for HTTPS')
51-
process.exit(1)
52-
} else {
53-
console.log('Warning: SSL certificate files not found')
54-
process.exit(1)
55-
}
56-
}
57-
58-
var web_server = require(server_type).createServer(...server_args)
59-
60-
web_server.listen(port)
61-
console.log('openning ' + server_type + ' server on port ' + port)
62-
var WebSocket = require('ws')
63-
var wss = new WebSocket.Server({ server : web_server })
33+
var server = require('http').createServer()
34+
server.listen(port)
35+
console.log('listening on port ' + port)
36+
var wss = new (require('ws').Server)({ server })
6437

65-
var diff_server = diffsync.create_server({
38+
diffsync.create_server({
6639
wss : wss,
6740
initial_data : channels,
6841
on_change : function (changes) {

0 commit comments

Comments
 (0)