@swizzyweb/swerve 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "swizzy-swerve is a bootstrapper for swizzy web services. This package will bootstrap and run independent swizzy web services.",
   "main": "dist/index.js",
   "type": "module",
@@ -37,10 +37,10 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@swizzyweb/express-unuse": "^1.0.1",
-    "@swizzyweb/swerve-manager": "^0.3.1",
+    "@swizzyweb/swerve": "^0.6.2",
+    "@swizzyweb/swerve-manager": "^0.3.4",
     "@swizzyweb/swizzy-common": "^0.3.3",
-    "@swizzyweb/swizzy-web-service": "^0.6.1",
+    "@swizzyweb/swizzy-web-service": "^0.6.2",
     "bun": "^1.2.22",
     "deno": "^2.5.2"
   },

package/dist/bootstrapDeno.ts

@@ -1,4 +0,0 @@
-#!/usr/bin/env deno
-import { run } from "./main.ts";
-
-run();

package/dist/bootstrapDenoCluster.ts

@@ -1,39 +0,0 @@
-#!/usr/bin/env deno
-
-import cluster from "node:cluster";
-import http from "node:http";
-import os from "node:os";
-import { run } from "./main.js";
-import process from "node:process";
-import { BrowserLogger } from "@swizzyweb/swizzy-common";
-import { getArgs } from "npm:@swizzyweb/swerve-manager";
-
-async function exec() {
-  const args = await getArgs(process.argv, new BrowserLogger());
-
-  const numThreads = args.serviceArgs?.numThreads ?? os.availableParallelism();
-  if (cluster.isPrimary) {
-    console.log(`Primary ${process.pid} is running`);
-    console.log(`forking ${numThreads} threads`);
-    // Fork workers.
-    for (let i = 0; i < numThreads; i++) {
-      cluster.fork();
-    }
-
-    cluster.on("exit", (worker, code, signal) => {
-      console.log(`worker ${worker.process.pid} died`);
-    });
-  } else {
-    // Workers can share any TCP connection
-    // In this case it is an HTTP server
-    /*  http
-    .createServer((req, res) => {
-      res.writeHead(200);
-      res.end("hello world\n");
-    })
-    .listen(8000);*/
-    run();
-    console.log(`Worker ${process.pid} started`);
-  }
-}
-exec();

package/dist/config/config-parser.d.ts

@@ -1,17 +0,0 @@
-import { IConfig } from "./config.js";
-export interface IAsyncConfigParser<CONFIG> {
-    parse(path: string): Promise<CONFIG>;
-}
-export interface ISwerveConfigException {
-    message: string;
-    stack: any;
-}
-export declare class SwerveConfigException implements ISwerveConfigException {
-    message: string;
-    stack: any;
-    constructor(message: string);
-}
-export declare class SwerveConfigParser implements IAsyncConfigParser<IConfig> {
-    parse(configPath: string): Promise<IConfig>;
-    validateConfig(config: any): void;
-}

package/dist/config/config-parser.js

@@ -1,43 +0,0 @@
-import { readFile } from "fs/promises";
-import path from "path";
-export class SwerveConfigException {
-    message;
-    stack;
-    constructor(message) {
-        this.message = message;
-        this.stack = new Error(message).stack;
-    }
-}
-export class SwerveConfigParser {
-    async parse(configPath) {
-        let actualPath;
-        if (configPath.startsWith(".")) {
-            actualPath = path.join(configPath);
-        }
-        else {
-            actualPath = configPath;
-        }
-        const content = await readFile(actualPath, {
-            encoding: "utf-8",
-        });
-        try {
-            const config = JSON.parse(content);
-            this.validateConfig(config);
-            return config;
-        }
-        catch (e) {
-            throw {
-                message: `Error parsing config, ${e.message}`,
-                stack: e.stack ?? new Error("Error parsing config").stack,
-            };
-        }
-    }
-    validateConfig(config) {
-        if (typeof config.port !== "number") {
-            throw new SwerveConfigException("Invalid port");
-        }
-        if (typeof config.services !== "object") {
-            throw new SwerveConfigException("Invalid services configuration");
-        }
-    }
-}

package/dist/config/config.d.ts

@@ -1,15 +0,0 @@
-export type KeyValue<VALUE> = {
-    [k: string]: VALUE;
-};
-export interface IService {
-    packageName?: string;
-    servicePath?: string;
-    packageJson?: any;
-    logLevel?: string;
-    [key: string]: any;
-}
-export interface IConfig {
-    port?: number;
-    services: KeyValue<IService>;
-    [key: string]: any;
-}

package/dist/config/config.js

@@ -1 +0,0 @@
-export {};

package/dist/config/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./config.js";
-export * from "./config-parser.js";

package/dist/config/index.js

@@ -1,2 +0,0 @@
-export * from "./config.js";
-export * from "./config-parser.js";

package/dist/logs/swerve-jmoney-Laptop-16-AMD-Ryzen-7040-Series-2025-08-10-00.log

