distapp 1.0.4 → 1.0.5

package/cli.mjs

@@ -20110,7 +20110,40 @@ var parse4 = (input) => {
 
 // utils/package-reader.ts
 var import_jszip = __toESM(require_lib3(), 1);
-var readPackageFile = async (data) => {
+
+// utils/utils.ts
+async function isZipFile(file) {
+  const ZIP_SIGNATURE = [80, 75, 3, 4];
+  let header;
+  if (file instanceof File) {
+    if (file.size < 4)
+      return false;
+    const buffer = await file.slice(0, 4).arrayBuffer();
+    header = new Uint8Array(buffer);
+  } else if (Buffer.isBuffer(file)) {
+    if (file.length < 4)
+      return false;
+    header = new Uint8Array(file.slice(0, 4));
+  } else {
+    throw new TypeError("Unsupported file type");
+  }
+  return ZIP_SIGNATURE.every((byte, i2) => header[i2] === byte);
+}
+
+// utils/package-reader.ts
+var readPackageFile = async (data, izZipPlatform) => {
+  if (izZipPlatform) {
+    const isActuallyZipFile = await isZipFile(data);
+    if (!isActuallyZipFile) {
+      throw "The file is not a zip file";
+    }
+    return {
+      extension: "zip",
+      versionCode: "",
+      versionName: "",
+      packageName: ""
+    };
+  }
   var fileZip = new import_jszip.default;
   await fileZip.loadAsync(data);
   var extension = "";
@@ -20225,7 +20258,7 @@ function normalizeError(error) {
     }
   }
   const message = error.response?._data?.message || error.response?.statusText || getFetchError()?.data?.message || getFetchError() || "Unexpected happen";
-  if (message.includes(`undefined (reading 'userId')`)) {
+  if (typeof message === "string" && message.includes(`undefined (reading 'userId')`)) {
     return "Unauthorized. Try login again";
   }
   return message;
@@ -20258,11 +20291,21 @@ function getSizeFromFile(input) {
   }
   return sizeInBytes;
 }
-async function uploadArtifact(file, filename, orgName, appName, releaseNotes, fileApk) {
-  const packageMetadata = await readPackageFile(file);
+async function uploadArtifact(file, filename, orgName, appName, releaseNotes, fileApk, versionMetadata) {
+  const isZipPlatform = filename.endsWith(".zip") ? true : false;
+  filename = filename.substring(0, filename.lastIndexOf("."));
+  const packageMetadata = await readPackageFile(file, isZipPlatform);
   if (!packageMetadata) {
     throw "Cannot read package file";
   }
+  if (!packageMetadata.packageName) {
+    if (!versionMetadata?.versionName || !versionMetadata.versionCode) {
+      throw "Version Name and Version Code are required.";
+    }
+    packageMetadata.packageName = appName;
+    packageMetadata.versionCode = versionMetadata.versionCode;
+    packageMetadata.versionName = versionMetadata.versionName;
+  }
   const fileSize = getSizeFromFile(file);
   const fileSizeApk = getSizeFromFile(fileApk);
   const { url, fileKey, apkUrl, uploadId } = await myFetch("/api/artifacts/upload-artifact", {
@@ -20273,7 +20316,8 @@ async function uploadArtifact(file, filename, orgName, appName, releaseNotes, fi
       hasFileApk: fileApk && fileApk !== "generate_bundle" ? true : false,
       filename,
       fileSize,
-      fileSizeApk
+      fileSizeApk,
+      isZipPlatform
     },
     onResponseError(r) {
       console.error("Error ", normalizeError(r));
@@ -20661,7 +20705,7 @@ async function extractAabToApk(aabPath, bundleKeystoreFetcher) {
 }
 
 // cli/commands/distribute.ts
-import { basename as basename2, extname as extname2 } from "path";
+import { basename as basename2 } from "path";
 function slugToOrgApp(slug) {
   const slugPath = slug.split("/");
   return {
@@ -20669,12 +20713,12 @@ function slugToOrgApp(slug) {
     appName: slugPath[1]
   };
 }
-var distribute = new Command("distribute").requiredOption("--slug <string>", "Slug of you app").requiredOption("--file <string>", "File path to your app").requiredOption("--api-key <string>").option("--release-notes <string>").option("--url <url>").option("--group <string...>").action(async (options) => {
+var distribute = new Command("distribute").requiredOption("--slug <string>", "Slug of you app").requiredOption("--file <string>", "File path to your app").requiredOption("--api-key <string>").option("--release-notes <string>").option("--url <url>").option("--group <string...>").option("--version-name <string>", "Version name of your desktop app (e.g v1.0.0)").option("--version-code <string>", "Version code of your desktop app (e.g 1)").action(async (options) => {
   const optUrl = options.url || process.env.DISTAPP_CLI_URL || "https://distapp.lhf.my.id";
   updateMyFetch(options.apiKey, optUrl);
   const { orgName, appName } = slugToOrgApp(options.slug);
   const filePath = resolve(options.file);
-  const filename = basename2(filePath, extname2(filePath));
+  const filename = basename2(filePath);
   const file = await promises3.readFile(filePath);
   console.log("Distributing", {
     filePath
@@ -20689,7 +20733,10 @@ var distribute = new Command("distribute").requiredOption("--slug <string>", "Sl
       disposeBundle = dispose;
     }
     const bundleApkFile = bundleApkPath ? await promises3.readFile(bundleApkPath) : undefined;
-    const { artifactId } = await uploadArtifact(file, filename, orgName, appName, options.releaseNotes ? options.releaseNotes : null, bundleApkFile);
+    const { artifactId } = await uploadArtifact(file, filename, orgName, appName, options.releaseNotes ? options.releaseNotes : null, bundleApkFile, options.versionCode && options.versionName ? {
+      versionCode: options.versionCode,
+      versionName: options.versionName
+    } : undefined);
     const groupNames = options.group;
     let updateToGroup = false;
     if (artifactId && groupNames && groupNames.length) {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "distapp",
-    "version": "1.0.4",
-    "description": "Manage and distribute Android or iOS app",
+    "version": "1.0.5",
+    "description": "Manage and distribute Android, iOS and Desktop app",
     "main": "cli.mjs",
     "bin": {
         "distapp": "./cli.mjs"