mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-27 03:57:21 +00:00
Code Issues Releases Wiki Activity

Fix syncing

Browse Source
This commit is contained in:
Jeremy Ruston 2024-03-24 21:15:59 +00:00
parent 8198574087
commit 708e21951f
3 changed files with 19 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/tiddlywiki/multiwikiclient/multiwikiclientadaptor.js
View File

@ -78,8 +78,8 @@ MultiWikiClientAdaptor.prototype.getTiddlerRevision = function(title) {
}; };
MultiWikiClientAdaptor.prototype.setTiddlerInfo = function(title,revision,bag) { MultiWikiClientAdaptor.prototype.setTiddlerInfo = function(title,revision,bag) {
this.wiki.setText(BAG_STATE_TIDDLER,null,title,revision,{suppressTimestamp: true}); this.wiki.setText(BAG_STATE_TIDDLER,null,title,bag,{suppressTimestamp: true});
this.wiki.setText(REVISION_STATE_TIDDLER,null,title,bag,{suppressTimestamp: true}); this.wiki.setText(REVISION_STATE_TIDDLER,null,title,revision,{suppressTimestamp: true});
}; };
MultiWikiClientAdaptor.prototype.removeTiddlerInfo = function(title) { MultiWikiClientAdaptor.prototype.removeTiddlerInfo = function(title) {
@ -88,7 +88,7 @@ MultiWikiClientAdaptor.prototype.removeTiddlerInfo = function(title) {
}; };
/* /*
Get the current status of the TiddlyWeb connection Get the current status of the server connection
*/ */
MultiWikiClientAdaptor.prototype.getStatus = function(callback) { MultiWikiClientAdaptor.prototype.getStatus = function(callback) {
// Invoke the callback if present // Invoke the callback if present
@ -169,14 +169,12 @@ MultiWikiClientAdaptor.prototype.saveTiddler = function(tiddler,callback,options
$tw.browserStorage.removeTiddlerFromLocalStorage(tiddler.fields.title) $tw.browserStorage.removeTiddlerFromLocalStorage(tiddler.fields.title)
} }
// Save the details of the new revision of the tiddler // Save the details of the new revision of the tiddler
var etag = request.getResponseHeader("Etag"); var revision = request.getResponseHeader("X-Revision-Number"),
if(!etag) { bag_name = request.getResponseHeader("X-Bag-Name");
callback("Response from server is missing required `etag` header"); console.log(`Saved ${tiddler.fields.title} with revision ${revision} and bag ${bag_name}`)
} else { // Invoke the callback
var etagInfo = self.parseEtag(etag); self.setTiddlerInfo(tiddler.fields.title,revision,bag_name);
// Invoke the callback callback(null,{bag: bag_name},revision);
callback(null,{},etagInfo.revision);
}
} }
}); });
}; };
@ -189,10 +187,15 @@ MultiWikiClientAdaptor.prototype.loadTiddler = function(title,callback) {
$tw.utils.httpRequest({ $tw.utils.httpRequest({
url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(title), url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(title),
callback: function(err,data,request) { callback: function(err,data,request) {
if(err) { if(err === 404) {
return callback(null,null);
} else if(err) {
return callback(err); return callback(err);
} }
// Invoke the callback // Invoke the callback
var revision = request.getResponseHeader("X-Revision-Number"),
bag_name = request.getResponseHeader("X-Bag-Name");
self.setTiddlerInfo(title,revision,bag_name);
callback(null,$tw.utils.parseJSONSafe(data)); callback(null,$tw.utils.parseJSONSafe(data));
} }
}); });
@ -228,39 +231,6 @@ MultiWikiClientAdaptor.prototype.deleteTiddler = function(title,callback,options
}); });
}; };
/*
Split an MWS Etag into its constituent parts. For example:
```
"tiddler:mybag/946151"
```
Note that the value includes the opening and closing double quotes.
The parts are:
```
"tiddler:<bag>/<revision>"
```
*/
MultiWikiClientAdaptor.prototype.parseEtag = function(etag) {
const PREFIX = "\"tiddler:";
if(etag.startsWith(PREFIX)) {
const slashPos = etag.indexOf("/");
if(slashPos !== -1) {
const bag_name = etag.slice(PREFIX.length,slashPos),
revision = parseInt(etag.slice(slashPos + 1),10);
if(!isNaN(revision)) {
return {
bag_name: bag_name,
revision: revision
};
}
}
}
return null;
};
if($tw.browser && document.location.protocol.substr(0,4) === "http" ) { if($tw.browser && document.location.protocol.substr(0,4) === "http" ) {
exports.adaptorClass = MultiWikiClientAdaptor; exports.adaptorClass = MultiWikiClientAdaptor;
} }

2
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/get-recipe-tiddler.js
View File

@ -29,6 +29,8 @@ exports.handler = function(request,response,state) {
// If application/json is requested then this is an API request, and gets the response in JSON // If application/json is requested then this is an API request, and gets the response in JSON
if(request.headers.accept && request.headers.accept.indexOf("application/json") !== -1) { if(request.headers.accept && request.headers.accept.indexOf("application/json") !== -1) {
state.sendResponse(200,{ state.sendResponse(200,{
"X-Revision-Number": tiddlerInfo.tiddler_id,
"X-Bag-Name": tiddlerInfo.bag_name,
Etag: state.makeTiddlerEtag(tiddlerInfo), Etag: state.makeTiddlerEtag(tiddlerInfo),
"Content-Type": "application/json" "Content-Type": "application/json"
},JSON.stringify(tiddlerInfo.tiddler),"utf8"); },JSON.stringify(tiddlerInfo.tiddler),"utf8");

2
plugins/tiddlywiki/multiwikiserver/modules/routes/handlers/put-recipe-tiddler.js
View File

@ -25,6 +25,8 @@ exports.handler = function(request,response,state) {
var result = $tw.mws.store.saveRecipeTiddler(fields,recipe_name); var result = $tw.mws.store.saveRecipeTiddler(fields,recipe_name);
if(result) { if(result) {
response.writeHead(204, "OK",{ response.writeHead(204, "OK",{
"X-Revision-Number": result.tiddler_id.toString(),
"X-Bag-Name": result.bag_name,
Etag: state.makeTiddlerEtag(result), Etag: state.makeTiddlerEtag(result),
"Content-Type": "text/plain" "Content-Type": "text/plain"
}); });