v7.0.0 - Rename AGC to SCC

Author: jondubois

README.md

@@ -1,7 +1,7 @@
-# agc-integration-tests
-Integration tests for AGC
+# scc-integration-tests
+Integration tests for SCC
 
-These integration tests simulate basic and advanced scenarios that may be encountered in AGC.
+These integration tests simulate basic and advanced scenarios that may be encountered in SCC.
 The goal of each test scenario is to spawn up a cluster and change its state while clients are simultaneously publishing and consuming channel data to/from various instances within that cluster.
 
 To run the tests, you need to have Node.js and Docker installed - You should be able to run the `docker` command from your user account without sudo.
@@ -12,10 +12,10 @@ Then:
 3. Run `npm install`
 4. Run `npm test`
 
-Note that if you've built an AGC architecture with some custom instances, you can swap out the default Docker images with your own images in `config.js`.
+Note that if you've built an SCC architecture with some custom instances, you can swap out the default Docker images with your own images in `config.js`.
 
 If you find new failure scenarios that you would like someone to look at and/or resolve, feel free to open a pull request on this repo so that we can start working on a fix.
 
 Please put long/complex test scenarios in a separate file under the `test/` directory.
 
-The goal of this project is to help the Asyngular/SC community share solutions and to build up a comprehensive set of test scenarios to help everyone build more robust systems on top of the AGC architecture.
+The goal of this project is to help the SocketCluster/SC community share solutions and to build up a comprehensive set of test scenarios to help everyone build more robust systems on top of the SCC architecture.

client-indirect-publishers.js

@@ -1,4 +1,4 @@
-let asyngularClient = require('asyngular-client');
+let socketClusterClient = require('socketcluster-client');
 let argv = require('minimist')(process.argv.slice(2));
 
 let options = JSON.parse(argv.options || '{}');
