verani 0.4.6 → 0.5.1

package/dist/verani.cjs

@@ -1 +1 @@
-const require_types=require(`./types-083oWz55.cjs`);let __cloudflare_actors=require(`@cloudflare/actors`);var RoomEventEmitterImpl=class{constructor(){this.handlers=new Map}on(c,T){this.handlers.has(c)||this.handlers.set(c,new Set),this.handlers.get(c).add(T)}off(c,T){let E=this.handlers.get(c);E&&(T?(E.delete(T),E.size===0&&this.handlers.delete(c)):this.handlers.delete(c))}async emit(c,T,E){let D=this.handlers.get(c);if(D&&D.size>0){let c=[];for(let O of D)try{let D=O(T,E);D instanceof Promise&&c.push(D)}catch{}await Promise.all(c)}let O=this.handlers.get(`*`);if(O&&O.size>0){let c=[];for(let D of O)try{let O=D(T,E);O instanceof Promise&&c.push(O)}catch{}await Promise.all(c)}}hasHandlers(c){return this.handlers.has(c)&&this.handlers.get(c).size>0||this.handlers.has(`*`)&&this.handlers.get(`*`).size>0}getEventNames(){return Array.from(this.handlers.keys())}rebuildHandlers(c){this.handlers.clear();for(let[T,E]of c.entries())this.handlers.set(T,new Set(E))}};function createRoomEventEmitter(){return new RoomEventEmitterImpl}function defaultExtractMeta(c){let T=crypto.randomUUID(),E=crypto.randomUUID(),D=new URL(c.url).searchParams.get(`channels`);return{userId:T,clientId:E,channels:D?D.split(`,`).map(c=>c.trim()).filter(Boolean):[`default`]}}function defineRoom(c){let T=c.eventEmitter||createRoomEventEmitter(),E=c._staticHandlers||new Map;return{name:c.name,websocketPath:c.websocketPath,extractMeta:c.extractMeta||(c=>defaultExtractMeta(c)),onConnect:c.onConnect,onDisconnect:c.onDisconnect,onMessage:c.onMessage,onError:c.onError,onHibernationRestore:c.onHibernationRestore,eventEmitter:T,_staticHandlers:E,on(c,D){T.on(c,D),E.has(c)||E.set(c,new Set),E.get(c).add(D)},off(c,D){T.off(c,D);let O=E.get(c);O&&(D?(O.delete(D),O.size===0&&E.delete(c)):E.delete(c))}}}function cleanupStaleSessions(c){let T=0,E=[];for(let[T,D]of c.entries())T.readyState!==WebSocket.OPEN&&E.push(T);for(let D of E)c.delete(D),T++;return T}function decodeFrame$1(T){return require_types.o(T)??{type:`invalid`}}function encodeFrame$1(T){return require_types.r(T)}function broadcast(c,T,E,D){let O=0,k=encodeFrame$1({type:`event`,channel:T,data:E}),A=[];for(let{ws:E,meta:j}of c.values())if(j.channels.includes(T)&&!(D?.except&&E===D.except)&&!(D?.userIds&&!D.userIds.includes(j.userId))&&!(D?.clientIds&&!D.clientIds.includes(j.clientId))){if(E.readyState!==WebSocket.OPEN){A.push(E);continue}try{E.send(k),O++}catch{A.push(E)}}for(let T of A)c.delete(T);return A.length,O}function sendToUser(c,T,E,D){let O=0,k=encodeFrame$1({type:`event`,channel:E,data:D}),A=[];for(let{ws:D,meta:j}of c.values())if(j.userId===T&&j.channels.includes(E)){if(D.readyState!==WebSocket.OPEN){A.push(D);continue}try{D.send(k),O++}catch{A.push(D)}}for(let T of A)c.delete(T);return A.length,O}function getSessionCount(c){return c.size}function getConnectedUserIds(c){let T=new Set;for(let{meta:E}of c.values())T.add(E.userId);return Array.from(T)}function getUserSessions(c,T){let E=[];for(let{ws:D,meta:O}of c.values())O.userId===T&&E.push(D);return E}function getStorage(c){return c.storage}function sanitizeToClassName(c){return c.replace(/^\/+/,``).split(/[-_\/\s]+/).map(c=>c.replace(/[^a-zA-Z0-9]/g,``)).filter(c=>c.length>0).map(c=>c.charAt(0).toUpperCase()+c.slice(1).toLowerCase()).join(``)||`VeraniActor`}function createConfiguration(c){return function(T){return{locationHint:`me`,sockets:{upgradePath:c.websocketPath}}}}function isValidConnectionMeta(c){return!(!c||typeof c!=`object`||typeof c.userId!=`string`||!c.userId||typeof c.clientId!=`string`||!c.clientId||!Array.isArray(c.channels)||!c.channels.every(c=>typeof c==`string`))}function storeAttachment(c,T){c.serializeAttachment(T)}function restoreSessions(c){let T=0,E=0;for(let D of c.ctx.getWebSockets()){if(D.readyState!==WebSocket.OPEN){E++;continue}let O=D.deserializeAttachment();if(!O){E++;continue}if(!isValidConnectionMeta(O)){E++;continue}c.sessions.set(D,{ws:D,meta:O}),T++}}async function onInit(c,T){if(T.eventEmitter&&T._staticHandlers)try{T.eventEmitter.rebuildHandlers(T._staticHandlers)}catch{}try{restoreSessions(c)}catch{}if(T.onHibernationRestore&&c.sessions.size>0)try{await T.onHibernationRestore(c)}catch{}else T.onHibernationRestore&&c.sessions.size}function createUserEmitBuilder(c,T,E){return{emit(D,O){return sendToUser(T,c,E,{type:D,...O})}}}function createChannelEmitBuilder(c,T,E){return{emit(D,O){return broadcast(T,c,{type:D,...O},E)}}}function createSocketEmit(c){let T=c.meta.channels[0]||`default`;return{emit(E,D){if(c.ws.readyState===WebSocket.OPEN)try{let O={type:`event`,channel:T,data:{type:E,...D}};c.ws.send(encodeFrame$1(O))}catch{}},to(E){return c.meta.channels.includes(E)?createChannelEmitBuilder(E,c.actor.sessions,{except:c.ws}):createUserEmitBuilder(E,c.actor.sessions,T)}}}function createActorEmit(c){return{emit(T,E){let D={type:T,...E};return broadcast(c.sessions,`default`,D)},to(T){return createChannelEmitBuilder(T,c.sessions)}}}async function onWebSocketConnect(c,T,E,D){let O;try{O=T.extractMeta?await T.extractMeta(D):{userId:`anonymous`,clientId:crypto.randomUUID(),channels:[`default`]},storeAttachment(E,O);let k={actor:c,ws:E,meta:O,frame:{type:`connect`}};if(T.onConnect){let D={actor:c,ws:E,meta:O,emit:createSocketEmit(k)};await T.onConnect(D)}c.sessions.set(E,{ws:E,meta:O})}catch(D){if(T.onError&&O)try{let k={actor:c,ws:E,meta:O,frame:{type:`error`}};await T.onError(D,{actor:c,ws:E,meta:O,emit:createSocketEmit(k)})}catch{}E.close(1011,`Internal server error`)}}async function onWebSocketMessage(c,T,E,D){let O;try{let k=decodeFrame$1(D);if(k&&k.type===`ping`){if(E.readyState===WebSocket.OPEN)try{E.send(encodeFrame$1({type:`pong`}))}catch{}return}if(!k||k.type===`invalid`||(O=c.sessions.get(E),!O))return;let A={actor:c,ws:E,meta:O.meta,frame:k,emit:createSocketEmit({actor:c,ws:E,meta:O.meta,frame:k})},M=T.eventEmitter;M&&M.hasHandlers&&M.hasHandlers(k.type)?await M.emit(k.type,A,k.data||{}):T.onMessage&&await T.onMessage(A,k)}catch(D){if(T.onError&&O)try{await T.onError(D,{actor:c,ws:E,meta:O.meta,emit:createSocketEmit({actor:c,ws:E,meta:O.meta,frame:{type:`error`}})})}catch{}}}async function onWebSocketDisconnect(c,T,E){try{let D=c.sessions.get(E);if(c.sessions.delete(E),D&&T.onDisconnect){let O={actor:c,ws:E,meta:D.meta,frame:{type:`disconnect`}},k={actor:c,ws:E,meta:D.meta,emit:createSocketEmit(O)};await T.onDisconnect(k)}}catch{}}function createFetch(c,T){return async function(E){let D=new URL(E.url),O=E.headers.get(`Upgrade`);return D.pathname===c.websocketPath&&O===`websocket`&&await T.shouldUpgradeWebSocket(E)?T.onWebSocketUpgrade(E):T.onRequest(E)}}function createRpcChannelEmitBuilder(c,T){return{async emit(E,D){return c.emitToChannel(T,E,D)}}}function createRpcUserEmitBuilder(c,T,E=`default`){return{async emit(E,D){return c.emitToUser(T,E,D)}}}function createRpcEmitBuilder(c,T,E=`default`){let D=!1;for(let{meta:E}of c.sessions.values())if(E.channels.includes(T)){D=!0;break}return D?createRpcChannelEmitBuilder(c,T):createRpcUserEmitBuilder(c,T,E)}function createActorHandler(c){let E=sanitizeToClassName(c.name||c.websocketPath||`VeraniActor`);class D extends __cloudflare_actors.Actor{constructor(...T){super(...T),this.sessions=new Map,this.emit=createActorEmit(this),this.fetch=createFetch(c,this)}static{this.configuration=createConfiguration(c)}async shouldUpgradeWebSocket(c){return!0}async onInit(){await onInit(this,c)}async onWebSocketConnect(T,E){await onWebSocketConnect(this,c,T,E)}async onWebSocketMessage(T,E){await onWebSocketMessage(this,c,T,E)}async onWebSocketDisconnect(T){await onWebSocketDisconnect(this,c,T)}cleanupStaleSessions(){return cleanupStaleSessions(this.sessions)}broadcast(c,T,E){return broadcast(this.sessions,c,T,E)}getSessionCount(){return getSessionCount(this.sessions)}getConnectedUserIds(){return getConnectedUserIds(this.sessions)}getUserSessions(c){return getUserSessions(this.sessions,c)}sendToUser(c,T,E){return sendToUser(this.sessions,c,T,E)}emitToChannel(c,T,E){let D={type:T,...E};return broadcast(this.sessions,c,D)}emitToUser(c,T,E){let D={type:T,...E};return sendToUser(this.sessions,c,`default`,D)}toChannel(c){return createRpcChannelEmitBuilder(this,c)}toUser(c){return createRpcUserEmitBuilder(this,c)}to(c){return createRpcEmitBuilder(this,c)}getStorage(){return getStorage(this.ctx)}}return Object.defineProperty(D,`name`,{value:E,writable:!1,configurable:!0}),D}exports.PROTOCOL_VERSION=require_types.t,exports.createActorHandler=createActorHandler,exports.decodeClientMessage=require_types.a,exports.decodeFrame=require_types.o,exports.decodeServerMessage=require_types.s,exports.defineRoom=defineRoom,exports.encodeClientMessage=require_types.n,exports.encodeFrame=require_types.r,exports.encodeServerMessage=require_types.i,exports.restoreSessions=restoreSessions,exports.storeAttachment=storeAttachment;
+const require_types=require(`./types-083oWz55.cjs`);let __cloudflare_actors=require(`@cloudflare/actors`);var RoomEventEmitterImpl=class{constructor(){this.handlers=new Map}on(e,S){this.handlers.has(e)||this.handlers.set(e,new Set),this.handlers.get(e).add(S)}off(e,S){let C=this.handlers.get(e);C&&(S?(C.delete(S),C.size===0&&this.handlers.delete(e)):this.handlers.delete(e))}async emit(e,S,C){let w=this.handlers.get(e);if(w&&w.size>0){let e=[];for(let T of w)try{let w=T(S,C);w instanceof Promise&&e.push(w)}catch{}await Promise.all(e)}let T=this.handlers.get(`*`);if(T&&T.size>0){let e=[];for(let w of T)try{let T=w(S,C);T instanceof Promise&&e.push(T)}catch{}await Promise.all(e)}}hasHandlers(e){return this.handlers.has(e)&&this.handlers.get(e).size>0||this.handlers.has(`*`)&&this.handlers.get(`*`).size>0}getEventNames(){return Array.from(this.handlers.keys())}rebuildHandlers(e){this.handlers.clear();for(let[S,C]of e.entries())this.handlers.set(S,new Set(C))}};function createRoomEventEmitter(){return new RoomEventEmitterImpl}function defaultExtractMeta(e){let S=crypto.randomUUID(),C=crypto.randomUUID(),w=new URL(e.url).searchParams.get(`channels`);return{userId:S,clientId:C,channels:w?w.split(`,`).map(e=>e.trim()).filter(Boolean):[`default`]}}function defineRoom(e){let S=e.eventEmitter||createRoomEventEmitter(),C=e._staticHandlers||new Map;return{name:e.name,websocketPath:e.websocketPath,extractMeta:e.extractMeta||(e=>defaultExtractMeta(e)),onConnect:e.onConnect,onDisconnect:e.onDisconnect,onMessage:e.onMessage,onError:e.onError,onHibernationRestore:e.onHibernationRestore,eventEmitter:S,_staticHandlers:C,on(e,w){S.on(e,w),C.has(e)||C.set(e,new Set),C.get(e).add(w)},off(e,w){S.off(e,w);let T=C.get(e);T&&(w?(T.delete(w),T.size===0&&C.delete(e)):C.delete(e))}}}function cleanupStaleSessions(e){let S=0,C=[];for(let[S,w]of e.entries())S.readyState!==WebSocket.OPEN&&C.push(S);for(let w of C)e.delete(w),S++;return S}function decodeFrame$1(S){return require_types.o(S)??{type:`invalid`}}function encodeFrame$1(S){return require_types.r(S)}function broadcast(e,S,C,w){let T=0,E=encodeFrame$1({type:`event`,channel:S,data:C}),D=[];for(let{ws:C,meta:O}of e.values())if(O.channels.includes(S)&&!(w?.except&&C===w.except)&&!(w?.userIds&&!w.userIds.includes(O.userId))&&!(w?.clientIds&&!w.clientIds.includes(O.clientId))){if(C.readyState!==WebSocket.OPEN){D.push(C);continue}try{C.send(E),T++}catch{D.push(C)}}for(let S of D)e.delete(S);return D.length,T}function sendToUser(e,S,C,w){let T=0,E=encodeFrame$1({type:`event`,channel:C,data:w}),D=[];for(let{ws:w,meta:O}of e.values())if(O.userId===S&&O.channels.includes(C)){if(w.readyState!==WebSocket.OPEN){D.push(w);continue}try{w.send(E),T++}catch{D.push(w)}}for(let S of D)e.delete(S);return D.length,T}function getSessionCount(e){return e.size}function getConnectedUserIds(e){let S=new Set;for(let{meta:C}of e.values())S.add(C.userId);return Array.from(S)}function getUserSessions(e,S){let C=[];for(let{ws:w,meta:T}of e.values())T.userId===S&&C.push(w);return C}function getStorage(e){return e.storage}function sanitizeToClassName(e){return e.replace(/^\/+/,``).split(/[-_\/\s]+/).map(e=>e.replace(/[^a-zA-Z0-9]/g,``)).filter(e=>e.length>0).map(e=>e.charAt(0).toUpperCase()+e.slice(1).toLowerCase()).join(``)||`VeraniActor`}function createConfiguration(e){return function(S){return{locationHint:`me`,sockets:{upgradePath:e.websocketPath}}}}function isValidConnectionMeta(e){return!(!e||typeof e!=`object`||typeof e.userId!=`string`||!e.userId||typeof e.clientId!=`string`||!e.clientId||!Array.isArray(e.channels)||!e.channels.every(e=>typeof e==`string`))}function storeAttachment(e,S){e.serializeAttachment(S)}function restoreSessions(e){let S=0,C=0;for(let w of e.ctx.getWebSockets()){if(w.readyState!==WebSocket.OPEN){C++;continue}let T=w.deserializeAttachment();if(!T){C++;continue}if(!isValidConnectionMeta(T)){C++;continue}e.sessions.set(w,{ws:w,meta:T}),S++}}async function onInit(e,S){if(S.eventEmitter&&S._staticHandlers)try{S.eventEmitter.rebuildHandlers(S._staticHandlers)}catch{}try{restoreSessions(e)}catch{}if(S.onHibernationRestore&&e.sessions.size>0)try{await S.onHibernationRestore(e)}catch{}else S.onHibernationRestore&&e.sessions.size}function createUserEmitBuilder(e,S,C){return{emit(w,T){return sendToUser(S,e,C,{type:w,...T})}}}function createChannelEmitBuilder(e,S,C){return{emit(w,T){return broadcast(S,e,{type:w,...T},C)}}}function createSocketEmit(e){let S=e.meta.channels[0]||`default`;return{emit(C,w){if(e.ws.readyState===WebSocket.OPEN)try{let T={type:`event`,channel:S,data:{type:C,...w}};e.ws.send(encodeFrame$1(T))}catch{}},to(C){return e.meta.channels.includes(C)?createChannelEmitBuilder(C,e.actor.sessions,{except:e.ws}):createUserEmitBuilder(C,e.actor.sessions,S)}}}function createActorEmit(e){return{emit(S,C){let w={type:S,...C};return broadcast(e.sessions,`default`,w)},to(S){return createChannelEmitBuilder(S,e.sessions)}}}async function onWebSocketConnect(e,S,C,w){let T;try{T=S.extractMeta?await S.extractMeta(w):{userId:`anonymous`,clientId:crypto.randomUUID(),channels:[`default`]},storeAttachment(C,T);let E={actor:e,ws:C,meta:T,frame:{type:`connect`}};if(S.onConnect){let w={actor:e,ws:C,meta:T,emit:createSocketEmit(E)};await S.onConnect(w)}e.sessions.set(C,{ws:C,meta:T})}catch(w){if(S.onError&&T)try{let E={actor:e,ws:C,meta:T,frame:{type:`error`}};await S.onError(w,{actor:e,ws:C,meta:T,emit:createSocketEmit(E)})}catch{}C.close(1011,`Internal server error`)}}async function onWebSocketMessage(e,S,C,w){let T;try{let E=decodeFrame$1(w);if(E&&E.type===`ping`){if(C.readyState===WebSocket.OPEN)try{C.send(encodeFrame$1({type:`pong`}))}catch{}return}if(!E||E.type===`invalid`||(T=e.sessions.get(C),!T))return;let D={actor:e,ws:C,meta:T.meta,frame:E,emit:createSocketEmit({actor:e,ws:C,meta:T.meta,frame:E})},k=S.eventEmitter;k&&k.hasHandlers&&k.hasHandlers(E.type)?await k.emit(E.type,D,E.data||{}):S.onMessage&&await S.onMessage(D,E)}catch(w){if(S.onError&&T)try{await S.onError(w,{actor:e,ws:C,meta:T.meta,emit:createSocketEmit({actor:e,ws:C,meta:T.meta,frame:{type:`error`}})})}catch{}}}async function onWebSocketDisconnect(e,S,C){try{let w=e.sessions.get(C);if(e.sessions.delete(C),w&&S.onDisconnect){let T={actor:e,ws:C,meta:w.meta,frame:{type:`disconnect`}},E={actor:e,ws:C,meta:w.meta,emit:createSocketEmit(T)};await S.onDisconnect(E)}}catch{}}function createFetch(e,S){return async function(C){let w=new URL(C.url),T=C.headers.get(`Upgrade`);return w.pathname===e.websocketPath&&T===`websocket`&&await S.shouldUpgradeWebSocket(C)?S.onWebSocketUpgrade(C):S.onRequest(C)}}function createActorHandler(e){let C=sanitizeToClassName(e.name||e.websocketPath||`VeraniActor`);class w extends __cloudflare_actors.Actor{constructor(...S){super(...S),this.sessions=new Map,this.emit=createActorEmit(this),this.fetch=createFetch(e,this)}static{this.configuration=createConfiguration(e)}async shouldUpgradeWebSocket(e){return!0}async onInit(){await onInit(this,e)}async onWebSocketConnect(S,C){await onWebSocketConnect(this,e,S,C)}async onWebSocketMessage(S,C){await onWebSocketMessage(this,e,S,C)}async onWebSocketDisconnect(S){await onWebSocketDisconnect(this,e,S)}cleanupStaleSessions(){return cleanupStaleSessions(this.sessions)}broadcast(e,S,C){return broadcast(this.sessions,e,S,C)}getSessionCount(){return getSessionCount(this.sessions)}getConnectedUserIds(){return getConnectedUserIds(this.sessions)}getUserSessions(e){return getUserSessions(this.sessions,e)}sendToUser(e,S,C){return sendToUser(this.sessions,e,S,C)}emitToChannel(e,S,C){let w={type:S,...C};return broadcast(this.sessions,e,w)}emitToUser(e,S,C){let w={type:S,...C};return sendToUser(this.sessions,e,`default`,w)}getStorage(){return getStorage(this.ctx)}}return Object.defineProperty(w,`name`,{value:C,writable:!1,configurable:!0}),w}exports.PROTOCOL_VERSION=require_types.t,exports.createActorHandler=createActorHandler,exports.decodeClientMessage=require_types.a,exports.decodeFrame=require_types.o,exports.decodeServerMessage=require_types.s,exports.defineRoom=defineRoom,exports.encodeClientMessage=require_types.n,exports.encodeFrame=require_types.r,exports.encodeServerMessage=require_types.i,exports.restoreSessions=restoreSessions,exports.storeAttachment=storeAttachment;

