Merge pull request #20 from neuralinterfaces/v0.0.59

0.0.59 Release

docs/getting-started.md

@@ -13,7 +13,7 @@ Follow the prompts to select your favorite framework and features.
 After running `npm install`, add Commoners as a dependency:
 
 ```bash
-npm install -D [email protected].58
+npm install -D [email protected].59
 ```
 
 ## Configuring the `package.json` File

package.json

@@ -20,13 +20,13 @@
     "@commoners/bluetooth": "0.0.55",
     "@commoners/custom-protocol": "0.0.55",
     "@commoners/serial": "0.0.55",
-    "@commoners/solidarity": "0.0.58",
+    "@commoners/solidarity": "0.0.59",
     "@commoners/splash-screen": "0.0.55",
-    "@commoners/testing": "0.0.58",
+    "@commoners/testing": "0.0.59",
     "@commoners/windows": "0.0.58",
     "@vitest/coverage-v8": "^2.0.3",
     "search-insights": "^2.15.0",
-    "commoners": "0.0.58",
+    "commoners": "0.0.59",
     "vite": "^5.3.4",
     "vitepress": "^1.3.1",
     "vitest": "^2.0.3"

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "commoners",
   "description": "Cross-Platform Development for the Rest of Us",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "type": "module",
   "license": "MIT",
   "engines": {
@@ -18,7 +18,7 @@
     "watch": "vite build --watch"
   },
   "dependencies": {
-    "@commoners/solidarity": "^0.0.58",
+    "@commoners/solidarity": "^0.0.59",
     "cac": "^6.7.14"
   },
   "devDependencies": {

packages/core/assets/electron/main.ts

@@ -10,6 +10,16 @@ function normalizeAndCompare(path1, path2, comparison = (a,b) => a === b) {
   return comparison(decodePath(path1), decodePath(path2))
 }
 
+async function checkLinkType(url) {
+  try {
+      const response = await fetch(url, { method: 'HEAD' });
+      const contentDisposition = response.headers.get('Content-Disposition');
+      if (contentDisposition && contentDisposition.includes('attachment')) return 'download'; // Download if attachment
+      if (!response.headers.get('Content-Type').startsWith('text/html')) return 'download'; // Download if not an HTML file
+      return 'webpage';
+  } catch (error) { return 'unknown' }
+}
+
 // Custom Window Flags
 // __main: Is Main Window
 // __show: Used to block show behavior
@@ -297,13 +307,21 @@ const runWindowPlugins = async (win: BrowserWindow | null = null, type = 'load',
     })
 
 
