Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions infrastructure/eid-wallet/src/routes/(app)/scan-qr/scanLogic.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -237,10 +237,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Comment thread
coodos marked this conversation as resolved.
Expand All@@ -260,18 +257,10 @@ export function createScanLogic({
const authPayload = {
ename: vault.ename,
session: get(session),
w3id: w3idResult,
signature: signature,
appVersion: "0.4.0",
};

console.log("🔐 Auth payload with signature:", {
ename: authPayload.ename,
session: authPayload.session,
w3id: authPayload.w3id,
signatureLength: authPayload.signature.length,
});

const redirectUrl = get(redirect);
if (!redirectUrl) {
throw new Error(
Expand DownExpand Up@@ -534,10 +523,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand DownExpand Up@@ -678,10 +664,7 @@ export function createScanLogic({
created ? "key-generated" : "key-exists",
);

const w3idResult = await globalState.keyService.getPublicKey(
vault.ename,
"signing",
);
const w3idResult = vault.ename;
if (!w3idResult) {
throw new Error("Failed to get W3ID");
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -175,6 +175,14 @@ export class VaultAccessGuard {

// Check if envelope exists and user has access
const { hasAccess, exists } = await this.checkAccess(metaEnvelopeId, context);

// For update operations, if envelope doesn't exist, allow the resolver to create it
if (!exists && args.input) {
// This is an update/create operation - let the resolver handle it
const result = await resolver(parent, args, context);
return this.filterACL(result);
}

if (!hasAccess) {
// If envelope doesn't exist, return null (not found)
if (!exists) {
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/web3-adapter/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -212,7 +212,7 @@ async function createGroupManifestWithRetry(
STORE_META_ENVELOPE,
{
input: {
ontology: "550e8400-e29b-41d4-a716-446655440001", // GroupManifest schema ID
ontology: "550e8400-e29b-41d4-a716-446655440003", // GroupManifest schema ID
payload: groupManifest,
acl: ["*"],
},
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,8 @@ export class FirestoreWatcher {
private retryCount = 0;
private readonly maxRetries: number = 10; // Increased retries
private readonly retryDelay: number = 1000; // 1 second
private isFirstSnapshot = true; // Skip the initial snapshot that contains all existing documents
private watcherStartTime: number = Date.now(); // Track when watcher starts
private firstSnapshotReceived = false; // Track if we've received the first snapshot

// Track processed document IDs to prevent duplicates
private processedIds = new Set<string>();
Expand DownExpand Up@@ -57,23 +58,53 @@ export class FirestoreWatcher {

// Reset stopped flag when starting
this.stopped = false;

// Reset watcher start time
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;

try {
// Set up real-time listener (only for new changes, not existing documents)
// Set up real-time listener
this.unsubscribe = this.collection.onSnapshot(
async (snapshot) => {
// Update last snapshot time for health monitoring
this.lastSnapshotTime = Date.now();

// Skip the first snapshot which contains all existing documents
if (this.isFirstSnapshot) {
console.log(`Skipping initial snapshot for ${collectionPath} (contains all existing documents)`);
this.isFirstSnapshot = false;
// On first snapshot, only skip documents that were created/modified BEFORE watcher started
// This ensures we don't miss any new documents created right as the watcher starts
if (!this.firstSnapshotReceived) {
console.log(`First snapshot received for ${collectionPath} with ${snapshot.size} documents`);
this.firstSnapshotReceived = true;

// Process only documents modified AFTER watcher start time
const recentChanges = snapshot.docChanges().filter((change) => {
const doc = change.doc;
const data = doc.data();

// Check if document was modified after watcher started
// Use updatedAt if available, otherwise createdAt
const timestamp = data.updatedAt || data.createdAt;
if (timestamp && timestamp.toMillis) {
const docTime = timestamp.toMillis();
return docTime >= this.watcherStartTime;
}

// If no timestamp, process it to be safe
return true;
});

if (recentChanges.length > 0) {
console.log(`Processing ${recentChanges.length} recent changes from first snapshot`);
await this.processChanges(recentChanges);
} else {
console.log(`No recent changes in first snapshot, skipping`);
}

this.retryCount = 0;
return;
}

// Don't skip snapshots - queue them instead to handle large databases
// Process snapshot asynchronously without blocking new snapshots
// For subsequent snapshots, process all changes normally
this.processSnapshot(snapshot).catch((error) => {
console.error("Error processing snapshot:", error);
this.handleError(error);
Expand DownExpand Up@@ -205,8 +236,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag
this.isFirstSnapshot = true;
// Reset watcher state
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

// Reset reconnection attempt counter on successful reconnect
Expand DownExpand Up@@ -323,8 +355,9 @@ export class FirestoreWatcher {
this.unsubscribe = null;
}

// Reset first snapshot flag when restarting
this.isFirstSnapshot = true;
// Reset watcher state when restarting
this.watcherStartTime = Date.now();
this.firstSnapshotReceived = false;
this.lastSnapshotTime = Date.now();

try {
Expand All@@ -343,8 +376,10 @@ export class FirestoreWatcher {
}
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
/**
* Processes an array of document changes
*/
private async processChanges(changes: DocumentChange[]): Promise<void> {
const collectionPath =
this.collection instanceof CollectionReference
? this.collection.path
Expand DownExpand Up@@ -412,6 +447,12 @@ export class FirestoreWatcher {
await Promise.all(processPromises);
}

private async processSnapshot(snapshot: QuerySnapshot): Promise<void> {
const changes = snapshot.docChanges();
await this.processChanges(changes);
}


private async handleCreateOrUpdate(
doc: FirebaseFirestore.QueryDocumentSnapshot<DocumentData>,
data: DocumentData
Expand Down
15 changes: 13 additions & 2 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -117,8 +117,19 @@ export function ChatContextProvider({
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
});

setChats(sortedChats);
Expand Down
Loading
Loading