@screeb/react-native 2.1.18 → 2.2.0

package/src/index.tsx

@@ -1,170 +1,277 @@
 import {
-  DeviceEventEmitter,
-  NativeEventEmitter,
-  NativeModules,
-  Platform,
+	DeviceEventEmitter,
+	NativeEventEmitter,
+	NativeModules,
+	Platform,
 } from "react-native";
+import ScreebReactNative from "./NativeScreebReactNative";
 
-const LINKING_ERROR =
-  `The package '@screeb/react-native' doesn't seem to be linked. Make sure: \n\n` +
-  Platform.select({ ios: "- You have run 'pod install'\n", default: "" }) +
-  "- You rebuilt the app after installing the package\n" +
-  "- You are not using Expo managed workflow\n";
-
-const ScreebModule = NativeModules.ScreebModule
-  ? NativeModules.ScreebModule
-  : new Proxy(
-      {},
-      {
-        get() {
-          throw new Error(LINKING_ERROR);
-        },
-      }
-    );
-
-let hooksRegistry = new Map<string, any>();
+// biome-ignore lint/suspicious/noExplicitAny: .
+let emitter: any;
 
+type HookFn = (payload: string) => unknown | Promise<unknown>;
+type HookMap = {
+	version?: string;
+	[key: string]: unknown;
+};
+
+type HookIdsMap = { [key: string]: string };
+type InitOptions = {
+	isDebugMode?: boolean;
+	disableMirror?: boolean;
+};
+
+// initSdk
 export function initSdk(
-  androidChannelId: string,
-  iosChannelId: string,
-  userId?: string,
-  properties?: Map<string, any>,
-  hooks?: any,
-  isDebugMode?: boolean,
-  language?: string
+	channelId: string,
+	userId?: string,
+	properties?: Record<string, unknown> | Map<string, unknown>,
+	hooks?: HookMap,
+	initOptions?: InitOptions,
+	language?: string,
 ) {
-  const emitter =
-    Platform.OS === "ios"
-      ? new NativeEventEmitter(NativeModules.ScreebModule)
-      : DeviceEventEmitter;
-  emitter.addListener("ScreebEvent", handleEvent);
-  let mapHooksId: any = undefined;
-  if (hooks != null) {
-    mapHooksId = new Object();
-    Object.keys(hooks).map((key) => {
-      if (key == "version") {
-        mapHooksId = { ...mapHooksId, version: hooks[key] };
-      } else {
-        let uuid = Date.now().toString() + Math.random().toString() + key;
-        hooksRegistry.set(uuid, hooks[key]);
-        mapHooksId = { ...mapHooksId, [key]: uuid };
-      }
-    });
-  }
-  if (Platform.OS === "ios") {
-    return ScreebModule.initSdk(
-      iosChannelId,
-      userId,
-      properties,
-      mapHooksId,
-      isDebugMode,
-      language
-    );
-  } else {
-    return ScreebModule.initSdk(
-      androidChannelId,
-      userId,
-      properties,
-      mapHooksId,
-      isDebugMode,
-      language
-    );
-  }
-}
-export function setIdentity(userId: string, properties?: Map<string, any>) {
-  return ScreebModule.setIdentity(userId, properties);
-}
-export function setProperties(properties?: Map<string, any>) {
-  return ScreebModule.setProperties(properties);
+	// Use NativeEventEmitter on both platforms; pass the native module on iOS
+	// and rely on the default emitter on Android.
+	if (Platform.OS === "ios") {
+		emitter = new NativeEventEmitter(NativeModules.ScreebReactNative);
+	} else {
+		emitter = DeviceEventEmitter;
+	}
+
+	emitter.addListener("ScreebEvent", handleEvent);
+
+	let mapHooksId: HookIdsMap | undefined;
+	if (hooks != null) {
+		mapHooksId = {};
+		Object.keys(hooks).map((key) => {
+			if (key === "version") {
+				const v = hooks.version ?? undefined;
+				if (v)
+					mapHooksId = { ...mapHooksId, version: v } as {
+						[key: string]: string;
+					};
+			} else {
+				const uuid = Date.now().toString() + Math.random().toString() + key;
+				const fn = (hooks as Record<string, unknown>)[key];
+				if (typeof fn === "function") {
+					hooksRegistry.set(uuid, fn as HookFn);
+				}
+				mapHooksId = { ...mapHooksId, [key]: uuid };
+			}
+		});
+	}
+
+	return ScreebReactNative.initSdk(
+		channelId,
+		userId,
+		toObject(properties),
+		mapHooksId,
+		initOptions,
+		language,
+	);
 }