-    // CAtch all navigation events
-    win.webContents.on('will-navigate', (event, url) => {
+    // Catch all navigation events
+    win.webContents.on('will-navigate', async (event, url) => {
 
       event.preventDefault()
+
       const urlObj = new URL(url)
-      const file = urlObj.pathname
-      loadPage(win, file)
+      const isValid = (devServerURL && devServerURL.startsWith(urlObj.origin)) || urlObj.protocol === 'file:'
+
+      if (!isValid) {
+        const type = await checkLinkType(url)
+        if (type === 'download') return win.webContents.downloadURL(url) // Download
+        return shell.openExternal(url) // Opened externally
+      }
+
+      loadPage(win, urlObj.pathname) // Required for successful navigation relative to the root (e.g. "../..") 
     })
 
 
@@ -334,6 +352,7 @@ const runWindowPlugins = async (win: BrowserWindow | null = null, type = 'load',
     // ------------------------ Default Quit Behavior ------------------------
     ipcMain.once('commoners:quit', () => app.quit())
 
+    // ------------------------ Open Windows Externally ------------------------
     win.webContents.setWindowOpenHandler(({ url }) => {
       shell.openExternal(url);
       return { action: 'deny' };

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@commoners/solidarity",
   "description": "Build solidarity across platform",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "type": "module",
   "license": "MIT",
   "exports": {

packages/plugins/windows/package.json

@@ -12,6 +12,6 @@
         "vite": "^5.3.4"
     },
     "peerDependencies": {
-        "@commoners/solidarity": "^0.0.58"
+        "@commoners/solidarity": "^0.0.59"
     }
 }

packages/testing/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@commoners/testing",
-    "version": "0.0.58",
+    "version": "0.0.59",
     "license": "MIT",
     "type": "module",
     "main": "./dist/main.cjs",
@@ -21,7 +21,7 @@
         "postinstall": "pnpm exec playwright install chromium"
     },
     "dependencies": {
-        "@commoners/solidarity": "^0.0.58",
+        "@commoners/solidarity": "^0.0.59",
         "playwright": "^1.48.0",
         "vite": "^5.4.2",
         "vitest": "^2.0.3"

tests/demo/commoners.config.ts

@@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url";
 // const root/ = resolve(dirname(fileURLToPath(import.meta.url)))
 const root = './'
 
-import * as checksPlugin from './src/plugins/checks.ts'
+import * as checksPlugin from './src/plugins/checks'
 
 import splashPagePlugin from '@commoners/splash-screen'
 import customProtocolPlugin from '@commoners/custom-protocol'
@@ -75,7 +75,7 @@ const config = defineConfig({
     plugins: {
         checks: checksPlugin,
         splash: splashPagePlugin(splashSrc),
-        protocol: customProtocolPlugin('app', { supportFetchAPI: true }),
+        protocol: customProtocolPlugin('commoners', { supportFetchAPI: true }), // NOTE: Test this in detail with a build
         windows: windowsPlugin({
             popup: {
                 src: join(root, "pages", "windows", 'popup.html'),

tests/demo/index.html

@@ -14,15 +14,27 @@ <h1 id="name"></h1>
 
     <main>
             <section>
+                <h2>Core Features</h2>
                 <ol>
                     <li>
                         <a href="./pages/services/index.html">Services</a>
                     </li>
                 </ol>
             </section>
 
+
             <section>
-                <h2>Plugins</h2>
+                <h3>Desktop</h3>
+                <small><a href="" disabled>Download Link</a></small>
+            </section>
+
+            <section>
+                <h3>Mobile</h3>
+                <small><a href="" disabled>Download Link</a></small>
+            </section>
+
+            <section>
+                <h2>Community Plugins</h2>
                 <ol>
                     <li>
                         <a href="./pages/bluetooth/index.html">Bluetooth</a>
@@ -37,14 +49,11 @@ <h2>Plugins</h2>
             </section>
 
             <section>
-                <h2>Desktop</h2>
-                <small><a href="" disabled>Download Link</a></small>
+                <h2>Additional Resources</h2>
+                <p><a href="https://commoners.dev">Documentation</a></p>
+                <p><a href="https://github.com/neuralinterfaces/commoners">Source code</a> (<a href="https://github.com/neuralinterfaces/commoners/archive/refs/heads/main.zip">.zip</a>)</p>
             </section>
 
-            <section>
-                <h2>Mobile</h2>
-                <small><a href="" disabled>Download Link</a></small>
-            </section>
         </main>
 </body>
 

tests/demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@commoners/test-app",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "private": true,
   "description": "A test app for the commoners library",
   "repository": {

tests/demo/src/plugins/checks.ts

@@ -8,7 +8,10 @@ import { fileURLToPath } from "node:url";
 let src: string | null = null
 try { src = resolve(fileURLToPath(import.meta.url)) } catch {}
 
-export const isSupported = {  mobile: true, web: true }
+export const isSupported = { 
+    mobile: true, 
+    web: true 
+}
 
 export function load () {
     const { commoners } = globalThis

tests/demo/style.css

@@ -27,11 +27,10 @@
   h1 {
     font-size: 3.2em;
     line-height: 1.1;
-    margin: 0;
     margin-bottom: 0.5em;
   }
 
-  h2 {
+  h1, h2, h3, h4 {
     margin: 0;
   }