cordova-admob-tomitank 1.3.0 → 1.3.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.
Files changed (17) hide show
  1. package/README.md +1 -1
  2. package/esm/generated.js +1 -0
  3. package/esm/generated.js.map +1 -1
  4. package/esm/index.d.ts +5 -4
  5. package/esm/index.js +26 -13
  6. package/esm/index.js.map +1 -1
  7. package/lib/generated.js +1 -0
  8. package/lib/generated.js.map +1 -1
  9. package/lib/index.d.ts +5 -4
  10. package/lib/index.js +26 -13
  11. package/lib/index.js.map +1 -1
  12. package/package.json +1 -1
  13. package/plugin.xml +1 -1
  14. package/src/ios/AMBPlugin.swift +5 -3
  15. package/src/www/generated.ts +3 -3
  16. package/src/www/index.ts +28 -13
  17. package/www/admob.js +26 -12
package/README.md CHANGED
@@ -23,7 +23,7 @@ banner.on('size', (res) => ...);
23
23
  const banner = new BannerAd(...);
24
24
  banner.on('size', (res) => ...);
25
25
  };
26
- document.addEventListener('resume', () => admob.reinitWhenNeeded(), false);
26
+ document.addEventListener('resume', () => admob.reinitWhenNeeded(initFn), false);
27
27
  ```
28
28
 
29
29
  ## Documentation
package/esm/generated.js CHANGED
@@ -56,6 +56,7 @@ export function waitEvent(successEvent, failEvent) {
56
56
  }
57
57
  });
58
58
  }
59
+ ;
59
60
  export var initPlugin = function () {
60
61
  document.addEventListener('deviceready', function () {
61
62
  cordova.exec(function (event) {
package/esm/generated.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generated.js","sourceRoot":"","sources":["../src/www/generated.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,MAAM,CAAN,IAAY,aAcX;AAdD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,4CAA2B,CAAA;IAC3B,8CAA6B,CAAA;IAC7B,8CAA6B,CAAA;IAC7B,gDAA+B,CAAA;IAC/B,8EAA6D,CAAA;AAC/D,CAAC,EAdW,aAAa,KAAb,aAAa,QAcxB;AAED,MAAM,CAAN,IAAY,MAYX;AAZD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,kCAAwB,CAAA;IACxB,kCAAwB,CAAA;IACxB,oCAA0B,CAAA;IAC1B,sCAA4B,CAAA;IAC5B,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,sCAA4B,CAAA,CAAC,gBAAgB;AAC/C,CAAC,EAZW,MAAM,KAAN,MAAM,QAYjB;AAED,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,2DAAY,CAAA;IACZ,mEAAgB,CAAA;IAChB,yDAAW,CAAA;IACX,yDAAW,CAAA;IACX,2DAAY,CAAA;AACd,CAAC,EAPW,UAAU,KAAV,UAAU,QAOrB;AAED,MAAM,CAAC,IAAM,SAAS,GAAG,UAAC,MAAqB,EAAE,IAAY;IAC3D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,UAAU,SAAS,CACvB,YAAoB,EACpB,SAAc;IAAd,0BAAA,EAAA,cAAc;IAEd,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,QAAQ,CAAC,gBAAgB,CACvB,YAAmB,EACnB,UAAC,KAAkB;YACjB,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,EACD,KAAK,CACN,CAAA;QAED,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,gBAAgB,CACvB,SAAgB,EAChB,UAAC,WAAwB;gBACvB,MAAM,CAAC,WAAW,CAAC,CAAA;YACrB,CAAC,EACD,KAAK,CACN,CAAA;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,IAAM,UAAU,GAAG;IACxB,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb;QACE,OAAO,CAAC,IAAI,CACV,UAAC,KAAK;YACJ,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACnD,CAAC,EACD,OAAO,CAAC,KAAK,EACb,OAAO,EACP,aAAa,CAAC,KAAK,CACpB,CAAA;IACH,CAAC,EACD,KAAK,CACN,CAAA;AACH,CAAC,CAAA"}
1
+ {"version":3,"file":"generated.js","sourceRoot":"","sources":["../src/www/generated.ts"],"names":[],"mappings":"AAAA,iEAAiE;AACjE,MAAM,CAAN,IAAY,aAcX;AAdD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,4CAA2B,CAAA;IAC3B,8CAA6B,CAAA;IAC7B,8CAA6B,CAAA;IAC7B,gDAA+B,CAAA;IAC/B,8EAA6D,CAAA;AAC/D,CAAC,EAdW,aAAa,KAAb,aAAa,QAcxB;AAED,MAAM,CAAN,IAAY,MAYX;AAZD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,kCAAwB,CAAA;IACxB,kCAAwB,CAAA;IACxB,oCAA0B,CAAA;IAC1B,sCAA4B,CAAA;IAC5B,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,sCAA4B,CAAA,CAAC,gBAAgB;AAC/C,CAAC,EAZW,MAAM,KAAN,MAAM,QAYjB;AAED,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,2DAAY,CAAA;IACZ,mEAAgB,CAAA;IAChB,yDAAW,CAAA;IACX,yDAAW,CAAA;IACX,2DAAY,CAAA;AACd,CAAC,EAPW,UAAU,KAAV,UAAU,QAOrB;AAED,MAAM,CAAC,IAAM,SAAS,GAAG,UAAC,MAAqB,EAAE,IAAY;IAC3D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAA;AAED,MAAM,UAAU,SAAS,CACvB,YAAoB,EACpB,SAAc;IAAd,0BAAA,EAAA,cAAc;IAEd,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,QAAQ,CAAC,gBAAgB,CACvB,YAAmB,EACnB,UAAC,KAAkB;YACjB,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,EACD,KAAK,CACN,CAAA;QAED,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,gBAAgB,CACvB,SAAgB,EAChB,UAAC,WAAwB;gBACvB,MAAM,CAAC,WAAW,CAAC,CAAA;YACrB,CAAC,EACD,KAAK,CACN,CAAA;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAAA,CAAC;AAEF,MAAM,CAAC,IAAM,UAAU,GAAG;IACxB,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb;QACE,OAAO,CAAC,IAAI,CACV,UAAC,KAAK;YACJ,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACnD,CAAC,EACD,OAAO,CAAC,KAAK,EACb,OAAO,EACP,aAAa,CAAC,KAAK,CACpB,CAAA;IACH,CAAC,EACD,KAAK,CACN,CAAA;AACH,CAAC,CAAC"}
package/esm/index.d.ts CHANGED
@@ -19,11 +19,12 @@ export declare class AdMob {
19
19
  readonly TrackingAuthorizationStatus: typeof TrackingAuthorizationStatus;
20
20
  constructor();
21
21
  /**
22
- * Return false, when not needed, return true when yes
23
- * @description error: bridge connection lost..
24
- * @param callback
22
+ * @return true: successfully reinited
23
+ * @return false: reinit not needed bridge still connected
24
+ * @return 'fail': ready event not fired after reinit
25
+ * @param callback? Function
25
26
  */
26
- reinitWhenNeeded(callback?: Function): Promise<boolean>;
27
+ reinitWhenNeeded(callback?: Function): Promise<boolean | "fail">;
27
28
  private reinit;
28
29
  private cleanup;
29
30
  configure(config: AdMobConfig): Promise<unknown>;
package/esm/index.js CHANGED
@@ -73,18 +73,23 @@ var AdMob = /** @class */ (function () {
73
73
  channel.onCordovaReady.subscribe(cordovaEventListener);
74
74
  }
75
75
  /**
76
- * Return false, when not needed, return true when yes
77
- * @description error: bridge connection lost..
78
- * @param callback
76
+ * @return true: successfully reinited
77
+ * @return false: reinit not needed bridge still connected
78
+ * @return 'fail': ready event not fired after reinit
79
+ * @param callback? Function
79
80
  */
80
81
  AdMob.prototype.reinitWhenNeeded = function (callback) {
81
82
  return __awaiter(this, void 0, void 0, function () {
82
- var error_1;
83
+ var readyPromise, timeoutPromise, error_1;
83
84
  return __generator(this, function (_a) {
84
85
  switch (_a.label) {
85
86
  case 0:
86
87
  _a.trys.push([0, 2, , 3]);
87
- return [4 /*yield*/, execAsync(NativeActions.ready, [])];
88
+ readyPromise = execAsync(NativeActions.ready, []);
89
+ timeoutPromise = new Promise(function (resolve, reject) {
90
+ setTimeout(function () { return reject('timeout'); }, 2000); // Max 2 sec..
91
+ });
92
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
88
93
  case 1:
89
94
  _a.sent();
90
95
  return [2 /*return*/, false];
@@ -98,15 +103,23 @@ var AdMob = /** @class */ (function () {
98
103
  };
99
104
  AdMob.prototype.reinit = function (callback) {
100
105
  this.cleanup();
101
- if (typeof callback === 'function') {
102
- var readyCallback_1 = function () {
103
- document.removeEventListener(Events.ready, readyCallback_1);
104
- callback();
106
+ return new Promise(function (resolve) {
107
+ var onReady = function () {
108
+ clearTimeout(timeoutId);
109
+ document.removeEventListener(Events.ready, onReady);
110
+ resolve(true);
111
+ if (typeof callback === 'function') {
112
+ callback();
113
+ }
105
114
  };
106
- document.addEventListener(Events.ready, readyCallback_1);
107
- }
108
- channel.onCordovaReady.subscribe(cordovaEventListener);
109
- return true;
115
+ var timeoutId = setTimeout(function () {
116
+ document.removeEventListener(Events.ready, onReady);
117
+ resolve('fail');
118
+ }, 2000);
119
+ // wait fo ready event..
120
+ document.addEventListener(Events.ready, onReady);
121
+ channel.onCordovaReady.subscribe(cordovaEventListener);
122
+ });
110
123
  };
111
124
  AdMob.prototype.cleanup = function () {
112
125
  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/generated.js CHANGED
@@ -61,6 +61,7 @@ function waitEvent(successEvent, failEvent) {
61
61
  });
62
62
  }
63
63
  exports.waitEvent = waitEvent;
64
+ ;
64
65
  var initPlugin = function () {
65
66
  document.addEventListener('deviceready', function () {
66
67
  cordova.exec(function (event) {
package/lib/generated.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generated.js","sourceRoot":"","sources":["../src/www/generated.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,IAAY,aAcX;AAdD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,4CAA2B,CAAA;IAC3B,8CAA6B,CAAA;IAC7B,8CAA6B,CAAA;IAC7B,gDAA+B,CAAA;IAC/B,8EAA6D,CAAA;AAC/D,CAAC,EAdW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAcxB;AAED,IAAY,MAYX;AAZD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,kCAAwB,CAAA;IACxB,kCAAwB,CAAA;IACxB,oCAA0B,CAAA;IAC1B,sCAA4B,CAAA;IAC5B,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,sCAA4B,CAAA,CAAC,gBAAgB;AAC/C,CAAC,EAZW,MAAM,GAAN,cAAM,KAAN,cAAM,QAYjB;AAED,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,2DAAY,CAAA;IACZ,mEAAgB,CAAA;IAChB,yDAAW,CAAA;IACX,yDAAW,CAAA;IACX,2DAAY,CAAA;AACd,CAAC,EAPW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAOrB;AAEM,IAAM,SAAS,GAAG,UAAC,MAAqB,EAAE,IAAY;IAC3D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAJY,QAAA,SAAS,aAIrB;AAED,SAAgB,SAAS,CACvB,YAAoB,EACpB,SAAc;IAAd,0BAAA,EAAA,cAAc;IAEd,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,QAAQ,CAAC,gBAAgB,CACvB,YAAmB,EACnB,UAAC,KAAkB;YACjB,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,EACD,KAAK,CACN,CAAA;QAED,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,gBAAgB,CACvB,SAAgB,EAChB,UAAC,WAAwB;gBACvB,MAAM,CAAC,WAAW,CAAC,CAAA;YACrB,CAAC,EACD,KAAK,CACN,CAAA;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAvBD,8BAuBC;AAEM,IAAM,UAAU,GAAG;IACxB,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb;QACE,OAAO,CAAC,IAAI,CACV,UAAC,KAAK;YACJ,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACnD,CAAC,EACD,OAAO,CAAC,KAAK,EACb,OAAO,EACP,aAAa,CAAC,KAAK,CACpB,CAAA;IACH,CAAC,EACD,KAAK,CACN,CAAA;AACH,CAAC,CAAA;AAfY,QAAA,UAAU,cAetB"}
1
+ {"version":3,"file":"generated.js","sourceRoot":"","sources":["../src/www/generated.ts"],"names":[],"mappings":";;;AAAA,iEAAiE;AACjE,IAAY,aAcX;AAdD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,kCAAiB,CAAA;IACjB,sCAAqB,CAAA;IACrB,wCAAuB,CAAA;IACvB,0CAAyB,CAAA;IACzB,4CAA2B,CAAA;IAC3B,8CAA6B,CAAA;IAC7B,8CAA6B,CAAA;IAC7B,gDAA+B,CAAA;IAC/B,8EAA6D,CAAA;AAC/D,CAAC,EAdW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAcxB;AAED,IAAY,MAYX;AAZD,WAAY,MAAM;IAChB,+BAAqB,CAAA;IACrB,kCAAwB,CAAA;IACxB,kCAAwB,CAAA;IACxB,oCAA0B,CAAA;IAC1B,sCAA4B,CAAA;IAC5B,wCAA8B,CAAA;IAC9B,0CAAgC,CAAA;IAChC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,sCAA4B,CAAA,CAAC,gBAAgB;AAC/C,CAAC,EAZW,MAAM,GAAN,cAAM,KAAN,cAAM,QAYjB;AAED,IAAY,UAOX;AAPD,WAAY,UAAU;IACpB,+CAAM,CAAA;IACN,2DAAY,CAAA;IACZ,mEAAgB,CAAA;IAChB,yDAAW,CAAA;IACX,yDAAW,CAAA;IACX,2DAAY,CAAA;AACd,CAAC,EAPW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAOrB;AAEM,IAAM,SAAS,GAAG,UAAC,MAAqB,EAAE,IAAY;IAC3D,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACtD,CAAC,CAAC,CAAC;AACL,CAAC,CAAA;AAJY,QAAA,SAAS,aAIrB;AAED,SAAgB,SAAS,CACvB,YAAoB,EACpB,SAAc;IAAd,0BAAA,EAAA,cAAc;IAEd,OAAO,IAAI,OAAO,CAAC,UAAC,OAAO,EAAE,MAAM;QACjC,QAAQ,CAAC,gBAAgB,CACvB,YAAmB,EACnB,UAAC,KAAkB;YACjB,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,EACD,KAAK,CACN,CAAA;QAED,IAAI,SAAS,EAAE;YACb,QAAQ,CAAC,gBAAgB,CACvB,SAAgB,EAChB,UAAC,WAAwB;gBACvB,MAAM,CAAC,WAAW,CAAC,CAAA;YACrB,CAAC,EACD,KAAK,CACN,CAAA;SACF;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAvBD,8BAuBC;AAAA,CAAC;AAEK,IAAM,UAAU,GAAG;IACxB,QAAQ,CAAC,gBAAgB,CACvB,aAAa,EACb;QACE,OAAO,CAAC,IAAI,CACV,UAAC,KAAK;YACJ,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QACnD,CAAC,EACD,OAAO,CAAC,KAAK,EACb,OAAO,EACP,aAAa,CAAC,KAAK,CACpB,CAAA;IACH,CAAC,EACD,KAAK,CACN,CAAA;AACH,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB"}
package/lib/index.d.ts CHANGED
@@ -19,11 +19,12 @@ export declare class AdMob {
19
19
  readonly TrackingAuthorizationStatus: typeof TrackingAuthorizationStatus;
20
20
  constructor();
21
21
  /**
22
- * Return false, when not needed, return true when yes
23
- * @description error: bridge connection lost..
24
- * @param callback
22
+ * @return true: successfully reinited
23
+ * @return false: reinit not needed bridge still connected
24
+ * @return 'fail': ready event not fired after reinit
25
+ * @param callback? Function
25
26
  */
26
- reinitWhenNeeded(callback?: Function): Promise<boolean>;
27
+ reinitWhenNeeded(callback?: Function): Promise<boolean | "fail">;
27
28
  private reinit;
28
29
  private cleanup;
29
30
  configure(config: AdMobConfig): Promise<unknown>;
package/lib/index.js CHANGED
@@ -98,18 +98,23 @@ var AdMob = /** @class */ (function () {
98
98
  channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
99
99
  }
100
100
  /**
101
- * Return false, when not needed, return true when yes
102
- * @description error: bridge connection lost..
103
- * @param callback
101
+ * @return true: successfully reinited
102
+ * @return false: reinit not needed bridge still connected
103
+ * @return 'fail': ready event not fired after reinit
104
+ * @param callback? Function
104
105
  */
105
106
  AdMob.prototype.reinitWhenNeeded = function (callback) {
106
107
  return __awaiter(this, void 0, void 0, function () {
107
- var error_1;
108
+ var readyPromise, timeoutPromise, error_1;
108
109
  return __generator(this, function (_a) {
109
110
  switch (_a.label) {
110
111
  case 0:
111
112
  _a.trys.push([0, 2, , 3]);
112
- return [4 /*yield*/, (0, shared_1.execAsync)(shared_1.NativeActions.ready, [])];
113
+ readyPromise = (0, shared_1.execAsync)(shared_1.NativeActions.ready, []);
114
+ timeoutPromise = new Promise(function (resolve, reject) {
115
+ setTimeout(function () { return reject('timeout'); }, 2000); // Max 2 sec..
116
+ });
117
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
113
118
  case 1:
114
119
  _a.sent();
115
120
  return [2 /*return*/, false];
@@ -123,15 +128,23 @@ var AdMob = /** @class */ (function () {
123
128
  };
124
129
  AdMob.prototype.reinit = function (callback) {
125
130
  this.cleanup();
126
- if (typeof callback === 'function') {
127
- var readyCallback_1 = function () {
128
- document.removeEventListener(shared_1.Events.ready, readyCallback_1);
129
- callback();
131
+ return new Promise(function (resolve) {
132
+ var onReady = function () {
133
+ clearTimeout(timeoutId);
134
+ document.removeEventListener(shared_1.Events.ready, onReady);
135
+ resolve(true);
136
+ if (typeof callback === 'function') {
137
+ callback();
138
+ }
130
139
  };
131
- document.addEventListener(shared_1.Events.ready, readyCallback_1);
132
- }
133
- channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
134
- return true;
140
+ var timeoutId = setTimeout(function () {
141
+ document.removeEventListener(shared_1.Events.ready, onReady);
142
+ resolve('fail');
143
+ }, 2000);
144
+ // wait fo ready event..
145
+ document.addEventListener(shared_1.Events.ready, onReady);
146
+ channel_1.default.onCordovaReady.subscribe(cordovaEventListener);
147
+ });
135
148
  };
136
149
  AdMob.prototype.cleanup = function () {
137
150
  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":"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"}
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.3.0",
3
+ "version": "1.3.2",
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.3.0"
2
+ <plugin id="cordova-admob-tomitank" version="1.3.2"
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>
package/src/ios/AMBPlugin.swift CHANGED
@@ -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/generated.ts CHANGED
@@ -41,7 +41,7 @@ export enum AdSizeType {
41
41
  export const execAsync = (action: NativeActions, args?: any[]) => {
42
42
  return new Promise((resolve, reject) => {
43
43
  cordova.exec(resolve, reject, 'AdMob', action, args)
44
- })
44
+ });
45
45
  }
46
46
 
47
47
  export function waitEvent(
@@ -67,7 +67,7 @@ export function waitEvent(
67
67
  )
68
68
  }
69
69
  })
70
- }
70
+ };
71
71
 
72
72
  export const initPlugin = () => {
73
73
  document.addEventListener(
@@ -84,4 +84,4 @@ export const initPlugin = () => {
84
84
  },
85
85
  false,
86
86
  )
87
- }
87
+ };
package/src/www/index.ts CHANGED
@@ -55,30 +55,45 @@ export class AdMob {
55
55
  }
56
56
 
57
57
  /**
58
- * Return false, when not needed, return true when yes
59
- * @description error: bridge connection lost..
60
- * @param callback
58
+ * @return true: successfully reinited
59
+ * @return false: reinit not needed bridge still connected
60
+ * @return 'fail': ready event not fired after reinit
61
+ * @param callback? Function
61
62
  */
62
63
  public async reinitWhenNeeded(callback?: Function) {
63
64
  try {
64
- await execAsync(NativeActions.ready, []);
65
+ const readyPromise = execAsync(NativeActions.ready, []);
66
+ const timeoutPromise = new Promise((resolve, reject) => {
67
+ setTimeout(()=>reject('timeout'), 2000); // Max 2 sec..
68
+ });
69
+ await Promise.race([timeoutPromise, readyPromise]);
65
70
  return false;
66
71
  } catch (error) { // reinit only when has error..
67
72
  return this.reinit(callback);
68
73
  }
69
74
  }
70
75
 
71
- private reinit(callback?: Function) {
72
- this.cleanup();
73
- if (typeof callback === 'function') {
74
- const readyCallback = () => {
75
- document.removeEventListener(Events.ready, readyCallback);
76
+ private reinit(callback?: Function): Promise<true|'fail'> {
77
+ this.cleanup();
78
+ return new Promise((resolve) => {
79
+ const onReady = () => {
80
+ clearTimeout(timeoutId);
81
+ document.removeEventListener(Events.ready, onReady);
82
+ resolve(true);
83
+ if (typeof callback === 'function') {
76
84
  callback();
77
- };
78
- document.addEventListener(Events.ready, readyCallback);
79
- }
85
+ }
86
+ };
87
+
88
+ const timeoutId = setTimeout(() => { // Max 2 sec..
89
+ document.removeEventListener(Events.ready, onReady);
90
+ resolve('fail');
91
+ }, 2000);
92
+
93
+ // wait fo ready event..
94
+ document.addEventListener(Events.ready, onReady);
80
95
  channel.onCordovaReady.subscribe(cordovaEventListener);
81
- return true;
96
+ });
82
97
  }
83
98
 
84
99
  private cleanup() {
package/www/admob.js CHANGED
@@ -567,17 +567,23 @@ var AdMob = /** @class */ (function () {
567
567
  channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
568
568
  }
569
569
  /**
570
- * Return false, when not needed, return true when yes
571
- * @description error: bridge connection lost..
572
- * @param callback
570
+ * @return true: successfully reinited
571
+ * @return false: reinit not needed bridge still connected
572
+ * @return 'fail': ready event not fired after reinit
573
+ * @param callback? Function
573
574
  */
574
575
  AdMob.prototype.reinitWhenNeeded = function (callback) {
575
576
  return __awaiter(this, void 0, void 0, function () {
577
+ var readyPromise, timeoutPromise;
576
578
  return __generator(this, function (_a) {
577
579
  switch (_a.label) {
578
580
  case 0:
579
581
  _a.trys.push([0, 2, , 3]);
580
- return [4 /*yield*/, execAsync(NativeActions.ready, [])];
582
+ readyPromise = execAsync(NativeActions.ready, []);
583
+ timeoutPromise = new Promise(function (resolve, reject) {
584
+ setTimeout(function () { return reject('timeout'); }, 2000); // Max 2 sec..
585
+ });
586
+ return [4 /*yield*/, Promise.race([timeoutPromise, readyPromise])];
581
587
  case 1:
582
588
  _a.sent();
583
589
  return [2 /*return*/, false];
@@ -591,15 +597,23 @@ var AdMob = /** @class */ (function () {
591
597
  };
592
598
  AdMob.prototype.reinit = function (callback) {
593
599
  this.cleanup();
594
- if (typeof callback === 'function') {
595
- var readyCallback_1 = function () {
596
- document.removeEventListener(Events.ready, readyCallback_1);
597
- callback();
600
+ return new Promise(function (resolve) {
601
+ var onReady = function () {
602
+ clearTimeout(timeoutId);
603
+ document.removeEventListener(Events.ready, onReady);
604
+ resolve(true);
605
+ if (typeof callback === 'function') {
606
+ callback();
607
+ }
598
608
  };
599
- document.addEventListener(Events.ready, readyCallback_1);
600
- }
601
- channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
602
- return true;
609
+ var timeoutId = setTimeout(function () {
610
+ document.removeEventListener(Events.ready, onReady);
611
+ resolve('fail');
612
+ }, 2000);
613
+ // wait fo ready event..
614
+ document.addEventListener(Events.ready, onReady);
615
+ channel__default["default"].onCordovaReady.subscribe(cordovaEventListener);
616
+ });
603
617
  };
604
618
  AdMob.prototype.cleanup = function () {
605
619
  MobileAd.cleanup();