+
+// setIdentity
+export function setIdentity(
+	userId: string,
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
+) {
+	return ScreebReactNative.setIdentity(userId, toObject(properties));
+}
+
+// setProperties
+export function setProperties(
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
+) {
+	return ScreebReactNative.setProperties(toObject(properties));
+}
+
+// assignGroup
 export function assignGroup(
-  type: string | null,
-  name: string,
-  properties?: Map<string, any>
+	type: string | null,
+	name: string,
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
 ) {
-  return ScreebModule.assignGroup(type, name, properties);
+	return ScreebReactNative.assignGroup(type, name, toObject(properties));
 }
+
+// unassignGroup
 export function unassignGroup(
-  type: string | null,
-  name: string,
-  properties?: Map<string, any>
+	type: string | null,
+	name: string,
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
 ) {
-  return ScreebModule.unassignGroup(type, name, properties);
+	return ScreebReactNative.unassignGroup(type, name, toObject(properties));
 }
-export function trackEvent(name: string, properties?: Map<string, any>) {
-  return ScreebModule.trackEvent(name, properties);
+
+// trackEvent
+export function trackEvent(
+	name: string,
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
+) {
+	return ScreebReactNative.trackEvent(name, toObject(properties));
 }
-export function trackScreen(name: string, properties?: Map<string, any>) {
-  return ScreebModule.trackScreen(name, properties);
+
+// trackScreen
+export function trackScreen(
+	name: string,
+	properties?: Record<string, unknown> | Map<string, unknown> | null,
+) {
+	return ScreebReactNative.trackScreen(name, toObject(properties));
 }
+
+// startSurvey
 export function startSurvey(
-  surveyId: string,
-  allowMultipleResponses?: boolean,
-  hiddenFields?: Map<string, any>,
-  ignoreSurveyStatus?: boolean,
-  hooks?: any,
-  language?: string
+	surveyId: string,
+	allowMultipleResponses?: boolean,
+	hiddenFields?: Record<string, unknown> | Map<string, unknown> | null,
+	ignoreSurveyStatus?: boolean,
+	hooks?: HookMap,
+	language?: string,
+	distributionId?: string,
 ) {
-  let mapHooksId: any = undefined;
-  if (hooks != undefined) {
-    mapHooksId = new Object();
-    Object.keys(hooks).map((key) => {
-      if (key == "version") {
-        mapHooksId = { ...mapHooksId, version: hooks[key] };
-      } else {
-        let uuid = Date.now().toString() + Math.random().toString() + key;
-        hooksRegistry.set(uuid, hooks[key]);
-        mapHooksId = { ...mapHooksId, [key]: uuid };
-      }
-    });
-  }
-  return ScreebModule.startSurvey(
-    surveyId,
-    allowMultipleResponses ?? true,
-    hiddenFields,
-    ignoreSurveyStatus ?? true,
-    mapHooksId,
-    language
-  );
+	let mapHooksId: HookIdsMap | undefined;
+	if (hooks !== undefined) {
+		mapHooksId = {};
+		Object.keys(hooks).map((key) => {
+			if (key === "version") {
+				const v = hooks.version ?? undefined;
+				if (v)
+					mapHooksId = { ...mapHooksId, version: v } as {
+						[key: string]: string;
+					};
+			} else {
+				const uuid = Date.now().toString() + Math.random().toString() + key;
+				const fn = (hooks as Record<string, unknown>)[key];
+				if (typeof fn === "function") {
+					hooksRegistry.set(uuid, fn as HookFn);
+				}
+				mapHooksId = { ...mapHooksId, [key]: uuid };
+			}
+		});
+	}
+	return ScreebReactNative.startSurvey(
+		surveyId,
+		allowMultipleResponses ?? true,
+		toObject(hiddenFields),
+		ignoreSurveyStatus ?? true,
+		mapHooksId,
+		language,
+		distributionId,
+	);
 }
+
+// startMessage
+export function startMessage(
+	messageId: string,
+	allowMultipleResponses?: boolean,
+	hiddenFields?: Record<string, unknown> | Map<string, unknown> | null,
+	ignoreMessageStatus?: boolean,
+	hooks?: HookMap,
+	language?: string,
+	distributionId?: string,
+) {
+	let mapHooksId: HookIdsMap | undefined;
+	if (hooks !== undefined) {
+		mapHooksId = {};
+		Object.keys(hooks).map((key) => {
+			if (key === "version") {
+				const v = hooks.version ?? undefined;
+				if (v)
+					mapHooksId = { ...mapHooksId, version: v } as {
+						[key: string]: string;
+					};
+			} else {
+				const uuid = Date.now().toString() + Math.random().toString() + key;
+				const fn = (hooks as Record<string, unknown>)[key];
+				if (typeof fn === "function") {
+					hooksRegistry.set(uuid, fn as HookFn);
+				}
+				mapHooksId = { ...mapHooksId, [key]: uuid };
+			}
+		});
+	}
+	return ScreebReactNative.startMessage(
+		messageId,
+		allowMultipleResponses ?? true,
+		toObject(hiddenFields),
+		ignoreMessageStatus ?? true,
+		mapHooksId,
+		language,
+		distributionId,
+	);
+}
+
+// debug
 export function debug() {
-  return ScreebModule.debug();
+	return ScreebReactNative.debug();
 }
+
+// debugTargeting
 export function debugTargeting() {
-  return ScreebModule.debugTargeting();
+	return ScreebReactNative.debugTargeting();
 }
+
+// resetIdentity
 export function resetIdentity() {
-  return ScreebModule.resetIdentity();
+	return ScreebReactNative.resetIdentity();
 }
+
+// closeSdk
 export function closeSdk() {
-  return ScreebModule.closeSdk();
-}
-export function closeSurvey() {
-  return ScreebModule.closeSurvey();
-}
-
-function handleEvent(event: any) {
-  if (event?.hookId != null) {
-    let hook = hooksRegistry.get(event.hookId);
-    if (hook != null) {
-      const result = hook(event.payload);
-      const parsedPayload = JSON.parse(event.payload);
-      const originalHookId = parsedPayload?.hook_id;
-      if (originalHookId) {
-        // result must be a map to fit with react native allowed types
-        // Check if hook is a promise/async function
-        if (result instanceof Promise) {
-          result
-            .then((result) => {
-              ScreebModule.onHookResult(originalHookId, { result });
-            })
-            .catch((error) => {
-              console.error(error);
-            });
-        } else {
-          ScreebModule.onHookResult(originalHookId, { result });
-        }
-      }
-    }
-  }
+	if (emitter) {
+		emitter.removeAllListeners("ScreebEvent");
+		emitter = undefined;
+	}
+	return ScreebReactNative.closeSdk();
+}
+
+// closeSurvey
+export function closeSurvey(surveyId?: string) {
+	return ScreebReactNative.closeSurvey(surveyId);
+}
+
+// closeMessage
+export function closeMessage(messageId?: string) {
+	return ScreebReactNative.closeMessage(messageId);
+}
+
+const hooksRegistry = new Map<
+	string,
+	(payload: string) => unknown | Promise<unknown>
+>();
+
+function handleEvent(event: { hookId?: string; payload?: string }) {
+	if (event?.hookId != null) {
+		const hook = hooksRegistry.get(event.hookId);
+		if (hook != null) {
+			const payload = event.payload ?? "{}";
+			const result = hook(payload);
+			const parsedPayload = JSON.parse(payload);
+			const originalHookId = parsedPayload?.hook_id;
+			if (originalHookId) {
+				if (result instanceof Promise) {
+					result
+						.then((result) => {
+							ScreebReactNative.onHookResult(originalHookId, { result });
+						})
+						.catch((error) => {
+							console.error(error);
+						});
+				} else {
+					ScreebReactNative.onHookResult(originalHookId, { result });
+				}
+			}
+		}
+	}
+}
+
+function toObject(
+	value?: Record<string, unknown> | Map<string, unknown> | null,
+): { [key: string]: unknown } | undefined {
+	if (value == null) return undefined;
+	if (value instanceof Map) {
+		return Object.fromEntries(value as Map<string, unknown>);
+	}
+	return value as { [key: string]: unknown };
 }

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip

package/android/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"