Analyze artifact for version and package

components/AppFileUpload.vue

@@ -15,6 +15,7 @@
 </template>
 
 <script setup lang="ts">
+import JSZip from 'jszip';
 import { UpdateGroupsRequest } from '~/server/api/update-artifact-groups.put';
 
 const releaseNotes = ref<string | null>(null)
@@ -25,8 +26,8 @@ const orgName = ref<string>('')
 const appName = ref<string>('')
 osType.value = dialogRef.value.data.osType
 prop.value = dialogRef.value.data.props
-orgName.value = dialogRef.value.data.orgName
-appName.value = dialogRef.value.data.appName
+orgName.value = dialogRef.value.data.props.orgName
+appName.value = dialogRef.value.data.props.appName
 
 const mimeTypeFromOsType = computed(() => getMimeTypeFromosType(osType.value ?? 'android'))
 const fileRef = ref<HTMLInputElement | null>(null)
@@ -96,6 +97,8 @@ const onUpload = async (file: File) => {
             releaseNotes: releaseNotes.value,
         },
     })
-    return data
+    return {
+        artifactId: data?.artifactId,
+    }
 };
 </script>

components/Releases.vue

@@ -47,7 +47,7 @@ const list = computed(() => data.value as any[])
 
 const dialog = useDialog();
 
