Merge branch 'dev' into ya/clean-china-cicd

Author: yagarwal1307

asg_client/app/build.gradle

@@ -75,8 +75,8 @@ android {
 
         minSdk 28
         targetSdk 33
-        versionCode 16
-        versionName "16.0"
+        versionCode 17
+        versionName "17.0"
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a"

asg_client/app/src/main/java/com/mentra/asg_client/service/core/AsgClientService.java

@@ -852,7 +852,6 @@ public void sendVersionInfo() {
         try {
             JSONObject versionInfo = new JSONObject();
             versionInfo.put("type", "version_info");
-            versionInfo.put("timestamp", System.currentTimeMillis());
 
             String appVersion = "1.0.0";
             String buildNumber = "1";

asg_client/app/src/main/java/com/mentra/asg_client/service/core/handlers/VersionCommandHandler.java

@@ -86,7 +86,6 @@ private void sendVersionInfo() {
         try {
             JSONObject versionInfo = new JSONObject();
             versionInfo.put("type", "version_info");
-            versionInfo.put("timestamp", System.currentTimeMillis());
 
             String appVersion = "1.0.0";
             String buildNumber = "1";

bun.lock

@@ -8,6 +8,17 @@ PORT=80
 
 ADMIN_EMAILS=alex1115alex@gmail.com,alex1115alex+tester@gmail.com,isaiah@mentra.glass,israelov@mentra.glass,cayden@mentra.glass,nicolo@mentra.glass,nirhbay@mentra.glass,roger@mentra.glass
 
+# Additional Pre-installed Apps (optional, comma-separated package names)
+# These apps will be added on top of the default pre-installed apps
+# Example: ADDITIONAL_PRE_INSTALLED_APPS=com.mentra.mentraai.beta,com.custom.app
+ADDITIONAL_PRE_INSTALLED_APPS=
+
+# Auto-delete Apps (optional, comma-separated package names)
+# Apps specified here will be automatically removed from users' installed apps when they connect
+# Useful for deprecating or removing apps across all users
+# Example: DELETE_APP_BY_PACKAGE_NAME=cloud.augmentos.mira,com.deprecated.app
+DELETE_APP_BY_PACKAGE_NAME=
+
 # Services URLs
 CLOUD_URL=cloud
 APPSTORE_URL=appstore

cloud/.env.example

@@ -192,4 +192,4 @@ graph TD
 This project is licensed under the MIT License - see the [LICENSE](../LICENSE) file for details.
 
 Update the below count to trigger CI/CD cloud redeployment without making any real code changes.
-Redeploy cloud: 1
+Redeploy cloud: 3

cloud/README.md

@@ -814,6 +814,50 @@ UserSchema.statics.findOrCreateUser = async function (
     // Don't fail user creation if app installation fails
   }
 
+  // Auto-delete apps specified in DELETE_APP_BY_PACKAGE_NAME environment variable
+  try {
+    const deletePackageNames = process.env.DELETE_APP_BY_PACKAGE_NAME;
+
+    if (deletePackageNames && deletePackageNames.trim()) {
+      const packagesToDelete = deletePackageNames
+        .split(",")
+        .map((pkg) => pkg.trim())
+        .filter((pkg) => pkg.length > 0);
+
+      if (packagesToDelete.length > 0 && user.installedApps) {
+        const deletedApps: string[] = [];
+
+        // Filter out apps that should be deleted
+        user.installedApps = user.installedApps.filter((app: any) => {
+          const shouldDelete = packagesToDelete.includes(app.packageName);
+          if (shouldDelete) {
+            deletedApps.push(app.packageName);
+          }
+          return !shouldDelete;
+        });
+
+        // Only save if we actually deleted something
+        if (deletedApps.length > 0) {
+          await user.save();
+          logger.info(
+            {
+              email,
+              deletedApps,
+              deletedCount: deletedApps.length,
+            },
+            `Auto-deleted ${deletedApps.length} app(s) for user: ${email}`,
+          );
+        }
+      }
+    }
+  } catch (error) {
+    {
+      const err = error instanceof Error ? error : new Error(String(error));
+      logger.error(err, "Error auto-deleting apps:");
+    }
+    // Don't fail user creation if app deletion fails
+  }
+
   return user;
 };
 

cloud/packages/cloud/src/models/user.model.ts

@@ -34,6 +34,10 @@ const ALLOWED_API_KEY_PACKAGES = [
   "test.augmentos.mira",
   "cloud.augmentos.mira",
   "com.augmentos.mira",
+  "com.mentra.mentraai.beta",
+  // "com.mentra.mentraai.dev",  //later
+  // "com.mentra.mentraai" //later
+
 ];
 
 const AUGMENTOS_AUTH_JWT_SECRET = process.env.AUGMENTOS_AUTH_JWT_SECRET || "";

cloud/packages/cloud/src/routes/apps.routes.ts

@@ -32,7 +32,7 @@ export const SYSTEM_DASHBOARD_PACKAGE_NAME =
 export const PRE_INSTALLED = [
   "com.augmentos.livecaptions",
   "cloud.augmentos.notify",
-  "cloud.augmentos.mira",
+  // "cloud.augmentos.mira",
 ];
 export const PRE_INSTALLED_DEBUG = [
   // "com.mentra.link",
@@ -51,18 +51,31 @@ export const PRE_INSTALLED_DEBUG = [
 
 // export const PRE_INSTALLED = ["cloud.augmentos.live-captions-global", "cloud.augmentos.notify", "cloud.augmentos.mira"];
 
+// Add debug apps in non-production environments
 if (
   process.env.NODE_ENV !== "production" ||
   process.env.DEBUG_APPS === "true"
 ) {
-  // If we're in debug mode, add the debug apps to the preinstalled list.
   PRE_INSTALLED.push(...PRE_INSTALLED_DEBUG);
   logger.info(
     { PRE_INSTALLED_DEBUG },
     "Debug mode enabled - adding debug apps to preinstalled list:",
   );
 }
 
+// Add additional pre-installed apps from environment variable
+if (process.env.ADDITIONAL_PRE_INSTALLED_APPS) {
+  const additionalApps = process.env.ADDITIONAL_PRE_INSTALLED_APPS.split(",")
+    .map((app) => app.trim())
+    .filter((app) => app.length > 0);
+
+  PRE_INSTALLED.push(...additionalApps);
+  logger.info(
+    { additionalApps },
+    "Adding additional pre-installed apps from ADDITIONAL_PRE_INSTALLED_APPS:",
+  );
+}
+
 // If we're in test mode, we don't want to pre-install any apps. (used with the headless client for testing)
 if (process.env.NODE_ENV === "test") {
   logger.info("Test mode - no pre-installed apps");

cloud/packages/cloud/src/services/core/app.service.ts

@@ -6,20 +6,29 @@ import pluginReactNative from "eslint-plugin-react-native"
 import pluginReactotron from "eslint-plugin-reactotron"
 import pluginPrettier from "eslint-plugin-prettier"
 import prettierConfig from "eslint-config-prettier"
-import pluginImport from "eslint-plugin-import"
+import expoConfig from "eslint-config-expo/flat.js"
+import {defineConfig} from "eslint/config"
 
-export default [
-  // Base config for all JS/TS files
+export default defineConfig([
+  
+  // Recommended configs
+  expoConfig,
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+  pluginReact.configs.flat.recommended,
+  pluginReact.configs.flat["jsx-runtime"],
+  prettierConfig,
+
+  // custom config:
   {
     files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"],
-    ignores: ["eslint.config.mjs"],
+    ignores: ["eslint.config.mjs", "metro.config.js"],
     plugins: {
       "@typescript-eslint": tseslint.plugin,
       "react": pluginReact,
       "react-native": pluginReactNative,
       "reactotron": pluginReactotron,
       "prettier": pluginPrettier,
-      "import": pluginImport,
     },
     languageOptions: {
       globals: {
@@ -37,25 +46,11 @@ export default [
       react: {
         version: "detect", // Automatically detect the React version
       },
-    },
-  },
-
-  // Recommended configs
-  js.configs.recommended,
-  ...tseslint.configs.recommended,
-  pluginReact.configs.flat.recommended,
-  pluginReact.configs.flat["jsx-runtime"],
-  prettierConfig,
-
-  // All rule overrides in one place
-  {
-    plugins: {
-      "@typescript-eslint": tseslint.plugin,
-      "react": pluginReact,
-      "react-native": pluginReactNative,
-      "reactotron": pluginReactotron,
-      "prettier": pluginPrettier,
-      "import": pluginImport,
+      "import/resolver": {
+        typescript: {
+          project: ["./mobile/tsconfig.json", "./cloud/tsconfig.json"],
+        },
+      },
     },
     rules: {
       // Prettier
@@ -195,4 +190,4 @@ export default [
       "mobile/**/*.aab",
     ],
   },
-]
+])