@@ -1,3 +0,0 @@
-{"label":"jmoney-Laptop-16-AMD-Ryzen-7040-Series:::swerve:121451:swerve:","level":"info","message":"Getting webservice package @swizzyweb/swerve and will run on port 3005","timestamp":"2025-08-11T03:55:34.252Z"}
-{"label":"jmoney-Laptop-16-AMD-Ryzen-7040-Series:::swerve:121451:swerve:","level":"error","message":"Failed to install web service","timestamp":"2025-08-11T03:55:34.253Z"}
-{"label":"jmoney-Laptop-16-AMD-Ryzen-7040-Series:::swerve:121451:swerve:","level":"error","message":"Error occurred initializing service\n Invalid arguments\n TypeError: Invalid arguments\n    at getFullImportPath (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/node_modules/@swizzyweb/swerve-manager/dist/utils/installWebservice.js:54:37)\n    at SwerveManager.installWebService (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/node_modules/@swizzyweb/swerve-manager/dist/swerve.js:150:36)\n    at SwerveManager.runWithArgs (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/node_modules/@swizzyweb/swerve-manager/dist/swerve.js:61:47)\n    at async SwerveManager.run (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/node_modules/@swizzyweb/swerve-manager/dist/swerve.js:24:32)\n    at async runV2 (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/dist/bootstrapDeno.js:24:9)\n    at async run (file:///home/jmoney/repos/BrowserToolkitWorkspace/swerve/dist/bootstrapDeno.js:34:16)","timestamp":"2025-08-11T03:55:34.253Z"}

package/dist/logs/swerve-jmoney-Laptop-16-AMD-Ryzen-7040-Series-2025-08-11-00.log

@@ -1,2 +0,0 @@
-{"label":"jmoney-Laptop-16-AMD-Ryzen-7040-Series:::swerve:121451:swerve:","level":"info","message":"swerveArgs.services.length < 1","timestamp":"2025-08-11T03:55:34.243Z"}
-{"label":"jmoney-Laptop-16-AMD-Ryzen-7040-Series:::swerve:121451:swerve:","level":"error","message":"Exception running v2 TypeError: newWebServices is not iterable (cannot read property undefined)","timestamp":"2025-08-11T03:55:34.254Z"}

package/dist/main.ts

@@ -1,129 +0,0 @@
-// @ts-ignore
-import express, { Application } from "../node_modules/@swizzyweb/express";
-import {
-  getArgs,
-  installWebService,
-  SwerveArgs,
-  ISwerveManager,
-  SwerveManager,
-} from "../node_modules/@swizzyweb/swerve-manager";
-import { SwizzyWinstonLogger } from "../node_modules/@swizzyweb/swizzy-web-service";
-import os from "node:os";
-import process from "node:process";
-
-export async function runV2(): Promise<ISwerveManager> {
-  let gLogger = new SwizzyWinstonLogger({
-    port: 0,
-    logLevel: process.env.LOG_LEVEL ?? "info",
-    appDataRoot: ".",
-    appName: `swerve`,
-    ownerName: "swerve",
-    hostName: os.hostname(),
-    pid: process.pid,
-  });
-
-  const swerveManager: ISwerveManager = new SwerveManager({});
-  try {
-    const args = await getArgs(process.argv, gLogger);
-    await swerveManager.run({ args });
-    return swerveManager;
-  } catch (e) {
-    gLogger.error(`Exception running v2 ${e}`);
-    throw e;
-  }
-}
-export async function run() {
-  if (true) {
-    return await runV2();
-  }
-  let gLogger = new SwizzyWinstonLogger({
-    port: 0,
-    logLevel: process.env.LOG_LEVEL ?? "info",
-    appDataRoot: ".",
-    appName: `swerve`,
-    hostName: os.hostname(),
-    pid: process.pid,
-  });
-
-  try {
-    const args = await getArgs(process.argv, gLogger);
-
-    const app = express();
-    const webServices = await runWithApp({ app, args });
-    const port = args.serviceArgs.port ?? 3005;
-    gLogger.debug(`Starting express app...`);
-    await app.listen(port, (err) => {
-      if (err) {
-        gLogger.log(err);
-      }
-      gLogger.info(
-        `${webServices
-          .map((service) => {
-            return service.name;
-          })
-          .join(",")} running on port ${port}`,
-      );
-    });
-  } catch (e) {
-    gLogger.error(
-      `Error occurred initializing service\n ${e.message}\n ${e.stack ?? {}}`,
-    );
-  }
-}
-
-interface RunWithAppArgs {
-  app: Application;
-  args: SwerveArgs;
-}
-
-export async function runWithApp(props: RunWithAppArgs) {
-  const { app, args } = props;
-  let gLogger = new SwizzyWinstonLogger({
-    port: 0,
-    logLevel: process.env.LOG_LEVEL ?? "info",
-    appDataRoot: args.appDataRoot,
-    appName: `swerve`,
-    hostName: os.hostname(),
-    pid: process.pid,
-  });
-
-  try {
-    gLogger = new SwizzyWinstonLogger({
-      logLevel: args.serviceArgs.logLevel ?? process.env.LOG_LEVEL ?? "info",
-      port: args.port,
-      logDir: args.appDataRoot,
-      appName: `swerve`,
-      hostName: os.hostname(),
-      pid: process.pid,
-    });
-
-    gLogger.debug(`Swerve Args: ${JSON.stringify(args)}`);
-
-    const PORT = args.port ?? 3005;
-    const webServices = [];
-    for (const serviceEntry of Object.entries(args.services)) {
-      const service = serviceEntry[1];
-      const packageName = service.packageName;
-      const importPathOrName = service.servicePath;
-      const webservice = await installWebService(
-        packageName,
-        importPathOrName,
-        PORT,
-        app,
-        {
-          appDataRoot: args.appDataRoot,
-          ...service,
-          ...service.serviceConfiguration,
-          ...args.serviceArgs,
-        },
-        gLogger,
-      );
-      webServices.push(webservice);
-    }
-    return webServices;
-  } catch (e) {
-    gLogger.error(
-      `Error occurred initializing service\n ${e.message}\n ${e.stack ?? {}}`,
-    );
-  }
-}

