dispatchMessage now notifies on onError callback if the session is finished. Previously it threw an error, making mandatory to wrap dispatchMessage methods with try/catch.

Error callbacks have been refactored to return an Error instead of string.

Author: hyperandroid

build/src/automata.d.ts

@@ -26,14 +26,14 @@ export interface FSMJson {
     transition: TransitionJson[];
 }
 export declare type SessionMessageCallback = <T>(session: Session<T>, message?: Message) => void;
-export declare type SessionMessageCallbackError = <T>(session: Session<T>, message?: string) => void;
+export declare type SessionMessageCallbackError = <T>(session: Session<T>, message?: Error) => void;
 export declare class SessionConsumeMessagePromise<T> {
     _success: SessionMessageCallback;
     _error: SessionMessageCallbackError;
     constructor();
     then(ok: SessionMessageCallback, error?: SessionMessageCallbackError): this;
     __success(s: Session<T>, m: Message): void;
-    __error(s: Session<T>, message?: string): void;
+    __error(s: Session<T>, message?: Error): void;
 }
 export declare class FSMRegistry {
     static _fsm: GenericMap<FSM>;

build/src/automata.js

@@ -1,3 +1,15 @@
+06-08-2016 *3.0.2*
+------------------
+
+`dispatchMessage` now notifies on `onError` callback if the session is finished. Previously it threw an error, making mandatory to wrap dispatchMessage methods with try/catch.
+Error callbacks have been refactored to return an Error instead of string.
+
+
+04-15/2016 *3.0.1*
+------------------
+
+* Changed error callback function to accept an Error instead of a String.
+
 04-15/2016 *3.0.0*
 ------------------
 
@@ -81,4 +93,4 @@ Major changes.
 ------------------
 
 * published module 1.0.4
-* added onEnter/onExit on subState.
+* added onEnter/onExit on subState.

build/src/automata.js.map

@@ -1,6 +1,6 @@
 {
   "name": "automata",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "main": "./build/src/automata.js",
   "keywords": [
     "DFA",

build/test/test1.js

@@ -30,7 +30,7 @@ export interface FSMJson {
 }
 
 export type SessionMessageCallback = <T>(session : Session<T>, message? : Message) => void;
-export type SessionMessageCallbackError = <T>(session : Session<T>, message? : string) => void;
+export type SessionMessageCallbackError = <T>(session : Session<T>, message? : Error) => void;
 
 export class SessionConsumeMessagePromise<T> {
 
@@ -50,7 +50,7 @@ export class SessionConsumeMessagePromise<T> {
         this._success && this._success( s, m );
     }
 
-    __error( s : Session<T>, message? : string ) {
+    __error( s : Session<T>, message? : Error ) {
         this._error && this._error( s, message );
     }
 }
@@ -87,13 +87,13 @@ export class FSMRegistry {
                 (session : Session<T>, m: Message) : void => {
                     promise.__success( session, m );
                 },
-                (session : Session<T>, m : string) : void => {
+                (session : Session<T>, m : Error) : void => {
                     promise.__error( session, m );
                 }
             );
         } else {
             setImmediate( function() {
-                promise.__error( null, "Unkonwn automata: '"+fsm_id+"'");
+                promise.__error( null, new Error("Unkonwn automata: '"+fsm_id+"'") );
             } );
         }
 
@@ -498,12 +498,16 @@ export class Session<T> {
      * User side message.
      */
     dispatchMessage<U extends Message>( m : U ) : SessionConsumeMessagePromise<T> {
+        const c : SessionConsumeMessagePromise<T> = new SessionConsumeMessagePromise();
+
         if ( this._ended ) {
-            throw "Session is ended.";
+            setTimeout( ()=> {
+                c._error(this, new Error('Session ended'));
+            }, 0 );
+        } else {
+            this._messages_controller.dispatchMessage(m, c);
         }
-
-        const c : SessionConsumeMessagePromise<T> = new SessionConsumeMessagePromise();
-        this._messages_controller.dispatchMessage( m, c );
+        
         return c;
     }
 
@@ -766,7 +770,7 @@ export class SessionMessageControllerMessageQueue<T> {
                 this._session.__messageImpl(m);
                 ret = false;
             } catch (e) {
-                console.error(`consume for message '${m.msgId}' got exception: `, e);
+                // console.error(`consume for message '${m.msgId}' got exception: `, e);
                 this._messages_queue= [];
                 this._callback.__error( this._session, e );
                 ret = true;

build/test/test1.js.map

@@ -86,9 +86,9 @@ Automata.CreateSession(
             }
         );
     },
-    function error( s : Session<Controller>, m : string ) {
+    function error( s : Session<Controller>, m : Error ) {
 
-        console.log("Error creating Session of type Test1, reason: '"+m+"'");
+        console.log("Error creating Session of type Test1, reason: '"+m.message+"'");
     }
 );