-const osType = inject<OsType>('detail-app')
+const osType = inject<ComputedRef<OsType>>('detail-app')
 
 const upload = () => {
     dialog.open(AppFileUpload, {
@@ -58,8 +58,6 @@ const upload = () => {
         data: {
             osType,
             props,
-            orgName: props.orgName,
-            appName: props.appName,
         },
         onClose: (o) => {
             if (o?.data?.success) {

package.json

@@ -21,11 +21,15 @@
     "@aws-sdk/s3-request-presigner": "^3.556.0",
     "@hebilicious/vue-query-nuxt": "^0.3.0",
     "@libsql/client": "^0.6.0",
+    "@plist/parse": "^1.1.0",
     "@tanstack/vue-query": "^5.28.9",
+    "@xmldom/xmldom": "^0.8.10",
+    "adbkit-apkreader": "^3.2.0",
     "chart.js": "3.3.2",
     "drizzle-orm": "^0.30.7",
     "h3": "^1.11.1",
     "jose": "^5.2.4",
+    "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "pg": "^8.11.3",

pages/orgs/[orgName]/apps/[appId]/[detailArtifact].vue

@@ -34,7 +34,7 @@
             <span class="font-semibold">File metadata</span>
             <div class="flex flex-col">
                 <label>{{ `MD5: ${detailArtifact?.fileMetadata?.md5?.replaceAll('"', '')}` }}</label>
-                <label>{{ `File Extension: ${getExtensionFromMimeType(detailArtifact?.fileMetadata?.contentType)}`
+                <label>{{ `File Extension: ${detailArtifact?.extension}`
                     }}</label>
                 <label>{{ `File Size: ${formatBytes(detailArtifact?.fileMetadata?.contentLength ?? 0)}` }}</label>
             </div>

pages/orgs/[orgName]/apps/[appId]/index.vue

@@ -67,7 +67,9 @@ const detailApp = useFetch('/api/detail-app', {
         orgName: orgName,
     },
 })
-provide('detail-app', toOsType(detailApp.data.value?.osType))
+
+const osType = computed(() => toOsType(detailApp.data.value?.osType))
+provide('detail-app', osType)
 </script>
 
 <style>

server/api/artifacts/detail-artifact.get.ts

@@ -4,6 +4,7 @@ import { generateRandomPassword, getStorageKeys } from "~/server/utils/utils"
 import { takeUniqueOrThrow } from "../detail-app.get"
 import { GetObjectAttributesCommand, GetObjectTaggingCommand, HeadObjectCommand, ObjectAttributes } from "@aws-sdk/client-s3"
 import { S3AppClient, type AppHeadObjectCommandOutput } from "~/server/services/S3AppClient"
+import { readPackageFile } from "~/server/utils/package-reader"
 
 export default defineEventHandler(async (event) => {
     const db = event.context.drizzle

server/api/artifacts/download-artifact.get.ts

@@ -36,7 +36,7 @@ export default defineEventHandler(async (event) => {
     const signedUrl = await s3.getSignedUrlGetObject(event, new GetObjectCommand({
         Bucket: s3BucketName,
         Key: assets,
-        ResponseContentDisposition: `attachment; filename ="${app.name}"`,
+        ResponseContentDisposition: `attachment; filename ="${app.name}${detailArtifact.extension ? `.${detailArtifact.extension}` : ''}"`,
     }), 1800)
     await sendRedirect(event, signedUrl)
 })

server/api/artifacts/upload-artifact-url.post.ts

@@ -2,7 +2,7 @@ import { and, eq } from "drizzle-orm"
 import { artifacts, organizations, organizationsPeople } from "~/server/db/schema"
 import { getStorageKeys, s3BucketName } from "~/server/utils/utils"
 import { takeUniqueOrThrow } from "../detail-app.get"
-import { CopyObjectCommand, DeleteObjectCommand } from "@aws-sdk/client-s3"
+import { CopyObjectCommand, DeleteObjectCommand, GetObjectCommand } from "@aws-sdk/client-s3"
 import { S3AppClient } from "~/server/services/S3AppClient"
 
 export default defineEventHandler(async (event) => {
@@ -21,6 +21,37 @@ export default defineEventHandler(async (event) => {
             return operators.and(operators.eq(fields.organizationsId, userOrg.organizationsId!), operators.eq(fields.name, appName!.toString()))
         },
     }).then(takeUniqueOrThrow)
+    const { temp, assets } = getStorageKeys(userOrg.organizationsId!, app.id, key)
+
+    // Processing the file
+    const s3 = new S3AppClient()
+    const tempSignedUrl = await s3.getSignedUrlGetObject(event, new GetObjectCommand({
+        Bucket: s3BucketName,
+        Key: temp,
+    }), 1800)
+    const response = await fetch(tempSignedUrl)
+    if (!response.ok) {
+        setResponseStatus(event, 400)
+        return
+    }
+    const arrayBuffer = await response.arrayBuffer() // WARNING: This will download to memory
+    const packageData = await readPackageFile(arrayBuffer)
+    if (!packageData) {
+        setResponseStatus(event, 400, 'Cannot read package')
+        return
+    }
+
+    await s3.copyObject(event, new CopyObjectCommand({
+        CopySource: `${s3BucketName}/${temp}`,
+        Bucket: s3BucketName,
+        Key: assets,
+    }))
+    await s3.deleteObject(event, new DeleteObjectCommand({
+        Bucket: s3BucketName,
+        Key: temp,
+    }))
+
+    // Inserting to db
     const lastArtifact = await db.query.artifacts.findFirst({
         orderBy(fields, operators) {
             return operators.desc(fields.releaseId)
@@ -37,23 +68,14 @@ export default defineEventHandler(async (event) => {
         createdAt: now,
         updatedAt: now,
         fileObjectKey: key,
-        versionCode2: '1',
-        versionName2: '1.0.0',
+        versionCode2: packageData?.versionCode?.toString()!,
+        versionName2: packageData?.versionName!,
         appsId: app.id,
         releaseNotes: releaseNotes,
         releaseId: newReleaseId,
+        extension: packageData?.extension,
+        packageName: packageData?.metadata?.packageName,
     })
-    const { temp, assets } = getStorageKeys(userOrg.organizationsId!, app.id, key)
-    const s3 = new S3AppClient()
-    await s3.copyObject(event, new CopyObjectCommand({
-        CopySource: `${s3BucketName}/${temp}`,
-        Bucket: s3BucketName,
-        Key: assets,
-    }))
-    await s3.deleteObject(event, new DeleteObjectCommand({
-        Bucket: s3BucketName,
-        Key: temp,
-    }))
 
     return {
         artifactId: artifactsId,

server/api/artifacts/upload-artifact.post.ts

@@ -25,15 +25,14 @@ export default defineEventHandler(async (event) => {
     }).then(takeUniqueOrThrow)
 
     const key = generateRandomPassword()
-    var expires = 300;
+    var expires = 500;
     const { temp } = getStorageKeys(userOrg.organizationsId!, app.id, key)
-    const limitUploadSizeMb = useRuntimeConfig(event)
     const s3 = new S3AppClient()
     const signedUrl = await s3.getSignedUrlPutObject(event, new PutObjectCommand({
         Bucket: s3BucketName,
         Key: temp,
-        ContentLength: limitUploadSizeMb.app.limitUploadSizeMb,
-    }), expires)    
+        // ContentLength: limitUploadSizeMb.app.limitUploadSizeMb,
+    }), expires)
     return {
         file: key,
         url: signedUrl,

server/api/install/download.get.ts

@@ -45,7 +45,7 @@ export default defineEventHandler(async (event) => {
     const signedUrl = await s3.getSignedUrlGetObject(event, new GetObjectCommand({
         Bucket: s3BucketName,
         Key: assets,
-        ResponseContentDisposition: `attachment; filename ="${app.name}"`
+        ResponseContentDisposition: `attachment; filename ="${app.name}${detailArtifact.extension ? `.${detailArtifact.extension}` : ''}"`,
     }), 1800)
     await sendRedirect(event, signedUrl)
 })

server/db/db.ts

@@ -5,5 +5,5 @@ import * as schema from '~/server/db/schema';
 const db = (env: any) => drizzle(createClient({
     url: env.DB_URL ?? env.NUXT_DB_URL,
     authToken: env.DB_AUTH_TOKEN ?? env.NUXT_DB_AUTH_TOKEN,
-}), { schema, logger: env.enableLogging ?? env.NUXT_APP_ENABLE_DRIZZLE_LOGGING ?? true });
+}), { schema, logger: env?.enableLogging ?? env?.NUXT_APP_ENABLE_DRIZZLE_LOGGING ?? true });
 export default db

server/db/drizzle/0010_jittery_warbird.sql

@@ -0,0 +1,2 @@
+ALTER TABLE artifacts ADD `extension` text;--> statement-breakpoint
+ALTER TABLE artifacts ADD `packageName` text;