package/dist/mainCluster.ts

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-
-import cluster from "node:cluster";
-import http from "node:http";
-import os from "node:os";
-import { run } from "./main.js";
-import process from "node:process";
-import { BrowserLogger } from "@swizzyweb/swizzy-common";
-import { SwizzyWinstonLogger } from "@swizzyweb/swizzy-web-service";
-
-import { getArgs } from "./utils/index.js";
-/**
- * extra arg:
- * numThreads - number, default to num cpu cores from os
- * */
-async function runCluster() {
-  const args = await getArgs(process.argv, new BrowserLogger());
-  const logger = new SwizzyWinstonLogger({
-    port: args.port,
-    //    appDataRoot: args.appDataRoot,
-    appName: `swerve-root`,
-    hostName: os.hostname(),
-    pid: process.pid,
-  });
-  const numThreads = args.serviceArgs?.numThreads ?? os.availableParallelism();
-  if (cluster.isPrimary) {
-    logger.info(`[ParentThread]: Primary ${process.pid} is running`);
-    logger.info(`[ParentThread]: forking ${numThreads} threads`);
-    // Fork workers.
-    for (let i = 0; i < numThreads; i++) {
-      cluster.fork();
-    }
-
-    cluster.on("exit", (worker, code, signal) => {
-      logger.info(
-        `[ParentThread]: worker ${worker.process.pid} died with code ${code} and singal ${signal}`,
-      );
-    });
-  } else {
-    // Workers can share any TCP connection
-    // In this case it is an HTTP server
-
-    run();
-    console.log(`Worker ${process.pid} started`);
-  }
-}

package/dist/swerve.d.ts

@@ -1,82 +0,0 @@
-import { Application } from "@swizzyweb/express";
-import { SwerveArgs } from "./utils/index.js";
-import { AnyServer, IWebService, WebService } from "@swizzyweb/swizzy-web-service";
-import { ILogger } from "@swizzyweb/swizzy-common";
-export interface ISwerveManager {
-    run(request: RunRequest): Promise<RunResponse>;
-    stop(request: StopRequest): Promise<void>;
-    getRunningWebServices(props: GetRunningWebServiceRequest): Promise<GetRunningWebServiceResponse>;
-}
-export interface GetRunningWebServiceRequest {
-}
-export interface GetRunningWebServiceResponse {
-    webServices: {
-        [instanceId: string]: {
-            webService: any;
-            serviceConfig: any;
-        };
-    };
-}
-export declare enum InstanceType {
-    webservice = "webservice",
-    stack = "stack"
-}
-export interface InstanceDetails {
-    instanceType: InstanceType;
-    instanceId: string;
-}
-export interface StopRequest {
-    instanceDetails: InstanceDetails;
-}
-export interface RunRequest {
-    args?: SwerveArgs;
-}
-export interface RunResponse {
-    webServices: WebService<any>[];
-}
-export type Apps = {
-    [key: number]: {
-        app: Application;
-        server?: AnyServer;
-        services: {
-            [instanceId: string]: {
-                webService: IWebService;
-                serviceArgs: SwerveArgs;
-                runRequest: RunRequest;
-            };
-        };
-    };
-};
-export interface SwerveManagerProps {
-    apps?: Apps;
-    webServices?: WebService<any>[];
-}
-export interface WebServiceConfiguration {
-}
-type WebServiceConfigurations = {
-    [instanceId: string]: WebServiceConfiguration;
-};
-export declare class SwerveManager implements ISwerveManager {
-    apps: Apps;
-    webServices: WebService<any>[];
-    configurations: WebServiceConfigurations;
-    constructor(props: SwerveManagerProps);
-    run(request: RunRequest): Promise<RunResponse>;
-    runWithArgs(request: RunRequest): Promise<WebService<any>[]>;
-    private runWithApp;
-    installWebService(props: {
-        serviceKey: string;
-        importPathOrName: string;
-        app: Application;
-        appDataRoot: string;
-        packageName: string;
-        port: number;
-        gLogger: ILogger<any>;
-        serviceArgs: {
-            [key: string]: any;
-        };
-    }): Promise<any>;
-    stop(request: StopRequest): Promise<void>;
-    getRunningWebServices(props: GetRunningWebServiceRequest): Promise<GetRunningWebServiceResponse>;
-}
-export {};

package/dist/swerve.js

