ansxor.ca
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Scale back sentry logs for trivial events (#2997)
* scale back sentry logs
* update migrate log tests
hailey.at
+3
-3
src/lib/api/index.ts
+3
-3
src/lib/api/index.ts
···
104
105
// add image embed if present
106
if (opts.images?.length) {
107
-
logger.info(`Uploading images`, {
108
count: opts.images.length,
109
})
110
111
const images: AppBskyEmbedImages.Image[] = []
112
for (const image of opts.images) {
113
opts.onStateChange?.(`Uploading image #${images.length + 1}...`)
114
-
logger.info(`Compressing image`)
115
await image.compress()
116
const path = image.compressed?.path ?? image.path
117
const {width, height} = image.compressed || image
118
-
logger.info(`Uploading image`)
119
const res = await uploadBlob(agent, path, 'image/jpeg')
120
images.push({
121
image: res.data.blob,
···
104
105
// add image embed if present
106
if (opts.images?.length) {
107
+
logger.debug(`Uploading images`, {
108
count: opts.images.length,
109
})
110
111
const images: AppBskyEmbedImages.Image[] = []
112
for (const image of opts.images) {
113
opts.onStateChange?.(`Uploading image #${images.length + 1}...`)
114
+
logger.debug(`Compressing image`)
115
await image.compress()
116
const path = image.compressed?.path ?? image.path
117
const {width, height} = image.compressed || image
118
+
logger.debug(`Uploading image`)
119
const res = await uploadBlob(agent, path, 'image/jpeg')
120
images.push({
121
image: res.data.blob,
+1
-1
src/screens/Onboarding/state.ts
+1
-1
src/screens/Onboarding/state.ts
+3
-3
src/state/persisted/__tests__/migrate.test.ts
+3
-3
src/state/persisted/__tests__/migrate.test.ts
···
26
27
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
28
expect(read).toHaveBeenCalledTimes(1)
29
-
expect(logger.info).toHaveBeenCalledWith(
30
'persisted state: no migration needed',
31
)
32
})
···
38
39
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
40
expect(read).toHaveBeenCalledTimes(1)
41
-
expect(logger.info).toHaveBeenCalledWith(
42
'persisted state: no migration needed',
43
)
44
})
···
68
await migrate()
69
70
expect(write).toHaveBeenCalledWith(transform(fixtures.LEGACY_DATA_DUMP))
71
-
expect(logger.info).toHaveBeenCalledWith(
72
'persisted state: migrated legacy storage',
73
)
74
})
···
26
27
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
28
expect(read).toHaveBeenCalledTimes(1)
29
+
expect(logger.debug).toHaveBeenCalledWith(
30
'persisted state: no migration needed',
31
)
32
})
···
38
39
expect(AsyncStorage.getItem).toHaveBeenCalledWith('root')
40
expect(read).toHaveBeenCalledTimes(1)
41
+
expect(logger.debug).toHaveBeenCalledWith(
42
'persisted state: no migration needed',
43
)
44
})
···
68
await migrate()
69
70
expect(write).toHaveBeenCalledWith(transform(fixtures.LEGACY_DATA_DUMP))
71
+
expect(logger.debug).toHaveBeenCalledWith(
72
'persisted state: migrated legacy storage',
73
)
74
})
+3
-3
src/state/persisted/index.ts
+3
-3
src/state/persisted/index.ts
···
19
* the Provider.
20
*/
21
export async function init() {
22
-
logger.info('persisted state: initializing')
23
24
broadcast.onmessage = onBroadcastMessage
25
···
27
await migrate() // migrate old store
28
const stored = await store.read() // check for new store
29
if (!stored) {
30
-
logger.info('persisted state: initializing default storage')
31
await store.write(defaults) // opt: init new store
32
}
33
_state = stored || defaults // return new store
34
-
logger.log('persisted state: initialized')
35
} catch (e) {
36
logger.error('persisted state: failed to load root state from storage', {
37
message: e,
···
19
* the Provider.
20
*/
21
export async function init() {
22
+
logger.debug('persisted state: initializing')
23
24
broadcast.onmessage = onBroadcastMessage
25
···
27
await migrate() // migrate old store
28
const stored = await store.read() // check for new store
29
if (!stored) {
30
+
logger.debug('persisted state: initializing default storage')
31
await store.write(defaults) // opt: init new store
32
}
33
_state = stored || defaults // return new store
34
+
logger.debug('persisted state: initialized')
35
} catch (e) {
36
logger.error('persisted state: failed to load root state from storage', {
37
message: e,
+4
-4
src/state/persisted/legacy.ts
+4
-4
src/state/persisted/legacy.ts
···
121
* local storage AND old storage exists.
122
*/
123
export async function migrate() {
124
-
logger.info('persisted state: check need to migrate')
125
126
try {
127
const rawLegacyData = await AsyncStorage.getItem(
···
131
const alreadyMigrated = Boolean(newData)
132
133
if (!alreadyMigrated && rawLegacyData) {
134
-
logger.info('persisted state: migrating legacy storage')
135
136
const legacyData = JSON.parse(rawLegacyData)
137
const newData = transform(legacyData)
···
139
140
if (validate.success) {
141
await write(newData)
142
-
logger.info('persisted state: migrated legacy storage')
143
} else {
144
logger.error('persisted state: legacy data failed validation', {
145
message: validate.error,
146
})
147
}
148
} else {
149
-
logger.info('persisted state: no migration needed')
150
}
151
} catch (e: any) {
152
logger.error(e, {
···
121
* local storage AND old storage exists.
122
*/
123
export async function migrate() {
124
+
logger.debug('persisted state: check need to migrate')
125
126
try {
127
const rawLegacyData = await AsyncStorage.getItem(
···
131
const alreadyMigrated = Boolean(newData)
132
133
if (!alreadyMigrated && rawLegacyData) {
134
+
logger.debug('persisted state: migrating legacy storage')
135
136
const legacyData = JSON.parse(rawLegacyData)
137
const newData = transform(legacyData)
···
139
140
if (validate.success) {
141
await write(newData)
142
+
logger.debug('persisted state: migrated legacy storage')
143
} else {
144
logger.error('persisted state: legacy data failed validation', {
145
message: validate.error,
146
})
147
}
148
} else {
149
+
logger.debug('persisted state: no migration needed')
150
}
151
} catch (e: any) {
152
logger.error(e, {
+9
-9
src/state/session/index.tsx
+9
-9
src/state/session/index.tsx
···
133
accessJwt: session?.accessJwt,
134
}
135
136
-
logger.info(`session: persistSession`, {
137
event,
138
deactivated: refreshedAccount.deactivated,
139
})
···
320
)
321
322
const logout = React.useCallback<ApiContext['logout']>(async () => {
323
-
logger.info(`session: logout`)
324
clearCurrentAccount()
325
setStateAndPersist(s => {
326
return {
···
374
}
375
376
if (canReusePrevSession) {
377
-
logger.info(`session: attempting to reuse previous session`)
378
379
agent.session = prevSession
380
__globalAgent = agent
···
384
if (prevSession.deactivated) {
385
// don't attempt to resume
386
// use will be taken to the deactivated screen
387
-
logger.info(`session: reusing session for deactivated account`)
388
return
389
}
390
···
410
__globalAgent = PUBLIC_BSKY_AGENT
411
})
412
} else {
413
-
logger.info(`session: attempting to resume using previous session`)
414
415
try {
416
const freshAccount = await resumeSessionWithFreshAccount()
···
431
}
432
433
async function resumeSessionWithFreshAccount(): Promise<SessionAccount> {
434
-
logger.info(`session: resumeSessionWithFreshAccount`)
435
436
await networkRetry(1, () => agent.resumeSession(prevSession))
437
···
552
return persisted.onUpdate(() => {
553
const session = persisted.get('session')
554
555
-
logger.info(`session: persisted onUpdate`, {})
556
557
if (session.currentAccount && session.currentAccount.refreshJwt) {
558
if (session.currentAccount?.did !== state.currentAccount?.did) {
559
-
logger.info(`session: persisted onUpdate, switching accounts`, {
560
from: {
561
did: state.currentAccount?.did,
562
handle: state.currentAccount?.handle,
···
569
570
initSession(session.currentAccount)
571
} else {
572
-
logger.info(`session: persisted onUpdate, updating session`, {})
573
574
/*
575
* Use updated session in this tab's agent. Do not call
···
133
accessJwt: session?.accessJwt,
134
}
135
136
+
logger.debug(`session: persistSession`, {
137
event,
138
deactivated: refreshedAccount.deactivated,
139
})
···
320
)
321
322
const logout = React.useCallback<ApiContext['logout']>(async () => {
323
+
logger.debug(`session: logout`)
324
clearCurrentAccount()
325
setStateAndPersist(s => {
326
return {
···
374
}
375
376
if (canReusePrevSession) {
377
+
logger.debug(`session: attempting to reuse previous session`)
378
379
agent.session = prevSession
380
__globalAgent = agent
···
384
if (prevSession.deactivated) {
385
// don't attempt to resume
386
// use will be taken to the deactivated screen
387
+
logger.debug(`session: reusing session for deactivated account`)
388
return
389
}
390
···
410
__globalAgent = PUBLIC_BSKY_AGENT
411
})
412
} else {
413
+
logger.debug(`session: attempting to resume using previous session`)
414
415
try {
416
const freshAccount = await resumeSessionWithFreshAccount()
···
431
}
432
433
async function resumeSessionWithFreshAccount(): Promise<SessionAccount> {
434
+
logger.debug(`session: resumeSessionWithFreshAccount`)
435
436
await networkRetry(1, () => agent.resumeSession(prevSession))
437
···
552
return persisted.onUpdate(() => {
553
const session = persisted.get('session')
554
555
+
logger.debug(`session: persisted onUpdate`, {})
556
557
if (session.currentAccount && session.currentAccount.refreshJwt) {
558
if (session.currentAccount?.did !== state.currentAccount?.did) {
559
+
logger.debug(`session: persisted onUpdate, switching accounts`, {
560
from: {
561
did: state.currentAccount?.did,
562
handle: state.currentAccount?.handle,
···
569
570
initSession(session.currentAccount)
571
} else {
572
+
logger.debug(`session: persisted onUpdate, updating session`, {})
573
574
/*
575
* Use updated session in this tab's agent. Do not call
+1
-1
src/view/com/auth/login/LoginForm.tsx
+1
-1
src/view/com/auth/login/LoginForm.tsx