@hagicode/hagiscript 0.1.6-dev.39.1.abb22ea → 0.1.6-dev.40.1.34b860c

package/dist/runtime/runtime-paths.js

@@ -3,18 +3,24 @@ import { isAbsolute, join, relative, resolve } from "node:path";
 export const defaultRuntimeRoot = "~/.hagicode/runtime";
 export function resolveRuntimePaths(manifest, options = {}) {
     const root = normalizeManagedRoot(options.runtimeRoot ?? manifest.paths.runtimeRoot ?? defaultRuntimeRoot);
+    const runtimeHome = resolveManagedPath(manifest.paths.runtimeHome, root);
+    const runtimeDataRoot = resolveManagedPath(manifest.paths.runtimeDataRoot, root);
     return {
         root,
-        bin: resolveManagedPath(manifest.paths.bin, root),
-        config: resolveManagedPath(manifest.paths.config, root),
-        logs: resolveManagedPath(manifest.paths.logs, root),
-        data: resolveManagedPath(manifest.paths.data, root),
-        stateFile: resolveManagedPath(manifest.paths.stateFile, root),
-        componentsRoot: resolveManagedPath(manifest.paths.componentsRoot, root),
-        npmPrefix: resolveManagedPath(manifest.paths.npmPrefix, root),
-        nodeRuntime: resolveManagedPath(manifest.paths.nodeRuntime, root),
-        dotnetRuntime: resolveManagedPath(manifest.paths.dotnetRuntime, root),
-        vendoredRoot: resolveManagedPath(manifest.paths.vendoredRoot, root)
+        runtimeHome,
+        runtimeDataRoot,
+        bin: resolveManagedPath(manifest.paths.bin, runtimeHome),
+        config: resolveManagedPath(manifest.paths.config, runtimeDataRoot),
+        logs: resolveManagedPath(manifest.paths.logs, runtimeDataRoot),
+        data: resolveManagedPath(manifest.paths.data, runtimeDataRoot),
+        stateFile: resolveManagedPath(manifest.paths.stateFile, runtimeDataRoot),
+        componentsRoot: resolveManagedPath(manifest.paths.componentsRoot, runtimeHome),
+        componentDataRoot: resolveManagedPath(manifest.paths.componentDataRoot, runtimeDataRoot),
+        defaultPm2Home: manifest.paths.defaultPm2Home,
+        npmPrefix: resolveManagedPath(manifest.paths.npmPrefix, runtimeHome),
+        nodeRuntime: resolveManagedPath(manifest.paths.nodeRuntime, runtimeHome),
+        dotnetRuntime: resolveManagedPath(manifest.paths.dotnetRuntime, runtimeHome),
+        vendoredRoot: resolveManagedPath(manifest.paths.vendoredRoot, runtimeHome)
     };
 }
 export function normalizeManagedRoot(value) {
@@ -43,8 +49,17 @@ export function getComponentManagedRoot(paths, componentName) {
             return join(paths.componentsRoot, componentName);
     }
 }
