@swizzyweb/swerve-manager 0.3.3 → 0.3.5

package/deno.lock

@@ -1,7 +1,6 @@
 {
   "version": "5",
   "specifiers": {
-    "npm:@swizzyweb/swizzy-common@~0.3.3": "0.3.3",
     "npm:@types/express@^5.0.6": "5.0.6",
     "npm:@types/node@^22.18.6": "22.19.7",
     "npm:@typescript-eslint/eslint-plugin@^8.54.0": "8.54.0_@typescript-eslint+parser@8.54.0__eslint@9.39.2__typescript@5.9.3_eslint@9.39.2_typescript@5.9.3",
@@ -1211,8 +1210,8 @@
   "workspace": {
     "packageJson": {
       "dependencies": [
-        "npm:@swizzyweb/swizzy-common@~0.3.3",
-        "npm:@swizzyweb/swizzy-web-service@0.6.2",
+        "npm:@swizzyweb/swizzy-common@~0.3.5",
+        "npm:@swizzyweb/swizzy-web-service@~0.6.3",
         "npm:@types/express@^5.0.6",
         "npm:@types/node@^22.18.6",
         "npm:@typescript-eslint/eslint-plugin@^8.54.0",

package/dist/swerve.d.ts

@@ -52,6 +52,7 @@ export interface SwerveManagerProps {
     webServices?: WebService<any>[];
     nodeModulesPath?: string;
     logger?: ILogger<any> | undefined;
+    noLogFile?: boolean;
 }
 export interface WebServiceConfiguration {
 }

package/dist/swerve.js

@@ -28,6 +28,7 @@ export class SwerveManager {
                     appName: "swerve-manager",
                     port: -1,
                     hostName: os.hostname(),
+                    noLogFile: props.noLogFile ?? true,
                 });
     }
     async run(request) {
@@ -49,6 +50,7 @@ export class SwerveManager {
             hostName: os.hostname(),
             ownerName: "swerve",
             pid: process.pid,
+            noLogFile: args.noLogFile,
         });
         try {
             const webServices = [];
@@ -108,21 +110,14 @@ export class SwerveManager {
         const { app, args } = props;
         let gLogger = new SwizzyWinstonLogger({
             port: 0,
-            logLevel: process.env.LOG_LEVEL ?? "info",
+            logLevel: process.env.LOG_LEVEL ?? args.logLevel ?? "info",
             appDataRoot: args.appDataRoot,
             appName: `swerve`,
             hostName: os.hostname(),
             pid: process.pid,
+            noLogFile: args.noLogFile,
         });
         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 = [];
@@ -187,7 +182,7 @@ export class SwerveManager {
                 serviceArgs: { ...serviceArgs },
                 logger,
             });
-            logger.debug(`Got web service`);
+            gLogger.debug(`Got web service`);
             gLogger.debug(`Installing web service...`);
             await service.install({});
             gLogger.debug(`Installed web service ${packageName}`);

package/dist/utils/getArgs.d.ts

@@ -7,6 +7,7 @@ export interface SwerveArgs extends IConfig {
     appDataRoot?: string;
     serviceArgs?: KeyValue<any>;
     logLevel: string;
+    noLogFile: boolean;
     [key: string]: any;
 }
 export declare function getArgs(args: string[], logger: ILogger<any>): Promise<SwerveArgs>;

package/dist/utils/getArgs.js

@@ -1,8 +1,9 @@
 import path from "node:path";
-import process from "node:process";
+import process, { cwd } from "node:process";
 import { SwerveConfigParser } from "../config/config-parser.js";
 import { deepMerge } from "@swizzyweb/swizzy-common";
 import { getPackageJson } from "./getPackageJson.js";
+import { existsSync, readFileSync } from "node:fs";
 function getHelpText() {
     return `Help --
 npm run server <serviceName> <port (optional)>
@@ -80,6 +81,7 @@ function getDefaultArgs() {
         services: {},
         port: 3005,
         serviceArgs: {},
+        noLogFile: false,
     };
 }
 const ARG_PREFIX = "--";
@@ -116,6 +118,12 @@ function tryParseNumberArg(val) {
 }
 function parseArgValue(val, logger) {
     try {
+        if (`${val}`.toLocaleLowerCase() == "true") {
+            return true;
+        }
+        else if (`${val}`.toLocaleLowerCase() == "false") {
+            return false;
+        }
         return JSON.parse(val);
     }
     catch (e) {
@@ -126,7 +134,8 @@ function parseArgValue(val, logger) {
 const DEFAULT_PORT = 3005;
 export async function getArgs(args, logger) {
     let argKey = undefined;
-    let swerveArgs = getDefaultArgs();
+    let defaultArgs = getDefaultArgs();
+    let swerveArgs = defaultArgs;
     let configFromFile;
     const serviceCounts = new Map();
     for (let i = 2; i < args.length; i++) {
@@ -140,6 +149,9 @@ export async function getArgs(args, logger) {
                 argKey = undefined;
                 continue;
             }
+            if (Object.keys(defaultArgs).includes(argKey)) {
+                swerveArgs[argKey] = parseArgValue(nextVal, logger);
+            }
             swerveArgs.serviceArgs[argKey] = parseArgValue(nextVal, logger);
             argKey = undefined;
             continue;
@@ -168,9 +180,16 @@ export async function getArgs(args, logger) {
             //        serviceEntry[1].servicePath ?? serviceEntry[1].packageName;
             if (!servicePath) {
                 serviceEntry[1].servicePath = packageName;
-                //        throw new Error(
-                //        `servicePath or packageName must be set in service configurations`,
-                //      );
+                const localPackage = path.join(cwd(), "node_modules", packageName);
+                const packageJsonPath = path.join(localPackage, "package.json");
+                if (existsSync(path.join(packageJsonPath))) {
+                    const json = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+                    const main = json.main;
+                    serviceEntry[1].servicePath = path.join(localPackage, main);
+                }
+                else {
+                    serviceEntry[1].servicePath = getPackageJson(packageName).servicePath;
+                }
             }
             else {
                 const serviceData = getService(servicePath, logger);

package/dist/utils/installWebservice.js

@@ -73,6 +73,7 @@ export function getLoggerForService(serviceArgs, appName, port, gLogger) {
     const hostName = os.hostname();
     const logDir = serviceArgs.logDir;
     const appDataRoot = serviceArgs.appDataRoot;
+    const noLogFile = serviceArgs.noLogFile ?? gLogger.getLoggerProps().noLogFile;
     return gLogger.clone({
         port,
         appName,
@@ -83,5 +84,6 @@ export function getLoggerForService(serviceArgs, appName, port, gLogger) {
         logLevel,
         ownerName,
         logFileName,
+        noLogFile,
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swizzyweb/swerve-manager",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "swizzy-swerve is a bootstrapper for swizzy web services. This package will bootstrap and run independent swizzy web services.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,9 +12,10 @@
     "test:node": "node --test ./test**/*.spec.ts",
     "test:deno": "deno test test/** --allow-env --allow-write --allow-read",
     "test:bun": "bun test",
-    "coverage": "jest --coverage",
+    "coverage": "node --test --experimental-test-coverage ./test/**.spec.ts",
     "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "docs": "npx typedoc src/index.ts"
   },
   "author": "Jason Gallagher",
   "license": "Apache-2.0",
@@ -29,8 +30,8 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@swizzyweb/swizzy-common": "^0.3.3",
-    "@swizzyweb/swizzy-web-service": "0.6.2",
+    "@swizzyweb/swizzy-common": "^0.3.5",
+    "@swizzyweb/swizzy-web-service": "^0.6.3",
     "express": "^5.2.1"
   },
   "repository": {

package/src/swerve.ts

@@ -75,6 +75,7 @@ export interface SwerveManagerProps {
   webServices?: WebService<any>[];
   nodeModulesPath?: string;
   logger?: ILogger<any> | undefined;
+  noLogFile?: boolean;
 }
 
 export interface WebServiceConfiguration {}
@@ -99,6 +100,7 @@ export class SwerveManager implements ISwerveManager {
         appName: "swerve-manager",
         port: -1,
         hostName: os.hostname(),
+        noLogFile: props.noLogFile ?? true,
       });
   }
 
@@ -122,6 +124,7 @@ export class SwerveManager implements ISwerveManager {
       hostName: os.hostname(),
       ownerName: "swerve",
       pid: process.pid,
+      noLogFile: args.noLogFile,
     });
 
     try {
@@ -190,23 +193,15 @@ export class SwerveManager implements ISwerveManager {
     const { app, args } = props;
     let gLogger = new SwizzyWinstonLogger({
       port: 0,
-      logLevel: process.env.LOG_LEVEL ?? "info",
+      logLevel: process.env.LOG_LEVEL ?? args.logLevel ?? "info",
       appDataRoot: args.appDataRoot,
       appName: `swerve`,
       hostName: os.hostname(),
       pid: process.pid,
+      noLogFile: args.noLogFile,
     });
 
     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;
@@ -306,7 +301,7 @@ export class SwerveManager implements ISwerveManager {
         logger,
       });
 
-      logger.debug(`Got web service`);
+      gLogger.debug(`Got web service`);
 
       gLogger.debug(`Installing web service...`);
       await service.install({});

package/src/utils/getArgs.ts

@@ -1,11 +1,12 @@
 // @ts-ignore
 import { ILogger } from "@swizzyweb/swizzy-common";
 import path from "node:path";
-import process from "node:process";
+import process, { cwd } from "node:process";
 import { IConfig, IService, KeyValue } from "../config/index.js";
 import { SwerveConfigParser } from "../config/config-parser.js";
 import { deepMerge } from "@swizzyweb/swizzy-common";
 import { getPackageJson } from "./getPackageJson.js";
+import { existsSync, readFileSync } from "node:fs";
 
 function getHelpText() {
   return `Help --
@@ -85,6 +86,7 @@ export interface SwerveArgs extends IConfig {
   appDataRoot?: string;
   serviceArgs?: KeyValue<any>;
   logLevel: string;
+  noLogFile: boolean;
   [key: string]: any;
 }
 
@@ -96,6 +98,7 @@ function getDefaultArgs(): SwerveArgs {
     services: {},
     port: 3005,
     serviceArgs: {},
+    noLogFile: false,
   };
 }
 const ARG_PREFIX = "--";
@@ -139,6 +142,11 @@ function tryParseNumberArg(val): number | boolean {
 
 function parseArgValue(val: string, logger: ILogger<any>) {
   try {
+    if (`${val}`.toLocaleLowerCase() == "true") {
+      return true;
+    } else if (`${val}`.toLocaleLowerCase() == "false") {
+      return false;
+    }
     return JSON.parse(val);
   } catch (e) {
     logger.warn(
@@ -155,7 +163,8 @@ export async function getArgs(
   logger: ILogger<any>,
 ): Promise<SwerveArgs> {
   let argKey = undefined;
-  let swerveArgs = getDefaultArgs();
+  let defaultArgs = getDefaultArgs();
+  let swerveArgs = defaultArgs;
   let configFromFile: IConfig;
   const serviceCounts = new Map<string, number>();
   for (let i = 2; i < args.length; i++) {
@@ -171,8 +180,12 @@ export async function getArgs(
         argKey = undefined;
         continue;
       }
+      if (Object.keys(defaultArgs).includes(argKey)) {
+        swerveArgs[argKey] = parseArgValue(nextVal, logger);
+      }
       swerveArgs.serviceArgs[argKey] = parseArgValue(nextVal, logger);
       argKey = undefined;
+
       continue;
     }
     if (nextVal.startsWith(ARG_PREFIX)) {
@@ -202,9 +215,17 @@ export async function getArgs(
       //        serviceEntry[1].servicePath ?? serviceEntry[1].packageName;
       if (!servicePath) {
         serviceEntry[1].servicePath = packageName!;
-        //        throw new Error(
-        //        `servicePath or packageName must be set in service configurations`,
-        //      );
+        const localPackage = path.join(cwd(), "node_modules", packageName);
+        const packageJsonPath = path.join(localPackage, "package.json");
+        if (existsSync(path.join(packageJsonPath))) {
+          const json = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
+          const main = json.main;
+          serviceEntry[1].servicePath = path.join(localPackage, main);
+        } else {
+          serviceEntry[1].servicePath = getPackageJson(
+            packageName!,
+          ).servicePath;
+        }
       } else {
         const serviceData = getService(servicePath, logger);
         serviceEntry[1].packageName = serviceData.packageJson?.name;

package/src/utils/installWebservice.ts

@@ -105,7 +105,7 @@ export function getLoggerForService(
   const hostName = os.hostname();
   const logDir = serviceArgs.logDir;
   const appDataRoot = serviceArgs.appDataRoot;
-
+  const noLogFile = serviceArgs.noLogFile ?? gLogger.getLoggerProps().noLogFile;
   return gLogger.clone({
     port,
     appName,
@@ -116,5 +116,6 @@ export function getLoggerForService(
     logLevel,
     ownerName,
     logFileName,
+    noLogFile,
   });
 }

package/test/config/serviceConfig.json

@@ -9,7 +9,7 @@
         "hello": "world",
         "none": false
       },
-      "packageName": "@swizzyweb/my-first-web-service",
+      "packageName": "@swizzyweb/swizzy-web-service",
       "serviceConfiguration": {
         "port": 3001,
         "tableName": "someString"