@@ -1,282 +0,0 @@
-// @ts-ignore
-import express from "@swizzyweb/express";
-import { getFullImportPath, getLoggerForService, } from "./utils/index.js";
-import { SwizzyWinstonLogger, } from "@swizzyweb/swizzy-web-service";
-import os from "node:os";
-import process from "node:process";
-import path from "path";
-import { mkdirSync } from "node:fs";
-export var InstanceType;
-(function (InstanceType) {
-    InstanceType["webservice"] = "webservice";
-    InstanceType["stack"] = "stack";
-})(InstanceType || (InstanceType = {}));
-export class SwerveManager {
-    apps;
-    webServices;
-    configurations;
-    constructor(props) {
-        this.apps = props.apps ?? {};
-        this.webServices = props.webServices ?? [];
-    }
-    async run(request) {
-        const { args } = request;
-        const newWebServices = await this.runWithArgs({
-            args,
-        });
-        this.webServices.push(...newWebServices);
-        return { webServices: newWebServices };
-    }
-    async runWithArgs(request) {
-        const { args } = request;
-        const logLevel = process.env.LOG_LEVEL ?? args.logLevel ?? "info";
-        let gLogger = new SwizzyWinstonLogger({
-            port: 0,
-            logLevel,
-            appDataRoot: args.appDataRoot ?? ".",
-            appName: `swerve`,
-            hostName: os.hostname(),
-            ownerName: "swerve",
-            pid: process.pid,
-        });
-        try {
-            const webServices = [];
-            const newApps = {};
-            for (const serviceEntry of Object.entries(args.services)) {
-                const port = serviceEntry[1].port ?? args.port;
-                if (!this.apps[`${port}`]) {
-                    this.apps[`${port}`] = { app: await express(), services: {} };
-                    newApps[`${port}`] = this.apps[`${port}`];
-                }
-                const app = this.apps[`${port}`].app;
-                const service = serviceEntry[1];
-                const packageName = serviceEntry[0];
-                const importPathOrName = service.servicePath ?? service.packageName;
-                gLogger.debug(`importPathOrName ${importPathOrName}`);
-                const serviceArgs = {
-                    ...service,
-                    ...service.serviceConfiguration,
-                    ...args.serviceArgs,
-                };
-                const webservice = await this.installWebService({
-                    serviceKey: serviceEntry[0],
-                    packageName,
-                    importPathOrName,
-                    port,
-                    app,
-                    appDataRoot: args.appDataRoot,
-                    serviceArgs,
-                    gLogger,
-                });
-                this.apps[`${port}`].services[webservice.instanceId] = {
-                    webService: webservice,
-                    serviceArgs,
-                    runRequest: request,
-                };
-                webServices.push(webservice);
-            }
-            for (const newAppEntry of Object.entries(newApps)) {
-                const [port, appRecord] = newAppEntry;
-                const newApp = appRecord.app;
-                const server = await newApp.listen(port, () => {
-                    //          this.apps[port].services[newApp.instanceId] = {};
-                    gLogger.debug(`New app listening on port ${port}`);
-                });
-                this.apps[`${port}`].server = server;
-            }
-            for (const webService of webServices) {
-                gLogger.info(`${webService.name} running on port ${webService.port}`);
-            }
-            return webServices;
-        }
-        catch (e) {
-            gLogger.error(`Error occurred initializing service\n ${e.message}\n ${e.stack ?? {}}`);
-        }
-    }
-    async runWithApp(props) {
-        const { app, args } = props;
-        let gLogger = new SwizzyWinstonLogger({
-            port: 0,
-            logLevel: process.env.LOG_LEVEL ?? "info",
-            appDataRoot: args.appDataRoot,
-            appName: `swerve`,
-            hostName: os.hostname(),
-            pid: process.pid,
-        });
-        try {
-            gLogger = new SwizzyWinstonLogger({
-                logLevel: args.serviceArgs.logLevel ?? process.env.LOG_LEVEL ?? "info",
-                port: args.port,
-                logDir: args.appDataRoot,
-                appName: `swerve`,
-                hostName: os.hostname(),
-                pid: process.pid,
-            });
-            gLogger.debug(`Swerve Args: ${JSON.stringify(args)}`);
-            const PORT = args.port ?? 3005;
-            const webServices = [];
-            for (const serviceEntry of Object.entries(args.services)) {
-                const service = serviceEntry[1];
-                const packageName = service.packageName;
-                const importPathOrName = service.servicePath ?? service.serviceArgs.servicePath ?? packageName;
-                const webservice = await this.installWebService({
-                    serviceKey: serviceEntry[0],
-                    packageName,
-                    importPathOrName,
-                    port: PORT,
-                    app,
-                    appDataRoot: args.appDataRoot,
-                    serviceArgs: {
-                        ...service,
-                        ...service.serviceConfiguration,
-                        ...args.serviceArgs,
-                    },
-                    gLogger,
-                });
-                webServices.push(webservice);
-            }
-            return webServices;
-        }
-        catch (e) {
-            gLogger.error(`Error occurred initializing service\n ${e.message}\n ${e.stack ?? {}}`);
-        }
-    }
-    async installWebService(props) {
-        //  const packageName = importPathOrName;
-        const { app, appDataRoot, packageName, port, gLogger, serviceArgs, importPathOrName, serviceKey, } = props;
-        try {
-            gLogger.info(`Getting webservice package ${packageName} and will run on port ${port}`);
-            gLogger.debug(`Getting tool with path: ${importPathOrName}`);
-            let tool;
-            try {
-                gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
-                gLogger.debug(`Getting web service from tool...`);
-                tool = await import(importPathOrName);
-            }
-            catch (e) {
-                gLogger.warn(`Error importing raw import path ${importPathOrName}, attempting again with fullImportPath. Err: ${e?.message}, stack: ${e?.stack}`);
-                const fullPath = await getFullImportPath(importPathOrName);
-                tool = await import(fullPath); //require(fullPath); //require(packageName as string);
-            }
-            const appDataPath = path.join(appDataRoot, "appdata", serviceKey);
-            mkdirSync(appDataPath, { recursive: true });
-            const logger = getLoggerForService(serviceArgs, serviceKey, port, gLogger);
-            gLogger.debug(`serviceArgs for ${packageName}: ${serviceArgs}`);
-            const service = await tool.getWebservice({
-                appDataPath,
-                port,
-                ...serviceArgs,
-                app,
-                packageName,
-                serviceArgs: { ...serviceArgs },
-                logger,
-            });
-            logger.debug(`Got web service`);
-            gLogger.debug(`Installing web service...`);
-            await service.install({});
-            gLogger.debug(`Installed web service ${packageName}`);
-            return service;
-        }
-        catch (e) {
-            const exceptionMessage = `exception: ${e}
-Failed to install web service, is it installed with NPM? Check package exists in node_modules
-    To add, run:
-			npm install ${packageName ?? "packageName"}
-		args:
-			packageName: ${packageName}
-			port: ${port}
-`;
-            //		${getHelpText}`;
-            gLogger.error(`Failed to install web service`);
-            throw e; //new Error(exceptionMessage);
-        }
-    }
-    async stop(request) {
-        const { instanceDetails } = request;
-        const { instanceId, instanceType } = instanceDetails;
-        const instanceIds = [];
-        if (!instanceId) {
-            throw new Error(`Instance id required to stop web service`);
-        }
-        if (instanceType === InstanceType.webservice) {
-            //      console.log(`Matched instance type`);
-            instanceIds.push(`${instanceId}`);
-        }
-        else if (instanceType === InstanceType.stack) {
-            // TODO: implement
-            throw new Error(`Stack instance type is not yet supported`);
-        }
-        else {
-            //     this.logger.error(`Invalid instance details ${instanceDetails}`);
-            throw new Error(`Invalid instance details provided`);
-        }
-        //    console.log(`instanceIds: ${instanceIds}`);
-        const webServices = this.webServices.filter((service) => {
-            //      console.log(`instanceId ${service.instanceId}`);
-            return instanceIds.includes(`${service.instanceId}`);
-        });
-        if (!webServices || webServices.length < 1) {
-            //console.error(webServices); //this.webServices);
-            throw new Error(`WebService with instanceId ${instanceId} not found while attempting to stop`);
-        }
-        const ports = [];
-        for (const webService of webServices) {
-            const port = webService.port;
-            ports.push(port);
-            //console.log(webService);
-            await webService.uninstall({});
-            const indexes = this.webServices.map((val, index, array) => {
-                //console.log(
-                //            `instanceInSwerve: ${val.instanceId} instanceInWebService ${webService.instanceId}`,
-                //          );
-                if (val.instanceId == webService.instanceId) {
-                    return index;
-                }
-            });
-            //.filter((val) => val);
-            if (indexes.length > 1) {
-                throw new Error(`Found multiple indexes for webservice instance ${webService.instanceId}`);
-            }
-            else if (indexes.length == 0) {
-                throw new Error(`No indexes for webservice instance ${webService.instanceId}`);
-            }
-            const index = indexes[0];
-            this.webServices.splice(index, 1);
-            if (!this.apps[`${port}`]?.services[webService.instanceId]) {
-                //console.log(`Apps does not contain service`);
-                // TODO: DO SOMETHING, log, throw maybe.
-            }
-            else {
-                delete this.apps[`${port}`].services[webService.instanceId];
-            }
-        }
-        //cleanup apps if no more services
-        for (const port of ports) {
-            const { services, server, app } = this.apps[`${port}`];
-            if (!services || Object.keys(services).length == 0) {
-                if (server) {
-                    server.close();
-                }
-                else {
-                    continue;
-                    // TODO: do something, log throw etc
-                }
-                delete this.apps[`${port}`];
-            }
-        }
-    }
-    async getRunningWebServices(props) {
-        const webservices = {};
-        for (const webservice of this.webServices) {
-            const instanceId = webservice.instanceId;
-            const { runRequest, serviceArgs } = this.apps[webservice.port].services[instanceId];
-            webservices[instanceId] = {
-                webService: webservice.toJson(),
-                serviceConfig: runRequest?.args,
-            };
-        }
-        return {
-            webServices: webservices,
-        };
-    }
-}