package/dist/verani.d.cts

@@ -168,19 +168,6 @@ interface ActorEmit<TMeta extends ConnectionMeta = ConnectionMeta, E = unknown>
    */
   to(channel: string): EmitBuilder<TMeta, E>;
 }
-/**
- * RPC-safe emit builder interface for use over RPC calls.
- * Used by ActorStub to provide Socket.IO-like emit API over RPC.
- */
-interface RpcEmitBuilder {
-  /**
-   * Emit an event to the targeted scope (channel or user)
-   * @param event - Event name
-   * @param data - Event data
-   * @returns Promise resolving to the number of connections that received the message
-   */
-  emit(event: string, data?: any): Promise<number>;
-}
 /**
  * Context provided to room lifecycle hooks
  */
@@ -305,26 +292,31 @@ interface ActorStub {
    */
   fetch(request: Request): Promise<Response>;
   /**
-   * Socket.IO-like emit API: Get a builder for emitting to a specific channel.
-   * Use `toChannel("default").emit(event, data)` to emit to the default channel.
-   * @param channel - Channel name
-   * @returns Promise resolving to an emit builder
-   */
-  toChannel(channel: string): Promise<RpcEmitBuilder>;
-  /**
-   * Socket.IO-like emit API: Get a builder for emitting to a specific user.
-   * @param userId - User ID
-   * @returns Promise resolving to an emit builder
+   * Socket.IO-like emit API: Emit an event to a specific channel via RPC.
+   * @param channel - Channel name to emit to
+   * @param event - Event name
+   * @param data - Event data
+   * @returns Promise resolving to the number of connections that received the message
+   * @example
+   * ```typescript
+   * await stub.emitToChannel("default", "announcement", { text: "Hello!" });
+   * ```
    */
-  toUser(userId: string): Promise<RpcEmitBuilder>;
+  emitToChannel(channel: string, event: string, data?: any): Promise<number>;
   /**
-   * Socket.IO-like emit API: Get a builder with smart routing (channel or user).
-   * @param target - Channel name or user ID
-   * @returns Promise resolving to an emit builder
+   * Socket.IO-like emit API: Emit an event to a specific user (all their sessions) via RPC.
+   * @param userId - User ID to emit to
+   * @param event - Event name
+   * @param data - Event data
+   * @returns Promise resolving to the number of sessions that received the message
+   * @example
+   * ```typescript
+   * await stub.emitToUser("alice", "notification", { message: "Hello!" });
+   * ```
    */
-  to(target: string): Promise<RpcEmitBuilder>;
+  emitToUser(userId: string, event: string, data?: any): Promise<number>;
   /**
-   * @deprecated Use `emit()` or `toChannel().emit()` instead for Socket.IO-like API.
+   * @deprecated Use `emitToUser()` instead for Socket.IO-like API.
    * Sends a message to a specific user (all their sessions) via RPC.
    * @param userId - The user ID to send to
    * @param channel - The channel to send to
@@ -333,7 +325,7 @@ interface ActorStub {
    */
   sendToUser(userId: string, channel: string, data?: any): Promise<number>;
   /**
-   * @deprecated Use `emit()` or `toChannel().emit()` instead for Socket.IO-like API.
+   * @deprecated Use `emitToChannel()` instead for Socket.IO-like API.
    * Broadcasts a message to all connections in a channel via RPC.
    * Note: The `except` option from BroadcastOptions is not available over RPC
    * since WebSocket cannot be serialized.

package/dist/verani.d.mts

@@ -168,19 +168,6 @@ interface ActorEmit<TMeta extends ConnectionMeta = ConnectionMeta, E = unknown>
    */
   to(channel: string): EmitBuilder<TMeta, E>;
 }
