Merge branch 'unstable' into test-hashtag-strip-helper-resize-7955570684281399740

This commit is contained in:
thePR0M3TH3AN authored and GitHub committed 2026-02-07 21:00:57 -05:00
commit 07a9284cb1
5 files changed
+525 -1

No files matched your search

+6 -1
View File
@@ -1081,7 +1081,7 @@ class Application {
async _initNostr() {
// Kick off relay connection in the background.
nostrClient.init().catch((err) => {
return nostrClient.init().catch((err) => {
devLogger.warn("[app.init()] Background nostrClient.init failed:", err);
});
}
@@ -3992,6 +3992,11 @@ class Application {
return this._feed.refreshFeed("recent", ...args);
}
async refreshFeed(...args) {
this._initCoordinators();
return this._feed.refreshFeed(...args);
}
checkRelayHealthWarning(...args) {
this._initCoordinators();
return this._feed.checkRelayHealthWarning(...args);
+255
View File
@@ -0,0 +1,255 @@
import { describe, it, before, after, beforeEach, afterEach, mock } from 'node:test';
import assert from 'node:assert';
// Mock Worker globally
class MockWorker {
constructor(scriptURL) {
this.scriptURL = scriptURL;
this.listeners = {};
MockWorker.instances.push(this);
// Mimic the real worker path
assert.match(String(scriptURL), /dmDecryptWorker\.js$/);
}
addEventListener(event, handler) {
if (!this.listeners[event]) {
this.listeners[event] = [];
}
this.listeners[event].push(handler);
}
removeEventListener(event, handler) {
if (this.listeners[event]) {
this.listeners[event] = this.listeners[event].filter((h) => h !== handler);
}
}
postMessage(data) {
// Simulate async processing
setImmediate(() => {
if (MockWorker.onPostMessage) {
MockWorker.onPostMessage(this, data);
}
});
}
// Helper to simulate incoming message from worker
emitMessage(data) {
if (this.listeners['message']) {
const event = { data };
this.listeners['message'].forEach((handler) => handler(event));
}
}
// Helper to simulate worker error
emitError(error) {
if (this.listeners['error']) {
this.listeners['error'].forEach((handler) => handler(error));
}
}
terminate() {}
}
MockWorker.instances = [];
MockWorker.onPostMessage = null;
describe('dmDecryptWorkerClient', () => {
let originalWorker;
let originalConsoleWarn;
let originalDevOverride;
before(() => {
originalWorker = globalThis.Worker;
originalConsoleWarn = console.warn;
originalDevOverride = globalThis.__BITVID_DEV_MODE_OVERRIDE__;
// Set dev mode to true to ensure logger calls console.warn
globalThis.__BITVID_DEV_MODE_OVERRIDE__ = true;
});
after(() => {
globalThis.Worker = originalWorker;
console.warn = originalConsoleWarn;
globalThis.__BITVID_DEV_MODE_OVERRIDE__ = originalDevOverride;
});
let warnMock;
let initialCallCount = 0;
beforeEach(() => {
MockWorker.instances = [];
MockWorker.onPostMessage = null;
if (!warnMock) {
warnMock = mock.fn();
console.warn = warnMock;
}
initialCallCount = warnMock.mock.calls.length;
globalThis.Worker = MockWorker;
});
afterEach(() => {
// Cleanup is handled by new import per test or global reset
// We don't need to manually destroy the module as we import a fresh one
});
// Helper to load a fresh module instance
async function loadModule() {
// Cache busting to ensure we get a fresh module with reset internal state (workerInstance = null)
const mod = await import(`../../js/nostr/dmDecryptWorkerClient.js?t=${Date.now()}-${Math.random()}`);
return mod;
}
it('should support worker environment', async () => {
const { isDmDecryptWorkerSupported } = await loadModule();
assert.strictEqual(isDmDecryptWorkerSupported(), true);
});
it('should reject if Worker is unavailable', async () => {
globalThis.Worker = undefined;
const { decryptDmInWorker } = await loadModule();
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' }),
{ message: 'dm-worker-unavailable' }
);
});
it('should reject if inputs are invalid', async () => {
const { decryptDmInWorker } = await loadModule();
await assert.rejects(
decryptDmInWorker({ privateKey: '', targetPubkey: 'tp', ciphertext: 'ct' }),
{ message: 'dm-worker-invalid-input' }
);
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: '', ciphertext: 'ct' }),
{ message: 'dm-worker-invalid-input' }
);
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: '' }),
{ message: 'dm-worker-invalid-input' }
);
});
it('should successfully decrypt message', async () => {
const { decryptDmInWorker, getDmDecryptWorkerQueueSize } = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
assert.strictEqual(data.privateKey, 'pk');
assert.strictEqual(data.ciphertext, 'ct');
assert.strictEqual(data.targetPubkey, 'tp');
worker.emitMessage({
id: data.id,
ok: true,
plaintext: 'decrypted-text'
});
};
const promise = decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' });
assert.strictEqual(getDmDecryptWorkerQueueSize(), 1);
const result = await promise;
assert.strictEqual(result, 'decrypted-text');
assert.strictEqual(getDmDecryptWorkerQueueSize(), 0);
});
it('should handle worker error response', async () => {
const { decryptDmInWorker } = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
worker.emitMessage({
id: data.id,
error: { message: 'decryption-failed', name: 'DecryptError' }
});
};
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' }),
(err) => {
assert.strictEqual(err.message, 'decryption-failed');
assert.strictEqual(err.name, 'DecryptError');
return true;
}
);
});
it('should handle worker error event', async () => {
const { decryptDmInWorker } = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
worker.emitError(new Error('worker-crashed'));
};
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' }),
{ message: 'worker-crashed' }
);
// Check that warning was logged
const newCalls = warnMock.mock.calls.slice(initialCallCount);
assert.strictEqual(newCalls.length, 1);
const args = newCalls[0].arguments;
assert.match(args[0], /Worker error/);
});
it('should timeout if worker does not respond', async () => {
const { decryptDmInWorker } = await loadModule();
// Use a short timeout for testing
const timeoutMs = 100;
MockWorker.onPostMessage = (worker, data) => {
// Do nothing, let it timeout
};
await assert.rejects(
decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct', timeoutMs }),
{ message: 'dm-worker-timeout' }
);
});
it('should initialize worker lazily and reuse instance', async () => {
const mod = await loadModule();
// First call creates worker
MockWorker.onPostMessage = (worker, data) => worker.emitMessage({id: data.id, ok: true, plaintext: 'p1'});
await mod.decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' });
assert.strictEqual(MockWorker.instances.length, 1);
const firstInstance = MockWorker.instances[0];
// Second call reuses worker
MockWorker.onPostMessage = (worker, data) => worker.emitMessage({id: data.id, ok: true, plaintext: 'p2'});
await mod.decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' });
assert.strictEqual(MockWorker.instances.length, 1);
assert.strictEqual(MockWorker.instances[0], firstInstance);
});
it('should recreate worker if creation fails', async () => {
// This is hard to test because ensureWorker catches the error and sets workerInstance to null
// but only logs it. It returns null.
globalThis.Worker = class BrokenWorker {
constructor() { throw new Error('Init failed'); }
};
const mod = await loadModule();
await assert.rejects(
mod.decryptDmInWorker({ privateKey: 'pk', targetPubkey: 'tp', ciphertext: 'ct' }),
{ message: 'dm-worker-unavailable' }
);
const newCalls = warnMock.mock.calls.slice(initialCallCount);
assert.strictEqual(newCalls.length, 1);
assert.match(newCalls[0].arguments[0], /Failed to create worker/);
});
});
+260
View File
@@ -0,0 +1,260 @@
import { describe, it, before, beforeEach, afterEach, after, mock } from 'node:test';
import assert from 'node:assert';
// Set Dev Mode Override to ensure logs are emitted
globalThis.__BITVID_DEV_MODE_OVERRIDE__ = true;
// Mock Worker globally before importing the service
class MockWorker {
constructor(scriptURL) {
this.scriptURL = scriptURL;
this.listeners = {};
MockWorker.instances.push(this);
if (MockWorker.onCreate) {
MockWorker.onCreate(this);
}
}
addEventListener(event, handler) {
if (!this.listeners[event]) {
this.listeners[event] = [];
}
this.listeners[event].push(handler);
}
removeEventListener(event, handler) {
if (this.listeners[event]) {
this.listeners[event] = this.listeners[event].filter((h) => h !== handler);
}
}
postMessage(data) {
// Simulate async processing
setImmediate(() => {
if (MockWorker.onPostMessage) {
MockWorker.onPostMessage(this, data);
}
});
}
// Helper to simulate incoming message from worker
emitMessage(data) {
if (this.listeners['message']) {
const event = { data };
this.listeners['message'].forEach((handler) => handler(event));
}
}
// Helper to simulate error event
emitError(error) {
if (this.listeners['error']) {
this.listeners['error'].forEach((handler) => handler(error));
}
}
}
MockWorker.instances = [];
MockWorker.onPostMessage = null;
MockWorker.onCreate = null;
globalThis.Worker = MockWorker;
describe('nip04WorkerClient', () => {
let encryptNip04InWorker;
let consoleWarnMock;
let originalWorker;
// Helper to load a fresh module instance
const loadModule = async () => {
// Cache busting to ensure we get a fresh module instance (and thus fresh internal state)
const mod = await import(`../../js/nostr/nip04WorkerClient.js?t=${Date.now()}-${Math.random()}`);
return mod.encryptNip04InWorker;
};
before(() => {
if (console.warn.mock) console.warn.mock.restore();
consoleWarnMock = mock.method(console, 'warn', () => {});
originalWorker = globalThis.Worker;
});
after(() => {
if (consoleWarnMock) consoleWarnMock.mock.restore();
globalThis.Worker = originalWorker;
});
beforeEach(() => {
MockWorker.instances = [];
MockWorker.onPostMessage = null;
MockWorker.onCreate = null;
globalThis.Worker = MockWorker;
});
it('should encrypt message successfully via worker', async () => {
encryptNip04InWorker = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
assert.strictEqual(data.privateKey, 'privKey');
assert.strictEqual(data.targetPubkey, 'pubKey');
assert.strictEqual(data.plaintext, 'hello');
worker.emitMessage({
id: data.id,
ok: true,
ciphertext: 'encrypted_data'
});
};
const result = await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello'
});
assert.strictEqual(result, 'encrypted_data');
});
it('should reject when worker returns error', async () => {
encryptNip04InWorker = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
worker.emitMessage({
id: data.id,
ok: false,
error: { message: 'encryption failed', name: 'EncryptionError' }
});
};
await assert.rejects(
async () => {
await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello'
});
},
(err) => {
assert.strictEqual(err.message, 'encryption failed');
assert.strictEqual(err.name, 'EncryptionError');
return true;
}
);
});
it('should reject when worker emits error event', async () => {
encryptNip04InWorker = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
worker.emitError(new Error('Worker crashed'));
};
await assert.rejects(
async () => {
await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello'
});
},
(err) => {
assert.strictEqual(err.message, 'Worker crashed');
return true;
}
);
});
it('should timeout if worker does not respond', async () => {
encryptNip04InWorker = await loadModule();
MockWorker.onPostMessage = (worker, data) => {
// Do nothing, let it timeout
};
await assert.rejects(
async () => {
await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello',
timeoutMs: 100 // Short timeout
});
},
(err) => {
assert.strictEqual(err.message, 'nip04-worker-timeout');
return true;
}
);
});
it('should reject immediately if inputs are missing', async () => {
encryptNip04InWorker = await loadModule();
await assert.rejects(
async () => {
await encryptNip04InWorker({});
},
(err) => {
assert.strictEqual(err.message, 'nip04-worker-invalid-input');
return true;
}
);
await assert.rejects(
async () => {
await encryptNip04InWorker({ privateKey: '', targetPubkey: 'pub' });
},
(err) => {
assert.strictEqual(err.message, 'nip04-worker-invalid-input');
return true;
}
);
});
it('should reject if Worker API is unavailable', async () => {
globalThis.Worker = undefined;
encryptNip04InWorker = await loadModule();
await assert.rejects(
async () => {
await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello'
});
},
(err) => {
assert.strictEqual(err.message, 'nip04-worker-unavailable');
return true;
}
);
});
it('should handle worker creation failure', async () => {
// Mock Worker to throw on instantiation
globalThis.Worker = class ThrowingWorker {
constructor() {
throw new Error('Worker creation not allowed');
}
};
encryptNip04InWorker = await loadModule();
await assert.rejects(
async () => {
await encryptNip04InWorker({
privateKey: 'privKey',
targetPubkey: 'pubKey',
plaintext: 'hello'
});
},
(err) => {
assert.strictEqual(err.message, 'nip04-worker-unavailable');
return true;
}
);
// Verify warning was logged
const calls = consoleWarnMock.mock.calls;
const warning = calls.find(c => c.arguments[0] && String(c.arguments[0]).includes('Failed to create worker'));
assert.ok(warning, 'Should log warning about worker creation failure');
});
});
+2
View File
@@ -0,0 +1,2 @@
import "./js/app.js";
console.log("Syntax check passed");
+2
View File
@@ -0,0 +1,2 @@
import "./tests/app/channel-profile-moderation.test.mjs";
console.log("Syntax check passed");