@geode/opengeodeweb-front 10.33.3 → 10.33.4-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +3 -3
  2. package/server/utils/path.js +9 -11
  3. package/server/utils/scripts.js +18 -11
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geode/opengeodeweb-front",
3
- "version": "10.33.3",
3
+ "version": "10.33.4-rc.2",
4
4
  "description": "OpenSource Vue/Nuxt/Pinia/Vuetify framework for web applications",
5
5
  "homepage": "https://github.com/Geode-solutions/OpenGeodeWeb-Front",
6
6
  "bugs": {
@@ -39,8 +39,8 @@
39
39
  "build": ""
40
40
  },
41
41
  "dependencies": {
42
- "@geode/opengeodeweb-back": "latest",
43
- "@geode/opengeodeweb-viewer": "latest",
42
+ "@geode/opengeodeweb-back": "next",
43
+ "@geode/opengeodeweb-viewer": "next",
44
44
  "@google-cloud/run": "3.2.0",
45
45
  "@kitware/vtk.js": "33.3.0",
46
46
  "@mdi/font": "7.4.47",
package/server/utils/path.js CHANGED
@@ -38,13 +38,14 @@ function executablePath(execPath, execName) {
38
38
  const resourcesPath = process.env.RESOURCES_PATH;
39
39
  const mode = process.env.MODE;
40
40
  const nodeEnv = process.env.NODE_ENV;
41
- console.log("[executablePath]", {
42
- execPath,
43
- execName,
44
- mode,
45
- nodeEnv,
46
- resourcesPath,
47
- });
41
+
42
+ console.log("[executablePath]", { execPath, execName, mode, nodeEnv, resourcesPath });
43
+
44
+ if (commandExistsSync(osExecutableName)) {
45
+ console.log(`[executablePath] Found executable in PATH: ${osExecutableName}`);
46
+ return osExecutableName;
47
+ }
48
+
48
49
  const foundAtExecPath = findExecutableInDir(execPath, execName, osExecutableName);
49
50
  if (foundAtExecPath) {
50
51
  return foundAtExecPath;
@@ -58,10 +59,7 @@ function executablePath(execPath, execName) {
58
59
  `Executable not found in execPath (${execPath}) or resourcesPath (${resourcesPath}): ${osExecutableName}`,
59
60
  );
60
61
  }
61
- if (commandExistsSync(osExecutableName)) {
62
- console.log(`[executablePath] Found executable in PATH: ${osExecutableName}`);
63
- return osExecutableName;
64
- }
62
+
65
63
  throw new Error(`Executable not found: ${osExecutableName}`);
66
64
  }
67
65
  function createPath(dirPath) {
package/server/utils/scripts.js CHANGED
@@ -83,27 +83,34 @@ function waitForReady(child, expectedResponse, signal) {
83
83
  }
84
84
  }
85
85
 
86
+ function becomeReady() {
87
+ cleanup();
88
+ readlineStdout.on("line", (line) => {
89
+ console.log(`[${child.name}] ${line}`);
90
+ });
91
+ readlineStderr.on("line", (line) => {
92
+ console.log(`[${child.name}] ${line}`);
93
+ });
94
+ child.once("close", (code) => {
95
+ console.log(`[${child.name}] exited with code ${code}`);
96
+ });
97
+ resolve(child);
98
+ }
99
+
86
100
  onLine = (lineOutput) => {
87
101
  console.log(`[${child.name}] ${lineOutput}`);
88
102
  recordOutput(lineOutput);
89
103
  if (lineOutput.includes(expectedResponse)) {
90
- cleanup();
91
- readlineStdout.on("line", (line) => {
92
- console.log(`[${child.name}] ${line}`);
93
- });
94
- readlineStderr.on("line", (line) => {
95
- console.log(`[${child.name}] ${line}`);
96
- });
97
- child.once("close", (code) => {
98
- console.log(`[${child.name}] exited with code ${code}`);
99
- });
100
- resolve(child);
104
+ becomeReady();
101
105
  }
102
106
  };
103
107
 
104
108
  onErrLine = (line) => {
105
109
  console.log(`[${child.name}] ${line}`);
106
110
  recordOutput(line);
111
+ if (line.includes(expectedResponse)) {
112
+ becomeReady();
113
+ }
107
114
  };
108
115
 
109
116
  onError = (err) => {