fix(core): Exception object was not set on Cap (#5917)

ionic-team · Sep 15, 2022 · 9ca27a4 · 9ca27a4
1 parent 7553ede
commit 9ca27a4
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 2 deletions.
diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
@@ -2,9 +2,36 @@
 /*! Capacitor: https://capacitorjs.com/ - MIT License */
 /* Generated File. Do not edit. */
 
-const nativeBridge = (function (exports) {
+var nativeBridge = (function (exports) {
     'use strict';
 
+    var ExceptionCode;
+    (function (ExceptionCode) {
+        /**
+         * API is not implemented.
+         *
+         * This usually means the API can't be used because it is not implemented for
+         * the current platform.
+         */
+        ExceptionCode["Unimplemented"] = "UNIMPLEMENTED";
+        /**
+         * API is not available.
+         *
+         * This means the API can't be used right now because:
+         *   - it is currently missing a prerequisite, such as network connectivity
+         *   - it requires a particular platform or browser version
+         */
+        ExceptionCode["Unavailable"] = "UNAVAILABLE";
+    })(ExceptionCode || (ExceptionCode = {}));
+    class CapacitorException extends Error {
+        constructor(message, code, data) {
+            super(message);
+            this.message = message;
+            this.code = code;
+            this.data = data;
+        }
+    }
+
     // For removing exports for iOS/Android, keep let for reassignment
     // eslint-disable-next-line
     let dummy = {};
@@ -468,6 +495,7 @@ const nativeBridge = (function (exports) {
                 });
             };
             cap.withPlugin = (_pluginId, _fn) => dummy;
+            cap.Exception = CapacitorException;
             initEvents(win, cap);
             initLegacyHandlers(win, cap);
             initVendor(win, cap);

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
@@ -10,6 +10,7 @@ import type {
   PluginResult,
   WindowCapacitor,
 } from './src/definitions-internal';
+import { CapacitorException } from './src/util';
 
 // For removing exports for iOS/Android, keep let for reassignment
 // eslint-disable-next-line
@@ -552,6 +553,8 @@ const initBridge = (w: any): void => {
 
     cap.withPlugin = (_pluginId, _fn) => dummy;
 
+    cap.Exception = CapacitorException;
+
     initEvents(win, cap);
     initLegacyHandlers(win, cap);
     initVendor(win, cap);

diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -2,9 +2,36 @@
 /*! Capacitor: https://capacitorjs.com/ - MIT License */
 /* Generated File. Do not edit. */
 
-const nativeBridge = (function (exports) {
+var nativeBridge = (function (exports) {
     'use strict';
 
+    var ExceptionCode;
+    (function (ExceptionCode) {
+        /**
+         * API is not implemented.
+         *
+         * This usually means the API can't be used because it is not implemented for
+         * the current platform.
+         */
+        ExceptionCode["Unimplemented"] = "UNIMPLEMENTED";
+        /**
+         * API is not available.
+         *
+         * This means the API can't be used right now because:
+         *   - it is currently missing a prerequisite, such as network connectivity
+         *   - it requires a particular platform or browser version
+         */
+        ExceptionCode["Unavailable"] = "UNAVAILABLE";
+    })(ExceptionCode || (ExceptionCode = {}));
+    class CapacitorException extends Error {
+        constructor(message, code, data) {
+            super(message);
+            this.message = message;
+            this.code = code;
+            this.data = data;
+        }
+    }
+
     // For removing exports for iOS/Android, keep let for reassignment
     // eslint-disable-next-line
     let dummy = {};
@@ -468,6 +495,7 @@ const nativeBridge = (function (exports) {
                 });
             };
             cap.withPlugin = (_pluginId, _fn) => dummy;
+            cap.Exception = CapacitorException;
             initEvents(win, cap);
             initLegacyHandlers(win, cap);
             initVendor(win, cap);