javascript-solid-server 0.0.91 → 0.0.93
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +8 -0
- package/bin/jss.js +13 -0
- package/package.json +1 -1
- package/src/config.js +4 -2
- package/src/handlers/resource.js +9 -5
- package/src/mashlib/index.js +17 -0
- package/src/server.js +15 -2
package/README.md
CHANGED
|
@@ -130,6 +130,7 @@ jss --help # Show help
|
|
|
130
130
|
| `--base-domain <domain>` | Base domain for subdomains | - |
|
|
131
131
|
| `--mashlib` | Enable Mashlib (local mode) | false |
|
|
132
132
|
| `--mashlib-cdn` | Enable Mashlib (CDN mode) | false |
|
|
133
|
+
| `--mashlib-module <url>` | Enable ES module data browser from a URL | - |
|
|
133
134
|
| `--mashlib-version <ver>` | Mashlib CDN version | 2.0.0 |
|
|
134
135
|
| `--solidos-ui` | Enable modern SolidOS UI (requires --mashlib) | false |
|
|
135
136
|
| `--git` | Enable Git HTTP backend | false |
|
|
@@ -161,6 +162,7 @@ export JSS_CONNEG=true
|
|
|
161
162
|
export JSS_SUBDOMAINS=true
|
|
162
163
|
export JSS_BASE_DOMAIN=example.com
|
|
163
164
|
export JSS_MASHLIB=true
|
|
165
|
+
export JSS_MASHLIB_MODULE=https://example.com/mashlib.js
|
|
164
166
|
export JSS_NOSTR=true
|
|
165
167
|
export JSS_INVITE_ONLY=true
|
|
166
168
|
export JSS_WEBID_TLS=true
|
|
@@ -367,6 +369,12 @@ cd src/mashlib-local
|
|
|
367
369
|
npm install && npm run build
|
|
368
370
|
```
|
|
369
371
|
|
|
372
|
+
**ES Module Mode** (for custom or next-gen mashlib builds):
|
|
373
|
+
```bash
|
|
374
|
+
jss start --mashlib-module https://example.com/mashlib.js
|
|
375
|
+
```
|
|
376
|
+
Loads an ES module-based data browser from any URL. Uses `<script type="module">` and `<div id="mashlib">` (self-initializing). CSS is auto-derived by replacing `.js` with `.css`. Content negotiation is auto-enabled.
|
|
377
|
+
|
|
370
378
|
**How it works:**
|
|
371
379
|
1. Browser requests `/alice/public/data.ttl` with `Accept: text/html`
|
|
372
380
|
2. Server returns Mashlib HTML wrapper
|
package/bin/jss.js
CHANGED
|
@@ -55,6 +55,7 @@ program
|
|
|
55
55
|
.option('--base-domain <domain>', 'Base domain for subdomain pods (e.g., "example.com")')
|
|
56
56
|
.option('--mashlib', 'Enable Mashlib data browser (local mode, requires mashlib in node_modules)')
|
|
57
57
|
.option('--mashlib-cdn', 'Enable Mashlib data browser (CDN mode, no local files needed)')
|
|
58
|
+
.option('--mashlib-module <url>', 'Enable ES module data browser from a URL')
|
|
58
59
|
.option('--no-mashlib', 'Disable Mashlib data browser')
|
|
59
60
|
.option('--mashlib-version <version>', 'Mashlib version for CDN mode (default: 2.0.0)')
|
|
60
61
|
.option('--solidos-ui', 'Enable modern Nextcloud-style UI (requires --mashlib)')
|
|
@@ -123,6 +124,7 @@ program
|
|
|
123
124
|
mashlib: config.mashlib || config.mashlibCdn,
|
|
124
125
|
mashlibCdn: config.mashlibCdn,
|
|
125
126
|
mashlibVersion: config.mashlibVersion,
|
|
127
|
+
mashlibModule: config.mashlibModule,
|
|
126
128
|
solidosUi: config.solidosUi,
|
|
127
129
|
git: config.git,
|
|
128
130
|
nostr: config.nostr,
|
|
@@ -158,6 +160,7 @@ program
|
|
|
158
160
|
} else if (config.mashlib) {
|
|
159
161
|
console.log(` Mashlib: local (data browser enabled)`);
|
|
160
162
|
}
|
|
163
|
+
if (config.mashlibModule) console.log(` Mashlib module: ${config.mashlibModule}`);
|
|
161
164
|
if (config.solidosUi) console.log(' SolidOS UI: enabled (modern interface)');
|
|
162
165
|
if (config.git) console.log(' Git: enabled (clone/push support)');
|
|
163
166
|
if (config.nostr) console.log(` Nostr: enabled (${config.nostrPath})`);
|
|
@@ -188,6 +191,16 @@ program
|
|
|
188
191
|
process.on('SIGINT', shutdown);
|
|
189
192
|
process.on('SIGTERM', shutdown);
|
|
190
193
|
|
|
194
|
+
// Gracefully handle ECONNRESET — normal network noise from clients
|
|
195
|
+
// closing connections early (browser navigation, health checks, etc.)
|
|
196
|
+
process.on('uncaughtException', (err) => {
|
|
197
|
+
if (err.code === 'ECONNRESET' || err.code === 'EPIPE' || err.code === 'ECONNABORTED') {
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
console.error('Uncaught exception:', err);
|
|
201
|
+
process.exit(1);
|
|
202
|
+
});
|
|
203
|
+
|
|
191
204
|
} catch (err) {
|
|
192
205
|
console.error(`Error: ${err.message}`);
|
|
193
206
|
process.exit(1);
|
package/package.json
CHANGED
package/src/config.js
CHANGED
|
@@ -41,6 +41,7 @@ export const defaults = {
|
|
|
41
41
|
mashlib: false,
|
|
42
42
|
mashlibCdn: false,
|
|
43
43
|
mashlibVersion: '2.0.0',
|
|
44
|
+
mashlibModule: false,
|
|
44
45
|
|
|
45
46
|
// SolidOS UI (modern Nextcloud-style interface)
|
|
46
47
|
solidosUi: false,
|
|
@@ -113,6 +114,7 @@ const envMap = {
|
|
|
113
114
|
JSS_MASHLIB: 'mashlib',
|
|
114
115
|
JSS_MASHLIB_CDN: 'mashlibCdn',
|
|
115
116
|
JSS_MASHLIB_VERSION: 'mashlibVersion',
|
|
117
|
+
JSS_MASHLIB_MODULE: 'mashlibModule',
|
|
116
118
|
JSS_SOLIDOS_UI: 'solidosUi',
|
|
117
119
|
JSS_GIT: 'git',
|
|
118
120
|
JSS_NOSTR: 'nostr',
|
|
@@ -238,7 +240,7 @@ export async function loadConfig(cliOptions = {}, configFile = null) {
|
|
|
238
240
|
}
|
|
239
241
|
|
|
240
242
|
// Mashlib requires content negotiation for Turtle support
|
|
241
|
-
if (config.mashlib || config.mashlibCdn) {
|
|
243
|
+
if (config.mashlib || config.mashlibCdn || config.mashlibModule) {
|
|
242
244
|
config.conneg = true;
|
|
243
245
|
}
|
|
244
246
|
|
|
@@ -293,7 +295,7 @@ export function printConfig(config) {
|
|
|
293
295
|
console.log(` Notifications: ${config.notifications}`);
|
|
294
296
|
console.log(` IdP: ${config.idp ? (config.idpIssuer || 'enabled') : 'disabled'}`);
|
|
295
297
|
console.log(` Subdomains: ${config.subdomains ? (config.baseDomain || 'enabled') : 'disabled'}`);
|
|
296
|
-
console.log(` Mashlib: ${config.mashlibCdn ? `CDN v${config.mashlibVersion}` : config.mashlib ? 'local' : 'disabled'}`);
|
|
298
|
+
console.log(` Mashlib: ${config.mashlibModule ? `module (${config.mashlibModule})` : config.mashlibCdn ? `CDN v${config.mashlibVersion}` : config.mashlib ? 'local' : 'disabled'}`);
|
|
297
299
|
console.log(` SolidOS UI: ${config.solidosUi ? 'enabled' : 'disabled'}`);
|
|
298
300
|
console.log('─'.repeat(40));
|
|
299
301
|
}
|
package/src/handlers/resource.js
CHANGED
|
@@ -15,7 +15,7 @@ import {
|
|
|
15
15
|
} from '../rdf/conneg.js';
|
|
16
16
|
import { emitChange } from '../notifications/events.js';
|
|
17
17
|
import { checkIfMatch, checkIfNoneMatchForGet, checkIfNoneMatchForWrite } from '../utils/conditional.js';
|
|
18
|
-
import { generateDatabrowserHtml, generateSolidosUiHtml, shouldServeMashlib } from '../mashlib/index.js';
|
|
18
|
+
import { generateDatabrowserHtml, generateModuleDatabrowserHtml, generateSolidosUiHtml, shouldServeMashlib } from '../mashlib/index.js';
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* Live reload script - injected into HTML when --live-reload is enabled
|
|
@@ -230,10 +230,12 @@ export async function handleGet(request, reply) {
|
|
|
230
230
|
|
|
231
231
|
// Check if we should serve Mashlib data browser for containers
|
|
232
232
|
if (shouldServeMashlib(request, request.mashlibEnabled, 'application/ld+json')) {
|
|
233
|
-
// Use SolidOS UI if enabled,
|
|
233
|
+
// Use SolidOS UI if enabled, ES module if configured, otherwise classic mashlib
|
|
234
234
|
const html = request.solidosUiEnabled
|
|
235
235
|
? generateSolidosUiHtml()
|
|
236
|
-
:
|
|
236
|
+
: request.mashlibModule
|
|
237
|
+
? generateModuleDatabrowserHtml(request.mashlibModule)
|
|
238
|
+
: generateDatabrowserHtml(resourceUrl, request.mashlibCdn ? request.mashlibVersion : null);
|
|
237
239
|
const headers = getAllHeaders({
|
|
238
240
|
isContainer: true,
|
|
239
241
|
etag: stats.etag,
|
|
@@ -307,10 +309,12 @@ export async function handleGet(request, reply) {
|
|
|
307
309
|
// Check if we should serve Mashlib data browser
|
|
308
310
|
// Only for RDF resources when Accept: text/html is requested
|
|
309
311
|
if (shouldServeMashlib(request, request.mashlibEnabled, storedContentType)) {
|
|
310
|
-
// Use SolidOS UI if enabled,
|
|
312
|
+
// Use SolidOS UI if enabled, ES module if configured, otherwise classic mashlib
|
|
311
313
|
const html = request.solidosUiEnabled
|
|
312
314
|
? generateSolidosUiHtml()
|
|
313
|
-
:
|
|
315
|
+
: request.mashlibModule
|
|
316
|
+
? generateModuleDatabrowserHtml(request.mashlibModule)
|
|
317
|
+
: generateDatabrowserHtml(resourceUrl, request.mashlibCdn ? request.mashlibVersion : null);
|
|
314
318
|
const headers = getAllHeaders({
|
|
315
319
|
isContainer: false,
|
|
316
320
|
etag: stats.etag,
|
package/src/mashlib/index.js
CHANGED
|
@@ -40,6 +40,23 @@ export function generateDatabrowserHtml(resourceUrl, cdnVersion = null) {
|
|
|
40
40
|
})</script><script defer="defer" src="/mashlib.min.js"></script><link href="/mash.css" rel="stylesheet"></head><body id="PageBody"><header id="PageHeader"></header><div class="TabulatorOutline" id="DummyUUID" role="main"><table id="outline"></table><div id="GlobalDashboard"></div></div><footer id="PageFooter"></footer></body></html>`;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
+
/**
|
|
44
|
+
* Generate ES module-based databrowser HTML
|
|
45
|
+
*
|
|
46
|
+
* @param {string} moduleUrl - URL to the ES module entry point
|
|
47
|
+
* @returns {string} HTML content
|
|
48
|
+
*/
|
|
49
|
+
export function generateModuleDatabrowserHtml(moduleUrl) {
|
|
50
|
+
const cssUrl = moduleUrl.replace(/\.js$/, '.css');
|
|
51
|
+
return `<!doctype html><html lang="en"><head><meta charset="utf-8"/>
|
|
52
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
53
|
+
<title>Solid Data Browser</title>
|
|
54
|
+
<link rel="stylesheet" href="${cssUrl}"></head>
|
|
55
|
+
<body><div id="mashlib"></div>
|
|
56
|
+
<script type="module" src="${moduleUrl}"></script>
|
|
57
|
+
</body></html>`;
|
|
58
|
+
}
|
|
59
|
+
|
|
43
60
|
/**
|
|
44
61
|
* Check if request wants HTML and mashlib should handle it
|
|
45
62
|
* @param {object} request - Fastify request
|
package/src/server.js
CHANGED
|
@@ -54,7 +54,9 @@ export function createServer(options = {}) {
|
|
|
54
54
|
const baseDomain = options.baseDomain || null;
|
|
55
55
|
// Mashlib data browser is OFF by default
|
|
56
56
|
// mashlibCdn: if true, load from CDN; if false, serve locally
|
|
57
|
-
|
|
57
|
+
// mashlibModule: URL to ES module entry point (alternative to classic mashlib)
|
|
58
|
+
const mashlibModule = options.mashlibModule ?? false;
|
|
59
|
+
const mashlibEnabled = options.mashlib || !!mashlibModule;
|
|
58
60
|
const mashlibCdn = options.mashlibCdn ?? false;
|
|
59
61
|
const mashlibVersion = options.mashlibVersion ?? '2.0.0';
|
|
60
62
|
// SolidOS UI (modern Nextcloud-style interface) - requires mashlib
|
|
@@ -95,7 +97,16 @@ export function createServer(options = {}) {
|
|
|
95
97
|
disableRequestLogging: true,
|
|
96
98
|
trustProxy: true,
|
|
97
99
|
// Handle raw body for non-JSON content
|
|
98
|
-
bodyLimit: 10 * 1024 * 1024 // 10MB
|
|
100
|
+
bodyLimit: 10 * 1024 * 1024, // 10MB
|
|
101
|
+
// Gracefully handle client TCP errors (ECONNRESET, EPIPE, etc.)
|
|
102
|
+
clientErrorHandler: (err, socket) => {
|
|
103
|
+
if (err.code === 'ECONNRESET' || err.code === 'EPIPE' || err.code === 'ECONNABORTED') {
|
|
104
|
+
socket.destroy();
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
// Default Fastify behavior for other client errors
|
|
108
|
+
socket.destroy(err);
|
|
109
|
+
}
|
|
99
110
|
};
|
|
100
111
|
|
|
101
112
|
// Add HTTPS support if SSL config provided
|
|
@@ -138,6 +149,7 @@ export function createServer(options = {}) {
|
|
|
138
149
|
fastify.decorateRequest('mashlibEnabled', null);
|
|
139
150
|
fastify.decorateRequest('mashlibCdn', null);
|
|
140
151
|
fastify.decorateRequest('mashlibVersion', null);
|
|
152
|
+
fastify.decorateRequest('mashlibModule', null);
|
|
141
153
|
fastify.decorateRequest('solidosUiEnabled', null);
|
|
142
154
|
fastify.decorateRequest('defaultQuota', null);
|
|
143
155
|
fastify.decorateRequest('config', null);
|
|
@@ -151,6 +163,7 @@ export function createServer(options = {}) {
|
|
|
151
163
|
request.mashlibEnabled = mashlibEnabled;
|
|
152
164
|
request.mashlibCdn = mashlibCdn;
|
|
153
165
|
request.mashlibVersion = mashlibVersion;
|
|
166
|
+
request.mashlibModule = mashlibModule;
|
|
154
167
|
request.solidosUiEnabled = solidosUiEnabled;
|
|
155
168
|
request.defaultQuota = defaultQuota;
|
|
156
169
|
request.config = { public: options.public, readOnly: options.readOnly };
|