Merge branch 'metarhia:master' into master

.github/workflows/test.yml

@@ -1,25 +1,21 @@
 name: Testing CI
-
 on: pull_request
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
-
     strategy:
       matrix:
         node:
           - 18
           - 20
+          - 21
         os:
           - ubuntu-latest
-
     services:
       redis:
         image: redis:7
         ports:
           - 6379:6379
-
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node }}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Metarhia contributors
+Copyright (c) 2020-2024 Metarhia contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -68,5 +68,5 @@ let's start with
 
 ## License
 
-Copyright (c) 2020-2023 Metarhia contributors.
+Copyright (c) 2020-2024 Metarhia contributors.
 This starter kit is [MIT licensed](./LICENSE).

application/db/redis/start.js

@@ -4,11 +4,13 @@ async () => {
   }
   const client = npm.redis.createClient(config.redis);
   db.redis.client = client;
-  client.on('error', () => {
+  client.on('error', async (error) => {
     if (application.worker.id === 'W1') {
       console.warn('No redis service detected, so quit client');
+      const err = new Error('No redis', { cause: error });
+      console.error(err);
+      await client.disconnect();
     }
-    client.quit();
   });
   await client.connect();
 };

application/static/events.js

@@ -34,7 +34,7 @@ class EventEmitter {
   once(name, fn) {
     const dispose = (...args) => {
       this.remove(name, dispose);
-      return fn(...args);
+      return void fn(...args);
     };
     this.on(name, dispose);
   }
@@ -50,17 +50,18 @@ class EventEmitter {
   remove(name, fn) {
     const event = this.events.get(name);
     if (!event) return;
-    if (event.has(fn)) event.delete(fn);
+    event.delete(fn);
   }
 
   clear(name) {
     if (!name) return void this.events.clear();
     this.events.delete(name);
   }
-
-  static once(emitter, name) {
-    return new Promise((resolve) => emitter.once(name, resolve));
-  }
 }
 
-export default EventEmitter;
+const once = (emitter, name) =>
+  new Promise((resolve) => {
+    emitter.once(name, resolve);
+  });
+
+export { EventEmitter, once };

application/static/metacom.js

@@ -1,4 +1,4 @@
-import EventEmitter from './events.js';
+import { EventEmitter } from './events.js';
 import { chunkDecode, MetaReadable, MetaWritable } from './streams.js';
 
 const CALL_TIMEOUT = 7 * 1000;
@@ -7,11 +7,13 @@ const RECONNECT_TIMEOUT = 2 * 1000;
 
 const connections = new Set();
 
-window.addEventListener('online', () => {
-  for (const connection of connections) {
-    if (!connection.connected) connection.open();
-  }
-});
+if (window) {
+  window.addEventListener('online', () => {
+    for (const connection of connections) {
+      if (!connection.connected) connection.open();
+    }
+  });
+}
 
 class MetacomError extends Error {
   constructor({ message, code }) {
@@ -62,9 +64,8 @@ class Metacom extends EventEmitter {
 
   createStream(name, size) {
     const id = ++this.streamId;
-    const initData = { type: 'stream', id, name, size };
     const transport = this;
-    return new MetaWritable(transport, initData);
+    return new MetaWritable(id, name, size, transport);
   }
 
   createBlobUploader(blob) {
@@ -121,8 +122,7 @@ class Metacom extends EventEmitter {
         if (stream) {
           console.error(new Error(`Stream ${name} is already initialized`));
         } else {
-          const streamData = { id, name, size };
-          const stream = new MetaReadable(streamData);
+          const stream = new MetaReadable(id, name, size);
           this.streams.set(id, stream);
         }
       } else if (!stream) {

application/static/streams.js

@@ -1,4 +1,4 @@
-import EventEmitter from '/events.js';
+import { EventEmitter } from './events.js';
 
 const ID_LENGTH = 4;
 
@@ -132,12 +132,12 @@ class MetaReadable extends EventEmitter {
 }
 
 class MetaWritable extends EventEmitter {
-  constructor(transport, options = {}) {
+  constructor(id, name, size, transport) {
     super();
+    this.id = id;
+    this.name = name;
+    this.size = size;
     this.transport = transport;
-    this.id = options.id;
-    this.name = options.name;
-    this.size = options.size;
     this.init();
   }