@eighty4/c2 0.0.2-2 → 0.0.2-26

package/README.md

@@ -30,7 +30,7 @@ const userData: string = await buildUserData('./cloud_init_dir')
 
 ## Cloud Config data dir
 
-Multiple user data are ordered by filenames and `01_` numbered prefixes help declaring execution order.
+Multiple user data are ordered by filenames and `01_` numbered prefixes help declare execution order.
 
 ```
 ls ./cloud_init_dir

package/lib/attachments.spec.ts

@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, expect, test } from 'bun:test'
 import { join } from 'node:path'
-import { collectAttachments } from '#c2/attachments.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { collectAttachments } from '#c2/attachments'
+import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing'
 
 let tmpDir: string
 
@@ -9,18 +9,40 @@ beforeEach(async () => (tmpDir = await makeTempDir()))
 
 afterEach(async () => await removeDir(tmpDir))
 
+test('collect throws error when yml does not have #cloud-config comment', async () => {
+    await makeFile('init-cloud', 'whoopie', tmpDir)
+    await expect(() => collectAttachments(tmpDir)).toThrow(
+        'init-cloud is an unsupported file type',
+    )
+})
+
 test('collect cloud config yml', async () => {
-    await makeFile('init-cloud.yml', 'whoopie', tmpDir)
+    await makeFile('init-cloud.yml', '#cloud-config\nwhoopie', tmpDir)
     expect(await collectAttachments(tmpDir)).toStrictEqual([
         {
             path: join(tmpDir, 'init-cloud.yml'),
-            content: 'whoopie',
+            content: '#cloud-config\nwhoopie',
             filename: 'init-cloud.yml',
+            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(
+        'YAML cloud config must start with a #cloud-config comment',
+    )
+})
+
+test('collect throws error when yaml does not have #cloud-config comment', async () => {
+    await makeFile('init-cloud.yaml', 'whoopie', tmpDir)
+    await expect(() => collectAttachments(tmpDir)).toThrow(
+        'YAML cloud config must start with a #cloud-config comment',
+    )
+})
+
 test('collect shell script', async () => {
     await makeFile('init-cloud.sh', 'whoopie', tmpDir)
     expect(await collectAttachments(tmpDir)).toStrictEqual([
@@ -28,9 +50,30 @@ test('collect shell script', async () => {
             path: join(tmpDir, 'init-cloud.sh'),
             content: 'whoopie',
             filename: 'init-cloud.sh',
+            source: 'whoopie',
+            type: 'x-shellscript',
+        },
+    ])
+})
+
+test('evals template expressions', async () => {
+    const resourceTmpDir = await makeTempDir()
+    await makeFile('whoopie', 'whoopie', resourceTmpDir)
+    await makeFile(
+        'init-cloud.sh',
+        `\${{ file('${resourceTmpDir}/whoopie') }}`,
+        tmpDir,
+    )
+    expect(await collectAttachments(tmpDir)).toStrictEqual([
+        {
+            path: tmpDir + '/init-cloud.sh',
+            content: 'whoopie',
+            filename: 'init-cloud.sh',
+            source: `\${{ file('${resourceTmpDir}/whoopie') }}`,
             type: 'x-shellscript',
         },
     ])
+    await removeDir(resourceTmpDir)
 })
 
 test('sorts attachments by filename', async () => {
@@ -41,12 +84,14 @@ test('sorts attachments by filename', async () => {
             path: join(tmpDir, '01-init-cloud.sh'),
             content: 'whoopie',
             filename: '01-init-cloud.sh',
+            source: 'whoopie',
             type: 'x-shellscript',
         },
         {
             path: join(tmpDir, '02-init-cloud.sh'),
             content: 'whoopie',
             filename: '02-init-cloud.sh',
+            source: 'whoopie',
             type: 'x-shellscript',
         },
     ])

package/lib/attachments.ts

@@ -1,4 +1,5 @@
-import { readDirListing, readToString } from '#c2/fs.ts'
+import { evalTemplateExpressions } from '#c2/expression'
+import { readDirListing, readToString } from '#c2/fs'
 
 export type AttachmentType = 'cloud-config' | 'x-shellscript'
 
@@ -6,20 +7,24 @@ export interface Attachment {
     path: string
     content: string
     filename: string
+    source: string
     type: AttachmentType
 }
 
 export async function collectAttachments(
     dir: string,
 ): Promise<Array<Attachment>> {
-    const result: Array<Attachment> = []
-    for (const filename of await readDirListing(dir)) {
-        const path = `${dir}/${filename}`
-        const content = await readToString(path)
-        const type = resolveAttachmentType(filename, content)
-        result.push({ content, filename, path, type })
-    }
-    return result.sort(compareAttachmentFilenames)
+    const filenames = await readDirListing(dir)
+    const attachments = await Promise.all(
+        filenames.map(async filename => {
+            const path = `${dir}/${filename}`
+            const source = await readToString(path)
+            const type = resolveAttachmentType(filename, source)
+            const content = await evalTemplateExpressions(source)
+            return { content, filename, path, type, source }
+        }),
+    )
+    return attachments.sort(compareAttachmentFilenames)
 }
 
 function compareAttachmentFilenames(
@@ -33,17 +38,18 @@ function compareAttachmentFilenames(
 
 export function resolveAttachmentType(
     filename: string,
-    content: string,
+    source: string,
 ): AttachmentType {
-    if (
-        filename.endsWith('.yml') ||
-        (filename.endsWith('.yaml') &&
-            content.trim().startsWith('#cloud-config'))
-    ) {
+    if (filename.endsWith('.yml') || filename.endsWith('.yaml')) {
+        if (!source.trim().startsWith('#cloud-config')) {
+            throw new Error(
+                'YAML cloud config must start with a #cloud-config comment',
+            )
+        }
         return 'cloud-config'
     } else if (filename.endsWith('.sh')) {
         return 'x-shellscript'
     } else {
-        throw new Error(`unsupported file type ${filename}`)
+        throw new Error(`${filename} is an unsupported file type`)
     }
 }

package/lib/build.spec.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, expect, test } from 'bun:test'
-import { buildUserData } from '#c2/build.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { buildUserData } from '#c2/build'
+import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing'
 
 let tmpDir: string
 
@@ -11,9 +11,9 @@ beforeEach(async () => {
 afterEach(async () => removeDir(tmpDir))
 
 test('build user data of single file', async () => {
-    const initCloudYml = 'whoopie'
+    const initCloudYml = '#cloud-config\nwhoopie'
     await makeFile('init-cloud.yml', initCloudYml, tmpDir)
-    expect(await buildUserData(tmpDir)).toStrictEqual('whoopie')
+    expect(await buildUserData(tmpDir)).toStrictEqual(initCloudYml)
 })
 
 test('build user data of single file with template expression', async () => {
@@ -21,38 +21,37 @@ test('build user data of single file with template expression', async () => {
     await makeFile('whoopie', 'whoopie', whoopie)
     await makeFile(
         'init-cloud.yml',
-        `\${{ file('${whoopie}/whoopie')}}`,
+        `#cloud-config\n\${{ file('${whoopie}/whoopie')}}`,
         tmpDir,
     )
