From e320385dac8ce3a31e6cf168fe5d0369b31e623f Mon Sep 17 00:00:00 2001 From: c9jenkinsv3 Date: Tue, 6 Feb 2018 05:01:52 +0100 Subject: [PATCH] Tue Feb 6 05:01:51 CET 2018 --- build/standalone/config/default.js | 21 +++++++++++-------- lib/tern/package.json | 2 +- lib/tern_from_ts/package.json | 2 +- .../node_modules/inherits/package.json | 3 +-- node_modules/nak/package.json | 2 +- node_modules/tern/package.json | 2 +- node_modules/tern_from_ts/package.json | 2 +- package.json | 2 +- version | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build/standalone/config/default.js b/build/standalone/config/default.js index 264dab77..e04f3e33 100644 --- a/build/standalone/config/default.js +++ b/build/standalone/config/default.js @@ -84509,9 +84509,6 @@ DbgpSession.prototype.end = function() { }; DbgpSession.prototype._handleInit = function(init) { - if (this.initialized) - throw new Error("Cannot initialize debugger session more than once"); - this.protocolVersion = init["@protocol_version"]; this.appId = init["@appid"]; @@ -85150,7 +85147,7 @@ DbgpClient.prototype.close = function() { }); -define("text!plugins/c9.ide.run.debug.xdebug/netproxy.js",[],"var net = require(\"net\");\n\nvar debug = function() {};\n\nvar host = \"{HOST}\" || \"127.0.0.1\";\nvar port = parseInt(\"{PORT}\", 10) || 9000;\n\nvar browserBuffer = [];\nvar debugBuffer = [];\nvar browserClient;\nvar debugClient;\n\nvar log = console.log;\n\nconsole.warn = console.log = function() {\n return console.error.apply(console, arguments);\n};\nfunction send() {\n log.apply(console, arguments);\n}\nvar browserServer = net.createServer(function(client) {\n debug(\"browserClient::connect\");\n\n if (browserClient)\n browserClient.end();\n\n browserClient = client;\n debugBuffer = [];\n\n browserClient.on(\"end\", function() {\n debug(\"browserClient::end\");\n process.exit(0);\n browserClient = null;\n });\n\n browserClient.on(\"data\", function(data) {\n debug(\"browserClient::data:\", data.toString(\"utf8\"));\n if (debugClient) {\n debugClient.write(data);\n } else {\n debugBuffer.push(data);\n }\n });\n\n if (browserBuffer.length) {\n browserBuffer.forEach(function(data) {\n browserClient.write(data);\n });\n browserBuffer = [];\n }\n});\n\nbrowserServer.listen(port + 1, host, function() {\n debug(\"netproxy listening for browser on port \" + (port + 1));\n start();\n});\n\nbrowserServer.on(\"error\", function(err) {\n console.log(err);\n process.exit(0);\n});\nvar debugServer = net.createServer(function(client) {\n debug(\"debugClient::connect\");\n\n if (debugClient)\n debugClient.end();\n\n debugClient = client;\n\n debugBuffer = [];\n browserBuffer = [];\n\n debugClient.on(\"end\", function() {\n debug(\"debugClient::end\");\n process.exit(0);\n });\n\n debugClient.on(\"data\", function(data) {\n debug(\"debugClient::data:\", data.toString(\"utf8\"));\n if (browserClient) {\n browserClient.write(data);\n } else {\n browserBuffer.push(data);\n }\n });\n\n if (debugBuffer.length) {\n debugBuffer.forEach(function(data) {\n debugClient.write(data);\n });\n debugBuffer = [];\n }\n});\n\ndebugServer.listen(port, host, function() {\n debug(\"netproxy listening for debugger on port \" + port);\n start();\n});\n\ndebugServer.on(\"error\", function(err) {\n console.log(err);\n process.exit(0);\n});\nvar I = 0;\nfunction start() {\n if (++I == 2)\n send(\"ß\");\n}\n"); +define("text!plugins/c9.ide.run.debug.xdebug/netproxy.js",[],"var net = require(\"net\");\nvar fs = require(\"fs\");\n\nvar debug = function() {};\nvar socketPath = process.env.HOME + \"/.c9/xdebug.sock\";\nif (process.platform == \"win32\")\n socketPath = \"\\\\\\\\.\\\\pipe\\\\\" + socketPath.replace(/\\//g, \"\\\\\");\n\nvar host = \"{HOST}\" || \"127.0.0.1\";\nvar port = parseInt(\"{PORT}\", 10) || 9000;\n\nvar browserBuffer = [];\nvar debugBuffer = [];\nvar browserClient;\nvar debugClient;\n\nvar log = console.log;\n\nconsole.warn = console.log = function() {\n return console.error.apply(console, arguments);\n};\nfunction send() {\n log.apply(console, arguments);\n}\n\nvar browserServer = net.createServer(function(client) {\n debug(\"browserClient::connect\");\n\n if (browserClient)\n browserClient.end();\n\n browserClient = client;\n debugBuffer = [];\n\n browserClient.on(\"end\", function() {\n debug(\"browserClient::end\");\n process.exit(0);\n browserClient = null;\n });\n\n browserClient.on(\"data\", function(data) {\n debug(\"browserClient::data:\", data.toString(\"utf8\"));\n if (debugClient) {\n debugClient.write(data);\n } else {\n debugBuffer.push(data);\n }\n });\n\n if (browserBuffer.length) {\n browserBuffer.forEach(function(data) {\n browserClient.write(data);\n });\n browserBuffer = [];\n }\n});\n\n\nif (process.platform !== \"win32\") {\n try {\n fs.unlinkSync(socketPath);\n } catch (e) {\n if (e.code != \"ENOENT\")\n console.log(e);\n }\n}\nbrowserServer.listen(socketPath, function() {\n debug(\"netproxy listening for \" + socketPath);\n start();\n});\n\nbrowserServer.on(\"error\", function(err) {\n console.log(err);\n process.exit(0);\n});\nbrowserServer.on(\"close\", function(err) {\n console.log(err);\n process.exit(0);\n});\n\nvar debugServer = net.createServer(function(client) {\n debug(\"debugClient::connect\");\n\n if (debugClient)\n debugClient.end();\n\n debugClient = client;\n\n debugBuffer = [];\n browserBuffer = [];\n\n debugClient.on(\"end\", function() {\n debug(\"debugClient::end\");\n process.exit(0);\n });\n\n debugClient.on(\"data\", function(data) {\n debug(\"debugClient::data:\", data.toString(\"utf8\"));\n if (browserClient) {\n browserClient.write(data);\n } else {\n browserBuffer.push(data);\n }\n });\n\n if (debugBuffer.length) {\n debugBuffer.forEach(function(data) {\n debugClient.write(data);\n });\n debugBuffer = [];\n }\n});\n\ndebugServer.listen(port, host, function() {\n debug(\"netproxy listening for debugger on port \" + port);\n start();\n});\n\ndebugServer.on(\"error\", function(err) {\n console.log(err);\n process.exit(0);\n});\n\nvar I = 0;\nfunction start() {\n if (++I == 2)\n send(\"ß\");\n}\n"); define("plugins/c9.ide.run.debug.xdebug/xdebug",[], function(require, exports, module) { main.consumes = ["Plugin", "c9", "debugger"]; @@ -85573,11 +85570,17 @@ define("plugins/c9.ide.run.debug.xdebug/xdebug",[], function(require, exports, m } function getProxySource(process) { - return PROXY - .replace(/\/\/.*/g, "") - .replace(/[\n\r]/g, "") - .replace(/\{HOST\}/, process.runner.debughost || "") - .replace(/\{PORT\}/, process.runner.debugport); + var socketPath = c9.home + "/.c9/xdebug.sock"; + if (c9.platform == "win32") + socketPath = "\\\\.\\pipe\\" + socketPath.replace(/\//g, "\\"); + return { + source: PROXY + .replace(/^\s*\/\/.*/gm, "") + .replace(/[\n\r]/g, "") + .replace(/\{HOST\}/, process.runner.debughost || "") + .replace(/\{PORT\}/, process.runner.debugport), + port: socketPath + }; } function setBreakpoints(breakpoints, callback) { diff --git a/lib/tern/package.json b/lib/tern/package.json index 7f493065..23cc0c24 100644 --- a/lib/tern/package.json +++ b/lib/tern/package.json @@ -248,7 +248,7 @@ }, "homepage": "https://github.com/ternjs/tern#readme", "_id": "tern@0.16.1", - "_shasum": "6ba8c12e38fc3f97a9713a907f6c2fe383b2c26a", + "_shasum": "4ca130c0ce663fee9add61de32be700cfede4d07", "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e", "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e" } diff --git a/lib/tern_from_ts/package.json b/lib/tern_from_ts/package.json index aaa56d36..a4b1ffc7 100644 --- a/lib/tern_from_ts/package.json +++ b/lib/tern_from_ts/package.json @@ -20,7 +20,7 @@ "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n", "readmeFilename": "README.md", "_id": "tern_from_ts@0.0.1", - "_shasum": "33a5f1e601081490e83d179b01aa54813e874b2e", + "_shasum": "f0553eb889a809d4bdd920acf43f78259245c70c", "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c", "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c" } diff --git a/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/inherits/package.json b/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/inherits/package.json index 9146e757..f0e62d3c 100644 --- a/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/inherits/package.json +++ b/node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/inherits/package.json @@ -58,6 +58,5 @@ "tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "readme": "ERROR: No README data found!" + "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz" } diff --git a/node_modules/nak/package.json b/node_modules/nak/package.json index 3ddf955b..7ad9f3cf 100644 --- a/node_modules/nak/package.json +++ b/node_modules/nak/package.json @@ -52,7 +52,7 @@ }, "homepage": "https://github.com/gjtorikian/nak#readme", "_id": "nak@0.3.3", - "_shasum": "e32e40932922f3b007d1208d28b1daf65b92ce3e", + "_shasum": "27ac2a29ae9b3a471056f7368730d4c51dae49de", "_from": "git+https://github.com/cloud9ide/nak.git#6deef931594", "_resolved": "git+https://github.com/cloud9ide/nak.git#6deef931594787edd167040f7352e3e7533430e4" } diff --git a/node_modules/tern/package.json b/node_modules/tern/package.json index 7f493065..23cc0c24 100644 --- a/node_modules/tern/package.json +++ b/node_modules/tern/package.json @@ -248,7 +248,7 @@ }, "homepage": "https://github.com/ternjs/tern#readme", "_id": "tern@0.16.1", - "_shasum": "6ba8c12e38fc3f97a9713a907f6c2fe383b2c26a", + "_shasum": "4ca130c0ce663fee9add61de32be700cfede4d07", "_from": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e", "_resolved": "git+https://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e" } diff --git a/node_modules/tern_from_ts/package.json b/node_modules/tern_from_ts/package.json index aaa56d36..a4b1ffc7 100644 --- a/node_modules/tern_from_ts/package.json +++ b/node_modules/tern_from_ts/package.json @@ -20,7 +20,7 @@ "readme": "# tern_from_ts\n\nTern signatures extracted from typescript signatures.\n\nLicense: MIT\n\nSee also https://github.com/marijnh/tern and https://github.com/borisyankov/DefinitelyTyped\n", "readmeFilename": "README.md", "_id": "tern_from_ts@0.0.1", - "_shasum": "33a5f1e601081490e83d179b01aa54813e874b2e", + "_shasum": "f0553eb889a809d4bdd920acf43f78259245c70c", "_from": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c", "_resolved": "git+https://github.com/cloud9ide/tern_from_ts.git#66df507986bbdd63f3bc4f0c53edb39169ce4f1c" } diff --git a/package.json b/package.json index 20466c2c..7102a670 100644 --- a/package.json +++ b/package.json @@ -49,5 +49,5 @@ }, "devDependencies": {}, "licenses": [], - "revision": "6d29c6b3dc2375468218f1dabd67ce6ac1dfa76d" + "revision": "7ba90a03a5584e431261fa8006e87d29532878b7" } diff --git a/version b/version index 650c375d..2b393d6a 100644 --- a/version +++ b/version @@ -1 +1 @@ -1517803307 +1517889708