@cyberismo/backend 1.1.1 → 1.1.2

package/dist/public/index.html

@@ -15,7 +15,7 @@
       name="msapplication-TileImage"
       content="/cropped-favicon-270x270.png"
     />
-    <script type="module" crossorigin src="/assets/index-H1CkT-JT.js"></script>
+    <script type="module" crossorigin src="/assets/index-Y8Ckwau7.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/dist-BzwexiH1.js">
     <link rel="modulepreload" crossorigin href="/assets/chunk-Y2CYZVJY-DsF7k-Jl.js">
     <link rel="modulepreload" crossorigin href="/assets/src-DOh7_en_.js">

package/dist/utils.d.ts

@@ -9,3 +9,7 @@ export declare const staticFrontendDirRelative: string;
  * @returns The free port.
  */
 export declare function findFreePort(minPort: number, maxPort: number): Promise<number>;
+export declare function gitOptionsFromEnv(): {
+    autocommit: boolean;
+    autopush: boolean;
+};

package/dist/utils.js

@@ -54,4 +54,10 @@ function testPort(port) {
         }, 2000);
     });
 }
+export function gitOptionsFromEnv() {
+    return {
+        autocommit: process.env.CYBERISMO_AUTOCOMMIT === 'true',
+        autopush: process.env.CYBERISMO_AUTOPUSH === 'true',
+    };
+}
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "@cyberismo/backend",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Express backend for Cyberismo",
   "main": "dist/index.js",
   "keywords": [],
@@ -27,9 +27,9 @@
     "jose": "^6.2.5",
     "mime-types": "^3.0.2",
     "zod": "^4.3.6",
-    "@cyberismo/assets": "1.1.1",
-    "@cyberismo/data-handler": "1.1.1",
-    "@cyberismo/mcp": "1.1.1"
+    "@cyberismo/assets": "1.1.2",
+    "@cyberismo/data-handler": "1.1.2",
+    "@cyberismo/mcp": "1.1.2"
   },
   "devDependencies": {
     "@cyberismo/app": "0.0.2"

package/src/app.ts

@@ -11,7 +11,7 @@
   License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
 import { Hono, type MiddlewareHandler } from 'hono';
-import { staticFrontendDirRelative } from './utils.js';
+import { gitOptionsFromEnv, staticFrontendDirRelative } from './utils.js';
 import { serveStatic } from '@hono/node-server/serve-static';
 import { attachProjectRegistry } from './middleware/commandManager.js';
 import calculationsRouter from './domain/calculations/index.js';
@@ -163,7 +163,6 @@ export function createApp(
       }
       await fs.rm(resolvedProject, { recursive: true, force: true });
       await fs.cp(goldenPath, resolvedProject, { recursive: true });
-      const autocommit = process.env.CYBERISMO_AUTOCOMMIT === 'true';
       const projects = await scanForProjects(resolvedProject);
 
       if (projects.length === 0) {
@@ -176,7 +175,7 @@ export function createApp(
       }
       const entries = [];
       for (const project of projects) {
-        const commands = new CommandManager(project.path, { autocommit });
+        const commands = new CommandManager(project.path, gitOptionsFromEnv());
         await commands.initialize();
         entries.push({ prefix: project.prefix, commands });
       }
@@ -189,7 +188,7 @@ export function createApp(
     if (!multiProjectRoot) return c.json({ publicKey: null });
     try {
       const content = await readFile(
-        join(multiProjectRoot, '.git-service', 'id_rsa.pub'),
+        join(multiProjectRoot, '.keyholder', 'id_rsa.pub'),
         'utf-8',
       );
       return c.json({ publicKey: content.trim() });

package/src/main.ts

@@ -17,6 +17,7 @@ import { MockAuthProvider } from './auth/mock.js';
 import { KeycloakAuthProvider } from './auth/keycloak.js';
 import type { AuthProvider } from './auth/types.js';
 import { ProjectRegistry } from './project-registry.js';
+import { gitOptionsFromEnv } from './utils.js';
 import { parseArgs } from 'node:util';
 import dotenv from 'dotenv';
 
@@ -91,10 +92,10 @@ if (args.export) {
         : undefined,
   });
 } else {
-  const autocommit = process.env.CYBERISMO_AUTOCOMMIT === 'true';
-  const registry = await ProjectRegistry.fromScannedProjects(projects, {
-    autocommit,
-  });
+  const registry = await ProjectRegistry.fromScannedProjects(
+    projects,
+    gitOptionsFromEnv(),
+  );
   const authProvider = createAuthProvider();
   await startServer(authProvider, registry, true, projectPath);
 }

package/src/utils.ts

@@ -61,3 +61,13 @@ function testPort(port: number) {
     }, 2000);
   });
 }
+
+export function gitOptionsFromEnv(): {
+  autocommit: boolean;
+  autopush: boolean;
+} {
+  return {
+    autocommit: process.env.CYBERISMO_AUTOCOMMIT === 'true',
+    autopush: process.env.CYBERISMO_AUTOPUSH === 'true',
+  };
+}