@goliapkg/sentori-react-native 0.7.3 → 0.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/capture.d.ts.map +1 -1
- package/lib/capture.js +23 -1
- package/lib/capture.js.map +1 -1
- package/lib/init.d.ts.map +1 -1
- package/lib/init.js +5 -0
- package/lib/init.js.map +1 -1
- package/lib/navigation.d.ts.map +1 -1
- package/lib/navigation.js +33 -9
- package/lib/navigation.js.map +1 -1
- package/lib/netinfo.d.ts +14 -0
- package/lib/netinfo.d.ts.map +1 -0
- package/lib/netinfo.js +70 -0
- package/lib/netinfo.js.map +1 -0
- package/package.json +6 -2
- package/src/capture.ts +26 -1
- package/src/init.ts +5 -0
- package/src/navigation.ts +37 -9
- package/src/netinfo.ts +81 -0
package/lib/capture.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAoD,IAAI,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE5F,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAgB5D,eAAO,MAAM,+BAA+B,QAAO,IAElD,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,IAAI,GAAG,IAAI,KAAG,IAE3C,CAAC;AAEF,eAAO,MAAM,OAAO,QAAO,IAAI,GAAG,IAAa,CAAC;AAEhD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB;;;qDAGiD;IACjD,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,KAAK,EAAE,SAAS,aAAa,KAAG,IAyDnE,CAAC;AAoCF,eAAO,MAAM,gBAAgB,UA7FO,KAAK,WAAW,aAAa,KAAG,IA6FxB,CAAC"}
|
package/lib/capture.js
CHANGED
|
@@ -8,6 +8,7 @@ import { parseStack } from './stack';
|
|
|
8
8
|
import { getTrailBuffer } from './trail';
|
|
9
9
|
import { enqueue, uploadAttachment } from './transport';
|
|
10
10
|
import { uuidV7 } from './uuid';
|
|
11
|
+
import { getCachedNetworkType } from './netinfo';
|
|
11
12
|
export { captureStep, __resetTrailForTests } from './trail';
|
|
12
13
|
let _user = null;
|
|
13
14
|
// Phase 42 sub-D.08 — per-session screenshot quota. Defaults: 10 in
|
|
@@ -174,16 +175,37 @@ const errorToObject = (error) => {
|
|
|
174
175
|
const collectDevice = () => {
|
|
175
176
|
let os = 'other';
|
|
176
177
|
let osVersion = '0';
|
|
178
|
+
let locale;
|
|
179
|
+
const networkType = getCachedNetworkType();
|
|
177
180
|
try {
|
|
178
181
|
const RN = require('react-native');
|
|
179
182
|
const rnOS = RN.Platform.OS;
|
|
180
183
|
os = rnOS === 'ios' || rnOS === 'android' || rnOS === 'web' ? rnOS : 'other';
|
|
181
184
|
osVersion = String(RN.Platform.Version);
|
|
185
|
+
// v0.8.0-a — RN reads user locale through native modules. These
|
|
186
|
+
// are stable RN-internal modules (SettingsManager since 0.4,
|
|
187
|
+
// I18nManager since 0.16) so we can read them directly without
|
|
188
|
+
// an extra peer dep. iOS returns e.g. "en_US"; Android returns
|
|
189
|
+
// e.g. "en_US" via `getDefault().toString()`. `AppleLocale` is
|
|
190
|
+
// the format the user picked in Settings; `AppleLanguages[0]`
|
|
191
|
+
// is the resolved language priority — prefer the former.
|
|
192
|
+
if (rnOS === 'ios') {
|
|
193
|
+
const s = RN.NativeModules.SettingsManager?.settings;
|
|
194
|
+
locale = s?.AppleLocale ?? s?.AppleLanguages?.[0];
|
|
195
|
+
}
|
|
196
|
+
else if (rnOS === 'android') {
|
|
197
|
+
locale = RN.NativeModules.I18nManager?.localeIdentifier;
|
|
198
|
+
}
|
|
182
199
|
}
|
|
183
200
|
catch {
|
|
184
201
|
// not in RN runtime (jest, bun test)
|
|
185
202
|
}
|
|
186
|
-
|
|
203
|
+
const device = { os, osVersion };
|
|
204
|
+
if (locale)
|
|
205
|
+
device.locale = locale;
|
|
206
|
+
if (networkType)
|
|
207
|
+
device.networkType = networkType;
|
|
208
|
+
return device;
|
|
187
209
|
};
|
|
188
210
|
const collectApp = (release) => {
|
|
189
211
|
const m = /^(?:[^@]+@)?([^+]+)(?:\+(.+))?$/.exec(release);
|
package/lib/capture.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"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"}
|
package/lib/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAkB,cAAc,EAA2B,MAAM,SAAS,CAAC;AAIvF,MAAM,MAAM,WAAW,GAAG;IACxB,sDAAsD;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,qFAAqF;IACrF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,OAAO,CAAC,EAAE;QACR,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB;;8DAEsD;QACtD,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB;;;;;;;uBAOe;QACf,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB;;;6CAGqC;QACrC,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;IACF;;;;;gEAK4D;IAC5D,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,EAAE,IAAI,GAAG,MAAM,CAAC;KACxB,CAAC;CACH,CAAC;AAIF,eAAO,MAAM,IAAI,GAAI,SAAS,WAAW,KAAG,IAwF3C,CAAC;AAiBF,YAAY,EAAE,cAAc,EAAE,CAAC"}
|
package/lib/init.js
CHANGED
|
@@ -4,6 +4,7 @@ import { installLifecycleHandler } from './handlers/lifecycle';
|
|
|
4
4
|
import { installPromiseHandler } from './handlers/promise';
|
|
5
5
|
import { installNetworkHandler } from './handlers/network';
|
|
6
6
|
import { drainNativePending, setNativeConfig } from './native';
|
|
7
|
+
import { startNetworkTypeWatch } from './netinfo';
|
|
7
8
|
import { startSession } from './session-tracker';
|
|
8
9
|
import { drainOfflineQueue, enqueue, startTransport, uploadAttachment, } from './transport';
|
|
9
10
|
const DEFAULT_INGEST_URL = 'https://ingest.sentori.golia.jp';
|
|
@@ -35,6 +36,10 @@ export const init = (options) => {
|
|
|
35
36
|
environment: env,
|
|
36
37
|
});
|
|
37
38
|
startTransport();
|
|
39
|
+
// v0.8.0-c — start watching network class. No-op if NetInfo isn't
|
|
40
|
+
// installed; events just won't carry `device.networkType` in that
|
|
41
|
+
// case.
|
|
42
|
+
startNetworkTypeWatch();
|
|
38
43
|
const capture = options.capture ?? {};
|
|
39
44
|
if (capture.globalErrors !== false)
|
|
40
45
|
installGlobalHandler();
|
package/lib/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EACL,iBAAiB,EACjB,OAAO,EACP,cAAc,EACd,gBAAgB,GACjB,MAAM,aAAa,CAAC;AAkDrB,MAAM,kBAAkB,GAAG,iCAAiC,CAAC;AAE7D,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,OAAoB,EAAQ,EAAE;IACjD,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,GAAG,GACP,OAAO,CAAC,WAAW;QACnB,CAAC,OAAO,OAAO,KAAK,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAE/D,SAAS,CAAC;QACR,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,GAAG;QAChB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,kBAAkB;QAClD,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,OAAO,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI;QACxD,eAAe,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,IAAI;QACjD,eAAe,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,IAAI;QACjD,mBAAmB,EAAE,OAAO,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI;KAC5D,CAAC,CAAC;IAEH,uEAAuE;IACvE,iEAAiE;IACjE,eAAe,CAAC;QACd,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,WAAW,EAAE,GAAG;KACjB,CAAC,CAAC;IAEH,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../src/init.ts"],"names":[],"mappings":"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"}
|
package/lib/navigation.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AA4BA;;kDAEkD;AAClD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAClE,eAAe,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AA4BA;;kDAEkD;AAClD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAC;IAClE,eAAe,EAAE,MAAM;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;CACrD,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,IAAI,CAiFzE"}
|
package/lib/navigation.js
CHANGED
|
@@ -42,6 +42,9 @@ import { captureStep } from './trail';
|
|
|
42
42
|
export function useTraceNavigation(navigationRef) {
|
|
43
43
|
// Latest route name we've observed.
|
|
44
44
|
const lastRouteRef = useRef(null);
|
|
45
|
+
// Wall-clock ms when the last screen was entered. Drives dwell time
|
|
46
|
+
// attached to the leaving span + the next captureStep breadcrumb.
|
|
47
|
+
const lastRouteEnteredAtRef = useRef(null);
|
|
45
48
|
// Span for the screen the user is currently on. Finished when the
|
|
46
49
|
// next screen is entered (or on unmount).
|
|
47
50
|
const openSpanRef = useRef(null);
|
|
@@ -53,7 +56,7 @@ export function useTraceNavigation(navigationRef) {
|
|
|
53
56
|
// Each screen gets its own trace root — detach from whatever the
|
|
54
57
|
// previous screen's span was (we keep it active, so without
|
|
55
58
|
// `parent: null` the new one would nest under it).
|
|
56
|
-
const openScreenSpan = (from, to) => {
|
|
59
|
+
const openScreenSpan = (from, to, prevDwellMs) => {
|
|
57
60
|
const span = startSpan('react.navigation', {
|
|
58
61
|
name: from ? `${from} → ${to}` : to,
|
|
59
62
|
parent: null,
|
|
@@ -62,19 +65,39 @@ export function useTraceNavigation(navigationRef) {
|
|
|
62
65
|
openSpanRef.current = span;
|
|
63
66
|
setActiveSpan(span);
|
|
64
67
|
lastRouteRef.current = to;
|
|
65
|
-
|
|
66
|
-
//
|
|
67
|
-
//
|
|
68
|
+
lastRouteEnteredAtRef.current = Date.now();
|
|
69
|
+
// v0.8.0-b — dwell on the previous screen surfaces in the
|
|
70
|
+
// session trail. The leaving span's `durationMs` already
|
|
71
|
+
// carries the same number, but the trail is the most-glanced
|
|
72
|
+
// surface so we duplicate it as breadcrumb data. No bytes wasted:
|
|
73
|
+
// a breadcrumb without sessionTrail enabled is a no-op.
|
|
68
74
|
captureStep(`screen:${to}`, {
|
|
69
|
-
breadcrumb: {
|
|
75
|
+
breadcrumb: {
|
|
76
|
+
data: prevDwellMs !== null ? { dwellMsPrev: prevDwellMs } : undefined,
|
|
77
|
+
message: from ? `${from} → ${to}` : to,
|
|
78
|
+
type: 'navigation',
|
|
79
|
+
},
|
|
70
80
|
});
|
|
71
81
|
};
|
|
82
|
+
const finishOpenSpanWithDwell = () => {
|
|
83
|
+
const span = openSpanRef.current;
|
|
84
|
+
const enteredAt = lastRouteEnteredAtRef.current;
|
|
85
|
+
if (!span)
|
|
86
|
+
return null;
|
|
87
|
+
const dwellMs = enteredAt !== null ? Math.max(0, Date.now() - enteredAt) : null;
|
|
88
|
+
span.finish({
|
|
89
|
+
status: 'ok',
|
|
90
|
+
// Tag values are strings on the wire — cast at finish-time.
|
|
91
|
+
tags: dwellMs !== null ? { 'nav.dwell_ms': String(dwellMs) } : undefined,
|
|
92
|
+
});
|
|
93
|
+
return dwellMs;
|
|
94
|
+
};
|
|
72
95
|
// Open a span for the initial screen so its requests are grouped
|
|
73
96
|
// too (auth / config / first data load are usually the busiest
|
|
74
97
|
// screen of a session).
|
|
75
98
|
const initial = navigationRef.getCurrentRoute()?.name ?? null;
|
|
76
99
|
if (initial !== null)
|
|
77
|
-
openScreenSpan(null, initial);
|
|
100
|
+
openScreenSpan(null, initial, null);
|
|
78
101
|
else
|
|
79
102
|
lastRouteRef.current = null;
|
|
80
103
|
const unsubscribe = navigationRef.addListener('state', () => {
|
|
@@ -82,13 +105,14 @@ export function useTraceNavigation(navigationRef) {
|
|
|
82
105
|
const prev = lastRouteRef.current;
|
|
83
106
|
if (next === null || next === prev)
|
|
84
107
|
return;
|
|
85
|
-
|
|
86
|
-
openScreenSpan(prev, next);
|
|
108
|
+
const dwellMs = finishOpenSpanWithDwell();
|
|
109
|
+
openScreenSpan(prev, next, dwellMs);
|
|
87
110
|
});
|
|
88
111
|
return () => {
|
|
89
112
|
unsubscribe();
|
|
90
|
-
|
|
113
|
+
finishOpenSpanWithDwell();
|
|
91
114
|
openSpanRef.current = null;
|
|
115
|
+
lastRouteEnteredAtRef.current = null;
|
|
92
116
|
setActiveSpan(null);
|
|
93
117
|
};
|
|
94
118
|
}, [navigationRef]);
|
package/lib/navigation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,oEAAoE;AACpE,0DAA0D;AAC1D,qEAAqE;AACrE,iEAAiE;AACjE,EAAE;AACF,yDAAyD;AACzD,8DAA8D;AAC9D,mEAAmE;AACnE,4CAA4C;AAC5C,EAAE;AACF,oEAAoE;AACpE,gEAAgE;AAChE,mEAAmE;AACnE,kEAAkE;AAClE,EAAE;AACF,kEAAkE;AAClE,qEAAqE;AACrE,sEAAsE;AACtE,gEAAgE;AAChE,6CAA6C;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,EAAE,aAAa,EAAE,SAAS,EAAmB,MAAM,wBAAwB,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAUtC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,kBAAkB,CAAC,aAAgC;IACjE,oCAAoC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACjD,kEAAkE;IAClE,0CAA0C;IAC1C,MAAM,WAAW,GAAG,MAAM,CAAoB,IAAI,CAAC,CAAC;IAEpD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,OAAO,aAAa,CAAC,WAAW,KAAK,UAAU;YAAE,OAAO;QAC5D,IAAI,OAAO,aAAa,CAAC,eAAe,KAAK,UAAU;YAAE,OAAO;QAEhE,iEAAiE;QACjE,4DAA4D;QAC5D,mDAAmD;QACnD,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"navigation.js","sourceRoot":"","sources":["../src/navigation.ts"],"names":[],"mappings":"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"}
|
package/lib/netinfo.d.ts
ADDED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { Device } from '@goliapkg/sentori-core';
|
|
2
|
+
type NetworkType = Device['networkType'];
|
|
3
|
+
/**
|
|
4
|
+
* Idempotent — subscribe to NetInfo state changes and cache the
|
|
5
|
+
* latest network class. Called once from `init()`. Pure no-op if
|
|
6
|
+
* the peer isn't installed or we're not in an RN runtime.
|
|
7
|
+
*/
|
|
8
|
+
export declare function startNetworkTypeWatch(): void;
|
|
9
|
+
/** Synchronous read at capture time. */
|
|
10
|
+
export declare function getCachedNetworkType(): NetworkType;
|
|
11
|
+
/** Test-only. */
|
|
12
|
+
export declare function __resetNetworkTypeForTests(): void;
|
|
13
|
+
export {};
|
|
14
|
+
//# sourceMappingURL=netinfo.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"netinfo.d.ts","sourceRoot":"","sources":["../src/netinfo.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,KAAK,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AA8BzC;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAc5C;AAED,wCAAwC;AACxC,wBAAgB,oBAAoB,IAAI,WAAW,CAElD;AAED,iBAAiB;AACjB,wBAAgB,0BAA0B,IAAI,IAAI,CAKjD"}
|
package/lib/netinfo.js
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
// v0.8.0-c — cached read of the current network class.
|
|
2
|
+
//
|
|
3
|
+
// `@react-native-community/netinfo` is an OPTIONAL peer dep. If the
|
|
4
|
+
// host app has it installed (most production RN apps do — it's a
|
|
5
|
+
// standard library), we subscribe at SDK init time and cache the
|
|
6
|
+
// latest network state. `collectDevice()` reads the cache
|
|
7
|
+
// synchronously at capture time. If the peer isn't installed, the
|
|
8
|
+
// cache stays `undefined` and `device.networkType` is omitted —
|
|
9
|
+
// no warning, no crash.
|
|
10
|
+
//
|
|
11
|
+
// We collapse NetInfo's enum into the smaller set the protocol
|
|
12
|
+
// allows (see `Device.networkType` in `sdk/core/src/types.ts`):
|
|
13
|
+
// `wifi`, `2g/3g/4g/slow-2g`, `offline`, `unknown`. 5G collapses
|
|
14
|
+
// into `4g` because the schema doesn't have a 5g slot yet; the
|
|
15
|
+
// information loss is acceptable for an analytics dimension.
|
|
16
|
+
let _cached;
|
|
17
|
+
let _started = false;
|
|
18
|
+
let _unsubscribe = null;
|
|
19
|
+
function mapState(state) {
|
|
20
|
+
if (state.isConnected === false)
|
|
21
|
+
return 'offline';
|
|
22
|
+
if (state.type === 'wifi' || state.type === 'ethernet')
|
|
23
|
+
return 'wifi';
|
|
24
|
+
if (state.type === 'cellular') {
|
|
25
|
+
const gen = state.details?.cellularGeneration;
|
|
26
|
+
if (gen === '2g' || gen === '3g' || gen === '4g')
|
|
27
|
+
return gen;
|
|
28
|
+
if (gen === '5g')
|
|
29
|
+
return '4g';
|
|
30
|
+
return 'unknown';
|
|
31
|
+
}
|
|
32
|
+
if (state.type === 'none' || state.type === 'unknown')
|
|
33
|
+
return 'unknown';
|
|
34
|
+
return undefined;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* Idempotent — subscribe to NetInfo state changes and cache the
|
|
38
|
+
* latest network class. Called once from `init()`. Pure no-op if
|
|
39
|
+
* the peer isn't installed or we're not in an RN runtime.
|
|
40
|
+
*/
|
|
41
|
+
export function startNetworkTypeWatch() {
|
|
42
|
+
if (_started)
|
|
43
|
+
return;
|
|
44
|
+
_started = true;
|
|
45
|
+
try {
|
|
46
|
+
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
47
|
+
const mod = require('@react-native-community/netinfo');
|
|
48
|
+
const add = mod.addEventListener ?? mod.default?.addEventListener;
|
|
49
|
+
if (typeof add !== 'function')
|
|
50
|
+
return;
|
|
51
|
+
_unsubscribe = add((state) => {
|
|
52
|
+
_cached = mapState(state);
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// not installed — leave cache undefined
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
/** Synchronous read at capture time. */
|
|
60
|
+
export function getCachedNetworkType() {
|
|
61
|
+
return _cached;
|
|
62
|
+
}
|
|
63
|
+
/** Test-only. */
|
|
64
|
+
export function __resetNetworkTypeForTests() {
|
|
65
|
+
_unsubscribe?.();
|
|
66
|
+
_unsubscribe = null;
|
|
67
|
+
_started = false;
|
|
68
|
+
_cached = undefined;
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=netinfo.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"netinfo.js","sourceRoot":"","sources":["../src/netinfo.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,EAAE;AACF,oEAAoE;AACpE,iEAAiE;AACjE,iEAAiE;AACjE,0DAA0D;AAC1D,kEAAkE;AAClE,gEAAgE;AAChE,wBAAwB;AACxB,EAAE;AACF,+DAA+D;AAC/D,gEAAgE;AAChE,iEAAiE;AACjE,+DAA+D;AAC/D,6DAA6D;AAiB7D,IAAI,OAAoB,CAAC;AACzB,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,IAAI,YAAY,GAAwB,IAAI,CAAC;AAE7C,SAAS,QAAQ,CAAC,KAAmB;IACnC,IAAI,KAAK,CAAC,WAAW,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAClD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;QAAE,OAAO,MAAM,CAAC;IACtE,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,kBAAkB,CAAC;QAC9C,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,GAAG,CAAC;QAC7D,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAC9B,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACxE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB;IACnC,IAAI,QAAQ;QAAE,OAAO;IACrB,QAAQ,GAAG,IAAI,CAAC;IAChB,IAAI,CAAC;QACH,iEAAiE;QACjE,MAAM,GAAG,GAAG,OAAO,CAAC,iCAAiC,CAAkB,CAAC;QACxE,MAAM,GAAG,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,OAAO,EAAE,gBAAgB,CAAC;QAClE,IAAI,OAAO,GAAG,KAAK,UAAU;YAAE,OAAO;QACtC,YAAY,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,wCAAwC;IAC1C,CAAC;AACH,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,oBAAoB;IAClC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,iBAAiB;AACjB,MAAM,UAAU,0BAA0B;IACxC,YAAY,EAAE,EAAE,CAAC;IACjB,YAAY,GAAG,IAAI,CAAC;IACpB,QAAQ,GAAG,KAAK,CAAC;IACjB,OAAO,GAAG,SAAS,CAAC;AACtB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goliapkg/sentori-react-native",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.4",
|
|
4
4
|
"description": "Sentori SDK for React Native \u2014 JS-layer error capture, native crash handlers (iOS / Android), batched transport, fetch + react-navigation tracing.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://sentori.golia.jp",
|
|
@@ -47,12 +47,16 @@
|
|
|
47
47
|
"@react-native-async-storage/async-storage": {
|
|
48
48
|
"optional": true
|
|
49
49
|
},
|
|
50
|
+
"@react-native-community/netinfo": {
|
|
51
|
+
"optional": true
|
|
52
|
+
},
|
|
50
53
|
"expo-modules-core": {
|
|
51
54
|
"optional": true
|
|
52
55
|
}
|
|
53
56
|
},
|
|
54
57
|
"optionalDependencies": {
|
|
55
58
|
"@react-native-async-storage/async-storage": ">=1.23",
|
|
59
|
+
"@react-native-community/netinfo": ">=11.0",
|
|
56
60
|
"expo-modules-core": ">=2.0"
|
|
57
61
|
},
|
|
58
62
|
"devDependencies": {
|
|
@@ -64,6 +68,6 @@
|
|
|
64
68
|
"access": "public"
|
|
65
69
|
},
|
|
66
70
|
"dependencies": {
|
|
67
|
-
"@goliapkg/sentori-core": "0.7.
|
|
71
|
+
"@goliapkg/sentori-core": "0.7.1"
|
|
68
72
|
}
|
|
69
73
|
}
|
package/src/capture.ts
CHANGED
|
@@ -9,6 +9,7 @@ import { parseStack } from './stack';
|
|
|
9
9
|
import { getTrailBuffer } from './trail';
|
|
10
10
|
import { enqueue, uploadAttachment } from './transport';
|
|
11
11
|
import { uuidV7 } from './uuid';
|
|
12
|
+
import { getCachedNetworkType } from './netinfo';
|
|
12
13
|
import type { App, AttachmentMeta, Device, Event, SentoriError, Tags, User } from './types';
|
|
13
14
|
|
|
14
15
|
export { captureStep, __resetTrailForTests } from './trail';
|
|
@@ -214,17 +215,41 @@ const errorToObject = (error: Error): SentoriError => {
|
|
|
214
215
|
const collectDevice = (): Device => {
|
|
215
216
|
let os: Device['os'] = 'other';
|
|
216
217
|
let osVersion = '0';
|
|
218
|
+
let locale: string | undefined;
|
|
219
|
+
const networkType = getCachedNetworkType();
|
|
217
220
|
try {
|
|
218
221
|
const RN = require('react-native') as {
|
|
222
|
+
NativeModules: {
|
|
223
|
+
I18nManager?: { localeIdentifier?: string };
|
|
224
|
+
SettingsManager?: {
|
|
225
|
+
settings?: { AppleLanguages?: string[]; AppleLocale?: string };
|
|
226
|
+
};
|
|
227
|
+
};
|
|
219
228
|
Platform: { OS: string; Version: string | number };
|
|
220
229
|
};
|
|
221
230
|
const rnOS = RN.Platform.OS;
|
|
222
231
|
os = rnOS === 'ios' || rnOS === 'android' || rnOS === 'web' ? rnOS : 'other';
|
|
223
232
|
osVersion = String(RN.Platform.Version);
|
|
233
|
+
// v0.8.0-a — RN reads user locale through native modules. These
|
|
234
|
+
// are stable RN-internal modules (SettingsManager since 0.4,
|
|
235
|
+
// I18nManager since 0.16) so we can read them directly without
|
|
236
|
+
// an extra peer dep. iOS returns e.g. "en_US"; Android returns
|
|
237
|
+
// e.g. "en_US" via `getDefault().toString()`. `AppleLocale` is
|
|
238
|
+
// the format the user picked in Settings; `AppleLanguages[0]`
|
|
239
|
+
// is the resolved language priority — prefer the former.
|
|
240
|
+
if (rnOS === 'ios') {
|
|
241
|
+
const s = RN.NativeModules.SettingsManager?.settings;
|
|
242
|
+
locale = s?.AppleLocale ?? s?.AppleLanguages?.[0];
|
|
243
|
+
} else if (rnOS === 'android') {
|
|
244
|
+
locale = RN.NativeModules.I18nManager?.localeIdentifier;
|
|
245
|
+
}
|
|
224
246
|
} catch {
|
|
225
247
|
// not in RN runtime (jest, bun test)
|
|
226
248
|
}
|
|
227
|
-
|
|
249
|
+
const device: Device = { os, osVersion };
|
|
250
|
+
if (locale) device.locale = locale;
|
|
251
|
+
if (networkType) device.networkType = networkType;
|
|
252
|
+
return device;
|
|
228
253
|
};
|
|
229
254
|
|
|
230
255
|
const collectApp = (release: string): App => {
|
package/src/init.ts
CHANGED
|
@@ -4,6 +4,7 @@ import { installLifecycleHandler } from './handlers/lifecycle';
|
|
|
4
4
|
import { installPromiseHandler } from './handlers/promise';
|
|
5
5
|
import { installNetworkHandler } from './handlers/network';
|
|
6
6
|
import { drainNativePending, setNativeConfig } from './native';
|
|
7
|
+
import { startNetworkTypeWatch } from './netinfo';
|
|
7
8
|
import { startSession } from './session-tracker';
|
|
8
9
|
import {
|
|
9
10
|
drainOfflineQueue,
|
|
@@ -95,6 +96,10 @@ export const init = (options: InitOptions): void => {
|
|
|
95
96
|
});
|
|
96
97
|
|
|
97
98
|
startTransport();
|
|
99
|
+
// v0.8.0-c — start watching network class. No-op if NetInfo isn't
|
|
100
|
+
// installed; events just won't carry `device.networkType` in that
|
|
101
|
+
// case.
|
|
102
|
+
startNetworkTypeWatch();
|
|
98
103
|
|
|
99
104
|
const capture = options.capture ?? {};
|
|
100
105
|
if (capture.globalErrors !== false) installGlobalHandler();
|
package/src/navigation.ts
CHANGED
|
@@ -54,6 +54,9 @@ export type NavigationRefLike = {
|
|
|
54
54
|
export function useTraceNavigation(navigationRef: NavigationRefLike): void {
|
|
55
55
|
// Latest route name we've observed.
|
|
56
56
|
const lastRouteRef = useRef<null | string>(null);
|
|
57
|
+
// Wall-clock ms when the last screen was entered. Drives dwell time
|
|
58
|
+
// attached to the leaving span + the next captureStep breadcrumb.
|
|
59
|
+
const lastRouteEnteredAtRef = useRef<null | number>(null);
|
|
57
60
|
// Span for the screen the user is currently on. Finished when the
|
|
58
61
|
// next screen is entered (or on unmount).
|
|
59
62
|
const openSpanRef = useRef<null | SpanHandle>(null);
|
|
@@ -65,7 +68,11 @@ export function useTraceNavigation(navigationRef: NavigationRefLike): void {
|
|
|
65
68
|
// Each screen gets its own trace root — detach from whatever the
|
|
66
69
|
// previous screen's span was (we keep it active, so without
|
|
67
70
|
// `parent: null` the new one would nest under it).
|
|
68
|
-
const openScreenSpan = (
|
|
71
|
+
const openScreenSpan = (
|
|
72
|
+
from: null | string,
|
|
73
|
+
to: string,
|
|
74
|
+
prevDwellMs: null | number,
|
|
75
|
+
) => {
|
|
69
76
|
const span = startSpan('react.navigation', {
|
|
70
77
|
name: from ? `${from} → ${to}` : to,
|
|
71
78
|
parent: null,
|
|
@@ -74,33 +81,54 @@ export function useTraceNavigation(navigationRef: NavigationRefLike): void {
|
|
|
74
81
|
openSpanRef.current = span;
|
|
75
82
|
setActiveSpan(span);
|
|
76
83
|
lastRouteRef.current = to;
|
|
77
|
-
|
|
78
|
-
//
|
|
79
|
-
//
|
|
84
|
+
lastRouteEnteredAtRef.current = Date.now();
|
|
85
|
+
// v0.8.0-b — dwell on the previous screen surfaces in the
|
|
86
|
+
// session trail. The leaving span's `durationMs` already
|
|
87
|
+
// carries the same number, but the trail is the most-glanced
|
|
88
|
+
// surface so we duplicate it as breadcrumb data. No bytes wasted:
|
|
89
|
+
// a breadcrumb without sessionTrail enabled is a no-op.
|
|
80
90
|
captureStep(`screen:${to}`, {
|
|
81
|
-
breadcrumb: {
|
|
91
|
+
breadcrumb: {
|
|
92
|
+
data: prevDwellMs !== null ? { dwellMsPrev: prevDwellMs } : undefined,
|
|
93
|
+
message: from ? `${from} → ${to}` : to,
|
|
94
|
+
type: 'navigation',
|
|
95
|
+
},
|
|
82
96
|
});
|
|
83
97
|
};
|
|
84
98
|
|
|
99
|
+
const finishOpenSpanWithDwell = (): null | number => {
|
|
100
|
+
const span = openSpanRef.current;
|
|
101
|
+
const enteredAt = lastRouteEnteredAtRef.current;
|
|
102
|
+
if (!span) return null;
|
|
103
|
+
const dwellMs = enteredAt !== null ? Math.max(0, Date.now() - enteredAt) : null;
|
|
104
|
+
span.finish({
|
|
105
|
+
status: 'ok',
|
|
106
|
+
// Tag values are strings on the wire — cast at finish-time.
|
|
107
|
+
tags: dwellMs !== null ? { 'nav.dwell_ms': String(dwellMs) } : undefined,
|
|
108
|
+
});
|
|
109
|
+
return dwellMs;
|
|
110
|
+
};
|
|
111
|
+
|
|
85
112
|
// Open a span for the initial screen so its requests are grouped
|
|
86
113
|
// too (auth / config / first data load are usually the busiest
|
|
87
114
|
// screen of a session).
|
|
88
115
|
const initial = navigationRef.getCurrentRoute()?.name ?? null;
|
|
89
|
-
if (initial !== null) openScreenSpan(null, initial);
|
|
116
|
+
if (initial !== null) openScreenSpan(null, initial, null);
|
|
90
117
|
else lastRouteRef.current = null;
|
|
91
118
|
|
|
92
119
|
const unsubscribe = navigationRef.addListener('state', () => {
|
|
93
120
|
const next = navigationRef.getCurrentRoute()?.name ?? null;
|
|
94
121
|
const prev = lastRouteRef.current;
|
|
95
122
|
if (next === null || next === prev) return;
|
|
96
|
-
|
|
97
|
-
openScreenSpan(prev, next);
|
|
123
|
+
const dwellMs = finishOpenSpanWithDwell();
|
|
124
|
+
openScreenSpan(prev, next, dwellMs);
|
|
98
125
|
});
|
|
99
126
|
|
|
100
127
|
return () => {
|
|
101
128
|
unsubscribe();
|
|
102
|
-
|
|
129
|
+
finishOpenSpanWithDwell();
|
|
103
130
|
openSpanRef.current = null;
|
|
131
|
+
lastRouteEnteredAtRef.current = null;
|
|
104
132
|
setActiveSpan(null);
|
|
105
133
|
};
|
|
106
134
|
}, [navigationRef]);
|
package/src/netinfo.ts
ADDED
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
// v0.8.0-c — cached read of the current network class.
|
|
2
|
+
//
|
|
3
|
+
// `@react-native-community/netinfo` is an OPTIONAL peer dep. If the
|
|
4
|
+
// host app has it installed (most production RN apps do — it's a
|
|
5
|
+
// standard library), we subscribe at SDK init time and cache the
|
|
6
|
+
// latest network state. `collectDevice()` reads the cache
|
|
7
|
+
// synchronously at capture time. If the peer isn't installed, the
|
|
8
|
+
// cache stays `undefined` and `device.networkType` is omitted —
|
|
9
|
+
// no warning, no crash.
|
|
10
|
+
//
|
|
11
|
+
// We collapse NetInfo's enum into the smaller set the protocol
|
|
12
|
+
// allows (see `Device.networkType` in `sdk/core/src/types.ts`):
|
|
13
|
+
// `wifi`, `2g/3g/4g/slow-2g`, `offline`, `unknown`. 5G collapses
|
|
14
|
+
// into `4g` because the schema doesn't have a 5g slot yet; the
|
|
15
|
+
// information loss is acceptable for an analytics dimension.
|
|
16
|
+
|
|
17
|
+
import type { Device } from '@goliapkg/sentori-core';
|
|
18
|
+
|
|
19
|
+
type NetworkType = Device['networkType'];
|
|
20
|
+
|
|
21
|
+
type NetInfoState = {
|
|
22
|
+
details?: { cellularGeneration?: null | string };
|
|
23
|
+
isConnected?: boolean | null;
|
|
24
|
+
type?: string;
|
|
25
|
+
};
|
|
26
|
+
|
|
27
|
+
type NetInfoModule = {
|
|
28
|
+
addEventListener?: (cb: (state: NetInfoState) => void) => () => void;
|
|
29
|
+
default?: { addEventListener?: (cb: (state: NetInfoState) => void) => () => void };
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
let _cached: NetworkType;
|
|
33
|
+
let _started = false;
|
|
34
|
+
let _unsubscribe: (() => void) | null = null;
|
|
35
|
+
|
|
36
|
+
function mapState(state: NetInfoState): NetworkType {
|
|
37
|
+
if (state.isConnected === false) return 'offline';
|
|
38
|
+
if (state.type === 'wifi' || state.type === 'ethernet') return 'wifi';
|
|
39
|
+
if (state.type === 'cellular') {
|
|
40
|
+
const gen = state.details?.cellularGeneration;
|
|
41
|
+
if (gen === '2g' || gen === '3g' || gen === '4g') return gen;
|
|
42
|
+
if (gen === '5g') return '4g';
|
|
43
|
+
return 'unknown';
|
|
44
|
+
}
|
|
45
|
+
if (state.type === 'none' || state.type === 'unknown') return 'unknown';
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Idempotent — subscribe to NetInfo state changes and cache the
|
|
51
|
+
* latest network class. Called once from `init()`. Pure no-op if
|
|
52
|
+
* the peer isn't installed or we're not in an RN runtime.
|
|
53
|
+
*/
|
|
54
|
+
export function startNetworkTypeWatch(): void {
|
|
55
|
+
if (_started) return;
|
|
56
|
+
_started = true;
|
|
57
|
+
try {
|
|
58
|
+
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
59
|
+
const mod = require('@react-native-community/netinfo') as NetInfoModule;
|
|
60
|
+
const add = mod.addEventListener ?? mod.default?.addEventListener;
|
|
61
|
+
if (typeof add !== 'function') return;
|
|
62
|
+
_unsubscribe = add((state) => {
|
|
63
|
+
_cached = mapState(state);
|
|
64
|
+
});
|
|
65
|
+
} catch {
|
|
66
|
+
// not installed — leave cache undefined
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/** Synchronous read at capture time. */
|
|
71
|
+
export function getCachedNetworkType(): NetworkType {
|
|
72
|
+
return _cached;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** Test-only. */
|
|
76
|
+
export function __resetNetworkTypeForTests(): void {
|
|
77
|
+
_unsubscribe?.();
|
|
78
|
+
_unsubscribe = null;
|
|
79
|
+
_started = false;
|
|
80
|
+
_cached = undefined;
|
|
81
|
+
}
|