-/**
- * RPC-safe emit builder interface for use over RPC calls.
- * Used by ActorStub to provide Socket.IO-like emit API over RPC.
- */
-interface RpcEmitBuilder {
-  /**
-   * Emit an event to the targeted scope (channel or user)
-   * @param event - Event name
-   * @param data - Event data
-   * @returns Promise resolving to the number of connections that received the message
-   */
-  emit(event: string, data?: any): Promise<number>;
-}
 /**
  * Context provided to room lifecycle hooks
  */
@@ -305,26 +292,31 @@ interface ActorStub {
    */
   fetch(request: Request): Promise<Response>;
   /**
-   * Socket.IO-like emit API: Get a builder for emitting to a specific channel.
-   * Use `toChannel("default").emit(event, data)` to emit to the default channel.
-   * @param channel - Channel name
-   * @returns Promise resolving to an emit builder
-   */
-  toChannel(channel: string): Promise<RpcEmitBuilder>;
-  /**
-   * Socket.IO-like emit API: Get a builder for emitting to a specific user.
-   * @param userId - User ID
-   * @returns Promise resolving to an emit builder
+   * Socket.IO-like emit API: Emit an event to a specific channel via RPC.
+   * @param channel - Channel name to emit to
+   * @param event - Event name
+   * @param data - Event data
+   * @returns Promise resolving to the number of connections that received the message
+   * @example
+   * ```typescript
+   * await stub.emitToChannel("default", "announcement", { text: "Hello!" });
+   * ```
    */
-  toUser(userId: string): Promise<RpcEmitBuilder>;
+  emitToChannel(channel: string, event: string, data?: any): Promise<number>;
   /**
-   * Socket.IO-like emit API: Get a builder with smart routing (channel or user).
-   * @param target - Channel name or user ID
-   * @returns Promise resolving to an emit builder
+   * Socket.IO-like emit API: Emit an event to a specific user (all their sessions) via RPC.
+   * @param userId - User ID to emit to
+   * @param event - Event name
+   * @param data - Event data
+   * @returns Promise resolving to the number of sessions that received the message
+   * @example
+   * ```typescript
+   * await stub.emitToUser("alice", "notification", { message: "Hello!" });
+   * ```
    */
-  to(target: string): Promise<RpcEmitBuilder>;
+  emitToUser(userId: string, event: string, data?: any): Promise<number>;
   /**
-   * @deprecated Use `emit()` or `toChannel().emit()` instead for Socket.IO-like API.
+   * @deprecated Use `emitToUser()` instead for Socket.IO-like API.
    * Sends a message to a specific user (all their sessions) via RPC.
    * @param userId - The user ID to send to
    * @param channel - The channel to send to
@@ -333,7 +325,7 @@ interface ActorStub {
    */
   sendToUser(userId: string, channel: string, data?: any): Promise<number>;
   /**
-   * @deprecated Use `emit()` or `toChannel().emit()` instead for Socket.IO-like API.
+   * @deprecated Use `emitToChannel()` instead for Socket.IO-like API.
    * Broadcasts a message to all connections in a channel via RPC.
    * Note: The `except` option from BroadcastOptions is not available over RPC
    * since WebSocket cannot be serialized.

package/dist/verani.mjs

@@ -1 +1 @@
-import{a as decodeClientMessage,i as encodeServerMessage,n as encodeClientMessage,o as decodeFrame,r as encodeFrame,s as decodeServerMessage,t as PROTOCOL_VERSION}from"./types-CJLnZrA8.mjs";import{Actor}from"@cloudflare/actors";var RoomEventEmitterImpl=class{constructor(){this.handlers=new Map}on(u,M){this.handlers.has(u)||this.handlers.set(u,new Set),this.handlers.get(u).add(M)}off(u,M){let N=this.handlers.get(u);N&&(M?(N.delete(M),N.size===0&&this.handlers.delete(u)):this.handlers.delete(u))}async emit(u,M,N){let P=this.handlers.get(u);if(P&&P.size>0){let u=[];for(let F of P)try{let P=F(M,N);P instanceof Promise&&u.push(P)}catch{}await Promise.all(u)}let F=this.handlers.get(`*`);if(F&&F.size>0){let u=[];for(let P of F)try{let F=P(M,N);F instanceof Promise&&u.push(F)}catch{}await Promise.all(u)}}hasHandlers(u){return this.handlers.has(u)&&this.handlers.get(u).size>0||this.handlers.has(`*`)&&this.handlers.get(`*`).size>0}getEventNames(){return Array.from(this.handlers.keys())}rebuildHandlers(u){this.handlers.clear();for(let[M,N]of u.entries())this.handlers.set(M,new Set(N))}};function createRoomEventEmitter(){return new RoomEventEmitterImpl}function defaultExtractMeta(u){let M=crypto.randomUUID(),N=crypto.randomUUID(),P=new URL(u.url).searchParams.get(`channels`);return{userId:M,clientId:N,channels:P?P.split(`,`).map(u=>u.trim()).filter(Boolean):[`default`]}}function defineRoom(u){let M=u.eventEmitter||createRoomEventEmitter(),N=u._staticHandlers||new Map;return{name:u.name,websocketPath:u.websocketPath,extractMeta:u.extractMeta||(u=>defaultExtractMeta(u)),onConnect:u.onConnect,onDisconnect:u.onDisconnect,onMessage:u.onMessage,onError:u.onError,onHibernationRestore:u.onHibernationRestore,eventEmitter:M,_staticHandlers:N,on(u,P){M.on(u,P),N.has(u)||N.set(u,new Set),N.get(u).add(P)},off(u,P){M.off(u,P);let F=N.get(u);F&&(P?(F.delete(P),F.size===0&&N.delete(u)):N.delete(u))}}}function cleanupStaleSessions(u){let M=0,N=[];for(let[M,P]of u.entries())M.readyState!==WebSocket.OPEN&&N.push(M);for(let P of N)u.delete(P),M++;return M}function decodeFrame$1(u){return decodeFrame(u)??{type:`invalid`}}function encodeFrame$1(u){return encodeFrame(u)}function broadcast(u,M,N,P){let F=0,I=encodeFrame$1({type:`event`,channel:M,data:N}),L=[];for(let{ws:N,meta:R}of u.values())if(R.channels.includes(M)&&!(P?.except&&N===P.except)&&!(P?.userIds&&!P.userIds.includes(R.userId))&&!(P?.clientIds&&!P.clientIds.includes(R.clientId))){if(N.readyState!==WebSocket.OPEN){L.push(N);continue}try{N.send(I),F++}catch{L.push(N)}}for(let M of L)u.delete(M);return L.length,F}function sendToUser(u,M,N,P){let F=0,I=encodeFrame$1({type:`event`,channel:N,data:P}),L=[];for(let{ws:P,meta:R}of u.values())if(R.userId===M&&R.channels.includes(N)){if(P.readyState!==WebSocket.OPEN){L.push(P);continue}try{P.send(I),F++}catch{L.push(P)}}for(let M of L)u.delete(M);return L.length,F}function getSessionCount(u){return u.size}function getConnectedUserIds(u){let M=new Set;for(let{meta:N}of u.values())M.add(N.userId);return Array.from(M)}function getUserSessions(u,M){let N=[];for(let{ws:P,meta:F}of u.values())F.userId===M&&N.push(P);return N}function getStorage(u){return u.storage}function sanitizeToClassName(u){return u.replace(/^\/+/,``).split(/[-_\/\s]+/).map(u=>u.replace(/[^a-zA-Z0-9]/g,``)).filter(u=>u.length>0).map(u=>u.charAt(0).toUpperCase()+u.slice(1).toLowerCase()).join(``)||`VeraniActor`}function createConfiguration(u){return function(M){return{locationHint:`me`,sockets:{upgradePath:u.websocketPath}}}}function isValidConnectionMeta(u){return!(!u||typeof u!=`object`||typeof u.userId!=`string`||!u.userId||typeof u.clientId!=`string`||!u.clientId||!Array.isArray(u.channels)||!u.channels.every(u=>typeof u==`string`))}function storeAttachment(u,M){u.serializeAttachment(M)}function restoreSessions(u){let M=0,N=0;for(let P of u.ctx.getWebSockets()){if(P.readyState!==WebSocket.OPEN){N++;continue}let F=P.deserializeAttachment();if(!F){N++;continue}if(!isValidConnectionMeta(F)){N++;continue}u.sessions.set(P,{ws:P,meta:F}),M++}}async function onInit(u,M){if(M.eventEmitter&&M._staticHandlers)try{M.eventEmitter.rebuildHandlers(M._staticHandlers)}catch{}try{restoreSessions(u)}catch{}if(M.onHibernationRestore&&u.sessions.size>0)try{await M.onHibernationRestore(u)}catch{}else M.onHibernationRestore&&u.sessions.size}function createUserEmitBuilder(u,M,N){return{emit(P,F){return sendToUser(M,u,N,{type:P,...F})}}}function createChannelEmitBuilder(u,M,N){return{emit(P,F){return broadcast(M,u,{type:P,...F},N)}}}function createSocketEmit(u){let M=u.meta.channels[0]||`default`;return{emit(N,P){if(u.ws.readyState===WebSocket.OPEN)try{let F={type:`event`,channel:M,data:{type:N,...P}};u.ws.send(encodeFrame$1(F))}catch{}},to(N){return u.meta.channels.includes(N)?createChannelEmitBuilder(N,u.actor.sessions,{except:u.ws}):createUserEmitBuilder(N,u.actor.sessions,M)}}}function createActorEmit(u){return{emit(M,N){let P={type:M,...N};return broadcast(u.sessions,`default`,P)},to(M){return createChannelEmitBuilder(M,u.sessions)}}}async function onWebSocketConnect(u,M,N,P){let F;try{F=M.extractMeta?await M.extractMeta(P):{userId:`anonymous`,clientId:crypto.randomUUID(),channels:[`default`]},storeAttachment(N,F);let I={actor:u,ws:N,meta:F,frame:{type:`connect`}};if(M.onConnect){let P={actor:u,ws:N,meta:F,emit:createSocketEmit(I)};await M.onConnect(P)}u.sessions.set(N,{ws:N,meta:F})}catch(P){if(M.onError&&F)try{let I={actor:u,ws:N,meta:F,frame:{type:`error`}};await M.onError(P,{actor:u,ws:N,meta:F,emit:createSocketEmit(I)})}catch{}N.close(1011,`Internal server error`)}}async function onWebSocketMessage(u,M,N,P){let F;try{let I=decodeFrame$1(P);if(I&&I.type===`ping`){if(N.readyState===WebSocket.OPEN)try{N.send(encodeFrame$1({type:`pong`}))}catch{}return}if(!I||I.type===`invalid`||(F=u.sessions.get(N),!F))return;let L={actor:u,ws:N,meta:F.meta,frame:I,emit:createSocketEmit({actor:u,ws:N,meta:F.meta,frame:I})},R=M.eventEmitter;R&&R.hasHandlers&&R.hasHandlers(I.type)?await R.emit(I.type,L,I.data||{}):M.onMessage&&await M.onMessage(L,I)}catch(P){if(M.onError&&F)try{await M.onError(P,{actor:u,ws:N,meta:F.meta,emit:createSocketEmit({actor:u,ws:N,meta:F.meta,frame:{type:`error`}})})}catch{}}}async function onWebSocketDisconnect(u,M,N){try{let P=u.sessions.get(N);if(u.sessions.delete(N),P&&M.onDisconnect){let F={actor:u,ws:N,meta:P.meta,frame:{type:`disconnect`}},I={actor:u,ws:N,meta:P.meta,emit:createSocketEmit(F)};await M.onDisconnect(I)}}catch{}}function createFetch(u,M){return async function(N){let P=new URL(N.url),F=N.headers.get(`Upgrade`);return P.pathname===u.websocketPath&&F===`websocket`&&await M.shouldUpgradeWebSocket(N)?M.onWebSocketUpgrade(N):M.onRequest(N)}}function createRpcChannelEmitBuilder(u,M){return{async emit(N,P){return u.emitToChannel(M,N,P)}}}function createRpcUserEmitBuilder(u,M,N=`default`){return{async emit(N,P){return u.emitToUser(M,N,P)}}}function createRpcEmitBuilder(u,M,N=`default`){let P=!1;for(let{meta:N}of u.sessions.values())if(N.channels.includes(M)){P=!0;break}return P?createRpcChannelEmitBuilder(u,M):createRpcUserEmitBuilder(u,M,N)}function createActorHandler(u){let M=sanitizeToClassName(u.name||u.websocketPath||`VeraniActor`);class N extends Actor{constructor(...M){super(...M),this.sessions=new Map,this.emit=createActorEmit(this),this.fetch=createFetch(u,this)}static{this.configuration=createConfiguration(u)}async shouldUpgradeWebSocket(u){return!0}async onInit(){await onInit(this,u)}async onWebSocketConnect(M,N){await onWebSocketConnect(this,u,M,N)}async onWebSocketMessage(M,N){await onWebSocketMessage(this,u,M,N)}async onWebSocketDisconnect(M){await onWebSocketDisconnect(this,u,M)}cleanupStaleSessions(){return cleanupStaleSessions(this.sessions)}broadcast(u,M,N){return broadcast(this.sessions,u,M,N)}getSessionCount(){return getSessionCount(this.sessions)}getConnectedUserIds(){return getConnectedUserIds(this.sessions)}getUserSessions(u){return getUserSessions(this.sessions,u)}sendToUser(u,M,N){return sendToUser(this.sessions,u,M,N)}emitToChannel(u,M,N){let P={type:M,...N};return broadcast(this.sessions,u,P)}emitToUser(u,M,N){let P={type:M,...N};return sendToUser(this.sessions,u,`default`,P)}toChannel(u){return createRpcChannelEmitBuilder(this,u)}toUser(u){return createRpcUserEmitBuilder(this,u)}to(u){return createRpcEmitBuilder(this,u)}getStorage(){return getStorage(this.ctx)}}return Object.defineProperty(N,`name`,{value:M,writable:!1,configurable:!0}),N}export{PROTOCOL_VERSION,createActorHandler,decodeClientMessage,decodeFrame,decodeServerMessage,defineRoom,encodeClientMessage,encodeFrame,encodeServerMessage,restoreSessions,storeAttachment};
+import{a as decodeClientMessage,i as encodeServerMessage,n as encodeClientMessage,o as decodeFrame,r as encodeFrame,s as decodeServerMessage,t as PROTOCOL_VERSION}from"./types-CJLnZrA8.mjs";import{Actor}from"@cloudflare/actors";var RoomEventEmitterImpl=class{constructor(){this.handlers=new Map}on(u,k){this.handlers.has(u)||this.handlers.set(u,new Set),this.handlers.get(u).add(k)}off(u,k){let A=this.handlers.get(u);A&&(k?(A.delete(k),A.size===0&&this.handlers.delete(u)):this.handlers.delete(u))}async emit(u,k,A){let j=this.handlers.get(u);if(j&&j.size>0){let u=[];for(let M of j)try{let j=M(k,A);j instanceof Promise&&u.push(j)}catch{}await Promise.all(u)}let M=this.handlers.get(`*`);if(M&&M.size>0){let u=[];for(let j of M)try{let M=j(k,A);M instanceof Promise&&u.push(M)}catch{}await Promise.all(u)}}hasHandlers(u){return this.handlers.has(u)&&this.handlers.get(u).size>0||this.handlers.has(`*`)&&this.handlers.get(`*`).size>0}getEventNames(){return Array.from(this.handlers.keys())}rebuildHandlers(u){this.handlers.clear();for(let[k,A]of u.entries())this.handlers.set(k,new Set(A))}};function createRoomEventEmitter(){return new RoomEventEmitterImpl}function defaultExtractMeta(u){let k=crypto.randomUUID(),A=crypto.randomUUID(),j=new URL(u.url).searchParams.get(`channels`);return{userId:k,clientId:A,channels:j?j.split(`,`).map(u=>u.trim()).filter(Boolean):[`default`]}}function defineRoom(u){let k=u.eventEmitter||createRoomEventEmitter(),A=u._staticHandlers||new Map;return{name:u.name,websocketPath:u.websocketPath,extractMeta:u.extractMeta||(u=>defaultExtractMeta(u)),onConnect:u.onConnect,onDisconnect:u.onDisconnect,onMessage:u.onMessage,onError:u.onError,onHibernationRestore:u.onHibernationRestore,eventEmitter:k,_staticHandlers:A,on(u,j){k.on(u,j),A.has(u)||A.set(u,new Set),A.get(u).add(j)},off(u,j){k.off(u,j);let M=A.get(u);M&&(j?(M.delete(j),M.size===0&&A.delete(u)):A.delete(u))}}}function cleanupStaleSessions(u){let k=0,A=[];for(let[k,j]of u.entries())k.readyState!==WebSocket.OPEN&&A.push(k);for(let j of A)u.delete(j),k++;return k}function decodeFrame$1(u){return decodeFrame(u)??{type:`invalid`}}function encodeFrame$1(u){return encodeFrame(u)}function broadcast(u,k,A,j){let M=0,N=encodeFrame$1({type:`event`,channel:k,data:A}),P=[];for(let{ws:A,meta:F}of u.values())if(F.channels.includes(k)&&!(j?.except&&A===j.except)&&!(j?.userIds&&!j.userIds.includes(F.userId))&&!(j?.clientIds&&!j.clientIds.includes(F.clientId))){if(A.readyState!==WebSocket.OPEN){P.push(A);continue}try{A.send(N),M++}catch{P.push(A)}}for(let k of P)u.delete(k);return P.length,M}function sendToUser(u,k,A,j){let M=0,N=encodeFrame$1({type:`event`,channel:A,data:j}),P=[];for(let{ws:j,meta:F}of u.values())if(F.userId===k&&F.channels.includes(A)){if(j.readyState!==WebSocket.OPEN){P.push(j);continue}try{j.send(N),M++}catch{P.push(j)}}for(let k of P)u.delete(k);return P.length,M}function getSessionCount(u){return u.size}function getConnectedUserIds(u){let k=new Set;for(let{meta:A}of u.values())k.add(A.userId);return Array.from(k)}function getUserSessions(u,k){let A=[];for(let{ws:j,meta:M}of u.values())M.userId===k&&A.push(j);return A}function getStorage(u){return u.storage}function sanitizeToClassName(u){return u.replace(/^\/+/,``).split(/[-_\/\s]+/).map(u=>u.replace(/[^a-zA-Z0-9]/g,``)).filter(u=>u.length>0).map(u=>u.charAt(0).toUpperCase()+u.slice(1).toLowerCase()).join(``)||`VeraniActor`}function createConfiguration(u){return function(k){return{locationHint:`me`,sockets:{upgradePath:u.websocketPath}}}}function isValidConnectionMeta(u){return!(!u||typeof u!=`object`||typeof u.userId!=`string`||!u.userId||typeof u.clientId!=`string`||!u.clientId||!Array.isArray(u.channels)||!u.channels.every(u=>typeof u==`string`))}function storeAttachment(u,k){u.serializeAttachment(k)}function restoreSessions(u){let k=0,A=0;for(let j of u.ctx.getWebSockets()){if(j.readyState!==WebSocket.OPEN){A++;continue}let M=j.deserializeAttachment();if(!M){A++;continue}if(!isValidConnectionMeta(M)){A++;continue}u.sessions.set(j,{ws:j,meta:M}),k++}}async function onInit(u,k){if(k.eventEmitter&&k._staticHandlers)try{k.eventEmitter.rebuildHandlers(k._staticHandlers)}catch{}try{restoreSessions(u)}catch{}if(k.onHibernationRestore&&u.sessions.size>0)try{await k.onHibernationRestore(u)}catch{}else k.onHibernationRestore&&u.sessions.size}function createUserEmitBuilder(u,k,A){return{emit(j,M){return sendToUser(k,u,A,{type:j,...M})}}}function createChannelEmitBuilder(u,k,A){return{emit(j,M){return broadcast(k,u,{type:j,...M},A)}}}function createSocketEmit(u){let k=u.meta.channels[0]||`default`;return{emit(A,j){if(u.ws.readyState===WebSocket.OPEN)try{let M={type:`event`,channel:k,data:{type:A,...j}};u.ws.send(encodeFrame$1(M))}catch{}},to(A){return u.meta.channels.includes(A)?createChannelEmitBuilder(A,u.actor.sessions,{except:u.ws}):createUserEmitBuilder(A,u.actor.sessions,k)}}}function createActorEmit(u){return{emit(k,A){let j={type:k,...A};return broadcast(u.sessions,`default`,j)},to(k){return createChannelEmitBuilder(k,u.sessions)}}}async function onWebSocketConnect(u,k,A,j){let M;try{M=k.extractMeta?await k.extractMeta(j):{userId:`anonymous`,clientId:crypto.randomUUID(),channels:[`default`]},storeAttachment(A,M);let N={actor:u,ws:A,meta:M,frame:{type:`connect`}};if(k.onConnect){let j={actor:u,ws:A,meta:M,emit:createSocketEmit(N)};await k.onConnect(j)}u.sessions.set(A,{ws:A,meta:M})}catch(j){if(k.onError&&M)try{let N={actor:u,ws:A,meta:M,frame:{type:`error`}};await k.onError(j,{actor:u,ws:A,meta:M,emit:createSocketEmit(N)})}catch{}A.close(1011,`Internal server error`)}}async function onWebSocketMessage(u,k,A,j){let M;try{let N=decodeFrame$1(j);if(N&&N.type===`ping`){if(A.readyState===WebSocket.OPEN)try{A.send(encodeFrame$1({type:`pong`}))}catch{}return}if(!N||N.type===`invalid`||(M=u.sessions.get(A),!M))return;let P={actor:u,ws:A,meta:M.meta,frame:N,emit:createSocketEmit({actor:u,ws:A,meta:M.meta,frame:N})},F=k.eventEmitter;F&&F.hasHandlers&&F.hasHandlers(N.type)?await F.emit(N.type,P,N.data||{}):k.onMessage&&await k.onMessage(P,N)}catch(j){if(k.onError&&M)try{await k.onError(j,{actor:u,ws:A,meta:M.meta,emit:createSocketEmit({actor:u,ws:A,meta:M.meta,frame:{type:`error`}})})}catch{}}}async function onWebSocketDisconnect(u,k,A){try{let j=u.sessions.get(A);if(u.sessions.delete(A),j&&k.onDisconnect){let M={actor:u,ws:A,meta:j.meta,frame:{type:`disconnect`}},N={actor:u,ws:A,meta:j.meta,emit:createSocketEmit(M)};await k.onDisconnect(N)}}catch{}}function createFetch(u,k){return async function(A){let j=new URL(A.url),M=A.headers.get(`Upgrade`);return j.pathname===u.websocketPath&&M===`websocket`&&await k.shouldUpgradeWebSocket(A)?k.onWebSocketUpgrade(A):k.onRequest(A)}}function createActorHandler(u){let k=sanitizeToClassName(u.name||u.websocketPath||`VeraniActor`);class A extends Actor{constructor(...k){super(...k),this.sessions=new Map,this.emit=createActorEmit(this),this.fetch=createFetch(u,this)}static{this.configuration=createConfiguration(u)}async shouldUpgradeWebSocket(u){return!0}async onInit(){await onInit(this,u)}async onWebSocketConnect(k,A){await onWebSocketConnect(this,u,k,A)}async onWebSocketMessage(k,A){await onWebSocketMessage(this,u,k,A)}async onWebSocketDisconnect(k){await onWebSocketDisconnect(this,u,k)}cleanupStaleSessions(){return cleanupStaleSessions(this.sessions)}broadcast(u,k,A){return broadcast(this.sessions,u,k,A)}getSessionCount(){return getSessionCount(this.sessions)}getConnectedUserIds(){return getConnectedUserIds(this.sessions)}getUserSessions(u){return getUserSessions(this.sessions,u)}sendToUser(u,k,A){return sendToUser(this.sessions,u,k,A)}emitToChannel(u,k,A){let j={type:k,...A};return broadcast(this.sessions,u,j)}emitToUser(u,k,A){let j={type:k,...A};return sendToUser(this.sessions,u,`default`,j)}getStorage(){return getStorage(this.ctx)}}return Object.defineProperty(A,`name`,{value:k,writable:!1,configurable:!0}),A}export{PROTOCOL_VERSION,createActorHandler,decodeClientMessage,decodeFrame,decodeServerMessage,defineRoom,encodeClientMessage,encodeFrame,encodeServerMessage,restoreSessions,storeAttachment};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "verani",
-	"version": "0.4.6",
+	"version": "0.5.1",
 	"description": "A simple, focused realtime SDK for Cloudflare Actors with Socket.io-like semantics",
 	"license": "ISC",
 	"keywords": [