Fix building and serving

Removed a few unneeded dependencies, created two separate files for different building actions, and serving now works

Author: Avad3

.babelrc

@@ -1,5 +1,4 @@
 node_modules 
-./bin/node_modules
-./static/dynamic/
+dist
 .DS_Store
 **/.DS_Store

.gitignore

@@ -0,0 +1,70 @@
+import * as esbuild from "esbuild";
+import { copyFile } from "fs/promises";
+
+console.time("esbuild");
+
+const worker = await esbuild.context({
+  entryPoints: ["lib/worker/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.worker.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+worker.watch();
+
+const handler = await esbuild.context({
+  entryPoints: ["lib/handler/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.handler.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+handler.watch();
+
+const client = await esbuild.context({
+  entryPoints: ["lib/client/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.client.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+client.watch();
+
+const html = await esbuild.context({
+  entryPoints: ["lib/html/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.html.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+html.watch();
+
+await copyFile("./lib/dynamic.config.js", "./dist/dynamic.config.js");
+
+console.log(await esbuild.analyzeMetafile((await worker.rebuild()).metafile));
+
+console.timeEnd("esbuild");

dist/dynamic.client.js

@@ -0,0 +1,62 @@
+import * as esbuild from "esbuild";
+import { copyFile } from "fs/promises";
+
+console.time("esbuild");
+
+const worker = await esbuild.build({
+  entryPoints: ["lib/worker/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.worker.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+const handler = await esbuild.build({
+  entryPoints: ["lib/handler/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.handler.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+const client = await esbuild.build({
+  entryPoints: ["lib/client/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.client.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+const html = await esbuild.build({
+  entryPoints: ["lib/html/index.ts"],
+  bundle: true,
+  outfile: "dist/dynamic.html.js",
+  format: "iife",
+  minify: true,
+  platform: "browser",
+  sourcemap: true,
+  target: ["es2020"],
+  plugins: [],
+  metafile: true,
+});
+
+await copyFile("./lib/dynamic.config.js", "./dist/dynamic.config.js");
+
+console.log(await esbuild.analyzeMetafile((worker.metafile)));
+
+console.timeEnd("esbuild");

dist/dynamic.client.js.map

@@ -1,54 +1,61 @@
+import Fastify from 'fastify';
+import fastifyStatic from '@fastify/static';
 import { createBareServer } from '@tomphttp/bare-server-node';
-import http from 'http';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-import nodeStatic from 'node-static';
+import { createServer } from 'http';
 import chalk from 'chalk';
 import open from 'open';
-import { readFile } from 'fs/promises';
+import { existsSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+if (!existsSync("./dist")) await import("./esbuild.prod.js");
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
 const port = process.env.PORT || 3000;
 const _v = process.env.npm_package_version;
 
 const bare = createBareServer('/bare/');
-const serve = new nodeStatic.Server('static/');
-
-const server = http.createServer();
-
-server.on('request', (req, res) => {
-  if (req.url === '/version') {
-    // Handle version endpoint
-    const versionResponse = {
-      version: _v,
-    };
-    res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify(versionResponse));
-  } else if (bare.shouldRoute(req)) {
-    bare.routeRequest(req, res);
-  } else {
-    serve.serve(req, res);
-  }
+const serverFactory = (handler, opts) => {
+  return createServer()
+    .on("request", (req, res) => {
+      if (req.url === "/version") {
+        const versionResponse = {
+          version: _v,
+        };
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify(versionResponse));
+      } else if (bare.shouldRoute(req)) {
+        bare.routeRequest(req, res);
+      } else {
+        handler(req, res)
+      }
+    }).on("upgrade", (req, socket, head) => {
+      if (bare.shouldRoute(req)) {
+        bare.routeUpgrade(req, socket, head);
+      } else {
+        socket.end();
+      }
+    });
+}
+const fastify = Fastify({ serverFactory });
+fastify.register(fastifyStatic, {
+  root: join(__dirname, "./static"),
+  decorateReply: false
 });
-
-server.on('upgrade', (req, socket, head) => {
-  if (bare.shouldRoute(req, socket, head)) {
-    bare.routeUpgrade(req, socket, head);
-  } else {
-    socket.end();
-  }
+fastify.register(fastifyStatic, {
+  root: join(__dirname, "./dist"),
+  prefix: "/dynamic/",
+  decorateReply: false
 });
 
 const URL = `http://localhost:${port}/`;
-server.listen(port, () => {
+fastify.listen({ port }, async () => {
   console.log(chalk.bold('Thanks for using Dynamic!'), chalk.red(`Please notice that ${chalk.red.bold('dynamic is currently in public BETA')}. please report all issues to the GitHub page. `))
   console.log(chalk.green.bold(`Dynamic ${_v} `) + "live at port " + chalk.bold.green(port));
-  (async () => {
-    try {
-      await open(URL);
-    } catch (ERR) {
-      console.error(ERR);
-    }
-  })();
-});
+  try {
+    await open(URL);
+  } catch (ERR) {
+    console.error(ERR);
+  }
+});

dist/dynamic.handler.js

@@ -1,5 +1,3 @@
-import * as b64 from '@dynamic-pkg/base64';
-
 const xor = {
     encode: (str: string | undefined, key: number = 2) => {
         if (!str) return str;
@@ -35,12 +33,12 @@ const base64 = {
     encode: (str: string | undefined) => {
         if (!str) return str;
 
-        return decodeURIComponent(b64.encode(str));
+        return decodeURIComponent(btoa(str));
     },
     decode: (str: string | undefined) => {
         if (!str) return str;
 
-        return b64.decode(str);
+        return atob(str);
     }
 }
 

dist/dynamic.handler.js.map

@@ -1,27 +1,23 @@
 import mime from '@dynamic-pkg/mime';
 import * as path from 'path-browserify';
 import * as idb from 'idb';
-import * as base64 from '@dynamic-pkg/base64';
 import { parse } from '@dynamic-pkg/acorn';
 import { BareClient, createBareClient } from '@tomphttp/bare-client';
 import * as cookie from '@dynamic-pkg/cookie';
-import * as setCookieParser from 'set-cookie-parser'
+import { parse as cookieParser } from 'set-cookie-parser'
 import { generate } from '@dynamic-pkg/astring';
-//import * as Bowser from 'bowser';
-//import mutation from '@dynamic-pkg/mutation';
 
 class DynamicModules {
   mime = mime;
   idb = idb;
   path = path;
   acorn = { parse };
   bare = {createBareClient, BareClient};
-  base64 = base64;
+  base64 = { encode: btoa, decode: atob };
   estree = { generate };
   cookie = {...cookie, serialize: (...args: any) => { try {return cookie.serialize.apply({}, args)} catch(e) {console.log(e);}}};
-  setCookieParser = setCookieParser.parse;
- //bowser = Bowser;
-  
+  setCookieParser = cookieParser;
+
   ctx;
 
   constructor(ctx:any) {