A bunch more peer business.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4241 542714f4-19e9-0310-aa3c-eee0fc999fb1
2006-07-01 03:34:00 +00:00
parent 0bceb75365
commit 3a9c6ced44
13 changed files with 675 additions and 37 deletions
@@ -0,0 +1,40 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.client;
+
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationService;
+
+import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.crowd.chat.data.ChatMessage;
+
+/**
+ * Bridges certain Crowd services between peers in a cluster configuration.
+ */
+public interface CrowdPeerService extends InvocationService
+{
+    /**
+     * Forwards a tell request to the server on which a user actually resides.
+     */
+    public void deliverTell (
+        Client client, ChatMessage message, ChatService.TellListener listener);
+}
@@ -0,0 +1,35 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.data;
+
+import com.threerings.util.Name;
+
+import com.threerings.presents.peer.data.ClientInfo;
+
+/**
+ * Extends the standard {@link ClientInfo} with Crowd bits.
+ */
+public class CrowdClientInfo extends ClientInfo
+{
+    /** The client's visible name, which is used for chatting. */
+    public Name visibleName;
+}
@@ -0,0 +1,56 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.data;
+
+import com.threerings.presents.peer.data.NodeObject;
+
+/**
+ * Extends the basic {@link NodeObject} with Crowd bits.
+ */
+public class CrowdNodeObject extends NodeObject
+{
+    // AUTO-GENERATED: FIELDS START
+    /** The field name of the <code>crowdPeerService</code> field. */
+    public static final String CROWD_PEER_SERVICE = "crowdPeerService";
+    // AUTO-GENERATED: FIELDS END
+
+    /** Used to coordinate tells between servers. */
+    public CrowdPeerMarshaller crowdPeerService;
+
+    // AUTO-GENERATED: METHODS START
+    /**
+     * Requests that the <code>crowdPeerService</code> field be set to the
+     * specified value. The local value will be updated immediately and an
+     * event will be propagated through the system to notify all listeners
+     * that the attribute did change. Proxied copies of this object (on
+     * clients) will apply the value change when they received the
+     * attribute changed notification.
+     */
+    public void setCrowdPeerService (CrowdPeerMarshaller value)
+    {
+        CrowdPeerMarshaller ovalue = this.crowdPeerService;
+        requestAttributeChange(
+            CROWD_PEER_SERVICE, value, ovalue);
+        this.crowdPeerService = value;
+    }
+    // AUTO-GENERATED: METHODS END
+}
@@ -0,0 +1,55 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.data;
+
+import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.crowd.chat.data.ChatMarshaller;
+import com.threerings.crowd.chat.data.ChatMessage;
+import com.threerings.crowd.peer.client.CrowdPeerService;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.dobj.InvocationResponseEvent;
+
+/**
+ * Provides the implementation of the {@link CrowdPeerService} interface
+ * that marshalls the arguments and delivers the request to the provider
+ * on the server. Also provides an implementation of the response listener
+ * interfaces that marshall the response arguments and deliver them back
+ * to the requesting client.
+ */
+public class CrowdPeerMarshaller extends InvocationMarshaller
+    implements CrowdPeerService
+{
+    /** The method id used to dispatch {@link #deliverTell} requests. */
+    public static final int DELIVER_TELL = 1;
+
+    // documentation inherited from interface
+    public void deliverTell (Client arg1, ChatMessage arg2, ChatService.TellListener arg3)
+    {
+        ChatMarshaller.TellMarshaller listener3 = new ChatMarshaller.TellMarshaller();
+        listener3.listener = arg3;
+        sendRequest(arg1, DELIVER_TELL, new Object[] {
+            arg2, listener3
+        });
+    }
+
+}
@@ -0,0 +1,73 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.server;
+
+import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.crowd.chat.data.ChatMarshaller;
+import com.threerings.crowd.chat.data.ChatMessage;
+import com.threerings.crowd.peer.client.CrowdPeerService;
+import com.threerings.crowd.peer.data.CrowdPeerMarshaller;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.presents.server.InvocationDispatcher;
+import com.threerings.presents.server.InvocationException;
+
+/**
+ * Dispatches requests to the {@link CrowdPeerProvider}.
+ */
+public class CrowdPeerDispatcher extends InvocationDispatcher
+{
+    /**
+     * Creates a dispatcher that may be registered to dispatch invocation
+     * service requests for the specified provider.
+     */
+    public CrowdPeerDispatcher (CrowdPeerProvider provider)
+    {
+        this.provider = provider;
+    }
+
+    // documentation inherited
+    public InvocationMarshaller createMarshaller ()
+    {
+        return new CrowdPeerMarshaller();
+    }
+
+    // documentation inherited
+    public void dispatchRequest (
+        ClientObject source, int methodId, Object[] args)
+        throws InvocationException
+    {
+        switch (methodId) {
+        case CrowdPeerMarshaller.DELIVER_TELL:
+            ((CrowdPeerProvider)provider).deliverTell(
+                source,
+                (ChatMessage)args[0], (ChatService.TellListener)args[1]
+            );
+            return;
+
+        default:
+            super.dispatchRequest(source, methodId, args);
+            return;
+        }
+    }
+}
@@ -0,0 +1,53 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.server;
+
+import com.samskivert.io.PersistenceException;
+import com.samskivert.jdbc.ConnectionProvider;
+import com.samskivert.util.Invoker;
+
+import com.threerings.presents.peer.data.NodeObject;
+import com.threerings.presents.peer.server.PeerManager;
+
+import com.threerings.crowd.peer.data.CrowdNodeObject;
+
+/**
+ * Extends the standard peer manager and bridges certain Crowd services.
+ */
+public class CrowdPeerManager extends PeerManager
+{
+    /**
+     * Creates a peer manager that integrates Crowd services across a cluster
+     * of servers.
+     */
+    public CrowdPeerManager (ConnectionProvider conprov, Invoker invoker)
+        throws PersistenceException
+    {
+        super(conprov, invoker);
+    }
+
+    @Override // documentation inherited
+    protected Class<? extends NodeObject> getNodeObjectClass ()
+    {
+        return CrowdNodeObject.class;
+    }
+}
@@ -0,0 +1,43 @@
+//
+// $Id$
+//
+// Narya library - tools for developing networked games
+// Copyright (C) 2002-2006 Three Rings Design, Inc., All Rights Reserved
+// http://www.threerings.net/code/narya/
+//
+// This library is free software; you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as published
+// by the Free Software Foundation; either version 2.1 of the License, or
+// (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+package com.threerings.crowd.peer.server;
+
+import com.threerings.crowd.chat.client.ChatService;
+import com.threerings.crowd.chat.data.ChatMarshaller;
+import com.threerings.crowd.chat.data.ChatMessage;
+import com.threerings.crowd.peer.client.CrowdPeerService;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.ClientObject;
+import com.threerings.presents.server.InvocationException;
+import com.threerings.presents.server.InvocationProvider;
+
+/**
+ * Defines the server-side of the {@link CrowdPeerService}.
+ */
+public interface CrowdPeerProvider extends InvocationProvider
+{
+    /**
+     * Handles a {@link CrowdPeerService#deliverTell} request.
+     */
+    public void deliverTell (ClientObject caller, ChatMessage arg1, ChatService.TellListener arg2)
+        throws InvocationException;
+}