@truewatchtech/cocos-sdk 0.1.0-alpha.6 → 0.1.0

package/extensions/creator3/install-native.cjs

@@ -34,7 +34,7 @@ function installNative(buildRoot, extensionRoot, logger = console) {
   const installedFile = path.join(extensionRoot, 'sdk-integration.json');
   const installed = fs.existsSync(installedFile) ? JSON.parse(fs.readFileSync(installedFile, 'utf8')) : null;
   if (installed?.replay && !replay) throw new Error('[cocos-sdk] Replay assets are missing. Run truewatch-cocos install --replay.');
-  if (replay && (replay.schemaVersion !== 1 || !installed || replay.baseVersion !== installed.version || replay.version !== installed.version || replay.iosSdkVersion !== '1.6.8-alpha.5')) {
+  if (replay && (replay.schemaVersion !== 1 || !installed || replay.baseVersion !== installed.version || replay.version !== installed.version || replay.iosSdkVersion !== '1.6.8')) {
     throw new Error('[cocos-sdk] Replay native integration version does not match the base SDK. Reinstall matching packages.');
   }
   const replaySource = path.join(extensionRoot, 'replay-native');
@@ -79,6 +79,7 @@ function installNative(buildRoot, extensionRoot, logger = console) {
     });
   }
   iosApplicationProjects.forEach(({ projectFile, target }) => {
+    patchIosDeploymentTarget(projectFile);
     patchCocos2IosConfiguration(projectFile, target);
     if (dependencyManager === 'spm') {
       const spm = require('./install-spm.cjs');
@@ -151,6 +152,17 @@ function findReplayEntryFiles(files) {
   return uniqueFiles(entries);
 }
 
+function patchIosDeploymentTarget(projectFile) {
+  const original = fs.readFileSync(projectFile, 'utf8');
+  const next = original.replace(
+    /(\bIPHONEOS_DEPLOYMENT_TARGET\s*=\s*"?)(\d+(?:\.\d+)*)("?\s*;)/g,
+    (line, prefix, version, suffix) => compareVersions(version, '15.0') < 0
+      ? `${prefix}15.0${suffix}`
+      : line,
+  );
+  if (next !== original) fs.writeFileSync(projectFile, next);
+}
+
 function patchCocos2IosConfiguration(projectFile, target) {
   const projectDirectory = path.dirname(path.dirname(projectFile));
   const iosDirectory = path.join(projectDirectory, 'ios');
@@ -174,18 +186,12 @@ function patchCocos2IosConfiguration(projectFile, target) {
   });
 
   const original = fs.readFileSync(projectFile, 'utf8');
-  let next = quoteWhitespaceProductNames(original).replace(
+  const next = quoteWhitespaceProductNames(original).replace(
     /(\b(?:HEADER|LIBRARY)_SEARCH_PATHS\s*=\s*)"([^"]*)";/g,
     (line, prefix, value) => value.includes('$(inherited)')
       ? line
       : `${prefix}"${`$(inherited) ${value}`.trim()}";`,
   );
-  next = next.replace(
-    /(\bIPHONEOS_DEPLOYMENT_TARGET\s*=\s*)(\d+(?:\.\d+)*)(\s*;)/g,
-    (line, prefix, version, suffix) => compareVersions(version, '12.0') < 0
-      ? `${prefix}12.0${suffix}`
-      : line,
-  );
   if (next !== original) fs.writeFileSync(projectFile, next);
 }
 
@@ -292,8 +298,8 @@ function patchGradle(file, nativeRoot, replay) {
     "    maven { url 'https://mvnrepo.truewatch.com/repository/maven-releases' }",
     '}',
     'dependencies {',
-    "    implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.6-alpha03'",
-    "    implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-native:1.1.3'",
+    "    implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-sdk:1.7.6'",
+    "    implementation 'com.truewatch.ft.mobile.sdk.tracker.agent:ft-native:1.1.4'",
     ...(replay ? [`    implementation '${escapeGroovy(replay.androidReplay)}'`] : []),
     "    implementation 'com.google.code.gson:gson:2.10.1'",
     "    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.22')",
@@ -329,6 +335,14 @@ function patchPodfile(file, nativeRoot, replay) {
       ? original.replace(targetPattern, `$1\n  ${block.replace(/\n/g, '\n  ')}`)
       : `${original.replace(/\s*$/, '')}\n\n${block}\n`;
   }
+  const platformPattern = /(^[ \t]*platform\s+:ios\s*,\s*['"])(\d+(?:\.\d+)*)(['"])/gm;
+  if (platformPattern.test(next)) {
+    next = next.replace(platformPattern, (line, prefix, version, suffix) => (
+      compareVersions(version, '15.0') < 0 ? `${prefix}15.0${suffix}` : line
+    ));
+  } else {
+    next = `platform :ios, '15.0'\n${next}`;
+  }
   if (next !== original) fs.writeFileSync(file, next);
 }
 
@@ -368,7 +382,7 @@ function unquotePbxValue(value) {
 function createPodfile(file, projectFile, target) {
   const projectName = path.basename(path.dirname(projectFile));
   fs.writeFileSync(file, [
-    "platform :ios, '12.0'",
+    "platform :ios, '15.0'",
     `project '${escapeRuby(projectName)}'`,
     '',
     `target '${escapeRuby(target)}' do`,

package/extensions/creator3/install-spm.cjs

@@ -93,7 +93,7 @@ function installSwiftPackage(projectFile, packageDirectory, productName, targetN
       if (!/(?:^|\s)-ObjC(?:\s|$)/.test(flags || '')) add(parts, '-ObjC');
       settings.OTHER_LDFLAGS = parts.join(' ');
     }
-    if (Number(settings.IPHONEOS_DEPLOYMENT_TARGET || 0) < 12) settings.IPHONEOS_DEPLOYMENT_TARGET = '12.0';
+    if (Number(settings.IPHONEOS_DEPLOYMENT_TARGET || 0) < 15) settings.IPHONEOS_DEPLOYMENT_TARGET = '15.0';
     settings.CLANG_ENABLE_MODULES = 'YES';
   }
   preserveCmakeIntegration(projectFile, project, { packageDirectory, productName, targetName: target.name });

package/native/android/src/main/java/com/ft/sdk/cocos/FTCocosBridge.java

@@ -180,8 +180,10 @@ public final class FTCocosBridge {
         String appId = json.optString("androidAppId", "");
         if (appId.isEmpty()) throw new IllegalArgumentException("rum.androidAppId is required on Android");
         final FTRUMConfig config = new FTRUMConfig().setRumAppId(appId);
-        if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
-        if (json.has("sessionOnErrorSampleRate")) config.setSessionErrorSampleRate((float) json.getDouble("sessionOnErrorSampleRate"));
+        if (json.has("sessionSamplingRate")) config.setSessionSamplingRate(samplingPercentage(json, "sessionSamplingRate"));
+        else if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
+        if (json.has("sessionOnErrorSamplingRate")) config.setSessionOnErrorSamplingRate(samplingPercentage(json, "sessionOnErrorSamplingRate"));
+        else if (json.has("sessionOnErrorSampleRate")) config.setSessionErrorSampleRate((float) json.getDouble("sessionOnErrorSampleRate"));
         if (json.has("enableNativeUserAction")) config.setEnableTraceUserAction(json.getBoolean("enableNativeUserAction"));
         if (json.has("enableNativeUserView")) config.setEnableTraceUserView(json.getBoolean("enableNativeUserView"));
         if (json.has("enableNativeUserResource")) config.setEnableTraceUserResource(json.getBoolean("enableNativeUserResource"));
@@ -204,7 +206,8 @@ public final class FTCocosBridge {
 
     private static void configureLogger(JSONObject json) throws Exception {
         final FTLoggerConfig config = new FTLoggerConfig();
-        if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
+        if (json.has("logSamplingRate")) config.setLogSamplingRate(samplingPercentage(json, "logSamplingRate"));
+        else if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
         if (json.has("enableLinkRumData")) config.setEnableLinkRumData(json.getBoolean("enableLinkRumData"));
         if (json.has("enableCustomLog")) config.setEnableCustomLog(json.getBoolean("enableCustomLog"));
         if (json.has("printCustomLogToConsole")) config.setPrintCustomLogToConsole(json.getBoolean("printCustomLogToConsole"));
@@ -220,13 +223,23 @@ public final class FTCocosBridge {
 
     private static void configureTrace(JSONObject json) throws Exception {
         FTTraceConfig config = new FTTraceConfig();
-        if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
+        if (json.has("traceSamplingRate")) config.setTraceSamplingRate(samplingPercentage(json, "traceSamplingRate"));
+        else if (json.has("sampleRate")) config.setSamplingRate((float) json.getDouble("sampleRate"));
         if (json.has("enableLinkRumData")) config.setEnableLinkRUMData(json.getBoolean("enableLinkRumData"));
         if (json.has("enableNativeAutoTrace")) config.setEnableAutoTrace(json.getBoolean("enableNativeAutoTrace"));
         if (hasText(json, "traceType")) config.setTraceType(traceType(json.getString("traceType")));
         FTSdk.initTraceWithConfig(config);
     }
 
+    private static float samplingPercentage(JSONObject json, String key) throws Exception {
+        double percentage = json.getDouble(key);
+        if (Double.isNaN(percentage) || Double.isInfinite(percentage)
+                || percentage < 0d || percentage > 100d) {
+            throw new IllegalArgumentException(key + " must be between 0 and 100");
+        }
+        return (float) percentage;
+    }
+
     private static void addResource(JSONObject payload) throws Exception {
         JSONObject content = payload.getJSONObject("content");
         ResourceParams params = new ResourceParams();

package/native/ios/FTCocosBridge.m

@@ -9,7 +9,6 @@
 #import "FTResourceMetricsModel.h"
 #import "FTResourceContentModel.h"
 #import <UIKit/UIKit.h>
-#import <objc/message.h>
 
 @implementation FTCocosBridge
 
@@ -78,8 +77,16 @@
         NSString *appID = [self text:arguments[@"iosAppId"]];
         if (appID.length == 0) [self fail:@"rum.iosAppId is required on iOS"];
         FTRumConfig *config = [[FTRumConfig alloc] initWithAppid:appID];
-        if (arguments[@"sampleRate"]) config.sampleRate = [self percent:arguments[@"sampleRate"]];
-        if (arguments[@"sessionOnErrorSampleRate"]) config.sessionOnErrorSampleRate = [self percent:arguments[@"sessionOnErrorSampleRate"]];
+        if (arguments[@"sessionSamplingRate"]) {
+            config.sessionSamplingRate = [self samplingPercentage:arguments[@"sessionSamplingRate"] field:@"sessionSamplingRate"];
+        } else if (arguments[@"sampleRate"]) {
+            config.sampleRate = [self percent:arguments[@"sampleRate"]];
+        }
+        if (arguments[@"sessionOnErrorSamplingRate"]) {
+            config.sessionOnErrorSamplingRate = [self samplingPercentage:arguments[@"sessionOnErrorSamplingRate"] field:@"sessionOnErrorSamplingRate"];
+        } else if (arguments[@"sessionOnErrorSampleRate"]) {
+            config.sessionOnErrorSampleRate = [self percent:arguments[@"sessionOnErrorSampleRate"]];
+        }
         if (arguments[@"enableNativeUserAction"]) config.enableTraceUserAction = [arguments[@"enableNativeUserAction"] boolValue];
         if (arguments[@"enableNativeUserView"]) config.enableTraceUserView = [arguments[@"enableNativeUserView"] boolValue];
         if (arguments[@"enableNativeUserResource"]) config.enableTraceUserResource = [arguments[@"enableNativeUserResource"] boolValue];
@@ -143,7 +150,11 @@
     }
     if ([method isEqualToString:@"logger.configure"]) {
         FTLoggerConfig *config = [[FTLoggerConfig alloc] init];
-        if (arguments[@"sampleRate"]) config.sampleRate = [self percent:arguments[@"sampleRate"]];
+        if (arguments[@"logSamplingRate"]) {
+            config.logSamplingRate = [self samplingPercentage:arguments[@"logSamplingRate"] field:@"logSamplingRate"];
+        } else if (arguments[@"sampleRate"]) {
+            config.sampleRate = [self percent:arguments[@"sampleRate"]];
+        }
         if (arguments[@"enableLinkRumData"]) config.enableLinkRumData = [arguments[@"enableLinkRumData"] boolValue];
         if (arguments[@"enableCustomLog"]) config.enableCustomLog = [arguments[@"enableCustomLog"] boolValue];
         if (arguments[@"printCustomLogToConsole"]) config.printCustomLogToConsole = [arguments[@"printCustomLogToConsole"] boolValue];
@@ -162,7 +173,11 @@
     }
     if ([method isEqualToString:@"trace.configure"]) {
         FTTraceConfig *config = [[FTTraceConfig alloc] init];
-        if (arguments[@"sampleRate"]) config.sampleRate = [self percent:arguments[@"sampleRate"]];
+        if (arguments[@"traceSamplingRate"]) {
+            config.traceSamplingRate = [self samplingPercentage:arguments[@"traceSamplingRate"] field:@"traceSamplingRate"];
+        } else if (arguments[@"sampleRate"]) {
+            config.sampleRate = [self percent:arguments[@"sampleRate"]];
+        }
         if (arguments[@"enableLinkRumData"]) config.enableLinkRumData = [arguments[@"enableLinkRumData"] boolValue];
         if (arguments[@"enableNativeAutoTrace"]) config.enableAutoTrace = [arguments[@"enableNativeAutoTrace"] boolValue];
         config.networkTraceType = [self traceType:[self text:arguments[@"traceType"]]];
@@ -244,6 +259,14 @@
     return (int)lround(MIN(1.0, MAX(0.0, number.doubleValue)) * 100.0);
 }
 
++ (float)samplingPercentage:(NSNumber *)number field:(NSString *)fieldName {
+    double percentage = number.doubleValue;
+    if (!isfinite(percentage) || percentage < 0.0 || percentage > 100.0) {
+        [self fail:[NSString stringWithFormat:@"%@ must be between 0 and 100", fieldName]];
+    }
+    return (float)percentage;
+}
+
 + (FTLogStatus)logStatus:(NSString *)value {
     if ([value isEqualToString:@"warning"]) return FTStatusWarning;
     if ([value isEqualToString:@"error"]) return FTStatusError;

package/native/ios/FTCocosBridge.podspec

@@ -1,17 +1,17 @@
 Pod::Spec.new do |s|
   s.name             = 'FTCocosBridge'
-  s.version          = '0.1.0-alpha.6'
+  s.version          = '0.1.0'
   s.summary          = 'TrueWatch Mobile SDK native bridge for Cocos Creator.'
   s.homepage         = 'https://github.com/TrueWatchTech/datakit-cocos'
   s.license          = { :type => 'Apache-2.0' }
   s.author           = { 'TrueWatch' => 'support@truewatch.com' }
   s.source           = { :path => '.' }
-  s.platform         = :ios, '12.0'
+  s.platform         = :ios, '15.0'
   s.source_files     = 'FTCocosBridge.{h,m}'
   s.public_header_files = 'FTCocosBridge.h'
   s.requires_arc     = true
   # Cocos resolves FTCocosBridge by class name at runtime, so no direct symbol
   # reference would otherwise keep the Objective-C category/class in the app.
   s.user_target_xcconfig = { 'OTHER_LDFLAGS' => '$(inherited) -ObjC' }
-  s.dependency 'TrueWatchSDK/Agent', '1.6.8-alpha.5'
+  s.dependency 'TrueWatchSDK/Agent', '1.6.8'
 end

package/native/ios/Package.swift

@@ -1,12 +1,12 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 import PackageDescription
 
 let package = Package(
     name: "FTCocosBridge",
-    platforms: [.iOS(.v12)],
+    platforms: [.iOS(.v15)],
     products: [.library(name: "FTCocosBridge", targets: ["FTCocosBridge"])],
     dependencies: [
-        .package(url: "https://github.com/TrueWatchTech/datakit-ios.git", .exact("1.6.8-alpha.5")),
+        .package(url: "https://github.com/TrueWatchTech/datakit-ios.git", .exact("1.6.8")),
     ],
     targets: [
         .target(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@truewatchtech/cocos-sdk",
-  "version": "0.1.0-alpha.6",
+  "version": "0.1.0",
   "description": "Observability SDK integration for Cocos Creator 2.4 and 3.x",
   "license": "Apache-2.0",
   "author": "TrueWatch",