expo-live-activity 0.2.1-alpha1 → 0.3.0-alpha1

package/plugin/src/xcode/addBuildPhases.ts

@@ -1,7 +1,7 @@
-import { XcodeProject } from "@expo/config-plugins";
-import * as util from "util";
+import { XcodeProject } from '@expo/config-plugins'
+import * as util from 'util'
 
-import { WidgetFiles } from "../lib/getWidgetFiles";
+import { WidgetFiles } from '../lib/getWidgetFiles'
 
 export function addBuildPhases(
   xcodeProject: XcodeProject,
@@ -11,73 +11,58 @@ export function addBuildPhases(
     productFile,
     widgetFiles,
   }: {
-    targetUuid: string;
-    groupName: string;
+    targetUuid: string
+    groupName: string
     productFile: {
-      uuid: string;
-      target: string;
-      basename: string;
-      group: string;
-    };
-    widgetFiles: WidgetFiles;
+      uuid: string
+      target: string
+      basename: string
+      group: string
+    }
+    widgetFiles: WidgetFiles
   }
 ) {
-  const buildPath = `""`;
-  const folderType = "app_extension";
+  const buildPath = `""`
+  const folderType = 'app_extension'
 
-  const {
-    swiftFiles,
-    intentFiles,
-    assetDirectories,
-    entitlementFiles,
-    plistFiles,
-  } = widgetFiles;
+  const { swiftFiles, intentFiles, assetDirectories } = widgetFiles
 
   // Sources build phase
   xcodeProject.addBuildPhase(
     [...swiftFiles, ...intentFiles],
-    "PBXSourcesBuildPhase",
+    'PBXSourcesBuildPhase',
     groupName,
     targetUuid,
     folderType,
     buildPath
-  );
+  )
 
   // Copy files build phase
   xcodeProject.addBuildPhase(
     [],
-    "PBXCopyFilesBuildPhase",
+    'PBXCopyFilesBuildPhase',
     groupName,
     xcodeProject.getFirstTarget().uuid,
     folderType,
     buildPath
-  );
+  )
 
-  xcodeProject
-    .buildPhaseObject("PBXCopyFilesBuildPhase", groupName, productFile.target)
-    .files.push({
-      value: productFile.uuid,
-      comment: util.format("%s in %s", productFile.basename, productFile.group), // longComment(file);
-    });
-  xcodeProject.addToPbxBuildFileSection(productFile);
+  xcodeProject.buildPhaseObject('PBXCopyFilesBuildPhase', groupName, productFile.target).files.push({
+    value: productFile.uuid,
+    comment: util.format('%s in %s', productFile.basename, productFile.group), // longComment(file);
+  })
+  xcodeProject.addToPbxBuildFileSection(productFile)
 
   // Frameworks build phase
-  xcodeProject.addBuildPhase(
-    [],
-    "PBXFrameworksBuildPhase",
-    groupName,
-    targetUuid,
-    folderType,
-    buildPath
-  );
+  xcodeProject.addBuildPhase([], 'PBXFrameworksBuildPhase', groupName, targetUuid, folderType, buildPath)
 
   // Resources build phase
   xcodeProject.addBuildPhase(
     [...assetDirectories],
-    "PBXResourcesBuildPhase",
+    'PBXResourcesBuildPhase',
     groupName,
     targetUuid,
     folderType,
     buildPath
-  );
+  )
 }

package/plugin/src/xcode/addPbxGroup.ts

@@ -1,6 +1,6 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
-import { WidgetFiles } from "../lib/getWidgetFiles";
+import { WidgetFiles } from '../lib/getWidgetFiles'
 
 export function addPbxGroup(
   xcodeProject: XcodeProject,
@@ -8,18 +8,11 @@ export function addPbxGroup(
     targetName,
     widgetFiles,
   }: {
-    targetName: string;
-    widgetFiles: WidgetFiles;
+    targetName: string
+    widgetFiles: WidgetFiles
   }
 ) {
-  const {
-    swiftFiles,
-    intentFiles,
-    otherFiles,
-    assetDirectories,
-    entitlementFiles,
-    plistFiles,
-  } = widgetFiles;
+  const { swiftFiles, intentFiles, otherFiles, assetDirectories, entitlementFiles, plistFiles } = widgetFiles
 
   // Add PBX group
   const { uuid: pbxGroupUuid } = xcodeProject.addPbxGroup(
@@ -34,15 +27,15 @@ export function addPbxGroup(
     ],
     targetName,
     targetName
-  );
+  )
 
   // Add PBXGroup to top level group
