mirror of
https://github.com/amark/gun.git
synced 2025-03-30 15:08:33 +00:00
Merge branch 'master' into dev
This commit is contained in:
Mark Nadal
commit
996db1a42e
38
lib/metae.js
Normal file
38
lib/metae.js
Normal file
@ -0,0 +1,38 @@
|
||||
$(function(){
|
||||
var m = window.meta = {edit:[], os:{}}, ua = '';
|
||||
try{ua = navigator.userAgent.toLowerCase()}catch(e){}
|
||||
m.os.is = {
|
||||
win: (ua.search("win") >= 0)? "windows":false,
|
||||
lin: (ua.search("linux") >= 0)? "linux":false,
|
||||
mac: (ua.search("mac") >= 0)? "macintosh":false,
|
||||
and: (ua.search("android") >= 0)? "android":false,
|
||||
ios: (ua.search('ipod') >= 0
|
||||
|| ua.search('iphone') >= 0
|
||||
|| ua.search('ipad') >= 0)? "ios":false
|
||||
}
|
||||
m.key = {ctrl: 17, cmd: 91};
|
||||
m.key.meta = (m.os.is.win||m.os.is.lin||m.os.is.and)? m.key.ctrl : m.key.cmd;
|
||||
m.key.on = {};
|
||||
$(document).on('keydown', function(e){
|
||||
m.e = e;
|
||||
console.log('keydown', e.keyCode);
|
||||
m.key.on[e.code = e.keyCode] = !0;
|
||||
}).on('keyup', function(e){
|
||||
m.e = e;
|
||||
delete m.key.on[e.code = e.keyCode];
|
||||
}).on('keydown', '[contenteditable=true]', function(e){
|
||||
return;
|
||||
var r = monotype();
|
||||
console.log("keys down", Gun.obj.copy(m.key.on));
|
||||
$.each(m.edit, function(i,edit){ var tmp = true;
|
||||
$.each(edit.keys||[''], function(i,k){
|
||||
if(!m.key.on[k.length? k.charCodeAt(0) : k]){ tmp = false }
|
||||
});
|
||||
console.log(tmp, edit);
|
||||
})
|
||||
r.restore();
|
||||
});
|
||||
m.edit.push({keys: ['B'], on: function(){
|
||||
console.log('hi!');
|
||||
}})
|
||||
});
|
||||
230
lib/monotype.js
Normal file
230
lib/monotype.js
Normal file
@ -0,0 +1,230 @@
|
||||
;var monotype = monotype || (function(monotype){
|
||||
monotype.range = function(n){
|
||||
var R, s, t, n = n || 0, win = monotype.win || window, doc = win.document;
|
||||
if(!arguments.length) return doc.createRange();
|
||||
if(!(win.Range && R instanceof Range)){
|
||||
s = win.getSelection? win.getSelection() : {};
|
||||
if(s.rangeCount){
|
||||
R = s.getRangeAt(n);
|
||||
} else {
|
||||
if(doc.createRange){
|
||||
R = doc.createRange();
|
||||
R.setStart(doc.body, 0);
|
||||
} else
|
||||
if (doc.selection){ // <IE9
|
||||
R = doc.selection.createRange();
|
||||
R = R.getBookmark();
|
||||
}
|
||||
}
|
||||
s.end = (s.extentNode || s.focusNode || R.startContainer);
|
||||
if(s.anchorNode === s.end){
|
||||
R.direction = s.anchorOffset <= (s.extentOffset || s.focusOffset || 0)? 1 : -1;
|
||||
} else
|
||||
if($.contains(s.anchorNode||{}, s.end||{})){
|
||||
s.end = $(s.anchorNode).contents().filter(s.end).length? s.end : $(s.end).parentsUntil(s.anchorNode).last()[0];
|
||||
R.direction = s.anchorOffset < $(s.anchorNode).contents().index(s.end)? 1 : -1; // Compare immediate descendants to see which comes first.
|
||||
} else {
|
||||
R.direction = s.anchorNode === R.endContainer? -1 : 1; // Checking against startContainer fails going backward.
|
||||
}
|
||||
}
|
||||
return R;
|
||||
}
|
||||
monotype.restore = function(R){
|
||||
var win = monotype.win, doc = win.document;
|
||||
if(R.R && R.restore){
|
||||
R.restore();
|
||||
return;
|
||||
}
|
||||
if(win.getSelection){
|
||||
var s = win.getSelection();
|
||||
s.removeAllRanges();
|
||||
if(s.extend && R.direction < 0){
|
||||
R.esC = R.startContainer;
|
||||
R.esO = R.startOffset;
|
||||
R.setStart(R.endContainer, R.endOffset);
|
||||
}
|
||||
s.addRange(R);
|
||||
R.esC && s.extend(R.esC, R.esO);
|
||||
} else {
|
||||
if(doc.body.createTextRange) { // <IE9
|
||||
var ier = doc.body.createTextRange();
|
||||
ier.moveToBookmark(R);
|
||||
ier.select();
|
||||
}
|
||||
}
|
||||
}
|
||||
monotype.text = function(n){
|
||||
return !n? false : (n.nodeType == 3 || n.nodeType == Node.TEXT_NODE);
|
||||
}
|
||||
monotype.prev = function(n,c,d){
|
||||
return !n? null : n === c? null
|
||||
: n[(d?'next':'previous')+'Sibling']?
|
||||
monotype.deep(n[(d?'next':'previous')+'Sibling'],d?-1:Infinity).container
|
||||
: monotype.prev($(n).parent()[0],c,d);
|
||||
}; monotype.next = function(n,c){ return monotype.prev(n,c,1) }
|
||||
monotype.deep = function(n, o, c, i){
|
||||
return i = (o === Infinity? $(n).contents().length-1 : o),
|
||||
i = (i === -1? 0 : i),
|
||||
(c = $(n).contents()).length?
|
||||
monotype.deep(c = c[i < c.length? i : c.length - 1], monotype.text(c)? 0 : o)
|
||||
: {
|
||||
container: n
|
||||
,offset: $(n).text() && o !== -1? (o === Infinity? $(n).text().length : o) : 0
|
||||
};
|
||||
}
|
||||
monotype.count = function(n, o, c){
|
||||
var g = monotype.deep(n, o)
|
||||
, m = g.container
|
||||
, i = g.offset || 0;
|
||||
while(m = monotype.prev(m,c)){
|
||||
i += $(m).text().length;
|
||||
}
|
||||
return i;
|
||||
}
|
||||
monotype.hint = function(n, o, c){
|
||||
var g = monotype.deep(n, o)
|
||||
, m = g.container
|
||||
, i = g.offset || 0
|
||||
, h = [], t;
|
||||
while(m){
|
||||
h.push({
|
||||
t: t = $(m).text()
|
||||
,n: t? 'TEXT' : m.nodeName
|
||||
});
|
||||
m = t? null : monotype.prev(m,c);
|
||||
}
|
||||
if(h.length == 1 && h[0].t){
|
||||
return [];
|
||||
}
|
||||
if((t = $(n).contents()).length && o == t.length){
|
||||
h.push(1); // Indicate that the selection is after the last element.
|
||||
}
|
||||
return h;
|
||||
}
|
||||
monotype.reach = function(i, c, o){
|
||||
o = o || {};
|
||||
o.i = o.i || o.offset || 0;
|
||||
o.$ = o.$? o.$.jquery? o.$ : $(o.$)
|
||||
: o.container? $(o.container) : $(c);
|
||||
var n = monotype.deep(o.$[0], -1).container, t;
|
||||
while(n){
|
||||
t = $(n).text().length;
|
||||
if(i <= o.i + t){
|
||||
o.$ = $(n);
|
||||
o.i = i - o.i;
|
||||
n = null;
|
||||
} else {
|
||||
o.i += t;
|
||||
}
|
||||
n = monotype.next(n,c);
|
||||
}
|
||||
return o;
|
||||
}
|
||||
return monotype;
|
||||
})(function(r,opt){
|
||||
r = r || {};
|
||||
opt = opt || {};
|
||||
monotype.win = opt.win || window;
|
||||
r = r.jquery || monotype.text(r)? {root: $(r)} : r;
|
||||
r.root = $(r.root || monotype.win.document.body);
|
||||
var t, m = monotype;
|
||||
//console.log('_______________________');
|
||||
r.R = m.range(0);
|
||||
r.H = {};
|
||||
r.H.R = $.extend({}, r.R);
|
||||
r.d = r.R.direction || 1;
|
||||
r.t = r.R.toString();
|
||||
r.H.s = m.hint(r.R.startContainer, r.R.startOffset, r.root[0]);
|
||||
r.s = m.count(r.R.startContainer, r.R.startOffset, r.root[0]);
|
||||
t = m.deep(r.R.startContainer, r.R.startOffset);
|
||||
(!t.offset && !r.H.s.length) && (r.s += 0.1); // At the beginning of a text, not at the end of a text.
|
||||
r.H.e = m.hint(r.R.endContainer, r.R.endOffset, r.root[0]);
|
||||
r.e = (function(n, o, c, t){
|
||||
if(r.R.collapsed
|
||||
|| (o === r.R.startOffset
|
||||
&& n === r.R.startContainer)){
|
||||
return r.s;
|
||||
} c = m.count(n, o, r.root[0]);
|
||||
t = m.deep(n, o);
|
||||
(!t.offset && !r.H.e.length) && (c += 0.1); // Same as above.
|
||||
return c;
|
||||
})(r.R.endContainer, r.R.endOffset);
|
||||
//console.log(r.s, r.R.startOffset, r.H.s, 'M',r.d,'E', r.H.e, r.R.endOffset, r.e);
|
||||
t = r.root.text();
|
||||
r.L = t.length;
|
||||
r.T = {
|
||||
s: t.slice(r.s - 9, r.s)
|
||||
,e: t.slice(r.e, r.e + 9)
|
||||
,t: function(){ return r.T.s + r.T.e }
|
||||
}
|
||||
r.range = function(){
|
||||
//console.log('----');
|
||||
r.H = r.H || {};
|
||||
var s = m.reach(r.s, r.root[0])
|
||||
, st = s.$.text()
|
||||
, e = m.reach(r.e, r.root[0])
|
||||
, et = e.$.text()
|
||||
, R = m.range()
|
||||
, p = function(g, c){ // TODO: BUG! Backtracking in non-Chrome and non-IE9+ browsers. IE9 doesn't like end selections.
|
||||
if(!c || !c.length){
|
||||
return g;
|
||||
}
|
||||
var n = g.$[0], f = [], i = 0, t;
|
||||
while((n = m.next(n,r.root[0])) && ++i < c.length){
|
||||
t = $(n).text();
|
||||
if(t){
|
||||
n = null;
|
||||
} else {
|
||||
f.push(n);
|
||||
}
|
||||
}
|
||||
n = $(f[f.length-1] || g.$);
|
||||
t = n.parent();
|
||||
if(c[c.length-1] === 1 || (i && f.length === i
|
||||
&& (f.length < c.length-1))){ // tests pass with this condition, yet failed without
|
||||
return {
|
||||
i: t.contents().length
|
||||
,$: t
|
||||
}
|
||||
}
|
||||
if(f.length < c.length - 1){ // despite above's addition, this still gets activated.
|
||||
f = t.contents().slice(n = t.contents().index(n));
|
||||
i = f.map(function(j){ return $(this).text()? (n+j+1) : null})[0] || t.contents().length;
|
||||
f = f.slice(0, i - n);
|
||||
n = f.last()[0];
|
||||
if(g.$[0] === n){
|
||||
return g;
|
||||
}
|
||||
return {
|
||||
$: t
|
||||
,i: t.contents().index(n)
|
||||
}
|
||||
}
|
||||
return {
|
||||
i: 0
|
||||
,$: n
|
||||
};
|
||||
}
|
||||
s = p(s, r.H.s);
|
||||
e = p(e, r.H.e);
|
||||
//console.log("START", parseInt(s.i), 'in """',(s.$[0]),'""" with hint of', r.H.s, 'from original', r.s);
|
||||
//console.log("END", parseInt(e.i), 'in """',(e.$[0]),'""" hint clue of', r.H.e, 'from original', r.e);
|
||||
R.setStart(s.$[0], parseInt(s.i));
|
||||
R.setEnd(e.$[0], parseInt(e.i));
|
||||
return R;
|
||||
}
|
||||
r.restore = function(R){
|
||||
if(r.R.startOffset !== r.H.R.startOffset
|
||||
|| r.R.endOffset !== r.H.R.endOffset
|
||||
|| r.R.startContainer !== r.H.R.startContainer
|
||||
|| r.R.endContainer !== r.H.R.endContainer){
|
||||
r.R = R = r.range();
|
||||
} else {
|
||||
R = r.R;
|
||||
}
|
||||
R.direction = r.d;
|
||||
m.restore(R);
|
||||
return r;
|
||||
}
|
||||
return r;
|
||||
});
|
||||
@ -9,6 +9,7 @@
|
||||
fn && fn(a);
|
||||
});
|
||||
})
|
||||
return el;
|
||||
};
|
||||
var n = normalize, u;
|
||||
n.get = function(o, p){
|
||||
@ -97,31 +98,29 @@
|
||||
,function(a, tmp){ // convert
|
||||
if(!(tmp = n.get(a.opt,'convert.' + a.tag))){ return }
|
||||
a.attr = a.attr || n.attrs(a.$);
|
||||
a.$.replaceWith(a.$ = $('<'+ (a.tag = t.toLowerCase()) +'>').append(a.$.contents()));
|
||||
a.$.replaceWith(a.$ = $('<'+ (a.tag = tmp.toLowerCase()) +'>').append(a.$.contents()));
|
||||
h.attr(a.$, a.attr, a.attrs);
|
||||
}
|
||||
,function(a, tmp){ // lookahead
|
||||
if((tmp = n.joint(a.$,1)) && (t = t.contents()).length === 1 && a.tag === n.tag(t = t.first())){
|
||||
a.$.append(t.parent()); // no need to unwrap the child, since the recursion will do it for us
|
||||
if((tmp = n.joint(a.$,1)) && (tmp = tmp.contents()).length === 1 && a.tag === n.tag(tmp = tmp.first())){
|
||||
a.$.append(tmp.parent()); // no need to unwrap the child, since the recursion will do it for us
|
||||
}
|
||||
}
|
||||
,function(a){ // recurse
|
||||
// this needs to precede the exclusion and empty.
|
||||
normalize(a);
|
||||
}
|
||||
,function(a){ // exclude
|
||||
var t;
|
||||
,function(a, tmp){ // exclude
|
||||
if(!n.get(a.opt,'tags.' + a.tag)
|
||||
|| ((t = n.get(a.opt,'tags.'+ a.tag +'.exclude'))
|
||||
&& a.$.parents($.map(t,function(i,v){return v})+' ').length)
|
||||
|| ((tmp = n.get(a.opt,'tags.'+ a.tag +'.exclude'))
|
||||
&& a.$.parents($.map(tmp,function(i,v){return v})+' ').length)
|
||||
){
|
||||
a.$.replaceWith(a.$.contents());
|
||||
}
|
||||
}
|
||||
,function(a){ // prior
|
||||
var t;
|
||||
if((t = n.joint(a.$)).length && a.tag === n.tag(t)){
|
||||
t.append(a.$.contents());
|
||||
,function(a, tmp){ // prior
|
||||
if((tmp = n.joint(a.$)).length && a.tag === n.tag(tmp)){
|
||||
tmp.append(a.$.contents());
|
||||
}
|
||||
}
|
||||
,function(a){ // empty
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "gun",
|
||||
"version": "0.9.999992",
|
||||
"version": "0.9.999993",
|
||||
"description": "A realtime, decentralized, offline-first, graph data synchronization engine.",
|
||||
"main": "index.js",
|
||||
"browser": "gun.min.js",
|
||||
|
||||
18
sea.js
18
sea.js
@ -428,7 +428,7 @@
|
||||
SEA.verify = SEA.verify || (async (data, pair, cb, opt) => { try {
|
||||
const json = parse(data)
|
||||
if(false === pair){ // don't verify!
|
||||
const raw = (json !== data)?
|
||||
const raw = (json !== data)?
|
||||
(json.s && json.m)? parse(json.m) : data
|
||||
: json;
|
||||
if(cb){ try{ cb(raw) }catch(e){console.log(e)} }
|
||||
@ -441,11 +441,17 @@
|
||||
const jwk = S.jwk(pub)
|
||||
const key = await (shim.ossl || shim.subtle).importKey('jwk', jwk, S.ecdsa.pair, false, ['verify'])
|
||||
const hash = await sha256hash(json.m)
|
||||
var buf; try{buf = shim.Buffer.from(json.s, opt.encode || 'base64') // NEW DEFAULT!
|
||||
}catch(e){buf = shim.Buffer.from(json.s, 'utf8')} // AUTO BACKWARD OLD UTF8 DATA!
|
||||
const sig = new Uint8Array(buf)
|
||||
const check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
var buf; var sig; var check; try{
|
||||
buf = shim.Buffer.from(json.s, opt.encode || 'base64') // NEW DEFAULT!
|
||||
sig = new Uint8Array(buf)
|
||||
check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
}catch(e){
|
||||
buf = shim.Buffer.from(json.s, 'utf8') // AUTO BACKWARD OLD UTF8 DATA!
|
||||
sig = new Uint8Array(buf)
|
||||
check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
}
|
||||
const r = check? parse(json.m) : u;
|
||||
|
||||
if(cb){ try{ cb(r) }catch(e){console.log(e)} }
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
SEA.verify = SEA.verify || (async (data, pair, cb, opt) => { try {
|
||||
const json = parse(data)
|
||||
if(false === pair){ // don't verify!
|
||||
const raw = (json !== data)?
|
||||
const raw = (json !== data)?
|
||||
(json.s && json.m)? parse(json.m) : data
|
||||
: json;
|
||||
if(cb){ try{ cb(raw) }catch(e){console.log(e)} }
|
||||
@ -22,11 +22,17 @@
|
||||
const jwk = S.jwk(pub)
|
||||
const key = await (shim.ossl || shim.subtle).importKey('jwk', jwk, S.ecdsa.pair, false, ['verify'])
|
||||
const hash = await sha256hash(json.m)
|
||||
var buf; try{buf = shim.Buffer.from(json.s, opt.encode || 'base64') // NEW DEFAULT!
|
||||
}catch(e){buf = shim.Buffer.from(json.s, 'utf8')} // AUTO BACKWARD OLD UTF8 DATA!
|
||||
const sig = new Uint8Array(buf)
|
||||
const check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
var buf; var sig; var check; try{
|
||||
buf = shim.Buffer.from(json.s, opt.encode || 'base64') // NEW DEFAULT!
|
||||
sig = new Uint8Array(buf)
|
||||
check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
}catch(e){
|
||||
buf = shim.Buffer.from(json.s, 'utf8') // AUTO BACKWARD OLD UTF8 DATA!
|
||||
sig = new Uint8Array(buf)
|
||||
check = await (shim.ossl || shim.subtle).verify(S.ecdsa.sign, key, sig, new Uint8Array(hash))
|
||||
if(!check){ throw "Signature did not match." }
|
||||
}
|
||||
const r = check? parse(json.m) : u;
|
||||
|
||||
if(cb){ try{ cb(r) }catch(e){console.log(e)} }
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user