-    expect(await buildUserData(tmpDir)).toStrictEqual('whoopie')
+    expect(await buildUserData(tmpDir)).toStrictEqual('#cloud-config\nwhoopie')
     await removeDir(whoopie)
 })
 
 test('build user data multipart message', async () => {
-    await makeFile('1-init-cloud.yml', 'whoopie', tmpDir)
+    await makeFile('1-init-cloud.yml', '#cloud-config\nwhoopie', tmpDir)
     await makeFile('2-init-cloud.sh', 'cushion', tmpDir)
     const boundary = Bun.randomUUIDv7()
     expect(
         await buildUserData(tmpDir, { attachmentBoundary: boundary }),
     ).toStrictEqual(
-        `Content-Type: multipart/mixed; boundary=${boundary}
-MIME-Version: 1.0
-Number-Attachments: 2
---${boundary}
-Content-Type: text/cloud-config; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="1-init-cloud.yml"
-
-whoopie
---${boundary}
-Content-Type: text/x-shellscript; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="2-init-cloud.sh"
-
-cushion
---${boundary}
+        `Content-Type: multipart/mixed; boundary=${boundary}\r
+MIME-Version: 1.0\r
+Number-Attachments: 2\r
+--${boundary}\r
+Content-Type: text/cloud-config; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="1-init-cloud.yml"\r
+\r
+#cloud-config
+whoopie\r
+--${boundary}\r
+Content-Type: text/x-shellscript; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="2-init-cloud.sh"\r
+\r
+cushion\r
+--${boundary}--\r
 `,
     )
 })
@@ -62,7 +61,7 @@ test('build user data multipart with template expression', async () => {
     await makeFile('whoopie', 'whoopie', whoopie)
     await makeFile(
         '1-init-cloud.yml',
-        `\${{ file('${whoopie}/whoopie')}}`,
+        `#cloud-config\n\${{ file('${whoopie}/whoopie')}}`,
         tmpDir,
     )
     await makeFile('2-init-cloud.sh', 'cushion', tmpDir)
@@ -70,24 +69,22 @@ test('build user data multipart with template expression', async () => {
     expect(
         await buildUserData(tmpDir, { attachmentBoundary: boundary }),
     ).toStrictEqual(
-        `Content-Type: multipart/mixed; boundary=${boundary}
-MIME-Version: 1.0
-Number-Attachments: 2
---${boundary}
-Content-Type: text/cloud-config; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="1-init-cloud.yml"
-
-whoopie
---${boundary}
-Content-Type: text/x-shellscript; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="2-init-cloud.sh"
-
-cushion
---${boundary}
+        `Content-Type: multipart/mixed; boundary=${boundary}\r
+MIME-Version: 1.0\r
+Number-Attachments: 2\r
+--${boundary}\r
+Content-Type: text/cloud-config; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="1-init-cloud.yml"\r
+\r
+#cloud-config\nwhoopie\r
+--${boundary}\r
+Content-Type: text/x-shellscript; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="2-init-cloud.sh"\r
+\r
+cushion\r
+--${boundary}--\r
 `,
     )
 })

package/lib/build.ts

@@ -1,6 +1,5 @@
-import { type Attachment, collectAttachments } from '#c2/attachments.ts'
-import { evalTemplateExpressions } from '#c2/expression.ts'
-import { readToString } from '#c2/fs.ts'
+import { collectAttachments } from '#c2/attachments'
+import { MultipartMessage } from '#c2/http'
 
 export type BuildUserDataOpts = {
     attachmentBoundary?: string
@@ -15,45 +14,11 @@ export async function buildUserData(
         case 0:
             throw new Error(`nothing found in dir ${userDataDir}`)
         case 1:
-            return evalTemplateExpressions(
-                await readToString(attachments[0].path),
-            )
+            return attachments[0].content
         default:
-            return buildMultipartUserData(attachments, opts?.attachmentBoundary)
+            return new MultipartMessage(
+                attachments,
+                opts?.attachmentBoundary,
+            ).toHTTP()
     }
 }
-
-function createBoundary(): string {
-    return new Date().toISOString()
-}
-
-async function buildMultipartUserData(
-    attachments: Array<Attachment>,
-    boundary: string = createBoundary(),
-): Promise<string> {
-    let result = `Content-Type: multipart/mixed; boundary=${boundary}
-MIME-Version: 1.0
-Number-Attachments: ${attachments.length}
---${boundary}
-`
-
-    for (const attachment of attachments) {
-        let content: string
-        try {
-            content = await evalTemplateExpressions(attachment.content)
-        } catch (e: any) {
-            throw new Error(
-                `error templating ${attachment.filename}: ${e.message}`,
-            )
-        }
-        result += `Content-Type: text/${attachment.type}; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="${attachment.filename}"
-
-${content}
---${boundary}
-`
-    }
-    return result
-}

package/lib/c2.api.ts

@@ -1 +1 @@
-export { type BuildUserDataOpts, buildUserData } from '#c2/build.ts'
+export { type BuildUserDataOpts, buildUserData } from '#c2/build'

package/lib/c2.bin.ts

@@ -1,8 +1,9 @@
 #!/usr/bin/env node
 
-import { buildUserData } from '#c2/build.ts'
-import { parseArgs, type ParsedArgs } from '#c2/cli.ts'
-import { doesDirExist } from '#c2/fs.ts'
+import { buildUserData } from '#c2/build'
+import { parseArgs, type ParsedArgs } from '#c2/cli'
+import { doesDirExist } from '#c2/fs'
+import { startUserDataHttp } from '#c2/http'
 
 let args: ParsedArgs | undefined
 try {
@@ -21,17 +22,25 @@ if (!args || args.help) {
     )
 }
 
-if (args.httpPort) {
-    errorExit('--http PORT is not yet implemented')
-}
-
 if (!(await doesDirExist(args.userDataDir))) {
     errorExit(`${args.userDataDir} directory does not exist`)
 }
 
+let work: () => Promise<void>
+
+if (typeof args.httpPort !== 'undefined') {
+    work = async () => {
+        startUserDataHttp(args.httpPort!, args.userDataDir)
+    }
+} else {
+    work = async () => {
+        const userData = await buildUserData(args.userDataDir)
+        console.log(args.base64 ? btoa(userData) : userData)
+    }
+}
+
 try {
-    const userData = await buildUserData(args.userDataDir)
-    console.log(args.base64 ? btoa(userData) : userData)
+    await work()
 } catch (e: any) {
     errorExit(e.message)
 }

package/lib/cli.spec.ts

@@ -1,11 +1,24 @@
 import { expect, test } from 'bun:test'
-import { parseArgs } from '#c2/cli.ts'
+import { parseArgs } from '#c2/cli'
 
-test('parseArgs', () => {
+test('parseArgs with ts entrypoint', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/lib/c2.bin.ts',
+            'user_data_dir',
+        ]),
+    ).toStrictEqual({
+        base64: false,
+        userDataDir: 'user_data_dir',
+    })
+})
+
+test('parseArgs with js entrypoint', () => {
+    expect(
+        parseArgs([
+            '/Users/who/.nvm/versions/node/v23.7.0/bin/node',
+            '/Users/who/user-data/lib_js/c2.bin.js',
             'user_data_dir',
         ]),
     ).toStrictEqual({
@@ -16,7 +29,10 @@ test('parseArgs', () => {
 
 test('parseArgs errors without USER_DATA_DIR', () => {
     expect(() =>
-        parseArgs(['/Users/who/.bun/bin/bun', '/Users/who/user-data/c2.ts']),
+        parseArgs([
+            '/Users/who/.bun/bin/bun',
+            '/Users/who/user-data/lib/c2.bin.ts',
+        ]),
     ).toThrow()
 })
 
@@ -24,7 +40,7 @@ test('parseArgs errors with extra USER_DATA_DIR', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/lib/c2.bin.ts',
             'user_data_dir',
             'some_other_arg',
         ]),
@@ -35,7 +51,7 @@ test('parseArgs with --base64', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/lib/c2.bin.ts',
             '--base64',
             'user_data_dir',
         ]),
@@ -49,7 +65,7 @@ test('parseArgs with --http PORT', () => {
     expect(
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/lib/c2.bin.ts',
             '--http',
             '6666',
             'user_data_dir',
@@ -61,10 +77,21 @@ test('parseArgs with --http bunk', () => {
     expect(() =>
         parseArgs([
             '/Users/who/.bun/bin/bun',
-            '/Users/who/user-data/c2.ts',
+            '/Users/who/user-data/lib/c2.bin.ts',
             '--http',
             'bunk',
             'user_data_dir',
         ]),
     ).toThrow('--http bunk is not a valid http port')
 })
+
+test('parseArgs with --http without PORT', () => {
+    expect(() =>
+        parseArgs([
+            '/Users/who/.bun/bin/bun',
+            '/Users/who/user-data/lib/c2.bin.ts',
+            'user_data_dir',
+            '--http',
+        ]),
+    ).toThrow('--http did not include a PORT')
+})

package/lib/cli.ts

@@ -12,7 +12,15 @@ export function parseArgs(args?: Array<string>): ParsedArgs {
         args = process.argv
     }
     args = [...args]
-    while (!args.shift()!.endsWith('/c2.ts')) {}
+    let shifted
+    while ((shifted = args.shift())) {
+        if (
+            shifted.endsWith('/lib_js/c2.bin.js') ||
+            shifted.endsWith('/lib/c2.bin.ts')
+        ) {
+            break
+        }
+    }
     let base64 = false
     let httpPort: number | undefined
     let userData: Array<string> = []
@@ -34,6 +42,9 @@ export function parseArgs(args?: Array<string>): ParsedArgs {
             userData.push(arg)
         }
     }
+    if (expectHttpPort) {
+        throw new Error('--http did not include a PORT')
+    }
     switch (userData.length) {
         case 1:
             const userDataDir = userData[0]

package/lib/expression.spec.ts

@@ -1,7 +1,7 @@
 import { afterAll, afterEach, beforeEach, expect, test } from 'bun:test'
 import { join } from 'node:path'
-import { evalTemplateExpressions } from '#c2/expression.ts'
-import { makeFile, makeTempDir, removeDir } from '#c2/fs.testing.ts'
+import { evalTemplateExpressions } from './expression.ts'
+import { makeFile, makeTempDir, removeDir } from './fs.testing.ts'
 
 let files: Array<string> = []
 let tmpDir: string

package/lib/expression.ts

@@ -1,5 +1,5 @@
 import MagicString from 'magic-string'
-import { readToString } from '#c2/fs.ts'
+import { readToString } from '#c2/fs'
 
 type TemplateExpression = {
     index: number

package/lib/http.spec.ts

@@ -0,0 +1,57 @@
+import { beforeEach, expect, test } from 'bun:test'
+import { MultipartMessage, MultipartAttachment } from '#c2/http'
+
+let message: MultipartMessage
+
+beforeEach(() => {
+    message = new MultipartMessage(
+        [
+            {
+                path: 'upgrades',
+                content: '#cloud-config\nupgrades',
+                filename: 'upgrades.yml',
+                source: '#cloud-config\nupgrades',
+                type: 'cloud-config',
+            },
+            {
+                path: 'security',
+                content: 'security',
+                filename: 'security.sh',
+                source: 'security',
+                type: 'x-shellscript',
+            },
+        ],
+        'BOUNDARY',
+    )
+})
+
+test('multipart message creates cloud-init payload', () => {
+    expect(message.toHTTP()).toStrictEqual(
+        `Content-Type: multipart/mixed; boundary=BOUNDARY\r
+MIME-Version: 1.0\r
+Number-Attachments: 2\r
+--BOUNDARY\r
+Content-Type: text/cloud-config; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="upgrades.yml"\r
+\r
+#cloud-config
+upgrades\r
+--BOUNDARY\r
+Content-Type: text/x-shellscript; charset="us-ascii"\r
+Content-Transfer-Encoding: 7bit\r
+Content-Disposition: attachment; filename="security.sh"\r
+\r
+security\r
+--BOUNDARY--\r
+`,
+    )
+})
+
+test('multipart message creates HTTP headers', () => {
+    expect(message.headers).toStrictEqual({
+        'Content-Type': 'multipart/mixed; boundary=BOUNDARY',
+        'MIME-Version': '1.0',
+        'Number-Attachments': '2',
+    })
+})

package/lib/http.ts

@@ -0,0 +1,110 @@
+import { randomUUID } from 'node:crypto'
+import { createServer, type ServerResponse } from 'node:http'
+import { type Attachment, collectAttachments } from '#c2/attachments'
+
+export function startUserDataHttp(port: number, userDataDir: string) {
+    const server = createServer((req, res) => {
+        console.log(req.method, req.url)
+        if (req.method !== 'GET') {
+            res.writeHead(405)
+            res.end()
+        } else if (req.url === '/user-data') {
+            sendUserData(res, userDataDir).then()
+        } else {
+            res.writeHead(
+                req.url === '/meta-data' || req.url === '/network-config'
+                    ? 200
+                    : 404,
+            )
+            res.end()
+        }
+    })
+    server.listen(port, () => {
+        console.log(userDataDir, `up @ http://localhost:${port}/user-data`)
+    })
+}
+
+async function sendUserData(res: ServerResponse, userDataDir: string) {
+    try {
+        const message = new MultipartMessage(
+            await collectAttachments(userDataDir),
+        )
+        res.writeHead(200, message.headers)
+        res.write(message.responseBody())
+    } catch (e: any) {
+        console.error(500, '/user-data', e.message)
+        res.writeHead(500)
+    } finally {
+        res.end()
+    }
+}
+
+export class MultipartMessage {
+    static createBoundary(): string {
+        return randomUUID()
+    }
+
+    readonly #attachments: Array<MultipartAttachment>
+    readonly #boundary: string
+
+    constructor(
+        attachments: Array<Attachment>,
+        boundary: string = MultipartMessage.createBoundary(),
+    ) {
+        this.#attachments = attachments.map(a => new MultipartAttachment(a))
+        this.#boundary = boundary
+    }
+
+    get attachments(): Array<MultipartAttachment> {
+        return this.#attachments
+    }
+
+    get boundary(): string {
+        return this.#boundary
+    }
+
+    get headers(): Record<string, string> {
+        return {
+            'Content-Type': `multipart/mixed; boundary=${this.#boundary}`,
+            'MIME-Version': '1.0',
+            'Number-Attachments': `${this.#attachments.length}`,
+        }
+    }
+
+    toHTTP(): string {
+        return [
+            `Content-Type: multipart/mixed; boundary=${this.#boundary}`,
+            'MIME-Version: 1.0',
+            `Number-Attachments: ${this.#attachments.length}`,
+            this.responseBody(),
+        ].join('\r\n')
+    }
+
+    responseBody(): string {
+        return [
+            '--' + this.#boundary,
+            this.#attachments
+                .map(a => a.toHTTP())
+                .join('\r\n--' + this.#boundary + '\r\n'),
+            '--' + this.#boundary + '--\r\n',
+        ].join('\r\n')
+    }
+}
+
+export class MultipartAttachment {
+    #attachment: Attachment
+
+    constructor(attachment: Attachment) {
+        this.#attachment = attachment
+    }
+
+    toHTTP(): string {
+        return [
+            `Content-Type: text/${this.#attachment.type}; charset="us-ascii"`,
+            'Content-Transfer-Encoding: 7bit',
+            `Content-Disposition: attachment; filename="${this.#attachment.filename}"`,
+            '',
+            this.#attachment.content,
+        ].join('\r\n')
+    }
+}

package/lib_js/attachments.js

@@ -1,13 +1,15 @@
-import { readDirListing, readToString } from '#c2/fs.ts';
+import { evalTemplateExpressions } from '#c2/expression';
+import { readDirListing, readToString } from '#c2/fs';
 export async function collectAttachments(dir) {
-    const result = [];
-    for (const filename of await readDirListing(dir)) {
+    const filenames = await readDirListing(dir);
+    const attachments = await Promise.all(filenames.map(async (filename) => {
         const path = `${dir}/${filename}`;
-        const content = await readToString(path);
-        const type = resolveAttachmentType(filename, content);
-        result.push({ content, filename, path, type });
-    }
-    return result.sort(compareAttachmentFilenames);
+        const source = await readToString(path);
+        const type = resolveAttachmentType(filename, source);
+        const content = await evalTemplateExpressions(source);
+        return { content, filename, path, type, source };
+    }));
+    return attachments.sort(compareAttachmentFilenames);
 }
 function compareAttachmentFilenames(a1, a2) {
     if (a1.filename === a2.filename)
@@ -16,16 +18,17 @@ function compareAttachmentFilenames(a1, a2) {
         return 1;
     return -1;
 }
-export function resolveAttachmentType(filename, content) {
-    if (filename.endsWith('.yml') ||
-        (filename.endsWith('.yaml') &&
-            content.trim().startsWith('#cloud-config'))) {
+export function resolveAttachmentType(filename, source) {
+    if (filename.endsWith('.yml') || filename.endsWith('.yaml')) {
+        if (!source.trim().startsWith('#cloud-config')) {
+            throw new Error('YAML cloud config must start with a #cloud-config comment');
+        }
         return 'cloud-config';
     }
     else if (filename.endsWith('.sh')) {
         return 'x-shellscript';
     }
     else {
-        throw new Error(`unsupported file type ${filename}`);
+        throw new Error(`${filename} is an unsupported file type`);
     }
 }

package/lib_js/build.js

@@ -1,42 +1,13 @@
-import { collectAttachments } from '#c2/attachments.ts';
-import { evalTemplateExpressions } from '#c2/expression.ts';
-import { readToString } from '#c2/fs.ts';
+import { collectAttachments } from '#c2/attachments';
+import { MultipartMessage } from '#c2/http';
 export async function buildUserData(userDataDir, opts) {
     const attachments = await collectAttachments(userDataDir);
     switch (attachments.length) {
         case 0:
             throw new Error(`nothing found in dir ${userDataDir}`);
         case 1:
-            return evalTemplateExpressions(await readToString(attachments[0].path));
+            return attachments[0].content;
         default:
-            return buildMultipartUserData(attachments, opts?.attachmentBoundary);
+            return new MultipartMessage(attachments, opts?.attachmentBoundary).toHTTP();
     }
 }
-function createBoundary() {
-    return new Date().toISOString();
-}
-async function buildMultipartUserData(attachments, boundary = createBoundary()) {
-    let result = `Content-Type: multipart/mixed; boundary=${boundary}
-MIME-Version: 1.0
-Number-Attachments: ${attachments.length}
---${boundary}
-`;
-    for (const attachment of attachments) {
-        let content;
-        try {
-            content = await evalTemplateExpressions(attachment.content);
-        }
-        catch (e) {
-            throw new Error(`error templating ${attachment.filename}: ${e.message}`);
-        }
-        result += `Content-Type: text/${attachment.type}; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="${attachment.filename}"
-
-${content}
---${boundary}
-`;
-    }
-    return result;
-}

package/lib_js/c2.api.js

@@ -1 +1 @@
-export { buildUserData } from '#c2/build.ts';
+export { buildUserData } from '#c2/build';

package/lib_js/c2.bin.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
-import { buildUserData } from '#c2/build.ts';
-import { parseArgs } from '#c2/cli.ts';
-import { doesDirExist } from '#c2/fs.ts';
+import { buildUserData } from '#c2/build';
+import { parseArgs } from '#c2/cli';
+import { doesDirExist } from '#c2/fs';
+import { startUserDataHttp } from '#c2/http';
 let args;
 try {
     args = parseArgs();
@@ -16,15 +17,23 @@ if (!args || args.help) {
     const required = (s) => `\u001b[1m${s}\u001b[0m`;
     errorExit(`c2 ${optional('[[--base64] | [--http PORT]]')} ${required('USER_DATA_DIR')}`);
 }
-if (args.httpPort) {
-    errorExit('--http PORT is not yet implemented');
-}
 if (!(await doesDirExist(args.userDataDir))) {
     errorExit(`${args.userDataDir} directory does not exist`);
 }
+let work;
+if (typeof args.httpPort !== 'undefined') {
+    work = async () => {
+        startUserDataHttp(args.httpPort, args.userDataDir);
+    };
+}
+else {
+    work = async () => {
+        const userData = await buildUserData(args.userDataDir);
+        console.log(args.base64 ? btoa(userData) : userData);
+    };
+}
 try {
-    const userData = await buildUserData(args.userDataDir);
-    console.log(args.base64 ? btoa(userData) : userData);
+    await work();
 }
 catch (e) {
     errorExit(e.message);

package/lib_js/cli.js

@@ -3,7 +3,13 @@ export function parseArgs(args) {
         args = process.argv;
     }
     args = [...args];
-    while (!args.shift().endsWith('/c2.ts')) { }
+    let shifted;
+    while ((shifted = args.shift())) {
+        if (shifted.endsWith('/lib_js/c2.bin.js') ||
+            shifted.endsWith('/lib/c2.bin.ts')) {
+            break;
+        }
+    }
     let base64 = false;
     let httpPort;
     let userData = [];
@@ -29,6 +35,9 @@ export function parseArgs(args) {
             userData.push(arg);
         }
     }
+    if (expectHttpPort) {
+        throw new Error('--http did not include a PORT');
+    }
     switch (userData.length) {
         case 1:
             const userDataDir = userData[0];

package/lib_js/expression.js

@@ -1,5 +1,5 @@
 import MagicString from 'magic-string';
-import { readToString } from '#c2/fs.ts';
+import { readToString } from '#c2/fs';
 export async function evalTemplateExpressions(content) {
     const regex = new RegExp(/\${{\s*(.*)\s*}}/g);
     let match;

package/lib_js/http.js

@@ -0,0 +1,94 @@
+import { randomUUID } from 'node:crypto';
+import { createServer } from 'node:http';
+import { collectAttachments } from '#c2/attachments';
+export function startUserDataHttp(port, userDataDir) {
+    const server = createServer((req, res) => {
+        console.log(req.method, req.url);
+        if (req.method !== 'GET') {
+            res.writeHead(405);
+            res.end();
+        }
+        else if (req.url === '/user-data') {
+            sendUserData(res, userDataDir).then();
+        }
+        else {
+            res.writeHead(req.url === '/meta-data' || req.url === '/network-config'
+                ? 200
+                : 404);
+            res.end();
+        }
+    });
+    server.listen(port, () => {
+        console.log(userDataDir, `up @ http://localhost:${port}/user-data`);
+    });
+}
+async function sendUserData(res, userDataDir) {
+    try {
+        const message = new MultipartMessage(await collectAttachments(userDataDir));
+        res.writeHead(200, message.headers);
+        res.write(message.responseBody());
+    }
+    catch (e) {
+        console.error(500, '/user-data', e.message);
+        res.writeHead(500);
+    }
+    finally {
+        res.end();
+    }
+}
+export class MultipartMessage {
+    static createBoundary() {
+        return randomUUID();
+    }
+    #attachments;
+    #boundary;
+    constructor(attachments, boundary = MultipartMessage.createBoundary()) {
+        this.#attachments = attachments.map(a => new MultipartAttachment(a));
+        this.#boundary = boundary;
+    }
+    get attachments() {
+        return this.#attachments;
+    }
+    get boundary() {
+        return this.#boundary;
+    }
+    get headers() {
+        return {
+            'Content-Type': `multipart/mixed; boundary=${this.#boundary}`,
+            'MIME-Version': '1.0',
+            'Number-Attachments': `${this.#attachments.length}`,
+        };
+    }
+    toHTTP() {
+        return [
+            `Content-Type: multipart/mixed; boundary=${this.#boundary}`,
+            'MIME-Version: 1.0',
+            `Number-Attachments: ${this.#attachments.length}`,
+            this.responseBody(),
+        ].join('\r\n');
+    }
+    responseBody() {
+        return [
+            '--' + this.#boundary,
+            this.#attachments
+                .map(a => a.toHTTP())
+                .join('\r\n--' + this.#boundary + '\r\n'),
+            '--' + this.#boundary + '--\r\n',
+        ].join('\r\n');
+    }
+}
+export class MultipartAttachment {
+    #attachment;
+    constructor(attachment) {
+        this.#attachment = attachment;
+    }
+    toHTTP() {
+        return [
+            `Content-Type: text/${this.#attachment.type}; charset="us-ascii"`,
+            'Content-Transfer-Encoding: 7bit',
+            `Content-Disposition: attachment; filename="${this.#attachment.filename}"`,
+            '',
+            this.#attachment.content,
+        ].join('\r\n');
+    }
+}

package/lib_types/attachments.d.ts

@@ -3,8 +3,9 @@ export interface Attachment {
     path: string;
     content: string;
     filename: string;
+    source: string;
     type: AttachmentType;
 }
 export declare function collectAttachments(dir: string): Promise<Array<Attachment>>;
-export declare function resolveAttachmentType(filename: string, content: string): AttachmentType;
+export declare function resolveAttachmentType(filename: string, source: string): AttachmentType;
 //# sourceMappingURL=attachments.d.ts.map

package/lib_types/attachments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attachments.d.ts","sourceRoot":"","sources":["../lib/attachments.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAE7D,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,EAAE,cAAc,CAAA;CACvB;AAED,wBAAsB,kBAAkB,CACpC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAS5B;AAWD,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,GAChB,cAAc,CAYhB"}
+{"version":3,"file":"attachments.d.ts","sourceRoot":"","sources":["../lib/attachments.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAE7D,MAAM,WAAW,UAAU;IACvB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,cAAc,CAAA;CACvB;AAED,wBAAsB,kBAAkB,CACpC,GAAG,EAAE,MAAM,GACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAY5B;AAWD,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACf,cAAc,CAahB"}

package/lib_types/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../lib/build.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,iBAAiB,GAAG;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,wBAAsB,aAAa,CAC/B,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,CAYjB"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../lib/build.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,iBAAiB,GAAG;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAC9B,CAAA;AAED,wBAAsB,aAAa,CAC/B,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,CAajB"}

package/lib_types/c2.api.d.ts

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

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

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

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,CAsC1D"}
+{"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"}

package/lib_types/http.d.ts

@@ -0,0 +1,18 @@
+import { type Attachment } from '#c2/attachments';
+export declare function startUserDataHttp(port: number, userDataDir: string): void;
+export declare class MultipartMessage {
+    #private;
+    static createBoundary(): string;
+    constructor(attachments: Array<Attachment>, boundary?: string);
+    get attachments(): Array<MultipartAttachment>;
+    get boundary(): string;
+    get headers(): Record<string, string>;
+    toHTTP(): string;
+    responseBody(): string;
+}
+export declare class MultipartAttachment {
+    #private;
+    constructor(attachment: Attachment);
+    toHTTP(): string;
+}
+//# sourceMappingURL=http.d.ts.map

package/lib_types/http.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../lib/http.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAsB,MAAM,iBAAiB,CAAA;AAErE,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,QAoBlE;AAiBD,qBAAa,gBAAgB;;IACzB,MAAM,CAAC,cAAc,IAAI,MAAM;gBAQ3B,WAAW,EAAE,KAAK,CAAC,UAAU,CAAC,EAC9B,QAAQ,GAAE,MAA0C;IAMxD,IAAI,WAAW,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAE5C;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAMpC;IAED,MAAM,IAAI,MAAM;IAShB,YAAY,IAAI,MAAM;CASzB;AAED,qBAAa,mBAAmB;;gBAGhB,UAAU,EAAE,UAAU;IAIlC,MAAM,IAAI,MAAM;CASnB"}

package/package.json

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