package/dist/utils/getArgs.d.ts

@@ -1,12 +0,0 @@
-import { ILogger } from "@swizzyweb/swizzy-common";
-import { IConfig, IService, KeyValue } from "../config/index.js";
-export declare function getServiceNameFromCurrentDirPackage(logger: ILogger<any>): string;
-export interface SwerveArgs extends IConfig {
-    services: KeyValue<IService>;
-    port: number;
-    appDataRoot?: string;
-    serviceArgs?: KeyValue<any>;
-    logLevel: string;
-    [key: string]: any;
-}
-export declare function getArgs(args: string[], logger: ILogger<any>): Promise<SwerveArgs>;

package/dist/utils/getArgs.js

@@ -1,208 +0,0 @@
-import path from "path";
-import process from "node:process";
-import { SwerveConfigParser } from "../config/config-parser.js";
-import { deepMerge } from "@swizzyweb/swizzy-common";
-import { getPackageJson } from "./getPackageJson.js";
-function getHelpText() {
-    return `Help --
-npm run server <serviceName> <port (optional)>
-		`;
-}
-export function getServiceNameFromCurrentDirPackage(logger) {
-    try {
-        return process.cwd();
-    }
-    catch (e) {
-        logger.debug(`Error getting package from current dir package.json ${e}`);
-        throw e;
-    }
-}
-function getAppDataRoot(appDataRootPath, logger) {
-    try {
-        let directory;
-        if (!appDataRootPath || appDataRootPath === ".") {
-            directory = getServiceNameFromCurrentDirPackage(logger);
-        }
-        else {
-            directory = appDataRootPath;
-        }
-        return directory;
-    }
-    catch (e) {
-        throw {
-            message: `Unable to get app data root ${appDataRootPath}`,
-            exception: e,
-        };
-    }
-}
-function getService(serviceName, logger) {
-    try {
-        let directory;
-        let packageJson;
-        if (!serviceName || serviceName === ".") {
-            directory = getServiceNameFromCurrentDirPackage(logger);
-            //      packageJson = getPackageJsonFromDirectory(directory);
-            const packageResult = getPackageJson(directory);
-            packageJson = packageResult.packageJson;
-            directory = packageResult.servicePath;
-        }
-        else if (serviceName && serviceName.startsWith(".")) {
-            //      directory = serviceName;
-            //      const jsonPath = path.join(serviceName);
-            //      packageJson = getPackageJsonFromDirectory(path.resolve(jsonPath));
-            const packageResult = getPackageJson(serviceName);
-            packageJson = packageResult.packageJson;
-            directory = packageResult.servicePath;
-        }
-        else {
-            return getPackageJson(serviceName);
-        }
-        const response = {
-            servicePath: directory,
-            packageJson,
-        };
-        logger.debug(`response ${response}`);
-        return response;
-    }
-    catch (e) {
-        const ex = {
-            message: "Error getting service name",
-            serviceName,
-            error: e,
-        };
-        throw ex;
-    }
-}
-function getDefaultArgs() {
-    let currentServiceName = undefined;
-    return {
-        logLevel: "info",
-        services: {},
-        port: 3005,
-        serviceArgs: {},
-    };
-}
-const ARG_PREFIX = "--";
-const CONFIG_ARG_KEY = "config";
-function cliArgToPropertyName(rawArg) {
-    return rawArg.replace(ARG_PREFIX, "");
-}
-const configParser = new SwerveConfigParser();
-async function getConfigValuesFromPath(configPath, logger) {
-    try {
-        return await configParser.parse(configPath);
-    }
-    catch (e) {
-        logger.error(`Error occurred parsing config values from path`);
-        throw {
-            message: "Unexpected error occurred when attempting to read serviceConfiguration file",
-            configFilePath: configPath,
-            error: e,
-        };
-    }
-}
-const topLevelArgs = new Set();
-topLevelArgs.add("port");
-function isTopLevelArg(key) {
-    return topLevelArgs.has(key);
-}
-function tryParseNumberArg(val) {
-    try {
-        return parseInt(val);
-    }
-    catch (e) {
-        return false;
-    }
-}
-function parseArgValue(val, logger) {
-    try {
-        return JSON.parse(val);
-    }
-    catch (e) {
-        logger.warn(`Exception occurred while parsing arg value ${val}. This is sometimes expected. Error ${e}`);
-    }
-    return val;
-}
-const DEFAULT_PORT = 3005;
-export async function getArgs(args, logger) {
-    let argKey = undefined;
-    let swerveArgs = getDefaultArgs();
-    let configFromFile;
-    const serviceCounts = new Map();
-    for (let i = 2; i < args.length; i++) {
-        const nextVal = args[i];
-        if (argKey) {
-            if (argKey == CONFIG_ARG_KEY) {
-                if (configFromFile) {
-                    throw new Error(`Config file already specified, you can only specify one config file with the --config arg`);
-                }
-                configFromFile = await getConfigValuesFromPath(nextVal, logger);
-                argKey = undefined;
-                continue;
-            }
-            swerveArgs.serviceArgs[argKey] = parseArgValue(nextVal, logger);
-            argKey = undefined;
-            continue;
-        }
-        if (nextVal.startsWith(ARG_PREFIX)) {
-            argKey = cliArgToPropertyName(nextVal);
-            continue;
-        }
-        const serviceDetails = getService(nextVal, logger);
-        const serviceName = serviceDetails.packageJson.name;
-        const serviceIndex = serviceCounts.get(serviceName) ?? 0;
-        serviceCounts.set(serviceName, serviceIndex + 1);
-        swerveArgs.services[`${serviceDetails.packageJson.name}-${serviceIndex}`] =
-            {
-                serviceConfiguration: {},
-                ...serviceDetails,
-            };
-    }
-    swerveArgs.port =
-        configFromFile?.port ?? swerveArgs.serviceArgs?.port ?? DEFAULT_PORT;
-    logger.debug(`configFromFile ${configFromFile}`);
-    if (configFromFile?.services) {
-        logger.debug(`ConfigFromFile has service`);
-        for (const serviceEntry of Object.entries(configFromFile.services)) {
-            let { servicePath, packageName } = serviceEntry[1];
-            //        serviceEntry[1].servicePath ?? serviceEntry[1].packageName;
-            if (!servicePath) {
-                serviceEntry[1].servicePath = packageName;
-                //        throw new Error(
-                //        `servicePath or packageName must be set in service configurations`,
-                //      );
-            }
-            else {
-                const serviceData = getService(servicePath, logger);
-                serviceEntry[1].packageName = serviceData.packageJson?.name;
-                serviceEntry[1].servicePath = serviceData.servicePath;
-            }
-            //      logger.debug(`ServiceName: ${}`);
-            swerveArgs.services[serviceEntry[0]] = await deepMerge(await deepMerge(swerveArgs.serviceArgs ?? {}, serviceEntry.values() ?? {}), configFromFile.services[serviceEntry[0]]);
-        }
-        logger.debug(`packagedConfigFromFile into services`);
-    }
-    swerveArgs = deepMerge(swerveArgs, configFromFile ?? {});
-    logger.debug(`${JSON.stringify(swerveArgs)}`);
-    if (swerveArgs.serviceArgs?.appDataRoot?.startsWith(".") ||
-        swerveArgs.serviceArgs?.appDataRoot == undefined) {
-        const appDataRootPath = path.join(process.cwd());
-        swerveArgs.appDataRoot = appDataRootPath;
-        swerveArgs.serviceArgs.appDataRoot = appDataRootPath;
-    }
-    else {
-        swerveArgs.appDataRoot = swerveArgs.serviceArgs.appDataRoot;
-    }
-    if (Object.keys(swerveArgs.services).length < 1) {
-        logger.info(`swerveArgs.services.length < 1`);
-        const { servicePath, packageJson } = getService(".", logger);
-        swerveArgs.services[packageJson.name] = {
-            servicePath,
-            packageJson,
-            appDataRoot: swerveArgs.appDataRoot,
-            ...swerveArgs.serviceArgs,
-        };
-    }
-    logger.debug(`getArgs complete with parsed swerveArgs: ${JSON.stringify(swerveArgs)}`);
-    return swerveArgs;
-}

