last commit before bundling nostr-tools ourselves
This commit is contained in:
Your Name
195
lite/ui/modal.js
195
lite/ui/modal.js
@@ -281,85 +281,166 @@ class Modal {
|
||||
// Detect all available real extensions
|
||||
const availableExtensions = this._detectAllExtensions();
|
||||
|
||||
console.log(`Modal: Found ${availableExtensions.length} extensions:`, availableExtensions.map(e => e.displayName));
|
||||
|
||||
if (availableExtensions.length === 0) {
|
||||
console.log('Modal: No real extensions found');
|
||||
this._showExtensionRequired();
|
||||
} else if (availableExtensions.length === 1) {
|
||||
console.log('Modal detected single extension:', availableExtensions[0].name);
|
||||
// Single extension - use it directly without showing choice UI
|
||||
console.log('Modal: Single extension detected, using it directly:', availableExtensions[0].displayName);
|
||||
this._tryExtensionLogin(availableExtensions[0].extension);
|
||||
} else {
|
||||
console.log('Modal detected multiple extensions:', availableExtensions.map(e => e.name));
|
||||
// Multiple extensions - show choice UI
|
||||
console.log('Modal: Multiple extensions detected, showing choice UI for', availableExtensions.length, 'extensions');
|
||||
this._showExtensionChoice(availableExtensions);
|
||||
}
|
||||
}
|
||||
|
||||
_detectAllExtensions() {
|
||||
const extensions = [];
|
||||
const seenExtensions = new Set(); // Track extensions by object reference to avoid duplicates
|
||||
|
||||
// Check navigator.nostr (NIP-07 standard location)
|
||||
if (window.navigator?.nostr && typeof window.navigator.nostr.getPublicKey === 'function') {
|
||||
extensions.push({
|
||||
name: 'navigator.nostr',
|
||||
displayName: 'Standard Extension (navigator.nostr)',
|
||||
icon: '🌐',
|
||||
extension: window.navigator.nostr
|
||||
});
|
||||
}
|
||||
|
||||
// Check webln.nostr (Alby WebLN)
|
||||
if (window.webln?.nostr && typeof window.webln.nostr.getPublicKey === 'function') {
|
||||
extensions.push({
|
||||
name: 'webln.nostr',
|
||||
displayName: 'Alby WebLN Extension',
|
||||
icon: '⚡',
|
||||
extension: window.webln.nostr
|
||||
});
|
||||
}
|
||||
|
||||
// Check alby.nostr (Alby direct)
|
||||
if (window.alby?.nostr && typeof window.alby.nostr.getPublicKey === 'function') {
|
||||
extensions.push({
|
||||
name: 'alby.nostr',
|
||||
displayName: 'Alby Extension (Direct)',
|
||||
icon: '🐝',
|
||||
extension: window.alby.nostr
|
||||
});
|
||||
}
|
||||
|
||||
// Check nos2x
|
||||
if (window.nos2x && typeof window.nos2x.getPublicKey === 'function') {
|
||||
extensions.push({
|
||||
name: 'nos2x',
|
||||
displayName: 'nos2x Extension',
|
||||
icon: '🔌',
|
||||
extension: window.nos2x
|
||||
});
|
||||
}
|
||||
|
||||
// Check window.nostr but make sure it's not our library
|
||||
if (window.nostr && typeof window.nostr.getPublicKey === 'function') {
|
||||
const isRealExtension = (
|
||||
typeof window.nostr._hexToUint8Array !== 'function' && // Our library has this method
|
||||
window.nostr.constructor.name !== 'Object' // Real extensions usually have proper constructors
|
||||
);
|
||||
|
||||
if (isRealExtension) {
|
||||
// Don't add if we already detected it via another path
|
||||
const alreadyDetected = extensions.some(ext => ext.extension === window.nostr);
|
||||
if (!alreadyDetected) {
|
||||
// Extension locations to check (in priority order)
|
||||
const locations = [
|
||||
{ path: 'window.navigator?.nostr', name: 'navigator.nostr', displayName: 'Standard Extension (navigator.nostr)', icon: '🌐', getter: () => window.navigator?.nostr },
|
||||
{ path: 'window.webln?.nostr', name: 'webln.nostr', displayName: 'Alby WebLN Extension', icon: '⚡', getter: () => window.webln?.nostr },
|
||||
{ path: 'window.alby?.nostr', name: 'alby.nostr', displayName: 'Alby Extension (Direct)', icon: '🐝', getter: () => window.alby?.nostr },
|
||||
{ path: 'window.nos2x', name: 'nos2x', displayName: 'nos2x Extension', icon: '🔌', getter: () => window.nos2x },
|
||||
{ path: 'window.flamingo?.nostr', name: 'flamingo.nostr', displayName: 'Flamingo Extension', icon: '🦩', getter: () => window.flamingo?.nostr },
|
||||
{ path: 'window.mutiny?.nostr', name: 'mutiny.nostr', displayName: 'Mutiny Extension', icon: '⚔️', getter: () => window.mutiny?.nostr },
|
||||
{ path: 'window.nostrich?.nostr', name: 'nostrich.nostr', displayName: 'Nostrich Extension', icon: '🐦', getter: () => window.nostrich?.nostr },
|
||||
{ path: 'window.getAlby?.nostr', name: 'getAlby.nostr', displayName: 'getAlby Extension', icon: '🔧', getter: () => window.getAlby?.nostr }
|
||||
];
|
||||
|
||||
// Check each location
|
||||
for (const location of locations) {
|
||||
try {
|
||||
const obj = location.getter();
|
||||
|
||||
console.log(`Modal: Checking ${location.name}:`, !!obj, obj?.constructor?.name);
|
||||
|
||||
if (obj && this._isRealExtension(obj) && !seenExtensions.has(obj)) {
|
||||
extensions.push({
|
||||
name: 'window.nostr',
|
||||
displayName: 'Extension (window.nostr)',
|
||||
icon: '🔑',
|
||||
extension: window.nostr
|
||||
name: location.name,
|
||||
displayName: location.displayName,
|
||||
icon: location.icon,
|
||||
extension: obj
|
||||
});
|
||||
seenExtensions.add(obj);
|
||||
console.log(`Modal: ✓ Detected extension at ${location.name} (${obj.constructor?.name})`);
|
||||
} else if (obj) {
|
||||
console.log(`Modal: ✗ Filtered out ${location.name} (${obj.constructor?.name})`);
|
||||
}
|
||||
} catch (e) {
|
||||
// Location doesn't exist or can't be accessed
|
||||
console.log(`Modal: ${location.name} not accessible:`, e.message);
|
||||
}
|
||||
}
|
||||
|
||||
// Also check window.nostr but be extra careful to avoid our library
|
||||
console.log('Modal: Checking window.nostr:', !!window.nostr, window.nostr?.constructor?.name);
|
||||
if (window.nostr && this._isRealExtension(window.nostr) && !seenExtensions.has(window.nostr)) {
|
||||
extensions.push({
|
||||
name: 'window.nostr',
|
||||
displayName: 'Extension (window.nostr)',
|
||||
icon: '🔑',
|
||||
extension: window.nostr
|
||||
});
|
||||
seenExtensions.add(window.nostr);
|
||||
console.log(`Modal: ✓ Detected extension at window.nostr: ${window.nostr.constructor?.name}`);
|
||||
} else if (window.nostr) {
|
||||
console.log(`Modal: ✗ Filtered out window.nostr (${window.nostr.constructor?.name}) - likely our library`);
|
||||
}
|
||||
|
||||
return extensions;
|
||||
}
|
||||
|
||||
_isRealExtension(obj) {
|
||||
console.log(`Modal: EXTENSIVE DEBUG - _isRealExtension called with:`, obj);
|
||||
console.log(`Modal: Object type: ${typeof obj}`);
|
||||
console.log(`Modal: Object truthy: ${!!obj}`);
|
||||
|
||||
if (!obj || typeof obj !== 'object') {
|
||||
console.log(`Modal: REJECT - Not an object`);
|
||||
return false;
|
||||
}
|
||||
|
||||
console.log(`Modal: getPublicKey type: ${typeof obj.getPublicKey}`);
|
||||
console.log(`Modal: signEvent type: ${typeof obj.signEvent}`);
|
||||
|
||||
// Must have required Nostr methods
|
||||
if (typeof obj.getPublicKey !== 'function' || typeof obj.signEvent !== 'function') {
|
||||
console.log(`Modal: REJECT - Missing required methods`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Exclude NostrTools library object
|
||||
if (obj === window.NostrTools) {
|
||||
console.log(`Modal: REJECT - Is NostrTools object`);
|
||||
return false;
|
||||
}
|
||||
|
||||
// Use the EXACT SAME logic as the comprehensive test (lines 804-809)
|
||||
// This is the key fix - match the comprehensive test's successful detection logic
|
||||
const constructorName = obj.constructor?.name;
|
||||
const objectKeys = Object.keys(obj);
|
||||
|
||||
console.log(`Modal: Constructor name: "${constructorName}"`);
|
||||
console.log(`Modal: Object keys: [${objectKeys.join(', ')}]`);
|
||||
|
||||
// COMPREHENSIVE TEST LOGIC - Accept anything with required methods that's not our specific library classes
|
||||
const isRealExtension = (
|
||||
typeof obj.getPublicKey === 'function' &&
|
||||
typeof obj.signEvent === 'function' &&
|
||||
constructorName !== 'WindowNostr' && // Our library class
|
||||
constructorName !== 'NostrLite' // Our main class
|
||||
);
|
||||
|
||||
console.log(`Modal: Using comprehensive test logic:`);
|
||||
console.log(` Has getPublicKey: ${typeof obj.getPublicKey === 'function'}`);
|
||||
console.log(` Has signEvent: ${typeof obj.signEvent === 'function'}`);
|
||||
console.log(` Not WindowNostr: ${constructorName !== 'WindowNostr'}`);
|
||||
console.log(` Not NostrLite: ${constructorName !== 'NostrLite'}`);
|
||||
console.log(` Constructor: "${constructorName}"`);
|
||||
|
||||
// Additional debugging for comparison
|
||||
const extensionPropChecks = {
|
||||
_isEnabled: !!obj._isEnabled,
|
||||
enabled: !!obj.enabled,
|
||||
kind: !!obj.kind,
|
||||
_eventEmitter: !!obj._eventEmitter,
|
||||
_scope: !!obj._scope,
|
||||
_requests: !!obj._requests,
|
||||
_pubkey: !!obj._pubkey,
|
||||
name: !!obj.name,
|
||||
version: !!obj.version,
|
||||
description: !!obj.description
|
||||
};
|
||||
|
||||
console.log(`Modal: Extension property analysis:`, extensionPropChecks);
|
||||
|
||||
const hasExtensionProps = !!(
|
||||
obj._isEnabled || obj.enabled || obj.kind ||
|
||||
obj._eventEmitter || obj._scope || obj._requests || obj._pubkey ||
|
||||
obj.name || obj.version || obj.description
|
||||
);
|
||||
|
||||
const underscoreKeys = objectKeys.filter(key => key.startsWith('_'));
|
||||
const hexToUint8Keys = objectKeys.filter(key => key.startsWith('_hex'));
|
||||
console.log(`Modal: Underscore keys: [${underscoreKeys.join(', ')}]`);
|
||||
console.log(`Modal: _hex* keys: [${hexToUint8Keys.join(', ')}]`);
|
||||
|
||||
console.log(`Modal: Additional analysis:`);
|
||||
console.log(` hasExtensionProps: ${hasExtensionProps}`);
|
||||
console.log(` hasLibraryMethod (_hexToUint8Array): ${objectKeys.includes('_hexToUint8Array')}`);
|
||||
|
||||
console.log(`Modal: COMPREHENSIVE TEST LOGIC RESULT: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
|
||||
console.log(`Modal: FINAL DECISION for ${constructorName}: ${isRealExtension ? 'ACCEPT' : 'REJECT'}`);
|
||||
|
||||
return isRealExtension;
|
||||
}
|
||||
|
||||
_showExtensionChoice(extensions) {
|
||||
this.modalBody.innerHTML = '';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user