-export function getComponentConfigDirectory(paths, componentName) {
-    return join(paths.config, componentName);
+export function getComponentConfigDirectory(paths, componentName, runtimeDataDir) {
+    return join(getComponentRuntimeDataHome(paths, componentName, runtimeDataDir), "config");
+}
+export function getComponentLogsDirectory(paths, componentName, runtimeDataDir) {
+    return join(getComponentRuntimeDataHome(paths, componentName, runtimeDataDir), "logs");
+}
+export function getComponentRuntimeDataHome(paths, componentName, runtimeDataDir) {
+    return resolveManagedPath(runtimeDataDir ?? componentName, paths.componentDataRoot);
+}
+export function getComponentPm2Home(paths, componentName, runtimeDataDir, pm2Home) {
+    return resolveManagedPath(pm2Home ?? paths.defaultPm2Home, getComponentRuntimeDataHome(paths, componentName, runtimeDataDir));
 }
 export function isPathInsideRuntimeRoot(runtimeRoot, targetPath) {
     const relativePath = relative(resolve(runtimeRoot), resolve(targetPath));

package/dist/runtime/runtime-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-paths.js","sourceRoot":"","sources":["../../src/runtime/runtime-paths.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-paths.js","sourceRoot":"","sources":["../../src/runtime/runtime-paths.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hagicode/hagiscript",
-  "version": "0.1.6-dev.39.1.abb22ea",
+  "version": "0.1.6-dev.40.1.34b860c",
   "description": "Scoped npm package foundation for Hagiscript language tooling.",
   "license": "MIT",
   "homepage": "https://github.com/HagiCode-org/hagiscript#readme",

package/runtime/lib/runtime-script-lib.mjs

@@ -1,10 +1,12 @@
-import { mkdir, readFile, writeFile } from "node:fs/promises"
+import { chmod, mkdir, readFile, writeFile } from "node:fs/promises"
 import path from "node:path"
 import process from "node:process"
 
 export function readRuntimeScriptContext() {
   return {
     runtimeRoot: requiredEnv("HAGISCRIPT_RUNTIME_ROOT"),
+    runtimeHome: requiredEnv("HAGICODE_RUNTIME_HOME"),
+    runtimeDataHome: requiredEnv("HAGICODE_RUNTIME_DATA_HOME"),
     binDir: requiredEnv("HAGISCRIPT_RUNTIME_BIN_DIR"),
     configDir: requiredEnv("HAGISCRIPT_RUNTIME_CONFIG_DIR"),
     logsDir: requiredEnv("HAGISCRIPT_RUNTIME_LOGS_DIR"),
@@ -14,6 +16,9 @@ export function readRuntimeScriptContext() {
     componentType: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_TYPE"),
     componentRoot: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_ROOT"),
     componentConfigDir: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_CONFIG_DIR"),
+    componentDataDir: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_DATA_DIR"),
+    componentLogsDir: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_LOGS_DIR"),
+    componentPm2Home: requiredEnv("HAGISCRIPT_RUNTIME_COMPONENT_PM2_HOME"),
     templateDir: requiredEnv("HAGISCRIPT_RUNTIME_TEMPLATE_DIR"),
     componentVersion: process.env.HAGISCRIPT_RUNTIME_COMPONENT_VERSION?.trim() || null,
     phase: process.env.HAGISCRIPT_RUNTIME_PHASE?.trim() || "install",
@@ -65,6 +70,31 @@ export async function writeNodeEntrypoint(filePath, message) {
     `#!/usr/bin/env node\nprocess.stdout.write(${JSON.stringify(message)} + "\\n")\n`,
     "utf8"
   )
+  await makeExecutable(filePath)
+  return filePath
+}
+
+export async function writeManagedServiceEntrypoint(filePath, serviceName) {
+  await ensureDirectory(path.dirname(filePath))
+  await writeFile(
+    filePath,
+    `#!/usr/bin/env node
+const serviceName = ${JSON.stringify(serviceName)}
+process.stdout.write(serviceName + " ready\\n")
+const timer = setInterval(() => {
+  process.stdout.write("")
+}, 60_000)
+const shutdown = (signal) => {
+  clearInterval(timer)
+  process.stdout.write(serviceName + " shutting down via " + signal + "\\n")
+  process.exit(0)
+}
+process.on("SIGINT", () => shutdown("SIGINT"))
+process.on("SIGTERM", () => shutdown("SIGTERM"))
+`,
+    "utf8"
+  )
+  await makeExecutable(filePath)
   return filePath
 }
 
@@ -89,6 +119,7 @@ export async function writeCommandWrapper(binDir, commandName, scriptPath) {
     `#!/usr/bin/env sh\nexec node "$(dirname "$0")/${relativeTarget}" "$@"\n`,
     "utf8"
   )
+  await makeExecutable(wrapperPath)
   return wrapperPath
 }
 
@@ -101,3 +132,11 @@ function requiredEnv(name) {
 
   return value
 }
+
+async function makeExecutable(filePath) {
+  if (process.platform === "win32") {
+    return
+  }
+
+  await chmod(filePath, 0o755)
+}

package/runtime/manifest.yaml

@@ -4,13 +4,17 @@ runtime:
 
 paths:
   runtimeRoot: "~/.hagicode/runtime"
+  runtimeHome: "program"
+  runtimeDataRoot: "runtime-data"
   bin: "bin"
   config: "config"
   logs: "logs"
   data: "data"
   stateFile: "state.json"
   componentsRoot: "components"
-  npmPrefix: "data/npm"
+  componentDataRoot: "components"
+  defaultPm2Home: "pm2"
+  npmPrefix: "npm"
   nodeRuntime: "components/node/runtime"
   dotnetRuntime: "components/dotnet/runtime"
   vendoredRoot: "components/bundled"
@@ -88,15 +92,25 @@ components:
     type: "bundled-runtime"
     source: "desktop-vendored-runtime"
     version: "3.6.9"
+    runtimeDataDir: "services/omniroute"
     installScript: "scripts/install-omniroute.mjs"
     configureScript: "scripts/configure-omniroute.mjs"
+    pm2:
+      appName: "hagicode-omniroute"
+      cwd: "."
+      script: "current/omniroute-launcher.mjs"
 
   - name: "code-server"
     type: "bundled-runtime"
     source: "desktop-vendored-runtime"
     version: "4.117.0"
+    runtimeDataDir: "services/code-server"
     installScript: "scripts/install-code-server.mjs"
     configureScript: "scripts/configure-code-server.mjs"
+    pm2:
+      appName: "hagicode-code-server"
+      cwd: "."
+      script: "current/code-server-launcher.mjs"
 
 phases:
   install:

package/runtime/scripts/configure-code-server.mjs

@@ -9,6 +9,6 @@ import {
 const context = readRuntimeScriptContext()
 const configPath = path.join(context.componentConfigDir, "config.yaml")
 await materializeTemplate("code-server-config.yaml", configPath, {
-  DATA_DIR: context.dataDir
+  DATA_DIR: context.runtimeDataHome
 })
 process.stdout.write(`Configured code-server template at ${configPath}\n`)

package/runtime/scripts/configure-omniroute.mjs

@@ -9,8 +9,8 @@ import {
 const context = readRuntimeScriptContext()
 const configPath = path.join(context.componentConfigDir, "config.yaml")
 await materializeTemplate("omniroute-config.yaml", configPath, {
-  RUNTIME_ROOT: context.runtimeRoot,
-  DATA_DIR: context.dataDir,
-  LOGS_DIR: context.logsDir
+  RUNTIME_ROOT: context.runtimeHome,
+  DATA_DIR: context.runtimeDataHome,
+  LOGS_DIR: context.componentLogsDir
 })
 process.stdout.write(`Configured omniroute template at ${configPath}\n`)

package/runtime/scripts/install-code-server.mjs

@@ -7,7 +7,7 @@ import {
   readRuntimeScriptContext,
   writeCommandWrapper,
   writeComponentMarker,
-  writeNodeEntrypoint
+  writeManagedServiceEntrypoint
 } from "../lib/runtime-script-lib.mjs"
 
 const context = readRuntimeScriptContext()
@@ -17,16 +17,19 @@ const configPath = path.join(context.componentConfigDir, "config.yaml")
 
 await ensureDirectory(currentRoot)
 await materializeTemplate("code-server-config.yaml", configPath, {
-  DATA_DIR: context.dataDir
+  DATA_DIR: context.runtimeDataHome
 })
-await writeNodeEntrypoint(
+await writeManagedServiceEntrypoint(
   launcherPath,
-  `code-server placeholder managed by hagiscript at ${context.runtimeRoot}`
+  "code-server"
 )
 await writeCommandWrapper(context.binDir, "code-server", launcherPath)
 await writeComponentMarker(context, {
   configPath,
   launcherPath,
+  runtimeHome: context.runtimeHome,
+  runtimeDataHome: context.runtimeDataHome,
+  pm2Home: context.componentPm2Home,
   ownership: "vendored-runtime"
 })
 process.stdout.write(`Prepared code-server assets in ${currentRoot}\n`)

package/runtime/scripts/install-omniroute.mjs

@@ -7,7 +7,7 @@ import {
   readRuntimeScriptContext,
   writeCommandWrapper,
   writeComponentMarker,
-  writeNodeEntrypoint
+  writeManagedServiceEntrypoint
 } from "../lib/runtime-script-lib.mjs"
 
 const context = readRuntimeScriptContext()
@@ -17,18 +17,21 @@ const configPath = path.join(context.componentConfigDir, "config.yaml")
 
 await ensureDirectory(currentRoot)
 await materializeTemplate("omniroute-config.yaml", configPath, {
-  RUNTIME_ROOT: context.runtimeRoot,
-  DATA_DIR: context.dataDir,
-  LOGS_DIR: context.logsDir
+  RUNTIME_ROOT: context.runtimeHome,
+  DATA_DIR: context.runtimeDataHome,
+  LOGS_DIR: context.componentLogsDir
 })
-await writeNodeEntrypoint(
+await writeManagedServiceEntrypoint(
   launcherPath,
-  `omniroute placeholder managed by hagiscript at ${context.runtimeRoot}`
+  "omniroute"
 )
 await writeCommandWrapper(context.binDir, "omniroute", launcherPath)
 await writeComponentMarker(context, {
   configPath,
   launcherPath,
+  runtimeHome: context.runtimeHome,
+  runtimeDataHome: context.runtimeDataHome,
+  pm2Home: context.componentPm2Home,
   ownership: "vendored-runtime"
 })
 process.stdout.write(`Prepared omniroute assets in ${currentRoot}\n`)

package/runtime/templates/code-server-config.yaml

@@ -1,5 +1,5 @@
 bind-addr: 127.0.0.1:8080
 auth: none
-user-data-dir: "{{DATA_DIR}}/code-server"
-extensions-dir: "{{DATA_DIR}}/code-server/extensions"
+user-data-dir: "{{DATA_DIR}}"
+extensions-dir: "{{DATA_DIR}}/extensions"
 log: info

package/runtime/templates/omniroute-config.yaml

@@ -1,4 +1,4 @@
-runtimeRoot: "{{RUNTIME_ROOT}}"
+runtimeHome: "{{RUNTIME_ROOT}}"
 listen: "127.0.0.1:39001"
-dataDir: "{{DATA_DIR}}/omniroute"
-logDir: "{{LOGS_DIR}}/omniroute"
+dataDir: "{{DATA_DIR}}"
+logDir: "{{LOGS_DIR}}"