@kokimoki/app 1.2.0 → 1.3.1

package/dist/kokimoki-awareness.d.ts

@@ -6,19 +6,17 @@ export declare class KokimokiAwareness<Data extends S.Generic<unknown>> extends
     clientId: S.String;
     lastPing: S.Number;
     data: Data;
-}>>, {
-    [clientId: string]: Data["defaultValue"];
-}> {
+}>>> {
     readonly dataSchema: Data;
-    readonly data: Data["defaultValue"];
+    private _data;
     private _pingInterval;
     private _kmClients;
-    constructor(roomName: string, dataSchema: Data, data: Data["defaultValue"], mode?: RoomSubscriptionMode, pingTimeout?: number);
+    constructor(roomName: string, dataSchema: Data, _data: Data["defaultValue"], mode?: RoomSubscriptionMode, pingTimeout?: number);
     onJoin(client: KokimokiClient<any>): Promise<void>;
     onBeforeLeave(client: KokimokiClient<any>): Promise<void>;
     onLeave(client: KokimokiClient<any>): Promise<void>;
-    private getConnectedClients;
-    subscribe(set: (value: {
+    getClients(): {
         [clientId: string]: Data["defaultValue"];
-    }) => void): () => void;
+    };
+    setData(data: Data["defaultValue"]): Promise<void>;
 }

package/dist/kokimoki-awareness.js

