Crates folder

.github/workflows/pr/test-integration.bash

@@ -13,4 +13,4 @@ export MACH_SKIP_POST_INSTALL="true"
 
 profile=release os=linux arch=amd64 just build
 
-just test-integration
+just integration-tests

Cargo.toml

@@ -2,8 +2,7 @@
 resolver = "2"
 
 members = [
-  "./mach",
-  "./mach-nodejs",
+  "./crates/*",
 ]
 
 [profile.release]

mach-nodejs/src/lib.rs → crates/mach-nodejs/src/lib.rs

@@ -5,10 +5,10 @@ use std::thread;
 
 use ipc_channel_adapter::child::sync::HostReceiver;
 use ipc_channel_adapter::child::sync::HostSender;
-use mach::public::nodejs::client::NodejsClientRequest;
-use mach::public::nodejs::client::NodejsClientResponse;
-use mach::public::nodejs::NodejsHostRequest;
-use mach::public::nodejs::NodejsHostResponse;
+use libmach::public::nodejs::client::NodejsClientRequest;
+use libmach::public::nodejs::client::NodejsClientResponse;
+use libmach::public::nodejs::NodejsHostRequest;
+use libmach::public::nodejs::NodejsHostResponse;
 use napi::threadsafe_function::ThreadSafeCallContext;
 use napi::threadsafe_function::ThreadsafeFunctionCallMode;
 use napi::Env;

mach/Cargo.toml → crates/mach/Cargo.toml

@@ -12,7 +12,7 @@ name = "mach"
 path = "src/main.rs"
 
 [lib]
-name = "mach"
+name = "libmach"
 path = "src/lib.rs"
 
 [dependencies]

crates/mach/src/lib.rs

@@ -0,0 +1,4 @@
+pub mod kit;
+pub mod public;
+pub mod platform;
+pub mod cmd;

justfile

@@ -84,15 +84,15 @@ _default:
 build:
   # Build mach and napi
   cargo build {{profile_cargo}} {{target_cargo}}
-  @cp ./target/.cargo/{{target}}/{{profile}}/libmach_nodejs.{{dylib}} ./mach-nodejs/lib/napi/index.node
+  @cp ./target/.cargo/{{target}}/{{profile}}/libmach_nodejs.{{dylib}} ./crates/mach-nodejs/lib/napi/index.node
 
   # Copy output to target
   @rm -rf {{out_dir}}
   @rm -rf {{out_dir_link}}
   @mkdir -p {{out_dir}}
   @mkdir -p {{out_dir}}/bin
   @cp ./target/.cargo/{{target}}/{{profile}}/mach {{out_dir}}/bin
-  @cp -r ./mach-nodejs/lib {{out_dir}}/nodejs
+  @cp -r ./crates/mach-nodejs/lib {{out_dir}}/nodejs
   @ln -s {{out_dir}} {{out_dir_link}}
 
   # Prepare local npm package to use local binary
@@ -105,15 +105,15 @@ build:
 build:
   # Build mach and napi
   cargo build {{profile_cargo}} {{target_cargo}}
-  @Copy-Item ".\target\.cargo\{{target}}\{{profile}}\mach_nodejs.{{dylib}}" -Destination ".\mach-nodejs\lib\napi\index.node" | Out-Null  
+  @Copy-Item ".\target\.cargo\{{target}}\{{profile}}\mach_nodejs.{{dylib}}" -Destination ".\crates\mach-nodejs\lib\napi\index.node" | Out-Null  
 
   # Copy output to target
   @if (Test-Path {{out_dir}}) { Remove-Item -Recurse -Force {{out_dir}} | Out-Null }
   @if (Test-Path {{out_dir_link}}) { Remove-Item -Recurse -Force {{out_dir_link}} | Out-Null }
   @New-Item -ItemType "directory" -Force -Path "{{out_dir}}"  | Out-Null
   @New-Item -ItemType "directory" -Force -Path "{{out_dir}}\bin" | Out-Null
   @Copy-Item ".\target\.cargo\{{target}}\{{profile}}\mach.exe" -Destination "{{out_dir}}\bin" | Out-Null
-  @Copy-Item ".\mach-nodejs\lib" -Destination "{{out_dir}}\nodejs" -Recurse | Out-Null
+  @Copy-Item ".\crates\mach-nodejs\lib" -Destination "{{out_dir}}\nodejs" -Recurse | Out-Null
   @New-Item -ItemType SymbolicLink -Path "{{out_dir_link}}" -Target "{{out_dir}}" | Out-Null
 
   # Prepare local npm package to use local binary
@@ -144,7 +144,7 @@ example cmd fixture *ARGS:
 serve:
   npx http-server -p 3000 ./examples
 
-test-integration:
+integration-tests:
   cd testing && node --import tsx setup.ts
 
 test:
@@ -180,7 +180,7 @@ build-publish:
 [private]
 build-publish-common:
   node {{justfile_directory()}}/.github/scripts/ci/string-replace.mjs \
-    "./mach/Cargo.toml" \
+    "./crates/mach/Cargo.toml" \
     "0.0.0-local" \
     {{MACH_VERSION}}
 

npm/mach/lib/mach.js

@@ -105,8 +105,7 @@ export class Mach {
     })
 
     let result = await on_complete
-    server.close()
-    child.kill()
+    await new Promise(res => server.close(() => res()))
     return result
   }
 

