@oscilar/react-native-oscilar-module 3.2.0 → 3.4.0

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 (15) hide show
  1. package/OscilarModule.podspec +2 -2
  2. package/android/build.gradle +6 -6
  3. package/android/src/main/java/com/oscilarmodule/OscilarModuleModule.kt +50 -14
  4. package/ios/OscilarModule.mm +7 -6
  5. package/ios/OscilarModule.swift +30 -10
  6. package/lib/commonjs/index.js +31 -6
  7. package/lib/commonjs/index.js.map +1 -1
  8. package/lib/module/index.js +30 -5
  9. package/lib/module/index.js.map +1 -1
  10. package/lib/typescript/commonjs/src/index.d.ts +2 -2
  11. package/lib/typescript/commonjs/src/index.d.ts.map +1 -1
  12. package/lib/typescript/module/src/index.d.ts +2 -2
  13. package/lib/typescript/module/src/index.d.ts.map +1 -1
  14. package/package.json +15 -3
  15. package/src/index.tsx +49 -9
package/OscilarModule.podspec CHANGED
@@ -12,11 +12,11 @@ Pod::Spec.new do |s|
12
12
  s.authors = package["author"]
13
13
 
14
14
  s.platforms = { :ios => min_ios_version_supported }
15
- s.source = { :git => "https://github.com/Oscilar/react-native-oscilar-module.git", :tag => "#{s.version}" }
15
+ s.source = { :git => "https://github.com/Oscilar/react-native-oscilar-module.git", :tag => "v#{s.version}" }
16
16
 
17
17
  s.source_files = "ios/**/*.{h,m,mm,swift}"
18
18
 
19
- s.dependency "OscilarSDK", "3.2.0"
19
+ s.dependency "OscilarSDK", "3.3.0"
20
20
 
21
21
  s.ios.deployment_target = '15.0'
22
22
 
package/android/build.gradle CHANGED
@@ -95,11 +95,11 @@ def kotlin_version = getExtOrDefault("kotlinVersion")
95
95
  dependencies {
96
96
  implementation "com.facebook.react:react-android"
97
97
  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
98
- debugImplementation "com.oscilar:osclib:3.3.0"
99
- releaseImplementation "com.oscilar:osclib:3.3.0"
100
- implementation "com.google.code.gson:gson:2.10.1"
101
- implementation "com.squareup.retrofit2:retrofit:2.9.0"
102
- implementation "com.squareup.retrofit2:converter-gson:2.9.0"
103
- implementation "androidx.work:work-runtime:2.9.0"
98
+ implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
99
+ implementation "com.oscilar:osclib:3.5.0"
100
+ implementation "com.google.code.gson:gson:2.13.2"
101
+ implementation "com.squareup.retrofit2:retrofit:3.0.0"
102
+ implementation "com.squareup.retrofit2:converter-gson:3.0.0"
103
+ implementation "androidx.work:work-runtime-ktx:2.11.0"
104
104
  }
105
105
 
package/android/src/main/java/com/oscilarmodule/OscilarModuleModule.kt CHANGED
@@ -9,14 +9,27 @@ import android.util.Log
9
9
  import com.osc.and.OscApi
10
10
  import com.osc.and.OscApiInterface
11
11
  import com.osc.and.OscEnv
12
+ import kotlinx.coroutines.CancellationException
13
+ import kotlinx.coroutines.CoroutineScope
14
+ import kotlinx.coroutines.Dispatchers
15
+ import kotlinx.coroutines.SupervisorJob
16
+ import kotlinx.coroutines.launch
17
+ import kotlinx.coroutines.cancel
12
18
 
13
19
  class OscilarModuleModule(reactContext: ReactApplicationContext) :
14
20
  ReactContextBaseJavaModule(reactContext) {
15
21
 
22
+ private val moduleScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
23
+
16
24
  override fun getName(): String {
17
25
  return NAME
18
26
  }
19
27
 
28
+ override fun invalidate() {
29
+ moduleScope.cancel()
30
+ super.invalidate()
31
+ }
32
+
20
33
  private lateinit var oscApiInt: OscApiInterface
21
34
 
22
35
  @ReactMethod
@@ -41,17 +54,35 @@ class OscilarModuleModule(reactContext: ReactApplicationContext) :
41
54
  promise.reject("INIT_ERROR", e)
42
55
  }
43
56
  }
