@michijs/dev-server 0.4.2 → 0.5.0

package/bin/actions/start.js

@@ -1,21 +1,23 @@
-import http from 'http';
-import fs from 'fs';
-import { config, hostURL, localURL, connections } from '../config/config.js';
-import coloredString from '../utils/coloredString.js';
-import { getPath } from '../utils/getPath.js';
-import open from 'open';
-import { context } from 'esbuild';
-import watch from 'node-watch';
-import { copyFile } from '../utils/copy.js';
-import { sep } from 'path';
-import { transformers } from '../utils/transformers.js';
+import http from "http";
+import fs from "fs";
+import { config, connections } from "../config/config.js";
+import coloredString from "../utils/coloredString.js";
+import { getPath } from "../utils/getPath.js";
+import open from "open";
+import { context } from "esbuild";
+import watch from "node-watch";
+import { copyFile } from "../utils/copy.js";
+import { sep } from "path";
+import { transformers } from "../utils/transformers.js";
+import { getHostURL } from "../utils/getHostURL.js";
+import { getLocalURL } from "../utils/getLocalURL.js";
 export const start = (callback) => {
     config.esbuildOptions.plugins?.push({
-        name: 'michijs-dev-server-watch-public-folder',
+        name: "michijs-dev-server-watch-public-folder",
         setup(build) {
-            if (config.public.path)
+            if (config.public.path && config.watch)
                 watch.default(config.public.path, {
-                    encoding: 'utf-8',
+                    encoding: "utf-8",
                     persistent: true,
                     recursive: true,
                 }, (event, fileChangedPath) => {
@@ -29,7 +31,7 @@ export const start = (callback) => {
                     fs.rmSync(getPath(`${outDir}/${transformers
                         .find((x) => x.fileRegex.test(fileName))
                         ?.pathTransformer?.(fileName) ?? fileName}`), { force: true, recursive: true });
-                    if (event === 'remove')
+                    if (event === "remove")
                         removed.push(fileChangedPath);
                     else {
                         updated.push(fileChangedPath);
@@ -48,9 +50,8 @@ export const start = (callback) => {
         const { host: esbuildHost, port: esbuildPort } = await buildContext.serve({
             servedir: config.esbuildOptions.outdir,
         });
-        http
-            .createServer(async (req, res) => {
-            if (req.url === '/esbuild')
+        const server = http.createServer(async (req, res) => {
+            if (req.url === "/esbuild")
                 connections.push(res);
             const esbuildProxyRequestOptions = {
                 hostname: esbuildHost,
@@ -63,7 +64,7 @@ export const start = (callback) => {
             const proxyReq = http.request(esbuildProxyRequestOptions, (proxyRes) => {
                 // If esbuild returns "not found", send a custom 404 page
                 if (!proxyRes.statusCode || proxyRes.statusCode === 404) {
-                    res.writeHead(200, { 'Content-Type': 'text/html' });
+                    res.writeHead(200, { "Content-Type": "text/html" });
                     // TODO: Find a better way to do this
                     res.end(fs.readFileSync(getPath(`${config.esbuildOptions.outdir}/${config.public.indexName}`)));
                     return;
@@ -74,16 +75,31 @@ export const start = (callback) => {
             });
             // Forward the body of the request to esbuild
             req.pipe(proxyReq, { end: true });
-        })
-            .listen(config.port);
-        console.log(`
-  Server running at:
-  
-  > Network:  ${coloredString(hostURL)}
-  > Local:    ${coloredString(localURL)}`);
-        callback();
-        buildContext.watch();
-        if (config.openBrowser)
-            open(localURL);
+        });
+        let selectedPort = config.port;
+        server.on("error", (e) => {
+            // @ts-ignore
+            if (e.code === "EADDRINUSE") {
+                selectedPort++;
+                server.listen(selectedPort);
+            }
+            else
+                throw e;
+        });
+        server.on("listening", () => {
+            const localURL = getLocalURL(selectedPort);
+            console.log(`
+    Server running at:
+    
+    > Network:  ${coloredString(getHostURL(selectedPort))}
+    > Local:    ${coloredString(localURL)}`);
+            callback(selectedPort);
+            if (config.watch)
+                buildContext.watch();
+            if (config.openBrowser)
+                open(localURL);
+        });
+        // First try
+        server.listen(selectedPort);
     });
 };

package/bin/cli.js

@@ -1,65 +1,65 @@
-import coloredString from './utils/coloredString.js';
-import yargs from 'yargs';
-import { Timer } from './classes/Timer.js';
-import { hideBin } from 'yargs/helpers';
+import coloredString from "./utils/coloredString.js";
+import yargs from "yargs";
+import { Timer } from "./classes/Timer.js";
+import { hideBin } from "yargs/helpers";
 export async function cli() {
     const timer = new Timer();
-    const showReadyMessage = () => console.log(`
+    const showReadyMessage = () => console.log(`
   ${coloredString(`Ready in ${timer.endTimer()}ms.`)}`);
     timer.startTimer();
     const args = await yargs(hideBin(process.argv))
-        .option('start', {
-        type: 'boolean',
+        .option("start", {
+        type: "boolean",
         default: false,
-        description: 'Allows to start a dev server as a webpage.',
+        description: "Allows to start a dev server as a webpage.",
     })
-        .option('build', {
-        type: 'boolean',
+        .option("build", {
+        type: "boolean",
         default: false,
-        description: 'Allows to build the src code as a webpage.',
+        description: "Allows to build the src code as a webpage.",
     })
-        .option('dist', {
-        type: 'boolean',
+        .option("dist", {
+        type: "boolean",
         default: false,
-        description: 'Allows to distribute the src code as a package.',
+        description: "Allows to distribute the src code as a package.",
     })
-        .option('generate-icons', {
-        type: 'string',
-        description: 'Allows to generate a full set of icons from a src icon.',
+        .option("generate-assets", {
+        type: "string",
+        description: "Allows to generate a full set of icons and screenshots from a src icon.",
     })
-        .option('watch', {
-        type: 'boolean',
+        .option("watch", {
+        type: "boolean",
         default: false,
-        alias: 'w',
+        alias: "w",
     })
-        .option('env', {
-        type: 'string',
+        .option("env", {
+        type: "string",
     })
-        .option('env', {
-        type: 'string',
+        .option("env", {
+        type: "string",
     })
         .help()
-        .alias('help', 'h').argv;
+        .alias("help", "h").argv;
     process.env.NODE_ENV =
         args.env ||
-            (args.build ? 'PRODUCTION' : args.dist ? 'DISTRIBUTION' : 'DEVELOPMENT');
-    const generateIcons = args.generateIcons === '' ? 'public/assets/icon.svg' : args.generateIcons;
-    if (generateIcons) {
-        const action = await import('./actions/generateIcons.js');
-        await action.generateIcons(showReadyMessage, generateIcons);
+            (args.build ? "PRODUCTION" : args.dist ? "DISTRIBUTION" : "DEVELOPMENT");
+    const generateAssets = args.generateAssets === "" ? "public/assets/icon.svg" : args.generateAssets;
+    if (generateAssets) {
+        const action = await import("./actions/generateAssets.js");
+        await action.generateAssets(showReadyMessage, generateAssets);
     }
     else
         console.log(coloredString(`  Running in ${process.env.NODE_ENV} mode`));
     if (args.start) {
-        const action = await import('./actions/start.js');
+        const action = await import("./actions/start.js");
         action.start(showReadyMessage);
     }
     if (args.build) {
-        const action = await import('./actions/build.js');
+        const action = await import("./actions/build.js");
         action.build(showReadyMessage);
     }
     if (args.dist) {
-        const action = await import('./actions/dist.js');
+        const action = await import("./actions/dist.js");
         action.dist(showReadyMessage, args.watch);
     }
 }

package/bin/config/config.d.ts

@@ -1,10 +1,115 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Config } from '../types.js';
-import http from 'http';
+import http from "http";
 export declare const connections: (http.ServerResponse<http.IncomingMessage> & {
     req: http.IncomingMessage;
 })[];
-declare const config: Required<Config>;
-declare const hostURL: string;
-declare const localURL: string;
-export { config, hostURL, localURL };
+declare const config: {
+    public: {
+        assets: {
+            screenshots: {
+                paths: string[];
+                pageCallbacks: import("../types.js").PageCallback<string | void>[];
+            };
+            featureImage: {
+                path: string;
+                pageCallback?: import("../types.js").PageCallback<void> | undefined;
+            };
+            path: string;
+        };
+        manifest: {
+            name: string;
+            options?: import("web-app-manifest").WebAppManifest | undefined;
+        };
+        wellKnown?: import("../types.js").WellKnown[] | undefined;
+        path: string;
+        indexName: string;
+        minify: boolean;
+    };
+    esbuildOptions: {
+        plugins: import("esbuild").Plugin[];
+        define: {
+            michiProcess: string;
+        };
+        inject: string[];
+        bundle: boolean;
+        splitting: boolean;
+        preserveSymlinks?: boolean | undefined;
+        outfile?: string | undefined;
+        metafile?: boolean | undefined;
+        outdir: string;
+        outbase?: string | undefined;
+        external?: string[] | undefined;
+        packages?: "external" | undefined;
+        alias?: Record<string, string> | undefined;
+        loader?: {
+            [ext: string]: import("esbuild").Loader;
+        } | undefined;
+        resolveExtensions?: string[] | undefined;
+        mainFields?: string[] | undefined;
+        conditions?: string[] | undefined;
+        write?: boolean | undefined;
+        allowOverwrite?: boolean | undefined;
+        tsconfig: string;
+        outExtension?: {
+            [ext: string]: string;
+        } | undefined;
+        publicPath?: string | undefined;
+        entryNames?: string | undefined;
+        chunkNames?: string | undefined;
+        assetNames?: string | undefined;
+        banner?: {
+            [type: string]: string;
+        } | undefined;
+        footer?: {
+            [type: string]: string;
+        } | undefined;
+        entryPoints: string[] | Record<string, string> | {
+            in: string;
+            out: string;
+        }[];
+        stdin?: import("esbuild").StdinOptions | undefined;
+        absWorkingDir?: string | undefined;
+        nodePaths?: string[] | undefined;
+        sourcemap: boolean | "linked" | "inline" | "external" | "both";
+        legalComments?: "linked" | "inline" | "external" | "none" | "eof" | undefined;
+        sourceRoot?: string | undefined;
+        sourcesContent?: boolean | undefined;
+        format: import("esbuild").Format;
+        globalName?: string | undefined;
+        target: string | string[];
+        supported?: Record<string, boolean> | undefined;
+        platform?: import("esbuild").Platform | undefined;
+        mangleProps?: RegExp | undefined;
+        reserveProps?: RegExp | undefined;
+        mangleQuoted?: boolean | undefined;
+        mangleCache?: Record<string, string | false> | undefined;
+        drop?: import("esbuild").Drop[] | undefined;
+        minify?: boolean | undefined;
+        minifyWhitespace: boolean;
+        minifyIdentifiers?: boolean | undefined;
+        minifySyntax: boolean;
+        charset?: import("esbuild").Charset | undefined;
+        treeShaking?: boolean | undefined;
+        ignoreAnnotations?: boolean | undefined;
+        jsx?: "transform" | "preserve" | "automatic" | undefined;
+        jsxFactory?: string | undefined;
+        jsxFragment?: string | undefined;
+        jsxImportSource?: string | undefined;
+        jsxDev?: boolean | undefined;
+        jsxSideEffects?: boolean | undefined;
+        pure?: string[] | undefined;
+        keepNames: boolean;
+        color?: boolean | undefined;
+        logLevel: import("esbuild").LogLevel;
+        logLimit?: number | undefined;
+        logOverride?: Record<string, import("esbuild").LogLevel> | undefined;
+    };
+    env?: {
+        [key: string]: any;
+    } | undefined;
+    watch: boolean;
+    port: number;
+    openBrowser: boolean;
+    showLinkedPackages: boolean;
+};
+export { config };

package/bin/config/config.js

@@ -1,48 +1,61 @@
-import fs from 'fs';
-import coloredString from '../utils/coloredString.js';
-import { copy } from '../utils/copy.js';
-import { getPath } from '../utils/getPath.js';
-import { Timer } from '../classes/Timer.js';
-import { getIPAddress } from './getIPAddress.js';
-import { userConfig } from './userConfig.js';
-import { resolve } from 'path';
-import { jsAndTsRegex, jsonTransformer, notJsAndTsRegex, } from '../utils/transformers.js';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-const minify = process.env.NODE_ENV === 'PRODUCTION';
-const devServerListener = process.env.NODE_ENV === 'DEVELOPMENT'
+import fs from "fs";
+import coloredString from "../utils/coloredString.js";
+import { copy } from "../utils/copy.js";
+import { getPath } from "../utils/getPath.js";
+import { Timer } from "../classes/Timer.js";
+import { userConfig } from "./userConfig.js";
+import { resolve } from "path";
+import { jsAndTsRegex, jsonTransformer, notJsAndTsRegex, } from "../utils/transformers.js";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+const minify = process.env.NODE_ENV === "PRODUCTION";
+const devServerListener = process.env.NODE_ENV === "DEVELOPMENT"
     ? [getPath(`${dirname(fileURLToPath(import.meta.url))}/public/client.js`)]
     : [];
 export const connections = [];
 const config = {
     port: 3000,
-    openBrowser: process.env.NODE_ENV === 'DEVELOPMENT',
+    openBrowser: process.env.NODE_ENV === "DEVELOPMENT",
     showLinkedPackages: true,
+    watch: true,
     ...userConfig,
     // protocol: 'http',
     public: {
-        path: 'public',
-        indexName: 'index.html',
+        path: "public",
+        indexName: "index.html",
         minify: minify,
         ...(userConfig.public ?? {}),
+        assets: {
+            path: "assets",
+            ...(userConfig.public?.assets ?? {}),
+            screenshots: {
+                paths: ["/"],
+                pageCallbacks: [() => { }],
+                ...(userConfig.public?.assets?.screenshots ?? {}),
+            },
+            featureImage: {
+                path: "/",
+                ...(userConfig.public?.assets?.featureImage ?? {}),
+            },
+        },
         manifest: {
-            name: 'manifest.json',
+            name: "manifest.json",
             ...(userConfig.public?.manifest ?? {}),
         },
     },
     esbuildOptions: {
-        outdir: 'build',
-        tsconfig: 'tsconfig.json',
+        outdir: "build",
+        tsconfig: "tsconfig.json",
         minifySyntax: minify,
         minifyWhitespace: minify,
-        sourcemap: process.env.NODE_ENV !== 'PRODUCTION',
+        sourcemap: process.env.NODE_ENV !== "PRODUCTION",
         splitting: true,
         bundle: true,
         keepNames: minify,
-        entryPoints: ['src/index.ts'],
-        format: 'esm',
-        target: 'esnext',
-        logLevel: 'error',
+        entryPoints: ["src/index.ts"],
+        format: "esm",
+        target: "esnext",
+        logLevel: "error",
         ...(userConfig.esbuildOptions ?? {}),
         // Still not supported
         // bug .css.ts
@@ -68,7 +81,7 @@ const config = {
         plugins: [
             ...(userConfig.esbuildOptions?.plugins ?? []),
             {
-                name: 'michijs-dev-server',
+                name: "michijs-dev-server",
                 setup(build) {
                     // Clean outdir
                     if (build.initialOptions.outdir) {
@@ -124,10 +137,6 @@ const config = {
         ...(userConfig.esbuildOptions?.define ?? {}),
     },
 };
-const hostURL = `http://${getIPAddress()}:${config.port}`;
-const localURL = `http://localhost:${config.port}`;
-// const hostURL = `${config.protocol}://${config.hostname}:${config.port}`;
-// const localURL = `${config.protocol}://localhost:${config.port}`;
 function findSymbolickLinkRealPath(packagePath) {
     if (fs.lstatSync(packagePath).isSymbolicLink()) {
         // Getting absolute path for the simbolic link
@@ -136,7 +145,7 @@ function findSymbolickLinkRealPath(packagePath) {
     return packagePath;
 }
 if (config.showLinkedPackages) {
-    const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+    const packageJson = JSON.parse(fs.readFileSync("package.json", "utf8"));
     const dependencies = Object.keys(packageJson.dependencies || {});
     const devDependencies = Object.keys(packageJson.devDependencies || {});
     dependencies.concat(devDependencies).forEach((packagePath) => {
@@ -147,4 +156,4 @@ if (config.showLinkedPackages) {
         }
     });
 }
-export { config, hostURL, localURL };
+export { config };

package/bin/config/getIPAddress.js

@@ -1,4 +1,4 @@
-import { networkInterfaces } from 'os';
+import { networkInterfaces } from "os";
 export function getIPAddress() {
     const interfaces = networkInterfaces();
     for (const devName in interfaces) {
@@ -6,9 +6,11 @@ export function getIPAddress() {
         if (iface)
             for (let i = 0; i < iface.length; i++) {
                 const alias = iface[i];
-                if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal)
+                if (alias.family === "IPv4" &&
+                    alias.address !== "127.0.0.1" &&
+                    !alias.internal)
                     return alias.address;
             }
     }
-    return '0.0.0.0';
+    return "0.0.0.0";
 }

package/bin/config/michi.config.cjs

@@ -0,0 +1,159 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// michi.config.ts
+var michi_config_exports = {};
+__export(michi_config_exports, {
+  androidTarget: () => androidTarget,
+  config: () => config,
+  default: () => michi_config_default
+});
+module.exports = __toCommonJS(michi_config_exports);
+var package_name = "app.netlify.michi_notepad.twa";
+var androidTarget = {
+  namespace: "android_app",
+  package_name,
+  sha256_cert_fingerprints: [
+    "5B:79:54:BA:A1:D8:8E:A9:C8:DE:E2:8A:AD:5B:09:B2:29:DF:57:15:54:67:11:30:61:AA:32:2D:1E:A0:2D:4E"
+  ]
+};
+var config = ({ assetsSizes }) => {
+  const icons = [
+    ...assetsSizes.webp.map((x) => ({
+      src: `/assets/generated/icon-${x}.webp`,
+      sizes: `${x}x${x}`,
+      type: "image/webp",
+      purpose: "any"
+    })),
+    ...assetsSizes.png.map((x) => ({
+      src: `/assets/generated/icon-${x}.png`,
+      sizes: `${x}x${x}`,
+      type: "image/png",
+      purpose: "any"
+    }))
+  ];
+  return {
+    public: {
+      assets: {
+        screenshots: {
+          paths: ["/", "/#navigation-drawer-opened", "/privacy-policy"],
+          pageCallbacks: [
+            async (page) => {
+              await page.emulateMediaFeatures([{ name: "prefers-color-scheme", value: "light" }]);
+              return "light";
+            },
+            async (page) => {
+              await page.emulateMediaFeatures([{ name: "prefers-color-scheme", value: "dark" }]);
+              return "dark";
+            }
+          ]
+        }
+      },
+      wellKnown: [
+        {
+          relation: ["delegate_permission/common.handle_all_urls"],
+          target: androidTarget
+        }
+      ],
+      manifest: {
+        options: {
+          prefer_related_applications: true,
+          related_applications: [
+            {
+              platform: "play",
+              url: `https://play.google.com/store/apps/details?id=${package_name}`,
+              id: package_name
+            },
+            {
+              platform: "windows",
+              url: "https://www.microsoft.com/store/apps/9N3RTBWQB529",
+              id: "9N3RTBWQB529"
+            }
+          ],
+          iarc_rating_id: "2975cb9a-7360-433d-8f1c-2e91b8c69dc8",
+          name: "Michi Notepad",
+          short_name: "Notepad",
+          description: "Simple notepad written in web languages",
+          lang: "en",
+          categories: ["business", "utilities", "productivity"],
+          theme_color: "#ffb05c",
+          background_color: "#767579",
+          display: "standalone",
+          orientation: "portrait",
+          start_url: "/",
+          scope: ".",
+          icons,
+          screenshots: assetsSizes.screenshots.map(({ width, height }) => ({
+            "src": `/assets/generated/screenshots/screenshot-${width}x${height}.png`,
+            "sizes": `${width}x${height}`,
+            "type": "image/png"
+          })),
+          file_handlers: [
+            {
+              action: "/",
+              name: "Text files",
+              icons,
+              accept: {
+                "text/*": [
+                  ".vtt",
+                  ".srt",
+                  ".sub",
+                  ".xml",
+                  ".yml",
+                  ".yaml",
+                  ".rtf",
+                  ".asc",
+                  ".cfg",
+                  ".conf",
+                  ".cpp",
+                  ".css",
+                  ".h",
+                  ".html",
+                  ".ini",
+                  ".java",
+                  ".js",
+                  ".json",
+                  ".log",
+                  ".md",
+                  ".php",
+                  ".py",
+                  ".rb",
+                  ".ts",
+                  ".tsx",
+                  ".jsx",
+                  ".txt",
+                  ".csv",
+                  ".dat",
+                  ".msg",
+                  ".pages",
+                  ".tex"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    }
+  };
+};
+var michi_config_default = config;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  androidTarget,
+  config
+});

package/bin/config/public/client.js

@@ -1,2 +1,2 @@
-new EventSource('/esbuild').addEventListener('change', () => location.reload());
+new EventSource("/esbuild").addEventListener("change", () => location.reload());
 export {};

package/bin/config/tsconfig.d.ts

@@ -1,4 +1,4 @@
-import type { CompilerOptions } from 'typescript';
+import type { CompilerOptions } from "typescript";
 declare let tsconfig: {
     compilerOptions: CompilerOptions;
     include: string[];

package/bin/config/tsconfig.js

@@ -1,9 +1,9 @@
-import { config } from './config.js';
-import fs from 'fs';
+import { config } from "./config.js";
+import fs from "fs";
 let tsconfig;
 if (config.esbuildOptions.tsconfig &&
     fs.existsSync(config.esbuildOptions?.tsconfig)) {
-    tsconfig = JSON.parse(fs.readFileSync(config.esbuildOptions.tsconfig, 'utf-8'));
+    tsconfig = JSON.parse(fs.readFileSync(config.esbuildOptions.tsconfig, "utf-8"));
 }
 else {
     throw `Unable to find tsconfig at ${config.esbuildOptions.tsconfig}`;

package/bin/config/userConfig.d.ts

@@ -1,2 +1,2 @@
-import { ServerConfig } from '../types.js';
+import { ServerConfig } from "../types.js";
 export declare const userConfig: ServerConfig;