package/dist/utils/getPackageJson.d.ts

@@ -1,14 +0,0 @@
-/**
- * Resolves the package.json file for a given package name or path.
- * @param packageNameOrPath Package name (e.g., 'lodash', '@nestjs/core') or path (e.g., './node_modules/lodash')
- * @returns Parsed package.json content or null
- */
-export declare function getPackageJson(packageNameOrPath: string): {
-    packageJson: Record<string, any>;
-    servicePath: string;
-} | null;
-/**
- * Get the nearest package.json of a given import name.
- * @param packageName The name of the imported package (e.g. "lodash")
- */
-export declare function getPackageJsonOrig(packageName: string): Record<string, any> | null;

package/dist/utils/getPackageJson.js

@@ -1,74 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import { fileURLToPath, pathToFileURL } from "url";
-/**
- * Determines whether the input string is a relative or absolute path.
- */
-function isPath(input) {
-    return input.startsWith(".") || path.isAbsolute(input);
-}
-/**
- * Resolves the package.json file for a given package name or path.
- * @param packageNameOrPath Package name (e.g., 'lodash', '@nestjs/core') or path (e.g., './node_modules/lodash')
- * @returns Parsed package.json content or null
- */
-export function getPackageJson(packageNameOrPath) {
-    try {
-        // Step 1: Resolve to an absolute path
-        //    const resolvedEntry = isPath(packageNameOrPath)
-        //    ? require.resolve(path.resolve(packageNameOrPath))
-        //      : //      : require.resolve(packageNameOrPath);
-        //        require.resolve(packageNameOrPath, { paths: [process.cwd()] });
-        const resolvedEntry = isPath(packageNameOrPath)
-            ? pathToFileURL(path.resolve(packageNameOrPath)).href
-            : import.meta.resolve(packageNameOrPath);
-        // Step 2: Traverse upward to find the nearest package.json
-        let dir = fileURLToPath(resolvedEntry); //path.dirname(resolvedEntry);
-        while (dir !== path.parse(dir).root) {
-            const pkgPath = path.join(dir, "package.json");
-            if (fs.existsSync(pkgPath)) {
-                const content = fs.readFileSync(pkgPath, "utf-8");
-                const packageJson = JSON.parse(content);
-                if (!dir || dir === ".") {
-                    dir = process.cwd();
-                }
-                else if (dir.startsWith(".")) {
-                    dir = path.join(process.cwd(), dir);
-                }
-                const entrypoint = path.join(dir, packageJson.main);
-                //        throw `Entrypoint is ${entrypoint}`;
-                return { packageJson, servicePath: entrypoint };
-            }
-            dir = path.dirname(dir);
-        }
-        throw new Error(`Could not parse package.json`);
-    }
-    catch (err) {
-        throw new Error(`Could not resolve package.json for "${packageNameOrPath}"`);
-    }
-}
-/**
- * Get the nearest package.json of a given import name.
- * @param packageName The name of the imported package (e.g. "lodash")
- */
-export function getPackageJsonOrig(packageName) {
-    try {
-        // Resolve the entry file of the package
-        const entryPath = import.meta.resolve(packageName); //require.resolve(packageName);
-        // Traverse up from the resolved file to find package.json
-        let dir = path.dirname(entryPath);
-        while (dir !== path.parse(dir).root) {
-            const pkgPath = path.join(dir, "package.json");
-            if (fs.existsSync(pkgPath)) {
-                const content = fs.readFileSync(pkgPath, "utf8");
-                return { packageJson: JSON.parse(content), servicePath: dir };
-            }
-            dir = path.dirname(dir);
-        }
-        return null;
-    }
-    catch (error) {
-        //console.error(`Failed to resolve package "${packageName}":`, error);
-        return null;
-    }
-}

