@factoidal/core 0.15.0 → 0.17.0

package/lib/store.mjs

@@ -99,16 +99,18 @@ export function manifestKeys(inspectEnvelope) {
   return keys;
 }
 
-const HEX = (() => {
-  const t = new Array(256);
-  for (let b = 0; b < 256; b += 1) t[b] = b.toString(16).padStart(2, '0');
-  return t;
-})();
+const HEX_DIGIT = Uint8Array.from('0123456789abcdef', (c) => c.charCodeAt(0));
+const HEX_DECODER = new TextDecoder();
 
 /** Lowercase hexadecimal: the transport the manifest argument of the store
  *  ops takes. Artifact bytes never take this path. */
 export function hexOfBytes(bytes) {
-  const parts = new Array(bytes.length);
-  for (let i = 0; i < bytes.length; i += 1) parts[i] = HEX[bytes[i]];
-  return parts.join('');
+  // One byte buffer of ASCII digits, decoded once (issue 1039; see
+  // bin/engine.mjs hexOfBytes).
+  const out = new Uint8Array(bytes.length * 2);
+  for (let i = 0, at = 0; i < bytes.length; i += 1, at += 2) {
+    out[at] = HEX_DIGIT[bytes[i] >> 4];
+    out[at + 1] = HEX_DIGIT[bytes[i] & 15];
+  }
+  return HEX_DECODER.decode(out);
 }

package/lib/version.mjs

@@ -2,4 +2,4 @@
 // needs import attributes, which not every runtime this package targets
 // reads). test/dts-drift.test.js checks that it equals package.json's
 // `version`.
-export const version = '0.15.0';
+export const version = '0.17.0';

package/lws/server.mjs

@@ -584,11 +584,33 @@ export async function createLwsServer (options = {}) {
   let settings = { ...options }
   let opening = null
   let opened = null
+  let authz = null
 
-  /** The storage handle, opened once. */
+  /** The storage handle, opened once. With `authz` (an object of
+   *  `openAuthorizationServer` options), an authorization server that shares
+   *  the storage's issuer is opened first, on `mountedOn: baseIri`; the
+   *  storage then trusts that issuer with the JWK Set the engine published
+   *  (L4Factoidal/Authz/Mount.lean). */
   function storage () {
     if (opening === null) {
-      opening = openLwsStorage(settings).then((value) => { opened = value; return value })
+      opening = (async () => {
+        let storageSettings = settings
+        if (settings.authz !== undefined && settings.authz !== null) {
+          if (typeof settings.baseIri !== 'string') throw new LwsHostError('authz needs baseIri')
+          const { openAuthorizationServer } = await import('../authz/server.mjs')
+          authz = await openAuthorizationServer({
+            ...settings.authz,
+            ...(settings.engine !== undefined ? { engine: settings.engine } : {}),
+            ...(settings.auth && typeof settings.auth.audience === 'string' ? { audience: settings.auth.audience } : {}),
+            mountedOn: settings.baseIri
+          })
+          const issuers = [{ issuer: authz.issuer, jwks: authz.jwks }]
+          const prior = settings.auth && Array.isArray(settings.auth.issuers) ? settings.auth.issuers : []
+          storageSettings = { ...settings, auth: { ...(settings.auth || {}), issuers: issuers.concat(prior) } }
+        }
+        opened = await openLwsStorage(storageSettings)
+        return opened
+      })()
     }
     return opening
   }
@@ -610,7 +632,13 @@ export async function createLwsServer (options = {}) {
     }
     let answer
     try {
-      answer = await (await storage()).step(record)
+      const store = await storage()
+      // One port for both servers: the engine names the authorization
+      // server's paths (L4Factoidal.Authz.owns); every other request is the
+      // storage's. The token request body is form text.
+      answer = authz !== null && authz.owns(record.target)
+        ? await authz.step({ ...record, body: new TextDecoder('utf-8').decode(record.body) })
+        : await store.step(record)
     } catch (error) {
       // A failure of this host or of the engine, not a protocol answer.
       // The engine's own words are kept; nothing is invented.
@@ -627,6 +655,8 @@ export async function createLwsServer (options = {}) {
   return {
     server,
     storage,
+    /** The authorization server sharing the storage's issuer, or null. */
+    authz () { return authz },
     /** Set the storage root's absolute IRI, before the first request. */
     setBaseIri (value) {
       if (opening !== null) {
@@ -646,6 +676,7 @@ export async function createLwsServer (options = {}) {
       return new Promise((resolve) => {
         server.close(() => {
           if (opened !== null) opened.close()
+          if (authz !== null) authz.close()
           resolve()
         })
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@factoidal/core",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "RDF parsing and writing (Turtle, TriG, N-Triples, N-Quads, RDF/XML, JSON-LD), SPARQL 1.1 and 1.2, RDFS and OWL reasoning, SHACL and ShEx validation, CSVW and RML mapping, RDFC-1.0, and SPARQL, LWS and Solid servers, for Node, Deno and browsers.",
   "keywords": [
     "sparql",
@@ -142,6 +142,7 @@
   "scripts": {
     "build": "bash ../../formal/lean4/Wasm/build-wasm.sh",
     "test": "node --test 'test/*.test.js' 'test/*.test.mjs'",
+    "test:jena": "node --test 'test/jena/*.test.mjs'",
     "test:speed": "node ../../tests/perf/npm_speed_gate.mjs",
     "test:costs": "node ../../tests/perf/npm_costs.mjs",
     "prepublishOnly": "npm test"