@geode/opengeodeweb-front 10.29.0-rc.3 → 10.29.0-rc.5

package/app/utils/local/microservices.js

@@ -13,6 +13,7 @@ import { executablePath } from "./path.js";
 
 const MILLISECONDS_PER_SECOND = 1000;
 const DEFAULT_TIMEOUT_SECONDS = 45;
+const MAX_PORT_RETRIES = 1;
 
 async function runScript(
   execPath,
@@ -51,7 +52,11 @@ async function runScript(
   }
 }
 
-async function runBack(execName, execPath, args = {}) {
+function isPortInUseError(errorMessage) {
+  return /EADDRINUSE|address already in use|port already in use/iu.test(errorMessage);
+}
+
+async function runBack(execName, execPath, args = {}, attempts = 0) {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
@@ -60,44 +65,68 @@ async function runBack(execName, execPath, args = {}) {
   if (!uploadFolderPath) {
     uploadFolderPath = path.join(projectFolderPath, "uploads");
   }
-  const port = await getAvailablePort();
-  const backArgs = [
-    "--port",
-    String(port),
-    "--project_folder_path",
-    projectFolderPath,
-    "--upload_folder_path",
-    uploadFolderPath,
-    "--allowed_origins",
-    "http://localhost:*",
-    "--timeout",
-    "0",
-  ];
-  if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
-    backArgs.push("--debug");
+  try {
+    const port = await getAvailablePort();
+    const backArgs = [
+      "--port",
+      String(port),
+      "--project_folder_path",
+      projectFolderPath,
+      "--upload_folder_path",
+      uploadFolderPath,
+      "--allowed_origins",
+      "http://localhost:*",
+      "--timeout",
+      "0",
+    ];
+    if (process.env.NODE_ENV === "development" || !process.env.NODE_ENV) {
+      backArgs.push("--debug");
+    }
+    console.log("runBack", execPath, execName, backArgs);
+    await runScript(execPath, execName, backArgs, "Serving Flask app");
+    return port;
+  } catch (error) {
+    if (!isPortInUseError(error)) {
+      console.log("runBack error", error);
+      throw error;
+    }
+    if (attempts <= MAX_PORT_RETRIES) {
+      console.log("Retrying runBack on conflicting port", port);
+      const port = await runBack(execName, execPath, args, attempts + 1);
+      return port;
+    }
   }
-  console.log("runBack", execPath, execName, backArgs);
-  await runScript(execPath, execName, backArgs, "Serving Flask app");
-  return port;
 }
 
-async function runViewer(execName, execPath, args = {}) {
+async function runViewer(execName, execPath, args = {}, attempts = 0) {
   const { projectFolderPath } = args;
   if (!projectFolderPath) {
     throw new Error("projectFolderPath is required");
   }
-  const port = await getAvailablePort();
-  const viewerArgs = [
-    "--port",
-    String(port),
-    "--project_folder_path",
-    projectFolderPath,
-    "--timeout",
-    "0",
-  ];
-  console.log("runViewer", execPath, execName, viewerArgs);
-  await runScript(execPath, execName, viewerArgs, "Starting factory");
-  return port;
+  try {
+    const port = await getAvailablePort();
+    const viewerArgs = [
+      "--port",
+      String(port),
+      "--project_folder_path",
+      projectFolderPath,
+      "--timeout",
+      "0",
+    ];
+    console.log("runViewer", execPath, execName, viewerArgs);
+    await runScript(execPath, execName, viewerArgs, "Starting factory");
+    return port;
+  } catch (error) {
+    if (!isPortInUseError(error)) {
+      console.log("runBack error", error);
+      throw error;
+    }
+    if (attempts <= MAX_PORT_RETRIES) {
+      console.log("Retrying runViewer on conflicting port", port);
+      const port = await runViewer(execName, execPath, args, attempts + 1);
+      return port;
+    }
+  }
 }
 
 function addMicroserviceMetadatas(projectFolderPath, serviceObj) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geode/opengeodeweb-front",
-  "version": "10.29.0-rc.3",
+  "version": "10.29.0-rc.5",
   "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
   "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
   "bugs": {

package/server/api/app/run_cloud.js

@@ -6,7 +6,7 @@ import { GoogleAuth } from "google-auth-library";
 import { ServicesClient } from "@google-cloud/run";
 
 // Local imports
-import { artifactImages, requestConfig } from "@ogw_server/utils/cloud";
+import { artifactImage, requestConfig } from "@ogw_server/utils/cloud";
 
 export default defineEventHandler(async (event) => {
   try {
@@ -23,8 +23,8 @@ export default defineEventHandler(async (event) => {
       scopes: ["https://www.googleapis.com/auth/cloud-platform"],
     });
     const authClient = await auth.getClient();
-    const [routerImage, backImage, viewerImage] = await artifactImages(parent, authClient);
-    const request = requestConfig(parent, routerImage, backImage, viewerImage, email, projectName);
+    const image = await artifactImage(parent, authClient);
+    const request = requestConfig(parent, image, email, projectName);
     console.log({ request });
     const runClient = new ServicesClient({ authClient });
     const [operation] = await runClient.createService(request);

package/server/utils/cloud.js

@@ -5,11 +5,16 @@ import { google } from "googleapis";
 
 // Local imports
 
-async function artifactImage(registry, parent, repo) {
+async function artifactImage(parent, authClient) {
+  const projectName = process.env.PROJECT;
+  const registry = google.artifactregistry({
+    version: "v1",
+    auth: authClient,
+  });
   const branch = process.env.NETLIFY_BRANCH;
   const [_, projectId] = parent.split("/");
   const repository = `${parent}/repositories/github/packages/`;
-  const name = `${repository}${repo}/tags/${branch}`;
+  const name = `${repository}${projectName}/tags/${branch}`;
   console.log({ name });
   const response = await registry.projects.locations.repositories.packages.tags.get({
     name,
@@ -17,24 +22,11 @@ async function artifactImage(registry, parent, repo) {
   console.log({ response });
   const digest = response.data.version.split("/").pop();
   const artifactRegistry = `europe-west9-docker.pkg.dev/${projectId}/github`;
-  const image = `${artifactRegistry}/${repo}@${digest}`;
-  console.log("Found image for", repo, image);
+  const image = `${artifactRegistry}/${projectName}@${digest}`;
+  console.log("Found image for", projectName, image);
   return image;
 }
 
-function artifactImages(parent, authClient) {
-  const projectName = process.env.PROJECT;
-  const registry = google.artifactregistry({
-    version: "v1",
-    auth: authClient,
-  });
-  return Promise.all([
-    artifactImage(registry, parent, "opengeodeweb-router"),
-    artifactImage(registry, parent, `${projectName}-back`),
-    artifactImage(registry, parent, `${projectName}-viewer`),
-  ]);
-}
-
 function sanitizeLabelValue(label) {
   console.log("label", label);
   const maxLabelLength = 63;
@@ -44,47 +36,32 @@ function sanitizeLabelValue(label) {
     .slice(0, maxLabelLength);
 }
 
-// oxlint-disable-next-line max-lines-per-function
-function requestConfig(parent, routerImage, backImage, viewerImage, email, projectName) {
+function requestConfig(parent, image, email, projectName) {
   const resources = {
     limits: {
       cpu: "1000m",
       memory: "1Gi",
     },
   };
-  const volumeMounts = {
-    name: "project",
-    mountPath: "/project",
+  const labels = {
+    user: sanitizeLabelValue(email),
+    project: sanitizeLabelValue(projectName),
   };
   return {
     parent,
     service: {
       ingress: "INGRESS_TRAFFIC_ALL",
       invokerIamDisabled: true,
-      labels: {
-        user: sanitizeLabelValue(email),
-        project: sanitizeLabelValue(projectName),
-      },
+      labels,
       scaling: {
         scalingMode: "MANUAL",
         manualInstanceCount: 1,
       },
       template: {
-        labels: {
-          user: sanitizeLabelValue(email),
-          project: sanitizeLabelValue(projectId),
-        },
-        volumes: [
-          {
-            name: "project",
-            emptyDir: {
-              medium: "MEMORY",
-            },
-          },
-        ],
+        labels,
         containers: [
           {
-            image: routerImage,
+            image,
             ports: [
               {
                 containerPort: 80,
@@ -106,20 +83,10 @@ function requestConfig(parent, routerImage, backImage, viewerImage, email, proje
               failureThreshold: 30,
             },
           },
-          {
-            image: backImage,
-            resources,
-            volumeMounts: [volumeMounts],
-          },
-          {
-            image: viewerImage,
-            resources,
-            volumeMounts: [volumeMounts],
-          },
         ],
       },
     },
   };
 }
 
-export { artifactImages, requestConfig };
+export { artifactImage, requestConfig };