cloudcms-server 0.9.252 → 0.9.255

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/package.json +13 -13
  2. package/server/index.js +17 -16
  3. package/web/socket.io/socket.io.js +4240 -2
  4. package/web/cms/ice.js +0 -109
  5. package/web/cms/preview.js +0 -106
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  },
7
7
  "name": "cloudcms-server",
8
8
  "description": "Cloud CMS Application Server Module",
9
- "version": "0.9.252",
9
+ "version": "0.9.255",
10
10
  "repository": {
11
11
  "type": "git",
12
12
  "url": "git://github.com/gitana/cloudcms-server.git"
@@ -16,7 +16,7 @@
16
16
  "agentkeepalive": "^4.1.3",
17
17
  "alpaca": "^1.5.27",
18
18
  "archiver": "^1.3.0",
19
- "async": "^1.5.2",
19
+ "async": "^3.2.3",
20
20
  "aws-sdk": "^2.544.0",
21
21
  "basic-auth": "^1.1.0",
22
22
  "body-parser": "^1.19.0",
@@ -25,18 +25,18 @@
25
25
  "clone": "^2.1.2",
26
26
  "connect-flash": "^0.1.1",
27
27
  "connect-multiparty": "^2.2.0",
28
- "connect-redis": "^3.4.2",
28
+ "connect-redis": "^6.1.3",
29
29
  "consolidate": "^0.14.5",
30
30
  "cookie-parser": "^1.4.4",
31
31
  "debug": "^2.6.9",
32
- "dustjs-helpers": "^1.7.4",
33
- "dustjs-linkedin": "^2.7.5",
32
+ "dustjs-helpers": "^1.6.3",
33
+ "dustjs-linkedin": "^3.0.1",
34
34
  "errorhandler": "^1.5.1",
35
35
  "express": "^4.17.1",
36
36
  "express-session": "^1.16.2",
37
37
  "express-useragent": "^1.0.13",
38
38
  "extend-with-super": "^2.0.0",
39
- "gitana": "^1.0.315",
39
+ "gitana": "^1.0.322",
40
40
  "handlebars": "^4.4.2",
41
41
  "hbs": "^4.0.5",
42
42
  "helmet": "^4.6.0",
@@ -45,13 +45,13 @@
45
45
  "jsonwebtoken": "^8.5.1",
46
46
  "klaw": "^1.3.1",
47
47
  "lru-cache": "^4.1.5",
48
- "marked": "^1.2.8",
48
+ "marked": "^4.0.14",
49
49
  "memorystore": "^1.6.1",
50
50
  "mime": "^1.6.0",
51
51
  "mkdirp": "^0.5.1",
52
52
  "moment": "^2.24.0",
53
53
  "morgan": "^1.9.1",
54
- "node-redis-pubsub": "^1.0.3",
54
+ "node-redis-pubsub": "^5.0.0",
55
55
  "object-hash": "^1.3.1",
56
56
  "object-merge": "^2.5.1",
57
57
  "on-headers": "^1.0.2",
@@ -63,13 +63,13 @@
63
63
  "passport-linkedin": "^1.0.0",
64
64
  "passport-local": "^1.0.0",
65
65
  "passport-oauth": "^1.0.0",
66
- "passport-saml": "^2.0.4",
67
- "passport-twitter": "^1.0.4",
66
+ "passport-saml": "^3.2.1",
67
+ "passport-twitter": "^0.1.5",
68
68
  "pkginfo": "^0.4.1",
69
69
  "q": "^1.5.1",
70
70
  "random-js": "^1.0.8",
71
71
  "recursive-readdir": "^2.2.2",
72
- "redis": "^2.8.0",
72
+ "redis": "^4.0.6",
73
73
  "redislock": "^1.3.0",
74
74
  "request": "^2.88.0",
75
75
  "request-param": "^1.0.1",
@@ -79,7 +79,7 @@
79
79
  "serve-favicon": "^2.5.0",
80
80
  "session-file-store": "^0.2.2",
81
81
  "sha1": "^1.1.1",
82
- "socket.io": "2.0.3",
82
+ "socket.io": "^4.4.1",
83
83
  "ssl-root-cas": "^1.3.1",
84
84
  "sticky-session": "^1.1.2",
85
85
  "stomp-client": "^0.9.0",
@@ -88,7 +88,7 @@
88
88
  "toobusy-js": "^0.5.1",
89
89
  "uuid": "^3.3.2",
90
90
  "vm2": "^3.8.4",
91
- "watch": "^1.0.2",
91
+ "watch": "^0.13.0",
92
92
  "winston": "^3.3.3"
93
93
  },
