@webview-bridge/react-native 1.4.1-nightly.0 → 1.4.2

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.
@@ -42,6 +42,17 @@ exports.bridge = bridge;
42
42
  const handleBridge = async ({ bridge, method, args, webview, eventId, }) => {
43
43
  const _bridge = bridge.getState();
44
44
  const _method = _bridge[method];
45
+ const handleThrow = () => {
46
+ webview.injectJavaScript(`
47
+ window.nativeEmitter.emit('${method}-${eventId}', {}, true);
48
+
49
+ true;
50
+ `);
51
+ };
52
+ if (!(method in _bridge)) {
53
+ handleThrow();
54
+ return;
55
+ }
45
56
  if (typeof _method !== "function") {
46
57
  return;
47
58
  }
@@ -54,12 +65,8 @@ const handleBridge = async ({ bridge, method, args, webview, eventId, }) => {
54
65
  `);
55
66
  }
56
67
  catch (error) {
68
+ handleThrow();
57
69
  console.error(error);
58
- webview.injectJavaScript(`
59
- window.nativeEmitter.emit('${method}-${eventId}', {}, true);
60
-
61
- true;
62
- `);
63
70
  }
64
71
  };
65
72
  exports.handleBridge = handleBridge;
@@ -8,13 +8,19 @@ const handleRegisterWebMethod = (emitter, webview, bridgeNames, responseTimeout)
8
8
  acc[methodName] = async (...args) => {
9
9
  const eventId = (0, util_1.createRandomId)();
10
10
  return Promise.race([
11
- (0, util_1.createResolver)(emitter, methodName, eventId, () => {
12
- webview.injectJavaScript(`
11
+ (0, util_1.createResolver)({
12
+ emitter,
13
+ methodName,
14
+ eventId,
15
+ evaluate: () => {
16
+ webview.injectJavaScript(`
13
17
  window.webEmitter.emit('${methodName}', '${eventId}', ${JSON.stringify(args)});
14
18
 
15
19
  true;
16
20
  `);
17
- }, new error_1.WebMethodError(methodName)),
21
+ },
22
+ failHandler: new error_1.WebMethodError(methodName),
23
+ }),
18
24
  (0, util_1.timeout)(responseTimeout),
19
25
  ]);
20
26
  };
@@ -12,5 +12,13 @@ export interface EventEmitter<Events extends EventsMap = DefaultEvents> {
12
12
  on<K extends keyof Events>(this: this, event: K, cb: Events[K]): () => void;
13
13
  }
14
14
  export declare const createEvents: <Events extends EventsMap = DefaultEvents>() => EventEmitter<Events>;
15
- export declare const createResolver: (emitter: EventEmitter<DefaultEvents>, methodName: string, eventId: string, evaluate: () => void, failHandler?: Error | false) => Promise<unknown>;
15
+ export interface CreateResolverOptions {
16
+ emitter: EventEmitter<DefaultEvents>;
17
+ evaluate: () => void;
18
+ eventId: string;
19
+ failHandler?: Error | false;
20
+ methodName: string;
21
+ onFallback?: () => void;
22
+ }
23
+ export declare const createResolver: ({ emitter, evaluate, eventId, failHandler, methodName, onFallback, }: CreateResolverOptions) => Promise<unknown>;
16
24
  export {};
@@ -17,12 +17,13 @@ const createEvents = () => ({
17
17
  },
18
18
  });
19
19
  exports.createEvents = createEvents;
20
- const createResolver = (emitter, methodName, eventId, evaluate, failHandler = false) => {
20
+ const createResolver = ({ emitter, evaluate, eventId, failHandler = false, methodName, onFallback, }) => {
21
21
  return new Promise((resolve, reject) => {
22
22
  const unbind = emitter.on(`${methodName}-${eventId}`, (data, throwOccurred) => {
23
23
  unbind();
24
24
  if (throwOccurred) {
25
25
  if (failHandler instanceof Error) {
26
+ onFallback?.();
26
27
  reject(failHandler);
27
28
  }
28
29
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webview-bridge/react-native",
3
- "version": "1.4.1-nightly.0",
3
+ "version": "1.4.2",
4
4
  "type": "module",
5
5
  "description": "Fully Type-Safe Integration for React Native WebView and Web",
6
6
  "main": "dist/packages/react-native/src/index.js",