@saltcorn/mobile-builder 1.1.0-beta.9 → 1.1.0

package/dist/utils/package-bundle-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-bundle-utils.js","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"package-bundle-utils.js","sourceRoot":"","sources":["../../utils/package-bundle-utils.ts"],"names":[],"mappings":"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"}

package/docker/Dockerfile

@@ -18,40 +18,36 @@ RUN android_sdk/cmdline-tools/13.0/bin/sdkmanager "build-tools;34.0.0"
 RUN wget -q https://services.gradle.org/distributions/gradle-8.4-all.zip \
     && unzip gradle-8.4-all.zip -d /opt
 
-RUN npm install -g cordova@12.0.0
-
 # create an empty project, the first init seems to take longer
 WORKDIR /init_project
-RUN cordova create project
-WORKDIR /init_project/project
-# download plugins while building
-# so that we can add them later via file reference
-RUN cordova plugin add cordova-sqlite-ext@6.0.0
-RUN cordova plugin add cordova-plugin-file@8.1.0
-RUN cordova plugin add cordova-plugin-inappbrowser@6.0.0
-RUN cordova plugin add cordova-plugin-network-information@3.0.0
-RUN cordova plugin add cordova-plugin-geolocation@5.0.0
-RUN cordova plugin add cordova-plugin-camera@7.0.0
-RUN cordova platform add android@^13.0.0
+RUN npm init -y
+RUN mkdir www
+RUN touch www/index.html
+RUN npm install @capacitor/cli @capacitor/core @capacitor/android
+RUN npx cap init MyApp com.example.myapp --web-dir www
+RUN npx cap add android
+RUN npx cap sync
+
 ENV ANDROID_SDK_ROOT=/android_sdk
 ENV ANDROID_HOME=/android_sdk
 ENV GRADLE_HOME=/opt/gradle-8.4
 ENV PATH=$PATH:/opt/gradle-8.4/bin
-# stop gradle from downloading itself
-ENV CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-8.4-all.zip
-RUN cordova build android
 
-# due to a bug in npm that has been addressed since then
-# some files in '/root/.npm' are owned by root
-RUN chown -R 1000:1000 "/root/.npm"
-RUN chmod -R o+rwx "/root/.npm"
+RUN cat <<EOF > /init_project/android/gradle/wrapper/gradle-wrapper.properties
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=file\:/gradle-8.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+EOF
+
+WORKDIR /init_project/android
+RUN ./gradlew assembleDebug
 
-# prepare entry point
 WORKDIR /
 COPY entry.bash ./
 RUN chmod u+x entry.bash
 
-RUN chmod o+rwx ~
-RUN chmod -R o+rwx ~/.config
-
 ENTRYPOINT ["./entry.bash"]

package/docker/entry.bash

@@ -1,11 +1,15 @@
 #!/bin/bash
 
+set -e
+
 BUILD_TYPE="$1"
-KEYSTORE_FILE="$2"
-KEYSTORE_ALIAS="$3"
-KEYSTORE_PASSWORD="$4"
+APP_VERSION="$2"
+KEYSTORE_FILE="$3"
+KEYSTORE_ALIAS="$4"
+KEYSTORE_PASSWORD="$5"
 
 echo "BUILD_TYPE: $BUILD_TYPE"
+echo "APP_VERSION: $APP_VERSION"
 echo "KEYSTORE_FILE: $KEYSTORE_FILE"
 echo "KEYSTORE_ALIAS: $KEYSTORE_ALIAS"
 #echo "KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD"
@@ -15,38 +19,89 @@ export ANDROID_SDK_ROOT=/android_sdk
 export ANDROID_HOME=/android_sdk
 export GRADLE_HOME=/opt/gradle-8.4
 export PATH=$PATH:/opt/gradle-8.4/bin
-# stop gradle from downloading itself
-export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL=file\:/gradle-8.4-all.zip
 
 cd /saltcorn-mobile-app
