working on getting brackets stuff integrated

Author: joelrbrandt

src/mac/node-shell-lib/node-shell-lib.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		7F8AD1901576B9450056914F /* config.js in Resources */ = {isa = PBXBuildFile; fileRef = 7F8AD18B1576B90D0056914F /* config.js */; };
+		7F8AD1911576B9490056914F /* clientProxy.js in Resources */ = {isa = PBXBuildFile; fileRef = 7F8AD18A1576B90D0056914F /* clientProxy.js */; };
+		7F8AD1921576B94D0056914F /* server.js in Resources */ = {isa = PBXBuildFile; fileRef = 7F8AD18D1576B90D0056914F /* server.js */; };
 		7FC7108F1576B348009262BF /* cocoanode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FC710491576A10A009262BF /* cocoanode.mm */; };
 		7FC710901576B4D7009262BF /* cocoanode.node in Resources */ = {isa = PBXBuildFile; fileRef = 7FC7108B1576B334009262BF /* cocoanode.node */; };
 		7FED295A1574F34F0027444F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FED29591574F34F0027444F /* Cocoa.framework */; };
@@ -16,7 +19,6 @@
 		7FED296D1574F34F0027444F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FED296C1574F34F0027444F /* AppDelegate.m */; };
 		7FED29701574F34F0027444F /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7FED296E1574F34F0027444F /* MainMenu.xib */; };
 		7FED29771574F5090027444F /* libnode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FED29761574F5090027444F /* libnode.dylib */; };
-		7FED299C1574F61F0027444F /* server.js in Resources */ = {isa = PBXBuildFile; fileRef = 7FED299A1574F5E80027444F /* server.js */; };
 		7FED299F1574F6D50027444F /* NodeWrapper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7FED299E1574F6D50027444F /* NodeWrapper.mm */; };
 		7FED29A01574F7B60027444F /* libnode.dylib in Resources */ = {isa = PBXBuildFile; fileRef = 7FED29761574F5090027444F /* libnode.dylib */; };
 /* End PBXBuildFile section */
