Working single post rendering
This commit is contained in:
16
src/App.ts
16
src/App.ts
@@ -236,10 +236,19 @@ export class App {
|
|||||||
for (let userID of userIDs) {
|
for (let userID of userIDs) {
|
||||||
// console.log.apply(null, log(`[app] announceUsers, got user:${userID} from peer ${sendingPeerID}`));
|
// console.log.apply(null, log(`[app] announceUsers, got user:${userID} from peer ${sendingPeerID}`));
|
||||||
this.sync.addUserPeer(userID, sendingPeerID);
|
this.sync.addUserPeer(userID, sendingPeerID);
|
||||||
if (!(this.sync.shouldSyncUserID(userID) || (this.router.route & (App.Route.USER | App.Route.POST) && userID === this.router.userID))) {
|
|
||||||
|
const isUserOrPostRoute = (this.router.route & (App.Route.USER | App.Route.POST)) !== 0;
|
||||||
|
|
||||||
|
if (isUserOrPostRoute) {
|
||||||
|
if (userID !== this.router.userID) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (!this.sync.shouldSyncUserID(userID)) {
|
||||||
console.log.apply(null, log(`[app] announceUser_rpc_response skipping user[${logID(userID)}] from[${logID(sendingPeerID)}]`));
|
console.log.apply(null, log(`[app] announceUser_rpc_response skipping user[${logID(userID)}] from[${logID(sendingPeerID)}]`));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
console.log.apply(null, log(`[app] calling getPostIDsForUser for user [${logID(userID)}] on peer [${logID(sendingPeerID)}]`));
|
console.log.apply(null, log(`[app] calling getPostIDsForUser for user [${logID(userID)}] on peer [${logID(sendingPeerID)}]`));
|
||||||
this.statusBar.updatePeerStatus(sendingPeerID, `getPostIDs(${logID(userID)})⬆️`);
|
this.statusBar.updatePeerStatus(sendingPeerID, `getPostIDs(${logID(userID)})⬆️`);
|
||||||
@@ -1091,7 +1100,10 @@ export class App {
|
|||||||
let posts: StoragePost[] = [];
|
let posts: StoragePost[] = [];
|
||||||
|
|
||||||
if (postID) {
|
if (postID) {
|
||||||
posts = await getPostForUser(userID, postID);
|
const post = await getPostForUser(userID, postID);
|
||||||
|
|
||||||
|
posts = post ? [post] : [];
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
posts = await getData(userID, new Date(2022, 8), new Date());
|
posts = await getData(userID, new Date(2022, 8), new Date());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -538,7 +538,7 @@ class PeerConnection {
|
|||||||
private chunkSize = (16 * 1024) - 100;
|
private chunkSize = (16 * 1024) - 100;
|
||||||
messageSuperlog: boolean = false;
|
messageSuperlog: boolean = false;
|
||||||
sendQueueSuperLog: boolean = false;
|
sendQueueSuperLog: boolean = false;
|
||||||
rpcSuperlog: boolean = true;
|
rpcSuperlog: boolean = false;
|
||||||
pendingRPCs: Map<
|
pendingRPCs: Map<
|
||||||
string,
|
string,
|
||||||
{ resolve: Function; reject: Function; functionName: string }
|
{ resolve: Function; reject: Function; functionName: string }
|
||||||
@@ -553,12 +553,7 @@ class PeerConnection {
|
|||||||
static config = {
|
static config = {
|
||||||
iceServers: [
|
iceServers: [
|
||||||
{ urls: "stun:ddln.app" },
|
{ urls: "stun:ddln.app" },
|
||||||
// { urls: "turn:ddln.app", username: "a", credential: "b" },
|
{ urls: "turn:ddln.app", username: "ddln1", credential: "ddln1" },
|
||||||
{ urls: "stun:stun.l.google.com" }, // keeping this for now as my STUN server is not returning ipv6
|
|
||||||
{ urls: "stun:stun1.l.google.com" },
|
|
||||||
//{ urls: "stun:stun2.l.google.com" },
|
|
||||||
//{ urls: "stun:stun3.l.google.com" },
|
|
||||||
//{ urls: "stun:stun4.l.google.com" },
|
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
// longMessageQueue: string[] = [];
|
// longMessageQueue: string[] = [];
|
||||||
|
|||||||
@@ -172,10 +172,18 @@ export class App {
|
|||||||
for (let userID of userIDs) {
|
for (let userID of userIDs) {
|
||||||
// console.log.apply(null, log(`[app] announceUsers, got user:${userID} from peer ${sendingPeerID}`));
|
// console.log.apply(null, log(`[app] announceUsers, got user:${userID} from peer ${sendingPeerID}`));
|
||||||
this.sync.addUserPeer(userID, sendingPeerID);
|
this.sync.addUserPeer(userID, sendingPeerID);
|
||||||
if (!(this.sync.shouldSyncUserID(userID) || (this.router.route & (App.Route.USER | App.Route.POST) && userID === this.router.userID))) {
|
const isUserOrPostRoute = (this.router.route & (App.Route.USER | App.Route.POST)) !== 0;
|
||||||
|
if (isUserOrPostRoute) {
|
||||||
|
if (userID !== this.router.userID) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
if (!this.sync.shouldSyncUserID(userID)) {
|
||||||
console.log.apply(null, log(`[app] announceUser_rpc_response skipping user[${logID(userID)}] from[${logID(sendingPeerID)}]`));
|
console.log.apply(null, log(`[app] announceUser_rpc_response skipping user[${logID(userID)}] from[${logID(sendingPeerID)}]`));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
console.log.apply(null, log(`[app] calling getPostIDsForUser for user [${logID(userID)}] on peer [${logID(sendingPeerID)}]`));
|
console.log.apply(null, log(`[app] calling getPostIDsForUser for user [${logID(userID)}] on peer [${logID(sendingPeerID)}]`));
|
||||||
this.statusBar.updatePeerStatus(sendingPeerID, `getPostIDs(${logID(userID)})⬆️`);
|
this.statusBar.updatePeerStatus(sendingPeerID, `getPostIDs(${logID(userID)})⬆️`);
|
||||||
let postIDs = null;
|
let postIDs = null;
|
||||||
@@ -809,7 +817,8 @@ export class App {
|
|||||||
this.timerStart();
|
this.timerStart();
|
||||||
let posts = [];
|
let posts = [];
|
||||||
if (postID) {
|
if (postID) {
|
||||||
posts = await getPostForUser(userID, postID);
|
const post = await getPostForUser(userID, postID);
|
||||||
|
posts = post ? [post] : [];
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
posts = await getData(userID, new Date(2022, 8), new Date());
|
posts = await getData(userID, new Date(2022, 8), new Date());
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -399,7 +399,7 @@ class PeerConnection {
|
|||||||
this.chunkSize = (16 * 1024) - 100;
|
this.chunkSize = (16 * 1024) - 100;
|
||||||
this.messageSuperlog = false;
|
this.messageSuperlog = false;
|
||||||
this.sendQueueSuperLog = false;
|
this.sendQueueSuperLog = false;
|
||||||
this.rpcSuperlog = true;
|
this.rpcSuperlog = false;
|
||||||
this.pendingRPCs = new Map();
|
this.pendingRPCs = new Map();
|
||||||
this.connectionPromise = null;
|
this.connectionPromise = null;
|
||||||
// private makingOffer:boolean = false;
|
// private makingOffer:boolean = false;
|
||||||
@@ -727,12 +727,7 @@ class PeerConnection {
|
|||||||
PeerConnection.config = {
|
PeerConnection.config = {
|
||||||
iceServers: [
|
iceServers: [
|
||||||
{ urls: "stun:ddln.app" },
|
{ urls: "stun:ddln.app" },
|
||||||
// { urls: "turn:ddln.app", username: "a", credential: "b" },
|
{ urls: "turn:ddln.app", username: "ddln1", credential: "ddln1" },
|
||||||
{ urls: "stun:stun.l.google.com" }, // keeping this for now as my STUN server is not returning ipv6
|
|
||||||
{ urls: "stun:stun1.l.google.com" },
|
|
||||||
//{ urls: "stun:stun2.l.google.com" },
|
|
||||||
//{ urls: "stun:stun3.l.google.com" },
|
|
||||||
//{ urls: "stun:stun4.l.google.com" },
|
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
//# sourceMappingURL=PeerManager.js.map
|
//# sourceMappingURL=PeerManager.js.map
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user