@bprotsyk/aso-core 1.2.88 → 1.2.90

package/lib/panel/flash/create-flash-app-request.d.ts

@@ -1,3 +1,4 @@
+import { IAppKeitaroData } from "flash/flash-app";
 export interface IUpsertFlashAppRequest {
     id: number;
     name: string;
@@ -11,6 +12,7 @@ export interface IUpsertFlashAppRequest {
     developerEmail: string;
     developerOrganization: string;
     generationOptions: IAppGenerationOptions;
+    keitaroData?: Partial<IAppKeitaroData>;
 }
 export interface IAppGenerationOptions {
     splashActivityClassName: string;

package/lib/utils/huawei/converter.d.ts

@@ -0,0 +1,2 @@
+export declare let modifyAppBuildGragleFile: (file: string, alias: string, password: string, keyName: string) => Promise<string>;
+export declare let mofidyGradleBuildFile: (file: string) => Promise<string>;

package/lib/utils/huawei/converter.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mofidyGradleBuildFile = exports.modifyAppBuildGragleFile = void 0;
+let modifyAppBuildGragleFile = async (file, alias, password, keyName) => {
+    const newSigningConfig = `
+    signingConfigs {
+      release {
+        keyAlias "${alias}"
+        keyPassword "${password}"
+        storePassword "${password}"
+        storeFile file('./${keyName}.jks')
+        v1SigningEnabled true 
+        v2SigningEnabled true 
+      }
+`;
+    const huaweiBlock = `
+        huawei {
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.release
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+        }
+`;
+    let updatedConfigString = file.replace(/(signingConfigs\s*{[^}]+})/, newSigningConfig.trim());
+    if (!file.includes("signingConfigs")) {
+        // If the signingConfigs block doesn't exist, insert it after buildTypes
+        updatedConfigString = file.replace("buildTypes {", `signingConfigs ${newSigningConfig.trim()}\n\nbuildTypes {`);
+    }
+    file = updatedConfigString
+        .replace("buildTypes {", `buildTypes {\n${huaweiBlock.trim()}\n`)
+        .replace("plugins {", "plugins {\n    id 'com.huawei.agconnect'")
+        .replace("apply plugin: 'com.android.application'", "apply plugin: 'com.huawei.agconnect'\napply plugin: 'com.android.application'")
+        .replace(/(implementation 'com\.onesignal.*')/g, `debugImplementation 'com.onesignal:OneSignal:4.7.2'
+    releaseImplementation 'com.onesignal:OneSignal:4.7.2'
+    
+    huaweiImplementation 'com.huawei.hms:push:6.3.0.304'
+    
+    huaweiImplementation('com.onesignal:OneSignal:4.7.2') {
+        exclude group: 'com.google.android.gms'
+        exclude group: 'com.google.firebase'
+    }`);
+    return file;
+};
+exports.modifyAppBuildGragleFile = modifyAppBuildGragleFile;
+let mofidyGradleBuildFile = async (file) => {
+    return file
+        .replace(/repositories {/g, "repositories {\nmaven {url 'https://developer.huawei.com/repo/'")
+        .replace(/dependencies {/g, "dependencies {\nclasspath 'com.huawei.agconnect:agcp:1.9.0.300'");
+};
+exports.mofidyGradleBuildFile = mofidyGradleBuildFile;

package/lib/utils/keitaro-utils.js

@@ -103,17 +103,17 @@ let addGeosToAllRedirectCampaigns = async (geosToAdd) => {
             console.log({
                 name: stream.name,
             });
-            let geos = stream?.filters[0]?.payload;
+            let geos = stream?.filters[stream.type == "forced" ? 1 : 0]?.payload;
             if (!geos)
                 continue;
             geosToAdd.split(" ").forEach((geo) => {
                 let streamForGeo = streams.find((s) => s.name == geo);
-                if (streamForGeo && stream && stream.type != "forced")
+                if (streamForGeo && stream)
                     return;
                 if (!geos.includes(geo))
                     geos.push(geo);
             });
-            stream.filters[0].payload = geos;
+            stream.filters[stream.type == "forced" ? 1 : 0].payload = geos;
             await keitaro_service_1.KeitaroService.upsertStreamToCampaign(campaign, stream);
             await (0, sleep_promise_1.default)(2000);
         }
@@ -466,6 +466,6 @@ let gatherInfoForFlashApps = async () => {
 // removeBrokenDomain()
 // createFlashCampaigns(sampleApp)
 // changeSourceForFA()
-// addGeosToAllRedirectCampaigns("BE")
+// addGeosToAllRedirectCam`paigns("GR")
 // removeGeosFromAllRedirectCampaigns("BE`")
 // gatherInfoForFlashApps()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bprotsyk/aso-core",
-  "version": "1.2.88",
+  "version": "1.2.90",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -29,6 +29,7 @@
     "module-alias": "^2.2.2",
     "mongoose": "^6.8.3",
     "react": "^18.2.0",
+    "replace-in-file": "^7.0.1",
     "sleep-promise": "^9.1.0",
     "styled-components": "^5.3.9"
   },

package/src/panel/flash/create-flash-app-request.ts

@@ -1,3 +1,4 @@
+import { IAppKeitaroData } from "flash/flash-app"
 import { PlugType } from "index"
 
 export interface IUpsertFlashAppRequest {
@@ -15,6 +16,7 @@ export interface IUpsertFlashAppRequest {
     developerEmail: string
     developerOrganization: string
     generationOptions: IAppGenerationOptions
+    keitaroData?: Partial<IAppKeitaroData>
 }
 
 export interface IAppGenerationOptions {

package/src/utils/huawei/converter.ts

@@ -0,0 +1,55 @@
+export let modifyAppBuildGragleFile = async (file: string, alias: string, password: string, keyName: string) => {
+    const newSigningConfig = `
+    signingConfigs {
+      release {
+        keyAlias "${alias}"
+        keyPassword "${password}"
+        storePassword "${password}"
+        storeFile file('./${keyName}.jks')
+        v1SigningEnabled true 
+        v2SigningEnabled true 
+      }
+`;
+
+    const huaweiBlock = `
+        huawei {
+            minifyEnabled true
+            shrinkResources true
+            signingConfig signingConfigs.release
+            proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+            )
+        }
+`;
+
+    let updatedConfigString = file.replace(/(signingConfigs\s*{[^}]+})/, newSigningConfig.trim());
+
+    if (!file.includes("signingConfigs")) {
+        // If the signingConfigs block doesn't exist, insert it after buildTypes
+        updatedConfigString = file.replace("buildTypes {", `signingConfigs ${newSigningConfig.trim()}\n\nbuildTypes {`);
+    }
+
+    file = updatedConfigString
+        .replace("buildTypes {", `buildTypes {\n${huaweiBlock.trim()}\n`)
+        .replace("plugins {", "plugins {\n    id 'com.huawei.agconnect'")
+        .replace("apply plugin: 'com.android.application'", "apply plugin: 'com.huawei.agconnect'\napply plugin: 'com.android.application'")
+        .replace(/(implementation 'com\.onesignal.*')/g, `debugImplementation 'com.onesignal:OneSignal:4.7.2'
+    releaseImplementation 'com.onesignal:OneSignal:4.7.2'
+    
+    huaweiImplementation 'com.huawei.hms:push:6.3.0.304'
+    
+    huaweiImplementation('com.onesignal:OneSignal:4.7.2') {
+        exclude group: 'com.google.android.gms'
+        exclude group: 'com.google.firebase'
+    }`)
+
+    return file
+}
+
+export let mofidyGradleBuildFile = async (file: string) => {
+    return file
+        .replace(/repositories {/g, "repositories {\nmaven {url 'https://developer.huawei.com/repo/'")
+        .replace(/dependencies {/g, "dependencies {\nclasspath 'com.huawei.agconnect:agcp:1.9.0.300'")
+}
+

package/src/utils/keitaro-utils.ts

@@ -85,15 +85,15 @@ export let addGeosToAllRedirectCampaigns = async (geosToAdd: string) => {
             console.log({
                 name: stream.name,
             })
-            let geos = stream?.filters[0]?.payload
+            let geos = stream?.filters[stream.type == "forced" ? 1 : 0]?.payload
             if (!geos) continue
             geosToAdd.split(" ").forEach((geo: string) => {
                 let streamForGeo = streams.find((s) => s.name == geo)
-                if (streamForGeo && stream && stream.type != "forced") return
+                if (streamForGeo && stream) return
                 if (!geos.includes(geo)) geos.push(geo)
             });
 
-            stream.filters[0].payload = geos
+            stream.filters[stream.type == "forced" ? 1 : 0].payload = geos
 
             await KeitaroService.upsertStreamToCampaign(campaign, stream)
             await sleep(2000)
@@ -495,7 +495,7 @@ let gatherInfoForFlashApps = async () => {
 
 // createFlashCampaigns(sampleApp)
 // changeSourceForFA()
-// addGeosToAllRedirectCampaigns("BE")
+// addGeosToAllRedirectCam`paigns("GR")
 // removeGeosFromAllRedirectCampaigns("BE`")
 
 // gatherInfoForFlashApps()