Skip to content

Commit cad6f7f

Browse files
pablof7zpablof7z
committed
format
1 parent 140dca0 commit cad6f7f

File tree

125 files changed

+3460
-2803
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+3460
-2803
lines changed

‎ndk-mobile/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ A React Native/Expo implementation of [NDK (Nostr Development Kit)](https://gith
44

55
## Features
66

7-
- 🔐 Multiple signer implementations (NIP-07, NIP-46, Private Key)
8-
- 💾 SQLite-based caching for offline support
9-
- 🔄 Subscription management with automatic reconnection
10-
- 📱 React Native and Expo compatibility
11-
- 🪝 React hooks for easy state management
12-
- 👛 Integrated wallet support
7+
- 🔐 Multiple signer implementations (NIP-07, NIP-46, Private Key)
8+
- 💾 SQLite-based caching for offline support
9+
- 🔄 Subscription management with automatic reconnection
10+
- 📱 React Native and Expo compatibility
11+
- 🪝 React hooks for easy state management
12+
- 👛 Integrated wallet support
1313

1414
## Installation
1515

‎ndk-mobile/knowledge.md

+16-14
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
## State Management
44

55
### Current Approach (Zustand)
6+
67
- Zustand stores are created as singletons to prevent multiple instances
78
- Use lazy initialization with getStore() pattern
89
- Export hooks that return singleton store state
910
- When consuming store in hooks, use selectors directly
1011

1112
### Experimental Jotai Migration
13+
1214
- Atoms provide more granular state management
1315
- Derived state can be computed automatically with derived atoms
1416
- Actions are explicit atoms that can be composed
@@ -22,14 +24,15 @@
2224
- Export a hook created with zustand's create(), not the store instance
2325
- The hook should return the singleton store's state
2426
- When consuming the store in hooks, use the hook directly with selectors:
25-
```typescript
26-
// Correct:
27-
const value = useStore(s => s.value)
28-
29-
// Incorrect:
30-
const store = useStore
31-
const value = store(s => s.value)
32-
```
27+
28+
```typescript
29+
// Correct:
30+
const value = useStore((s) => s.value);
31+
32+
// Incorrect:
33+
const store = useStore;
34+
const value = store((s) => s.value);
35+
```
3336

3437
## Important Implementation Details
3538

@@ -43,9 +46,8 @@
4346
- NDKProvider initializes and provides both NDK and Session stores
4447
- All hooks (useNDK, useNDKSession) must be used within NDKProvider
4548
- Example usage:
46-
```tsx
47-
<NDKProvider params={{settingsStore, ...ndkParams}}>
48-
<App />
49-
</NDKProvider>
50-
```
51-
49+
```tsx
50+
<NDKProvider params={{ settingsStore, ...ndkParams }}>
51+
<App />
52+
</NDKProvider>
53+
```

‎ndk-mobile/package.json

+78-78
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
11
{
2-
"name": "@nostr-dev-kit/ndk-mobile",
3-
"version": "0.4.4",
4-
"description": "NDK Mobile",
5-
"private": false,
6-
"license": "MIT",
7-
"peerDependencies": {
8-
"expo": "*",
9-
"expo-nip55": "*"
10-
},
11-
"devDependencies": {
12-
"react-native-builder-bob": "^0.35.2",
13-
"typescript": "^5.7.2"
14-
},
15-
"keywords": [
16-
"ndk",
17-
"nostr",
18-
"react-native",
19-
"expo"
20-
],
21-
"dependencies": {
22-
"@bacons/text-decoder": "^0.0.0",
23-
"@nostr-dev-kit/ndk": "workspace:*",
24-
"@nostr-dev-kit/ndk-wallet": "workspace:*",
25-
"react-native-get-random-values": "~1.11.0",
26-
"typescript-lru-cache": "^2.0.0",
27-
"zustand": "^5.0.2"
28-
},
29-
"source": "./src/index.ts",
30-
"type": "module",
31-
"react-native": "dist/module/index.js",
32-
"exports": {
33-
".": {
34-
"import": {
35-
"types": "./dist/typescript/module/index.d.ts",
36-
"default": "./dist/module/index.js"
37-
}
2+
"name": "@nostr-dev-kit/ndk-mobile",
3+
"version": "0.4.4",
4+
"description": "NDK Mobile",
5+
"private": false,
6+
"license": "MIT",
7+
"peerDependencies": {
8+
"expo": "*",
9+
"expo-nip55": "*"
3810
},
39-
"./components": {
40-
"import": {
41-
"types": "./dist/typescript/module/components/index.d.ts",
42-
"default": "./dist/module/components/index.js"
43-
}
11+
"devDependencies": {
12+
"react-native-builder-bob": "^0.35.2",
13+
"typescript": "^5.7.2"
4414
},
45-
"./components/relays": {
46-
"import": {
47-
"types": "./dist/typescript/module/components/relays/index.d.ts",
48-
"default": "./dist/module/components/relays/index.js"
49-
}
50-
}
51-
},
52-
"scripts": {
53-
"prepare": "cd ../ndk-wallet && pnpm build && cd ../ndk-mobile && bob build"
54-
},
55-
"files": [
56-
"src",
57-
"dist",
58-
"!**/__tests__",
59-
"!**/__fixtures__",
60-
"!**/__mocks__"
61-
],
62-
"react-native-builder-bob": {
63-
"source": "src",
64-
"output": "dist",
65-
"targets": [
66-
[
67-
"module",
68-
{
69-
"esm": true
70-
}
71-
],
72-
[
73-
"typescript",
74-
{
75-
"esm": true
15+
"keywords": [
16+
"ndk",
17+
"nostr",
18+
"react-native",
19+
"expo"
20+
],
21+
"dependencies": {
22+
"@bacons/text-decoder": "^0.0.0",
23+
"@nostr-dev-kit/ndk": "workspace:*",
24+
"@nostr-dev-kit/ndk-wallet": "workspace:*",
25+
"react-native-get-random-values": "~1.11.0",
26+
"typescript-lru-cache": "^2.0.0",
27+
"zustand": "^5.0.2"
28+
},
29+
"source": "./src/index.ts",
30+
"type": "module",
31+
"react-native": "dist/module/index.js",
32+
"exports": {
33+
".": {
34+
"import": {
35+
"types": "./dist/typescript/module/index.d.ts",
36+
"default": "./dist/module/index.js"
37+
}
38+
},
39+
"./components": {
40+
"import": {
41+
"types": "./dist/typescript/module/components/index.d.ts",
42+
"default": "./dist/module/components/index.js"
43+
}
44+
},
45+
"./components/relays": {
46+
"import": {
47+
"types": "./dist/typescript/module/components/relays/index.d.ts",
48+
"default": "./dist/module/components/relays/index.js"
49+
}
7650
}
77-
]
51+
},
52+
"scripts": {
53+
"prepare": "cd ../ndk-wallet && pnpm build && cd ../ndk-mobile && bob build"
54+
},
55+
"files": [
56+
"src",
57+
"dist",
58+
"!**/__tests__",
59+
"!**/__fixtures__",
60+
"!**/__mocks__"
61+
],
62+
"react-native-builder-bob": {
63+
"source": "src",
64+
"output": "dist",
65+
"targets": [
66+
[
67+
"module",
68+
{
69+
"esm": true
70+
}
71+
],
72+
[
73+
"typescript",
74+
{
75+
"esm": true
76+
}
77+
]
78+
]
79+
},
80+
"eslintIgnore": [
81+
"node_modules/",
82+
"dist/"
7883
]
79-
},
80-
"eslintIgnore": [
81-
"node_modules/",
82-
"dist/"
83-
]
8484
}

‎ndk-mobile/src/cache-adapter/migrations.ts

+47-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as SQLite from 'expo-sqlite';
1+
import * as SQLite from "expo-sqlite";
22

33
export const migrations = [
44
{
@@ -49,7 +49,9 @@ export const migrations = [
4949

5050
await db.execAsync(`CREATE INDEX IF NOT EXISTS idx_events_pubkey ON events (pubkey);`);
5151
await db.execAsync(`CREATE INDEX IF NOT EXISTS idx_events_kind ON events (kind);`);
52-
await db.execAsync(`CREATE INDEX IF NOT EXISTS idx_events_tags_tag ON event_tags (tag);`);
52+
await db.execAsync(
53+
`CREATE INDEX IF NOT EXISTS idx_events_tags_tag ON event_tags (tag);`
54+
);
5355
},
5456
},
5557
{
@@ -61,9 +63,13 @@ export const migrations = [
6163
{
6264
version: 2,
6365
up: async (db: SQLite.SQLiteDatabase) => {
64-
await db.execAsync(`CREATE INDEX IF NOT EXISTS idx_profiles_pubkey ON profiles (pubkey);`);
66+
await db.execAsync(
67+
`CREATE INDEX IF NOT EXISTS idx_profiles_pubkey ON profiles (pubkey);`
68+
);
6569
await db.execAsync(`DROP INDEX IF EXISTS idx_event_tags_tag;`);
66-
await db.execAsync(`CREATE INDEX IF NOT EXISTS idx_event_tags_tag ON event_tags (tag, value);`);
70+
await db.execAsync(
71+
`CREATE INDEX IF NOT EXISTS idx_event_tags_tag ON event_tags (tag, value);`
72+
);
6773
},
6874
},
6975
{
@@ -87,11 +93,11 @@ export const migrations = [
8793
version: 5, // Increment the version number
8894
up: async (db: SQLite.SQLiteDatabase) => {
8995
// Temporarily disable foreign key constraints
90-
await db.execAsync('PRAGMA foreign_keys=off;');
91-
96+
await db.execAsync("PRAGMA foreign_keys=off;");
97+
9298
// Rename the existing table
93-
await db.execAsync('ALTER TABLE event_tags RENAME TO event_tags_old;');
94-
99+
await db.execAsync("ALTER TABLE event_tags RENAME TO event_tags_old;");
100+
95101
// Create the new table without a primary key
96102
await db.execAsync(`
97103
CREATE TABLE event_tags (
@@ -100,26 +106,26 @@ export const migrations = [
100106
value TEXT
101107
);
102108
`);
103-
109+
104110
// Copy data back into the new table
105111
await db.execAsync(`
106112
INSERT INTO event_tags (event_id, tag, value)
107113
SELECT event_id, tag, value FROM event_tags_old;
108114
`);
109-
115+
110116
// Drop the old table
111-
await db.execAsync('DROP TABLE event_tags_old;');
112-
117+
await db.execAsync("DROP TABLE event_tags_old;");
118+
113119
// Add a non-unique index on event_id and tag
114120
await db.execAsync(`
115121
CREATE INDEX IF NOT EXISTS idx_event_tags_event_id_tag ON event_tags (event_id, tag);
116122
`);
117-
123+
118124
// Re-enable foreign key constraints
119-
await db.execAsync('PRAGMA foreign_keys=on;');
125+
await db.execAsync("PRAGMA foreign_keys=on;");
120126
},
121127
},
122-
128+
123129
{
124130
version: 6,
125131
up: async (db: SQLite.SQLiteDatabase) => {
@@ -136,8 +142,11 @@ export const migrations = [
136142
{
137143
version: 7,
138144
up: async (db: SQLite.SQLiteDatabase) => {
139-
const profiles = await db.getAllSync(`SELECT * FROM profiles;`) as { pubkey: string, profile: string }[];
140-
145+
const profiles = (await db.getAllSync(`SELECT * FROM profiles;`)) as {
146+
pubkey: string;
147+
profile: string;
148+
}[];
149+
141150
await db.execAsync(`
142151
ALTER TABLE profiles ADD COLUMN name TEXT;
143152
ALTER TABLE profiles ADD COLUMN about TEXT;
@@ -149,11 +158,25 @@ export const migrations = [
149158
ALTER TABLE profiles ADD COLUMN display_name TEXT;
150159
ALTER TABLE profiles ADD COLUMN website TEXT;
151160
`);
152-
161+
153162
for (const profile of profiles) {
154163
try {
155164
const profileJson = JSON.parse(profile.profile);
156-
await db.runAsync(`UPDATE profiles SET name = ?, about = ?, picture = ?, banner = ?, nip05 = ?, lud16 = ?, lud06 = ?, display_name = ?, website = ? WHERE pubkey = ?;`, [profileJson.name, profileJson.about, profileJson.image ?? profileJson.picture, profileJson.banner, profileJson.nip05, profileJson.lud16, profileJson.lud06, profileJson.displayName, profileJson.website, profile.pubkey]);
165+
await db.runAsync(
166+
`UPDATE profiles SET name = ?, about = ?, picture = ?, banner = ?, nip05 = ?, lud16 = ?, lud06 = ?, display_name = ?, website = ? WHERE pubkey = ?;`,
167+
[
168+
profileJson.name,
169+
profileJson.about,
170+
profileJson.image ?? profileJson.picture,
171+
profileJson.banner,
172+
profileJson.nip05,
173+
profileJson.lud16,
174+
profileJson.lud06,
175+
profileJson.displayName,
176+
profileJson.website,
177+
profile.pubkey,
178+
]
179+
);
157180
} catch (e) {
158181
await db.runAsync(`DELETE FROM profiles WHERE pubkey = ?;`, [profile.pubkey]);
159182
}
@@ -193,8 +216,8 @@ export const migrations = [
193216
up: async (db: SQLite.SQLiteDatabase) => {
194217
// Log current indexes to verify
195218
const indexes = await db.getAllAsync(`PRAGMA index_list('event_tags');`);
196-
console.log('Current indexes on event_tags:', indexes);
197-
219+
console.log("Current indexes on event_tags:", indexes);
220+
198221
// Proceed with dropping and recreating
199222
await db.execAsync(`
200223
ALTER TABLE event_tags RENAME TO event_tags_old;
@@ -210,7 +233,7 @@ export const migrations = [
210233
`);
211234
},
212235
},
213-
236+
214237
{
215238
version: 10,
216239
up: async (db: SQLite.SQLiteDatabase) => {
@@ -227,12 +250,12 @@ export const migrations = [
227250
`);
228251
},
229252
},
230-
253+
231254
{
232255
version: 11,
233256
up: async (db: SQLite.SQLiteDatabase) => {
234257
// Drop the old nutzaps table as it's no longer needed
235258
await db.execAsync(`DROP TABLE IF EXISTS wallet_nutzaps;`);
236259
},
237-
}
260+
},
238261
];

0 commit comments

Comments
 (0)