mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-11-09 11:29:58 +00:00
b95723a022
* First commit
* Add throttling of saves
Now we refuse to save a tiddler more often than once per second.
* Wait for a timeout before trying again after an error
* Modest optimisations of isDirty() method
* Synchronise system tiddlers and deletions from the server
Fixes two long-standing issues:
* Changes to system tiddlers are not synchronised from the server to the browser
* Deletions of tiddlers on the server are not propagated to browser clients
* Make sure we update the dirty status even if there isn't a task to perform
* Replace save-wiki button with popup sync menu
* Remove the "Server" control panel tab
We don't need it with the enhanced sync dropdown
* Add indentation to the save-wiki button
* Fix spacing in dropdown menu items
* Switch between cloud icons according to dirty status
* Add a menu item to copy syncer logs to the clipboard
* Improve animated icon
* Remove indentation from save-wiki button
@pmario the annoying thing is that using `\trim whitespace` trims significant whitespace too, so it means we have to use <$text text=" "/> when we need a space that won't be trimmed. For the moment, I've removed the indentation but will keep thinking about it.
* Further icon, UI and copy text tweaks
Move the icons and styles from the core into the TiddlyWeb plugin
* Clean up PR diff
* Tweak animation durations
* Break the actions from the syncer dropdown into separate tiddlers
@pmario I think this makes things a bit easier to follow
* Refactor syncadaptor creation and logging
The goal is for the syncadaptor to be able to log to the same logger as the syncer, so that the "copy syncer logs to clipboard" data is more useful.
* Don't transition the dirty indicator container colour, just the SVG's colour
* Only trigger a sync for changes to tiddlers we're interested in
Otherwise it is triggered by the creation of the alert tiddlers used to display errors.
* Restore deleting local tiddlers removed from the server
(I had commented it out for some testing and accidentally commited it).
* Guard against missing adaptor info
* We still need to trigger a timeout when there was no task to process
* Avoid repeatedly polling for changes
Instead we only trigger a timeout call at if there is a pending task (ie a tiddler that has changed but isn't yet old enough to save).
* Lazy loading: include skinny versions of lazily loaded tiddlers in the index.html
* Introduce _is_skinny field for indicating that a tiddler is subject to lazy loading
* Remove savetrail plugin from prerelease
It doesn't yet work with the new syncer
* Make the savetrail plugin work again
* Clear outstanding alerts when synchronisation is restored
* Logger: only remove alerts from the same component
Missed off 9f5c0de07
* Make the saving throttle interval configurable (#4385)
After switching Bob to use the core syncer the throttle interval makes saving feel very sluggish compared to the message queue setup that I had before.
The editing lock that I use to prevent conflicts with multiple users doesn't go away until the save is completed, and with the 1 second delay it means that if you edit a tiddler and save it than you have to wait one second before you can edit it again.
* Tweaks to appearance of alerts
* Exclude temp tiddlers from offline snapshots
Otherwise alerts will persist
* Tweak appearance of status line in dropdown
* Update release note
* Web server: Don't include full path in error messages
Fixes #3724
* In change event handler check for deletions
* Disable the official plugin library when the tiddlyweb plugin is loaded
* Hide error details from browser for /files/ route
See https://github.com/Jermolene/TiddlyWiki5/issues/3724#issuecomment-565702492 -- thanks @pmario
* Revert all the changes to the relationship between the syncer and the syncadaptor
Previously we had some major rearrangements to make it possible for the syncadaptor to route it's logging to the logger used by the syncer. The motivation is so that the "copy logs to clipboard" button is more useful.
On reflection, changing the interface this drastically is undesirable from a backwards compatibility perspective, so I'm going to investigate other ways to achieve the logger sharing
* Make the tiddlyweb adaptor use the syncer's logger
So that both are availavble when copying the syncer logs to the clipboard
* Update release note
* Support setting port=0 to get an OS assigned port
Quite useful
* Update code comment
* UI: Use "Get latest changes from server" instead of "Refresh"
* Add getUpdatedTiddlers() method to syncadaptor API
See https://github.com/Jermolene/TiddlyWiki5/pull/4373#issuecomment-573579495
* Refactor revision handling within the syncer
Thanks @pmario
* Fix typo in tiddlywebadaptor
* Improve presentation of errors
See https://github.com/Jermolene/TiddlyWiki5/pull/4373#issuecomment-573695267
* Add docs for getTiddlerRevision()
* Remove unused error animation
* Update comment for GET /recipes/default/tiddlers/tiddlers.json
* Optimise SVG cloud image
* Add optional list of allowed filters for get all tiddlers route
An attempt to address @Arlen22's concern here:
https://github.com/Jermolene/TiddlyWiki5/pull/4373#pullrequestreview-342146190
* Fix network error alert text translatability
* Fix error code and logging for GET /recipes/default/tiddlers/tiddlers.json
Thanks @Arlen22
* Flip GET /recipes/default/tiddlers/tiddlers.json allowed filter handling to be secure by default
* Validate updates received from getUpdatedTiddlers()
* Add syncer method to force loading of a tiddler from the server
* Remove the release note update to remove the merge conflict
* Fix crash when there's no config section in the tiddlywiki.info file
* Use config tiddler title to check filter query (merge into fix-syncer) (#4478)
* Use config tiddler title to check filter query
* Create config-tiddlers-filter.tid
* Add config switch to enable all filters on GET /recipes/default/tiddlers/tiddlers.json
And update docs
* Fix bug when deleting a tiddler with a shadow
Reported by @kookma at https://github.com/Jermolene/TiddlyWiki5/pull/4373#issuecomment-604027528
Co-authored-by: jed <inmysocks@fastmail.com>
Co-authored-by: Arlen22 <arlenbee@gmail.com>
348 lines
9.2 KiB
JavaScript
348 lines
9.2 KiB
JavaScript
/*\
|
|
title: $:/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
|
|
type: application/javascript
|
|
module-type: syncadaptor
|
|
|
|
A sync adaptor module for synchronising with TiddlyWeb compatible servers
|
|
|
|
\*/
|
|
(function(){
|
|
|
|
/*jslint node: true, browser: true */
|
|
/*global $tw: false */
|
|
"use strict";
|
|
|
|
var CONFIG_HOST_TIDDLER = "$:/config/tiddlyweb/host",
|
|
DEFAULT_HOST_TIDDLER = "$protocol$//$host$/";
|
|
|
|
function TiddlyWebAdaptor(options) {
|
|
this.wiki = options.wiki;
|
|
this.host = this.getHost();
|
|
this.recipe = undefined;
|
|
this.hasStatus = false;
|
|
this.logger = new $tw.utils.Logger("TiddlyWebAdaptor");
|
|
this.isLoggedIn = false;
|
|
this.isReadOnly = false;
|
|
}
|
|
|
|
TiddlyWebAdaptor.prototype.name = "tiddlyweb";
|
|
|
|
TiddlyWebAdaptor.prototype.supportsLazyLoading = true;
|
|
|
|
TiddlyWebAdaptor.prototype.setLoggerSaveBuffer = function(loggerForSaving) {
|
|
this.logger.setSaveBuffer(loggerForSaving);
|
|
};
|
|
|
|
TiddlyWebAdaptor.prototype.isReady = function() {
|
|
return this.hasStatus;
|
|
};
|
|
|
|
TiddlyWebAdaptor.prototype.getHost = function() {
|
|
var text = this.wiki.getTiddlerText(CONFIG_HOST_TIDDLER,DEFAULT_HOST_TIDDLER),
|
|
substitutions = [
|
|
{name: "protocol", value: document.location.protocol},
|
|
{name: "host", value: document.location.host}
|
|
];
|
|
for(var t=0; t<substitutions.length; t++) {
|
|
var s = substitutions[t];
|
|
text = $tw.utils.replaceString(text,new RegExp("\\$" + s.name + "\\$","mg"),s.value);
|
|
}
|
|
return text;
|
|
};
|
|
|
|
TiddlyWebAdaptor.prototype.getTiddlerInfo = function(tiddler) {
|
|
return {
|
|
bag: tiddler.fields.bag
|
|
};
|
|
};
|
|
|
|
TiddlyWebAdaptor.prototype.getTiddlerRevision = function(title) {
|
|
var tiddler = this.wiki.getTiddler(title);
|
|
return tiddler.fields.revision;
|
|
};
|
|
|
|
/*
|
|
Get the current status of the TiddlyWeb connection
|
|
*/
|
|
TiddlyWebAdaptor.prototype.getStatus = function(callback) {
|
|
// Get status
|
|
var self = this;
|
|
this.logger.log("Getting status");
|
|
$tw.utils.httpRequest({
|
|
url: this.host + "status",
|
|
callback: function(err,data) {
|
|
self.hasStatus = true;
|
|
if(err) {
|
|
return callback(err);
|
|
}
|
|
// Decode the status JSON
|
|
var json = null;
|
|
try {
|
|
json = JSON.parse(data);
|
|
} catch (e) {
|
|
}
|
|
if(json) {
|
|
self.logger.log("Status:",data);
|
|
// Record the recipe
|
|
if(json.space) {
|
|
self.recipe = json.space.recipe;
|
|
}
|
|
// Check if we're logged in
|
|
self.isLoggedIn = json.username !== "GUEST";
|
|
self.isReadOnly = !!json["read_only"];
|
|
self.isAnonymous = !!json.anonymous;
|
|
}
|
|
// Invoke the callback if present
|
|
if(callback) {
|
|
callback(null,self.isLoggedIn,json.username,self.isReadOnly,self.isAnonymous);
|
|
}
|
|
}
|
|
});
|
|
};
|
|
|
|
/*
|
|
Attempt to login and invoke the callback(err)
|
|
*/
|
|
TiddlyWebAdaptor.prototype.login = function(username,password,callback) {
|
|
var options = {
|
|
url: this.host + "challenge/tiddlywebplugins.tiddlyspace.cookie_form",
|
|
type: "POST",
|
|
data: {
|
|
user: username,
|
|
password: password,
|
|
tiddlyweb_redirect: "/status" // workaround to marginalize automatic subsequent GET
|
|
},
|
|
callback: function(err) {
|
|
callback(err);
|
|
}
|
|
};
|
|
this.logger.log("Logging in:",options);
|
|
$tw.utils.httpRequest(options);
|
|
};
|
|
|
|
/*
|
|
*/
|
|
TiddlyWebAdaptor.prototype.logout = function(callback) {
|
|
var options = {
|
|
url: this.host + "logout",
|
|
type: "POST",
|
|
data: {
|
|
csrf_token: this.getCsrfToken(),
|
|
tiddlyweb_redirect: "/status" // workaround to marginalize automatic subsequent GET
|
|
},
|
|
callback: function(err,data) {
|
|
callback(err);
|
|
}
|
|
};
|
|
this.logger.log("Logging out:",options);
|
|
$tw.utils.httpRequest(options);
|
|
};
|
|
|
|
/*
|
|
Retrieve the CSRF token from its cookie
|
|
*/
|
|
TiddlyWebAdaptor.prototype.getCsrfToken = function() {
|
|
var regex = /^(?:.*; )?csrf_token=([^(;|$)]*)(?:;|$)/,
|
|
match = regex.exec(document.cookie),
|
|
csrf = null;
|
|
if (match && (match.length === 2)) {
|
|
csrf = match[1];
|
|
}
|
|
return csrf;
|
|
};
|
|
|
|
/*
|
|
Get an array of skinny tiddler fields from the server
|
|
*/
|
|
TiddlyWebAdaptor.prototype.getSkinnyTiddlers = function(callback) {
|
|
var self = this;
|
|
$tw.utils.httpRequest({
|
|
url: this.host + "recipes/" + this.recipe + "/tiddlers.json",
|
|
data: {
|
|
filter: "[all[tiddlers]] -[[$:/isEncrypted]] -[prefix[$:/temp/]] -[prefix[$:/status/]]"
|
|
},
|
|
callback: function(err,data) {
|
|
// Check for errors
|
|
if(err) {
|
|
return callback(err);
|
|
}
|
|
// Process the tiddlers to make sure the revision is a string
|
|
var tiddlers = JSON.parse(data);
|
|
for(var t=0; t<tiddlers.length; t++) {
|
|
tiddlers[t] = self.convertTiddlerFromTiddlyWebFormat(tiddlers[t]);
|
|
}
|
|
// Invoke the callback with the skinny tiddlers
|
|
callback(null,tiddlers);
|
|
}
|
|
});
|
|
};
|
|
|
|
/*
|
|
Save a tiddler and invoke the callback with (err,adaptorInfo,revision)
|
|
*/
|
|
TiddlyWebAdaptor.prototype.saveTiddler = function(tiddler,callback) {
|
|
var self = this;
|
|
if(this.isReadOnly) {
|
|
return callback(null);
|
|
}
|
|
$tw.utils.httpRequest({
|
|
url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(tiddler.fields.title),
|
|
type: "PUT",
|
|
headers: {
|
|
"Content-type": "application/json"
|
|
},
|
|
data: this.convertTiddlerToTiddlyWebFormat(tiddler),
|
|
callback: function(err,data,request) {
|
|
if(err) {
|
|
return callback(err);
|
|
}
|
|
// Save the details of the new revision of the tiddler
|
|
var etagInfo = self.parseEtag(request.getResponseHeader("Etag"));
|
|
// Invoke the callback
|
|
callback(null,{
|
|
bag: etagInfo.bag
|
|
}, etagInfo.revision);
|
|
}
|
|
});
|
|
};
|
|
|
|
/*
|
|
Load a tiddler and invoke the callback with (err,tiddlerFields)
|
|
*/
|
|
TiddlyWebAdaptor.prototype.loadTiddler = function(title,callback) {
|
|
var self = this;
|
|
$tw.utils.httpRequest({
|
|
url: this.host + "recipes/" + encodeURIComponent(this.recipe) + "/tiddlers/" + encodeURIComponent(title),
|
|
callback: function(err,data,request) {
|
|
if(err) {
|
|
return callback(err);
|
|
}
|
|
// Invoke the callback
|
|
callback(null,self.convertTiddlerFromTiddlyWebFormat(JSON.parse(data)));
|
|
}
|
|
});
|
|
};
|
|
|
|
/*
|
|
Delete a tiddler and invoke the callback with (err)
|
|
options include:
|
|
tiddlerInfo: the syncer's tiddlerInfo for this tiddler
|
|
*/
|
|
TiddlyWebAdaptor.prototype.deleteTiddler = function(title,callback,options) {
|
|
var self = this;
|
|
if(this.isReadOnly) {
|
|
return callback(null);
|
|
}
|
|
// If we don't have a bag it means that the tiddler hasn't been seen by the server, so we don't need to delete it
|
|
var bag = options.tiddlerInfo.adaptorInfo && options.tiddlerInfo.adaptorInfo.bag;
|
|
if(!bag) {
|
|
return callback(null);
|
|
}
|
|
// Issue HTTP request to delete the tiddler
|
|
$tw.utils.httpRequest({
|
|
url: this.host + "bags/" + encodeURIComponent(bag) + "/tiddlers/" + encodeURIComponent(title),
|
|
type: "DELETE",
|
|
callback: function(err,data,request) {
|
|
if(err) {
|
|
return callback(err);
|
|
}
|
|
// Invoke the callback
|
|
callback(null);
|
|
}
|
|
});
|
|
};
|
|
|
|
/*
|
|
Convert a tiddler to a field set suitable for PUTting to TiddlyWeb
|
|
*/
|
|
TiddlyWebAdaptor.prototype.convertTiddlerToTiddlyWebFormat = function(tiddler) {
|
|
var result = {},
|
|
knownFields = [
|
|
"bag", "created", "creator", "modified", "modifier", "permissions", "recipe", "revision", "tags", "text", "title", "type", "uri"
|
|
];
|
|
if(tiddler) {
|
|
$tw.utils.each(tiddler.fields,function(fieldValue,fieldName) {
|
|
var fieldString = fieldName === "tags" ?
|
|
tiddler.fields.tags :
|
|
tiddler.getFieldString(fieldName); // Tags must be passed as an array, not a string
|
|
|
|
if(knownFields.indexOf(fieldName) !== -1) {
|
|
// If it's a known field, just copy it across
|
|
result[fieldName] = fieldString;
|
|
} else {
|
|
// If it's unknown, put it in the "fields" field
|
|
result.fields = result.fields || {};
|
|
result.fields[fieldName] = fieldString;
|
|
}
|
|
});
|
|
}
|
|
// Default the content type
|
|
result.type = result.type || "text/vnd.tiddlywiki";
|
|
return JSON.stringify(result,null,$tw.config.preferences.jsonSpaces);
|
|
};
|
|
|
|
/*
|
|
Convert a field set in TiddlyWeb format into ordinary TiddlyWiki5 format
|
|
*/
|
|
TiddlyWebAdaptor.prototype.convertTiddlerFromTiddlyWebFormat = function(tiddlerFields) {
|
|
var self = this,
|
|
result = {};
|
|
// Transfer the fields, pulling down the `fields` hashmap
|
|
$tw.utils.each(tiddlerFields,function(element,title,object) {
|
|
if(title === "fields") {
|
|
$tw.utils.each(element,function(element,subTitle,object) {
|
|
result[subTitle] = element;
|
|
});
|
|
} else {
|
|
result[title] = tiddlerFields[title];
|
|
}
|
|
});
|
|
// Make sure the revision is expressed as a string
|
|
if(typeof result.revision === "number") {
|
|
result.revision = result.revision.toString();
|
|
}
|
|
// Some unholy freaking of content types
|
|
if(result.type === "text/javascript") {
|
|
result.type = "application/javascript";
|
|
} else if(!result.type || result.type === "None") {
|
|
result.type = "text/x-tiddlywiki";
|
|
}
|
|
return result;
|
|
};
|
|
|
|
/*
|
|
Split a TiddlyWeb Etag into its constituent parts. For example:
|
|
|
|
```
|
|
"system-images_public/unsyncedIcon/946151:9f11c278ccde3a3149f339f4a1db80dd4369fc04"
|
|
```
|
|
|
|
Note that the value includes the opening and closing double quotes.
|
|
|
|
The parts are:
|
|
|
|
```
|
|
<bag>/<title>/<revision>:<hash>
|
|
```
|
|
*/
|
|
TiddlyWebAdaptor.prototype.parseEtag = function(etag) {
|
|
var firstSlash = etag.indexOf("/"),
|
|
lastSlash = etag.lastIndexOf("/"),
|
|
colon = etag.lastIndexOf(":");
|
|
if(firstSlash === -1 || lastSlash === -1 || colon === -1) {
|
|
return null;
|
|
} else {
|
|
return {
|
|
bag: decodeURIComponent(etag.substring(1,firstSlash)),
|
|
title: decodeURIComponent(etag.substring(firstSlash + 1,lastSlash)),
|
|
revision: etag.substring(lastSlash + 1,colon)
|
|
};
|
|
}
|
|
};
|
|
|
|
if($tw.browser && document.location.protocol.substr(0,4) === "http" ) {
|
|
exports.adaptorClass = TiddlyWebAdaptor;
|
|
}
|
|
|
|
})();
|