relight-cli 0.2.0 → 0.4.0

package/src/lib/config.js

@@ -11,23 +11,55 @@ export var CLOUD_NAMES = {
   cf: "Cloudflare",
   gcp: "GCP",
   aws: "AWS",
-  slicervm: "SlicerVM",
 };
 
 export var CLOUD_IDS = Object.keys(CLOUD_NAMES);
 
+export var SERVICE_TYPES = {
+  slicervm: { layer: "compute", name: "SlicerVM" },
+  neon: { layer: "db", name: "Neon" },
+};
+
 export function getConfig() {
   if (!existsSync(CONFIG_PATH)) {
     console.error("Not authenticated. Run `relight auth` first.");
     process.exit(1);
   }
-  return JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+  var config = JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+  return migrateSlicervm(config);
+}
+
+function migrateSlicervm(config) {
+  if (config.clouds && config.clouds.slicervm) {
+    if (!config.services) config.services = {};
+    if (!config.services.slicervm) {
+      var old = config.clouds.slicervm;
+      config.services.slicervm = {
+        layer: "compute",
+        type: "slicervm",
+        ...old,
+      };
+    }
+    delete config.clouds.slicervm;
+    if (config.default_cloud === "slicervm") {
+      delete config.default_cloud;
+    }
+    saveConfig(config);
+  }
+  // Migrate old "addons" key to "services"
+  if (config.addons && !config.services) {
+    config.services = config.addons;
+    delete config.addons;
+    saveConfig(config);
+  }
+  return config;
 }
 
 export function tryGetConfig() {
   if (!existsSync(CONFIG_PATH)) return null;
   try {
-    return JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+    var config = JSON.parse(readFileSync(CONFIG_PATH, "utf-8"));
+    return migrateSlicervm(config);
   } catch {
     return null;
   }
@@ -84,15 +116,141 @@ export function resolveCloudConfig(cloudId) {
   if (cloudId === "aws") {
     return { accessKeyId: cloud.accessKeyId, secretAccessKey: cloud.secretAccessKey, region: cloud.region };
   }
-  if (cloudId === "slicervm") {
-    var slicerCfg = { hostGroup: cloud.hostGroup, baseDomain: cloud.baseDomain };
-    if (cloud.socketPath) {
-      slicerCfg.socketPath = cloud.socketPath;
+  return cloud;
+}
+
+export function getServiceConfig(name) {
+  var config = getConfig();
+  var service = config.services && config.services[name];
+  if (!service) {
+    console.error(
+      `Service '${name}' not found. Run \`relight service add\` to register it.`
+    );
+    process.exit(1);
+  }
+  return service;
+}
+
+export function tryGetServiceConfig(name) {
+  var config = tryGetConfig();
+  if (!config || !config.services) return null;
+  return config.services[name] || null;
+}
+
+export function getRegisteredServices() {
+  var config = tryGetConfig();
+  if (!config || !config.services) return [];
+  return Object.entries(config.services).map(([name, service]) => ({
+    name,
+    ...service,
+  }));
+}
+
+export function saveServiceConfig(name, data) {
+  var config = tryGetConfig() || { clouds: {} };
+  if (!config.services) config.services = {};
+  config.services[name] = data;
+  saveConfig(config);
+}
+
+export function removeServiceConfig(name) {
+  var config = tryGetConfig();
+  if (!config || !config.services) return;
+  delete config.services[name];
+  saveConfig(config);
+}
+
+export function getCloudMeta(cloudId, key) {
+  var config = tryGetConfig();
+  if (!config || !config.clouds || !config.clouds[cloudId]) return undefined;
+  var meta = config.clouds[cloudId]._meta;
+  if (!meta) return undefined;
+  return key ? meta[key] : meta;
+}
+
+export function setCloudMeta(cloudId, key, value) {
+  var config = getConfig();
+  if (!config.clouds[cloudId]._meta) config.clouds[cloudId]._meta = {};
+  if (value === undefined) {
+    delete config.clouds[cloudId]._meta[key];
+    if (Object.keys(config.clouds[cloudId]._meta).length === 0) {
+      delete config.clouds[cloudId]._meta;
+    }
+  } else {
+    config.clouds[cloudId]._meta[key] = value;
+  }
+  saveConfig(config);
+}
+
+export function getServiceMeta(serviceName, key) {
+  var config = tryGetConfig();
+  if (!config || !config.services || !config.services[serviceName]) return undefined;
+  var meta = config.services[serviceName]._meta;
+  if (!meta) return undefined;
+  return key ? meta[key] : meta;
+}
+
+export function setServiceMeta(serviceName, key, value) {
+  var config = getConfig();
+  if (!config.services || !config.services[serviceName]) {
+    throw new Error(`Service '${serviceName}' not found.`);
+  }
+  if (!config.services[serviceName]._meta) config.services[serviceName]._meta = {};
+  if (value === undefined) {
+    delete config.services[serviceName]._meta[key];
+    if (Object.keys(config.services[serviceName]._meta).length === 0) {
+      delete config.services[serviceName]._meta;
+    }
+  } else {
+    config.services[serviceName]._meta[key] = value;
+  }
+  saveConfig(config);
+}
+
+// --- Database registry ---
+
+export function getDatabaseConfig(name) {
+  var config = tryGetConfig();
+  if (!config || !config.databases) return null;
+  return config.databases[name] || null;
+}
+
+export function saveDatabaseConfig(name, data) {
+  var config = tryGetConfig() || { clouds: {} };
+  if (!config.databases) config.databases = {};
+  config.databases[name] = data;
+  saveConfig(config);
+}
+
+export function removeDatabaseConfig(name) {
+  var config = tryGetConfig();
+  if (!config || !config.databases) return;
+  delete config.databases[name];
+  saveConfig(config);
+}
+
+export function listDatabases() {
+  var config = tryGetConfig();
+  if (!config || !config.databases) return [];
+  return Object.entries(config.databases).map(([name, data]) => ({
+    name,
+    ...data,
+  }));
+}
+
+export function normalizeServiceConfig(service) {
+  if (service.type === "slicervm") {
+    var cfg = { hostGroup: service.hostGroup, baseDomain: service.baseDomain };
+    if (service.socketPath) {
+      cfg.socketPath = service.socketPath;
     } else {
-      slicerCfg.apiUrl = cloud.apiUrl;
-      slicerCfg.apiToken = cloud.token;
+      cfg.apiUrl = service.apiUrl;
+      cfg.apiToken = service.token;
     }
-    return slicerCfg;
+    return cfg;
   }
-  return cloud;
+  if (service.type === "neon") {
+    return { apiKey: service.apiKey };
+  }
+  return service;
 }

package/src/lib/link.js

@@ -14,8 +14,14 @@ export function readLink() {
   }
 }
 
-export function linkApp(name, cloud, dns, db) {
-  var data = { app: name, cloud };
+export function linkApp(name, cloud, dns, db, compute) {
+  var data = { app: name };
+  if (compute) {
+    data.compute = compute;
+  }
+  if (cloud) {
+    data.cloud = cloud;
+  }
   if (dns && dns !== cloud) data.dns = dns;
   if (db && db !== cloud) data.db = db;
   writeFileSync(LINK_FILE, YAML.stringify(data));
@@ -53,3 +59,8 @@ export function resolveDb() {
   var linked = readLink();
   return linked?.db || null;
 }
+
+export function resolveCompute() {
+  var linked = readLink();
+  return linked?.compute || null;
+}