Refactored API internals to work with new service oriented architecture

Author: JudahGabriel

.vscode/settings.json

@@ -1,11 +1,24 @@
 {
   "editor.tabSize": 4,
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": false,
+  "editor.formatOnSave": true,
   "js/ts.implicitProjectConfig.experimentalDecorators": true,
   "typescript.tsdk": "node_modules/typescript/lib",
+  "[typescript]": {
+    "editor.tabSize": 4,
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  },
+  "typescript.preferences.quoteStyle": "double",
+  "[javascript]": {
+    "editor.tabSize": 4
+  },
   "files.saveConflictResolution": "askUser",
   "typescript.tsc.autoDetect": "on",
   "typescript.reportStyleChecksAsWarnings": true,
   "typescript.validate.enable": true,
   "javascript.validate.enable": true,
-  "sarif-viewer.connectToGithubCodeScanning": "on"
+  "sarif-viewer.connectToGithubCodeScanning": "off",
+  "csharp.format.enable": false,
+  "csharp.semanticHighlighting.enabled": true
 }

apps/pwabuilder-google-play/Dockerfile

@@ -3,6 +3,9 @@ FROM pwabuilder.azurecr.io/pwa-android-build-box:master AS base
 WORKDIR /app
 COPY . .
 
+# need to copy files in /static directory so that we can include next-steps.html in the package zip.
+COPY static/ ./static/ 
+
 ENV PORT=5858
 EXPOSE 5858
 

apps/pwabuilder-google-play/models/googlePlayPackageJob.ts

@@ -1,10 +1,12 @@
 import { AndroidPackageOptions } from "./androidPackageOptions.js";
 
-export interface GooglePlayPackagingJob {
+export interface GooglePlayPackageJob {
     id: string;
     analysisId: string;
+    status: "Queued" | "InProgress" | "Completed" | "Failed";
     createdAt: string;
     retryCount: number;
     errors: string[];
+    logs: string[];
     packageOptions: AndroidPackageOptions;
 }

apps/pwabuilder-google-play/models/packageCreationProgress.ts

@@ -0,0 +1,4 @@
+export interface PackageCreationProgress {
+    message: string;
+    level?: "info" | "warn" | "error";
+}

apps/pwabuilder-google-play/models/packageJobLogger.ts

@@ -0,0 +1,32 @@
+import { GooglePlayPackageJob } from "./googlePlayPackageJob.js";
+
+/**
+ * A logger that writes logs to a Google Play packaging job's log storage.
+ */
+export class PackageJobLogger {
+    /**
+     * Creates a new logger for the specified app package job.
+     */
+    constructor(private readonly job: GooglePlayPackageJob) {
+    }
+
+    info(message: string, ...optionalArgs: any[]): void {
+        this.log("info", message, optionalArgs);
+    }
+
+    warn(message: string, ...optionalArgs: any[]): void {
+        this.log("warn", message, optionalArgs);
+    }
+
+    error(message: string, ...optionalArgs: any[]): void {
+        this.log("error", message, optionalArgs);
+    }
+
+    private log(level: "info" | "warn" | "error", message: string, optionalArgs?: any[]): void {
+        const timestamp = new Date().toISOString();
+        const optionsArgsStr = optionalArgs ? " " + optionalArgs.map(arg => JSON.stringify(arg || "")).join(" ") : "";
+        const logEntry = `${timestamp} [${level}]: ${message}${optionsArgsStr}`;
+        this.job.logs.push(logEntry);
+        console.log(logEntry);
+    }
+}

apps/pwabuilder-google-play/package.json

@@ -9,7 +9,7 @@
     "postinstall": "tsc",
     "dev": "node --inspect=5858 --loader ts-node/esm ./server.ts",
     "build": "tsc",
-    "docker:build": "docker build -t cloud-apk .",
+    "docker:build": "npm run build && docker build -t cloud-apk .",
     "docker:run": "docker run -p 5779:5858 cloud-apk"
   },
   "repository": {