@hozon/store-log 0.2.1 → 0.2.3

package/lib/api.js

@@ -1,14 +1,19 @@
 import { chunk, withKeepSet, withStoreTransaction } from '@hozon/db';
+import { b64uFromUTF, b64uToUTF } from '@sozai/codec';
 import { categoryRange, encodeCategory } from './category.js';
+function decodeLog(data) {
+    // Decode only the JSON column; nested JSON-looking strings are payload values.
+    return typeof data === 'string' ? JSON.parse(data) : data;
+}
 function encodeCursor(timestamp, seq) {
-    return btoa(JSON.stringify([
+    return b64uFromUTF(JSON.stringify([
         timestamp,
         seq
-    ])).replaceAll('+', '-').replaceAll('/', '_').replace(/=+$/, '');
+    ]));
 }
 function decodeCursor(cursor) {
     try {
-        const value = JSON.parse(atob(cursor.replaceAll('-', '+').replaceAll('_', '/')));
+        const value = JSON.parse(b64uToUTF(cursor));
         if (!Array.isArray(value) || value.length !== 2 || !value.every((item)=>typeof item === 'number' && Number.isFinite(item)) || !Number.isInteger(value[1])) {
             throw new TypeError('Invalid log cursor');
         }
@@ -45,6 +50,9 @@ export function createLogStoreAPI(db, adapter) {
         },
         async queryLogs (params) {
             if (!Number.isInteger(params.limit) || params.limit <= 0) throw new RangeError('Log limit must be a positive integer');
+            if (params.spanID !== undefined && params.traceID === undefined) throw new TypeError('Log spanID filter requires traceID');
+            const order = params.order ?? 'asc';
+            const after = order === 'asc' ? '>' : '<';
             const limit = Math.min(params.limit, 1000);
             let query = db.selectFrom('logs').select([
                 'timestamp',
@@ -66,21 +74,22 @@ export function createLogStoreAPI(db, adapter) {
                 query = query.where('category', '>=', gte).where('category', '<', lt);
             }
             if (params.traceID !== undefined) query = query.where('trace_id', '=', params.traceID);
+            if (params.spanID !== undefined) query = query.where('span_id', '=', params.spanID);
             if (params.cursor !== undefined) {
                 const [timestamp, seq] = decodeCursor(params.cursor);
                 query = query.where((eb)=>eb.or([
-                        eb('timestamp', '>', timestamp),
+                        eb('timestamp', after, timestamp),
                         eb.and([
                             eb('timestamp', '=', timestamp),
-                            eb('seq', '>', seq)
+                            eb('seq', after, seq)
                         ])
                     ]));
             }
-            const rows = await query.orderBy('timestamp').orderBy('seq').limit(limit + 1).execute();
+            const rows = await query.orderBy('timestamp', order).orderBy('seq', order).limit(limit + 1).execute();
             const page = rows.slice(0, limit);
             const last = page.at(-1);
             return {
-                logs: page.map((row)=>row.data),
+                logs: page.map((row)=>decodeLog(row.data)),
                 ...rows.length > limit && last !== undefined ? {
                     cursor: encodeCursor(last.timestamp, last.seq)
                 } : {}
@@ -89,7 +98,7 @@ export function createLogStoreAPI(db, adapter) {
         async getTraceLogs (traceID) {
             const rows = await db.selectFrom('logs').select('data').where('trace_id', '=', traceID).orderBy('timestamp').orderBy('seq').execute();
             // addLogs enforces paired IDs for every traced row.
-            return rows.map((row)=>row.data);
+            return rows.map((row)=>decodeLog(row.data));
         },
         async deleteByTrace (traceIDs) {
             if (traceIDs.length === 0) return 0;

package/lib/migrations.js

@@ -16,6 +16,12 @@ export function logStoreMigrations(ctx) {
                     'timestamp',
                     'seq'
                 ]).execute();
+                await db.schema.createIndex(`${ctx.tablePrefix}_logs_trace_span_timestamp_seq`).on('logs').columns([
+                    'trace_id',
+                    'span_id',
+                    'timestamp',
+                    'seq'
+                ]).execute();
                 await db.schema.createIndex(`${ctx.tablePrefix}_logs_level_timestamp`).on('logs').columns([
                     'level',
                     'timestamp'

package/lib/tables.d.ts

@@ -8,6 +8,6 @@ export type LogTables = {
         category: string;
         trace_id: string | null;
         span_id: string | null;
-        data: ColumnType<StoredLog, unknown, unknown>;
+        data: ColumnType<StoredLog | string, unknown, unknown>;
     };
 };

package/lib/types.d.ts

@@ -20,6 +20,10 @@ export type QueryLogsParams = {
     levels?: Array<LogLevel>;
     categoryPrefix?: Array<string>;
     traceID?: string;
+    /** Requires traceID. */
+    spanID?: string;
+    /** Defaults to 'asc'. */
+    order?: 'asc' | 'desc';
     limit: number;
     cursor?: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hozon/store-log",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "Portable structured log store for Hozon",
   "repository": {
     "type": "git",
@@ -18,15 +18,16 @@
   ],
   "dependencies": {
     "@hozon/adapter": "^0.1.0",
-    "@hozon/db": "^0.2.1",
+    "@hozon/db": "^0.2.3",
+    "@sozai/codec": "^0.4.3",
     "@sozai/json": "^0.3.0"
   },
   "devDependencies": {
     "@hozon/node-sqlite": "^0.1.0",
-    "@types/node": "^26.6.4",
-    "del-cli": "^7.0.0",
+    "@types/node": "^26.6.5",
+    "del-cli": "^8.0.1",
     "kysely": "^0.29.6",
-    "vitest": "5.0.3"
+    "vitest": "5.0.4"
   },
   "publishConfig": {
     "access": "public"