@@ -24,7 +24,7 @@ let c = 0;
 
 for (let i = 0; i < clientCount; i++) {
   let intervalRandomness = Math.random() * publishRandomness;
-  let socket = asyngularClient.create(clientOptions);
+  let socket = socketClusterClient.create(clientOptions);
 
   (async () => {
     for await (let {error} of socket.listener('error')) {

client-publishers.js

@@ -1,4 +1,4 @@
-let asyngularClient = require('asyngular-client');
+let socketClusterClient = require('socketcluster-client');
 let argv = require('minimist')(process.argv.slice(2));
 
 let options = JSON.parse(argv.options || '{}');
@@ -24,7 +24,7 @@ let c = 0;
 
 for (let i = 0; i < clientCount; i++) {
   let intervalRandomness = Math.random() * publishRandomness;
-  let socket = asyngularClient.create(clientOptions);
+  let socket = socketClusterClient.create(clientOptions);
 
   (async () => {
     for await (let {error} of socket.listener('error')) {

client-subscribers.js

@@ -1,4 +1,4 @@
-let asyngularClient = require('asyngular-client');
+let socketClusterClient = require('socketcluster-client');
 let argv = require('minimist')(process.argv.slice(2));
 
 let options = JSON.parse(argv.options || '{}');
@@ -22,7 +22,7 @@ let pendingSubscriptionPromises = [];
 let c = 0;
 
 for (let i = 0; i < clientCount; i++) {
-  let socket = asyngularClient.create(clientOptions);
+  let socket = socketClusterClient.create(clientOptions);
 
   (async () => {
     for await (let {error} of socket.listener('error')) {

config.js

@@ -2,18 +2,18 @@ let path = require('path');
 
 module.exports = {
   state: {
-    imageName: 'socketcluster/agc-state',
-    versionTag: 'v6.0.0',
+    imageName: 'socketcluster/scc-state',
+    versionTag: 'v7.0.0',
     internalContainerPort: 7777
   },
   worker: {
-    imageName: 'socketcluster/asyngular',
-    versionTag: 'v6.1.1',
+    imageName: 'socketcluster/socketcluster',
+    versionTag: 'v15.0.6',
     internalContainerPort: 8000
   },
   broker: {
-    imageName: 'socketcluster/agc-broker',
-    versionTag: 'v6.0.0',
+    imageName: 'socketcluster/scc-broker',
+    versionTag: 'v7.0.0',
     internalContainerPort: 8888
   },
   subscriberInstancePath: path.resolve(__dirname, 'client-subscribers.js'),

controllers/server.js

@@ -1,43 +1,43 @@
 const http = require('http');
 const eetase = require('eetase');
-const asyngularServer = require('asyngular-server');
+const socketClusterServer = require('socketcluster-server');
 const express = require('express');
 const serveStatic = require('serve-static');
 const path = require('path');
 const morgan = require('morgan');
 const uuid = require('uuid');
-const agcBrokerClient = require('agc-broker-client');
+const sccBrokerClient = require('scc-broker-client');
 
 const ENVIRONMENT = process.env.ENV || 'dev';
-const ASYNGULAR_PORT = process.env.ASYNGULAR_PORT || 8000;
-const ASYNGULAR_WS_ENGINE = process.env.ASYNGULAR_WS_ENGINE || 'ws';
-const ASYNGULAR_SOCKET_CHANNEL_LIMIT = Number(process.env.ASYNGULAR_SOCKET_CHANNEL_LIMIT) || 1000;
-const ASYNGULAR_LOG_LEVEL = process.env.ASYNGULAR_LOG_LEVEL || 2;
-
-const AGC_INSTANCE_ID = uuid.v4();
-const AGC_STATE_SERVER_HOST = process.env.AGC_STATE_SERVER_HOST || null;
-const AGC_STATE_SERVER_PORT = process.env.AGC_STATE_SERVER_PORT || null;
-const AGC_MAPPING_ENGINE = process.env.AGC_MAPPING_ENGINE || null;
-const AGC_CLIENT_POOL_SIZE = process.env.AGC_CLIENT_POOL_SIZE || null;
-const AGC_AUTH_KEY = process.env.AGC_AUTH_KEY || null;
-const AGC_INSTANCE_IP = process.env.AGC_INSTANCE_IP || null;
-const AGC_INSTANCE_IP_FAMILY = process.env.AGC_INSTANCE_IP_FAMILY || null;
-const AGC_STATE_SERVER_CONNECT_TIMEOUT = Number(process.env.AGC_STATE_SERVER_CONNECT_TIMEOUT) || null;
-const AGC_STATE_SERVER_ACK_TIMEOUT = Number(process.env.AGC_STATE_SERVER_ACK_TIMEOUT) || null;
-const AGC_STATE_SERVER_RECONNECT_RANDOMNESS = Number(process.env.AGC_STATE_SERVER_RECONNECT_RANDOMNESS) || null;
-const AGC_PUB_SUB_BATCH_DURATION = Number(process.env.AGC_PUB_SUB_BATCH_DURATION) || null;
-const AGC_BROKER_RETRY_DELAY = Number(process.env.AGC_BROKER_RETRY_DELAY) || null;
+const SOCKETCLUSTER_PORT = process.env.SOCKETCLUSTER_PORT || 8000;
+const SOCKETCLUSTER_WS_ENGINE = process.env.SOCKETCLUSTER_WS_ENGINE || 'ws';
+const SOCKETCLUSTER_SOCKET_CHANNEL_LIMIT = Number(process.env.SOCKETCLUSTER_SOCKET_CHANNEL_LIMIT) || 1000;
+const SOCKETCLUSTER_LOG_LEVEL = process.env.SOCKETCLUSTER_LOG_LEVEL || 2;
+
+const SCC_INSTANCE_ID = uuid.v4();
+const SCC_STATE_SERVER_HOST = process.env.SCC_STATE_SERVER_HOST || null;
+const SCC_STATE_SERVER_PORT = process.env.SCC_STATE_SERVER_PORT || null;
+const SCC_MAPPING_ENGINE = process.env.SCC_MAPPING_ENGINE || null;
+const SCC_CLIENT_POOL_SIZE = process.env.SCC_CLIENT_POOL_SIZE || null;
+const SCC_AUTH_KEY = process.env.SCC_AUTH_KEY || null;
+const SCC_INSTANCE_IP = process.env.SCC_INSTANCE_IP || null;
+const SCC_INSTANCE_IP_FAMILY = process.env.SCC_INSTANCE_IP_FAMILY || null;
+const SCC_STATE_SERVER_CONNECT_TIMEOUT = Number(process.env.SCC_STATE_SERVER_CONNECT_TIMEOUT) || null;
+const SCC_STATE_SERVER_ACK_TIMEOUT = Number(process.env.SCC_STATE_SERVER_ACK_TIMEOUT) || null;
+const SCC_STATE_SERVER_RECONNECT_RANDOMNESS = Number(process.env.SCC_STATE_SERVER_RECONNECT_RANDOMNESS) || null;
+const SCC_PUB_SUB_BATCH_DURATION = Number(process.env.SCC_PUB_SUB_BATCH_DURATION) || null;
+const SCC_BROKER_RETRY_DELAY = Number(process.env.SCC_BROKER_RETRY_DELAY) || null;
 
 let agOptions;
 
-if (process.env.ASYNGULAR_OPTIONS) {
-  agOptions = JSON.parse(process.env.ASYNGULAR_OPTIONS);
+if (process.env.SOCKETCLUSTER_OPTIONS) {
+  agOptions = JSON.parse(process.env.SOCKETCLUSTER_OPTIONS);
 } else {
   agOptions = {};
 }
 
 let httpServer = eetase(http.createServer());
-let agServer = asyngularServer.attach(httpServer, agOptions);
+let agServer = socketClusterServer.attach(httpServer, agOptions);
 
 let expressApp = express();
 if (ENVIRONMENT === 'dev') {
@@ -59,17 +59,17 @@ expressApp.get('/health-check', (req, res) => {
   }
 })();
 
-if (ASYNGULAR_LOG_LEVEL >= 1) {
+if (SOCKETCLUSTER_LOG_LEVEL >= 1) {
   (async () => {
     for await (let {error} of agServer.listener('error')) {
       console.error(error);
     }
   })();
 }
 
-if (ASYNGULAR_LOG_LEVEL >= 2) {
+if (SOCKETCLUSTER_LOG_LEVEL >= 2) {
   console.log(
-    `   ${colorText('[Active]', 32)} Asyngular worker with PID ${process.pid} is listening on port ${ASYNGULAR_PORT}`
+    `   ${colorText('[Active]', 32)} SocketCluster worker with PID ${process.pid} is listening on port ${SOCKETCLUSTER_PORT}`
   );
 
   (async () => {
@@ -88,29 +88,29 @@ function colorText(message, color) {
 
 let stats = {};
 
-if (AGC_STATE_SERVER_HOST) {
-  // Setup broker client to connect to the Asyngular cluster (AGC).
-  let agcClient = agcBrokerClient.attach(agServer.brokerEngine, {
-    instanceId: AGC_INSTANCE_ID,
-    instancePort: ASYNGULAR_PORT,
-    instanceIp: AGC_INSTANCE_IP,
-    instanceIpFamily: AGC_INSTANCE_IP_FAMILY,
-    pubSubBatchDuration: AGC_PUB_SUB_BATCH_DURATION,
-    stateServerHost: AGC_STATE_SERVER_HOST,
-    stateServerPort: AGC_STATE_SERVER_PORT,
-    mappingEngine: AGC_MAPPING_ENGINE,
-    clientPoolSize: AGC_CLIENT_POOL_SIZE,
-    authKey: AGC_AUTH_KEY,
-    stateServerConnectTimeout: AGC_STATE_SERVER_CONNECT_TIMEOUT,
-    stateServerAckTimeout: AGC_STATE_SERVER_ACK_TIMEOUT,
-    stateServerReconnectRandomness: AGC_STATE_SERVER_RECONNECT_RANDOMNESS,
-    brokerRetryDelay: AGC_BROKER_RETRY_DELAY
+if (SCC_STATE_SERVER_HOST) {
+  // Setup broker client to connect to the SocketCluster cluster (SCC).
+  let sccClient = sccBrokerClient.attach(agServer.brokerEngine, {
+    instanceId: SCC_INSTANCE_ID,
+    instancePort: SOCKETCLUSTER_PORT,
+    instanceIp: SCC_INSTANCE_IP,
+    instanceIpFamily: SCC_INSTANCE_IP_FAMILY,
+    pubSubBatchDuration: SCC_PUB_SUB_BATCH_DURATION,
+    stateServerHost: SCC_STATE_SERVER_HOST,
+    stateServerPort: SCC_STATE_SERVER_PORT,
+    mappingEngine: SCC_MAPPING_ENGINE,
+    clientPoolSize: SCC_CLIENT_POOL_SIZE,
+    authKey: SCC_AUTH_KEY,
+    stateServerConnectTimeout: SCC_STATE_SERVER_CONNECT_TIMEOUT,
+    stateServerAckTimeout: SCC_STATE_SERVER_ACK_TIMEOUT,
+    stateServerReconnectRandomness: SCC_STATE_SERVER_RECONNECT_RANDOMNESS,
+    brokerRetryDelay: SCC_BROKER_RETRY_DELAY
   });
 
-  if (ASYNGULAR_LOG_LEVEL >= 1) {
+  if (SOCKETCLUSTER_LOG_LEVEL >= 1) {
     (async () => {
-      for await (let {error} of agcClient.listener('error')) {
-        error.name = 'AGCError';
+      for await (let {error} of sccClient.listener('error')) {
+        error.name = 'SCCError';
         console.error(error);
       }
     })();
@@ -135,33 +135,33 @@ if (AGC_STATE_SERVER_HOST) {
   }
 
   (async () => {
-    for await (let data of agcClient.listener('subscribe')) {
+    for await (let data of sccClient.listener('subscribe')) {
       handleEventData('subscribe', data);
     }
   })();
 
   (async () => {
-    for await (let data of agcClient.listener('subscribeFail')) {
+    for await (let data of sccClient.listener('subscribeFail')) {
       handleEventData('subscribeFail', data);
     }
   })();
 
   (async () => {
-    for await (let data of agcClient.listener('publish')) {
+    for await (let data of sccClient.listener('publish')) {
       handleEventData('publish', data);
     }
   })();
 
   (async () => {
-    for await (let data of agcClient.listener('publishFail')) {
+    for await (let data of sccClient.listener('publishFail')) {
       handleEventData('publishFail', data);
     }
   })();
 
   // ---- End stats collections ----
 }
 
-// Asyngular/WebSocket connection handling loop.
+// SocketCluster/WebSocket connection handling loop.
 (async () => {
   for await (let {socket} of agServer.listener('connection')) {
     // Handle socket connection.
@@ -182,4 +182,4 @@ if (AGC_STATE_SERVER_HOST) {
   }
 })();
 
-httpServer.listen(ASYNGULAR_PORT);
+httpServer.listen(SOCKETCLUSTER_PORT);