Merge pull request #168 from dosyago/better-starutp

crisdosaygo · web-flow · commit 0d94d869446d · 2023-07-23T10:08:48.000+08:00
Better startup
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "diskernet",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "type": "module",
   "description": "Library server and an archivist browser controller.",
   "main": "src/app.js",
@@ -41,7 +41,7 @@
     "library"
   ],
   "author": "@dosy",
-  "license": "PolyForm Strict 1.0",
+  "license": "AGPL-3.0",
   "bugs": {
     "url": "https://github.com/dosyago/DiskerNet/issues"
   },
diff --git a/public/index.html b/public/index.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>Your HTML Library</title>
-<link rel=stylesheet href=/style.css>
+<title>Your Personal Search Engine and Archive</title>
+<link rel=stylesheet href=style.css>
 <header>
-  <h1><a href=/>22120</a> &mdash; Internet Offline Library</h1>
+  <h1><a href=/>DiskerNet</a> &mdash; Personal Web Search and Archive</h1>
 </header>
 <p>
-  View <a href=/archive_index.html>the index</a>
+  View <a href=/archive_index.html>your index</a>
 </p>
 <!--
 <form method=POST action=/crawl>
@@ -147,7 +147,7 @@ <h1><a href=/>22120</a> &mdash; Internet Offline Library</h1>
 <form method=GET action=/search>
   <fieldset class=search>
     <legend>Search your archive</legend>
-    <input class=search type=search name=query placeholder="search your library">
+    <input autofocus class=search type=search name=query placeholder="search your library">
     <button>Search</button>
   </fieldset>
 </form>
@@ -236,8 +236,11 @@ <h1><a href=/>22120</a> &mdash; Internet Offline Library</h1>
       <button disabled>Publish</button>
   </fieldset>
 </form>
+<p>
+  Notice a bug? <a href=https://github.com/dosyago/DiskerNet/issues>Open an issue!</a>
+</p>
 <footer>
   <cite>
-    <a rel=author href=https://github.com/crisdosyago/22120>22120 GitHub</a>
+    <a rel=author href=https://github.com/dosyago/DiskerNet>DiskerNet GitHub</a>
   </cite>
 </footer>
diff --git a/public/style.css b/public/style.css
@@ -4,12 +4,12 @@
     background: lavenderblush;
   }
   body {
-    display: table;
     margin: 0 auto 0 min(10%, 5em);
     background: white;
     padding: 0.5em;
     border-bottom: 1px solid purple;
     max-width: min(777px, 80%);
+    overflow-x: hidden;
   }
   header {
     font-size: smaller;
@@ -80,7 +80,7 @@
 
   input[type="number"] {
     text-align: right;
-  ]
+  }
 
   input.search {
     flex-grow: 1;
@@ -99,3 +99,6 @@
   .grey {
     color: grey;
   }
+  a {
+    word-break: break-word;
+  }
diff --git a/run.cjs b/run.cjs
@@ -0,0 +1,24 @@
+#!/usr/bin/env node
+
+const os = require('os');
+const { spawn } = require('child_process');
+
+// Checking if node_modules directory exists
+const fs = require('fs');
+const path = require('path');
+
+if (!fs.existsSync(path.join(process.cwd(), 'node_modules'))) {
+  spawn('npm', ['i'], { stdio: 'inherit' });
+}
+
+// Getting the total system memory
+const totalMemory = os.totalmem();
+
+// Allocating 90% of the total memory
+const memoryAllocation = Math.floor((totalMemory / (1024 * 1024)) * 0.8); // Converted bytes to MB and took 90% of it
+
+console.log(`Index can use up to: ${memoryAllocation}MB RAM`);
+
+// Running the application
+spawn('node', [`--max-old-space-size=${memoryAllocation}`, 'src/app.js'], { stdio: 'inherit' });
+
diff --git a/run.sh b/run.sh
diff --git a/scripts/compile.sh b/scripts/compile.sh
@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
 
-./scripts/build_only.sh
-
 unset npm_config_prefix
 source $HOME/.nvm/nvm.sh
 nvm use --lts
+PKG=$(which pkg)
+if [ -z $PKG ]; then
+  npm i -g pkg@latest
+  PKG=$(which pkg)
+fi
+
+./scripts/build_only.sh
 
-pkg --compress GZip .
+$PKG --compress GZip .
diff --git a/src/app.js b/src/app.js
@@ -143,6 +143,7 @@ async function killChrome(wait = true) {
 }
 
 async function cleanup(reason, err, {exit = false} = {}) {
+  console.log(`Shutting down everything because of an error!`);
   console.log(`Cleanup called on reason: ${reason}`, err);
 
   if ( quitting ) {
diff --git a/src/archivist.js b/src/archivist.js
@@ -1222,7 +1222,8 @@
         obj.id = id;
         return obj;
       } catch(e) {
-        console.log({obj, index:State.Index, e, ndx, flex, fuzz});
+        DEBUG.verboseSlow && console.log({obj, index:State.Index, e, ndx, flex, fuzz});
+        console.error("Error", e);
         return obj;
       }
     });
diff --git a/src/common.js b/src/common.js
@@ -7,6 +7,7 @@ import {APP_ROOT as __ROOT} from './root.js';
 const DEEB = false;
 
 export const DEBUG = {
+  debugSec: false,
   askFirst: true,
   verboseSlow: process.env.VERBOSE_DEBUG_22120 || DEEB,
   debug: process.env.DEBUG_22120 || DEEB,
diff --git a/src/libraryServer.js b/src/libraryServer.js

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@ async function killChrome(wait = true) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`async function cleanup(reason, err, {exit = false} = {}) {`
	`146`	+ console.log(`Shutting down everything because of an error!`);
`146`	`147`	console.log(`Cleanup called on reason: ${reason}`, err);
`147`	`148`
`148`	`149`	`if ( quitting ) {`