44
-
45
57
 
46
- // New method to get transaction ID
58
+ @ReactMethod
59
+ fun initOscilarWithServerURL(
60
+ clientKey: String,
61
+ serverUrl: String,
62
+ stage: String,
63
+ promise: Promise
64
+ ) {
65
+ try {
66
+ val app = reactApplicationContext.applicationContext as android.app.Application
67
+ oscApiInt = OscApi.getInstance(app, clientKey, serverUrl, stage)
68
+ promise.resolve(null)
69
+ } catch (e: Exception) {
70
+ promise.reject("INIT_ERROR", e)
71
+ }
72
+ }
73
+
47
74
  @ReactMethod
48
75
  fun generateTransactionID(promise: Promise) {
49
- try {
50
- val transactionId = oscApiInt.getTransactionId(reactApplicationContext)
51
- Log.d("OscilarModule", "Transaction ID: $transactionId")
52
- promise.resolve(transactionId)
53
- } catch (e: Exception) {
54
- promise.reject("ERROR_GETTING_TRANSACTION_ID", e)
76
+ moduleScope.launch {
77
+ try {
78
+ val transactionId = oscApiInt.getTransactionIdAsync(reactApplicationContext)
79
+ Log.d("OscilarModule", "Transaction ID: $transactionId")
80
+ promise.resolve(transactionId)
81
+ } catch (e: CancellationException) {
82
+ promise.reject("CANCELLED", "Operation was cancelled", e)
83
+ } catch (e: Exception) {
84
+ promise.reject("ERROR_GETTING_TRANSACTION_ID", e)
85
+ }
55
86
  }
56
87
  }
57
88
 
@@ -60,17 +91,22 @@ class OscilarModuleModule(reactContext: ReactApplicationContext) :
60
91
  }
61
92
 
62
93
  @ReactMethod
63
- fun getIntegrationHealthInfo(promise: Promise) {
64
- try {
65
- val healthInfo = oscApiInt.getIntegrationHealthInfo(reactApplicationContext)
94
+ fun getIntegrationHealthInfo(promise: Promise) {
95
+ moduleScope.launch {
96
+ try {
97
+ val healthInfo = oscApiInt.getIntegrationHealthInfoAsync(reactApplicationContext)
66
98
  val writableMap = Arguments.createMap()
67
99
  for ((key, value) in healthInfo) {
68
- writableMap.putString(key, value)
100
+ writableMap.putString(key, value)
69
101
  }
70
102
  Log.d("OscilarModule", "Integration Health Info: $healthInfo")
71
103
  promise.resolve(writableMap)
72
- } catch (e: Exception) {
104
+ } catch (e: CancellationException) {
105
+ promise.reject("CANCELLED", "Operation was cancelled", e)
106
+ } catch (e: Exception) {
73
107
  promise.reject("ERROR_GETTING_HEALTH_INFO", e)
108
+ }
74
109
  }
75
- }
110
+ }
111
+
76
112
  }
package/ios/OscilarModule.mm CHANGED
@@ -6,15 +6,16 @@ RCT_EXTERN_METHOD(startWithClientKey:(NSString*)clientKey
6
6
  withResolver:(RCTPromiseResolveBlock)resolve
7
7
  withRejecter:(RCTPromiseRejectBlock)reject)
8
8
 
9
- RCT_EXTERN_METHOD(startWithClientKeyAndServerURL:(NSString*)clientKey
10
- serverURL:(NSString*)serverURL
11
- withResolver:(RCTPromiseResolveBlock)resolve
12
- withRejecter:(RCTPromiseRejectBlock)reject)
13
-
14
9
  RCT_EXTERN_METHOD(startWithClientKeyAndEnvironment:(NSString*)clientKey
15
10
  environment:(int)environment
16
11
  withResolver:(RCTPromiseResolveBlock)resolve
17
- withRejecter:(RCTPromiseRejectBlock)reject)
12
+ withRejecter:(RCTPromiseRejectBlock)reject)
13
+
14
+ RCT_EXTERN_METHOD(startWithClientKeyServerURLAndEnvironment:(NSString*)clientKey
15
+ serverURL:(NSString*)serverURL
16
+ environment:(int)environment
17
+ withResolver:(RCTPromiseResolveBlock)resolve
18
+ withRejecter:(RCTPromiseRejectBlock)reject)
18
19
 
