0.1.2 - adds some install instructions, and begins to make install easier

dglittle · dglittle · commit a3de0cb8b7a8 · 2025-09-02T19:35:12.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 node_modules/
 .DS_Store
 db*
+package-lock.json
diff --git a/README.md b/README.md
@@ -11,3 +11,10 @@ How are we able to prune history?  Well, because this algorithm isn't your norma
 See the index.html file for an example usage.
 
 If you're curious, you can also read up on our early [hypothesizing](https://stackoverflow.com/a/48652362/440344) about the relationship between version controll systems and OT and CRDT algorithms.  This was one of our earliest experiments into finding a universal synchronization algorithm and framework, which has now led to the [CTM theory](https://braid.org/time-machines) and the interoperable [Braid synchronization protocols](https://braid.org).
+
+## Installation Instructions
+
+> npm i
+> node server.js
+open http://localhost:60607/test in two browser windows, and there should be a collaborative text editor
+
diff --git a/index.html b/index.html
@@ -1,6 +1,6 @@
 
 <body>
-<script src="./diffsync.js"></script>
+<script src="https://invisible-college.github.io/diffsync/diffsync.js"></script>
 <script>
 
 var t = document.createElement('textarea')
@@ -9,9 +9,8 @@
 document.body.append(t)
 
 var ds = diffsync.create_client({
-	// ws_url : 'ws://localhost:' + diffsync.port,
-	ws_url : 'wss://invisible.college:' + diffsync.port,
-	channel : 'goop4',
+	ws_url : location.origin.replace(/^http/, 'ws'),
+	channel : location.pathname.slice(1),
 	get_text : function () {
 	    return t.value
 	},
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
 {
+  "version": "0.1.2",  
   "dependencies": {
-    "better-sqlite3": "^4.0.3",
-    "statebus": "^6.0.44",
+    "better-sqlite3": "^12.2.0",
+    "statebus": "^6.0.125",
     "ws": "^3.1.0"
   }
 }
diff --git a/server.js b/server.js
@@ -30,18 +30,17 @@ for (var key in bus.cache) {
 }
 
 var fs = require('fs')
-var web_server = null
-var server_type = null
-if (fs.existsSync('privkey.pem') && fs.existsSync('fullchain.pem')) {
-    web_server = require('https').createServer({
-        key : fs.readFileSync('privkey.pem'),
-        cert : fs.readFileSync('fullchain.pem')
-    })
-    server_type = 'https'
-} else {
-    web_server = require('http').createServer()
-    server_type = 'http'
-}
+var server_args = [async (req, res) => {
+    res.end(await require('fs').promises.readFile(`${__dirname}/index.html`))
+}]
+var server_type = 'http' +
+    (fs.existsSync('privkey.pem') && fs.existsSync('fullchain.pem') ? 's' : '')
+if (server_type === 'https') server_args.unshift({
+    key : fs.readFileSync('privkey.pem'),
+    cert : fs.readFileSync('fullchain.pem')
+})
+var web_server = require(server_type).createServer(...server_args)
+
 var port = diffsync.port
 web_server.listen(port)
 console.log('openning ' + server_type + ' server on port ' + port)
diff --git a/sync7.js b/sync7.js
diff --git a/sync7_server.js b/sync7_server.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
	`2`	`+ "version": "0.1.2",`
`2`	`3`	`"dependencies": {`
`3`		`- "better-sqlite3": "^4.0.3",`
`4`		`- "statebus": "^6.0.44",`
	`4`	`+ "better-sqlite3": "^12.2.0",`
	`5`	`+ "statebus": "^6.0.125",`
`5`	`6`	`"ws": "^3.1.0"`
`6`	`7`	`}`
`7`	`8`	`}`