@eighty4/c2 0.0.3 → 0.0.5-0

package/CHANGELOG.md

@@ -4,6 +4,12 @@
 
 - ???
 
+## [v0.0.4] - 2025-06-30
+
+### Fixed
+
+- Cleaning up console output of errors and CLI usage
+
 ## [v0.0.3] - 2025-06-26
 
 ### Fixed
@@ -22,6 +28,7 @@
 - Evaluate env() and file() expressions in user data
 - Merge multiple user data into a MIME multipart message
 
-[Unreleased]: https://github.com/eighty4/c2/compare/v0.0.3...HEAD
+[Unreleased]: https://github.com/eighty4/c2/compare/v0.0.4...HEAD
+[v0.0.4]: https://github.com/eighty4/c2/compare/v0.0.3...v0.0.4
 [v0.0.3]: https://github.com/eighty4/c2/compare/v0.0.2...v0.0.3
 [v0.0.2]: https://github.com/eighty4/c2/releases/tag/v0.0.2

package/README.md

@@ -12,9 +12,6 @@ npm i -g @eighty4/c2
 c2 -h
 ```
 
-(tests use `bun:test` so [install Bun](https://bun.sh/docs/installation)
-for contributing!)
-
 ## Using the CLI program
 
 ```

package/lib/attachments.ts

@@ -1,5 +1,5 @@
+import { readdir, readFile } from 'node:fs/promises'
 import { evalTemplateExpressions } from './expression.ts'
-import { readDirListing, readToString } from './fs.ts'
 
 export type AttachmentType = 'cloud-config' | 'x-shellscript'
 
