@cyberismo/backend 1.1.0 → 1.1.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.
- package/dist/app.js +3 -4
- package/dist/app.js.map +1 -1
- package/dist/main.js +2 -4
- package/dist/main.js.map +1 -1
- package/dist/public/THIRD-PARTY.txt +1 -1
- package/dist/public/assets/index-Y8Ckwau7.js +447 -0
- package/dist/public/index.html +1 -1
- package/dist/utils.d.ts +4 -0
- package/dist/utils.js +6 -0
- package/dist/utils.js.map +1 -1
- package/package.json +4 -4
- package/src/app.ts +3 -4
- package/src/main.ts +5 -4
- package/src/utils.ts +10 -0
- package/dist/public/assets/index-H1CkT-JT.js +0 -447
package/dist/public/index.html
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
name="msapplication-TileImage"
|
|
16
16
|
content="/cropped-favicon-270x270.png"
|
|
17
17
|
/>
|
|
18
|
-
<script type="module" crossorigin src="/assets/index-
|
|
18
|
+
<script type="module" crossorigin src="/assets/index-Y8Ckwau7.js"></script>
|
|
19
19
|
<link rel="modulepreload" crossorigin href="/assets/dist-BzwexiH1.js">
|
|
20
20
|
<link rel="modulepreload" crossorigin href="/assets/chunk-Y2CYZVJY-DsF7k-Jl.js">
|
|
21
21
|
<link rel="modulepreload" crossorigin href="/assets/src-DOh7_en_.js">
|
package/dist/utils.d.ts
CHANGED
|
@@ -9,3 +9,7 @@ export declare const staticFrontendDirRelative: string;
|
|
|
9
9
|
* @returns The free port.
|
|
10
10
|
*/
|
|
11
11
|
export declare function findFreePort(minPort: number, maxPort: number): Promise<number>;
|
|
12
|
+
export declare function gitOptionsFromEnv(): {
|
|
13
|
+
autocommit: boolean;
|
|
14
|
+
autopush: boolean;
|
|
15
|
+
};
|
package/dist/utils.js
CHANGED
|
@@ -54,4 +54,10 @@ function testPort(port) {
|
|
|
54
54
|
}, 2000);
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
+
export function gitOptionsFromEnv() {
|
|
58
|
+
return {
|
|
59
|
+
autocommit: process.env.CYBERISMO_AUTOCOMMIT === 'true',
|
|
60
|
+
autopush: process.env.CYBERISMO_AUTOPUSH === 'true',
|
|
61
|
+
};
|
|
62
|
+
}
|
|
57
63
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AACF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,QAAQ,CACpD,OAAO,CAAC,GAAG,EAAE,EACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC5C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,OAAe;IAEf,KAAK,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClB,OAAO,CAAC,CAAC;QACX,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;QAC7D,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;EAWE;AACF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;GAEG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,IAAI,CAAC,QAAQ,CACpD,OAAO,CAAC,GAAG,EAAE,EACb,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAC5C,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,OAAe,EACf,OAAe;IAEf,KAAK,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClB,OAAO,CAAC,CAAC;QACX,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC/D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,yCAAyC,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,CAAC;YACZ,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YACvB,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;QAC7D,CAAC,EAAE,IAAI,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB;IAI/B,OAAO;QACL,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM;QACvD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM;KACpD,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cyberismo/backend",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.2",
|
|
4
4
|
"description": "Express backend for Cyberismo",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"keywords": [],
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"jose": "^6.2.5",
|
|
28
28
|
"mime-types": "^3.0.2",
|
|
29
29
|
"zod": "^4.3.6",
|
|
30
|
-
"@cyberismo/assets": "1.1.
|
|
31
|
-
"@cyberismo/data-handler": "1.1.
|
|
32
|
-
"@cyberismo/mcp": "1.1.
|
|
30
|
+
"@cyberismo/assets": "1.1.2",
|
|
31
|
+
"@cyberismo/data-handler": "1.1.2",
|
|
32
|
+
"@cyberismo/mcp": "1.1.2"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@cyberismo/app": "0.0.2"
|
package/src/app.ts
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
12
12
|
*/
|
|
13
13
|
import { Hono, type MiddlewareHandler } from 'hono';
|
|
14
|
-
import { staticFrontendDirRelative } from './utils.js';
|
|
14
|
+
import { gitOptionsFromEnv, staticFrontendDirRelative } from './utils.js';
|
|
15
15
|
import { serveStatic } from '@hono/node-server/serve-static';
|
|
16
16
|
import { attachProjectRegistry } from './middleware/commandManager.js';
|
|
17
17
|
import calculationsRouter from './domain/calculations/index.js';
|
|
@@ -163,7 +163,6 @@ export function createApp(
|
|
|
163
163
|
}
|
|
164
164
|
await fs.rm(resolvedProject, { recursive: true, force: true });
|
|
165
165
|
await fs.cp(goldenPath, resolvedProject, { recursive: true });
|
|
166
|
-
const autocommit = process.env.CYBERISMO_AUTOCOMMIT === 'true';
|
|
167
166
|
const projects = await scanForProjects(resolvedProject);
|
|
168
167
|
|
|
169
168
|
if (projects.length === 0) {
|
|
@@ -176,7 +175,7 @@ export function createApp(
|
|
|
176
175
|
}
|
|
177
176
|
const entries = [];
|
|
178
177
|
for (const project of projects) {
|
|
179
|
-
const commands = new CommandManager(project.path,
|
|
178
|
+
const commands = new CommandManager(project.path, gitOptionsFromEnv());
|
|
180
179
|
await commands.initialize();
|
|
181
180
|
entries.push({ prefix: project.prefix, commands });
|
|
182
181
|
}
|
|
@@ -189,7 +188,7 @@ export function createApp(
|
|
|
189
188
|
if (!multiProjectRoot) return c.json({ publicKey: null });
|
|
190
189
|
try {
|
|
191
190
|
const content = await readFile(
|
|
192
|
-
join(multiProjectRoot, '.
|
|
191
|
+
join(multiProjectRoot, '.keyholder', 'id_rsa.pub'),
|
|
193
192
|
'utf-8',
|
|
194
193
|
);
|
|
195
194
|
return c.json({ publicKey: content.trim() });
|
package/src/main.ts
CHANGED
|
@@ -17,6 +17,7 @@ import { MockAuthProvider } from './auth/mock.js';
|
|
|
17
17
|
import { KeycloakAuthProvider } from './auth/keycloak.js';
|
|
18
18
|
import type { AuthProvider } from './auth/types.js';
|
|
19
19
|
import { ProjectRegistry } from './project-registry.js';
|
|
20
|
+
import { gitOptionsFromEnv } from './utils.js';
|
|
20
21
|
import { parseArgs } from 'node:util';
|
|
21
22
|
import dotenv from 'dotenv';
|
|
22
23
|
|
|
@@ -91,10 +92,10 @@ if (args.export) {
|
|
|
91
92
|
: undefined,
|
|
92
93
|
});
|
|
93
94
|
} else {
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
95
|
+
const registry = await ProjectRegistry.fromScannedProjects(
|
|
96
|
+
projects,
|
|
97
|
+
gitOptionsFromEnv(),
|
|
98
|
+
);
|
|
98
99
|
const authProvider = createAuthProvider();
|
|
99
100
|
await startServer(authProvider, registry, true, projectPath);
|
|
100
101
|
}
|
package/src/utils.ts
CHANGED
|
@@ -61,3 +61,13 @@ function testPort(port: number) {
|
|
|
61
61
|
}, 2000);
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
|
+
|
|
65
|
+
export function gitOptionsFromEnv(): {
|
|
66
|
+
autocommit: boolean;
|
|
67
|
+
autopush: boolean;
|
|
68
|
+
} {
|
|
69
|
+
return {
|
|
70
|
+
autocommit: process.env.CYBERISMO_AUTOCOMMIT === 'true',
|
|
71
|
+
autopush: process.env.CYBERISMO_AUTOPUSH === 'true',
|
|
72
|
+
};
|
|
73
|
+
}
|