@simplito/privmx-webendpoint 2.6.1 → 2.6.3

package/extra/subscriptions.d.ts

@@ -1,5 +1,4 @@
 import { Types } from "..";
-import { ThreadEventSelectorType, ThreadEventType } from "../Types";
 import { GenericEvent } from "./managers";
 export type ThreadCallbackPayload = {
     [Types.ThreadEventType.THREAD_CREATE]: Types.Thread;
@@ -75,8 +74,14 @@ export type KvdbCallbackPayload = {
     };
     [Types.KvdbEventType.COLLECTION_CHANGE]: Types.CollectionChangedEventData;
 };
+export type UserEventCallbackPayload = {
+    [Types.ConnectionEventType.USER_ADD]: Types.ContextUserEventData;
+    [Types.ConnectionEventType.USER_REMOVE]: Types.ContextUserEventData;
+    [Types.ConnectionEventType.USER_STATUS]: Types.ContextUsersStatusChangedEventData;
+};
+export type EventsCallbackPayload = Types.ContextCustomEventData;
 export type EventCallback = {
-    callback: (e: Types.Event) => void;
+    callback: (e: Types.Event | GenericEvent<unknown>) => void;
     symbol: Symbol;
 };
 export interface Subscription<T, S> {
@@ -129,37 +134,54 @@ export declare function createInboxSubscription<T extends Types.InboxEventType,
     selector: S;
     id: string;
 };
