@eighty4/c2 0.0.2-26 → 0.0.2-28

package/CHANGELOG.md

@@ -1,4 +1,6 @@
-## Unreleased
+## [Unreleased]
+
+### Added
 
 - Evaluate env() and file() expressions in user data
 - Merge multiple user data into a MIME multipart message

package/lib/attachments.spec.ts

@@ -9,7 +9,7 @@ beforeEach(async () => (tmpDir = await makeTempDir()))
 
 afterEach(async () => await removeDir(tmpDir))
 
-test('collect throws error when yml does not have #cloud-config comment', async () => {
+test('collect throws error for unknown filetype', async () => {
     await makeFile('init-cloud', 'whoopie', tmpDir)
     await expect(() => collectAttachments(tmpDir)).toThrow(
         'init-cloud is an unsupported file type',
@@ -29,6 +29,19 @@ test('collect cloud config yml', async () => {
     ])
 })
 
+test('collect cloud config yaml', async () => {
+    await makeFile('init-cloud.yaml', '#cloud-config\nwhoopie', tmpDir)
+    expect(await collectAttachments(tmpDir)).toStrictEqual([
+        {
+            path: join(tmpDir, 'init-cloud.yaml'),
+            content: '#cloud-config\nwhoopie',
+            filename: 'init-cloud.yaml',
+            source: '#cloud-config\nwhoopie',
+            type: 'cloud-config',
+        },
+    ])
+})
+
 test('collect throws error when yml does not have #cloud-config comment', async () => {
     await makeFile('init-cloud.yml', 'whoopie', tmpDir)
     await expect(() => collectAttachments(tmpDir)).toThrow(

package/lib/cli.spec.ts

@@ -14,6 +14,19 @@ test('parseArgs with ts entrypoint', () => {
     })
 })
 
+test('parseArgs with executable entrypoint', () => {
+    expect(
+        parseArgs([
+            '/Users/who/.nvm/versions/node/v23.7.0/bin/node',
+            '/Users/who/.nvm/versions/node/v23.7.0/bin/c2',
+            'user_data_dir',
+        ]),
+    ).toStrictEqual({
+        base64: false,
+        userDataDir: 'user_data_dir',
+    })
+})
+
 test('parseArgs with js entrypoint', () => {
     expect(
         parseArgs([
@@ -27,6 +40,12 @@ test('parseArgs with js entrypoint', () => {
     })
 })
 
+test('parseArgs with unexepected argv', () => {
+    expect(() => parseArgs(['tippity', 'doo', 'da'])).toThrow(
+        'unexpected program installation\nplease report at https://github.com/eighty4/c2/issues/new and include:\n\n[\n    \"tippity\",\n    \"doo\",\n    \"da\"\n]',
+    )
+})
+
 test('parseArgs errors without USER_DATA_DIR', () => {
     expect(() =>
         parseArgs([
@@ -44,7 +63,7 @@ test('parseArgs errors with extra USER_DATA_DIR', () => {
             'user_data_dir',
             'some_other_arg',
         ]),
-    ).toThrow('')
+    ).toThrow()
 })
 
 test('parseArgs with --base64', () => {

package/lib/cli.ts

@@ -7,25 +7,35 @@ export type ParsedArgs =
           userDataDir: string
       }
 
-export function parseArgs(args?: Array<string>): ParsedArgs {
-    if (!args) {
-        args = process.argv
+const SCRIPT_SUFFIXES = Object.freeze([
+    '/c2',
+    '/lib_js/c2.bin.js',
+    '/lib/c2.bin.ts',
+])
+
+export function parseArgs(input?: Array<string>): ParsedArgs {
+    if (!input) {
+        input = process.argv
     }
-    args = [...args]
-    let shifted
-    while ((shifted = args.shift())) {
-        if (
-            shifted.endsWith('/lib_js/c2.bin.js') ||
-            shifted.endsWith('/lib/c2.bin.ts')
-        ) {
+    let parsing: Array<string> = [...input]
+    let shifted: string | undefined
+    let found_cli: boolean = false
+    while ((shifted = parsing.shift())) {
+        if (SCRIPT_SUFFIXES.some(suffix => shifted!.endsWith(suffix))) {
+            found_cli = true
             break
         }
     }
+    if (!found_cli) {
+        throw new Error(
+            `unexpected program installation\nplease report at https://github.com/eighty4/c2/issues/new and include:\n\n${JSON.stringify(input, null, 4)}`,
+        )
+    }
     let base64 = false
     let httpPort: number | undefined
     let userData: Array<string> = []
     let expectHttpPort = false
-    for (const arg of args) {
+    for (const arg of parsing) {
         if (expectHttpPort) {
             expectHttpPort = false
             httpPort = parseInt(arg, 10)

package/lib/expression.spec.ts

@@ -32,6 +32,14 @@ test('env() not found', async () => {
     )
 })
 
+test('env() name not valid', async () => {
+    ;['2_NOT_VALID', 'NOT=VALID', 'NOT@VALID'].forEach(envVar =>
+        expect(() =>
+            evalTemplateExpressions(`\${{ env('${envVar}') }}`),
+        ).toThrow(`env var \`${envVar}\` is not a valid name`),
+    )
+})
+
 test('file() not found', async () => {
     const path = join(await makeTempDir(), 'whoopie')
     expect(() => evalTemplateExpressions(`\${{ file('${path}') }}`)).toThrow(

package/lib/expression.ts

@@ -38,10 +38,8 @@ async function evaluate(expression: string): Promise<string> {
     let match: RegExpMatchArray | null
     if ((match = expression.match(/env\(\s*'(.*)'\s*\)/)) != null) {
         const envVarKey = match[1]
-        if (!/[A-Z_]+/.test(envVarKey)) {
-            throw new Error(
-                `env var expression \`${envVarKey}\` is not valid syntax`,
-            )
+        if (!/^[A-Z_][A-Z_\d]+$/.test(envVarKey)) {
+            throw new Error(`env var \`${envVarKey}\` is not a valid name`)
         }
         const envVarValue = process.env[envVarKey]
         if (!envVarValue) {

package/lib_js/cli.js

@@ -1,20 +1,29 @@
-export function parseArgs(args) {
-    if (!args) {
-        args = process.argv;
+const SCRIPT_SUFFIXES = Object.freeze([
+    '/c2',
+    '/lib_js/c2.bin.js',
+    '/lib/c2.bin.ts',
+]);
+export function parseArgs(input) {
+    if (!input) {
+        input = process.argv;
     }
-    args = [...args];
+    let parsing = [...input];
     let shifted;
-    while ((shifted = args.shift())) {
-        if (shifted.endsWith('/lib_js/c2.bin.js') ||
-            shifted.endsWith('/lib/c2.bin.ts')) {
+    let found_cli = false;
+    while ((shifted = parsing.shift())) {
+        if (SCRIPT_SUFFIXES.some(suffix => shifted.endsWith(suffix))) {
+            found_cli = true;
             break;
         }
     }
+    if (!found_cli) {
+        throw new Error(`unexpected program installation\nplease report at https://github.com/eighty4/c2/issues/new and include:\n\n${JSON.stringify(input, null, 4)}`);
+    }
     let base64 = false;
     let httpPort;
     let userData = [];
     let expectHttpPort = false;
-    for (const arg of args) {
+    for (const arg of parsing) {
         if (expectHttpPort) {
             expectHttpPort = false;
             httpPort = parseInt(arg, 10);

package/lib_js/expression.js

@@ -24,8 +24,8 @@ async function evaluate(expression) {
     let match;
     if ((match = expression.match(/env\(\s*'(.*)'\s*\)/)) != null) {
         const envVarKey = match[1];
-        if (!/[A-Z_]+/.test(envVarKey)) {
-            throw new Error(`env var expression \`${envVarKey}\` is not valid syntax`);
+        if (!/^[A-Z_][A-Z_\d]+$/.test(envVarKey)) {
+            throw new Error(`env var \`${envVarKey}\` is not a valid name`);
         }
         const envVarValue = process.env[envVarKey];
         if (!envVarValue) {

package/lib_types/cli.d.ts

@@ -6,5 +6,5 @@ export type ParsedArgs = {
     httpPort?: number;
     userDataDir: string;
 };
-export declare function parseArgs(args?: Array<string>): ParsedArgs;
+export declare function parseArgs(input?: Array<string>): ParsedArgs;
 //# sourceMappingURL=cli.d.ts.map

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;AAEP,wBAAgB,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,UAAU,CAiD1D"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eighty4/c2",
-  "version": "0.0.2-26",
+  "version": "0.0.2-28",
   "author": "Adam McKee <adam.be.g84d@gmail.com>",
   "repository": "https://github.com/eighty4/c2",
   "homepage": "https://github.com/eighty4/c2",
@@ -24,8 +24,8 @@
   },
   "exports": {
     ".": {
-      "bun": "./lib_js/c2.api.js",
-      "node": "./lib/c2.api.ts"
+      "bun": "./lib/c2.api.ts",
+      "node": "./lib_js/c2.api.js"
     }
   },
   "imports": {
@@ -36,7 +36,7 @@
   },
   "types": "./lib_types",
   "scripts": {
-    "build": "tsc && chmod +x lib_js/c2.bin.js",
+    "build": "tsc",
     "fmt": "prettier --write .",
     "fmtcheck": "prettier --check .",
     "typecheck": "tsc --noEmit"