fix order of execution
This commit is contained in:
Avraham Sakal
Vendored
+63
-21
@@ -15,15 +15,24 @@
|
||||
var Goto = function(targetStateName) {
|
||||
return { type: "Goto", targetStateName };
|
||||
};
|
||||
function interpret(machine2, options) {
|
||||
let { state, context } = options;
|
||||
if (typeof state === "undefined") {
|
||||
state = machine2.states[0].name;
|
||||
function Interpreter(machine2, initialContext, initialStateName) {
|
||||
if (typeof initialStateName === "undefined") {
|
||||
initialStateName = machine2.states[0].name;
|
||||
}
|
||||
const interpreter = { machine: machine2, state, context, eventQueue: [], isTransitioning: false };
|
||||
const interpreter = { machine: machine2, state: initialStateName, context: initialContext, eventQueue: [], isTransitioning: false, peers: {}, peerSubscriptionIds: /* @__PURE__ */ new Map(), subscriptionsToEvents: {}, subscriptionsToState: {}, subscriptionsToSettledState: {}, isPaused: true };
|
||||
interpreter.start = () => {
|
||||
start(interpreter);
|
||||
return interpreter;
|
||||
};
|
||||
send(interpreter, ["entry", null]);
|
||||
return interpreter;
|
||||
}
|
||||
function start(interpreter) {
|
||||
if (interpreter.isPaused === true) {
|
||||
interpreter.isPaused = false;
|
||||
processEvents(interpreter);
|
||||
}
|
||||
}
|
||||
function getState(interpreter) {
|
||||
return interpreter.machine.states.find((state) => state.name === interpreter.state);
|
||||
}
|
||||
@@ -33,44 +42,77 @@
|
||||
function send(interpreter, event) {
|
||||
interpreter.eventQueue.push(event);
|
||||
if (interpreter.isTransitioning === false) {
|
||||
interpreter.isTransitioning = true;
|
||||
while (interpreter.eventQueue.length > 0) {
|
||||
processNextEvent(interpreter);
|
||||
}
|
||||
interpreter.isTransitioning = false;
|
||||
processEvents(interpreter);
|
||||
}
|
||||
}
|
||||
function processEvents(interpreter) {
|
||||
interpreter.isTransitioning = true;
|
||||
while (interpreter.eventQueue.length > 0 && interpreter.isPaused === false) {
|
||||
processNextEvent(interpreter);
|
||||
}
|
||||
interpreter.isTransitioning = false;
|
||||
Object.values(interpreter.subscriptionsToSettledState).forEach((callbackFunction) => {
|
||||
callbackFunction(interpreter);
|
||||
});
|
||||
}
|
||||
function processNextEvent(interpreter) {
|
||||
const nextEvent = interpreter.eventQueue.shift();
|
||||
if (typeof nextEvent !== "undefined") {
|
||||
const event = interpreter.eventQueue.shift();
|
||||
if (typeof event !== "undefined") {
|
||||
const state = getState(interpreter);
|
||||
const eventReactionCouplings = getMatchingEventReactionCouplings(state, nextEvent);
|
||||
const eventReactionCouplings = getMatchingEventReactionCouplings(state, event);
|
||||
const reactions = eventReactionCouplings.map((eventReactionCoupling) => eventReactionCoupling.reactions).flat();
|
||||
const { sideEffects, contextMutations, goto_ } = categorizeReactions(reactions);
|
||||
sideEffects.forEach((sideEffect) => {
|
||||
sideEffect.fn(interpreter.context, nextEvent, interpreter);
|
||||
});
|
||||
const { sideEffects, contextMutations, peerings, goto_ } = categorizeReactions(reactions);
|
||||
const originalContext = interpreter.context;
|
||||
contextMutations.forEach((contextMutation) => {
|
||||
interpreter.context = contextMutation.fn(interpreter.context, nextEvent, interpreter);
|
||||
interpreter.context = contextMutation.fn(interpreter.context, event, interpreter);
|
||||
});
|
||||
if (goto_ !== null) {
|
||||
send(interpreter, ["exit", null]);
|
||||
interpreter.state = goto_.targetStateName;
|
||||
Object.values(interpreter.subscriptionsToState).forEach((callbackFunction) => {
|
||||
callbackFunction(event, interpreter);
|
||||
});
|
||||
send(interpreter, ["entry", null]);
|
||||
}
|
||||
peerings.forEach((peering) => {
|
||||
addPeer(interpreter, peering.name, peering.peerCreationFunction(interpreter.context, event, interpreter));
|
||||
});
|
||||
Object.values(interpreter.subscriptionsToEvents).forEach((callbackFunction) => {
|
||||
callbackFunction(event, interpreter);
|
||||
});
|
||||
sideEffects.forEach((sideEffect) => {
|
||||
sideEffect.fn(interpreter.context, event, interpreter, originalContext);
|
||||
});
|
||||
}
|
||||
}
|
||||
function categorizeReactions(reactions) {
|
||||
let sideEffects = [], contextMutations = [], goto_ = null;
|
||||
let sideEffects = [], contextMutations = [], peerings = [], goto_ = null;
|
||||
reactions.forEach((reaction) => {
|
||||
if (reaction.type === "SideEffect") {
|
||||
sideEffects.push(reaction);
|
||||
} else if (reaction.type === "ContextMutation") {
|
||||
contextMutations.push(reaction);
|
||||
} else if (reaction.type === "Peering") {
|
||||
peerings.push(reaction);
|
||||
} else if (reaction.type === "Goto") {
|
||||
goto_ = reaction;
|
||||
}
|
||||
});
|
||||
return { sideEffects, contextMutations, goto_ };
|
||||
return { sideEffects, contextMutations, peerings, goto_ };
|
||||
}
|
||||
var subscriptionId = 0;
|
||||
function subscribeToEvents(interpreter, callback) {
|
||||
subscriptionId++;
|
||||
interpreter.subscriptionsToEvents[subscriptionId.toString()] = callback;
|
||||
return subscriptionId.toString();
|
||||
}
|
||||
function addPeer(self, name, peer) {
|
||||
self.peers[name] = peer;
|
||||
subscribeToEvents(peer, (e, peer2) => {
|
||||
if (self.isTransitioning === false) {
|
||||
send(self, [name + "." + e[0], e[1]]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// src/tests/00-basic.ts
|
||||
@@ -120,5 +162,5 @@
|
||||
)
|
||||
)
|
||||
);
|
||||
var actor = interpret(machine, { context: {} });
|
||||
var actor = Interpreter(machine, { context: {} }).start();
|
||||
})();
|
||||
|
||||
Vendored
+106
-43
@@ -18,15 +18,27 @@
|
||||
var Context = function(fn) {
|
||||
return { type: "ContextMutation", fn };
|
||||
};
|
||||
function interpret(machine, options) {
|
||||
let { state, context } = options;
|
||||
if (typeof state === "undefined") {
|
||||
state = machine.states[0].name;
|
||||
var Peer = function(name, peerCreationFunction) {
|
||||
return { type: "Peering", name, peerCreationFunction };
|
||||
};
|
||||
function Interpreter(machine, initialContext, initialStateName) {
|
||||
if (typeof initialStateName === "undefined") {
|
||||
initialStateName = machine.states[0].name;
|
||||
}
|
||||
const interpreter = { machine, state, context, eventQueue: [], isTransitioning: false };
|
||||
const interpreter = { machine, state: initialStateName, context: initialContext, eventQueue: [], isTransitioning: false, peers: {}, peerSubscriptionIds: /* @__PURE__ */ new Map(), subscriptionsToEvents: {}, subscriptionsToState: {}, subscriptionsToSettledState: {}, isPaused: true };
|
||||
interpreter.start = () => {
|
||||
start(interpreter);
|
||||
return interpreter;
|
||||
};
|
||||
send(interpreter, ["entry", null]);
|
||||
return interpreter;
|
||||
}
|
||||
function start(interpreter) {
|
||||
if (interpreter.isPaused === true) {
|
||||
interpreter.isPaused = false;
|
||||
processEvents(interpreter);
|
||||
}
|
||||
}
|
||||
function getState(interpreter) {
|
||||
return interpreter.machine.states.find((state) => state.name === interpreter.state);
|
||||
}
|
||||
@@ -36,44 +48,77 @@
|
||||
function send(interpreter, event) {
|
||||
interpreter.eventQueue.push(event);
|
||||
if (interpreter.isTransitioning === false) {
|
||||
interpreter.isTransitioning = true;
|
||||
while (interpreter.eventQueue.length > 0) {
|
||||
processNextEvent(interpreter);
|
||||
}
|
||||
interpreter.isTransitioning = false;
|
||||
processEvents(interpreter);
|
||||
}
|
||||
}
|
||||
function processEvents(interpreter) {
|
||||
interpreter.isTransitioning = true;
|
||||
while (interpreter.eventQueue.length > 0 && interpreter.isPaused === false) {
|
||||
processNextEvent(interpreter);
|
||||
}
|
||||
interpreter.isTransitioning = false;
|
||||
Object.values(interpreter.subscriptionsToSettledState).forEach((callbackFunction) => {
|
||||
callbackFunction(interpreter);
|
||||
});
|
||||
}
|
||||
function processNextEvent(interpreter) {
|
||||
const nextEvent = interpreter.eventQueue.shift();
|
||||
if (typeof nextEvent !== "undefined") {
|
||||
const event = interpreter.eventQueue.shift();
|
||||
if (typeof event !== "undefined") {
|
||||
const state = getState(interpreter);
|
||||
const eventReactionCouplings = getMatchingEventReactionCouplings(state, nextEvent);
|
||||
const eventReactionCouplings = getMatchingEventReactionCouplings(state, event);
|
||||
const reactions = eventReactionCouplings.map((eventReactionCoupling) => eventReactionCoupling.reactions).flat();
|
||||
const { sideEffects, contextMutations, goto_ } = categorizeReactions(reactions);
|
||||
sideEffects.forEach((sideEffect) => {
|
||||
sideEffect.fn(interpreter.context, nextEvent, interpreter);
|
||||
});
|
||||
const { sideEffects, contextMutations, peerings, goto_ } = categorizeReactions(reactions);
|
||||
const originalContext = interpreter.context;
|
||||
contextMutations.forEach((contextMutation) => {
|
||||
interpreter.context = contextMutation.fn(interpreter.context, nextEvent, interpreter);
|
||||
interpreter.context = contextMutation.fn(interpreter.context, event, interpreter);
|
||||
});
|
||||
if (goto_ !== null) {
|
||||
send(interpreter, ["exit", null]);
|
||||
interpreter.state = goto_.targetStateName;
|
||||
Object.values(interpreter.subscriptionsToState).forEach((callbackFunction) => {
|
||||
callbackFunction(event, interpreter);
|
||||
});
|
||||
send(interpreter, ["entry", null]);
|
||||
}
|
||||
peerings.forEach((peering) => {
|
||||
addPeer(interpreter, peering.name, peering.peerCreationFunction(interpreter.context, event, interpreter));
|
||||
});
|
||||
Object.values(interpreter.subscriptionsToEvents).forEach((callbackFunction) => {
|
||||
callbackFunction(event, interpreter);
|
||||
});
|
||||
sideEffects.forEach((sideEffect) => {
|
||||
sideEffect.fn(interpreter.context, event, interpreter, originalContext);
|
||||
});
|
||||
}
|
||||
}
|
||||
function categorizeReactions(reactions) {
|
||||
let sideEffects = [], contextMutations = [], goto_ = null;
|
||||
let sideEffects = [], contextMutations = [], peerings = [], goto_ = null;
|
||||
reactions.forEach((reaction) => {
|
||||
if (reaction.type === "SideEffect") {
|
||||
sideEffects.push(reaction);
|
||||
} else if (reaction.type === "ContextMutation") {
|
||||
contextMutations.push(reaction);
|
||||
} else if (reaction.type === "Peering") {
|
||||
peerings.push(reaction);
|
||||
} else if (reaction.type === "Goto") {
|
||||
goto_ = reaction;
|
||||
}
|
||||
});
|
||||
return { sideEffects, contextMutations, goto_ };
|
||||
return { sideEffects, contextMutations, peerings, goto_ };
|
||||
}
|
||||
var subscriptionId = 0;
|
||||
function subscribeToEvents(interpreter, callback) {
|
||||
subscriptionId++;
|
||||
interpreter.subscriptionsToEvents[subscriptionId.toString()] = callback;
|
||||
return subscriptionId.toString();
|
||||
}
|
||||
function addPeer(self, name, peer) {
|
||||
self.peers[name] = peer;
|
||||
subscribeToEvents(peer, (e, peer2) => {
|
||||
if (self.isTransitioning === false) {
|
||||
send(self, [name + "." + e[0], e[1]]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// src/tests/01-ping-pong.ts
|
||||
@@ -83,30 +128,36 @@
|
||||
}, ms);
|
||||
});
|
||||
var makeRequest = (ctx, e, self) => {
|
||||
send(ctx.serverActor, ["received-request", self]);
|
||||
send(self.peers.server, ["received-request", self]);
|
||||
};
|
||||
var sendResponse = (ctx, e, self) => {
|
||||
send(ctx.clientActor, ["received-response", self]);
|
||||
send(ctx.client, ["received-response", self]);
|
||||
};
|
||||
var startTimer = async (ctx, e, self) => {
|
||||
await wait(1500);
|
||||
console.log(" timer actually finished");
|
||||
send(self, ["timer-finished", null]);
|
||||
};
|
||||
var log = (ctx, e, self) => {
|
||||
console.log(self.state, ctx);
|
||||
var logServerStats = (ctx, e, self) => {
|
||||
console.log("server", ctx.requestsReceived, ctx.responsesSent);
|
||||
};
|
||||
var saveClient = (ctx, e, self) => ({ ...ctx, client: e[1] });
|
||||
var createServer = (ctx, e, self) => Interpreter(server, { requestsReceived: 0, responsesSent: 0 }).start();
|
||||
var client = Machine(
|
||||
State(
|
||||
"initializing",
|
||||
On(
|
||||
"entry",
|
||||
Peer("server", createServer),
|
||||
//SideEffect(log('client')),
|
||||
Goto("idle")
|
||||
)
|
||||
),
|
||||
State(
|
||||
"idle",
|
||||
On(
|
||||
"entry",
|
||||
SideEffect(log)
|
||||
),
|
||||
On(
|
||||
"server-created",
|
||||
SideEffect((_ctx, [_eventName, serverActor2], self) => {
|
||||
self.context.serverActor = serverActor2;
|
||||
}),
|
||||
//SideEffect(log('client')),
|
||||
Goto("making-request")
|
||||
)
|
||||
),
|
||||
@@ -114,7 +165,7 @@
|
||||
"making-request",
|
||||
On(
|
||||
"entry",
|
||||
SideEffect(log),
|
||||
//SideEffect(log('client')),
|
||||
SideEffect(makeRequest),
|
||||
Context((ctx) => ({ ...ctx, requestsMade: ctx.requestsMade + 1 })),
|
||||
Goto("awaiting-response")
|
||||
@@ -123,13 +174,13 @@
|
||||
State(
|
||||
"awaiting-response",
|
||||
On(
|
||||
"entry",
|
||||
SideEffect(log)
|
||||
"entry"
|
||||
//SideEffect(log('client')),
|
||||
),
|
||||
On(
|
||||
"received-response",
|
||||
SideEffect(log),
|
||||
Context((ctx) => ({ ...ctx, responsesReceived: ctx.responsesReceived + 1 })),
|
||||
//SideEffect(log('client')),
|
||||
Goto("making-request")
|
||||
)
|
||||
)
|
||||
@@ -139,13 +190,13 @@
|
||||
"awaiting-request",
|
||||
On(
|
||||
"entry",
|
||||
SideEffect(log)
|
||||
//SideEffect(log('server')),
|
||||
Context((ctx) => ({ ...ctx, requestsReceived: ctx.requestsReceived + 1 }))
|
||||
),
|
||||
On(
|
||||
"received-request",
|
||||
SideEffect((_ctx, [_eventName, clientActor2], self) => {
|
||||
self.context.clientActor = clientActor2;
|
||||
}),
|
||||
//SideEffect(log('server')),
|
||||
Context(saveClient),
|
||||
Goto("sending-response")
|
||||
)
|
||||
),
|
||||
@@ -153,17 +204,29 @@
|
||||
"sending-response",
|
||||
On(
|
||||
"entry",
|
||||
SideEffect(log),
|
||||
//SideEffect(log('server')),
|
||||
SideEffect(startTimer)
|
||||
),
|
||||
On(
|
||||
"timer-finished",
|
||||
//SideEffect(log('server')),
|
||||
SideEffect(logServerStats),
|
||||
SideEffect(sendResponse),
|
||||
Context((ctx) => ({ ...ctx, responsesSent: ctx.responsesSent + 1 })),
|
||||
Goto("awaiting-request")
|
||||
// for some reason, at this point there's a "received-request" waiting in the eventQueue, which gets processed before the "exit" then "entry" that get appended to the queue due to this Goto, which makes the Interpreter come right back to this State
|
||||
/*
|
||||
Server gets timer-finished, which sends response to client.
|
||||
|
||||
But client, at the time, is not transitioning, so it immediately begins
|
||||
processing that event. The problem is that one of the sideeffects involved
|
||||
in processing that event is to send another request to the server,
|
||||
which hasn't yet even queued `exit`-then-`entry` events for its next state!
|
||||
|
||||
So we have to ensure they get queued first, before processing the client.
|
||||
*/
|
||||
)
|
||||
)
|
||||
);
|
||||
var clientActor = interpret(client, { context: { requestsMade: 0, responsesReceived: 0 } });
|
||||
var serverActor = interpret(server, { context: {} });
|
||||
send(clientActor, ["server-created", serverActor]);
|
||||
var clientActor = Interpreter(client, { requestsMade: 0, responsesReceived: 0 }).start();
|
||||
})();
|
||||
|
||||
Reference in New Issue
Block a user