@sockethub/data-layer 1.0.0-alpha.11 → 1.0.0-alpha.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sockethub/data-layer",
   "description": "Storing and RPC of data for Sockethub",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.12",
   "type": "module",
   "private": false,
   "author": "Nick Jennings <nick@silverbucket.net>",
@@ -47,9 +47,9 @@
     "test:integration": "bun test ./integration/redis.integration.ts"
   },
   "dependencies": {
-    "@sockethub/crypto": "^1.0.0-alpha.11",
-    "@sockethub/logger": "^1.0.0-alpha.11",
-    "@sockethub/schemas": "^3.0.0-alpha.11",
+    "@sockethub/crypto": "^1.0.0-alpha.12",
+    "@sockethub/logger": "^1.0.0-alpha.12",
+    "@sockethub/schemas": "^3.0.0-alpha.12",
     "bullmq": "^5.66.5",
     "ioredis": "^5.9.2",
     "secure-store-redis": "^4.1.0"
@@ -63,5 +63,5 @@
     "typedoc-plugin-markdown": "^4.9.0",
     "winston": "^3.19.0"
   },
-  "gitHead": "c243fa9e76c688ce5ffcf524400b1dd27dcce615"
+  "gitHead": "f039dab3c3f67cbbf204476fc397532e973f82a8"
 }

package/src/credentials-store.ts

@@ -1,8 +1,8 @@
 import { crypto } from "@sockethub/crypto";
 import {
-    type Logger,
     createLogger,
     getLoggerNamespace,
+    type Logger,
 } from "@sockethub/logger";
 import type { CredentialsObject } from "@sockethub/schemas";
 import IORedis, { type Redis } from "ioredis";
