@based/db 0.0.28 → 0.0.30

package/dist/src/server/save.js

@@ -2,18 +2,21 @@ import native from '../native.js';
 import { isMainThread } from 'node:worker_threads';
 import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { destructureCsmtKey, foreachBlock, foreachDirtyBlock, makeCsmtKey, } from './tree.js';
+import { destructureCsmtKey, foreachBlock, foreachDirtyBlock, initCsmt, makeCsmtKey, specialBlock, } from './tree.js';
 import { WRITELOG_FILE } from './index.js';
 import { writeFileSync } from 'node:fs';
 import { bufToHex } from '../utils.js';
-import { createTree } from './csmt/tree.js';
 const COMMON_SDB_FILE = 'common.sdb';
 const block_sdb_file = (typeId, start, end) => `${typeId}_${start}_${end}.sdb`;
 function saveRange(db, typeId, start, end, hashOut) {
     const file = block_sdb_file(typeId, start, end);
     const path = join(db.fileSystemPath, file);
     const err = native.saveRange(path, typeId, start, end, db.dbCtxExternal, hashOut);
-    if (err) {
+    if (err == -8) {
+        // TODO ENOENT
+        return '';
+    }
+    else if (err) {
         // TODO print the error string
         console.error(`Save ${typeId}:${start}-${end} failed: ${err}`);
         return null;
@@ -32,51 +35,58 @@ export function save(db, sync = false, forceFullDump = false) {
     }
     if (forceFullDump) {
         // We just rebuild the whole tree
-        db.merkleTree = createTree(db.createCsmtHashFun); // TODO This could be somewhere else.
+        initCsmt(db);
         for (const key in db.schemaTypesParsed) {
             const def = db.schemaTypesParsed[key];
             foreachBlock(db, def, (start, end, _hash) => {
                 const typeId = def.id;
+                const mtKey = makeCsmtKey(typeId, start);
                 const hash = new Uint8Array(16);
                 const file = saveRange(db, typeId, start, end, hash);
-                if (!file) {
-                    // The previous state should remain in the merkle tree for
-                    // load and sync purposes.
-                    return;
+                if (file === null) {
+                    throw new Error('full dump failed');
+                }
+                else {
+                    const data = {
+                        file,
+                        typeId,
+                        start,
+                        end,
+                    };
+                    db.merkleTree.insert(mtKey, hash, data);
                 }
-                const mtKey = makeCsmtKey(typeId, start);
-                const data = {
-                    file,
-                    typeId,
-                    start,
-                    end,
-                };
-                db.merkleTree.insert(mtKey, hash, data);
             });
         }
     }
     else {
         foreachDirtyBlock(db, (mtKey, typeId, start, end) => {
             const hash = new Uint8Array(16);
+            // TODO Don't save if empty
             const file = saveRange(db, typeId, start, end, hash);
-            if (!file) {
+            if (file === null) {
                 // The previous state should remain in the merkle tree for
                 // load and sync purposes.
                 return;
             }
-            const data = {
-                file,
-                typeId,
-                start,
-                end,
-            };
-            try {
-                db.merkleTree.delete(mtKey);
+            else if (file.length === 0) {
+                // The range is empty
             }
-            catch (err) {
-                // console.error({ err })
+            else {
+                const oldLeaf = db.merkleTree.search(mtKey);
+                if (oldLeaf) {
+                    oldLeaf.data.file = file;
+                    db.merkleTree.update(mtKey, hash);
+                }
+                else {
+                    const data = {
+                        file,
+                        typeId,
+                        start,
+                        end,
+                    };
+                    db.merkleTree.insert(mtKey, hash, data);
+                }
             }
-            db.merkleTree.insert(mtKey, hash, data);
         });
     }
     db.dirtyRanges.clear();
@@ -89,6 +99,8 @@ export function save(db, sync = false, forceFullDump = false) {
     }
     db.merkleTree.visitLeafNodes((leaf) => {
         const [typeId, start] = destructureCsmtKey(leaf.key);
+        if (start == specialBlock)
+            return; // skip the type specialBlock
         const data = leaf.data;
         if (start != data.start) {
             console.error(`csmtKey start and range start mismatch: ${start} != ${data.start}`);

package/dist/src/server/start.js

@@ -3,8 +3,8 @@ import { DbWorker, SCHEMA_FILE, WRITELOG_FILE } from './index.js';
 import native from '../native.js';
 import { rm, mkdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
-import { createTree, hashEq } from './csmt/index.js';
-import { foreachBlock, makeCsmtKey } from './tree.js';
+import { hashEq } from './csmt/index.js';
+import { foreachBlock, initCsmt, makeCsmtKey } from './tree.js';
 import { availableParallelism } from 'node:os';
 import exitHook from 'exit-hook';
 import './worker.js';
@@ -28,7 +28,7 @@ export async function start(db, opts) {
             native.loadCommon(join(path, writelog.commonDump), db.dbCtxExternal);
         }
         catch (e) {
-            console.log(e.message);
+            console.error(e.message);
             throw e;
         }
         // Load all range dumps
@@ -40,7 +40,7 @@ export async function start(db, opts) {
                     native.loadRange(join(path, fname), db.dbCtxExternal);
                 }
                 catch (e) {
-                    console.log(e.message);
+                    console.error(e.message);
                 }
             }
         }
@@ -53,21 +53,9 @@ export async function start(db, opts) {
     catch (err) {
         // TODO In some cases we really should give up!
     }
-    // The merkle tree should be empty at start.
-    if (!db.merkleTree || db.merkleTree.getRoot()) {
-        db.merkleTree = createTree(db.createCsmtHashFun);
-    }
-    // FDN-791 CSMT is unstable (not history independent)
-    // For now we just sort the types to ensure that we always
-    // load in the same order.
-    const types = Object.keys(db.schemaTypesParsed)
-        .sort((a, b) => db.schemaTypesParsed[a].id - db.schemaTypesParsed[b].id)
-        .reduce((obj, key) => {
-        obj[key] = db.schemaTypesParsed[key];
-        return obj;
-    }, {});
-    for (const key in types) {
-        const def = types[key];
+    const csmtTypes = initCsmt(db);
+    for (const key in csmtTypes) {
+        const def = csmtTypes[key];
         const [total, lastId] = native.getTypeInfo(def.id, db.dbCtxExternal);
         def.total = total;
         def.lastId = writelog?.types[def.id]?.lastId || lastId;

package/dist/src/server/tree.d.ts

@@ -6,8 +6,10 @@ export type CsmtNodeRange = {
     start: number;
     end: number;
 };
+export declare const specialBlock = 2147483647;
 export declare const destructureCsmtKey: (key: number) => number[];
 export declare const makeCsmtKey: (typeId: number, start: number) => number;
 export declare const makeCsmtKeyFromNodeId: (typeId: number, blockCapacity: number, nodeId: number) => number;
+export declare function initCsmt(db: DbServer): {};
 export declare function foreachBlock(db: DbServer, def: SchemaTypeDef, cb: (start: number, end: number, hash: Uint8Array) => void): void;
 export declare function foreachDirtyBlock(db: DbServer, cb: (mtKey: number, typeId: number, start: number, end: number) => void): Promise<void>;

package/dist/src/server/tree.js

@@ -1,4 +1,8 @@
 import native from '../native.js';
+import { createTree } from './csmt/tree.js';
+// This is a special start id set for every type to somewhat lock the order of the csmt.
+// While the id is valid, it's never a true start id of a block.
+export const specialBlock = 2147483647;
 export const destructureCsmtKey = (key) => [
     (key / 4294967296) | 0, // typeId
     (key >>> 31) * 2147483648 + (key & 0x7fffffff), // start_node_id
@@ -8,13 +12,41 @@ export const makeCsmtKeyFromNodeId = (typeId, blockCapacity, nodeId) => {
     const tmp = nodeId - +!(nodeId % blockCapacity);
     return typeId * 4294967296 + ((tmp / blockCapacity) | 0) * blockCapacity + 1;
 };
+export function initCsmt(db) {
+    const types = Object.keys(db.schemaTypesParsed)
+        .sort((a, b) => db.schemaTypesParsed[a].id - db.schemaTypesParsed[b].id)
+        .reduce((obj, key) => {
+        obj[key] = db.schemaTypesParsed[key];
+        return obj;
+    }, {});
+    db.merkleTree = createTree(db.createCsmtHashFun);
+    // Insert specialBlocks for types.
+    // This should ensure that the insertion order of the actual node ranges is
+    // always deterministic.
+    for (const key in types) {
+        const { id: typeId } = types[key];
+        const data = {
+            file: '',
+            typeId: typeId,
+            start: 0,
+            end: 0,
+        };
+        try {
+            db.merkleTree.insert(makeCsmtKey(typeId, specialBlock), db.merkleTree.emptyHash, data);
+        }
+        catch (_) { }
+    }
+    return types;
+}
 export function foreachBlock(db, def, cb) {
     const step = def.blockCapacity;
     for (let start = 1; start <= def.lastId; start += step) {
         const end = start + step - 1;
         const hash = new Uint8Array(16);
-        native.getNodeRangeHash(def.id, start, end, hash, db.dbCtxExternal);
-        cb(start, end, hash);
+        const res = native.getNodeRangeHash(def.id, start, end, hash, db.dbCtxExternal);
+        if (res) {
+            cb(start, end, hash);
+        }
     }
 }
 export async function foreachDirtyBlock(db, cb) {

package/dist/src/server/worker.js

@@ -8,7 +8,7 @@ else {
     let { address, channel } = workerData;
     let dbCtx = native.externalFromInt(address);
     workerCtx = native.workerCtxInit();
-    const transferList = new Array(1);
+    // const transferList = new Array(1)
     const handleMsg = (msg) => {
         try {
             if (typeof msg === 'bigint') {
@@ -19,8 +19,8 @@ else {
             }
             else {
                 const arrayBuf = native.getQueryBuf(msg, dbCtx);
-                transferList[0] = arrayBuf;
-                channel.postMessage(arrayBuf, transferList);
+                // transferList[0] = arrayBuf
+                channel.postMessage(arrayBuf, [arrayBuf]);
             }
         }
         catch (e) {

package/dist/src/utils.d.ts

@@ -1,10 +1,12 @@
+import { DbServer } from './server/index.js';
 export declare const DECODER: TextDecoder;
 export declare const ENCODER: TextEncoder;
+export declare const debugMode: (target: any, getInfo?: any) => void;
+export declare const debugServer: (server: DbServer) => void;
 export declare const equals: (aB: Uint8Array, bB: Uint8Array) => boolean;
 export declare function concatUint8Arr(bufs: Uint8Array[], totalByteLength?: number): Uint8Array;
 export declare const bufToHex: (a: Uint8Array) => string;
 export declare const hexToBuf: (s: string) => Uint8Array;
-export declare const base64encode: (a: Uint8Array, lineMax?: number) => string;
 export declare const readDoubleLE: (val: Uint8Array, offset: number) => number;
 export declare const readFloatLE: (val: Uint8Array, offset: number) => number;
 export declare const readUint32: (val: Uint8Array, offset: number) => number;

package/dist/src/utils.js

@@ -1,7 +1,49 @@
-import { encodeBase64 } from '@saulx/utils';
+import { inspect } from 'node:util';
+import picocolors from 'picocolors';
 const native = typeof window === 'undefined' ? (await import('./native.js')).default : null;
 export const DECODER = new TextDecoder('utf-8');
 export const ENCODER = new TextEncoder();
+export const debugMode = (target, getInfo = null) => {
+    const opts = { showHidden: false, depth: null, colors: true };
+    const info = (v) => (typeof v === 'object' ? inspect(v, opts) : v);
+    const proto = target.constructor.prototype;
+    const keys = new Set([
+        ...Object.keys(Object.getOwnPropertyDescriptors(proto)),
+        ...Object.keys(target),
+    ]);
+    const colors = [
+        'red',
+        'green',
+        'yellow',
+        'blue',
+        'magenta',
+        'cyan',
+        'redBright',
+        'greenBright',
+        'yellowBright',
+        'blueBright',
+        'magentaBright',
+        'cyanBright',
+    ];
+    let colorKey = 0;
+    for (const key of keys) {
+        const fn = target[key];
+        if (typeof fn === 'function') {
+            let cnt = 0;
+            const color = colors[colorKey++ % colors.length];
+            target[key] = function () {
+                const arr = [picocolors[color](`[${key}:${++cnt}]`)];
+                const add = getInfo?.(key);
+                if (add)
+                    arr.push(add);
+                arr.push(...arguments);
+                console.info(arr.map(info).join(' '));
+                return fn.apply(target, arguments);
+            };
+        }
+    }
+};
+export const debugServer = (server) => debugMode(server, () => `p: ${server.processingQueries} m: ${server.modifyQueue.length} q: ${server.queryQueue.size}`);
 export const equals = (aB, bB) => {
     const len = aB.byteLength;
     if (len != bB.byteLength) {
@@ -82,24 +124,6 @@ export const hexToBuf = (s) => {
     }
     return buf;
 };
-function base64OutLen(n, lineMax) {
-    let olen;
-    /* This version would be with padding but we don't pad */
-    //olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-    olen = ((4 * n) / 3 + 3) & ~3;
-    olen += lineMax > 0 ? olen / lineMax : 0; // line feeds
-    return olen;
-}
-export const base64encode = (a, lineMax = 72) => {
-    // TODO Could fallback to @saulx/utils if native is not available
-    const tmp = new Uint8Array(base64OutLen(a.byteLength, lineMax));
-    if ((a.length < 10 && lineMax === 72) || !native) {
-        return encodeBase64(a);
-    }
-    else {
-        return DECODER.decode(native.base64encode(tmp, a, lineMax));
-    }
-};
 export const readDoubleLE = (val, offset) => {
     const low = (val[offset] |
         (val[offset + 1] << 8) |

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@based/db",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "license": "MIT",
   "type": "module",
   "main": "./dist/src/index.js",
   "scripts": {
     "build": "make -C clibs && npm run build-zig && tsc",
+    "build-ts": "tsc",
     "build-zig": "npx tsx scripts/zig_cross_compile.ts",
+    "build-linux_aarch64": "(cd clibs && podman run --rm -v \"$PWD/../../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64)",
+    "build-release-debug": "(cd clibs && ./build-release.sh) && npm run build-zig -- release debug && tsc",
     "build-release": "(cd clibs && ./build-release.sh) && npm run build-zig -- release && tsc",
     "watch": "npx tsc --watch",
     "clean-selva": "make -C clibs clean",
@@ -18,7 +21,10 @@
     "test-gdb": "npm run build && LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js",
     "test-fast": "LOCPATH=../locale/locale-x86_64-gnu/locale node ./scripts/test.js",
     "test-fast-linux_aarch64": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; npm run test-fast'",
+    "test-fast-linux_aarch64-gdb": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-x86_64-gnu/locale gdb -ex run --args node ./scripts/test.js'",
+    "test-fast-linux_aarch64-valgrind": "podman run --rm -v \"$PWD/../..:/usr/src/based-db\" based-db-clibs-build-linux_aarch64 sh -c '\\. \"/usr/local/nvm/nvm.sh\"; cd /usr/src/based-db/packages/db; LOCPATH=../locale/locale-aarch64-gnu/locale valgrind --leak-check=full node ./scripts/test.js references:update2'",
     "test-zig": "npm run build-zig -- debug && tsc && npm run test-fast",
+    "test-zig-debug": "npm run build-zig -- debug && tsc && LOCPATH=../locale/locale-x86_64-gnu/locale ./scripts/lldb-node ./scripts/test.js",
     "test-ts": "tsc && node ./scripts/test.js",
     "perf": "npm run build && node benchmarks/references.js && node benchmarks/transfermarkt/transfermarkt-based.js"
   },
@@ -32,9 +38,9 @@
     "basedDbNative.cjs"
   ],
   "dependencies": {
-    "@based/schema": "5.0.0-alpha.9",
+    "@based/schema": "5.0.0-alpha.10",
     "@saulx/hash": "^3.0.0",
-    "@saulx/utils": "^6.1.1",
+    "@saulx/utils": "^6.4.0",
     "exit-hook": "^4.0.0",
     "picocolors": "^1.1.0",
     "@based/crc32c": "^1.0.0"

package/dist/lib/darwin_aarch64/include/selva/base64.h

@@ -1,59 +0,0 @@
-/*
- * Base64 encoding/decoding (RFC1341)
- * Copyright (c) 2021-2025 SAULX
- * Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#pragma once
-
-#include "selva/_export.h"
-
-SELVA_EXPORT
-size_t base64_encode_s(char *out, const char *str_in, size_t len, size_t line_max)
-    __attribute__((access(write_only, 1), access(read_only, 2, 3)));
-
-/**
- * base64_encode - Base64 encode
- * Caller is responsible for freeing the returned buffer. Returned buffer is
- * nul terminated to make it easier to use as a C string. The nul terminator is
- * not included in out_len.
- * @parma str_in Data to be encoded
- * @param len Length of the data to be encoded
- * @param out_len Pointer to output length variable, or NULL if not used
- * @returns Allocated buffer of out_len bytes of encoded data,
- * or %NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64_encode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(read_only, 3)));
-
-/**
- * Base64 decode.
- * Caller is responsible for freeing the returned buffer.
- * @param str_in Data to be decoded
- * @param len Length of the data to be decoded
- * @param out_len Pointer to output length variable
- * @returns Allocated buffer of out_len bytes of decoded data, or NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64_decode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(write_only, 3)));
-
-/**
- * Calculate the required buffer size of a string of n bytes.
- * @param line_max is the max line length. 0 = no limit; 72 = typical.
- */
-static inline size_t base64_out_len(size_t n, size_t line_max) {
-    size_t olen;
-
-    /* This version would be with padding but we don't pad */
-#if 0
-    olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-#endif
-    olen = ((4 * n / 3) + 3) & ~3;
-    olen += line_max > 0 ? olen / line_max : 0; /* line feeds */
-
-    return olen;
-}

package/dist/lib/darwin_aarch64/include/selva/base64url.h

@@ -1,59 +0,0 @@
-/*
- * Base64url encoding/decoding (RFC4648)
- * Copyright (c) 2021-2025 SAULX
- * Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#pragma once
-
-#include "selva/_export.h"
-
-SELVA_EXPORT
-size_t base64url_encode_s(char *out, const char *str_in, size_t len, size_t line_max)
-    __attribute__((access(write_only, 1), access(read_only, 2, 3)));
-
-/**
- * base64url_encode - Base64url encode
- * Caller is responsible for freeing the returned buffer. Returned buffer is
- * nul terminated to make it easier to use as a C string. The nul terminator is
- * not included in out_len.
- * @parma str_in Data to be encoded
- * @param len Length of the data to be encoded
- * @param out_len Pointer to output length variable, or NULL if not used
- * @returns Allocated buffer of out_len bytes of encoded data,
- * or %NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64url_encode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(read_only, 3)));
-
-/**
- * Base64url decode.
- * Caller is responsible for freeing the returned buffer.
- * @param str_in Data to be decoded
- * @param len Length of the data to be decoded
- * @param out_len Pointer to output length variable
- * @returns Allocated buffer of out_len bytes of decoded data, or NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64url_decode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(write_only, 3)));
-
-/**
- * Calculate the required buffer size of a string of n bytes.
- * @param line_max is the max line length. 0 = no limit; 72 = typical.
- */
-static inline size_t base64url_out_len(size_t n, size_t line_max) {
-    size_t olen;
-
-    /* This version would be with padding but we don't pad */
-#if 0
-    olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-#endif
-    olen = ((4 * n / 3) + 3) & ~3;
-    olen += line_max > 0 ? olen / line_max : 0; /* line feeds */
-
-    return olen;
-}

package/dist/lib/linux_aarch64/include/selva/base64.h

@@ -1,59 +0,0 @@
-/*
- * Base64 encoding/decoding (RFC1341)
- * Copyright (c) 2021-2025 SAULX
- * Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#pragma once
-
-#include "selva/_export.h"
-
-SELVA_EXPORT
-size_t base64_encode_s(char *out, const char *str_in, size_t len, size_t line_max)
-    __attribute__((access(write_only, 1), access(read_only, 2, 3)));
-
-/**
- * base64_encode - Base64 encode
- * Caller is responsible for freeing the returned buffer. Returned buffer is
- * nul terminated to make it easier to use as a C string. The nul terminator is
- * not included in out_len.
- * @parma str_in Data to be encoded
- * @param len Length of the data to be encoded
- * @param out_len Pointer to output length variable, or NULL if not used
- * @returns Allocated buffer of out_len bytes of encoded data,
- * or %NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64_encode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(read_only, 3)));
-
-/**
- * Base64 decode.
- * Caller is responsible for freeing the returned buffer.
- * @param str_in Data to be decoded
- * @param len Length of the data to be decoded
- * @param out_len Pointer to output length variable
- * @returns Allocated buffer of out_len bytes of decoded data, or NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64_decode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(write_only, 3)));
-
-/**
- * Calculate the required buffer size of a string of n bytes.
- * @param line_max is the max line length. 0 = no limit; 72 = typical.
- */
-static inline size_t base64_out_len(size_t n, size_t line_max) {
-    size_t olen;
-
-    /* This version would be with padding but we don't pad */
-#if 0
-    olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-#endif
-    olen = ((4 * n / 3) + 3) & ~3;
-    olen += line_max > 0 ? olen / line_max : 0; /* line feeds */
-
-    return olen;
-}

package/dist/lib/linux_aarch64/include/selva/base64url.h

@@ -1,59 +0,0 @@
-/*
- * Base64url encoding/decoding (RFC4648)
- * Copyright (c) 2021-2025 SAULX
- * Copyright (c) 2005-2011, Jouni Malinen <j@w1.fi>
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#pragma once
-
-#include "selva/_export.h"
-
-SELVA_EXPORT
-size_t base64url_encode_s(char *out, const char *str_in, size_t len, size_t line_max)
-    __attribute__((access(write_only, 1), access(read_only, 2, 3)));
-
-/**
- * base64url_encode - Base64url encode
- * Caller is responsible for freeing the returned buffer. Returned buffer is
- * nul terminated to make it easier to use as a C string. The nul terminator is
- * not included in out_len.
- * @parma str_in Data to be encoded
- * @param len Length of the data to be encoded
- * @param out_len Pointer to output length variable, or NULL if not used
- * @returns Allocated buffer of out_len bytes of encoded data,
- * or %NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64url_encode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(read_only, 3)));
-
-/**
- * Base64url decode.
- * Caller is responsible for freeing the returned buffer.
- * @param str_in Data to be decoded
- * @param len Length of the data to be decoded
- * @param out_len Pointer to output length variable
- * @returns Allocated buffer of out_len bytes of decoded data, or NULL on failure
- */
-[[nodiscard]]
-SELVA_EXPORT
-char * base64url_decode(const char *str_in, size_t len, size_t *out_len)
-    __attribute__((access(read_only, 1, 2), access(write_only, 3)));
-
-/**
- * Calculate the required buffer size of a string of n bytes.
- * @param line_max is the max line length. 0 = no limit; 72 = typical.
- */
-static inline size_t base64url_out_len(size_t n, size_t line_max) {
-    size_t olen;
-
-    /* This version would be with padding but we don't pad */
-#if 0
-    olen = n * 4 / 3 + 4; /* 3-byte blocks to 4-byte */
-#endif
-    olen = ((4 * n / 3) + 3) & ~3;
-    olen += line_max > 0 ? olen / line_max : 0; /* line feeds */
-
-    return olen;
-}