@@ -32,6 +34,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		7F8AD18A1576B90D0056914F /* clientProxy.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = clientProxy.js; sourceTree = "<group>"; };
+		7F8AD18B1576B90D0056914F /* config.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = config.js; sourceTree = "<group>"; };
+		7F8AD18C1576B90D0056914F /* package.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = package.json; sourceTree = "<group>"; };
+		7F8AD18D1576B90D0056914F /* server.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = server.js; sourceTree = "<group>"; };
 		7FC710491576A10A009262BF /* cocoanode.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = cocoanode.mm; sourceTree = "<group>"; };
 		7FC710541576AA95009262BF /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		7FC7108B1576B334009262BF /* cocoanode.node */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = cocoanode.node; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -72,7 +78,6 @@
 		7FED29901574F55F0027444F /* v8-testing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "v8-testing.h"; sourceTree = "<group>"; };
 		7FED29911574F55F0027444F /* v8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8.h; sourceTree = "<group>"; };
 		7FED29921574F55F0027444F /* v8stdint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v8stdint.h; sourceTree = "<group>"; };
-		7FED299A1574F5E80027444F /* server.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = server.js; sourceTree = "<group>"; };
 		7FED299D1574F6D50027444F /* NodeWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeWrapper.h; sourceTree = "<group>"; };
 		7FED299E1574F6D50027444F /* NodeWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NodeWrapper.mm; sourceTree = "<group>"; };
 		7FED29A21574FA3C0027444F /* libnode_readme.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = libnode_readme.txt; sourceTree = "<group>"; };
@@ -98,6 +103,17 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		7F8AD1881576B90D0056914F /* server */ = {
+			isa = PBXGroup;
+			children = (
+				7F8AD18A1576B90D0056914F /* clientProxy.js */,
+				7F8AD18B1576B90D0056914F /* config.js */,
+				7F8AD18C1576B90D0056914F /* package.json */,
+				7F8AD18D1576B90D0056914F /* server.js */,
+			);
+			path = server;
+			sourceTree = "<group>";
+		};
 		7FED294A1574F34F0027444F = {
 			isa = PBXGroup;
 			children = (
@@ -139,12 +155,12 @@
 		7FED295F1574F34F0027444F /* node-shell-lib */ = {
 			isa = PBXGroup;
 			children = (
+				7F8AD1881576B90D0056914F /* server */,
 				7FED29781574F5300027444F /* include */,
 				7FED296B1574F34F0027444F /* AppDelegate.h */,
 				7FED296C1574F34F0027444F /* AppDelegate.m */,
 				7FED296E1574F34F0027444F /* MainMenu.xib */,
 				7FED29601574F34F0027444F /* Supporting Files */,
-				7FED299A1574F5E80027444F /* server.js */,
 				7FED299D1574F6D50027444F /* NodeWrapper.h */,
 				7FED299E1574F6D50027444F /* NodeWrapper.mm */,
 				7FC710491576A10A009262BF /* cocoanode.mm */,
@@ -257,6 +273,7 @@
 				7FED29511574F34F0027444F /* Sources */,
 				7FED29521574F34F0027444F /* Frameworks */,
 				7FED29531574F34F0027444F /* Resources */,
+				7F8AD1931576B9590056914F /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -300,9 +317,11 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7F8AD1921576B94D0056914F /* server.js in Resources */,
+				7F8AD1911576B9490056914F /* clientProxy.js in Resources */,
+				7F8AD1901576B9450056914F /* config.js in Resources */,
 				7FC710901576B4D7009262BF /* cocoanode.node in Resources */,
 				7FED29A01574F7B60027444F /* libnode.dylib in Resources */,
-				7FED299C1574F61F0027444F /* server.js in Resources */,
 				7FED29641574F34F0027444F /* InfoPlist.strings in Resources */,
 				7FED296A1574F34F0027444F /* Credits.rtf in Resources */,
 				7FED29701574F34F0027444F /* MainMenu.xib in Resources */,
@@ -311,6 +330,22 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		7F8AD1931576B9590056914F /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "cp -r ../../../node/node_modules $BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		7FC710871576B334009262BF /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -483,6 +518,7 @@
 				7FC7108E1576B334009262BF /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		7FED294F1574F34F0027444F /* Build configuration list for PBXProject "node-shell-lib" */ = {
 			isa = XCConfigurationList;

src/mac/node-shell-lib/node-shell-lib/cocoanode.mm

@@ -12,23 +12,69 @@
 #include <node.h>
 #include <v8.h>
 
-v8::Handle<v8::Value> Method(const v8::Arguments& args);
+v8::Handle<v8::Value> getSomeFiles(const v8::Arguments& args);
 void init(v8::Handle<v8::Object> target);
+NSString* NSArrayToJSONString(NSArray* array);
+NSString* showOpenDialog();
 
-v8::Handle<v8::Value> Method(const v8::Arguments& args) {
+
+v8::Handle<v8::Value> getSomeFiles(const v8::Arguments& args) {
     v8::HandleScope scope;
-    NSAlert *alert = [[NSAlert alloc] init];
-    [alert addButtonWithTitle:@"OK"];
-    [alert addButtonWithTitle:@"Cancel"];
-    [alert setMessageText:@"Delete the record?"];
-    [alert setInformativeText:@"Deleted records cannot be restored."];
-    [alert setAlertStyle:NSWarningAlertStyle];
-    [alert runModal];
-    return scope.Close(v8::String::New("world shmirld"));
+    NSString* result = showOpenDialog();
+    return scope.Close(v8::String::New([result UTF8String]));
 }
 
 void init(v8::Handle<v8::Object> target) {
-    target->Set(v8::String::NewSymbol("hello"),
-                v8::FunctionTemplate::New(Method)->GetFunction());
+    target->Set(v8::String::NewSymbol("getSomeFiles"),
+                v8::FunctionTemplate::New(getSomeFiles)->GetFunction());
+}
+
+NSString* NSArrayToJSONString(NSArray* array) {        
+    int numItems = [array count];
+    NSString* escapedStr = @"";
+    NSMutableString* result = [[[NSMutableString alloc] initWithString:@"["] autorelease];
+    NSString* item;
+    
+    for (int i = 0; i < numItems; i++)
+    {
+        [result appendString:@"\""];
+        
+        item = [array objectAtIndex:i];
+        escapedStr = item; //EscapeJSONString(item, escapedStr);
+        
+        [result appendString:escapedStr];
+        [result appendString:@"\""];
+        
+        
+        if (i < numItems - 1)
+            [result appendString:@", "];
+    }
+    [result appendString:@"]"];
+    
+    return result;
+}
+
+
+NSString* showOpenDialog() {
+    NSString* result = @"";  
+    NSArray* allowedFileTypes = nil;
+        
+    // Initialize the dialog
+    NSOpenPanel* openPanel = [NSOpenPanel openPanel];
+    [openPanel setCanChooseFiles:YES];
+    [openPanel setCanChooseDirectories:NO];
+    [openPanel setCanCreateDirectories:YES];
+    [openPanel setAllowsMultipleSelection:NO];
+    [openPanel setTitle: @"Exciting times!"];
+    
+    [openPanel setAllowedFileTypes:allowedFileTypes];
+    
+    if ([openPanel runModal] == NSOKButton)
+    {
+        NSArray *f = [openPanel filenames];
+        result = NSArrayToJSONString(f);
+    }
+    
+    return result;
 }
 NODE_MODULE(cocoanode, init)

src/mac/node-shell-lib/node-shell-lib/server.js

@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint sloppy: true, vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global global, require, exports, process, setInterval */
+
+var fs = require('fs');
+var cocoa = require('./cocoanode');
+
+var websocket = null;
+
+// add some stuff to fs because the return types are sometimes complicated objects that don't jsonify
+fs.statBrackets = function (path, callback) {
+    fs.stat(path, function (err, stats) {
+        var result;
+        if (err) {
+            callback(err, null);
+        } else {
+            result = {};
+            result.isFile = stats.isFile();
+            result.isDirectory = stats.isDirectory();
+            result.mtime = stats.mtime;
+            result.filesize = stats.size;
+            callback(0, result); // TODO: hack, need handling of error being null in callbacks on client side
+        }
+    });
+};
+
+// A test namespace
+
+var stupid = {};
+
+stupid.reverse = function (s) {
+    return s.split("").reverse().join("");
+};
+
+// end test namespace
+
+// app namespace
+
+var app = {};
+
+app.showOpenDialog = function(allowMultipleSelection, chooseDirectory, title, initialPath, fileTypes, callback) {
+    console.log("trying to get some files");
+    var files = cocoa.getSomeFiles();
+    console.log("got some files: " + files);
+    callback(null, JSON.parse(files));
+}
+
+var namespaces = {
+    app : app,
+    fs : fs,
+    stupid : stupid
+};
+
+function createCallback(id, ws) {
+    return function () {
+        var args = Array.prototype.slice.call(arguments);
+        if (websocket !== null) {
+            console.warn("Sending callback for " + id + " with args " + args);
+            websocket.send(JSON.stringify({id: id, result: args}));
+        }
+    };
+}
+
+function doCommand(id, namespace, command, args, isAsync, ws) {
+    try {
+        var f = namespaces[namespace][command];
+        var callback = createCallback(id, ws);
+        if (isAsync) {
+            args.push(callback);
+            f.apply(global, args);
+        } else {
+            callback(f.apply(global, args));
+        }
+    } catch (e) {
+        console.log("Error: Couldn't run the command " + namespace + "." + command + " with args " + JSON.stringify(args));
+    }
+}
+
+function receiveData(message) {
+    var m;
+    console.log('received: %s', message);
+    try {
+        m = JSON.parse(message);
+        //console.log('parsed version:');
+        //console.log(m);
+        doCommand(m.id, m.namespace, m.command, m.args, m.isAsync);
+    } catch (e) {
+        console.log("Error: could't parse the message or something");
+    }
+}
+
+function setWebsocket(ws) {
+    console.warn("setting new websocket");
+    if (websocket !== null) {
+        websocket.close();
+    }
+    websocket = ws;
+    websocket.on('message', function (message) {
+        var m;
+        console.log('received: %s', message);
+        try {
+            m = JSON.parse(message);
+            //console.log('parsed version:');
+            //console.log(m);
+            doCommand(m.id, m.namespace, m.command, m.args, m.isAsync, ws);
+        } catch (e) {
+            console.log("Error: could't parse the message or something");
+        }
+    });
+}
+
+exports.setWebsocket = setWebsocket;

src/mac/node-shell-lib/node-shell-lib/server/clientProxy.js

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */
+
+/*jslint sloppy: true, vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*global module */
+
+module.exports = {
+	clientPath: '/Users/jbrandt/development/brackets-app/brackets/src/'
+};