@@ -14,11 +14,11 @@ export interface Attachment {
 export async function collectAttachments(
     dir: string,
 ): Promise<Array<Attachment>> {
-    const filenames = await readDirListing(dir)
+    const filenames = await readdir(dir)
     const attachments = await Promise.all(
         filenames.map(async filename => {
             const path = `${dir}/${filename}`
-            const source = await readToString(path)
+            const source = await readFile(path, 'utf-8')
             const type = resolveAttachmentType(filename, source)
             const content = await evalTemplateExpressions(source)
             return { content, filename, path, type, source }
@@ -31,9 +31,9 @@ function compareAttachmentFilenames(
     a1: Attachment,
     a2: Attachment,
 ): 1 | 0 | -1 {
-    if (a1.filename === a2.filename) return 0
+    if (a1.filename < a2.filename) return -1
     if (a1.filename > a2.filename) return 1
-    return -1
+    return 0
 }
 
 export function resolveAttachmentType(

package/lib/{c2.bin.ts → bin.ts}

@@ -1,25 +1,24 @@
 #!/usr/bin/env node
 
+import { stat } from 'node:fs/promises'
 import { buildUserData } from './build.ts'
 import { parseArgs, type ParsedArgs } from './cli.ts'
-import { doesDirExist } from './fs.ts'
 import { startUserDataHttp } from './http.ts'
 
 let args: ParsedArgs | undefined
 try {
     args = parseArgs()
 } catch (e: any) {
-    if (e.message) {
-        console.error(e.message)
-    }
+    errorExit(e.message)
 }
 
 if (!args || args.help) {
     const optional = (s: string) => `\u001b[90m${s}\u001b[0m`
     const required = (s: string) => `\u001b[1m${s}\u001b[0m`
-    errorExit(
+    console.error(
         `c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`,
     )
+    process.exit(1)
 }
 
 if (!(await doesDirExist(args.userDataDir))) {
@@ -46,6 +45,18 @@ try {
 }
 
 function errorExit(msg: string): never {
-    console.error(msg)
+    console.error(errorText('error:'), msg)
     process.exit(1)
 }
+
+function errorText(s: string): string {
+    return `\u001b[1;31m${s}\u001b[0m`
+}
+
+async function doesDirExist(p: string): Promise<boolean> {
+    try {
+        return (await stat(p)).isDirectory()
+    } catch (ignore) {
+        return false
+    }
+}

package/lib/cli.ts

@@ -7,11 +7,7 @@ export type ParsedArgs =
           userDataDir: string
       }
 
-const SCRIPT_SUFFIXES = Object.freeze([
-    '/c2',
-    '/lib_js/c2.bin.js',
-    '/lib/c2.bin.ts',
-])
+const SCRIPT_SUFFIXES = Object.freeze(['/c2', '/lib_js/bin.js', '/lib/bin.ts'])
 
 export function parseArgs(input?: Array<string>): ParsedArgs {
     if (!input) {

package/lib/expression.ts

@@ -1,5 +1,5 @@
+import { readFile } from 'node:fs/promises'
 import MagicString from 'magic-string'
-import { readToString } from './fs.ts'
 
 type TemplateExpression = {
     index: number
@@ -56,7 +56,7 @@ async function evaluate(expression: string): Promise<string> {
             }
             path = `${process.env.HOME}${path.substring(1)}`
         }
-        return readToString(path)
+        return await readFile(path, 'utf-8')
     }
 
     throw new Error(`unsupported expression: ${expression}`)

package/lib/fs.testing.ts

@@ -1,4 +1,4 @@
-import { mkdtemp, rm } from 'node:fs/promises'
+import { mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 
@@ -8,7 +8,7 @@ export async function makeFile(
     pathPrefix?: string,
 ): Promise<string> {
     const p = !!pathPrefix ? join(pathPrefix, path) : path
-    await Bun.file(p).write(content)
+    await writeFile(p, content)
     return p
 }
 

package/lib_js/attachments.js

@@ -1,10 +1,10 @@
+import { readdir, readFile } from 'node:fs/promises';
 import { evalTemplateExpressions } from "./expression.js";
-import { readDirListing, readToString } from "./fs.js";
 export async function collectAttachments(dir) {
-    const filenames = await readDirListing(dir);
+    const filenames = await readdir(dir);
     const attachments = await Promise.all(filenames.map(async (filename) => {
         const path = `${dir}/${filename}`;
-        const source = await readToString(path);
+        const source = await readFile(path, 'utf-8');
         const type = resolveAttachmentType(filename, source);
         const content = await evalTemplateExpressions(source);
         return { content, filename, path, type, source };
@@ -12,11 +12,11 @@ export async function collectAttachments(dir) {
     return attachments.sort(compareAttachmentFilenames);
 }
 function compareAttachmentFilenames(a1, a2) {
-    if (a1.filename === a2.filename)
-        return 0;
+    if (a1.filename < a2.filename)
+        return -1;
     if (a1.filename > a2.filename)
         return 1;
-    return -1;
+    return 0;
 }
 export function resolveAttachmentType(filename, source) {
     if (filename.endsWith('.yml') || filename.endsWith('.yaml')) {

package/lib_js/{c2.bin.js → bin.js}

@@ -1,21 +1,20 @@
 #!/usr/bin/env node
+import { stat } from 'node:fs/promises';
 import { buildUserData } from "./build.js";
 import { parseArgs } from "./cli.js";
-import { doesDirExist } from "./fs.js";
 import { startUserDataHttp } from "./http.js";
 let args;
 try {
     args = parseArgs();
 }
 catch (e) {
-    if (e.message) {
-        console.error(e.message);
-    }
+    errorExit(e.message);
 }
 if (!args || args.help) {
     const optional = (s) => `\u001b[90m${s}\u001b[0m`;
     const required = (s) => `\u001b[1m${s}\u001b[0m`;
-    errorExit(`c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`);
+    console.error(`c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`);
+    process.exit(1);
 }
 if (!(await doesDirExist(args.userDataDir))) {
     errorExit(`${args.userDataDir} directory does not exist`);
@@ -39,6 +38,17 @@ catch (e) {
     errorExit(e.message);
 }
 function errorExit(msg) {
-    console.error(msg);
+    console.error(errorText('error:'), msg);
     process.exit(1);
 }
+function errorText(s) {
+    return `\u001b[1;31m${s}\u001b[0m`;
+}
+async function doesDirExist(p) {
+    try {
+        return (await stat(p)).isDirectory();
+    }
+    catch (ignore) {
+        return false;
+    }
+}

package/lib_js/cli.js

@@ -1,8 +1,4 @@
-const SCRIPT_SUFFIXES = Object.freeze([
-    '/c2',
-    '/lib_js/c2.bin.js',
-    '/lib/c2.bin.ts',
-]);
+const SCRIPT_SUFFIXES = Object.freeze(['/c2', '/lib_js/bin.js', '/lib/bin.ts']);
 export function parseArgs(input) {
     if (!input) {
         input = process.argv;

package/lib_js/expression.js

@@ -1,5 +1,5 @@
+import { readFile } from 'node:fs/promises';
 import MagicString from 'magic-string';
-import { readToString } from "./fs.js";
 export async function evalTemplateExpressions(content) {
     const regex = new RegExp(/\${{\s*(.*)\s*}}/g);
     let match;
@@ -41,7 +41,7 @@ async function evaluate(expression) {
             }
             path = `${process.env.HOME}${path.substring(1)}`;
         }
-        return readToString(path);
+        return await readFile(path, 'utf-8');
     }
     throw new Error(`unsupported expression: ${expression}`);
 }

package/lib_js/fs.testing.js

@@ -1,9 +1,9 @@
-import { mkdtemp, rm } from 'node:fs/promises';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 export async function makeFile(path, content, pathPrefix) {
     const p = !!pathPrefix ? join(pathPrefix, path) : path;
-    await Bun.file(p).write(content);
+    await writeFile(p, content);
     return p;
 }
 export async function makeTempDir() {

package/lib_types/{c2.api.d.ts → api.d.ts}

@@ -1,2 +1,2 @@
 export { type BuildUserDataOpts, buildUserData } from './build.ts';
-//# sourceMappingURL=c2.api.d.ts.map
+//# sourceMappingURL=api.d.ts.map

package/lib_types/api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA"}

package/lib_types/bin.d.ts

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+export {};
+//# sourceMappingURL=bin.d.ts.map

package/lib_types/bin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin.d.ts","sourceRoot":"","sources":["../lib/bin.ts"],"names":[],"mappings":""}

package/lib_types/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAQP,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAqD3D"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../lib/cli.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,UAAU,GAChB;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,GACd;IACI,IAAI,CAAC,EAAE,KAAK,CAAA;IACZ,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;CACtB,CAAA;AAIP,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAqD3D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/c2",
-  "version": "0.0.3",
+  "version": "0.0.5-0",
   "author": "Adam McKee <adam.be.g84d@gmail.com>",
   "repository": "https://github.com/eighty4/c2",
   "homepage": "https://github.com/eighty4/c2",
@@ -20,27 +20,19 @@
     "node": ">=23"
   },
   "bin": {
-    "c2": "./lib_js/c2.bin.js"
+    "c2": "./lib_js/bin.js"
   },
   "exports": {
     ".": {
-      "bun": "./lib/c2.api.ts",
-      "node": "./lib_js/c2.api.js",
-      "types": "./lib_types/c2.api.d.ts"
+      "bun": "./lib/api.ts",
+      "node": "./lib_js/api.js",
+      "types": "./lib_types/api.d.ts"
     }
   },
-  "scripts": {
-    "build": "tsc",
-    "fmt": "prettier --write .",
-    "fmtcheck": "prettier --check .",
-    "test": "bun test",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "magic-string": "0.30.17"
   },
   "devDependencies": {
-    "@types/bun": "1.2.5",
     "@types/node": "^22.14.1",
     "prettier": "^3.5.3",
     "typescript": "5.8.2"
@@ -51,5 +43,12 @@
     "lib_js/*",
     "lib_types/*",
     "CHANGELOG.md"
-  ]
-}
+  ],
+  "scripts": {
+    "build": "tsc",
+    "fmt": "prettier --write .",
+    "fmtcheck": "prettier --check .",
+    "test": "node --test \"lib/**/*.spec.ts\"",
+    "typecheck": "tsc --noEmit"
+  }
+}

package/lib/fs.ts

@@ -1,17 +0,0 @@
-import { readdir, readFile, stat } from 'node:fs/promises'
-
-export async function doesDirExist(p: string): Promise<boolean> {
-    try {
-        return (await stat(p)).isDirectory()
-    } catch (ignore) {
-        return false
-    }
-}
-
-export async function readDirListing(p: string): Promise<Array<string>> {
-    return readdir(p)
-}
-
-export async function readToString(p: string): Promise<string> {
-    return readFile(p, 'utf8')
-}

package/lib_js/fs.js

@@ -1,15 +0,0 @@
-import { readdir, readFile, stat } from 'node:fs/promises';
-export async function doesDirExist(p) {
-    try {
-        return (await stat(p)).isDirectory();
-    }
-    catch (ignore) {
-        return false;
-    }
-}
-export async function readDirListing(p) {
-    return readdir(p);
-}
-export async function readToString(p) {
-    return readFile(p, 'utf8');
-}

package/lib_types/c2.api.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"c2.api.d.ts","sourceRoot":"","sources":["../lib/c2.api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA"}

package/lib_types/c2.bin.d.ts

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-export {};
-//# sourceMappingURL=c2.bin.d.ts.map

package/lib_types/c2.bin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"c2.bin.d.ts","sourceRoot":"","sources":["../lib/c2.bin.ts"],"names":[],"mappings":""}

package/lib_types/fs.d.ts

@@ -1,4 +0,0 @@
-export declare function doesDirExist(p: string): Promise<boolean>;
-export declare function readDirListing(p: string): Promise<Array<string>>;
-export declare function readToString(p: string): Promise<string>;
-//# sourceMappingURL=fs.d.ts.map

package/lib_types/fs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../lib/fs.ts"],"names":[],"mappings":"AAEA,wBAAsB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAM9D;AAED,wBAAsB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAEtE;AAED,wBAAsB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE7D"}