martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-04-24 02:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updating focus module

Browse Source
This commit is contained in:
Roland Osborne 2024-11-22 11:06:14 -08:00
parent 3c845b7381
commit 373bae70f4
4 changed files with 5248 additions and 7884 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13028
app/client/web/yarn.lock
View File

File diff suppressed because it is too large Load Diff

96
app/sdk/src/focus.ts
View File

@ -88,51 +88,6 @@ export class FocusModule implements Focus {
this.syncing = true;
const { guid, node, secure, token, channelTypes } = this;
while ((this.loadMore || this.unsealAll || this.nextRevision) && !this.closing && this.connection) {
if (this.nextRevision && this.storeView.revision !== this.nextRevision) {
const nextRev = this.nextRevision;
try {
const delta = await this.getRemoteChannelTopics(this.storeView.revision, null, this.storeView.marker);
for (const entity of delta.topics) {
const { id, revision, data } = entity;
if (data) {
const { detailRevision, topicDetail } = data;
if (!this.cacheView || this.cacheView.position > detail.created || (this.cacheView.position === detail.created && this.cacheView.topicId >= topicId)) {
const entry = await this.getTopicEntry(id);
if (detailRevision > entry.item.detail.revision) {
const detail = topicDetail ? topicDetail : await getRemoteChannelTopicDetail(id);
entry.item.detail = this.getTopicDetail(detail, detailRevision);
entry.item.unsealedDetail = null;
entry.item.position = detail.created;
await this.unsealTopicDetail(entry.item);
entry.topic = this.setTopic(id, entry.item);
await this.setLocalChannelTopicDetail(id, detail, entry.item.unsealedDetail, detail.created);
}
} else {
const item = { detail, position: detail.created, unsealedDetail: null };
await this.store.addLocalChannelTopic(id, item);
}
} else {
this.topicEntries.delete(id);
await this.store.removeLocalChannelTopic(id);
}
}
this.storeView = { revision: nextRev, marker: delta.marker };
await this.setChannelTopicRevision(this.storeView);
if (this.nextRevision === nextRev) {
this.nextRevision = null;
}
this.emitTopics();
this.log.info(`topic revision: ${nextRev}`);
} catch (err) {
this.log.warn(err);
await new Promise((r) => setTimeout(r, RETRY_POLL_MS));
}
}
if (this.storeView.revision === this.nextRevision) {
this.nextRevision = null;
}
if (this.loadMore) {
try {
@ -193,6 +148,52 @@ export class FocusModule implements Focus {
}
}
if (this.nextRevision && this.storeView.revision !== this.nextRevision) {
const nextRev = this.nextRevision;
try {
const delta = await this.getRemoteChannelTopics(this.storeView.revision, null, this.storeView.marker);
for (const entity of delta.topics) {
const { id, revision, data } = entity;
if (data) {
const { detailRevision, topicDetail } = data;
if (!this.cacheView || this.cacheView.position > detail.created || (this.cacheView.position === detail.created && this.cacheView.topicId >= topicId)) {
const entry = await this.getTopicEntry(id);
if (detailRevision > entry.item.detail.revision) {
const detail = topicDetail ? topicDetail : await getRemoteChannelTopicDetail(id);
entry.item.detail = this.getTopicDetail(detail, detailRevision);
entry.item.unsealedDetail = null;
entry.item.position = detail.created;
await this.unsealTopicDetail(entry.item);
entry.topic = this.setTopic(id, entry.item);
await this.setLocalChannelTopicDetail(id, detail, entry.item.unsealedDetail, detail.created);
}
} else {
const item = { detail, position: detail.created, unsealedDetail: null };
await this.store.addLocalChannelTopic(id, item);
}
} else {
this.topicEntries.delete(id);
await this.store.removeLocalChannelTopic(id);
}
}
this.storeView = { revision: nextRev, marker: delta.marker };
await this.setChannelTopicRevision(this.storeView);
if (this.nextRevision === nextRev) {
this.nextRevision = null;
}
this.emitTopics();
this.log.info(`topic revision: ${nextRev}`);
} catch (err) {
this.log.warn(err);
await new Promise((r) => setTimeout(r, RETRY_POLL_MS));
}
}
if (this.storeView.revision === this.nextRevision) {
this.nextRevision = null;
}
if (this.unsealAll) {
for (const [topicId, entry] of this.topicEntries.entries()) {
try {
@ -252,12 +253,14 @@ export class FocusModule implements Focus {
const topics = Array.from(this.topicEntries, ([topicId, entry]) => entry.topic);
ev(topics);
}
public removeTopicListener(ev: (topics: Topic[]) => void) {
this.emitter.off('topic', ev);
}
private emitTopics() {
const topics = Array.from(this.topicEntries, ([topicId, entry]) => entry.topic);
console.log("EMIT: ", topics);
this.emitter.emit('topic', topics);
}
@ -340,13 +343,14 @@ export class FocusModule implements Focus {
}
}
private async getTopicDetail(entity: TopicDetailEntity, revision: number) {
private getTopicDetail(entity: TopicDetailEntity, revision: number) {
const { guid, dataType, data, created, updated, status, transform } = entity;
return {
revision,
guid,
sealed: false, //todo
data: {}, //todo
dataType,
assets: [], //todo
created,
updated,

4
app/sdk/src/net/getChannelTopics.ts
View File

@ -7,8 +7,8 @@ export async function getChannelTopics(node: string, secure: boolean, token: str
const topics = await fetchWithTimeout(endpoint, { method: 'GET' });
checkResponse(topics.status);
return {
marker: topics.headers.get('topic-marker'),
revision: topics.headers.get('topic-revision'),
marker: parseInt(topics.headers.get('topic-marker')),
revision: parseInt(topics.headers.get('topic-revision')),
topics: await topics.json(),
}
}

4
app/sdk/src/net/getContactChannelTopics.ts
View File

@ -7,8 +7,8 @@ export async function getContactChannelTopics(node: string, secure: boolean, gui
const topics = await fetchWithTimeout(endpoint, { method: 'GET' });
checkResponse(topics.status);
return {
marker: topics.headers.get('topic-marker'),
revision: topics.headers.get('topic-revision'),
marker: parseInt(topics.headers.get('topic-marker')),
revision: parseInt(topics.headers.get('topic-revision')),
topics: await topics.json(),
}
}