-  const groups = xcodeProject.hash.project.objects["PBXGroup"];
+  const groups = xcodeProject.hash.project.objects['PBXGroup']
   if (pbxGroupUuid) {
     Object.keys(groups).forEach(function (key) {
       if (groups[key].name === undefined && groups[key].path === undefined) {
-        xcodeProject.addToPbxGroup(pbxGroupUuid, key);
+        xcodeProject.addToPbxGroup(pbxGroupUuid, key)
       }
-    });
+    })
   }
 }

package/plugin/src/xcode/addProductFile.ts

@@ -1,4 +1,4 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
 export function addProductFile(
   xcodeProject: XcodeProject,
@@ -9,17 +9,17 @@ export function addProductFile(
     // fileRef: xcodeProject.generateUuid(),
     // uuid: xcodeProject.generateUuid(),
     group: groupName,
-    explicitFileType: "wrapper.app-extension",
+    explicitFileType: 'wrapper.app-extension',
     /* fileEncoding: 4, */
     settings: {
-      ATTRIBUTES: ["RemoveHeadersOnCopy"],
+      ATTRIBUTES: ['RemoveHeadersOnCopy'],
     },
     includeInIndex: 0,
     path: `${targetName}.appex`,
-    sourceTree: "BUILT_PRODUCTS_DIR",
-  };
+    sourceTree: 'BUILT_PRODUCTS_DIR',
+  }
 
-  const productFile = xcodeProject.addProductFile(targetName, options);
+  const productFile = xcodeProject.addProductFile(targetName, options)
 
-  return productFile;
+  return productFile
 }

package/plugin/src/xcode/addTargetDependency.ts

