CYInjectRemote should also be in #ifdef CY_ATTACH.

[cycript.git] / libcycript.cy

diff --git a/libcycript.cy b/libcycript.cy
index 6f798ea1528681c19e64b70ad866cf67d1f8000f..7690a299f7eadf6aa43074ecf5433c17c1dbf797 100644 (file)
--- a/libcycript.cy
+++ b/libcycript.cy
@@ -19,24 +19,28 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-var process = {
-    env: {},
-};
-

 (function() {
 
 (function() {
 

+Number.prototype.__defineGetter__('$cyt', function() {
+    if (this.$cyt_)
+        return this.$cyt_;
+    if ((this|0) == this)
+        return int;
+});
+

 this.typeid = function(object) {
     return object.$cyt;
 };
 
 let $cy_set = function(object, properties) {
     for (const name in properties)
 this.typeid = function(object) {
     return object.$cyt;
 };
 
 let $cy_set = function(object, properties) {
     for (const name in properties)

+        if ("defineProperty" in Object)

         Object.defineProperty(object, name, {
             configurable: true,
             enumerable: false,
             writable: true,
             value: properties[name],
         Object.defineProperty(object, name, {
             configurable: true,
             enumerable: false,
             writable: true,
             value: properties[name],

-        });
+        }); else object[name] = properties[name];

 };
 
 $cy_set(Boolean.prototype, {
 };
 
 $cy_set(Boolean.prototype, {


@@ -62,8 +66,12 @@ $cy_set(Error.prototype, {
                 stack = stack.slice(0, -1);
             for (let i = 0; i != stack.length; ++i)
                 stack[i] = '\n    ' + stack[i];
                 stack = stack.slice(0, -1);
             for (let i = 0; i != stack.length; ++i)
                 stack[i] = '\n    ' + stack[i];

-            stack = stack.join('');
-            stack = ` /*${stack} */`;
+            if (stack.length == 0)
+                stack = '';
+            else {
+                stack = stack.join('');
+                stack = ` /*${stack} */`;
+            }

         }
         return `new ${this.constructor.name}(${this.message.toCYON()})${stack}`;
     },
         }
         return `new ${this.constructor.name}(${this.message.toCYON()})${stack}`;
     },


@@ -72,7 +80,8 @@ $cy_set(Error.prototype, {
 $cy_set(Number.prototype, {
     toCYON: function() {
         if ("$cyt" in this)
 $cy_set(Number.prototype, {
     toCYON: function() {
         if ("$cyt" in this)

-            return `${this.$cyt.toCYON()}(${this.toString()})`;
+            //return `${this.$cyt.toCYON()}(${this.toString()})`;
+            return this.toString();

         return `new Number(${this.toString()})`;
     },
 });
         return `new Number(${this.toString()})`;
     },
 });


@@ -83,7 +92,41 @@ $cy_set(RegExp.prototype, {
     },
 });
 
     },
 });
 

+// XXX: Java should just always be available

 if ("Java" in Cycript) {
 if ("Java" in Cycript) {

+
+// XXX: this is a half-assed EventEmitter
+// XXX: this doesn't even have the same semantics
+
+Java.handlers_ = {};
+
+Java.on = function(event, handler) {
+    var handlers;
+    if (event in this.handlers_)
+        handlers = this.handlers_[event];
+    else {
+        handlers = [];
+        this.handlers_[event] = handlers;
+    }
+
+    if (this.handlers_ == null)
+        handler();
+    else
+        handlers.push(handler);
+};
+
+Java.emit = function(event) {
+    if (event in this.handlers_) {
+        var handlers = this.handlers_[event];
+        if (handlers != null)
+            for (var handler of handlers)
+                handler();
+    }
+
+    this.handlers_[event] = null;
+};
+
+Java.on('setup', function() {

     $cy_set(java.lang.Boolean.prototype, {
         toCYON: function() {
             return `new java.lang.Boolean(${this->value})`;
     $cy_set(java.lang.Boolean.prototype, {
         toCYON: function() {
             return `new java.lang.Boolean(${this->value})`;


@@ -150,6 +193,28 @@ if ("Java" in Cycript) {
                 this.put(key, value);
         },
     });
                 this.put(key, value);
         },
     });

+
+    $cy_set(java.lang.Throwable.prototype, {
+        toCYON: function() {
+            var message = this.getMessage();
+            if (message == null)
+                message = '';
+            else
+                message = message.toCYON();
+
+            let stack = this.getStackTrace();
+            if (stack.length == 0)
+                stack = '';
+            else {
+                stack = stack.join('\n    ');
+                stack = ` /*\n    ${stack} */`;
+            }
+
+            return `new ${this.constructor.class.getName()}(${message})${stack}`;
+        },
+    });
+});
+

 }
 
 if ("ObjectiveC" in Cycript) {
 }
 
 if ("ObjectiveC" in Cycript) {


@@ -253,7 +318,7 @@ require.resolve = function(name) {
         if (path != null)
             return path;
     } else {
         if (path != null)
             return path;
     } else {

-        let cwd = new (typedef char[1024]);
+        let cwd = *new (typedef char[1024]);

         cwd = getcwd(cwd, cwd.length).toString();
         cwd = cwd.split('/');
 
         cwd = getcwd(cwd, cwd.length).toString();
         cwd = cwd.split('/');
 


@@ -388,6 +453,8 @@ process.binding = function(name) {
     return binding;
 };
 
     return binding;
 };
 

+process.env = {};
+

 let environ = *(typedef char ***)(dlsym(RTLD_DEFAULT, "environ"));
 for (let i = 0; environ[i] != null; ++i) {
     let assign = environ[i];
 let environ = *(typedef char ***)(dlsym(RTLD_DEFAULT, "environ"));
 for (let i = 0; environ[i] != null; ++i) {
     let assign = environ[i];