@@ -46,7 +46,7 @@ export async function resetSharedCredentialsRedisConnection(): Promise<void> {
     if (sharedCredentialsRedisConnection) {
         try {
             sharedCredentialsRedisConnection.disconnect(false);
-        } catch (err) {
+        } catch (_err) {
             // Ignore disconnect errors during cleanup
         }
         sharedCredentialsRedisConnection = null;
@@ -187,6 +187,6 @@ export class CredentialsStore implements CredentialsStoreInterface {
         if (!this.store.isConnected) {
             await this.store.connect();
         }
-        return this.store.save(actor, creds);
+        return await this.store.save(actor, creds);
     }
 }

package/src/index.ts

@@ -12,7 +12,9 @@ import {
 } from "./job-base.js";
 import { JobQueue, verifyJobQueue } from "./job-queue.js";
 import { JobWorker } from "./job-worker.js";
+
 export * from "./types.js";
+
 import type { RedisConfig } from "./types.js";
 
 async function redisCheck(config: RedisConfig): Promise<void> {

package/src/job-base.ts

@@ -1,8 +1,7 @@
 import EventEmitter from "node:events";
-import IORedis, { type Redis } from "ioredis";
-
-import { crypto, type Crypto } from "@sockethub/crypto";
+import { type Crypto, crypto } from "@sockethub/crypto";
 import type { ActivityStream } from "@sockethub/schemas";
+import IORedis, { type Redis } from "ioredis";
 
 import type { JobDataDecrypted, JobEncrypted, RedisConfig } from "./types.js";
 
@@ -44,7 +43,7 @@ export async function resetSharedRedisConnection(): Promise<void> {
     if (sharedRedisConnection) {
         try {
             sharedRedisConnection.disconnect(false);
-        } catch (err) {
+        } catch (_err) {
             // Ignore disconnect errors during cleanup
         }
         sharedRedisConnection = null;
@@ -67,13 +66,15 @@ export async function getRedisConnectionCount(): Promise<number> {
     }
 
     try {
-        const clientList = await sharedRedisConnection.client("LIST");
+        const clientList = (await sharedRedisConnection.client(
+            "LIST",
+        )) as string;
         // CLIENT LIST returns one line per connection, filter out empty lines
         const connections = clientList
             .split("\n")
-            .filter((line) => line.trim());
+            .filter((line: string) => line.trim());
         return connections.length;
-    } catch (err) {
+    } catch (_err) {
         // Return 0 if Redis query fails (connection issues, etc.)
         return 0;
     }

package/src/job-queue.test.ts

@@ -108,7 +108,7 @@ describe("JobQueue", () => {
         it("returns expected job format", () => {
             cryptoMocks.encrypt.returns("an encrypted message");
             const job = jobQueue.createJob("a socket id", {
-                context: "some context",
+                platform: "some context",
                 id: "an identifier",
             });
             expect(job).to.eql({
@@ -121,7 +121,7 @@ describe("JobQueue", () => {
         it("uses counter when no id provided", () => {
             cryptoMocks.encrypt.returns("an encrypted message");
             let job = jobQueue.createJob("a socket id", {
-                context: "some context",
+                platform: "some context",
             });
             expect(job).to.eql({
                 title: "some context-0",
@@ -129,7 +129,7 @@ describe("JobQueue", () => {
                 sessionId: "a socket id",
             });
             job = jobQueue.createJob("a socket id", {
-                context: "some context",
+                platform: "some context",
             });
             expect(job).to.eql({
                 title: "some context-1",
@@ -201,7 +201,7 @@ describe("JobQueue", () => {
                 msg: "encrypted foo",
             };
             const res = await jobQueue.add("a socket id", {
-                context: "a platform",
+                platform: "a platform",
                 id: "an identifier",
             });
             sinon.assert.calledOnce(jobQueue.queue.isPaused);
@@ -222,7 +222,7 @@ describe("JobQueue", () => {
             jobQueue.queue.isPaused.returns(true);
             try {
                 await jobQueue.add("a socket id", {
-                    context: "a platform",
+                    platform: "a platform",
                     id: "an identifier",
                 });
             } catch (err) {

package/src/job-queue.ts

@@ -1,12 +1,12 @@
 import {
-    type Logger,
     createLogger,
     getLoggerNamespace,
+    type Logger,
 } from "@sockethub/logger";
-import type { ActivityStream } from "@sockethub/schemas";
+import { type ActivityStream, resolvePlatformId } from "@sockethub/schemas";
 import { type Job, Queue, QueueEvents, Worker } from "bullmq";
 
-import { JobBase, createIORedisConnection } from "./job-base.js";
+import { JobBase } from "./job-base.js";
 import { buildQueueId } from "./queue-id.js";
 import type { JobDataEncrypted, JobDecrypted, RedisConfig } from "./types.js";
 
@@ -25,7 +25,7 @@ export async function verifyJobQueue(config: RedisConfig): Promise<void> {
                 job.data.test = "touched by worker";
             },
             {
-                connection: createIORedisConnection(config),
+                connection: config,
             },
         );
         worker.on("completed", async (job: Job) => {
@@ -46,7 +46,7 @@ export async function verifyJobQueue(config: RedisConfig): Promise<void> {
             reject(err);
         });
         const queue = new Queue("connectiontest", {
-            connection: createIORedisConnection(config),
+            connection: config,
         });
         queue.on("error", (err) => {
             log.warn(
@@ -227,9 +227,8 @@ export class JobQueue extends JobBase {
         if (job) {
             job.data = this.decryptJobData(job);
             try {
-                // biome-ignore lint/performance/noDelete: <explanation>
                 delete job.data.msg.sessionSecret;
-            } catch (e) {
+            } catch (_e) {
                 // this property should never be exposed externally
             }
         }
@@ -237,7 +236,8 @@ export class JobQueue extends JobBase {
     }
 
     private createJob(socketId: string, msg: ActivityStream): JobDataEncrypted {
-        const title = `${msg.context}-${msg.id ? msg.id : this.counter++}`;
+        const platformId = resolvePlatformId(msg) || "unknown";
+        const title = `${platformId}-${msg.id ? msg.id : this.counter++}`;
         return {
             title: title,
             sessionId: socketId,

package/src/job-worker.ts

@@ -1,7 +1,7 @@
 import {
-    type Logger,
     createLogger,
     getLoggerNamespace,
+    type Logger,
 } from "@sockethub/logger";
 import { Worker } from "bullmq";