@@ -3,17 +3,17 @@ import { KokimokiSchema as S } from "./kokimoki-schema";
 import { RoomSubscriptionMode } from "./room-subscription-mode";
 export class KokimokiAwareness extends KokimokiStore {
     dataSchema;
-    data;
+    _data;
     _pingInterval = null;
     _kmClients = new Set();
-    constructor(roomName, dataSchema, data, mode = RoomSubscriptionMode.ReadWrite, pingTimeout = 2500) {
+    constructor(roomName, dataSchema, _data, mode = RoomSubscriptionMode.ReadWrite, pingTimeout = 3000) {
         super(`/a/${roomName}`, S.dict(S.struct({
             clientId: S.string(),
             lastPing: S.number(),
             data: dataSchema,
         })), mode);
         this.dataSchema = dataSchema;
-        this.data = data;
+        this._data = _data;
         this._pingInterval = setInterval(async () => {
             const kmClients = Array.from(this._kmClients);
             await Promise.all(kmClients.map(async (client) => {
@@ -28,7 +28,7 @@ export class KokimokiAwareness extends KokimokiStore {
                             t.set(this.root[client.connectionId], {
                                 clientId: client.id,
                                 lastPing: timestamp,
-                                data: this.data,
+                                data: this._data,
                             });
                         }
                         // Delete clients that haven't pinged in a while
@@ -50,7 +50,7 @@ export class KokimokiAwareness extends KokimokiStore {
             t.set(this.root[client.connectionId], {
                 clientId: client.id,
                 lastPing: client.serverTimestamp(),
-                data: this.data,
+                data: this._data,
             });
         });
     }
@@ -62,37 +62,20 @@ export class KokimokiAwareness extends KokimokiStore {
     async onLeave(client) {
         this._kmClients.delete(client);
     }
-    getConnectedClients() {
+    getClients() {
         const clients = {};
         for (const clientId in this.proxy) {
             clients[clientId] = this.proxy[clientId].data;
         }
         return clients;
     }
-    subscribe(set) {
-        let prevConnectionIds = {};
-        const handler = () => {
-            // Do nothing if only pings have changed
-            let changed = false;
-            const newConnectionIds = {};
-            for (const connectionId in this.proxy) {
-                newConnectionIds[connectionId] = true;
-                if (!prevConnectionIds[connectionId]) {
-                    changed = true;
-                }
-            }
-            for (const connectionId in prevConnectionIds) {
-                if (!newConnectionIds[connectionId]) {
-                    changed = true;
-                }
-            }
-            if (changed) {
-                set(this.getConnectedClients());
-                prevConnectionIds = newConnectionIds;
-            }
-        };
-        this.doc.on("update", handler);
-        set(this.getConnectedClients());
-        return () => this.doc.off("update", handler);
+    async setData(data) {
+        this._data = data;
+        const kmClients = Array.from(this._kmClients);
+        await Promise.all(kmClients.map(async (client) => {
+            await client.transact((t) => {
+                t.set(this.root[client.connectionId].data, this._data);
+            });
+        }));
     }
 }

package/dist/kokimoki-client.js

@@ -141,7 +141,7 @@ export class KokimokiClient extends EventEmitter {
                 this.emit("disconnected");
             };
             this.ws.onmessage = (e) => {
-                console.log(`Received WS message: ${e.data}`);
+                // console.log(`Received WS message: ${e.data}`);
                 // Handle JSON messages
                 if (typeof e.data === "string") {
                     const message = JSON.parse(e.data);

package/dist/kokimoki.min.d.ts

@@ -368,21 +368,19 @@ declare class KokimokiAwareness<Data extends KokimokiSchema.Generic<unknown>> ex
     clientId: KokimokiSchema.String;
     lastPing: KokimokiSchema.Number;
     data: Data;
-}>>, {
-    [clientId: string]: Data["defaultValue"];
-}> {
+}>>> {
     readonly dataSchema: Data;
-    readonly data: Data["defaultValue"];
+    private _data;
     private _pingInterval;
     private _kmClients;
-    constructor(roomName: string, dataSchema: Data, data: Data["defaultValue"], mode?: RoomSubscriptionMode, pingTimeout?: number);
+    constructor(roomName: string, dataSchema: Data, _data: Data["defaultValue"], mode?: RoomSubscriptionMode, pingTimeout?: number);
     onJoin(client: KokimokiClient<any>): Promise<void>;
     onBeforeLeave(client: KokimokiClient<any>): Promise<void>;
     onLeave(client: KokimokiClient<any>): Promise<void>;
-    private getConnectedClients;
-    subscribe(set: (value: {
+    getClients(): {
         [clientId: string]: Data["defaultValue"];
-    }) => void): () => void;
+    };
+    setData(data: Data["defaultValue"]): Promise<void>;
 }
 
 export { BooleanField, ConstField, EnumField, Field, type FieldOptions, FloatField, Form, FormArray, FormGroup, ImageField, IntegerField, KokimokiAwareness, KokimokiClient, type KokimokiClientEvents, KokimokiQueue, KokimokiSchema, KokimokiStore, type Paginated, RoomSubscription, RoomSubscriptionMode, TextField, type Upload };

package/dist/kokimoki.min.js

@@ -634,7 +634,7 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
 var eventsExports = events.exports;
 var EventEmitter$1 = /*@__PURE__*/getDefaultExportFromCjs(eventsExports);
 
-const KOKIMOKI_APP_VERSION = "1.2.0";
+const KOKIMOKI_APP_VERSION = "1.3.1";
 
 /**
  * Utility module to work with key-value stores.
@@ -11785,7 +11785,7 @@ class KokimokiClient extends EventEmitter$1 {
                 this.emit("disconnected");
             };
             this.ws.onmessage = (e) => {
-                console.log(`Received WS message: ${e.data}`);
+                // console.log(`Received WS message: ${e.data}`);
                 // Handle JSON messages
                 if (typeof e.data === "string") {
                     const message = JSON.parse(e.data);
@@ -12494,17 +12494,17 @@ class KokimokiQueue extends KokimokiStore {
 
 class KokimokiAwareness extends KokimokiStore {
     dataSchema;
-    data;
+    _data;
     _pingInterval = null;
     _kmClients = new Set();
-    constructor(roomName, dataSchema, data, mode = RoomSubscriptionMode.ReadWrite, pingTimeout = 2500) {
+    constructor(roomName, dataSchema, _data, mode = RoomSubscriptionMode.ReadWrite, pingTimeout = 3000) {
         super(`/a/${roomName}`, KokimokiSchema.dict(KokimokiSchema.struct({
             clientId: KokimokiSchema.string(),
             lastPing: KokimokiSchema.number(),
             data: dataSchema,
         })), mode);
         this.dataSchema = dataSchema;
-        this.data = data;
+        this._data = _data;
         this._pingInterval = setInterval(async () => {
             const kmClients = Array.from(this._kmClients);
             await Promise.all(kmClients.map(async (client) => {
@@ -12519,7 +12519,7 @@ class KokimokiAwareness extends KokimokiStore {
                             t.set(this.root[client.connectionId], {
                                 clientId: client.id,
                                 lastPing: timestamp,
-                                data: this.data,
+                                data: this._data,
                             });
                         }
                         // Delete clients that haven't pinged in a while
@@ -12541,7 +12541,7 @@ class KokimokiAwareness extends KokimokiStore {
             t.set(this.root[client.connectionId], {
                 clientId: client.id,
                 lastPing: client.serverTimestamp(),
-                data: this.data,
+                data: this._data,
             });
         });
     }
@@ -12553,38 +12553,21 @@ class KokimokiAwareness extends KokimokiStore {
     async onLeave(client) {
         this._kmClients.delete(client);
     }
-    getConnectedClients() {
+    getClients() {
         const clients = {};
         for (const clientId in this.proxy) {
             clients[clientId] = this.proxy[clientId].data;
         }
         return clients;
     }
-    subscribe(set) {
-        let prevConnectionIds = {};
-        const handler = () => {
-            // Do nothing if only pings have changed
-            let changed = false;
-            const newConnectionIds = {};
-            for (const connectionId in this.proxy) {
-                newConnectionIds[connectionId] = true;
-                if (!prevConnectionIds[connectionId]) {
-                    changed = true;
-                }
-            }
-            for (const connectionId in prevConnectionIds) {
-                if (!newConnectionIds[connectionId]) {
-                    changed = true;
-                }
-            }
-            if (changed) {
-                set(this.getConnectedClients());
-                prevConnectionIds = newConnectionIds;
-            }
-        };
-        this.doc.on("update", handler);
-        set(this.getConnectedClients());
-        return () => this.doc.off("update", handler);
+    async setData(data) {
+        this._data = data;
+        const kmClients = Array.from(this._kmClients);
+        await Promise.all(kmClients.map(async (client) => {
+            await client.transact((t) => {
+                t.set(this.root[client.connectionId].data, this._data);
+            });
+        }));
     }
 }