feat(Extension): allows cloud extension download

app/components/Launcher.vue

@@ -2,7 +2,7 @@
 import Loading from "@ogw_front/components/Loading";
 import Recaptcha from "@ogw_front/components/Recaptcha";
 import { Status } from "@ogw_front/utils/status";
-import { appMode } from "@ogw_front/utils/local/app_mode";
+import { appMode } from "@ogw_shared/app_mode";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
 const { appName, email, isUserAuthenticated, logo } = defineProps({

app/stores/app.js

@@ -1,13 +1,29 @@
 // Local imports
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores.js";
+import { Status } from "@ogw_front/utils/status";
 import { api_fetch } from "@ogw_internal/utils/api_fetch.js";
-import { upload_file } from "@ogw_internal/utils/upload_file.js";
-
 import { killExtension } from "@ogw_front/utils/extension.js";
+import { upload_file } from "@ogw_internal/utils/upload_file.js";
 import { useInfraStore } from "@ogw_front/stores/infra";
 
 // oxlint-disable-next-line max-lines-per-function, max-statements
 export const useAppStore = defineStore("app", () => {
   const stores = [];
+  const default_local_port = ref("3000");
+  const status = ref(Status.NOT_CONNECTED);
+
+  const protocol = computed(() => getRestApiProtocol());
+
+  const port = computed(() => getRestApiPort(default_local_port.value));
+
+  const base_url = computed(() => {
+    const infraStore = useInfraStore();
+    let app_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
+    if (isCloudMode()) {
+      app_url += `/server`;
+    }
+    return app_url;
+  });
 
   function registerStore(store) {
     const isAlreadyRegistered = stores.some((registeredStore) => registeredStore.$id === store.$id);
@@ -91,7 +107,7 @@ export const useAppStore = defineStore("app", () => {
     return loadedExtensions.value.get(id);
   }
 
-  async function loadExtension(path, port, backendPath = undefined) {
+  async function loadExtension(path, extensionPort, backendPath = undefined) {
     try {
       let finalURL = path;
 
@@ -108,7 +124,7 @@ export const useAppStore = defineStore("app", () => {
       // oxlint-disable-next-line no-inline-comments
       const extensionModule = await import(/* @vite-ignore */ finalURL);
       const store = extensionModule.metadata.store();
-      store.$patch({ default_local_port: port });
+      store.$patch({ default_local_port: extensionPort });
 
       if (finalURL !== path && finalURL.startsWith("blob:")) {
         URL.revokeObjectURL(finalURL);
@@ -196,7 +212,7 @@ export const useAppStore = defineStore("app", () => {
   }
 
   function upload(file, callbacks = {}) {
-    const route = "/api/microservice/extensions/upload";
+    const route = "/api/local/extensions/upload";
     const store = useAppStore();
     return upload_file(
       store,
@@ -239,12 +255,13 @@ export const useAppStore = defineStore("app", () => {
   function stop_request() {
     request_counter.value -= 1;
   }
+  const is_busy = computed(() => request_counter.value > 0);
 
   const projectFolderPath = ref("");
   function createProjectFolder() {
     const { PROJECT } = useRuntimeConfig().public;
     const schema = {
-      $id: "/api/local/project_folder_path",
+      $id: "/api/local/app/project_folder_path",
       methods: ["POST"],
       type: "object",
       properties: { PROJECT: { type: "string" } },
@@ -265,6 +282,13 @@ export const useAppStore = defineStore("app", () => {
 
   return {
     stores,
+    default_local_port,
+    request_counter,
+    status,
+    protocol,
+    port,
+    base_url,
+    is_busy,
     registerStore,
     exportStores,
     importStores,

app/stores/back.js

@@ -1,6 +1,6 @@
+import { getRestApiPort, getRestApiProtocol, isCloudMode } from "@ogw_front/utils/stores";
 import { Status } from "@ogw_front/utils/status";
 import { api_fetch } from "@ogw_internal/utils/api_fetch";
-import { appMode } from "@ogw_front/utils/local/app_mode";
 import back_schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json";
 import { upload_file } from "@ogw_internal/utils/upload_file.js";
 import { useAppStore } from "@ogw_front/stores/app";
@@ -19,24 +19,18 @@ export const useBackStore = defineStore("back", {
   }),
   getters: {
     protocol() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "https";
-      }
-      return "http";
+      return getRestApiProtocol();
     },
     port() {
-      if (useInfraStore().app_mode === appMode.CLOUD) {
-        return "443";
-      }
-      return this.default_local_port;
+      return getRestApiPort(this.default_local_port);
     },
     base_url() {
       const infraStore = useInfraStore();
-      let geode_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
-      if (infraStore.app_mode === appMode.CLOUD) {
-        geode_url += `/geode`;
+      let back_url = `${this.protocol}://${infraStore.domain_name}:${this.port}`;
+      if (isCloudMode()) {
+        back_url += `/geode`;
       }
-      return geode_url;
+      return back_url;
     },
     is_busy() {
       return this.request_counter > 0;
@@ -81,7 +75,7 @@ export const useBackStore = defineStore("back", {
       const appStore = useAppStore();
       const { COMMAND_BACK, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = {
-        $id: "/api/local/run_back",
+        $id: "/api/local/app/run_back",
         methods: ["POST"],
         type: "object",
         properties: {

app/stores/infra.js

@@ -1,5 +1,5 @@
 import { Status } from "@ogw_front/utils/status";
-import { appMode } from "@ogw_front/utils/local/app_mode";
+import { appMode } from "@ogw_shared/app_mode";
 import { registerRunningExtensions } from "@ogw_front/utils/extension";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useCloudStore } from "@ogw_front/stores/cloud";

app/stores/viewer.js

@@ -8,8 +8,12 @@ import { connectImageStream } from "@kitware/vtk.js/Rendering/Misc/RemoteView";
 import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json";
 
 // Local imports
+import {
+  getWebsocketApiPort,
+  getWebsocketApiProtocol,
+  isCloudMode,
+} from "@ogw_front/utils/stores.js";
 import { Status } from "@ogw_front/utils/status";
-import { appMode } from "@ogw_front/utils/local/app_mode";
 import { useAppStore } from "@ogw_front/stores/app";
 import { useInfraStore } from "@ogw_front/stores/infra";
 import { viewer_call } from "@ogw_internal/utils/viewer_call";
@@ -33,23 +37,13 @@ export const useViewerStore = defineStore(
     const version = ref("0.0.0");
     const busy = ref(0);
 
-    const protocol = computed(() => {
-      if (infraStore.app_mode === appMode.CLOUD) {
-        return "wss";
-      }
-      return "ws";
-    });
+    const protocol = computed(() => getWebsocketApiProtocol());
 
-    const port = computed(() => {
-      if (infraStore.app_mode === appMode.CLOUD) {
-        return "443";
-      }
-      return default_local_port.value;
-    });
+    const port = computed(() => getWebsocketApiPort(default_local_port.value));
 
     const base_url = computed(() => {
       let viewer_url = `${protocol.value}://${infraStore.domain_name}:${port.value}`;
-      if (infraStore.app_mode === appMode.CLOUD) {
+      if (isCloudMode()) {
         viewer_url += `/viewer`;
       }
       viewer_url += "/ws";
@@ -133,7 +127,7 @@ export const useViewerStore = defineStore(
 
       const { COMMAND_VIEWER, NUXT_ROOT_PATH } = useRuntimeConfig().public;
       const schema = {
-        $id: "/api/local/run_viewer",
+        $id: "/api/local/app/run_viewer",
         methods: ["POST"],
         type: "object",
         properties: { COMMAND_VIEWER: { type: "string" }, NUXT_ROOT_PATH: { type: "string" } },

app/utils/extension.js

@@ -12,6 +12,11 @@ async function importExtensionFile(file) {
   return registerRunningExtensions();
 }
 
+async function importExtensionURL(url) {
+  await downloadExtension(url);
+  return registerRunningExtensions();
+}
+
 async function registerRunningExtensions() {
   const appStore = useAppStore();
   const infraStore = useInfraStore();
@@ -74,6 +79,27 @@ async function uploadExtension(file) {
   await appStore.upload(file);
 }
 
+function downloadExtension({ url, extensionFileName }) {
+  const appStore = useAppStore();
+  const { PROJECT: projectName } = useRuntimeConfig().public;
+  const params = { projectName, url, extensionFileName };
+
+  const schema = {
+    $id: "/api/microservice/extensions/download",
+    methods: ["POST"],
+    type: "object",
+    properties: {
+      extensionFileName: { type: "string" },
+      projectName: { type: "string" },
+      url: { type: "string" },
+    },
+    required: ["extensionFileName", "projectName", "url"],
+    additionalProperties: false,
+  };
+
+  return appStore.request({ schema, params });
+}
+
 function runExtensions() {
   const appStore = useAppStore();
   const { projectFolderPath } = appStore;
@@ -121,9 +147,10 @@ function killExtension(extensionId) {
 
 export {
   importExtensionFile,
-  unloadExtension,
-  uploadExtension,
+  importExtensionURL,
+  killExtension,
   registerRunningExtensions,
   runExtensions,
-  killExtension,
+  unloadExtension,
+  uploadExtension,
 };

app/utils/stores.js

@@ -0,0 +1,32 @@
+import { appMode } from "@ogw_shared/app_mode";
+import { useInfraStore } from "@ogw_front/stores/infra";
+
+function isCloudMode() {
+  const infraStore = useInfraStore();
+  return infraStore.app_mode === appMode.CLOUD;
+}
+
+function getRestApiProtocol() {
+  const protocol = isCloudMode() ? "https" : "http";
+  return protocol;
+}
+function getRestApiPort(defaultLocalPort) {
+  const port = isCloudMode() ? "443" : defaultLocalPort;
+  return port;
+}
+function getWebsocketApiProtocol() {
+  const protocol = isCloudMode() ? "wss" : "ws";
+  return protocol;
+}
+function getWebsocketApiPort(defaultLocalPort) {
+  const port = isCloudMode() ? "443" : defaultLocalPort;
+  return port;
+}
+
+export {
+  isCloudMode,
+  getRestApiPort,
+  getRestApiProtocol,
+  getWebsocketApiProtocol,
+  getWebsocketApiPort,
+};

nuxt.config.js

@@ -27,8 +27,9 @@ export default defineNuxtConfig({
   alias: {
     "@ogw_front": path.resolve(__dirname, "app"),
     "@ogw_internal": path.resolve(__dirname, "internal"),
-    "@ogw_server": path.resolve(__dirname, "server"),
     "@ogw_tests": path.resolve(__dirname, "tests"),
+    "@ogw_shared": path.resolve(__dirname, "shared"),
+    "@ogw_server": path.resolve(__dirname, "server"),
   },
 
   // ** Global CSS

server/api/local/project_folder_path.post.js → server/api/local/app/project_folder_path.post.js

@@ -7,7 +7,7 @@ import { createError, defineEventHandler, readBody } from "h3";
 import {
   createPath,
   generateProjectFolderPath,
-} from "@geode/opengeodeweb-front/app/utils/local/path.js";
+} from "@geode/opengeodeweb-front/server/utils/path.js";
 
 export default defineEventHandler(async (event) => {
   try {

server/api/local/run_back.post.js → server/api/local/app/run_back.post.js

@@ -7,7 +7,7 @@ import { createError, defineEventHandler, readBody } from "h3";
 import {
   addMicroserviceMetadatas,
   runBack,
-} from "@geode/opengeodeweb-front/app/utils/local/microservices.js";
+} from "@geode/opengeodeweb-front/server/utils/microservices.js";
 
 export default defineEventHandler(async (event) => {
   try {

server/api/local/run_viewer.post.js → server/api/local/app/run_viewer.post.js

@@ -7,7 +7,7 @@ import { createError, defineEventHandler, readBody } from "h3";
 import {
   addMicroserviceMetadatas,
   runViewer,
-} from "@geode/opengeodeweb-front/app/utils/local/microservices.js";
+} from "@geode/opengeodeweb-front/server/utils/microservices.js";
 
 export default defineEventHandler(async (event) => {
   try {