X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FXMLRPC.java;h=12c64669c026835ccbf20da4a305a585371f0e51;hb=8235361e8601ae7b36ab707058de3b52225d15a2;hp=efe4959a5be79d714d4d7486665df0dec5245909;hpb=027607da259f292060d80e0ed90d2b0e896acd86;p=org.ibex.core.git diff --git a/src/org/xwt/XMLRPC.java b/src/org/xwt/XMLRPC.java index efe4959..12c6466 100644 --- a/src/org/xwt/XMLRPC.java +++ b/src/org/xwt/XMLRPC.java @@ -1,16 +1,16 @@ -// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL] +// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL] package org.xwt; import java.io.*; import java.net.*; import java.util.*; -import org.mozilla.javascript.*; +import org.xwt.js.*; import org.xwt.util.*; import org.bouncycastle.util.encoders.Base64; /** - * An XML-RPC client implemented as a Rhino JavaScript Host - * Object. See the XWT spec for information on its behavior. + * An XML-RPC client implemented as a JavaScript Host Object. See the + * XWT spec for information on its behavior. * * NOTE: this client is EXTREMELY lenient in the responses it will * accept; there are many, many invalid responses that it will @@ -30,7 +30,9 @@ import org.bouncycastle.util.encoders.Base64; * convert. * */ -class XMLRPC extends XML implements Function { +class XMLRPC extends JS.Callable { + + public Object[] keys() { throw new Error("not implemented"); } /** the url to connect to */ protected String url = null; @@ -41,6 +43,9 @@ class XMLRPC extends XML implements Function { /** this holds character content as we read it in -- since there is only one per instance, we don't support mixed content */ protected AccessibleCharArrayWriter content = new AccessibleCharArrayWriter(100); + /** the HTTP connection to use */ + protected HTTP http = null; + /** The object stack. As we process xml elements, pieces of the * return value are pushed onto and popped off of this stack. * @@ -52,7 +57,7 @@ class XMLRPC extends XML implements Function { * * If an <array> tag is encountered, a null is pushed onto the * stack. When a </data> is encountered, we search back on the - * stack to the last null, replace it with a NativeArray, and + * stack to the last null, replace it with a NativeJS.Array, and * insert into it all elements above it on the stack. * * If a <struct> tag is encountered, a JSObject is pushed @@ -73,98 +78,107 @@ class XMLRPC extends XML implements Function { // Methods to Recieve and parse XML-RPC Response //////////////////////////////////////////////////// - public void startElement(String name, String[] keys, Object[] vals, int line, int col) { - if (name.equals("fault")) fault = true; - else if (name.equals("struct")) objects.setElementAt(new JSObject(false), objects.size() - 1); - else if (name.equals("array")) objects.setElementAt(null, objects.size() - 1); - else if (name.equals("value")) objects.addElement(""); - } - - public void endElement(String name, int line, int col) { - - if (name.equals("int") || name.equals("i4")) - objects.setElementAt(new Integer(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - - else if (name.equals("boolean")) - objects.setElementAt(content.getBuf()[0] == '1' ? Boolean.TRUE : Boolean.FALSE, objects.size() - 1); - - else if (name.equals("string")) - objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - - else if (name.equals("double")) - objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1); - - else if (name.equals("base64")) - objects.setElementAt(new ByteStream(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1); - - else if (name.equals("name")) - objects.addElement(new String(content.getBuf(), 0, content.size())); - - else if (name.equals("value") && "".equals(objects.lastElement())) - objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); - - else if (name.equals("dateTime.iso8601")) { - String s = new String(content.getBuf(), 0, content.size()); + private class Helper extends XML { + public Helper() { super(BUFFER_SIZE); } - // strip whitespace - int i=0; - while(Character.isWhitespace(s.charAt(i))) i++; - if (i > 0) s = s.substring(i); - - try { - NativeDate nd = (NativeDate)Context.enter().newObject(org.xwt.util.JSObject.defaultObjects, "Date"); - double date = NativeDate.date_msecFromDate(Double.valueOf(s.substring(0, 4)).doubleValue(), - Double.valueOf(s.substring(4, 6)).doubleValue() - 1, - Double.valueOf(s.substring(6, 8)).doubleValue(), - Double.valueOf(s.substring(9, 11)).doubleValue(), - Double.valueOf(s.substring(12, 14)).doubleValue(), - Double.valueOf(s.substring(15, 17)).doubleValue(), - (double)0 - ); - nd.jsFunction_setTime(NativeDate.internalUTC(date)); - objects.setElementAt(nd, objects.size() - 1); - - } catch (Exception e) { - if (Log.on) Log.log(this, "error parsing date : " + s); - if (Log.on) Log.log(this, e); + public void startElement(XML.Element c) { + content.reset(); + if (c.localName.equals("fault")) fault = true; + else if (c.localName.equals("struct")) objects.setElementAt(new JS.Obj(), objects.size() - 1); + else if (c.localName.equals("array")) objects.setElementAt(null, objects.size() - 1); + else if (c.localName.equals("value")) objects.addElement(""); + } + + public void endElement(XML.Element c) { + + if (c.localName.equals("int") || c.localName.equals("i4")) + objects.setElementAt(new Integer(new String(content.getBuf(), 0, content.size())), objects.size() - 1); + + else if (c.localName.equals("boolean")) + objects.setElementAt(content.getBuf()[0] == '1' ? Boolean.TRUE : Boolean.FALSE, objects.size() - 1); + + else if (c.localName.equals("string")) + objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); + + else if (c.localName.equals("double")) + objects.setElementAt(new Double(new String(content.getBuf(), 0, content.size())), objects.size() - 1); + + else if (c.localName.equals("base64")) + objects.setElementAt(new Res.ByteArray(Base64.decode(new String(content.getBuf(), 0, content.size()))), objects.size() - 1); + + else if (c.localName.equals("name")) + objects.addElement(new String(content.getBuf(), 0, content.size())); + + else if (c.localName.equals("value") && "".equals(objects.lastElement())) + objects.setElementAt(new String(content.getBuf(), 0, content.size()), objects.size() - 1); + + else if (c.localName.equals("dateTime.iso8601")) { + throw new Error("not implemented"); + /* + String s = new String(content.getBuf(), 0, content.size()); + + // strip whitespace + int i=0; + while(Character.isWhitespace(s.charAt(i))) i++; + if (i > 0) s = s.substring(i); + + try { + NativeDate nd = (NativeDate)JS.Thread.enter().newObject(org.xwt.util.JS.Obj.defaultObjects, "Date"); + double date = NativeDate.date_msecFromDate(Double.valueOf(s.substring(0, 4)).doubleValue(), + Double.valueOf(s.substring(4, 6)).doubleValue() - 1, + Double.valueOf(s.substring(6, 8)).doubleValue(), + Double.valueOf(s.substring(9, 11)).doubleValue(), + Double.valueOf(s.substring(12, 14)).doubleValue(), + Double.valueOf(s.substring(15, 17)).doubleValue(), + (double)0 + ); + nd.jsFunction_setTime(NativeDate.internalUTC(date)); + objects.setElementAt(nd, objects.size() - 1); + + } catch (Exception e) { + if (Log.on) Log.log(this, "error parsing date : " + s); + if (Log.on) Log.log(this, e); + } + */ + + } else if (c.localName.equals("member")) { + Object memberValue = objects.elementAt(objects.size() - 1); + String memberName = (String)objects.elementAt(objects.size() - 2); + JS struct = (JS)objects.elementAt(objects.size() - 3); + struct.put(memberName, memberValue); + objects.setSize(objects.size() - 2); + + } else if (c.localName.equals("data")) { + int i; + for(i=objects.size() - 1; objects.elementAt(i) != null; i--); + JS.Array arr = new JS.Array(); + for(int j = i + 1; jo to sb */ - void appendObject(Object o, StringBuffer sb) throws JavaScriptException { + void appendObject(Object o, StringBuffer sb) throws JS.Exn { if (o == null) { - throw new JavaScriptException("attempted to send a null value via XML-RPC"); + throw new JS.Exn("attempted to send a null value via XML-RPC"); } else if (o instanceof Number) { if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) { @@ -182,13 +196,13 @@ class XMLRPC extends XML implements Function { sb.append(((Boolean)o).booleanValue() ? "1" : "0"); sb.append("\n"); - } else if (o instanceof ByteStream) { + } else if (o instanceof Res) { try { - sb.append(" "); - InputStream is = ((ByteStream)o).getInputStream(); - byte[] buf = new byte[96]; + sb.append(" \n"); + InputStream is = ((Res)o).getInputStream(); + byte[] buf = new byte[54]; while(true) { - int numread = is.read(buf, 0, 96); + int numread = is.read(buf, 0, 54); if (numread == -1) break; byte[] writebuf = buf; if (numread < buf.length) { @@ -196,15 +210,14 @@ class XMLRPC extends XML implements Function { System.arraycopy(buf, 0, writebuf, 0, numread); } sb.append(" "); - sb.append(Base64.encode(writebuf)); + sb.append(new String(Base64.encode(writebuf))); sb.append("\n"); } - sb.append(((Boolean)o).booleanValue() ? "1" : "0"); sb.append("\n \n"); } catch (IOException e) { if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via XML-RPC"); if (Log.on) Log.log(this, e); - throw new JavaScriptException("caught IOException while attempting to send a ByteStream via XML-RPC"); + throw new JS.Exn("caught IOException while attempting to send a ByteStream via XML-RPC"); } } else if (o instanceof String) { @@ -227,37 +240,58 @@ class XMLRPC extends XML implements Function { } sb.append("\n"); - } else if (o instanceof NativeArray) { - if (tracker.get(o) != null) throw new JavaScriptException("attempted to send multi-ref data structure via XML-RPC"); + /* + } else if (o instanceof org.xwt.js.Date) { + sb.append(" "); + org.xwt.js.Date d = (org.xwt.js.Date)o; + Date d = new Date(nd.getRawTime()); + sb.append(d.getYear() + 1900); + if (d.getMonth() + 1 < 10) sb.append('0'); + sb.append(d.getMonth() + 1); + if (d.getDate() < 10) sb.append('0'); + sb.append(d.getDate()); + sb.append('T'); + if (d.getHours() < 10) sb.append('0'); + sb.append(d.getHours()); + sb.append(':'); + if (d.getMinutes() < 10) sb.append('0'); + sb.append(d.getMinutes()); + sb.append(':'); + if (d.getSeconds() < 10) sb.append('0'); + sb.append(d.getSeconds()); + sb.append("\n"); + */ + + } else if (o instanceof JS.Array) { + if (tracker.get(o) != null) throw new JS.Exn("attempted to send multi-ref data structure via XML-RPC"); tracker.put(o, Boolean.TRUE); sb.append(" \n"); - NativeArray na = (NativeArray)o; - for(int i=0; i\n"); - } else if (o instanceof Scriptable && !(o instanceof Undefined)) { - if (tracker.get(o) != null) throw new JavaScriptException("attempted to send multi-ref data structure via XML-RPC"); + } else if (o instanceof JS) { + if (tracker.get(o) != null) throw new JS.Exn("attempted to send multi-ref data structure via XML-RPC"); tracker.put(o, Boolean.TRUE); - Scriptable s = (Scriptable)o; + JS j = (JS)o; sb.append(" \n"); - Object[] ids = s.getIds(); + Object[] ids = j.keys(); for(int i=0; i" + ids[i] + "\n"); - appendObject(s.get(ids[i].toString(), s), sb); + appendObject(j.get(ids[i].toString()), sb); sb.append(" \n"); } sb.append(" \n"); } else { - throw new JavaScriptException("attempt to send object of type " + o.getClass().getName() + " via XML-RPC"); + throw new JS.Exn("attempt to send object of type " + o.getClass().getName() + " via XML-RPC"); } } // this is synchronized in case multiple threads try to make a call on the same object... in the future, change this // behavior to use pipelining. - public synchronized Object call(Object[] args) throws JavaScriptException, IOException { + public synchronized Object call2(JS.Array args) throws JS.Exn, IOException { if (Log.verbose) Log.log(this, "call to " + url + " : " + methodname); if (tracker == null) tracker = new Hash(); @@ -266,125 +300,101 @@ class XMLRPC extends XML implements Function { if (objects == null) objects = new Vec(); else objects.setSize(0); - HTTP http = new HTTP(url); String content = send(args, http); - OutputStream os = new BufferedOutputStream(http.getOutputStream(content.length(), "text/xml"), 4000); - PrintWriter ps = !Log.verbose ? - new PrintWriter(os) : - new PrintWriter(new FilterWriter(new OutputStreamWriter(os)) { - public void write(int i) throws IOException { - super.write(i); - if (Log.on) Log.log(this, "send: " + ((char)i)); - } - public void write(String s, int start, int len) throws IOException { - super.write(s, start, len); - if (Log.on) Log.log(this, "send: " + s.substring(start, start + len)); - } - public void write(char[] c, int start, int len) throws IOException { - super.write(c, start, len); - if (Log.on) Log.log(this, "send: " + new String(c, start, len)); - } - }); - ps.print(content.toString()); - ps.flush(); - - BufferedReader br = !Log.verbose ? - new BufferedReader(new InputStreamReader(new Filter(http.getInputStream()))) : - new BufferedReader(new FilterReader(new InputStreamReader(new Filter(http.getInputStream()))) { - public int read() throws IOException { - int i = super.read(); - System.out.println("X " + i); - if (Log.on) Log.log(this, "recv: " + ((char)i)); - return i; - } - public int read(char[] c, int off, int len) throws IOException { - int ret = super.read(c, off, len); - System.out.println("Y " + ret); - if (ret == -1) return ret; - if (Log.on) Log.log(this, "recv: " + new String(c, off, ret)); - return ret; - } - }); - return recieve(br); + if (Log.verbose) { + String s; + BufferedReader br2 = new BufferedReader(new StringReader(content)); + while ((s = br2.readLine()) != null) Log.log(this, "send: " + s); + } + + InputStream is = http.POST("text/xml", content); + try { + BufferedReader br = !Log.verbose ? + new BufferedReader(new InputStreamReader(new Filter(is))) : + new BufferedReader(new FilterReader(new InputStreamReader(new Filter(is))) { + public int read() throws IOException { + int i = super.read(); + if (Log.on) Log.log(this, "recv: " + ((char)i)); + return i; + } + public int read(char[] c, int off, int len) throws IOException { + int ret = super.read(c, off, len); + if (ret == -1) return ret; + String s; + BufferedReader br2 = new BufferedReader(new StringReader(new String(c, off, ret))); + while ((s = br2.readLine()) != null) Log.log(this, "recv: " + s); + return ret; + } + }); + return recieve(br); + } finally { + is.close(); + } } - protected String send(Object[] args, HTTP http) throws JavaScriptException, IOException { + protected String send(JS.Array args, HTTP http) throws JS.Exn, IOException { StringBuffer content = new StringBuffer(); + content.append("\r\n"); content.append("\n"); content.append(" \n"); content.append(" "); content.append(methodname); content.append("\n"); - if (args.length > 0) { - content.append(" \n"); - for(int i=0; i\n"); - appendObject(args[i], content); - content.append(" \n"); - } - content.append(" \n"); + content.append(" \n"); + for(int i=0; i\n"); + appendObject(args.elementAt(i), content); + content.append(" \n"); } + content.append(" \n"); content.append(" "); return content.toString(); } - protected Object recieve(BufferedReader br) throws JavaScriptException, IOException { + protected Object recieve(BufferedReader br) throws JS.Exn, IOException { // parse XML reply try { - parse(br); - } catch (XML.SAXException e) { + new Helper().parse(br); + } catch (XML.XMLException e) { if (Log.on) Log.log(this, "reply from server was not well-formed XML: " + e); - throw new JavaScriptException("reply from server was not well-formed XML: " + e); + throw new JS.Exn("reply from server was not well-formed XML: " + e); } - if (fault) throw new JavaScriptException(objects.elementAt(0)); + if (fault) throw new JS.Exn(objects.elementAt(0)); if (objects.size() == 0) return null; return objects.elementAt(0); } - public final Object call(Context cx, Scriptable scope, Scriptable thisObj, java.lang.Object[] args) throws JavaScriptException { + public final Object call(JS.Array args) throws JS.Exn { - // put ourselves in the background - Thread thread = Thread.currentThread(); - if (!(thread instanceof ThreadMessage)) { - if (Log.on) Log.log(this, "RPC calls may only be made from background threads"); - return null; - } - ThreadMessage mythread = (ThreadMessage)thread; - mythread.setPriority(Thread.MIN_PRIORITY); - mythread.done.release(); + if (!ThreadMessage.suspendThread()) return null; try { - return call(args); - + return call2(args); } catch (IOException se) { if (Log.on) Log.log(this, se); - if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine); - throw new JavaScriptException("socket exception: " + se); - - } catch (JavaScriptException jse) { - Object val = jse.getValue(); - if (val instanceof String) { - if (Log.on) Log.log(this, val.toString()); - if (Log.on) Log.log(this, " at " + cx.interpreterSourceFile + ":" + cx.interpreterLine); - } - throw jse; + throw new JS.Exn("socket exception: " + se); + } catch (JS.Exn jse) { + if (Log.on) Log.log(this, jse.toString()); + throw jse; } finally { - // okay, let ourselves be brought to the foreground - MessageQueue.add(mythread); - mythread.setPriority(Thread.NORM_PRIORITY); - mythread.go.block(); + ThreadMessage.resumeThread(); } } /** When you get a property from an XMLRPC, it just returns another XMLRPC with the property name tacked onto methodname. */ - public Object get(String name, Scriptable start) { - return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name); + public Object get(Object name) { + return new XMLRPC(url, (methodname.equals("") ? "" : methodname + ".") + name.toString(), http); } public XMLRPC(String url, String methodname) { + this(url, methodname, new HTTP(url)); + } + + public XMLRPC(String url, String methodname, HTTP http) { + this.http = http; this.url = url; this.methodname = methodname; } @@ -402,40 +412,20 @@ class XMLRPC extends XML implements Function { private static class Filter extends FilterInputStream { public Filter(InputStream is) { super(is); } public int read() throws IOException { - Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + java.lang.Thread.yield(); + while(Message.Q.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { }; return super.read(); } public int read(byte[] b) throws IOException { - Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + java.lang.Thread.yield(); + while(Message.Q.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { }; return super.read(b); } public int read(byte[] b, int i, int j) throws IOException { - Thread.yield(); - while(MessageQueue.working) try { Thread.sleep(100); } catch (Exception e) { }; + java.lang.Thread.yield(); + while(Message.Q.nonThreadEventsInQueue > 0) try { java.lang.Thread.sleep(100); } catch (Exception e) { }; return super.read(b, i, j); } } - - // Methods Required by Rhino //////////////////////////////////////////////////////// - - public String getClassName() { return "XMLRPC"; } - public Scriptable construct(Context cx, Scriptable scope, java.lang.Object[] args) { return null; } - public void delete(String name) { } - public Scriptable getParentScope() { return null; } - public void setParentScope(Scriptable p) { } - public boolean hasInstance(Scriptable value) { return false; } - public Scriptable getPrototype() { return null; } - public void setPrototype(Scriptable p) { } - public void delete(int i) { } - public Object getDefaultValue(Class hint) { return "XML-RPC"; } - public void put(int i, Scriptable start, Object value) { } - public Object get(int i, Scriptable start) { return null; } - public void put(String name, Scriptable start, Object value) { } - public boolean has(String name, Scriptable start) { return true; } - public boolean has(int i, Scriptable start) { return false; } - public Object[] getIds() { return new Object[] { }; } - }