package/dist/utils/index.d.ts

@@ -1,2 +0,0 @@
-export * from "./getArgs.js";
-export * from "./installWebservice.js";

package/dist/utils/index.js

@@ -1,2 +0,0 @@
-export * from "./getArgs.js";
-export * from "./installWebservice.js";

package/dist/utils/installWebservice.d.ts

@@ -1,4 +0,0 @@
-import { ILogger } from "@swizzyweb/swizzy-common";
-export declare function installWebService(appName: string, importPathOrName: string, port: number, expressApp: any, serviceArgs: any, gLogger: ILogger<any>): Promise<any>;
-export declare function getFullImportPath(importPathOrName: string): Promise<string>;
-export declare function getLoggerForService(serviceArgs: any, appName: string, port: number, gLogger: ILogger<any>): ILogger<any>;

package/dist/utils/installWebservice.js

@@ -1,87 +0,0 @@
-import path from "path";
-import os from "node:os";
-import process from "node:process";
-import { mkdirSync } from "node:fs";
-import { fileURLToPath } from "node:url";
-export async function installWebService(appName, importPathOrName, port, expressApp, serviceArgs, gLogger) {
-    const packageName = importPathOrName;
-    try {
-        gLogger.info(`Getting webservice package ${packageName} and will run on port ${port}`);
-        gLogger.debug(`Getting tool with path: ${importPathOrName}`);
-        const fullPath = importPathOrName; //await getFullImportPath(importPathOrName);
-        const tool = await import(fullPath); //require(fullPath); //require(packageName as string);
-        gLogger.debug(`Got service with require: ${JSON.stringify(tool)}`);
-        gLogger.debug(`Getting web service from tool...`);
-        const appDataPath = path.join(serviceArgs.appDataRoot, "appdata", appName);
-        mkdirSync(appDataPath, { recursive: true });
-        const logger = getLoggerForService(serviceArgs, serviceArgs.appName, port, gLogger);
-        gLogger.debug(`serviceArgs for ${packageName}: ${serviceArgs}`);
-        const service = await tool.getWebservice({
-            appDataPath,
-            ...serviceArgs,
-            port,
-            app: expressApp,
-            packageName,
-            serviceArgs: { ...serviceArgs },
-            logger,
-        });
-        logger.debug(`Got web service`);
-        gLogger.debug(`Installing web service...`);
-        await service.install({});
-        gLogger.debug(`Installed web service ${packageName}`);
-        return service;
-    }
-    catch (e) {
-        const exceptionMessage = `exception: ${e}
-Failed to install web service, is it installed with NPM? Check package exists in node_modules
-    To add, run:
-			npm install ${packageName ?? "packageName"}
-		args:
-			packageName: ${packageName}
-			port: ${port}
-`;
-        //		${getHelpText}`;
-        gLogger.error(`Failed to install web service`);
-        throw e; //new Error(exceptionMessage);
-    }
-}
-export async function getFullImportPath(importPathOrName) {
-    const importPath = importPathOrName.startsWith(".")
-        ? path.join(process.cwd(), importPathOrName)
-        : importPathOrName;
-    let fullPath;
-    if (importPathOrName === importPath) {
-        const fullUrl = import.meta.resolve(importPath, import.meta.url);
-        fullPath = fileURLToPath(fullUrl);
-        //    const pkg = await import(fullUrl, {
-        //      assert: { type: "json" },
-        //    });
-        //      await require.resolve(importPath, {
-        //      paths: [process.cwd()],
-        //    });
-    }
-    else {
-        fullPath = importPath;
-    }
-    return fullPath;
-}
-export function getLoggerForService(serviceArgs, appName, port, gLogger) {
-    const logLevel = serviceArgs.logLevel ?? gLogger.getLoggerProps().logLevel;
-    const logFileName = serviceArgs.logFileName ?? undefined;
-    const ownerName = appName;
-    const pid = process.pid;
-    const hostName = os.hostname();
-    const logDir = serviceArgs.logDir;
-    const appDataRoot = serviceArgs.appDataRoot;
-    return gLogger.clone({
-        port,
-        appName,
-        appDataRoot,
-        logDir,
-        hostName,
-        pid,
-        logLevel,
-        ownerName,
-        logFileName,
-    });
-}