cordova-admob-tomitank 1.2.10 → 1.3.1

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/README.md CHANGED
@@ -15,6 +15,17 @@ const banner = new BannerAd(...);
15
15
  banner.on('size', (res) => ...);
16
16
  ```
17
17
 
18
+ ## Extras
19
+ - Added "admob.reinitWhenNeeded(callback)" function to restart when cordova - admob bridge connection lost
20
+ - Example:
21
+ ```
22
+ const initFn = () => {
23
+ const banner = new BannerAd(...);
24
+ banner.on('size', (res) => ...);
25
+ };
26
+ document.addEventListener('resume', () => admob.reinitWhenNeeded(), false);
27
+ ```
28
+
18
29
  ## Documentation
19
30
 
20
31
  You can find the documentation [on the website](https://admob-plus.github.io/docs/cordova).
package/esm/index.d.ts CHANGED
@@ -18,7 +18,13 @@ export declare class AdMob {
18
18
  readonly Events: typeof Events;
19
19
  readonly TrackingAuthorizationStatus: typeof TrackingAuthorizationStatus;
20
20
  constructor();
21
- reinit(callback?: Function): void;
21
+ /**
22
+ * Return false, when not needed, return true when yes
23
+ * @description error: bridge connection lost..
24
+ * @param callback
25
+ */
26
+ reinitWhenNeeded(callback?: Function): Promise<boolean>;
27
+ private reinit;
22
28
  private cleanup;
23
29
  configure(config: AdMobConfig): Promise<unknown>;
24
30
  configRequest(requestConfig: RequestConfig): Promise<unknown>;
package/esm/index.js CHANGED
@@ -72,16 +72,53 @@ var AdMob = /** @class */ (function () {
72
72
  this.TrackingAuthorizationStatus = TrackingAuthorizationStatus;
73
73
  channel.onCordovaReady.subscribe(cordovaEventListener);
74
74
  }
75
+ /**
76
+ * Return false, when not needed, return true when yes
77
+ * @description error: bridge connection lost..
78
+ * @param callback
79
+ */
80
+ AdMob.prototype.reinitWhenNeeded = function (callback) {
81
+ return __awaiter(this, void 0, void 0, function () {
82
+ var readyPromise, timeoutPromise, error_1;
83
+ return __generator(this, function (_a) {
84
+ switch (_a.label) {
85
+ case 0:
86
+ _a.trys.push([0, 2, , 3]);
87
+ readyPromise = execAsync(NativeActions.ready, []);
88
+ timeoutPromise = new Promise(function (resolve, reject) {
89
+ setTimeout(function () { return reject('error'); }, 2000); // Max 2 sec..
90
+ });
91
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
92
+ case 1:
93
+ _a.sent();
94
+ return [2 /*return*/, false];
95
+ case 2:
96
+ error_1 = _a.sent();
97
+ return [2 /*return*/, this.reinit(callback)];
98
+ case 3: return [2 /*return*/];
99
+ }
100
+ });
101
+ });
102
+ };
75
103
  AdMob.prototype.reinit = function (callback) {
76
104
  this.cleanup();
77
- if (typeof callback === 'function') {
78
- var readyCallback_1 = function () {
79
- document.removeEventListener(Events.ready, readyCallback_1);
80
- callback();
105
+ return new Promise(function (resolve) {
106
+ var onReady = function () {
107
+ clearTimeout(timeoutId);
108
+ document.removeEventListener(Events.ready, onReady);
109
+ resolve(true);
110
+ if (typeof callback === 'function') {
111
+ callback();
112
+ }
81
113
  };
82
- document.addEventListener(Events.ready, readyCallback_1);
83
- }
84
- channel.onCordovaReady.subscribe(cordovaEventListener);
114
+ var timeoutId = setTimeout(function () {
115
+ document.removeEventListener(Events.ready, onReady);
116
+ resolve(false);
117
+ }, 2000);
118
+ // wait fo ready event..
119
+ document.addEventListener(Events.ready, onReady);
120
+ channel.onCordovaReady.subscribe(cordovaEventListener);
121
+ });
85
122
  };
86
123
  AdMob.prototype.cleanup = function () {
87
124
  MobileAd.cleanup();
package/esm/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/www/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/www/index.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -18,7 +18,13 @@ export declare class AdMob {
18
18
  readonly Events: typeof Events;
19
19
  readonly TrackingAuthorizationStatus: typeof TrackingAuthorizationStatus;
20
20
  constructor();
21
- reinit(callback?: Function): void;
21
+ /**
22
+ * Return false, when not needed, return true when yes
23
+ * @description error: bridge connection lost..
24
+ * @param callback
25
+ */
26
+ reinitWhenNeeded(callback?: Function): Promise<boolean>;
27
+ private reinit;
22
28
  private cleanup;
23
29
  configure(config: AdMobConfig): Promise<unknown>;
24
30
  configRequest(requestConfig: RequestConfig): Promise<unknown>;
package/lib/index.js CHANGED
@@ -97,16 +97,53 @@ var AdMob = /** @class */ (function () {
97
97
  this.TrackingAuthorizationStatus = shared_1.TrackingAuthorizationStatus;
98
98
  channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
99
99
  }
100
+ /**
101
+ * Return false, when not needed, return true when yes
102
+ * @description error: bridge connection lost..
103
+ * @param callback
104
+ */
105
+ AdMob.prototype.reinitWhenNeeded = function (callback) {
106
+ return __awaiter(this, void 0, void 0, function () {
107
+ var readyPromise, timeoutPromise, error_1;
108
+ return __generator(this, function (_a) {
109
+ switch (_a.label) {
110
+ case 0:
111
+ _a.trys.push([0, 2, , 3]);
112
+ readyPromise = (0, shared_1.execAsync)(shared_1.NativeActions.ready, []);
113
+ timeoutPromise = new Promise(function (resolve, reject) {
114
+ setTimeout(function () { return reject('error'); }, 2000); // Max 2 sec..
115
+ });
116
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
117
+ case 1:
118
+ _a.sent();
119
+ return [2 /*return*/, false];
120
+ case 2:
121
+ error_1 = _a.sent();
122
+ return [2 /*return*/, this.reinit(callback)];
123
+ case 3: return [2 /*return*/];
124
+ }
125
+ });
126
+ });
127
+ };
100
128
  AdMob.prototype.reinit = function (callback) {
101
129
  this.cleanup();
102
- if (typeof callback === 'function') {
103
- var readyCallback_1 = function () {
104
- document.removeEventListener(shared_1.Events.ready, readyCallback_1);
105
- callback();
130
+ return new Promise(function (resolve) {
131
+ var onReady = function () {
132
+ clearTimeout(timeoutId);
133
+ document.removeEventListener(shared_1.Events.ready, onReady);
134
+ resolve(true);
135
+ if (typeof callback === 'function') {
136
+ callback();
137
+ }
106
138
  };
107
- document.addEventListener(shared_1.Events.ready, readyCallback_1);
108
- }
109
- channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
139
+ var timeoutId = setTimeout(function () {
140
+ document.removeEventListener(shared_1.Events.ready, onReady);
141
+ resolve(false);
142
+ }, 2000);
143
+ // wait fo ready event..
144
+ document.addEventListener(shared_1.Events.ready, onReady);
145
+ channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
146
+ });
110
147
  };
111
148
  AdMob.prototype.cleanup = function () {
112
149
  shared_1.MobileAd.cleanup();
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/www/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+B;AAC/B,wDAAmC;AAWjC,oBAXK,kBAAS,CAWL;AAVX,4DAAsC;AACtC,gEAA4C;AAY1C,yBAZK,sBAAc,CAYL;AAXhB,oDAAqD;AASnD,mBATK,gBAAQ,CASL;AARV,oDAAqD;AAWnD,mBAXK,gBAAQ,CAWL;AAVV,wDAA0F;AAYxF,qBAZK,kBAAU,CAYL;AAXZ,kFAAgG;AAa9F,iCAbK,+BAAsB,CAaL;AAZxB,mCAAsJ;AAEtJ,wCAAsB;AAetB,SAAS,mBAAmB,CAAC,KAAU;IAC7B,IAAA,IAAI,GAAK,KAAK,KAAV,CAAW;IACvB,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;QACrB,IAAI,CAAC,EAAE,GAAG,iBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACzC;IACD,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,oBAAoB;IAC3B,IAAM,OAAO,GAAG,kBAAkB,CAAC;IACnC,iBAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,iBAAO,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACvC,IAAA,cAAI,EAAC,mBAAmB,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,sBAAa,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;IAC3E,iBAAO,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC;AAED;IAWE;QAVgB,cAAS,GAAG,kBAAS,CAAC;QACtB,aAAQ,GAAG,gBAAQ,CAAC;QACpB,mBAAc,GAAG,sBAAc,CAAC;QAChC,aAAQ,GAAG,gBAAQ,CAAC;QACpB,eAAU,GAAG,kBAAU,CAAC;QACxB,2BAAsB,GAAG,+BAAsB,CAAC;QAChD,eAAU,GAAG,mBAAU,CAAC;QACxB,WAAM,GAAG,eAAM,CAAC;QAChB,gCAA2B,GAAG,oCAA2B,CAAC;QAGxE,iBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACzD,CAAC;IAEM,sBAAM,GAAb,UAAc,QAAmB;QAC/B,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;YAClC,IAAM,eAAa,GAAG;gBACpB,QAAQ,CAAC,mBAAmB,CAAC,eAAM,CAAC,KAAK,EAAE,eAAa,CAAC,CAAC;gBAC1D,QAAQ,EAAE,CAAC;YACb,CAAC,CAAC;YACF,QAAQ,CAAC,gBAAgB,CAAC,eAAM,CAAC,KAAK,EAAE,eAAa,CAAC,CAAC;SACxD;QACD,iBAAO,CAAC,cAAc,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;IACzD,CAAC;IAEO,uBAAO,GAAf;QACE,iBAAQ,CAAC,OAAO,EAAE,CAAC;QACnB,iBAAO,CAAC,cAAc,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IAEM,yBAAS,GAAhB,UAAiB,MAAmB;QAClC,OAAO,IAAA,kBAAS,EAAC,sBAAa,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,6BAAa,GAApB,UAAqB,aAA4B;QAC/C,OAAO,IAAA,kBAAS,EAAC,sBAAa,CAAC,aAAa,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACjE,CAAC;IAEM,2BAAW,GAAlB,UAAmB,KAAc;QAC/B,OAAO,IAAA,kBAAS,EAAC,sBAAa,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACvD,CAAC;IAEM,4BAAY,GAAnB,UAAoB,KAAa;QAC/B,OAAO,IAAA,kBAAS,EAAC,sBAAa,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,qBAAK,GAAZ;QACE,OAAO,iBAAQ,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAEY,4CAA4B,GAAzC;;;;;;6BAGM,CAAA,OAAO,CAAC,UAAU,8BAAkB,CAAA,EAApC,wBAAoC;wBAC5B,qBAAM,IAAA,kBAAS,EAAC,sBAAa,CAAC,4BAA4B,CAAC,EAAA;;wBAA/D,CAAC,GAAG,SAA2D;wBACrE,IAAI,CAAC,KAAK,KAAK,EAAE;4BACf,sBAAO,oCAA2B,CAChC,oCAA2B,CAAC,CAAW,CAAC,CACzC,EAAC;yBACH;;4BAEH,sBAAO,KAAK,EAAC;;;;KACd;IACH,YAAC;AAAD,CAAC,AAjED,IAiEC;AAjEY,sBAAK;AAuElB,kBAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/www/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cordova-admob-tomitank",
3
- "version": "1.2.10",
3
+ "version": "1.3.1",
4
4
  "description": "Trustable Google AdMob Cordova Plugin",
5
5
  "main": "lib/index.js",
6
6
  "module": "esm/index.js",
package/plugin.xml CHANGED
@@ -1,5 +1,5 @@
1
1
  <?xml version='1.0' encoding='utf-8'?>
2
- <plugin id="cordova-admob-tomitank" version="1.2.10"
2
+ <plugin id="cordova-admob-tomitank" version="1.3.1"
3
3
  xmlns="http://apache.org/cordova/ns/plugins/1.0"
4
4
  xmlns:android="http://schemas.android.com/apk/res/android">
5
5
  <name>cordova-admob-tomitank</name>
@@ -27,9 +27,11 @@ class AMBPlugin: CDVPlugin {
27
27
  }
28
28
 
29
29
  @objc func ready(_ command: CDVInvokedUrlCommand) {
30
- readyCallbackId = command.callbackId
31
-
32
- DispatchQueue.global(qos: .background).async {
30
+ if readyCallbackId == nil {
31
+ readyCallbackId = command.callbackId
32
+ }
33
+ //DispatchQueue.global(qos: .background).async { // -> slow -> not safe!
34
+ DispatchQueue.main.async {
33
35
  self.emit(AMBEvents.ready, data: ["isRunningInTestLab": false])
34
36
  }
35
37
  }
package/src/www/index.ts CHANGED
@@ -54,16 +54,45 @@ export class AdMob {
54
54
  channel.onCordovaReady.subscribe(cordovaEventListener);
55
55
  }
56
56
 
57
- public reinit(callback?: Function) {
57
+ /**
58
+ * Return false, when not needed, return true when yes
59
+ * @description error: bridge connection lost..
60
+ * @param callback
61
+ */
62
+ public async reinitWhenNeeded(callback?: Function) {
63
+ try {
64
+ const readyPromise = execAsync(NativeActions.ready, []);
65
+ const timeoutPromise = new Promise((resolve, reject) => {
66
+ setTimeout(()=>reject('error'), 2000); // Max 2 sec..
67
+ });
68
+ await Promise.race([timeoutPromise, readyPromise]);
69
+ return false;
70
+ } catch (error) { // reinit only when has error..
71
+ return this.reinit(callback);
72
+ }
73
+ }
74
+
75
+ private reinit(callback?: Function): Promise<boolean> {
58
76
  this.cleanup();
59
- if (typeof callback === 'function') {
60
- const readyCallback = () => {
61
- document.removeEventListener(Events.ready, readyCallback);
62
- callback();
77
+ return new Promise((resolve) => {
78
+ const onReady = () => {
79
+ clearTimeout(timeoutId);
80
+ document.removeEventListener(Events.ready, onReady);
81
+ resolve(true);
82
+ if (typeof callback === 'function') {
83
+ callback();
84
+ }
63
85
  };
64
- document.addEventListener(Events.ready, readyCallback);
65
- }
66
- channel.onCordovaReady.subscribe(cordovaEventListener);
86
+
87
+ const timeoutId = setTimeout(() => { // Max 2 sec..
88
+ document.removeEventListener(Events.ready, onReady);
89
+ resolve(false);
90
+ }, 2000);
91
+
92
+ // wait fo ready event..
93
+ document.addEventListener(Events.ready, onReady);
94
+ channel.onCordovaReady.subscribe(cordovaEventListener);
95
+ });
67
96
  }
68
97
 
69
98
  private cleanup() {
package/www/admob.js CHANGED
@@ -566,16 +566,53 @@ var AdMob = /** @class */ (function () {
566
566
  this.TrackingAuthorizationStatus = TrackingAuthorizationStatus;
567
567
  channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
568
568
  }
569
+ /**
570
+ * Return false, when not needed, return true when yes
571
+ * @description error: bridge connection lost..
572
+ * @param callback
573
+ */
574
+ AdMob.prototype.reinitWhenNeeded = function (callback) {
575
+ return __awaiter(this, void 0, void 0, function () {
576
+ var readyPromise, timeoutPromise;
577
+ return __generator(this, function (_a) {
578
+ switch (_a.label) {
579
+ case 0:
580
+ _a.trys.push([0, 2, , 3]);
581
+ readyPromise = execAsync(NativeActions.ready, []);
582
+ timeoutPromise = new Promise(function (resolve, reject) {
583
+ setTimeout(function () { return reject('error'); }, 2000); // Max 2 sec..
584
+ });
585
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
586
+ case 1:
587
+ _a.sent();
588
+ return [2 /*return*/, false];
589
+ case 2:
590
+ _a.sent();
591
+ return [2 /*return*/, this.reinit(callback)];
592
+ case 3: return [2 /*return*/];
593
+ }
594
+ });
595
+ });
596
+ };
569
597
  AdMob.prototype.reinit = function (callback) {
570
598
  this.cleanup();
571
- if (typeof callback === 'function') {
572
- var readyCallback_1 = function () {
573
- document.removeEventListener(Events.ready, readyCallback_1);
574
- callback();
599
+ return new Promise(function (resolve) {
600
+ var onReady = function () {
601
+ clearTimeout(timeoutId);
602
+ document.removeEventListener(Events.ready, onReady);
603
+ resolve(true);
604
+ if (typeof callback === 'function') {
605
+ callback();
606
+ }
575
607
  };
576
- document.addEventListener(Events.ready, readyCallback_1);
577
- }
578
- channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
608
+ var timeoutId = setTimeout(function () {
609
+ document.removeEventListener(Events.ready, onReady);
610
+ resolve(false);
611
+ }, 2000);
612
+ // wait fo ready event..
613
+ document.addEventListener(Events.ready, onReady);
614
+ channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
615
+ });
579
616
  };
580
617
  AdMob.prototype.cleanup = function () {
581
618
  MobileAd.cleanup();