git ssb - wip import with ssb-ebt data · mixmix/ticktack@69fecb32

Commit 69fecb32f29fb953037e1e0b67db4d89bb1cab8b

wip import with ssb-ebt data

mix irving committed on 5/23/2018, 9:00:58 AM
Parent: 45747ccda7b06223e42c0ead8833c062687d0d80

Files changed

app/html/app.js	changed
ftu/app.js	changed
package-lock.json	changed
package.json	changed

app/html/app.jsView
		@@ -42,23 +42,24 @@
42	42	}
43	43	})
44	44
45	45	function getMySeq (server) {
46		- server.ebt.remoteFeedSequence((err, data) => {
47		- server.latestSequence(server.id, (err, seq) => {
48		- console.log(`${count} mins`)
49		- count = count + 1
50		- console.log('actual seq:', seq)
51		- console.log(JSON.stringify(data, null, 2))
52		- console.log('ticktack pubs', [
53		- '@7xMrWP8708+LDvaJrRMRQJEixWYp4Oipa9ohqY7+NyQ=.ed25519',
54		- '@MflVZCcOBOUe6BLrm/8TyirkTu9/JtdnIJALcd8v5bc=.ed25519'
55		- ])
56		- console.log('------------------')
57		- })
58		- })
	46	+ console.log('REMOVE THIS')
	47	+ // server.ebt.peerStatus(server.id, err, data) => {
	48	+ // server.latestSequence(server.id, (err, seq) => {
	49	+ // console.log(`${count} mins`)
	50	+ // count = count + 1
	51	+ // console.log('actual seq:', seq)
	52	+ // console.log(JSON.stringify(data, null, 2))
	53	+ // console.log('ticktack pubs', [
	54	+ // '@7xMrWP8708+LDvaJrRMRQJEixWYp4Oipa9ohqY7+NyQ=.ed25519',
	55	+ // '@MflVZCcOBOUe6BLrm/8TyirkTu9/JtdnIJALcd8v5bc=.ed25519'
	56	+ // ])
	57	+ // console.log('------------------')
	58	+ // })
	59	+ // })
59	60
60		- setTimeout(() => getMySeq(server), 60000)
	61	+ // setTimeout(() => getMySeq(server), 60000)
61	62	}
62	63
63	64	function renderLocation (loc) {
64	65	var page = api.router.sync.router(loc)

ftu/app.jsView
		@@ -23,15 +23,14 @@
23	23	exports.gives = nest('ftu.app')
24	24
25	25	exports.needs = nest({
26	26	'styles.css': 'reduce',
27		- 'translations.sync.strings': 'first',
	27	+ 'translations.sync.strings': 'first'
28	28	})
29	29
30	30	exports.create = (api) => {
31	31	return nest({
32		- 'ftu.app': function app() {
33		-
	32	+ 'ftu.app': function app () {
34	33	const strings = api.translations.sync.strings()
35	34
36	35	const css = values(api.styles.css()).join('\n')
37	36	insertCss(css)
		@@ -53,9 +52,9 @@
53	52
54	53	var importProcess = h('Page -ftu', [
55	54	h('div.content', [
56	55	h('h1', strings.backup.import.header),
57		- h('p', [strings.backup.import.synchronizeMessage, state.currentSequence, '/', state.latestSequence]),
	56	+ h('p', [strings.backup.import.synchronizeMessage, state.currentSequence, '/', state.latestSequence])
58	57	])
59	58	])
60	59
61	60	// This watcher is responsible for switching from FTU to Ticktack main app
		@@ -65,9 +64,9 @@
65	64	electron.ipcRenderer.send('import-completed')
66	65	}
67	66	})
68	67
69		- if (fs.existsSync(path.join(configFolder, "secret"))) {
	68	+ if (fs.existsSync(path.join(configFolder, 'secret'))) {
70	69	// somehow the FTU started but the identity is already in place.
71	70	// treat it as a failed import and start importing...
72	71	console.log('resuming import')
73	72	let previousData = getImportData()
		@@ -102,27 +101,24 @@
102	101
103	102	observeSequence()
104	103	})
105	104
106		-
107		-
108		-function actionCreateNewOne() {
	105	+function actionCreateNewOne () {
109	106	isBusy.set(true)
110		- const manifest = JSON.parse(fs.readFileSync(path.join(__dirname, "../manifest.json")))
	107	+ const manifest = JSON.parse(fs.readFileSync(path.join(__dirname, '../manifest.json')))
111	108	const manifestFile = path.join(configFolder, 'manifest.json')
112	109	if (!fs.existsSync(configFolder)) {
113	110	fs.mkdirSync(configFolder)
114	111	}
115	112	fs.writeFileSync(manifestFile, JSON.stringify(manifest))
116	113
117		-
118	114	electron.ipcRenderer.send('create-new-identity')
119	115	}
120	116
121		-function actionImportIdentity(strings) {
122		- const peersFile = path.join(configFolder, "gossip.json")
123		- const secretFile = path.join(configFolder, "secret")
124		- const manifest = JSON.parse(fs.readFileSync(path.join(__dirname, "../manifest.json")))
	117	+function actionImportIdentity (strings) {
	118	+ const peersFile = path.join(configFolder, 'gossip.json')
	119	+ const secretFile = path.join(configFolder, 'secret')
	120	+ const manifest = JSON.parse(fs.readFileSync(path.join(__dirname, '../manifest.json')))
125	121	const manifestFile = path.join(configFolder, 'manifest.json')
126	122
127	123	// place the other files first
128	124	dialog.showOpenDialog(
		@@ -132,19 +128,19 @@
132	128	defaultPath: 'ticktack-identity.backup',
133	129	properties: ['openFile']
134	130	},
135	131	(filenames) => {
136		- if (typeof filenames !== "undefined") {
	132	+ if (typeof filenames !== 'undefined') {
137	133	let filename = filenames[0]
138	134	let data = JSON.parse(fs.readFileSync(filename))
139		- if (data.hasOwnProperty("secret") && data.hasOwnProperty("peers") && data.hasOwnProperty("latestSequence")) {
	135	+ if (data.hasOwnProperty('secret') && data.hasOwnProperty('peers') && data.hasOwnProperty('latestSequence')) {
140	136	if (!fs.existsSync(configFolder)) {
141	137	fs.mkdirSync(configFolder)
142	138	}
143	139
144	140	fs.writeFileSync(manifestFile, JSON.stringify(manifest))
145		- fs.writeFileSync(peersFile, JSON.stringify(data.peers), "utf8")
146		- fs.writeFileSync(secretFile, data.secret, "utf8")
	141	+ fs.writeFileSync(peersFile, JSON.stringify(data.peers), 'utf8')
	142	+ fs.writeFileSync(secretFile, data.secret, 'utf8')
147	143	state.latestSequence.set(data.latestSequence)
148	144	state.currentSequence.set(0)
149	145	isPresentingOptions.set(false)
150	146
		@@ -154,18 +150,18 @@
154	150	setImportData(data)
155	151
156	152	electron.ipcRenderer.send('import-identity')
157	153	} else {
158		- console.log("> bad export file")
	154	+ console.log('> bad export file')
159	155	console.log(data)
160		- alert("Bad Export File")
	156	+ alert('Bad Export File')
161	157	}
162	158	}
163	159	}
164	160	)
165	161	}
166	162
167		-function windowControls() {
	163	+function windowControls () {
168	164	if (process.platform === 'darwin') return
169	165
170	166	const window = remote.getCurrentWindow()
171	167	const minimize = () => window.minimize()
		@@ -190,15 +186,13 @@
190	186	})
191	187	])
192	188	}
193	189
194		-
195		-function assetPath(name) {
	190	+function assetPath (name) {
196	191	return path.join(__dirname, '../assets', name)
197	192	}
198	193
199		-
200		-function getImportData() {
	194	+function getImportData () {
201	195	var importFile = path.join(configFolder, 'importing.json')
202	196	if (fs.existsSync(importFile)) {
203	197	let data = JSON.parse(fs.readFileSync(importFile))
204	198	return data \|\| false
		@@ -206,14 +200,14 @@
206	200	return false
207	201	}
208	202	}
209	203
210		-function setImportData(data) {
	204	+function setImportData (data) {
211	205	var importFile = path.join(configFolder, 'importing.json')
212	206	fs.writeFileSync(importFile, JSON.stringify(data))
213	207	}
214	208
215		-function observeSequence() {
	209	+function observeSequence () {
216	210	const pull = require('pull-stream')
217	211	const Client = require('ssb-client')
218	212	const config = require('../config').create().config.sync.load()
219	213	const _ = require('lodash')
		@@ -223,24 +217,73 @@
223	217	console.error('problem starting client', err)
224	218	} else {
225	219	console.log('> sbot running!!!!')
226	220
	221	+ ssbServer.gossip.peers((err, data) => {
	222	+ console.log('PEERS', err, data)
	223	+
	224	+ data.forEach(peer => {
	225	+ ssbServer.gossip.connect({
	226	+ 'host': peer.host,
	227	+ 'port': peer.port,
	228	+ 'key': peer.key
	229	+ }, function (err, v) {
	230	+ console.log('connected to ', peer.host)
	231	+ })
	232	+ })
	233	+ })
	234	+
	235	+ // ssbServer.gossip.connect({
	236	+ // 'host': '128.199.76.241',
	237	+ // 'port': 8008,
	238	+ // 'key': '@7xMrWP8708+LDvaJrRMRQJEixWYp4Oipa9ohqY7+NyQ=.ed25519'
	239	+ // }, function (err, v) {
	240	+ // console.log('connected to ticktack 1', err, v)
	241	+ // })
	242	+
	243	+ // ssbServer.gossip.connect({
	244	+ // 'host': '138.68.27.255',
	245	+ // 'port': 8008,
	246	+ // 'key': '@MflVZCcOBOUe6BLrm/8TyirkTu9/JtdnIJALcd8v5bc=.ed25519'
	247	+ // }, function (err, v) {
	248	+ // console.log('connected to ticktack 2', err, v)
	249	+ // })
	250	+
	251	+ // ssbServer.gossip.connect({
	252	+ // host: 'one.butt.nz',
	253	+ // key: '@VJM7w1W19ZsKmG2KnfaoKIM66BRoreEkzaVm/J//wl8=.ed25519',
	254	+ // port: 8008
	255	+ // }, function (err, v) {
	256	+ // console.log('connected to one.butt.nz', err, v)
	257	+ // checkPeers()
	258	+ // })
	259	+
	260	+ function checkPeers () {
	261	+ ssbServer.ebt.peerStatus(ssbServer.id, (err, data) => {
	262	+ console.log('PEER STATUS:')
	263	+ console.log(data.seq)
	264	+ console.log(data.peers)
	265	+ console.log('-------')
	266	+ })
	267	+
	268	+ setTimeout(checkPeers, 5000)
	269	+ }
	270	+
227	271	var feedSource = ssbServer.createUserStream({
228	272	live: true,
229	273	id: ssbServer.id
230	274	})
231	275
232	276	var valueLogger = pull.drain((msg) => {
233		- let seq = _.get(msg, "value.sequence", false)
	277	+ let seq = _.get(msg, 'value.sequence', false)
234	278	if (seq) {
235	279	state.currentSequence.set(seq)
236	280	}
237	281	})
238	282
239	283	pull(
240	284	feedSource,
241		- valueLogger,
	285	+ valueLogger
242	286	)
243		-
244	287	}
245	288	})
246		-}
	289	+}

package-lock.jsonView
The diff is too large to show. Use a local git client to view these changes. Old file size: 289973 bytes New file size: 289973 bytes

package.jsonView
		@@ -65,9 +65,9 @@
65	65	"ssb-backlinks": "^0.6.1",
66	66	"ssb-blobs": "^1.1.4",
67	67	"ssb-client": "4.5.2",
68	68	"ssb-config": "^2.2.0",
69		- "ssb-ebt": "^5.1.5",
	69	+ "ssb-ebt": "^5.2.0",
70	70	"ssb-friends": "^2.3.5",
71	71	"ssb-keys": "^7.0.10",
72	72	"ssb-markdown": "^3.3.0",
73	73	"ssb-mentions": "^0.4.0",

Built with git-ssb-web

mixmix / ticktack

Commit 69fecb32f29fb953037e1e0b67db4d89bb1cab8b

wip import with ssb-ebt data

Files changed