-echo "adding android platform"
-cordova platform add android
-echo "writing gradle.properties"
-cat <<EOF > /saltcorn-mobile-app/platforms/android/gradle.properties
-org.gradle.jvmargs=-Xmx2048m
-android.useAndroidX=true
-android.enableJetifier=true
+npm install @capacitor/cli @capacitor/core @capacitor/android
+npx cap add android
+npx capacitor-assets generate
+npx cap sync
+
+npm install cordova-plugin-file@8.1.2
+npm install cordova-plugin-inappbrowser@6.0.0
+
+# data extraction rules
+cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/data_extraction_rules.xml
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+    <cloud-backup>
+      <exclude domain="root" />
+      <exclude domain="database" />
+      <exclude domain="sharedpref" />
+      <exclude domain="external" />
+    </cloud-backup>
+    <device-transfer>
+      <exclude domain="root" />
+      <exclude domain="database" />
+      <exclude domain="sharedpref" />
+      <exclude domain="external" />
+    </device-transfer>
+</data-extraction-rules>
+EOF
+
+# network security config
+cat <<EOF > /saltcorn-mobile-app/android/app/src/main/res/xml/network_security_config.xml
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+  <domain-config cleartextTrafficPermitted="true">
+    <domain includeSubdomains="true">10.0.2.2</domain>
+  </domain-config>
+</network-security-config>
+EOF
+
+npm run modify-android-manifest
+npx cap sync
+
+# gradle wrapper
+cat <<EOF > /saltcorn-mobile-app/android/gradle/wrapper/gradle-wrapper.properties
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
 distributionUrl=file\:/gradle-8.4-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
 EOF
 
-echo "adding plugins"
-cordova plugin add /init_project/project/plugins/cordova-plugin-inappbrowser
-cordova plugin add /init_project/project/plugins/cordova-plugin-file
-cordova plugin add /init_project/project/plugins/cordova-sqlite-ext
-cordova plugin add /init_project/project/plugins/cordova-plugin-network-information
-cordova plugin add /init_project/project/plugins/cordova-plugin-geolocation
-cordova plugin add /init_project/project/plugins/cordova-plugin-camera
+npm run build
+npx cap sync
 
-echo "calling cordova build"
-cordova build android --verbose
+# copy prepopulated db
+mkdir -p /saltcorn-mobile-app/android/app/src/main/assets/public/assets/databases
+cp /saltcorn-mobile-app/www/scdb.sqlite /saltcorn-mobile-app/android/app/src/main/assets/public/assets/databases/prepopulated.db
 
+# set app version and code in build.gradle
+npm run modify-gradle-cfg -- --app-version=$APP_VERSION
 
+ANDROID_RELEASE_TYPE="AAB"
+if [ "$BUILD_TYPE" == "debug" ]; then
+  ANDROID_RELEASE_TYPE="APK"
+fi
+
+# if KEYSTORE_FILE is not empty
 if [ -n "$KEYSTORE_FILE" ]; then
-  echo "building signed app with keystore"
-  cordova build android --"$BUILD_TYPE" --verbose -- --keystore="$KEYSTORE_FILE" --alias="$KEYSTORE_ALIAS" --storePassword="$KEYSTORE_PASSWORD" --password="$KEYSTORE_PASSWORD"
+  echo "building signed app"
+  npx cap build android \
+    --androidreleasetype "$ANDROID_RELEASE_TYPE" \
+    --keystorepath "/saltcorn-mobile-app/$KEYSTORE_FILE" \
+    --keystorepass "$KEYSTORE_PASSWORD" \
+    --keystorealias "$KEYSTORE_ALIAS" \
+    --keystorealiaspass "$KEYSTORE_PASSWORD" 
 else
   echo "building unsigned app"
-  cordova build android --"$BUILD_TYPE" --verbose
+  npx cap build android \
+    --androidreleasetype "$ANDROID_RELEASE_TYPE" \
+    --keystorepath "/saltcorn-mobile-app/unsecure-default-key.jks" \
+    --keystorepass "unsecurepassw" \
+    --keystorealias "unsecure-default-alias" \
+    --keystorealiaspass "unsecurepassw"
 fi
-
-chmod -R o+rwx /saltcorn-mobile-app

package/package.json

@@ -3,20 +3,20 @@
   "description": "plugin to to build a mobile app from a tenant application",
   "homepage": "https://saltcorn.com",
   "repository": "github:saltcorn/saltcorn",