testing/setup.ts

@@ -11,6 +11,22 @@ import { CHROME_EXECUTABLE_PATH } from './utils/browser/executable.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 void async function() {
+  const browser = await puppeteer.launch({
+    executablePath: CHROME_EXECUTABLE_PATH,
+    headless: true,
+    devtools: true,
+    ignoreHTTPSErrors: true,
+    args: [
+      '--no-sandbox',
+      '--disable-setuid-sandbox',
+      '--disable-sync',
+      '--ignore-certificate-errors',
+      '--disable-gpu'
+    ],
+  })
+
+  process.env.PUPPETEER_WS_ENDPOINT = browser.wsEndpoint()
+
   const files = fs.readdirSync(path.join(__dirname, 'tests'))
     .filter(test => !test.startsWith('_'))
     .map(test => path.join(__dirname, 'tests', test))
@@ -26,4 +42,5 @@ void async function() {
 
   test_stream.pipe(process.stdout)
   await new Promise(res => finished(test_stream, res))
+  await browser.close()
 }()

testing/tests/commonjs-basic.ts

@@ -11,7 +11,7 @@ describe('commonjs-basic', { concurrency: true }, () => {
   let report: BuildReport
 
   before(async () => {
-    await install_npm(FIXTURE())
+    install_npm(FIXTURE())
 
     report = await Mach.build({
       projectRoot: FIXTURE(),

testing/tests/web-html-ts-css.ts

@@ -2,7 +2,7 @@ import {test, describe, before, after} from 'node:test';
 import * as assert from 'node:assert';
 import { BuildReport, Mach } from '@alshdavid/mach';
 import { FIXTURES_FN } from '../utils/paths/index.js';
-import { CHROME_EXECUTABLE_PATH, ClientContext } from '../utils/browser/index.js';
+import { ClientContext } from '../utils/browser/index.js';
 import { install_npm } from '../utils/npm/index.js';
 import * as puppeteer from 'puppeteer-core';
 
@@ -14,36 +14,25 @@ describe('web-html-ts-css', { concurrency: true }, async () => {
   let report: BuildReport
 
   before(async () => {
-    await install_npm(FIXTURE())
+    install_npm(FIXTURE())
 
     report = await Mach.build({
       projectRoot: FIXTURE(),
       entries: ['src/index.html']
     })
 
-    browser = await puppeteer.launch({
-      executablePath: CHROME_EXECUTABLE_PATH,
-      headless: true,
-      devtools: true,
-      ignoreHTTPSErrors: true,
-      args: [
-        '--no-sandbox',
-        '--disable-setuid-sandbox',
-        '--disable-sync',
-        '--ignore-certificate-errors',
-        '--disable-gpu'
-      ],
+    browser = await puppeteer.connect({
+      browserWSEndpoint: process.env.PUPPETEER_WS_ENDPOINT
     })
 
     client = await ClientContext.new({ 
-      browser,
       serve_path: FIXTURE('dist')
     })
   })
 
   after(async () => {
-    await browser.close()
-    client.close()
+    await browser.disconnect()
+    await client.close()
   })
 
   test('Should set exports correctly ', async (t) => {

testing/utils/browser/client_context.ts

@@ -5,45 +5,31 @@ import * as fs from "node:fs"
 import * as fsAsync from "node:fs/promises"
 
 export type ClientContextOptions = {
-  browser: puppeteer.Browser
   serve_path: string
 }
 
 export class ClientContext {
   #server
-  #browser
 
   constructor(
     server: http.Server,
-    browser: puppeteer.Browser,
   ) {
     this.#server = server
-    this.#browser = browser
   }
 
   static async new(options: ClientContextOptions): Promise<ClientContext> {
     const server = http.createServer(serve_static(options.serve_path))
     await new Promise<void>(res => server.listen(0, "0.0.0.0", () => res()))
-    return new ClientContext(server, options.browser)
+    return new ClientContext(server)
   }
 
-  // async newPage(): Promise<puppeteer.Page & AsyncDisposable & Disposable> {
-  //   const page = await this.#browser.newPage()
-
-  //   await page.goto(`http://localhost:${this.#server.address().port}`)
-
-
-
-  //   return page as puppeteer.Page & AsyncDisposable & Disposable
-  // }
-
   address() {
     // @ts-expect-error
     return `http://localhost:${this.#server.address().port}`
   }
 
-  close() {
-    this.#server.close()
+  async close() {
+    await new Promise<void>(res => this.#server.close(() => res()))
   }
 }
 

testing/utils/npm/index.ts

@@ -2,17 +2,12 @@ import path from 'node:path';
 import child_process from 'node:child_process';
 import fs from 'node:fs';
 
-export async function install_npm(cwd: string): Promise<void> {
+export function install_npm(cwd: string): void {
   if (!fs.existsSync(cwd)) {
     throw new Error(`Error Does Not Exist: ${cwd}`)
   }
 
   if (!fs.existsSync(path.join(cwd, 'node_modules'))) {
-    await new Promise((resolve, reject) => {
-      child_process.exec(`npm install --no-package-lock`, { cwd }, (err, stdout) => {
-        if (err) return reject(err)
-        resolve(stdout)
-      })
-    })
+    child_process.execSync(`npm install --no-package-lock`, { cwd })
   }
 }