kireji 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
  "name": "kireji",
- "version": "0.3.0",
+ "version": "0.3.1",
  "description": "A web framework for stateful, entropy-perfect, multi-origin web applications. Currently in alpha. Expect breaking changes for version 0. Use with caution!",
  "files": [
   "src/",

package/src/build.js

@@ -7,17 +7,18 @@ function ƒ(_, compressedSubjectOrigins) {
    Object.defineProperty(_, "$", { value: (f => x => f(x).toString().trim())(require("child_process").execSync) }),
    _.command = process.argv[2] || "help",
    _.local = _.command === "dev" ? "1" : "0",
-   require.main === module && (
+   require.main === module ? (
     _.branch = _.$("git rev-parse --abbrev-ref HEAD").toString().trim(),
     _.gitSHA = _.$("git rev-parse HEAD").toString().trim(),
     _.version = (([M, m, p], c) => +_.local ? +M && c === "major" ? `${++M}.0.0` : c === "minor" || (!+M && c === "major") ? `${M}.${++m}.0` : `${M}.${m}.${++p}` : `${M}.${m}.${p}`)(_.$("git log -1 --pretty=%s").toString().match(/^\s*(\d+\.\d+\.\d+)/)[1].split("."), _.change),
     _.modified = _.$('git show -s --format=%ci HEAD').toString().trim(),
     _.ETag = `"${_.version}.${_.gitSHA.slice(0, 7)}${+_.local ? ("." + Math.random()).slice(2, 10) : ""}"`,
-    _.name = __dirname.split(/[\\/]/).filter(Boolean).at(-4)
-   ),
-   "node"
+    _.name = __dirname.split(/[\\/]/).filter(Boolean).at(-4),
+    "node-main"
+   ) :
+    "node-module"
   ),
-  production = _.branch === "main" && environment !== "node" && !(+_.local),
+  production = _.branch === "main" && (environment === "client" || environment === "worker") && !(+_.local),
   welcomeMessage = `
      ▌ ▘     ▘▘ ${_.name}
  k = ▙▘▌▛▘█▌ ▌▌ ${_.branch}
@@ -63,7 +64,7 @@ function ƒ(_, compressedSubjectOrigins) {
    }], "table")
   },
   logServerScope = (col1, col2, col3, callback) => {
-   return logScope(0, `\n${("" + col1).padEnd(22, " ")} ${(environment === "node" ? Math.trunc(process.memoryUsage().rss / 1024 / 1024) + " MiB" : "--").padEnd(8, " ")} ${("" + col2).padStart(24, " ")} ${col3}`, log => callback((col1, col2, col3) => log(`${("" + col1).padEnd(20, " ")} ${(environment === "node" ? Math.trunc(process.memoryUsage().rss / 1024 / 1024) + " MiB" : "--").padEnd(8, " ")} ${("" + col2).padStart(24, " ")} ${col3}`)))
+   return logScope(0, `\n${("" + col1).padEnd(22, " ")} ${(environment.startsWith("node") ? Math.trunc(process.memoryUsage().rss / 1024 / 1024) + " MiB" : "--").padEnd(8, " ")} ${("" + col2).padStart(24, " ")} ${col3}`, log => callback((col1, col2, col3) => log(`${("" + col1).padEnd(20, " ")} ${(environment.startsWith("node") ? Math.trunc(process.memoryUsage().rss / 1024 / 1024) + " MiB" : "--").padEnd(8, " ")} ${("" + col2).padStart(24, " ")} ${col3}`)))
   }
 
  // String and Stringification Utilities
@@ -240,7 +241,7 @@ function ƒ(_, compressedSubjectOrigins) {
    subjectIndices = new Map(),
    subjectOrigins = new Map()
 
-  if (environment === "node" && require.main === module) {
+  if (environment === "node-main") {
    subjectOrigins.set("", true)
 
    const
@@ -719,7 +720,7 @@ function ƒ(_, compressedSubjectOrigins) {
      return part
     },
     hydrateSubjectOrigins = () => {
-     if (environment === "node") {
+     if (environment === "node-main") {
       const bits = allSubjects.map(([host, fn]) => +subjectOrigins.get(host + (fn ? "/" + fn : "")))
       const bitString = bits.join("")
       compressedSubjectOrigins = encodeSegment(BigInt("0b" + bitString))

package/src/part.html_.js

@@ -50,8 +50,8 @@ const nonImageStyles = `<style id="user-css">${_["part.css"]}</style>` +
  `<style id="application-css">${application["part.css"]}</style>`
 
 const styles = nonImageStyles +
- `<style id="img-css">${environment === "node" ? "" : _["images.css"]}</style>` +
- (environment === "node" ? `<style id="early-img-css">${_.getImagesEarly(bodyHTML, nonImageStyles)}</style>` : "")
+ `<style id="img-css">${environment.startsWith("node") ? "" : _["images.css"]}</style>` +
+ (environment.startsWith("node") ? `<style id="early-img-css">${_.getImagesEarly(bodyHTML, nonImageStyles)}</style>` : "")
 
 const headHTML =
  `<head>${title}${meta}${links}${styles}</head>`

package/src/parts/abstract/facet/description-abstract

@@ -1,3 +1,3 @@
 Ecosystem Facets are subparts which undergo a special installation step, depending on the deployment environment.
 
-A facet can only be installed on a proper subset of the three environments (node server, service worker, and client). The ecosystem only accepts requests and user interaction after all applicable facets have been installed.
+A facet can only be installed on a proper subset of the four environments (node main, node module, service worker, and client). The ecosystem only accepts requests and user interaction after all applicable facets have been installed.

package/src/parts/core/server/description

@@ -1,5 +1,5 @@
 This server-only facet uses node-specific functionality to create an HTTP server on the designated port. It allows the ecosystem to server-render a snapshot of its GUI as a single HTML document with inlined CSS and JavaScript. This acts as a bootstrap which fetches and installs the ecosystem as a service worker and then hydrates the snapshot.
 
-When it is deployed as the main node module (and not imported by another module) it gathers information about other version deployments and can serve them by importing them as modules.
+When the environment is "node-main" (and not "node-module"), it gathers information about other version deployments and can serve them by importing them as modules.
 
 It provides http-to-https redirects, ensures that the "www." subdomain is removed, redirects from canonical URLs, provides version information for the update manager, and redirects certain canonical paths (like "/") to the appropriate versioned and stateful counterpart.

package/src/parts/core/server/environments

@@ -1 +1,2 @@
-node
+node-main
+node-module

package/src/parts/core/server/sync-install.js

@@ -83,7 +83,7 @@ const
 
 module.exports = currentExports
 
-if (require.main !== module) {
+if (environment === "node-module") {
  logScope(0, "Server Ready - Proxy Module")
  return
 }

package/src/type.d.ts

@@ -135,10 +135,14 @@ class SourceMappedFile {
  getMap(): string
 }
 /** A string representing which of three known environments the framework is running on.
- * 1. "node"
+ * 1. "node-main"
  *     - Unpacked in a clone of the project git repo in node.
  *     - It's called by `npx kireji` in order to perform operations like pack the repo into a single client artifact and run as a backend to serve that artifact and to server-render HTML.
- *     - It's state (when it runs as a server) is set by http requests at the designated port.
+ *     - Its state (when it runs as a server) is set by http requests at the designated port.
+ * 2. "node-module"
+ *     - Packed and archived, loaded in as a module via `require` by the main node module.
+ *     - It acts as a proxy for a previous version of the project, when matching versioned URLs are fetched.
+ *     - Its state is set by proxy requests passed through by the main node module.
  * 3. "worker"
  *     - Packed and deployed as the browser's ServiceWorker.
  *     - It's booted by the browser after a client registers it.
@@ -147,7 +151,7 @@ class SourceMappedFile {
  *     - Packed and deployed as a front-end framework hydrating a browser tab.
  *     - It's booted by a script tag added to the server- or worker-rendered html file.
  *     - Its state is initially set by `location.href` (whatever is in the address bar) and then set by user interaction thereafter. */
-declare const environment: "node" | "worker" | "client"
+declare const environment: "client" | "worker" | "node-main" | "node-module"
 /** True if the framework was built on the cloud from the main branch. */
 declare const production: boolean
 /** A unicode-safe replacement for btoa. */

package/src/validate.js

@@ -1,4 +1,4 @@
-if (environment === "node" && require.main === module) {
+if (environment === "node-main") {
  logScope(1, "Routing Test", log => {
   // logScope(3, "Uninitialized Model", log => log(serialize(_.model)))
   const testURL = `https://${_.defaultApplicationHost}/${_.version}/${_.landingHash}/`