94
94
  "contributors": [
package/server/index.js CHANGED
@@ -313,12 +313,12 @@ var SETTINGS = {
313
313
  process.env.PORT = process.env.PORT || 2999;
314
314
 
315
315
  // allows for specification of alternative transports
316
- SETTINGS.socketTransports = [
317
- 'websocket',
318
- 'xhr-polling',
319
- 'jsonp-polling',
320
- 'polling'
321
- ];
316
+ // SETTINGS.socketTransports = [
317
+ // 'websocket',
318
+ // 'xhr-polling',
319
+ // 'jsonp-polling',
320
+ // 'polling'
321
+ // ];
322
322
 
323
323
  var exports = module.exports;
324
324
 
@@ -1118,15 +1118,15 @@ var startSlave = function(config, afterStartFn)
1118
1118
 
1119
1119
 
1120
1120
  // create the server (either HTTP or HTTPS)
1121
- var server = null;
1121
+ var httpServer = null;
1122
1122
  if (process.configuration.https) {
1123
1123
  // configure helmet to support auto-upgrade of http->https
1124
1124
  app.use(helmet());
1125
1125
  // create https server
1126
- server = https.createServer(process.configuration.https, app);
1126
+ httpServer = https.createServer(process.configuration.https, app);
1127
1127
  } else {
1128
1128
  // legacy
1129
- server = http.Server(app);
1129
+ httpServer = http.Server(app);
1130
1130
  }
1131
1131
 
1132
1132
  // request timeout
@@ -1135,14 +1135,15 @@ var startSlave = function(config, afterStartFn)
1135
1135
  {
1136
1136
  requestTimeout = process.configuration.timeout;
1137
1137
  }
1138
- server.setTimeout(requestTimeout);
1138
+ httpServer.setTimeout(requestTimeout);
1139
1139
 
1140
1140
  // socket
1141
- server.on("connection", function (socket) {
1141
+ httpServer.on("connection", function (socket) {
1142
1142
  socket.setNoDelay(true);
1143
1143
  });
1144
- var io = process.IO = require("socket.io")(server);
1145
- io.set('transports', config.socketTransports);
1144
+ const { Server } = require("socket.io");
1145
+ var io = process.IO = new Server(httpServer);
1146
+ //io.set('transports', config.socketTransports);
1146
1147
  io.use(function (socket, next) {
1147
1148
 
1148
1149
  // console.log("New socket being initialized");
@@ -1234,7 +1235,7 @@ var startSlave = function(config, afterStartFn)
1234
1235
  // APPLY SERVER BEFORE START FUNCTIONS
1235
1236
  runFunctions(config.beforeFunctions, [app], function (err) {
1236
1237
 
1237
- server._listenPort = app.get("port");
1238
+ httpServer._listenPort = app.get("port");
1238
1239
 
1239
1240
  // AFTER SERVER START
1240
1241
  runFunctions(config.afterFunctions, [app], function (err) {
@@ -1254,7 +1255,7 @@ var startSlave = function(config, afterStartFn)
1254
1255
 
1255
1256
  try
1256
1257
  {
1257
- server.close();
1258
+ httpServer.close();
1258
1259
  }
1259
1260
  catch (e)
1260
1261
  {
@@ -1295,7 +1296,7 @@ var startSlave = function(config, afterStartFn)
1295
1296
  process.send("server-startup");
1296
1297
  }
1297
1298
 
1298
- afterStartFn(app, server);
1299
+ afterStartFn(app, httpServer);
1299
1300
 
1300
1301
  });
1301
1302
  });