19
20
  RCT_EXTERN_METHOD(generateTransactionID:(RCTPromiseResolveBlock)resolve
20
21
  withRejecter:(RCTPromiseRejectBlock)reject)
package/ios/OscilarModule.swift CHANGED
@@ -27,35 +27,54 @@ class OscilarModule: NSObject {
27
27
  }
28
28
  }
29
29
 
30
- @objc(startWithClientKeyAndServerURL:serverURL:withResolver:withRejecter:)
30
+ @objc(startWithClientKeyAndEnvironment:environment:withResolver:withRejecter:)
31
31
  func start(
32
- clientKey: String,
33
- serverURL: String,
32
+ clientKey: String,
33
+ environment: Int,
34
34
  resolve: @escaping RCTPromiseResolveBlock,
35
35
  reject: @escaping RCTPromiseRejectBlock
36
36
  ) -> Void {
37
- Task {
37
+ Task {
38
38
  do {
39
+ let sdkEnv: Oscilar.Environment = switch OSCEnvironment(rawValue: environment) {
40
+ case .dev:
41
+ .dev
42
+ case .sandbox:
43
+ .sandbox
44
+ case .production:
45
+ .production
46
+ case .production2:
47
+ .production2
48
+ case .productionEU:
49
+ .productionEU
50
+ default:
51
+ .sandbox
52
+ }
39
53
  try await Oscilar.shared.start(
40
54
  clientKey: clientKey,
41
- serverURL: URL(string: serverURL)
55
+ environment: sdkEnv
42
56
  )
43
57
  resolve(nil)
44
58
  } catch {
45
- reject(nil, nil, error)
59
+ reject("ERR", error.localizedDescription, error)
46
60
  }
47
61
  }
48
62
  }
49
63
 
50
- @objc(startWithClientKeyAndEnvironment:environment:withResolver:withRejecter:)
64
+ @objc(startWithClientKeyServerURLAndEnvironment:serverURL:environment:withResolver:withRejecter:)
51
65
  func start(
52
- clientKey: String,
66
+ clientKey: String,
67
+ serverURL: String,
53
68
  environment: Int,
54
69
  resolve: @escaping RCTPromiseResolveBlock,
55
70
  reject: @escaping RCTPromiseRejectBlock
56
71
  ) -> Void {
57
- Task {
72
+ Task {
58
73
  do {
74
+ guard let url = URL(string: serverURL) else {
75
+ reject("ERR", "Invalid server URL", nil)
76
+ return
77
+ }
59
78
  let sdkEnv: Oscilar.Environment = switch OSCEnvironment(rawValue: environment) {
60
79
  case .dev:
61
80
  .dev
@@ -72,6 +91,7 @@ class OscilarModule: NSObject {
72
91
  }
73
92
  try await Oscilar.shared.start(
74
93
  clientKey: clientKey,
94
+ serverURL: url,
75
95
  environment: sdkEnv
76
96
  )
77
97
  resolve(nil)
@@ -80,7 +100,7 @@ class OscilarModule: NSObject {
80
100
  }
81
101
  }
82
102
  }
83
-
103
+
84
104
  @objc(generateTransactionID:withRejecter:)
85
105
  func generateTransactionID(
86
106
  resolve: @escaping RCTPromiseResolveBlock,
package/lib/commonjs/index.js CHANGED
@@ -12,7 +12,7 @@ exports.getIntegrationHealthInfo = getIntegrationHealthInfo;
12
12
  exports.initOscilar = initOscilar;
13
13
  exports.startWithClientKey = startWithClientKey;
14
14
  exports.startWithClientKeyAndEnvironment = startWithClientKeyAndEnvironment;
15
- exports.startWithClientKeyAndServerURL = startWithClientKeyAndServerURL;
15
+ exports.startWithClientKeyServerURLAndEnvironment = startWithClientKeyServerURLAndEnvironment;
16
16
  var _reactNative = require("react-native");
17
17
  const LINKING_ERROR = `The package '@oscilar/react-native-oscilar-module' doesn't seem to be linked. Make sure: \n\n` + _reactNative.Platform.select({
18
18
  ios: "- You have run 'pod install'\n",
@@ -31,18 +31,43 @@ let OSCEnvironment = exports.OSCEnvironment = /*#__PURE__*/function (OSCEnvironm
31
31
  OSCEnvironment[OSCEnvironment["PRODUCTION_EU"] = 4] = "PRODUCTION_EU";
32
32
  return OSCEnvironment;
33
33
  }({});
34
- function initOscilar(clientKey, environment = OSCEnvironment.SANDBOX) {
34
+ function getAndroidStage(environment) {
35
+ switch (environment) {
36
+ case OSCEnvironment.DEV:
37
+ return 'dev';
38
+ case OSCEnvironment.SANDBOX:
39
+ return 'sandbox';
40
+ case OSCEnvironment.PRODUCTION:
41
+ return 'prod';
42
+ case OSCEnvironment.PRODUCTION2:
43
+ return 'prod2';
44
+ case OSCEnvironment.PRODUCTION_EU:
45
+ return 'prod-eu';
46
+ default:
47
+ return 'sandbox';
48
+ }
49
+ }
50
+ function initOscilar(clientKey, environment = OSCEnvironment.SANDBOX, serverURL) {
35
51
  if (_reactNative.Platform.OS === 'android') {
36
- return OscilarModule.initOscilar(clientKey, environment);
52
+ if (serverURL) {
53
+ const stage = getAndroidStage(environment);
54
+ return OscilarModule.initOscilarWithServerURL(clientKey, serverURL, stage);
55
+ } else {
56
+ return OscilarModule.initOscilar(clientKey, environment);
57
+ }
37
58
  } else {
38
- return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
59
+ if (serverURL) {
60
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment);
61
+ } else {
62
+ return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
63
+ }
39
64
  }
40
65
  }
41
66
  function startWithClientKey(clientKey) {
42
67
  return OscilarModule.startWithClientKey(clientKey);
43
68
  }
44
- function startWithClientKeyAndServerURL(clientKey, serverURL) {
45
- return OscilarModule.startWithClientKeyAndServerURL(clientKey, serverURL);
69
+ function startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment) {
70
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment);
46
71
  }
47
72
  function startWithClientKeyAndEnvironment(clientKey, environment) {
48
73
  return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
package/lib/commonjs/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OscilarModule","NativeModules","Proxy","get","Error","OSCEnvironment","exports","initOscilar","clientKey","environment","SANDBOX","OS","startWithClientKeyAndEnvironment","startWithClientKey","startWithClientKeyAndServerURL","serverURL","generateTransactionID","generateTransactionIDWithFlowType","flowType","generateTransactionIDWithUserInfo","usernameHash","userEmailHash","custom","generateTransactionIDWithFlowTypeAndUserInfo","getIntegrationHealthInfo"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,aAAa,GACjB,+FAA+F,GAC/FC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,aAAa,GAAGC,0BAAa,CAACD,aAAa,GAC7CC,0BAAa,CAACD,aAAa,GAC3B,IAAIE,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACT,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAAC,IAEMU,cAAc,GAAAC,OAAA,CAAAD,cAAA,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAQnB,SAASE,WAAWA,CACzBC,SAAiB,EACjBC,WAA2B,GAAGJ,cAAc,CAACK,OAAO,EACrC;EACf,IAAId,qBAAQ,CAACe,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOX,aAAa,CAACO,WAAW,CAACC,SAAS,EAAEC,WAAW,CAAC;EAC1D,CAAC,MAAM;IACL,OAAOT,aAAa,CAACY,gCAAgC,CACnDJ,SAAS,EACTC,WACF,CAAC;EACH;AACF;AAEO,SAASI,kBAAkBA,CAACL,SAAiB,EAAiB;EACnE,OAAOR,aAAa,CAACa,kBAAkB,CAACL,SAAS,CAAC;AACpD;AAEO,SAASM,8BAA8BA,CAC5CN,SAAiB,EACjBO,SAAiB,EACF;EACf,OAAOf,aAAa,CAACc,8BAA8B,CAACN,SAAS,EAAEO,SAAS,CAAC;AAC3E;AAEO,SAASH,gCAAgCA,CAC9CJ,SAAiB,EACjBC,WAA2B,EACZ;EACf,OAAOT,aAAa,CAACY,gCAAgC,CAACJ,SAAS,EAAEC,WAAW,CAAC;AAC/E;AAEO,SAASO,qBAAqBA,CAAA,EAAoB;EACvD,OAAOhB,aAAa,CAACgB,qBAAqB,CAAC,CAAC;AAC9C;AAEO,SAASC,iCAAiCA,CAC/CC,QAAgB,EACC;EACjB,OAAOlB,aAAa,CAACiB,iCAAiC,CAACC,QAAQ,CAAC;AAClE;AAEO,SAASC,iCAAiCA,CAC/CC,YAAoB,EACpBC,aAAqB,EACrBC,MAAc,EACG;EACjB,OAAOtB,aAAa,CAACmB,iCAAiC,CACpDC,YAAY,EACZC,aAAa,EACbC,MACF,CAAC;AACH;AAEO,SAASC,4CAA4CA,CAC1DL,QAAgB,EAChBE,YAAoB,EACpBC,aAAqB,EACrBC,MAAc,EACG;EACjB,OAAOtB,aAAa,CAACuB,4CAA4C,CAC/DL,QAAQ,EACRE,YAAY,EACZC,aAAa,EACbC,MACF,CAAC;AACH;AAEO,SAASE,wBAAwBA,CAAA,EAAuC;EAC7E,OAAOxB,aAAa,CAACwB,wBAAwB,CAAC,CAAC;AACjD","ignoreList":[]}
1
+ {"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","OscilarModule","NativeModules","Proxy","get","Error","OSCEnvironment","exports","getAndroidStage","environment","DEV","SANDBOX","PRODUCTION","PRODUCTION2","PRODUCTION_EU","initOscilar","clientKey","serverURL","OS","stage","initOscilarWithServerURL","startWithClientKeyServerURLAndEnvironment","startWithClientKeyAndEnvironment","startWithClientKey","generateTransactionID","generateTransactionIDWithFlowType","flowType","generateTransactionIDWithUserInfo","usernameHash","userEmailHash","custom","generateTransactionIDWithFlowTypeAndUserInfo","getIntegrationHealthInfo"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
package/lib/module/index.js CHANGED
@@ -18,18 +18,43 @@ export let OSCEnvironment = /*#__PURE__*/function (OSCEnvironment) {
18
18
  OSCEnvironment[OSCEnvironment["PRODUCTION_EU"] = 4] = "PRODUCTION_EU";
19
19
  return OSCEnvironment;
20
20
  }({});
21
- export function initOscilar(clientKey, environment = OSCEnvironment.SANDBOX) {
21
+ function getAndroidStage(environment) {
22
+ switch (environment) {
23
+ case OSCEnvironment.DEV:
24
+ return 'dev';
25
+ case OSCEnvironment.SANDBOX:
26
+ return 'sandbox';
27
+ case OSCEnvironment.PRODUCTION:
28
+ return 'prod';
29
+ case OSCEnvironment.PRODUCTION2:
30
+ return 'prod2';
31
+ case OSCEnvironment.PRODUCTION_EU:
32
+ return 'prod-eu';
33
+ default:
34
+ return 'sandbox';
35
+ }
36
+ }
37
+ export function initOscilar(clientKey, environment = OSCEnvironment.SANDBOX, serverURL) {
22
38
  if (Platform.OS === 'android') {
23
- return OscilarModule.initOscilar(clientKey, environment);
39
+ if (serverURL) {
40
+ const stage = getAndroidStage(environment);
41
+ return OscilarModule.initOscilarWithServerURL(clientKey, serverURL, stage);
42
+ } else {
43
+ return OscilarModule.initOscilar(clientKey, environment);
44
+ }
24
45
  } else {
25
- return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
46
+ if (serverURL) {
47
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment);
48
+ } else {
49
+ return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
50
+ }
26
51
  }
27
52
  }
28
53
  export function startWithClientKey(clientKey) {
29
54
  return OscilarModule.startWithClientKey(clientKey);
30
55
  }
31
- export function startWithClientKeyAndServerURL(clientKey, serverURL) {
32
- return OscilarModule.startWithClientKeyAndServerURL(clientKey, serverURL);
56
+ export function startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment) {
57
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(clientKey, serverURL, environment);
33
58
  }
34
59
  export function startWithClientKeyAndEnvironment(clientKey, environment) {
35
60
  return OscilarModule.startWithClientKeyAndEnvironment(clientKey, environment);
package/lib/module/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","OscilarModule","Proxy","get","Error","OSCEnvironment","initOscilar","clientKey","environment","SANDBOX","OS","startWithClientKeyAndEnvironment","startWithClientKey","startWithClientKeyAndServerURL","serverURL","generateTransactionID","generateTransactionIDWithFlowType","flowType","generateTransactionIDWithUserInfo","usernameHash","userEmailHash","custom","generateTransactionIDWithFlowTypeAndUserInfo","getIntegrationHealthInfo"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":";;AAAA,SAASA,aAAa,EAAEC,QAAQ,QAAQ,cAAc;AAEtD,MAAMC,aAAa,GACjB,+FAA+F,GAC/FD,QAAQ,CAACE,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;AAEjC,MAAMC,aAAa,GAAGN,aAAa,CAACM,aAAa,GAC7CN,aAAa,CAACM,aAAa,GAC3B,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACP,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAEL,WAAYQ,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAQ1B,OAAO,SAASC,WAAWA,CACzBC,SAAiB,EACjBC,WAA2B,GAAGH,cAAc,CAACI,OAAO,EACrC;EACf,IAAIb,QAAQ,CAACc,EAAE,KAAK,SAAS,EAAE;IAC7B,OAAOT,aAAa,CAACK,WAAW,CAACC,SAAS,EAAEC,WAAW,CAAC;EAC1D,CAAC,MAAM;IACL,OAAOP,aAAa,CAACU,gCAAgC,CACnDJ,SAAS,EACTC,WACF,CAAC;EACH;AACF;AAEA,OAAO,SAASI,kBAAkBA,CAACL,SAAiB,EAAiB;EACnE,OAAON,aAAa,CAACW,kBAAkB,CAACL,SAAS,CAAC;AACpD;AAEA,OAAO,SAASM,8BAA8BA,CAC5CN,SAAiB,EACjBO,SAAiB,EACF;EACf,OAAOb,aAAa,CAACY,8BAA8B,CAACN,SAAS,EAAEO,SAAS,CAAC;AAC3E;AAEA,OAAO,SAASH,gCAAgCA,CAC9CJ,SAAiB,EACjBC,WAA2B,EACZ;EACf,OAAOP,aAAa,CAACU,gCAAgC,CAACJ,SAAS,EAAEC,WAAW,CAAC;AAC/E;AAEA,OAAO,SAASO,qBAAqBA,CAAA,EAAoB;EACvD,OAAOd,aAAa,CAACc,qBAAqB,CAAC,CAAC;AAC9C;AAEA,OAAO,SAASC,iCAAiCA,CAC/CC,QAAgB,EACC;EACjB,OAAOhB,aAAa,CAACe,iCAAiC,CAACC,QAAQ,CAAC;AAClE;AAEA,OAAO,SAASC,iCAAiCA,CAC/CC,YAAoB,EACpBC,aAAqB,EACrBC,MAAc,EACG;EACjB,OAAOpB,aAAa,CAACiB,iCAAiC,CACpDC,YAAY,EACZC,aAAa,EACbC,MACF,CAAC;AACH;AAEA,OAAO,SAASC,4CAA4CA,CAC1DL,QAAgB,EAChBE,YAAoB,EACpBC,aAAqB,EACrBC,MAAc,EACG;EACjB,OAAOpB,aAAa,CAACqB,4CAA4C,CAC/DL,QAAQ,EACRE,YAAY,EACZC,aAAa,EACbC,MACF,CAAC;AACH;AAEA,OAAO,SAASE,wBAAwBA,CAAA,EAAuC;EAC7E,OAAOtB,aAAa,CAACsB,wBAAwB,CAAC,CAAC;AACjD","ignoreList":[]}
1
+ {"version":3,"names":["NativeModules","Platform","LINKING_ERROR","select","ios","default","OscilarModule","Proxy","get","Error","OSCEnvironment","getAndroidStage","environment","DEV","SANDBOX","PRODUCTION","PRODUCTION2","PRODUCTION_EU","initOscilar","clientKey","serverURL","OS","stage","initOscilarWithServerURL","startWithClientKeyServerURLAndEnvironment","startWithClientKeyAndEnvironment","startWithClientKey","generateTransactionID","generateTransactionIDWithFlowType","flowType","generateTransactionIDWithUserInfo","usernameHash","userEmailHash","custom","generateTransactionIDWithFlowTypeAndUserInfo","getIntegrationHealthInfo"],"sourceRoot":"../../src","sources":["index.tsx"],"mappings":"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","ignoreList":[]}
package/lib/typescript/commonjs/src/index.d.ts CHANGED
@@ -5,9 +5,9 @@ export declare enum OSCEnvironment {
5
5
  PRODUCTION2 = 3,
6
6
  PRODUCTION_EU = 4
7
7
  }
8
- export declare function initOscilar(clientKey: string, environment?: OSCEnvironment): Promise<void>;
8
+ export declare function initOscilar(clientKey: string, environment?: OSCEnvironment, serverURL?: string): Promise<void>;
9
9
  export declare function startWithClientKey(clientKey: string): Promise<void>;
10
- export declare function startWithClientKeyAndServerURL(clientKey: string, serverURL: string): Promise<void>;
10
+ export declare function startWithClientKeyServerURLAndEnvironment(clientKey: string, serverURL: string, environment: OSCEnvironment): Promise<void>;
11
11
  export declare function startWithClientKeyAndEnvironment(clientKey: string, environment: OSCEnvironment): Promise<void>;
12
12
  export declare function generateTransactionID(): Promise<string>;
13
13
  export declare function generateTransactionIDWithFlowType(flowType: string): Promise<string>;
package/lib/typescript/commonjs/src/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAmBA,oBAAY,cAAc;IACxB,GAAG,IAAI;IACP,OAAO,IAAI;IACX,UAAU,IAAI;IACd,WAAW,IAAI;IACf,aAAa,IAAI;CAClB;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,cAAuC,GACnD,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED,wBAAgB,4CAA4C,CAC1D,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAE7E"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAmBA,oBAAY,cAAc;IACxB,GAAG,IAAI;IACP,OAAO,IAAI;IACX,UAAU,IAAI;IACd,WAAW,IAAI;IACf,aAAa,IAAI;CAClB;AAmBD,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,cAAuC,EACpD,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAgB,yCAAyC,CACvD,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED,wBAAgB,4CAA4C,CAC1D,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAE7E"}
package/lib/typescript/module/src/index.d.ts CHANGED
@@ -5,9 +5,9 @@ export declare enum OSCEnvironment {
5
5
  PRODUCTION2 = 3,
6
6
  PRODUCTION_EU = 4
7
7
  }
8
- export declare function initOscilar(clientKey: string, environment?: OSCEnvironment): Promise<void>;
8
+ export declare function initOscilar(clientKey: string, environment?: OSCEnvironment, serverURL?: string): Promise<void>;
9
9
  export declare function startWithClientKey(clientKey: string): Promise<void>;
10
- export declare function startWithClientKeyAndServerURL(clientKey: string, serverURL: string): Promise<void>;
10
+ export declare function startWithClientKeyServerURLAndEnvironment(clientKey: string, serverURL: string, environment: OSCEnvironment): Promise<void>;
11
11
  export declare function startWithClientKeyAndEnvironment(clientKey: string, environment: OSCEnvironment): Promise<void>;
12
12
  export declare function generateTransactionID(): Promise<string>;
13
13
  export declare function generateTransactionIDWithFlowType(flowType: string): Promise<string>;
package/lib/typescript/module/src/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAmBA,oBAAY,cAAc;IACxB,GAAG,IAAI;IACP,OAAO,IAAI;IACX,UAAU,IAAI;IACd,WAAW,IAAI;IACf,aAAa,IAAI;CAClB;AAED,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,cAAuC,GACnD,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAgB,8BAA8B,CAC5C,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED,wBAAgB,4CAA4C,CAC1D,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAE7E"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.tsx"],"names":[],"mappings":"AAmBA,oBAAY,cAAc;IACxB,GAAG,IAAI;IACP,OAAO,IAAI;IACX,UAAU,IAAI;IACd,WAAW,IAAI;IACf,aAAa,IAAI;CAClB;AAmBD,wBAAgB,WAAW,CACzB,SAAS,EAAE,MAAM,EACjB,WAAW,GAAE,cAAuC,EACpD,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEnE;AAED,wBAAgB,yCAAyC,CACvD,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAMf;AAED,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,cAAc,GAC1B,OAAO,CAAC,IAAI,CAAC,CAEf;AAED,wBAAgB,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC,CAEvD;AAED,wBAAgB,iCAAiC,CAC/C,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,wBAAgB,iCAAiC,CAC/C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAMjB;AAED,wBAAgB,4CAA4C,CAC1D,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAOjB;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,CAE7E"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@oscilar/react-native-oscilar-module",
3
- "version": "3.2.0",
3
+ "version": "3.4.0",
4
4
  "description": "Oscilar module for React Native",
5
5
  "source": "./src/index.tsx",
6
6
  "main": "./lib/commonjs/index.js",
@@ -89,14 +89,26 @@
89
89
  "react": "19.0.0",
90
90
  "react-native": "^0.79.1",
91
91
  "react-native-builder-bob": "^0.37.0",
92
- "release-it": "^19.0.1",
92
+ "release-it": "^19.2.4",
93
93
  "turbo": "^1.10.7",
94
94
  "typescript": "^5.2.2",
95
95
  "wait-on": "^8.0.4"
96
96
  },
97
97
  "resolutions": {
98
98
  "@types/react": "^18.2.44",
99
- "image-size": "1.2.1"
99
+ "image-size": "1.2.1",
100
+ "@react-native-community/cli": "^18.0.1",
101
+ "@react-native-community/cli-server-api": "^18.0.1",
102
+ "axios": "^1.12.0",
103
+ "@conventional-changelog/git-client": "^2.0.0",
104
+ "js-yaml": "^4.1.1",
105
+ "tmp": "^0.2.4",
106
+ "brace-expansion": "^2.0.2",
107
+ "on-headers": "^1.1.0",
108
+ "qs": "^6.14.1",
109
+ "tar": "^7.5.4",
110
+ "lodash": "^4.17.23",
111
+ "diff": "^4.0.4"
100
112
  },
101
113
  "peerDependencies": {
102
114
  "react": "*",
package/src/index.tsx CHANGED
@@ -25,17 +25,52 @@ export enum OSCEnvironment {
25
25
  PRODUCTION_EU = 4,
26
26
  }
27
27
 
28
+ function getAndroidStage(environment: OSCEnvironment): string {
29
+ switch (environment) {
30
+ case OSCEnvironment.DEV:
31
+ return 'dev';
32
+ case OSCEnvironment.SANDBOX:
33
+ return 'sandbox';
34
+ case OSCEnvironment.PRODUCTION:
35
+ return 'prod';
36
+ case OSCEnvironment.PRODUCTION2:
37
+ return 'prod2';
38
+ case OSCEnvironment.PRODUCTION_EU:
39
+ return 'prod-eu';
40
+ default:
41
+ return 'sandbox';
42
+ }
43
+ }
44
+
28
45
  export function initOscilar(
29
46
  clientKey: string,
30
- environment: OSCEnvironment = OSCEnvironment.SANDBOX
47
+ environment: OSCEnvironment = OSCEnvironment.SANDBOX,
48
+ serverURL?: string
31
49
  ): Promise<void> {
32
50
  if (Platform.OS === 'android') {
33
- return OscilarModule.initOscilar(clientKey, environment);
51
+ if (serverURL) {
52
+ const stage = getAndroidStage(environment);
53
+ return OscilarModule.initOscilarWithServerURL(
54
+ clientKey,
55
+ serverURL,
56
+ stage
57
+ );
58
+ } else {
59
+ return OscilarModule.initOscilar(clientKey, environment);
60
+ }
34
61
  } else {
35
- return OscilarModule.startWithClientKeyAndEnvironment(
36
- clientKey,
37
- environment
38
- );
62
+ if (serverURL) {
63
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(
64
+ clientKey,
65
+ serverURL,
66
+ environment
67
+ );
68
+ } else {
69
+ return OscilarModule.startWithClientKeyAndEnvironment(
70
+ clientKey,
71
+ environment
72
+ );
73
+ }
39
74
  }
40
75
  }
41
76
 
@@ -43,11 +78,16 @@ export function startWithClientKey(clientKey: string): Promise<void> {
43
78
  return OscilarModule.startWithClientKey(clientKey);
44
79
  }
45
80
 
46
- export function startWithClientKeyAndServerURL(
81
+ export function startWithClientKeyServerURLAndEnvironment(
47
82
  clientKey: string,
48
- serverURL: string
83
+ serverURL: string,
84
+ environment: OSCEnvironment
49
85
  ): Promise<void> {
50
- return OscilarModule.startWithClientKeyAndServerURL(clientKey, serverURL);
86
+ return OscilarModule.startWithClientKeyServerURLAndEnvironment(
87
+ clientKey,
88
+ serverURL,
89
+ environment
90
+ );
51
91
  }
52
92
 
53
93
  export function startWithClientKeyAndEnvironment(