-export declare enum ConnectionEventType {
+export declare function createEventSubscription(s: {
+    channel: string;
+    selector: Types.EventsEventSelectorType;
+    id: string;
+    callbacks: ((arg: GenericEvent<EventsCallbackPayload>) => void)[];
+}): Subscription<string, Types.EventsEventSelectorType> & {
+    channel: string;
+};
+export declare enum ConnectionStatusEventType {
     LIB_DISCONNECTED = 0,
     LIB_PLATFORM_DISCONNECTED = 1,
     LIB_CONNECTED = 2
 }
-export declare function createConnectionSubscription(s: {
-    type: ConnectionEventType;
-    callbacks: ((arg: GenericEvent<undefined>) => void)[];
-}): {
+export type ConnectionSubscription = {
+    type: ConnectionStatusEventType;
     callbacks: EventCallback[];
-    type: ConnectionEventType;
 };
+export declare function createConnectionSubscription(s: {
+    type: ConnectionStatusEventType;
+    callbacks: ((arg: GenericEvent<undefined>) => void)[];
+}): ConnectionSubscription;
+export declare function createUserEventSubscription<T extends Types.ConnectionEventType, S extends Types.ConnectionEventSelectorType>(s: {
+    type: T;
+    selector: S;
+    id: string;
+    callbacks: ((arg: GenericEvent<UserEventCallbackPayload[T]>) => void)[];
+}): Subscription<T, S>;
 export interface EventSubscriber<E, S> {
     /**
-     * Subscribe for the Thread events on the given subscription query.
+     * Subscribe for events on the given subscription queries.
      * @param {string[]} subscriptionQueries list of queries
      */
     subscribeFor(subscriptionQueries: string[]): Promise<string[]>;
     /**
-     * Unsubscribes from events for the given subscriptionId.
+     * Unsubscribe from events for the given subscriptionIds.
      */
     unsubscribeFrom(subscriptionIds: string[]): Promise<void>;
     /**
-     * Generate subscription Query for the Thread events.
-     * @param {EventType} eventType type of event which you listen for
-     * @param {EventSelectorType} selectorType scope on which you listen for events
+     * Generate subscription query string for the requested event scope.
+     * @param {E} eventType type of event which you listen for
+     * @param {S} selectorType scope on which you listen for events
      * @param {string} selectorId ID of the selector
      */
     buildSubscriptionQuery(eventType: E, selectorType: S, selectorId: string): Promise<string>;
 }
-export type SubscriberForThreadsEvents = EventSubscriber<ThreadEventType, ThreadEventSelectorType>;
+export type SubscriberForThreadsEvents = EventSubscriber<Types.ThreadEventType, Types.ThreadEventSelectorType>;
 export type SubscriberForStoreEvents = EventSubscriber<Types.StoreEventType, Types.StoreEventSelectorType>;
 export type SubscriberForInboxEvents = EventSubscriber<Types.InboxEventType, Types.InboxEventSelectorType>;
 export type SubscriberForKvdbEvents = EventSubscriber<Types.KvdbEventType, Types.KvdbEventSelectorType>;
+export type SubscriberForUserEvents = EventSubscriber<Types.ConnectionEventType, Types.ConnectionEventSelectorType>;
+export type SubscriberForEvents = EventSubscriber<string, Types.EventsEventSelectorType>;

package/extra/subscriptions.js

@@ -1,51 +1,68 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionEventType = void 0;
+exports.ConnectionStatusEventType = void 0;
 exports.createThreadSubscription = createThreadSubscription;
 exports.createStoreSubscription = createStoreSubscription;
 exports.createKvdbSubscription = createKvdbSubscription;
 exports.createInboxSubscription = createInboxSubscription;
+exports.createEventSubscription = createEventSubscription;
 exports.createConnectionSubscription = createConnectionSubscription;
+exports.createUserEventSubscription = createUserEventSubscription;
 const __1 = require("..");
 function toEventCallback(f) {
     return {
         callback: f,
-        symbol: Symbol()
+        symbol: Symbol(),
     };
 }
 function createThreadSubscription(s) {
     return {
         ...s,
-        callbacks: s.callbacks.map(toEventCallback)
+        callbacks: s.callbacks.map(toEventCallback),
     };
 }
 function createStoreSubscription(s) {
     return {
         ...s,
-        callbacks: s.callbacks.map(toEventCallback)
+        callbacks: s.callbacks.map(toEventCallback),
     };
 }
 function createKvdbSubscription(s) {
     return {
         ...s,
-        callbacks: s.callbacks.map(toEventCallback)
+        callbacks: s.callbacks.map(toEventCallback),
     };
 }
 function createInboxSubscription(s) {
     return {
         ...s,
-        callbacks: s.callbacks.map(toEventCallback)
+        callbacks: s.callbacks.map(toEventCallback),
     };
 }
-var ConnectionEventType;
-(function (ConnectionEventType) {
-    ConnectionEventType[ConnectionEventType["LIB_DISCONNECTED"] = 0] = "LIB_DISCONNECTED";
-    ConnectionEventType[ConnectionEventType["LIB_PLATFORM_DISCONNECTED"] = 1] = "LIB_PLATFORM_DISCONNECTED";
-    ConnectionEventType[ConnectionEventType["LIB_CONNECTED"] = 2] = "LIB_CONNECTED";
-})(ConnectionEventType || (exports.ConnectionEventType = ConnectionEventType = {}));
+function createEventSubscription(s) {
+    return {
+        type: s.channel,
+        selector: s.selector,
+        id: s.id,
+        callbacks: s.callbacks.map(toEventCallback),
+        channel: s.channel,
+    };
+}
+var ConnectionStatusEventType;
+(function (ConnectionStatusEventType) {
+    ConnectionStatusEventType[ConnectionStatusEventType["LIB_DISCONNECTED"] = 0] = "LIB_DISCONNECTED";
+    ConnectionStatusEventType[ConnectionStatusEventType["LIB_PLATFORM_DISCONNECTED"] = 1] = "LIB_PLATFORM_DISCONNECTED";
+    ConnectionStatusEventType[ConnectionStatusEventType["LIB_CONNECTED"] = 2] = "LIB_CONNECTED";
+})(ConnectionStatusEventType || (exports.ConnectionStatusEventType = ConnectionStatusEventType = {}));
 function createConnectionSubscription(s) {
     return {
         ...s,
-        callbacks: s.callbacks.map(toEventCallback)
+        callbacks: s.callbacks.map(toEventCallback),
+    };
+}
+function createUserEventSubscription(s) {
+    return {
+        ...s,
+        callbacks: s.callbacks.map(toEventCallback),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simplito/privmx-webendpoint",
-  "version": "2.6.1",
+  "version": "2.6.3",
   "description": "PrivMX Web Endpoint library",
   "author": "Simplito",
   "license": "PrivMX Free License",

package/service/EventApi.d.ts

@@ -18,11 +18,11 @@ export declare class EventApi extends BaseApi {
      * Emits the custom event on the given Context and channel.
      *
      * @param {string} contextId ID of the Context
+     * @param {UserWithPubKey[]} users list of UserWithPubKey objects which defines the recipients of the event
      * @param {string} channelName name of the Channel
      * @param {Uint8Array} eventData event's data
-     * @param {UserWithPubKey[]} users list of UserWithPubKey objects which defines the recipients of the event
      */
-    emitEvent(contextId: string, channelName: string, eventData: Uint8Array, users: UserWithPubKey[]): Promise<void>;
+    emitEvent(contextId: string, users: UserWithPubKey[], channelName: string, eventData: Uint8Array): Promise<void>;
     /**
      * Subscribe for the custom events on the given subscription query.
      *

package/service/EventApi.js

@@ -31,12 +31,12 @@ class EventApi extends BaseApi_1.BaseApi {
      * Emits the custom event on the given Context and channel.
      *
      * @param {string} contextId ID of the Context
+     * @param {UserWithPubKey[]} users list of UserWithPubKey objects which defines the recipients of the event
      * @param {string} channelName name of the Channel
      * @param {Uint8Array} eventData event's data
-     * @param {UserWithPubKey[]} users list of UserWithPubKey objects which defines the recipients of the event
      */
-    async emitEvent(contextId, channelName, eventData, users) {
-        return this.native.emitEvent(this.servicePtr, [contextId, channelName, eventData, users]);
+    async emitEvent(contextId, users, channelName, eventData) {
+        return this.native.emitEvent(this.servicePtr, [contextId, users, channelName, eventData]);
     }
     // /**
     //  * Subscribe for the custom events on the given channel.

package/assets/endpoint-wasm-module.worker.js

@@ -1 +0,0 @@
-"use strict";var Module={};var ENVIRONMENT_IS_NODE=typeof process=="object"&&typeof process.versions=="object"&&typeof process.versions.node=="string";if(ENVIRONMENT_IS_NODE){var nodeWorkerThreads=require("worker_threads");var parentPort=nodeWorkerThreads.parentPort;parentPort.on("message",data=>onmessage({data:data}));var fs=require("fs");Object.assign(global,{self:global,require:require,Module:Module,location:{href:__filename},Worker:nodeWorkerThreads.Worker,importScripts:f=>(0,eval)(fs.readFileSync(f,"utf8")+"//# sourceURL="+f),postMessage:msg=>parentPort.postMessage(msg),performance:global.performance||{now:Date.now}})}var initializedJS=false;function assert(condition,text){if(!condition)abort("Assertion failed: "+text)}function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");if(ENVIRONMENT_IS_NODE){fs.writeSync(2,text+"\n");return}console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var out=()=>{throw"out() is not defined in worker.js."};var err=threadPrintErr;self.alert=threadAlert;var dbg=threadPrintErr;Module["instantiateWasm"]=(info,receiveInstance)=>{var module=Module["wasmModule"];Module["wasmModule"]=null;var instance=new WebAssembly.Instance(module,info);return receiveInstance(instance)};self.onunhandledrejection=e=>{throw e.reason||e};function handleMessage(e){try{if(e.data.cmd==="load"){let messageQueue=[];self.onmessage=e=>messageQueue.push(e);self.startWorker=instance=>{Module=instance;postMessage({"cmd":"loaded"});for(let msg of messageQueue){handleMessage(msg)}self.onmessage=handleMessage};Module["wasmModule"]=e.data.wasmModule;for(const handler of e.data.handlers){Module[handler]=(...args)=>{postMessage({cmd:"callHandler",handler:handler,args:args})}}Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["workerID"]=e.data.workerID;Module["ENVIRONMENT_IS_PTHREAD"]=true;if(typeof e.data.urlOrBlob=="string"){importScripts(e.data.urlOrBlob)}else{var objectUrl=URL.createObjectURL(e.data.urlOrBlob);importScripts(objectUrl);URL.revokeObjectURL(objectUrl)}endpointWasmModule(Module)}else if(e.data.cmd==="run"){Module["__emscripten_thread_init"](e.data.pthread_ptr,0,0,1);Module["__emscripten_thread_mailbox_await"](e.data.pthread_ptr);assert(e.data.pthread_ptr);Module["establishStackSpace"]();Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInitTLS();if(!initializedJS){Module["__embind_initialize_bindings"]();initializedJS=true}try{Module["invokeEntryPoint"](e.data.start_routine,e.data.arg)}catch(ex){if(ex!="unwind"){throw ex}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["__emscripten_thread_exit"](-1)}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="checkMailbox"){if(initializedJS){Module["checkMailbox"]()}}else if(e.data.cmd){err(`worker.js received unknown command ${e.data.cmd}`);err(e.data)}}catch(ex){err(`worker.js onmessage() captured an uncaught exception: ${ex}`);if(ex&&ex.stack)err(ex.stack);if(Module["__emscripten_thread_crashed"]){Module["__emscripten_thread_crashed"]()}throw ex}}self.onmessage=handleMessage;