-  "version": "1.1.0-beta.9",
+  "version": "1.1.0",
   "author": "Christian Hugo",
   "scripts": {
     "test": "jest ./tests/ --runInBand",
     "build": "webpack --mode development"
   },
   "dependencies": {
-    "@saltcorn/markup": "1.1.0-beta.9",
-    "@saltcorn/data": "1.1.0-beta.9",
-    "@saltcorn/db-common": "1.1.0-beta.9",
-    "@saltcorn/server": "1.1.0-beta.9",
-    "@saltcorn/base-plugin": "1.1.0-beta.9",
-    "@saltcorn/sbadmin2": "1.1.0-beta.9",
-    "@saltcorn/mobile-app": "1.1.0-beta.9",
+    "@saltcorn/markup": "1.1.0",
+    "@saltcorn/data": "1.1.0",
+    "@saltcorn/db-common": "1.1.0",
+    "@saltcorn/server": "1.1.0",
+    "@saltcorn/base-plugin": "1.1.0",
+    "@saltcorn/sbadmin2": "1.1.0",
+    "@saltcorn/mobile-app": "1.1.0",
     "fs-extra": "^10.0.1",
     "live-plugin-manager": "^0.17.1",
     "resize-with-sharp-or-jimp": "0.1.8",

package/dist/utils/cordova_helper.d.ts

@@ -1,43 +0,0 @@
-import type User from "@saltcorn/data/models/user";
-export declare type CordovaCfg = {
-    buildDir: string;
-    platforms: string[];
-    buildType: "debug" | "release";
-    appName: string;
-    useDocker?: boolean;
-    keyStorePath?: string;
-    keyStoreAlias?: string;
-    keyStorePassword?: string;
-    appleTeamId?: string;
-    provisioningGUUID?: string;
-};
-export declare class CordovaHelper {
-    buildDir: string;
-    platforms: string[];
-    buildType: "debug" | "release";
-    appName: string;
-    useDocker?: boolean;
-    keyStoreFile?: string;
-    keyStoreAlias?: string;
-    keyStorePassword?: string;
-    androidReleaseOut: string;
-    androidDebugOut: string;
-    appleTeamId?: string;
-    provisioningGUUID?: string;
-    constructor(cfg: CordovaCfg);
-    buildApp(): number | null;
-    private runXcodeCmds;
-    private copyAppIconsSet;
-    private buildApkInContainer;
-    private addPlugins;
-    private addPlatforms;
-    private callBuild;
-    /**
-     * copy .apk / .aab / .ipa files to 'copyDir' if they exist
-     * @param copyDir directory where the resulting app file will be copied to
-     * @param user the user specified by the userEmail (-c) parameter
-     * @param appName
-     */
-    tryCopyAppFiles(copyDir: string, user: User, appName?: string): Promise<void>;
-}
-//# sourceMappingURL=cordova_helper.d.ts.map

package/dist/utils/cordova_helper.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cordova_helper.d.ts","sourceRoot":"","sources":["../../utils/cordova_helper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,IAAI,MAAM,4BAA4B,CAAC;AAEnD,oBAAY,UAAU,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,qBAAa,aAAa;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,MAAM,CAAC;IAExB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;gBAEf,GAAG,EAAE,UAAU;IA2B3B,QAAQ;IAkBR,OAAO,CAAC,YAAY;IAmCpB,OAAO,CAAC,eAAe;IAsBvB,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,UAAU;IAoBlB,OAAO,CAAC,YAAY;IAgBpB,OAAO,CAAC,SAAS;IA+BjB;;;;;OAKG;IACG,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM;CAwBpE"}

package/dist/utils/cordova_helper.js

@@ -1,194 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CordovaHelper = void 0;
-const child_process_1 = require("child_process");
-const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
-const utils = require("@saltcorn/data/utils");
-const { fileWithEnding, safeEnding } = utils;
-const file_1 = __importDefault(require("@saltcorn/data/models/file"));
-class CordovaHelper {
-    constructor(cfg) {
-        this.buildDir = cfg.buildDir;
-        this.platforms = cfg.platforms;
-        this.buildType = cfg.buildType || "debug";
-        this.appName = cfg.appName;
-        this.useDocker = cfg.useDocker;
-        this.keyStoreFile = cfg.keyStorePath
-            ? (0, path_1.basename)(cfg.keyStorePath)
-            : undefined;
-        this.keyStoreAlias = cfg.keyStoreAlias;
-        this.keyStorePassword = cfg.keyStorePassword;
-        const androidOut = (0, path_1.join)(this.buildDir, "platforms", "android", "app", "build", "outputs");
-        this.androidReleaseOut = (0, path_1.join)(androidOut, "bundle", "release");
-        this.androidDebugOut = (0, path_1.join)(androidOut, "apk", "debug");
-        this.appleTeamId = cfg.appleTeamId;
-        this.provisioningGUUID = cfg.provisioningGUUID;
-    }
-    buildApp() {
-        let code = null;
-        if (!this.useDocker) {
-            this.addPlugins();
-            code = this.callBuild();
-        }
-        else {
-            code = this.buildApkInContainer();
-            if (code === 0 && this.platforms.includes("ios"))
-                code = this.callBuild(["ios"]);
-        }
-        if (code !== 0)
-            return code;
-        if (this.platforms.includes("ios")) {
-            this.copyAppIconsSet();
-            code = this.runXcodeCmds();
-        }
-        return code;
-    }
-    runXcodeCmds() {
-        try {
-            console.log("xcodebuild -workspace");
-            let buffer = (0, child_process_1.execSync)(`xcodebuild -workspace platforms/ios/${this.appName}.xcworkspace ` +
-                `-scheme ${this.appName} -destination "generic/platform=iOS" ` +
-                `-archivePath MyArchive.xcarchive archive PROVISIONING_PROFILE="${this.provisioningGUUID}" ` +
-                ' CODE_SIGN_STYLE="Manual" CODE_SIGN_IDENTITY="iPhone Distribution" ' +
-                ` DEVELOPMENT_TEAM="${this.appleTeamId}"`, { cwd: this.buildDir, maxBuffer: 1024 * 1024 * 10 });
-            console.log(buffer.toString());
-            if (!(0, fs_extra_1.existsSync)((0, path_1.join)(this.buildDir, "MyArchive.xcarchive"))) {
-                console.log("Unable to export ipa: xcodebuild did not create the archivePath.");
-                return 1;
-            }
-            else {
-                console.log("xcodebuild -exportArchive");
-                buffer = (0, child_process_1.execSync)("xcodebuild -exportArchive -archivePath MyArchive.xcarchive " +
-                    `-exportPath ${this.buildDir} -exportOptionsPlist ExportOptions.plist`, { cwd: this.buildDir, maxBuffer: 1024 * 1024 * 10 });
-                console.log(buffer.toString());
-                // to upload it automatically:
-                // xrun altool --upload-app -f [.ipa file] -t ios -u [apple-id] -p [app-specific password]
-                return 0;
-            }
-        }
-        catch (err) {
-            console.log(err);
-            return 1;
-        }
-    }
-    copyAppIconsSet() {
-        const src = (0, path_1.join)(this.buildDir, "AppIcon.appiconset");
-        if (!(0, fs_extra_1.existsSync)(src)) {
-            console.log("AppIcon.appiconset not found");
-        }
-        else {
-            const dst = (0, path_1.join)(this.buildDir, "platforms", "ios", this.appName, "Assets.xcassets", "AppIcon.appiconset");
-            try {
-                (0, fs_extra_1.rmSync)(dst, { recursive: true, force: true });
-                (0, fs_extra_1.copySync)(src, dst, { recursive: true, overwrite: true });
-            }
-            catch (err) {
-                console.log(err);
-            }
-        }
-    }
-    buildApkInContainer() {
-        const spawnParams = [
-            "run",
-            "--network",
-            "host",
-            "-v",
-            `${this.buildDir}:/saltcorn-mobile-app`,
-            "saltcorn/cordova-builder",
-        ];
-        spawnParams.push(this.buildType);
-        if (this.keyStoreFile)
-            spawnParams.push(this.keyStoreFile, this.keyStoreAlias || "??", this.keyStorePassword || "??");
-        const result = (0, child_process_1.spawnSync)(`${process.env.DOCKER_BIN ? `${process.env.DOCKER_BIN}/` : ""}docker`, spawnParams, { cwd: ".", maxBuffer: 1024 * 1024 * 10 });
-        if (result.output)
-            console.log(result.output.toString());
-        else if (result.error)
-            console.log(result.error.toString());
-        else
-            console.log("docker finished without output");
-        return result.status;
-    }
-    addPlugins() {
-        const addFn = (plugin) => {
-            let result = (0, child_process_1.spawnSync)("npm", ["run", "add-plugin", "--", plugin], {
-                cwd: this.buildDir,
-                env: {
-                    ...process.env,
-                    NODE_ENV: "development",
-                },
-                maxBuffer: 1024 * 1024 * 10,
-            });
-            console.log(result.output.toString());
-        };
-        addFn("cordova-sqlite-ext@6.0.0");
-        addFn("cordova-plugin-file@8.1.0");
-        addFn("cordova-plugin-inappbrowser@6.0.0");
-        addFn("cordova-plugin-network-information@3.0.0");
-        addFn("cordova-plugin-geolocation@5.0.0");
-        addFn("cordova-plugin-camera@7.0.0");
-    }
-    addPlatforms() {
-        const result = (0, child_process_1.spawnSync)("npm", ["run", "add-platform", "--", ...this.platforms], {
-            cwd: this.buildDir,
-            env: {
-                ...process.env,
-                NODE_ENV: "development",
-            },
-            maxBuffer: 1024 * 1024 * 10,
-        });
-        console.log(result.output.toString());
-    }
-    callBuild(platforms = this.platforms) {
-        this.addPlatforms();
-        let buildParams = [...platforms, `--${this.buildType}`];
-        if (this.keyStoreFile) {
-            buildParams.push(`--keystore=${this.keyStoreFile}`, `--alias=${this.keyStoreAlias || "??"}`, `--password=${this.keyStorePassword || "??"}`, `--storePassword=${this.keyStorePassword || "??"}`);
-        }
-        if (platforms.includes("ios")) {
-            buildParams.push(`--developmentTeam=${this.appleTeamId}`, '--codeSignIdentity="iPhone Distribution"', "--packageType=app-store", `--provisioningProfile=${this.provisioningGUUID}`);
-        }
-        const result = (0, child_process_1.spawnSync)("npm", ["run", "build-app", "--", ...buildParams], {
-            cwd: this.buildDir,
-            maxBuffer: 1024 * 1024 * 10,
-        });
-        console.log(result.output.toString());
-        return result.status;
-    }
-    /**
-     * copy .apk / .aab / .ipa files to 'copyDir' if they exist
-     * @param copyDir directory where the resulting app file will be copied to
-     * @param user the user specified by the userEmail (-c) parameter
-     * @param appName
-     */
-    async tryCopyAppFiles(copyDir, user, appName) {
-        const copyHelper = async (ending, apkBuildDir) => {
-            const appFile = fileWithEnding(apkBuildDir, `.${ending}`);
-            if (appFile) {
-                const dstFile = appName
-                    ? safeEnding(appName, `.${ending}`)
-                    : `app-${this.buildType}.${ending}`;
-                (0, fs_extra_1.copySync)((0, path_1.join)(apkBuildDir, appFile), (0, path_1.join)(copyDir, dstFile));
-                await file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
-            }
-        };
-        if (!(0, fs_extra_1.existsSync)(copyDir))
-            (0, fs_extra_1.mkdirSync)(copyDir);
-        if (this.buildType === "debug")
-            copyHelper("apk", this.androidDebugOut);
-        else
-            copyHelper("aab", this.androidReleaseOut);
-        // iOS .ipa file
-        const ipaFile = fileWithEnding(this.buildDir, ".ipa");
-        if (ipaFile) {
-            const dstFile = appName ? safeEnding(appName, ".ipa") : "app-debug.ipa";
-            (0, fs_extra_1.copySync)((0, path_1.join)(this.buildDir, ipaFile), (0, path_1.join)(copyDir, dstFile));
-            await file_1.default.set_xattr_of_existing_file(dstFile, copyDir, user);
-        }
-    }
-}
-exports.CordovaHelper = CordovaHelper;
-//# sourceMappingURL=cordova_helper.js.map

package/dist/utils/cordova_helper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"cordova_helper.js","sourceRoot":"","sources":["../../utils/cordova_helper.ts"],"names":[],"mappings":"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"}