@monkeyplus/flow 4.0.0-beta.19 → 4.0.0-beta.2

package/dist/index.cjs

@@ -10,9 +10,6 @@ const boom = require('@hapi/boom');
 const os = require('os');
 const chalk = require('chalk');
 const fs = require('fs-extra');
-const fs$1 = require('fs');
-const hookable = require('hookable');
-const chokidar = require('chokidar');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
@@ -34,11 +31,9 @@ const R__namespace = /*#__PURE__*/_interopNamespace(R);
 const os__default = /*#__PURE__*/_interopDefaultLegacy(os);
 const chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
 const fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
-const fs__default$1 = /*#__PURE__*/_interopDefaultLegacy(fs$1);
-const chokidar__default = /*#__PURE__*/_interopDefaultLegacy(chokidar);
 
 const name = "@monkeyplus/flow";
-const version = "4.0.0-beta.19";
+const version = "4.0.0-beta.2";
 const description = "Utils hapi";
 const author = "Andres Navarrete";
 const license = "MIT";
@@ -47,8 +42,7 @@ const module$1 = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
 const files = [
 	"dist/",
-	"types/",
-	"resources/"
+	"types/"
 ];
 const exports$1 = {
 	".": {
@@ -64,24 +58,21 @@ const scripts = {
 	lint: "eslint --ext .js,.ts .",
 	fix: "eslint --fix --ext .ts .",
 	prepublishOnly: "pnpm run build",
+	publish: "pnpm publish",
 	start: "esno src/index.ts",
 	test: "vitest"
 };
 const dependencies$1 = {
 	"@hapi/boom": "9.x.x",
 	"@hapi/hoek": "9.x.x",
+	chalk: "^5.0.0",
 	consola: "^2.15.3",
-	chalk: "^4.1.2",
-	chokidar: "^3.5.3",
-	hookable: "^5.1.1",
 	"fs-extra": "^10.0.0",
 	ramda: "^0.28.0"
 };
 const devDependencies = {
 	"@types/fs-extra": "^9.0.13",
 	"@types/hapi__hapi": "^20.0.10",
-	"@types/hapi__nes": "^11.0.5",
-	"@types/hapi__vision": "^5.5.3",
 	"@types/ramda": "^0.27.64"
 };
 const peerDependencies = {
@@ -108,13 +99,8 @@ const pkg = {
 
 const logger$1 = consola__default.withScope(pkg.name);
 const dependencies = {
-  "@hapi/vision": "6.x.x",
-  "@hapi/inert": "6.x.x",
-  "@hapi/h2o2": "9.x.x",
-  "@hapi/nes": "12.x.x"
+  "@hapi/vision": "6.x.x"
 };
-const isProduction = process.env.NODE_ENV === "production";
-const isGenerate = process.env.GENERATE;
 
 const LifeCircle = {
   register: (server) => {
@@ -328,7 +314,7 @@ const handlerPage = async (req, h) => {
     return context;
   }
   context.utils = utils;
-  return h.view(`${configs.dirTemplates}${flow.view.layout || "default"}`, context);
+  return h.view(`${configs.dirTemplates}${flow.view.template}`, context);
 };
 
 const logger = consola__default.withScope("@monkeyplus/flow");
@@ -336,10 +322,6 @@ const defaults = {
   locales: ["es-ec"],
   defaultUbication: "ec",
   defaultLanguage: "es",
-  staticDir: "static",
-  hmr: {
-    dirs: ["views"]
-  },
   publicPath: "/",
   locale: "es-ec",
   relativeTo: "",
@@ -582,7 +564,7 @@ const useGenerator = {
       if (!virtualGenerate)
         injectAssets(_assets);
       const dirOutut = helpers.getPath(configs.outputDir ?? "build");
-      const staticDirs = [configs.staticDir].map((dir) => helpers.getPath(dir));
+      const staticDirs = Object.keys(server.app.flow.generate.staticFolders).map((dir) => helpers.getPath(dir));
       const files = await getFlowPages();
       const pairFiles = R__namespace.toPairs(files);
       const ommit = ommitAssets;
@@ -711,47 +693,6 @@ const definePage = (pageOptions) => (levelOptions) => (configs) => {
   return routes;
 };
 
-const readPagesDir = (pathDir, folder) => {
-  const p = fs__default$1.readdirSync(pathDir);
-  return R.flatten(p.filter((f) => !f.includes(".js.map") && !f.includes(" copy.js.map") && !f.includes(" copy.js") && !f.includes(".model")).map((e) => {
-    if (e.includes(".js") || e.includes(".ts")) {
-      return {
-        path: path__default.join(pathDir, e),
-        prefix: folder
-      };
-    } else {
-      return readPagesDir(path__default.join(pathDir, e), e);
-    }
-  }));
-};
-const registerPages = async (server, dir) => {
-  const dirPages = path__default.resolve(dir || "./pages");
-  const listFiles = readPagesDir(dirPages);
-  const listPrePages = [];
-  for (const item of listFiles) {
-    try {
-      const module = require(item.path)?.default;
-      if (typeof module === "function") {
-        listPrePages.push(module());
-      } else if (typeof module === "object") {
-        if (Array.isArray(module)) {
-          module.forEach((el) => listPrePages.push(el()));
-        } else {
-          const _pages = await module.pages({ server });
-          if (Array.isArray(_pages))
-            _pages.forEach((page) => listPrePages.push(definePage(page)()));
-          else
-            listPrePages.push(definePage(_pages)());
-        }
-      }
-    } catch (details) {
-      logger$1.error(details);
-    }
-  }
-  for (const page of listPrePages)
-    await server.flow.addPage(page);
-};
-
 const RunMethods = {
   register: (server) => {
     const { flow: state } = server.app;
@@ -765,7 +706,7 @@ const RunMethods = {
         server.route(route);
     };
     const addPage = (_page, extra) => {
-      const registerPages2 = (_pages2) => {
+      const registerPages = (_pages2) => {
         for (const _route of _pages2) {
           if (state.routes[_route.path])
             logger$1.warn("The route %s alredy exist", _route.path);
@@ -776,14 +717,13 @@ const RunMethods = {
       let _pages;
       if (typeof _page === "function") {
         _pages = _page(config);
-        registerPages2(_pages);
+        registerPages(_pages);
       } else {
         _pages = definePage(_page)()(config);
-        registerPages2(_pages);
+        registerPages(_pages);
       }
     };
     const init = async () => {
-      await registerPages(server, config.pagesDir);
       const pages = server.app.flow.routes;
       for (const key in pages) {
         const page = pages[key];
@@ -800,137 +740,6 @@ const RunMethods = {
   }
 };
 
-const createHmr = (options) => {
-  const state = {
-    dir: options.relativeTo || "",
-    dirs: options.dirs || [],
-    extensions: options.extensions || ["eta"]
-  };
-  let watcher;
-  const hooks = hookable.createHooks();
-  const watch = () => {
-    watcher = chokidar__default.watch(state.dirs.map((d) => path__default.join(d, `**/*.(${state.extensions.join("|")})`)), {
-      cwd: state.dir,
-      ignoreInitial: true,
-      ignored: "node_modules/**/*"
-    }).on("change", (path2) => {
-      logger$1.info("Changed file", path2);
-      hooks.callHook("page:refresh");
-    });
-  };
-  watch();
-  return { watcher, hooks };
-};
-
-const RegisterCommon = async (server, configs) => {
-  server.route({
-    method: "GET",
-    path: "/{param*}",
-    options: {
-      ext: {
-        onPreResponse: {
-          method: (req, h) => {
-            return h.continue;
-          }
-        }
-      }
-    },
-    handler: {
-      directory: {
-        path: configs.staticDir,
-        listing: true
-      }
-    }
-  });
-  if (!isGenerate) {
-    const hmr = createHmr({
-      dirs: configs.hmr.dirs,
-      relativeTo: configs.relativeTo,
-      extensions: configs.hmr.extensions
-    });
-    hmr.hooks.hook("page:refresh", () => {
-      setTimeout(() => {
-        logger$1.info("Refresh page");
-        server.publish("/_flow/hmr", { reload: true });
-      }, 40);
-    });
-    server.subscription("/_flow/hmr");
-    server.route({
-      path: "/_flow/hmr/client.js",
-      method: "get",
-      handler: {
-        file: {
-          path: path.join(__dirname, "../resources/client"),
-          confine: false
-        }
-      }
-    });
-    server.route({
-      path: "/_flow/hmr/connect.js",
-      method: "get",
-      handler: {
-        file: {
-          path: path.join(__dirname, "../resources/ws.js"),
-          confine: false
-        }
-      }
-    });
-    logger$1.debug("Enable development routes");
-    server.route({
-      path: "/_flow/sitemap",
-      method: "get",
-      handler: async () => {
-        const { pages: getPages } = server.methods.flow;
-        const urls = await getPages();
-        const pages = Object.values(urls).map((p) => R.dissoc("context", p));
-        return {
-          total: pages.length,
-          pages
-        };
-      }
-    });
-    server.route({
-      path: "/_flow/locales",
-      method: "get",
-      handler: async (req) => {
-        const { pages: getPages } = server.methods.flow;
-        const urls = await getPages();
-        const pages = Object.values(urls).map((p) => R.dissoc("context", p));
-        const locales = R.groupBy((page) => page.locale, pages);
-        return {
-          locales: req.server.plugins.flow.configs.locales,
-          all: R.mapObjIndexed((l) => {
-            return {
-              total: l.length,
-              pages: l
-            };
-          }, locales)
-        };
-      }
-    });
-    server.route({
-      path: "/_flow/configs",
-      method: "get",
-      handler: (req) => {
-        return req.server.plugins.flow.configs;
-      }
-    });
-  }
-  const HMR = {
-    head: ' <script src="/_flow/hmr/client.js"><\/script>',
-    body: ' <script src="/_flow/hmr/connect.js"><\/script>'
-  };
-  server.ext("onPreHandler", async (req, h) => {
-    if (req.route.settings.plugins?.generate === ".html") {
-      const { global } = req.plugins.flow;
-      Object.assign(global, {
-        hmr: isProduction || isGenerate ? { head: "", body: "" } : HMR
-      });
-    }
-    return h.continue;
-  });
-};
-
 const plugin = {
   pkg,
   dependencies,
@@ -1055,7 +864,6 @@ const plugin = {
         return baseOptions;
       }
     };
-    await RegisterCommon(server, config);
   }
 };
 

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Server, Plugin } from '@hapi/hapi';
+import { Plugin } from '@hapi/hapi';
 import { PageInfo } from '../types/core';
 import { OptionsHapiPage, RunPreDefinePage, Flow, FlowExtensions, OptionDynamicLocalePages, GenerateOptions, FlowServerMethods, FlowOptions } from '../types';
 export { ContextHandler, Contexts, Extension, Flow, FlowContextPage, FlowContextSeo, FlowContextView, FlowEngines, FlowExtensions, FlowOptionPlugins, FlowOptions, FlowPluginExtension, FlowPluginGlobal, FlowPluginLocal, FlowPluginUtils, FlowServerMethods, FlowStatePlugins, GenerateFolder, OptionDynamicLocalePages, OptionsDynamicPages, OptionsHapiPage, RunDefinePage, RunPreDefinePage } from '../types';
@@ -6,14 +6,7 @@ export { ContextHandler, Contexts, Extension, Flow, FlowContextPage, FlowContext
 declare type DefinePage = (page: OptionsHapiPage) => RunPreDefinePage;
 declare const definePage: DefinePage;
 
-declare type HapiPages = OptionsHapiPage | OptionsHapiPage[];
-interface Context {
-    server: Server;
-}
-declare type Pages = (ctx: Context) => Promise<HapiPages>;
-
 declare const plugin: Plugin<FlowOptions>;
-
 declare module '@hapi/hapi' {
     interface ServerApplicationState {
         flow: Flow.AppState;
@@ -61,4 +54,4 @@ declare module '@hapi/hapi' {
     }
 }
 
-export { Pages, definePage, plugin };
+export { definePage, plugin };

package/dist/index.mjs

@@ -1,18 +1,14 @@
-import path, { join } from 'path';
+import path from 'path';
 import { applyToDefaults } from '@hapi/hoek';
 import consola from 'consola';
 import * as R from 'ramda';
-import { flatten, dissoc, groupBy, mapObjIndexed } from 'ramda';
 import { notFound } from '@hapi/boom';
 import os from 'os';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import fs$1 from 'fs';
-import { createHooks } from 'hookable';
-import chokidar from 'chokidar';
 
 const name = "@monkeyplus/flow";
-const version = "4.0.0-beta.19";
+const version = "4.0.0-beta.2";
 const description = "Utils hapi";
 const author = "Andres Navarrete";
 const license = "MIT";
@@ -21,8 +17,7 @@ const module = "./dist/index.mjs";
 const types = "./dist/index.d.ts";
 const files = [
 	"dist/",
-	"types/",
-	"resources/"
+	"types/"
 ];
 const exports = {
 	".": {
@@ -38,24 +33,21 @@ const scripts = {
 	lint: "eslint --ext .js,.ts .",
 	fix: "eslint --fix --ext .ts .",
 	prepublishOnly: "pnpm run build",
+	publish: "pnpm publish",
 	start: "esno src/index.ts",
 	test: "vitest"
 };
 const dependencies$1 = {
 	"@hapi/boom": "9.x.x",
 	"@hapi/hoek": "9.x.x",
+	chalk: "^5.0.0",
 	consola: "^2.15.3",
-	chalk: "^4.1.2",
-	chokidar: "^3.5.3",
-	hookable: "^5.1.1",
 	"fs-extra": "^10.0.0",
 	ramda: "^0.28.0"
 };
 const devDependencies = {
 	"@types/fs-extra": "^9.0.13",
 	"@types/hapi__hapi": "^20.0.10",
-	"@types/hapi__nes": "^11.0.5",
-	"@types/hapi__vision": "^5.5.3",
 	"@types/ramda": "^0.27.64"
 };
 const peerDependencies = {
@@ -82,13 +74,8 @@ const pkg = {
 
 const logger$1 = consola.withScope(pkg.name);
 const dependencies = {
-  "@hapi/vision": "6.x.x",
-  "@hapi/inert": "6.x.x",
-  "@hapi/h2o2": "9.x.x",
-  "@hapi/nes": "12.x.x"
+  "@hapi/vision": "6.x.x"
 };
-const isProduction = process.env.NODE_ENV === "production";
-const isGenerate = process.env.GENERATE;
 
 const LifeCircle = {
   register: (server) => {
@@ -302,7 +289,7 @@ const handlerPage = async (req, h) => {
     return context;
   }
   context.utils = utils;
-  return h.view(`${configs.dirTemplates}${flow.view.layout || "default"}`, context);
+  return h.view(`${configs.dirTemplates}${flow.view.template}`, context);
 };
 
 const logger = consola.withScope("@monkeyplus/flow");
@@ -310,10 +297,6 @@ const defaults = {
   locales: ["es-ec"],
   defaultUbication: "ec",
   defaultLanguage: "es",
-  staticDir: "static",
-  hmr: {
-    dirs: ["views"]
-  },
   publicPath: "/",
   locale: "es-ec",
   relativeTo: "",
@@ -556,7 +539,7 @@ const useGenerator = {
       if (!virtualGenerate)
         injectAssets(_assets);
       const dirOutut = helpers.getPath(configs.outputDir ?? "build");
-      const staticDirs = [configs.staticDir].map((dir) => helpers.getPath(dir));
+      const staticDirs = Object.keys(server.app.flow.generate.staticFolders).map((dir) => helpers.getPath(dir));
       const files = await getFlowPages();
       const pairFiles = R.toPairs(files);
       const ommit = ommitAssets;
@@ -685,47 +668,6 @@ const definePage = (pageOptions) => (levelOptions) => (configs) => {
   return routes;
 };
 
-const readPagesDir = (pathDir, folder) => {
-  const p = fs$1.readdirSync(pathDir);
-  return flatten(p.filter((f) => !f.includes(".js.map") && !f.includes(" copy.js.map") && !f.includes(" copy.js") && !f.includes(".model")).map((e) => {
-    if (e.includes(".js") || e.includes(".ts")) {
-      return {
-        path: path.join(pathDir, e),
-        prefix: folder
-      };
-    } else {
-      return readPagesDir(path.join(pathDir, e), e);
-    }
-  }));
-};
-const registerPages = async (server, dir) => {
-  const dirPages = path.resolve(dir || "./pages");
-  const listFiles = readPagesDir(dirPages);
-  const listPrePages = [];
-  for (const item of listFiles) {
-    try {
-      const module = require(item.path)?.default;
-      if (typeof module === "function") {
-        listPrePages.push(module());
-      } else if (typeof module === "object") {
-        if (Array.isArray(module)) {
-          module.forEach((el) => listPrePages.push(el()));
-        } else {
-          const _pages = await module.pages({ server });
-          if (Array.isArray(_pages))
-            _pages.forEach((page) => listPrePages.push(definePage(page)()));
-          else
-            listPrePages.push(definePage(_pages)());
-        }
-      }
-    } catch (details) {
-      logger$1.error(details);
-    }
-  }
-  for (const page of listPrePages)
-    await server.flow.addPage(page);
-};
-
 const RunMethods = {
   register: (server) => {
     const { flow: state } = server.app;
@@ -739,7 +681,7 @@ const RunMethods = {
         server.route(route);
     };
     const addPage = (_page, extra) => {
-      const registerPages2 = (_pages2) => {
+      const registerPages = (_pages2) => {
         for (const _route of _pages2) {
           if (state.routes[_route.path])
             logger$1.warn("The route %s alredy exist", _route.path);
@@ -750,14 +692,13 @@ const RunMethods = {
       let _pages;
       if (typeof _page === "function") {
         _pages = _page(config);
-        registerPages2(_pages);
+        registerPages(_pages);
       } else {
         _pages = definePage(_page)()(config);
-        registerPages2(_pages);
+        registerPages(_pages);
       }
     };
     const init = async () => {
-      await registerPages(server, config.pagesDir);
       const pages = server.app.flow.routes;
       for (const key in pages) {
         const page = pages[key];
@@ -774,137 +715,6 @@ const RunMethods = {
   }
 };
 
-const createHmr = (options) => {
-  const state = {
-    dir: options.relativeTo || "",
-    dirs: options.dirs || [],
-    extensions: options.extensions || ["eta"]
-  };
-  let watcher;
-  const hooks = createHooks();
-  const watch = () => {
-    watcher = chokidar.watch(state.dirs.map((d) => path.join(d, `**/*.(${state.extensions.join("|")})`)), {
-      cwd: state.dir,
-      ignoreInitial: true,
-      ignored: "node_modules/**/*"
-    }).on("change", (path2) => {
-      logger$1.info("Changed file", path2);
-      hooks.callHook("page:refresh");
-    });
-  };
-  watch();
-  return { watcher, hooks };
-};
-
-const RegisterCommon = async (server, configs) => {
-  server.route({
-    method: "GET",
-    path: "/{param*}",
-    options: {
-      ext: {
-        onPreResponse: {
-          method: (req, h) => {
-            return h.continue;
-          }
-        }
-      }
-    },
-    handler: {
-      directory: {
-        path: configs.staticDir,
-        listing: true
-      }
-    }
-  });
-  if (!isGenerate) {
-    const hmr = createHmr({
-      dirs: configs.hmr.dirs,
-      relativeTo: configs.relativeTo,
-      extensions: configs.hmr.extensions
-    });
-    hmr.hooks.hook("page:refresh", () => {
-      setTimeout(() => {
-        logger$1.info("Refresh page");
-        server.publish("/_flow/hmr", { reload: true });
-      }, 40);
-    });
-    server.subscription("/_flow/hmr");
-    server.route({
-      path: "/_flow/hmr/client.js",
-      method: "get",
-      handler: {
-        file: {
-          path: join(__dirname, "../resources/client"),
-          confine: false
-        }
-      }
-    });
-    server.route({
-      path: "/_flow/hmr/connect.js",
-      method: "get",
-      handler: {
-        file: {
-          path: join(__dirname, "../resources/ws.js"),
-          confine: false
-        }
-      }
-    });
-    logger$1.debug("Enable development routes");
-    server.route({
-      path: "/_flow/sitemap",
-      method: "get",
-      handler: async () => {
-        const { pages: getPages } = server.methods.flow;
-        const urls = await getPages();
-        const pages = Object.values(urls).map((p) => dissoc("context", p));
-        return {
-          total: pages.length,
-          pages
-        };
-      }
-    });
-    server.route({
-      path: "/_flow/locales",
-      method: "get",
-      handler: async (req) => {
-        const { pages: getPages } = server.methods.flow;
-        const urls = await getPages();
-        const pages = Object.values(urls).map((p) => dissoc("context", p));
-        const locales = groupBy((page) => page.locale, pages);
-        return {
-          locales: req.server.plugins.flow.configs.locales,
-          all: mapObjIndexed((l) => {
-            return {
-              total: l.length,
-              pages: l
-            };
-          }, locales)
-        };
-      }
-    });
-    server.route({
-      path: "/_flow/configs",
-      method: "get",
-      handler: (req) => {
-        return req.server.plugins.flow.configs;
-      }
-    });
-  }
-  const HMR = {
-    head: ' <script src="/_flow/hmr/client.js"><\/script>',
-    body: ' <script src="/_flow/hmr/connect.js"><\/script>'
-  };
-  server.ext("onPreHandler", async (req, h) => {
-    if (req.route.settings.plugins?.generate === ".html") {
-      const { global } = req.plugins.flow;
-      Object.assign(global, {
-        hmr: isProduction || isGenerate ? { head: "", body: "" } : HMR
-      });
-    }
-    return h.continue;
-  });
-};
-
 const plugin = {
   pkg,
   dependencies,
@@ -1029,7 +839,6 @@ const plugin = {
         return baseOptions;
       }
     };
-    await RegisterCommon(server, config);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkeyplus/flow",
-  "version": "4.0.0-beta.19",
+  "version": "4.0.0-beta.2",
   "description": "Utils hapi",
   "author": "Andres Navarrete",
   "license": "MIT",
@@ -9,8 +9,7 @@
   "types": "./dist/index.d.ts",
   "files": [
     "dist/",
-    "types/",
-    "resources/"
+    "types/"
   ],
   "exports": {
     ".": {
@@ -21,18 +20,14 @@
   "dependencies": {
     "@hapi/boom": "9.x.x",
     "@hapi/hoek": "9.x.x",
+    "chalk": "^5.0.0",
     "consola": "^2.15.3",
-    "chalk": "^4.1.2",
-    "chokidar": "^3.5.3",
-    "hookable": "^5.1.1",
     "fs-extra": "^10.0.0",
     "ramda": "^0.28.0"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
     "@types/hapi__hapi": "^20.0.10",
-    "@types/hapi__nes": "^11.0.5",
-    "@types/hapi__vision": "^5.5.3",
     "@types/ramda": "^0.27.64"
   },
   "peerDependencies": {

package/types/flow.d.ts

@@ -33,12 +33,6 @@ export interface FlowOptions {
   routeOptions?: RouteOptions
   dirTemplates?: string
   plugins: FlowOptionPlugins
-  staticDir: string
-  pagesDir?: string
-  hmr: {
-    dirs: string[]
-    extensions?: string[]
-  }
   engines?: ('eta' | 'nunjucks')[]
 }
 

package/resources/client

@@ -1 +0,0 @@
-'use strict';var _typeof='function'==typeof Symbol&&'symbol'==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&'function'==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?'symbol':typeof a};(function(a,b){'object'===('undefined'==typeof exports?'undefined':_typeof(exports))&&'object'===('undefined'==typeof module?'undefined':_typeof(module))?module.exports=b():'function'==typeof define&&define.amd?define(b):'object'===('undefined'==typeof exports?'undefined':_typeof(exports))?exports.nes=b():a.nes=b()})('undefined'==typeof window?global:window,function(){var a=function(){},b=function(a){try{return JSON.stringify(a)}catch(a){throw new e(a,d.USER)}},c=function(a){return function(b){setTimeout(function(){return a(b)},0)}},d={TIMEOUT:'timeout',DISCONNECT:'disconnect',SERVER:'server',PROTOCOL:'protocol',WS:'ws',USER:'user'},e=function(a,b){'string'==typeof a&&(a=new Error(a)),a.type=b,a.isNes=!0;try{throw a}catch(a){return a}},f={1000:'Normal closure',1001:'Going away',1002:'Protocol error',1003:'Unsupported data',1004:'Reserved',1005:'No status received',1006:'Abnormal closure',1007:'Invalid frame payload data',1008:'Policy violation',1009:'Message too big',1010:'Mandatory extension',1011:'Internal server error',1015:'TLS handshake'},g=function(b,c){c=c||{},this._isBrowser='undefined'!=typeof WebSocket,this._isBrowser||(c.ws=c.ws||{},void 0===c.ws.maxPayload&&(c.ws.maxPayload=0)),this._url=b,this._settings=c,this._heartbeatTimeout=!1,this._ws=null,this._reconnection=null,this._reconnectionTimer=null,this._ids=0,this._requests={},this._subscriptions={},this._heartbeat=null,this._packets=[],this._disconnectListeners=null,this._disconnectRequested=!1,this.onError=function(a){return console.error(a)},this.onConnect=a,this.onDisconnect=a,this.onHeartbeatTimeout=a,this.onUpdate=a,this.id=null};return g.WebSocket='undefined'==typeof WebSocket?null:WebSocket,g.prototype.connect=function(a){var b=this;return(a=a||{},this._reconnection)?Promise.reject(new e('Cannot connect while client attempts to reconnect',d.USER)):this._ws?Promise.reject(new e('Already connected',d.USER)):(this._reconnection=!1===a.reconnect?null:{wait:0,delay:a.delay||1e3,maxDelay:a.maxDelay||5e3,retries:a.retries||Infinity,settings:{auth:a.auth,timeout:a.timeout}},new Promise(function(c,d){b._connect(a,!0,function(a){return a?d(a):c()})}))},g.prototype._connect=function(a,b,h){var i=this,j=this._isBrowser?new g.WebSocket(this._url):new g.WebSocket(this._url,this._settings.ws);this._ws=j,clearTimeout(this._reconnectionTimer),this._reconnectionTimer=null;var k=function(a){j.onopen&&l(new e('Connection terminated while waiting to connect',d.WS));var b=i._disconnectRequested;i._cleanup();var c={code:a.code,explanation:f[a.code]||'Unknown',reason:a.reason,wasClean:a.wasClean,willReconnect:i._willReconnect(),wasRequested:b};i.onDisconnect(c.willReconnect,c),i._reconnect()},l=function(a){if(h){var b=h;return h=null,b(a)}return i.onError(a)},m=a.timeout?setTimeout(function timeoutHandler(){if(i._cleanup(),l(new e('Connection timed out',d.TIMEOUT)),b)return i._reconnect()},a.timeout):null;j.onopen=function(){clearTimeout(m),j.onopen=null,i._hello(a.auth).then(function(){i.onConnect(),l()}).catch(function(a){a.path&&delete i._subscriptions[a.path],i._disconnect(function(){return c(l)(a)},!0)})},j.onerror=function(a){if(clearTimeout(m),i._willReconnect())return k(a);i._cleanup();var b=new e('Socket error',d.WS);return l(b)},j.onclose=k,j.onmessage=function(a){return i._onMessage(a)}},g.prototype.overrideReconnectionAuth=function(a){return!!this._reconnection&&(this._reconnection.settings.auth=a,!0)},g.prototype.reauthenticate=function(a){this.overrideReconnectionAuth(a);return this._send({type:'reauth',auth:a},!0)},g.prototype.disconnect=function(){var a=this;return new Promise(function(b){return a._disconnect(b,!1)})},g.prototype._disconnect=function(a,b){this._reconnection=null,clearTimeout(this._reconnectionTimer),this._reconnectionTimer=null;var c=this._disconnectRequested||!b;return this._disconnectListeners?(this._disconnectRequested=c,void this._disconnectListeners.push(a)):this._ws&&(this._ws.readyState===g.WebSocket.OPEN||this._ws.readyState===g.WebSocket.CONNECTING)?void(this._disconnectRequested=c,this._disconnectListeners=[a],this._ws.close()):a()},g.prototype._cleanup=function(){if(this._ws){var k=this._ws;this._ws=null,k.readyState!==g.WebSocket.CLOSED&&k.readyState!==g.WebSocket.CLOSING&&k.close(),k.onopen=null,k.onclose=null,k.onerror=a,k.onmessage=null}this._packets=[],this.id=null,clearTimeout(this._heartbeat),this._heartbeat=null;var b=new e('Request failed - server disconnected',d.DISCONNECT),c=this._requests;this._requests={};for(var f=Object.keys(c),h=0;h<f.length;++h){var i=f[h],j=c[i];clearTimeout(j.timeout),j.reject(b)}if(this._disconnectListeners){var l=this._disconnectListeners;this._disconnectListeners=null,this._disconnectRequested=!1,l.forEach(function(a){return a()})}},g.prototype._reconnect=function(){var b=this,c=this._reconnection;if(c){if(1>c.retries)return this._disconnect(a,!0);--c.retries,c.wait+=c.delay;var d=Math.min(c.wait,c.maxDelay);this._reconnectionTimer=setTimeout(function(){b._connect(c.settings,!1,function(a){if(a)return b.onError(a),b._reconnect()})},d)}},g.prototype.request=function(a){'string'==typeof a&&(a={method:'GET',path:a});var b={type:'request',method:a.method||'GET',path:a.path,headers:a.headers,payload:a.payload};return this._send(b,!0)},g.prototype.message=function(a){return this._send({type:'message',message:a},!0)},g.prototype._isReady=function(){return this._ws&&this._ws.readyState===g.WebSocket.OPEN},g.prototype._send=function(a,c){if(!this._isReady())return Promise.reject(new e('Failed to send message - server disconnected',d.DISCONNECT));a.id=++this._ids;try{var f=b(a)}catch(a){return Promise.reject(a)}if(!c)try{return this._ws.send(f),Promise.resolve()}catch(a){return Promise.reject(new e(a,d.WS))}var g={resolve:null,reject:null,timeout:null},h=new Promise(function(a,b){g.resolve=a,g.reject=b});this._settings.timeout&&(g.timeout=setTimeout(function(){return g.timeout=null,g.reject(new e('Request timed out',d.TIMEOUT))},this._settings.timeout)),this._requests[a.id]=g;try{this._ws.send(f)}catch(b){return clearTimeout(this._requests[a.id].timeout),delete this._requests[a.id],Promise.reject(new e(b,d.WS))}return h},g.prototype._hello=function(a){var b={type:'hello',version:'2'};a&&(b.auth=a);var c=this.subscriptions();return c.length&&(b.subs=c),this._send(b,!0)},g.prototype.subscriptions=function(){return Object.keys(this._subscriptions)},g.prototype.subscribe=function(a,b){var c=this;if(!a||'/'!==a[0])return Promise.reject(new e('Invalid path',d.USER));var f=this._subscriptions[a];if(f)return-1===f.indexOf(b)&&f.push(b),Promise.resolve();if(this._subscriptions[a]=[b],!this._isReady())return Promise.resolve();var g=this._send({type:'sub',path:a},!0);return g.catch(function(){delete c._subscriptions[a]}),g},g.prototype.unsubscribe=function(b,c){if(!b||'/'!==b[0])return Promise.reject(new e('Invalid path',d.USER));var f=this._subscriptions[b];if(!f)return Promise.resolve();var g=!1;if(!c)delete this._subscriptions[b],g=!0;else{var i=f.indexOf(c);if(-1===i)return Promise.resolve();f.splice(i,1),f.length||(delete this._subscriptions[b],g=!0)}if(!g||!this._isReady())return Promise.resolve();var h=this._send({type:'unsub',path:b},!0);return h.catch(a),h},g.prototype._onMessage=function(b){this._beat();var c=b.data,f=c[0];if('{'!==f){if(this._packets.push(c.slice(1)),'!'!==f)return;c=this._packets.join(''),this._packets=[]}this._packets.length&&(this._packets=[],this.onError(new e('Received an incomplete message',d.PROTOCOL)));try{var g=JSON.parse(c)}catch(a){return this.onError(new e(a,d.PROTOCOL))}var h=null;if(g.statusCode&&400<=g.statusCode&&(h=new e(g.payload.message||g.payload.error||'Error',d.SERVER),h.statusCode=g.statusCode,h.data=g.payload,h.headers=g.headers,h.path=g.path),'ping'===g.type)return this._send({type:'ping'},!1).catch(a);if('update'===g.type)return this.onUpdate(g.message);if('pub'===g.type||'revoke'===g.type){var l=this._subscriptions[g.path];if('revoke'===g.type&&delete this._subscriptions[g.path],l&&void 0!==g.message){var m={};'revoke'===g.type&&(m.revoked=!0);for(var n=0;n<l.length;++n)l[n](g.message,m)}return}var j=this._requests[g.id];if(!j)return this.onError(new e('Received response for unknown request',d.PROTOCOL));clearTimeout(j.timeout),delete this._requests[g.id];var k=function(a,b){return a?j.reject(a):j.resolve(b)};return'request'===g.type?k(h,{payload:g.payload,statusCode:g.statusCode,headers:g.headers}):'message'===g.type?k(h,{payload:g.message}):'hello'===g.type?(this.id=g.socket,g.heartbeat&&(this._heartbeatTimeout=g.heartbeat.interval+g.heartbeat.timeout,this._beat()),k(h)):'reauth'===g.type?k(h,!0):'sub'===g.type||'unsub'===g.type?k(h):(k(new e('Received invalid response',d.PROTOCOL)),this.onError(new e('Received unknown response type: '+g.type,d.PROTOCOL)))},g.prototype._beat=function(){var a=this;this._heartbeatTimeout&&(clearTimeout(this._heartbeat),this._heartbeat=setTimeout(function(){a.onError(new e('Disconnecting due to heartbeat timeout',d.TIMEOUT)),a.onHeartbeatTimeout(a._willReconnect()),a._ws.close()},this._heartbeatTimeout))},g.prototype._willReconnect=function(){return!!(this._reconnection&&1<=this._reconnection.retries)},{Client:g}});

package/resources/ws.js

@@ -1,15 +0,0 @@
-/* eslint-disable no-undef */
-const client = new nes.Client("ws://" + location.host, {
-  timeout: 5000,
-});
-console.log("[flow] connecting...");
-const start = async () => {
-  await client.connect({ delay: 5000 });
-  console.log("[flow] connected.");
-  const handler = (update, flags) => {
-    location.reload();
-  };
-  client.subscribe("/_flow/hmr", handler);
-};
-
-start();