@pi-r/android 0.11.3 → 0.12.0

package/extensions/app/manifest/index.js

@@ -1,13 +1,12 @@
 "use strict";
-const path = require("node:path");
-const htmlparser2 = require("htmlparser2");
-const domhandler = require("domhandler");
-const domutils = require("domutils");
-const domserializer = require("dom-serializer");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/document/util");
-const Parser = htmlparser2.Parser;
-const DomHandler = domhandler.DomHandler;
+
+const path = require('node:path');
+const domhandler = require('domhandler');
+const domutils = require('domutils');
+const { Parser } = require('htmlparser2');
+const { render } = require('dom-serializer');
+const { isArray, isPlainObject } = require('@e-mc/types');
+const { replaceAll } = require('@e-mc/document/util');
 const MANIFEST_ATTR = [
     'package',
     'android:sharedUserId',
@@ -107,26 +106,28 @@ const ACTIVITY_ATTR = [
     'android:windowSoftInputMode'
 ];
 const INVALID_ATTR = [
-    [36, ['android:resizableActivity', 'android:minAspectRatio', 'android:maxAspectRatio']]
+    [36, ['android:resizableActivity', 'android:minAspectRatio', 'android:maxAspectRatio']],
+    [37, [['android:screenOrientation', 'portrait', 'reversePortrait', 'sensorPortrait', 'userPortrait', 'landscape', 'reverseLandscape', 'sensorLandscape', 'userLandscape']]]
 ];
 function getValidKeys(instance, data, attrList) {
     const result = [];
     const targetApi = typeof instance.targetAPI === 'number' ? instance.targetAPI : 0;
+    const minResolution = Math.min(instance.resolutionScreenWidth || 0, instance.resolutionScreenHeight || 0);
     for (let attr in data) {
-        let value = data[attr];
-        const messageString = (type) => `${type} attribute: ${attr}="${value || 'null'}"`;
+        const value = data[attr];
+        const messageString = (type) => `${type} attribute: ${attr}="${value?.toString() || 'null'}"`;
         invalid: {
-            if (attrList.includes(attr) || !attr.includes(':') && attrList.includes(attr = 'android:' + attr)) {
-                value = Array.isArray(value) ? value.join('|') : value?.toString() || '';
-                if (targetApi >= 36) {
+            if (attrList.includes(attr) || !attr.includes(':') && attrList.includes(attr = `android:${attr}`)) {
+                const attrValue = Array.isArray(value) ? value.join('|') : value != null ? String(value) : '';
+                if (targetApi >= 36 && minResolution >= 600) {
                     for (const [api, attrs] of INVALID_ATTR) {
-                        if (targetApi >= api && attrs.includes(attr)) {
+                        if (targetApi >= api && attrs.some(item => Array.isArray(item) ? item[0] === attr && item.slice(1).includes(attrValue) : item === attr)) {
                             instance.addLog(instance.statusType.WARN, messageString("Invalid config"));
                             break invalid;
                         }
                     }
                 }
-                result.push([attr, value]);
+                result.push([attr, attrValue]);
             }
             else if (value !== undefined) {
                 instance.addLog(instance.statusType.INFO, messageString("Unknown"));
@@ -163,7 +164,7 @@ function finalize(instance) {
         const manifestKeys = getValidKeys(instance, config.manifest, MANIFEST_ATTR);
         let modified = false;
         if (!existing) {
-            source = (0, util_1.replaceAll)(source, (name) => {
+            source = replaceAll(source, (name) => {
                 switch (name) {
                     case 'supportsRtl':
                         return supportsRtl === false ? 'false' : 'true';
@@ -181,7 +182,7 @@ function finalize(instance) {
             });
         }
         if (existing && (theme || activityName || activity || supportsRtl !== undefined) || applicationKeys.length > 0) {
-            new Parser(new DomHandler((err, dom) => {
+            new Parser(new domhandler.DomHandler((err, dom) => {
                 if (err) {
                     instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
                     return;
@@ -225,7 +226,7 @@ function finalize(instance) {
                             const attribs = data.layout;
                             delete data.layout;
                             const activityKeys = getValidKeys(instance, data, ACTIVITY_ATTR);
-                            if (!(0, types_1.isPlainObject)(attribs) && activityKeys.length === 0) {
+                            if (!isPlainObject(attribs) && activityKeys.length === 0) {
                                 continue;
                             }
                             let element = domutils.findOne(elem => elem.attribs['android:name'] === name, activities);
@@ -277,15 +278,15 @@ function finalize(instance) {
                     modified = true;
                 }
                 if (modified) {
-                    source = domserializer.default(dom, { xmlMode: true });
+                    source = render(dom, { xmlMode: true });
                 }
             }), { xmlMode: true, decodeEntities: false }).end(source);
         }
         if (fontProvider) {
             metaData.push({ name: 'preloaded_fonts', resource: '@array/' + fontProvider });
         }
-        if (manifestKeys.length > 0 || (0, types_1.isArray)(metaData)) {
-            new Parser(new DomHandler((err, dom) => {
+        if (manifestKeys.length > 0 || isArray(metaData)) {
+            new Parser(new domhandler.DomHandler((err, dom) => {
                 if (err) {
                     instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
                     return;
@@ -294,7 +295,7 @@ function finalize(instance) {
                 if (manifestKeys.length > 0 && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true)) && applyAttributes(target, manifestKeys)) {
                     modified = true;
                 }
-                if ((0, types_1.isArray)(metaData) && (target = domutils.findOne(elem => elem.tagName === 'application', dom, true))) {
+                if (isArray(metaData) && (target = domutils.findOne(elem => elem.tagName === 'application', dom, true))) {
                     for (const { name, resource, value } of metaData) {
                         if (name && (resource || value)) {
                             let item = domutils.findOne(elem => elem.tagName === 'meta-data' && elem.attribs['android:name'] === name, target.childNodes);
@@ -311,7 +312,7 @@ function finalize(instance) {
                             if (value) {
                                 item.attribs['android:value'] = value;
                             }
-                            source = domserializer.default(dom, { xmlMode: true });
+                            source = render(dom, { xmlMode: true });
                             modified = true;
                         }
                     }
@@ -330,4 +331,5 @@ function finalize(instance) {
         }
     }
 }
+
 module.exports = finalize;