@@ -1,17 +1,12 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
-export function addTargetDependency(
-  xcodeProject: XcodeProject,
-  target: { uuid: string }
-) {
-  if (!xcodeProject.hash.project.objects["PBXTargetDependency"]) {
-    xcodeProject.hash.project.objects["PBXTargetDependency"] = {};
+export function addTargetDependency(xcodeProject: XcodeProject, target: { uuid: string }) {
+  if (!xcodeProject.hash.project.objects['PBXTargetDependency']) {
+    xcodeProject.hash.project.objects['PBXTargetDependency'] = {}
   }
-  if (!xcodeProject.hash.project.objects["PBXContainerItemProxy"]) {
-    xcodeProject.hash.project.objects["PBXContainerItemProxy"] = {};
+  if (!xcodeProject.hash.project.objects['PBXContainerItemProxy']) {
+    xcodeProject.hash.project.objects['PBXContainerItemProxy'] = {}
   }
 
-  xcodeProject.addTargetDependency(xcodeProject.getFirstTarget().uuid, [
-    target.uuid,
-  ]);
+  xcodeProject.addTargetDependency(xcodeProject.getFirstTarget().uuid, [target.uuid])
 }

package/plugin/src/xcode/addToPbxNativeTargetSection.ts

@@ -1,4 +1,4 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
 export function addToPbxNativeTargetSection(
   xcodeProject: XcodeProject,
@@ -8,16 +8,16 @@ export function addToPbxNativeTargetSection(
     productFile,
     xCConfigurationList,
   }: {
-    targetName: string;
-    targetUuid: string;
-    productFile: { fileRef: string };
-    xCConfigurationList: { uuid: string };
+    targetName: string
+    targetUuid: string
+    productFile: { fileRef: string }
+    xCConfigurationList: { uuid: string }
   }
 ) {
   const target = {
     uuid: targetUuid,
     pbxNativeTarget: {
-      isa: "PBXNativeTarget",
+      isa: 'PBXNativeTarget',
       name: targetName,
       productName: targetName,
       productReference: productFile.fileRef,
@@ -27,20 +27,18 @@ export function addToPbxNativeTargetSection(
       buildRules: [],
       dependencies: [],
     },
-  };
+  }
 
-  xcodeProject.addToPbxNativeTargetSection(target);
+  xcodeProject.addToPbxNativeTargetSection(target)
 
-  const frameworksGroup = xcodeProject.findPBXGroupKey({ name: "Frameworks" });
-  const file1 = xcodeProject.addFile("WidgetKit.framework", frameworksGroup);
-  const file2 = xcodeProject.addFile("SwiftUI.framework", frameworksGroup);
-  const frameworksBuildPhaseObj = xcodeProject.pbxFrameworksBuildPhaseObj(
-    target.uuid
-  );
+  // const frameworksGroup = xcodeProject.findPBXGroupKey({ name: 'Frameworks' })
+  // const file1 = xcodeProject.addFile('WidgetKit.framework', frameworksGroup)
+  // const file2 = xcodeProject.addFile('SwiftUI.framework', frameworksGroup)
+  // const frameworksBuildPhaseObj = xcodeProject.pbxFrameworksBuildPhaseObj(target.uuid)
   /* console.log(
     { file1, file2, frameworksBuildPhaseObj },
     frameworksBuildPhaseObj.files
   ); */
 
-  return target;
+  return target
 }

package/plugin/src/xcode/addToPbxProjectSection.ts

@@ -1,23 +1,13 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
-export function addToPbxProjectSection(
-  xcodeProject: XcodeProject,
-  target: { uuid: string }
-) {
-  xcodeProject.addToPbxProjectSection(target);
+export function addToPbxProjectSection(xcodeProject: XcodeProject, target: { uuid: string }) {
+  xcodeProject.addToPbxProjectSection(target)
 
   // Add target attributes to project section
-  if (
-    !xcodeProject.pbxProjectSection()[xcodeProject.getFirstProject().uuid]
-      .attributes.TargetAttributes
-  ) {
-    xcodeProject.pbxProjectSection()[
-      xcodeProject.getFirstProject().uuid
-    ].attributes.TargetAttributes = {};
+  if (!xcodeProject.pbxProjectSection()[xcodeProject.getFirstProject().uuid].attributes.TargetAttributes) {
+    xcodeProject.pbxProjectSection()[xcodeProject.getFirstProject().uuid].attributes.TargetAttributes = {}
   }
-  xcodeProject.pbxProjectSection()[
-    xcodeProject.getFirstProject().uuid
-  ].attributes.TargetAttributes[target.uuid] = {
+  xcodeProject.pbxProjectSection()[xcodeProject.getFirstProject().uuid].attributes.TargetAttributes[target.uuid] = {
     LastSwiftMigration: 1250,
-  };
+  }
 }

package/plugin/src/xcode/addXCConfigurationList.ts

@@ -1,4 +1,4 @@
-import { XcodeProject } from "@expo/config-plugins";
+import { XcodeProject } from '@expo/config-plugins'
 
 export function addXCConfigurationList(
   xcodeProject: XcodeProject,
@@ -9,11 +9,11 @@ export function addXCConfigurationList(
     deploymentTarget,
     marketingVersion,
   }: {
-    targetName: string;
-    currentProjectVersion: string;
-    bundleIdentifier: string;
-    deploymentTarget: string;
-    marketingVersion?: string;
+    targetName: string
+    currentProjectVersion: string
+    bundleIdentifier: string
+    deploymentTarget: string
+    marketingVersion?: string
   }
 ) {
   const commonBuildSettings: any = {
@@ -41,7 +41,7 @@ export function addXCConfigurationList(
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone"; */
 
     PRODUCT_NAME: `"$(TARGET_NAME)"`,
-    SWIFT_VERSION: "5.0",
+    SWIFT_VERSION: '5.0',
     TARGETED_DEVICE_FAMILY: `"1,2"`,
     INFOPLIST_FILE: `${targetName}/Info.plist`,
     CURRENT_PROJECT_VERSION: `"${currentProjectVersion}"`,
@@ -54,30 +54,30 @@ export function addXCConfigurationList(
     SWIFT_OPTIMIZATION_LEVEL: `"-Onone"`,
     CODE_SIGN_ENTITLEMENTS: `"${targetName}/${targetName}.entitlements"`,
     // DEVELOPMENT_TEAM: `"G76836P2D4"`,
-  };
+  }
 
   const buildConfigurationsList = [
     {
-      name: "Debug",
-      isa: "XCBuildConfiguration",
+      name: 'Debug',
+      isa: 'XCBuildConfiguration',
       buildSettings: {
         ...commonBuildSettings,
       },
     },
     {
-      name: "Release",
-      isa: "XCBuildConfiguration",
+      name: 'Release',
+      isa: 'XCBuildConfiguration',
       buildSettings: {
         ...commonBuildSettings,
       },
     },
-  ];
+  ]
 
   const xCConfigurationList = xcodeProject.addXCConfigurationList(
     buildConfigurationsList,
-    "Release",
+    'Release',
     `Build configuration list for PBXNativeTarget "${targetName}"`
-  );
+  )
 
-  return xCConfigurationList;
+  return xCConfigurationList
 }

package/plugin/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["./src/index.ts","./src/types.ts","./src/withConfig.ts","./src/withPodfile.ts","./src/withPushNotifications.ts","./src/withWidgetExtensionEntitlements.ts","./src/withXcode.ts","./src/lib/getWidgetExtensionEntitlements.ts","./src/lib/getWidgetFiles.ts","./src/xcode/addBuildPhases.ts","./src/xcode/addPbxGroup.ts","./src/xcode/addProductFile.ts","./src/xcode/addTargetDependency.ts","./src/xcode/addToPbxNativeTargetSection.ts","./src/xcode/addToPbxProjectSection.ts","./src/xcode/addXCConfigurationList.ts"],"version":"5.8.3"}
+{"root":["./src/index.ts","./src/types.ts","./src/withConfig.ts","./src/withPlist.ts","./src/withPodfile.ts","./src/withPushNotifications.ts","./src/withWidgetExtensionEntitlements.ts","./src/withXcode.ts","./src/lib/getWidgetExtensionEntitlements.ts","./src/lib/getWidgetFiles.ts","./src/xcode/addBuildPhases.ts","./src/xcode/addPbxGroup.ts","./src/xcode/addProductFile.ts","./src/xcode/addTargetDependency.ts","./src/xcode/addToPbxNativeTargetSection.ts","./src/xcode/addToPbxProjectSection.ts","./src/xcode/addXCConfigurationList.ts"],"version":"5.8.3"}

package/scripts/update-version.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+TAG=$(git describe --tags --exact-match HEAD 2>/dev/null || true)
+
+if [[ "$TAG" =~ ^alpha_v([0-9]+\.[0-9]+\.[0-9]+)\(([0-9]+)\)$ ]]; then
+  NEW_VERSION="${BASH_REMATCH[1]}-alpha${BASH_REMATCH[2]}"
+elif [[ "$TAG" =~ ^v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+  NEW_VERSION="${BASH_REMATCH[1]}"
+fi
+
+if [[ -n "${NEW_VERSION:-}" ]]; then
+  jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp \
+    && mv package.json.tmp package.json
+fi

package/src/ExpoLiveActivityModule.ts

@@ -1,3 +1,3 @@
-import { requireOptionalNativeModule } from 'expo';
+import { requireOptionalNativeModule } from 'expo'
 
-export default requireOptionalNativeModule('ExpoLiveActivity');
+export default requireOptionalNativeModule('ExpoLiveActivity')

package/src/index.ts

@@ -1,52 +1,69 @@
-import ExpoLiveActivityModule from "./ExpoLiveActivityModule";
-import { Platform } from "react-native";
-import { EventSubscription } from 'expo-modules-core';
+import { EventSubscription } from 'expo-modules-core'
+import { Platform } from 'react-native'
+
+import ExpoLiveActivityModule from './ExpoLiveActivityModule'
+
+type Voidable<T> = T | void
 
 export type DynamicIslandTimerType = 'circular' | 'digital'
 
 export type LiveActivityState = {
-  title: string;
-  subtitle?: string;
-  date?: number;
-  imageName?: string;
-  dynamicIslandImageName?: string;
-};
+  title: string
+  subtitle?: string
+  date?: number
+  imageName?: string
+  dynamicIslandImageName?: string
+}
 
 export type LiveActivityConfig = {
-  backgroundColor?: string;
-  titleColor?: string;
-  subtitleColor?: string;
-  progressViewTint?: string;
-  progressViewLabelColor?: string;
-  deepLinkUrl?: string;
-  timerType?: DynamicIslandTimerType;
-};
+  backgroundColor?: string
+  titleColor?: string
+  subtitleColor?: string
+  progressViewTint?: string
+  progressViewLabelColor?: string
+  deepLinkUrl?: string
+  timerType?: DynamicIslandTimerType
+}
 
 export type ActivityTokenReceivedEvent = {
-  activityID: string;
-  activityPushToken: string;
-};
+  activityID: string
+  activityName: string
+  activityPushToken: string
+}
+
+export type ActivityPushToStartTokenReceivedEvent = {
+  activityPushToStartToken: string
+}
+
+type ActivityState = 'active' | 'dismissed' | 'pending' | 'stale' | 'ended'
+
+export type ActivityUpdateEvent = {
+  activityID: string
+  activityName: string
+  activityState: ActivityState
+}
 
 export type LiveActivityModuleEvents = {
-  onTokenReceived: (params: ActivityTokenReceivedEvent) => void;
-};
+  onTokenReceived: (params: ActivityTokenReceivedEvent) => void
+  onPushToStartTokenReceived: (params: ActivityPushToStartTokenReceivedEvent) => void
+  onStateChange: (params: ActivityUpdateEvent) => void
+}
+
+function assertIOS(name: string) {
+  const isIOS = Platform.OS === 'ios'
+
+  if (!isIOS) console.error(`${name} is only available on iOS`)
+
+  return isIOS
+}
 
 /**
  * @param {LiveActivityState} state The state for the live activity.
  * @param {LiveActivityConfig} config Live activity config object.
  * @returns {string} The identifier of the started activity or undefined if creating live activity failed.
  */
-export function startActivity(state: LiveActivityState, config?: LiveActivityConfig): string | undefined {
-  if (Platform.OS !== "ios") {
-    console.error("startActivity is only available on iOS");
-    return undefined
-  }
-  try {
-    return ExpoLiveActivityModule.startActivity(state, config);
-  } catch (error) {
-    console.error(`startActivity failed with an error: ${error}`);
-    return undefined
-  }
+export function startActivity(state: LiveActivityState, config?: LiveActivityConfig): Voidable<string> {
+  if (assertIOS('startActivity')) return ExpoLiveActivityModule.startActivity(state, config)
 }
 
 /**
@@ -54,14 +71,7 @@ export function startActivity(state: LiveActivityState, config?: LiveActivityCon
  * @param {LiveActivityState} state The updated state for the live activity.
  */
 export function stopActivity(id: string, state: LiveActivityState) {
-  if (Platform.OS !== "ios") {
-    console.error("stopActivity is only available on iOS");
-  }
-  try {
-    return ExpoLiveActivityModule.stopActivity(id, state);
-  } catch (error) {
-    console.error(`stopActivity failed with an error: ${error}`);
-  }
+  if (assertIOS('stopActivity')) return ExpoLiveActivityModule.stopActivity(id, state)
 }
 
 /**
@@ -69,20 +79,24 @@ export function stopActivity(id: string, state: LiveActivityState) {
  * @param {LiveActivityState} state The updated state for the live activity.
  */
 export function updateActivity(id: string, state: LiveActivityState) {
-  if (Platform.OS !== "ios") {
-    console.error("updateActivity is only available on iOS");
-  }
-  try {
-    return ExpoLiveActivityModule.updateActivity(id, state);
-  } catch (error) {
-    console.error(`updateActivity failed with an error: ${error}`);
-  }
+  if (assertIOS('updateActivity')) return ExpoLiveActivityModule.updateActivity(id, state)
+}
+
+export function addActivityTokenListener(
+  listener: (event: ActivityTokenReceivedEvent) => void
+): Voidable<EventSubscription> {
+  if (assertIOS('addActivityTokenListener')) return ExpoLiveActivityModule.addListener('onTokenReceived', listener)
+}
+
+export function addActivityPushToStartTokenListener(
+  listener: (event: ActivityPushToStartTokenReceivedEvent) => void
+): Voidable<EventSubscription> {
+  if (assertIOS('addActivityPushToStartTokenListener'))
+    return ExpoLiveActivityModule.addListener('onPushToStartTokenReceived', listener)
 }
 
-export function addActivityTokenListener(listener: (event: ActivityTokenReceivedEvent) => void): EventSubscription | undefined {
-  if (Platform.OS !== "ios") {
-    console.error("addActivityTokenListener is only available on iOS");
-    return undefined
-  }
-  return ExpoLiveActivityModule.addListener('onTokenReceived', listener);
+export function addActivityUpdatesListener(
+  listener: (event: ActivityUpdateEvent) => void
+): Voidable<EventSubscription> {
+  if (assertIOS('addActivityUpdatesListener')) return ExpoLiveActivityModule.addListener('onStateChange', listener)
 }

package/.eslintrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  root: true,
-  extends: ['universe/native', 'universe/web'],
-  ignorePatterns: ['build'],
-};