@things-factory/shell 7.0.14 → 7.0.28

package/config/config.development.js

@@ -55,7 +55,7 @@ module.exports = {
    * pubsub configuration
    * ie.
    * pubsub: {
-   *   middleware: 'redis', // empty, redis, mqtt, redisCluster
+   *   middleware: 'redis',
    *   host: 'redis',
    *   port: 6379,
    *   options: {
@@ -64,7 +64,7 @@ module.exports = {
    * }
    *
    * pubsub: {
-   *   middleware: 'redisCluster', // empty, redis, mqtt, redisCluster
+   *   middleware: 'redisCluster',
    *   nodes: [
    *      { host: '{endpoint1}', port: 6379 },
    *      { host: '{endpoint2}', port: 6379 },
@@ -73,38 +73,6 @@ module.exports = {
    *     ...
    *   }
    * }
-   *
-   * pubsub: {
-   *   middleware: 'kafka',
-   *   topic: 'operato-app-graphql-pubsub'
-   *   host: 'b-3.kafka-server:9092,b-1.kafka-server:9092,b-2.kafka-server:9092',
-   *   options: {
-   *      ...
-   *   }
-   * }
-   *
-   * pubsub: {
-   *   middleware: 'kafka',
-   *   host: 'confluent.cloud:9092',
-   *   topic: 'operato-app-graphql-pubsub',
-   *   options: {
-   *     globalConfig: {
-   *       "sasl.mechanisms": "PLAIN",
-   *       "security.protocol": "SASL_SSL",
-   *       "sasl.username": "{CLOUD_KEY}",
-   *       "sasl.password": "{CLOUD_SECRET_KEY}"
-   *     }
-   *   }
-   * }
-   *
-   * pubsub: {
-   *   middleware: 'mqtt',
-   *   host: 'mosquitto',
-   *   port: 1884,
-   *   options: {
-   *     ...
-   *   }
-   * }
    */
   ormconfig: {
     name: 'default',

package/config/config.production.js

@@ -73,32 +73,11 @@ module.exports = {
    * }
    *
    * pubsub: {
-   *   middleware: 'kafka',
-   *   topic: 'operato-app-graphql-pubsub'
-   *   host: 'b-3.kafka-server:9092,b-1.kafka-server:9092,b-2.kafka-server:9092',
-   *   options: {
-   *      ...
-   *   }
-   * }
-   *
-   * pubsub: {
-   *   middleware: 'kafka',
-   *   host: 'confluent.cloud:9092',
-   *   topic: 'operato-app-graphql-pubsub',
-   *   options: {
-   *     globalConfig: {
-   *       "sasl.mechanisms": "PLAIN",
-   *       "security.protocol": "SASL_SSL",
-   *       "sasl.username": "{CLOUD_KEY}",
-   *       "sasl.password": "{CLOUD_SECRET_KEY}"
-   *     }
-   *   }
-   * }
-   *
-   * pubsub: {
-   *   middleware: 'mqtt',
-   *   host: 'mosquitto',
-   *   port: 1884,
+   *   middleware: 'redisCluster',
+   *   nodes: [
+   *      { host: '{endpoint1}', port: 6379 },
+   *      { host: '{endpoint2}', port: 6379 },
+   *   ]
    *   options: {
    *     ...
    *   }

package/dist-server/pubsub.d.ts

@@ -2,7 +2,7 @@
  * @module pubsub
  * @description
  * This module provides a Pub/Sub (Publish/Subscribe) mechanism for handling messages and events.
- * Developers can use various middleware options such as MQTT, Redis, Redis Cluster, or Kafka
+ * Developers can use various middleware options such as Redis, Redis Cluster
  * to implement Pub/Sub functionality.
  */
 import { PubSub } from 'type-graphql';

package/dist-server/pubsub.js

@@ -3,27 +3,19 @@
  * @module pubsub
  * @description
  * This module provides a Pub/Sub (Publish/Subscribe) mechanism for handling messages and events.
- * Developers can use various middleware options such as MQTT, Redis, Redis Cluster, or Kafka
+ * Developers can use various middleware options such as Redis, Redis Cluster
  * to implement Pub/Sub functionality.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pubsub = void 0;
 const tslib_1 = require("tslib");
-const graphql_mqtt_subscriptions_1 = require("graphql-mqtt-subscriptions");
-const graphql_redis_subscriptions_1 = require("graphql-redis-subscriptions");
 const graphql_yoga_1 = require("graphql-yoga");
+const redis_event_target_1 = require("@graphql-yoga/redis-event-target");
 const ioredis_1 = tslib_1.__importDefault(require("ioredis"));
-const mqtt_1 = require("mqtt");
 const env_1 = require("@things-factory/env");
-const { middleware, host, port, nodes, topic, options } = env_1.config.get('pubsub', {});
+const { middleware, host, port, nodes, options } = env_1.config.get('pubsub', {});
 let pubsub;
 switch (middleware) {
-    case 'mqtt':
-        //@ts-ignore
-        exports.pubsub = pubsub = new graphql_mqtt_subscriptions_1.MQTTPubSub({
-            client: (0, mqtt_1.connect)('mqtt://' + host, Object.assign({ reconnectPeriod: 1000 }, options))
-        });
-        break;
     case 'redis':
         const redisOption = Object.assign({ host,
             port, retryStrategy: times => {
@@ -31,34 +23,23 @@ switch (middleware) {
                 return Math.min(times * 50, 2000);
             } }, options);
         //@ts-ignore
-        exports.pubsub = pubsub = new graphql_redis_subscriptions_1.RedisPubSub({
-            publisher: new ioredis_1.default(redisOption),
-            subscriber: new ioredis_1.default(redisOption)
+        exports.pubsub = pubsub = (0, graphql_yoga_1.createPubSub)({
+            eventTarget: (0, redis_event_target_1.createRedisEventTarget)({
+                publishClient: new ioredis_1.default(redisOption),
+                subscribeClient: new ioredis_1.default(redisOption)
+            })
         });
         break;
     case 'redisCluster':
         const cluster = new ioredis_1.default.Cluster(nodes, options);
         //@ts-ignore
-        exports.pubsub = pubsub = new graphql_redis_subscriptions_1.RedisPubSub({
-            publisher: cluster,
-            subscriber: cluster
+        exports.pubsub = pubsub = (0, graphql_yoga_1.createPubSub)({
+            eventTarget: (0, redis_event_target_1.createRedisEventTarget)({
+                publishClient: cluster,
+                subscribeClient: cluster
+            })
         });
         break;
-    case 'kafka':
-        try {
-            /*
-             * https://github.com/hatiolab/things-factory/issues/1239
-             */
-            const { KafkaPubSub } = require('graphql-kafka-subscriptions');
-            exports.pubsub = pubsub = new KafkaPubSub(Object.assign({ topic,
-                host,
-                port }, options));
-        }
-        catch (e) {
-            env_1.logger.error('graphql-kafka-subscriptions module is not installed, so application can not go further.', e);
-            throw e;
-        }
-        break;
     default:
         exports.pubsub = pubsub = (0, graphql_yoga_1.createPubSub)();
         break;

package/dist-server/pubsub.js.map

@@ -1 +1 @@
-{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../server/pubsub.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,2EAAuD;AACvD,6EAAyD;AACzD,+CAA2C;AAC3C,8DAA2B;AAC3B,+BAA8B;AAE9B,6CAAoD;AAGpD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,YAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AAElF,IAAI,MAAc,CAAA;AAElB,QAAQ,UAAU,EAAE,CAAC;IACnB,KAAK,MAAM;QACT,YAAY;QACZ,iBAAA,MAAM,GAAG,IAAI,uCAAU,CAAC;YACtB,MAAM,EAAE,IAAA,cAAO,EAAC,SAAS,GAAG,IAAI,kBAC9B,eAAe,EAAE,IAAI,IAClB,OAAO,EACH;SACV,CAAC,CAAA;QACF,MAAK;IACP,KAAK,OAAO;QACV,MAAM,WAAW,mBACf,IAAI;YACJ,IAAI,EACJ,aAAa,EAAE,KAAK,CAAC,EAAE;gBACrB,kBAAkB;gBAClB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC,CAAA;YACnC,CAAC,IACE,OAAO,CACX,CAAA;QACD,YAAY;QACZ,iBAAA,MAAM,GAAG,IAAI,yCAAW,CAAC;YACvB,SAAS,EAAE,IAAI,iBAAK,CAAC,WAAW,CAAC;YACjC,UAAU,EAAE,IAAI,iBAAK,CAAC,WAAW,CAAC;SACnC,CAAC,CAAA;QACF,MAAK;IACP,KAAK,cAAc;QACjB,MAAM,OAAO,GAAG,IAAI,iBAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACjD,YAAY;QACZ,iBAAA,MAAM,GAAG,IAAI,yCAAW,CAAC;YACvB,SAAS,EAAE,OAAO;YAClB,UAAU,EAAE,OAAO;SACpB,CAAC,CAAA;QACF,MAAK;IACP,KAAK,OAAO;QACV,IAAI,CAAC;YACH;;eAEG;YACH,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;YAC9D,iBAAA,MAAM,GAAG,IAAI,WAAW,iBACtB,KAAK;gBACL,IAAI;gBACJ,IAAI,IACD,OAAO,EACV,CAAA;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAM,CAAC,KAAK,CAAC,yFAAyF,EAAE,CAAC,CAAC,CAAA;YAC1G,MAAM,CAAC,CAAA;QACT,CAAC;QACD,MAAK;IACP;QACE,iBAAA,MAAM,GAAG,IAAA,2BAAY,GAAE,CAAA;QACvB,MAAK;AACT,CAAC;AAED,wEAAwE;AACxE,MAAM,WAAW,GAAG,KAAK,EAAC,GAAG,EAAC,EAAE;IAC9B,YAAY;IACZ,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,YAAY;YACZ,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED;;GAEG;AAEH,kCAAkC;AAClC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAExE,sBAAsB;AACtB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAE5E,oDAAoD;AACpD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAC9E,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA","sourcesContent":["/**\n * @module pubsub\n * @description\n * This module provides a Pub/Sub (Publish/Subscribe) mechanism for handling messages and events.\n * Developers can use various middleware options such as MQTT, Redis, Redis Cluster, or Kafka\n * to implement Pub/Sub functionality.\n */\n\nimport { MQTTPubSub } from 'graphql-mqtt-subscriptions'\nimport { RedisPubSub } from 'graphql-redis-subscriptions'\nimport { createPubSub } from 'graphql-yoga'\nimport Redis from 'ioredis'\nimport { connect } from 'mqtt'\n\nimport { config, logger } from '@things-factory/env'\nimport { PubSub } from 'type-graphql'\n\nconst { middleware, host, port, nodes, topic, options } = config.get('pubsub', {})\n\nlet pubsub: PubSub\n\nswitch (middleware) {\n  case 'mqtt':\n    //@ts-ignore\n    pubsub = new MQTTPubSub({\n      client: connect('mqtt://' + host, {\n        reconnectPeriod: 1000,\n        ...options\n      }) as any\n    })\n    break\n  case 'redis':\n    const redisOption = {\n      host,\n      port,\n      retryStrategy: times => {\n        // reconnect after\n        return Math.min(times * 50, 2000)\n      },\n      ...options\n    }\n    //@ts-ignore\n    pubsub = new RedisPubSub({\n      publisher: new Redis(redisOption),\n      subscriber: new Redis(redisOption)\n    })\n    break\n  case 'redisCluster':\n    const cluster = new Redis.Cluster(nodes, options)\n    //@ts-ignore\n    pubsub = new RedisPubSub({\n      publisher: cluster,\n      subscriber: cluster\n    })\n    break\n  case 'kafka':\n    try {\n      /*\n       * https://github.com/hatiolab/things-factory/issues/1239\n       */\n      const { KafkaPubSub } = require('graphql-kafka-subscriptions')\n      pubsub = new KafkaPubSub({\n        topic,\n        host,\n        port,\n        ...options\n      })\n    } catch (e) {\n      logger.error('graphql-kafka-subscriptions module is not installed, so application can not go further.', e)\n      throw e\n    }\n    break\n  default:\n    pubsub = createPubSub()\n    break\n}\n\n// kafka pubsub keeps connection and app port with 'ctrl+c' termination.\nconst exitHandler = async evt => {\n  //@ts-ignore\n  if (pubsub.close) {\n    try {\n      //@ts-ignore\n      await pubsub.close()\n    } catch (err) {\n      logger.error(err)\n    }\n  }\n}\n\n/*\n * exit events hint from https://stackoverflow.com/a/14032965/14539284\n */\n\n//do something when app is closing\nprocess.on('exit', exitHandler.bind(null, { name: 'exit', exit: true }))\n\n//catches ctrl+c event\nprocess.on('SIGINT', exitHandler.bind(null, { name: 'SIGINT', exit: true }))\n\n// catches \"kill pid\" (for example: nodemon restart)\nprocess.on('SIGUSR1', exitHandler.bind(null, { name: 'SIGUSR1', exit: true }))\nprocess.on('SIGUSR2', exitHandler.bind(null, { name: 'SIGUSR2', exit: true }))\n\n//catches uncaught exceptions\n// process.on('uncaughtException', exitHandler.bind(null, { name: 'uncaughtException', exit: true }))\n\nexport { pubsub }\n"]}
+{"version":3,"file":"pubsub.js","sourceRoot":"","sources":["../server/pubsub.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAEH,+CAA2C;AAC3C,yEAAyE;AACzE,8DAA2B;AAE3B,6CAAoD;AAGpD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,YAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AAE3E,IAAI,MAAc,CAAA;AAElB,QAAQ,UAAU,EAAE,CAAC;IACnB,KAAK,OAAO;QACV,MAAM,WAAW,mBACf,IAAI;YACJ,IAAI,EACJ,aAAa,EAAE,KAAK,CAAC,EAAE;gBACrB,kBAAkB;gBAClB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC,CAAA;YACnC,CAAC,IACE,OAAO,CACX,CAAA;QACD,YAAY;QACZ,iBAAA,MAAM,GAAG,IAAA,2BAAY,EAAC;YACpB,WAAW,EAAE,IAAA,2CAAsB,EAAC;gBAClC,aAAa,EAAE,IAAI,iBAAK,CAAC,WAAW,CAAC;gBACrC,eAAe,EAAE,IAAI,iBAAK,CAAC,WAAW,CAAC;aACxC,CAAC;SACH,CAAC,CAAA;QACF,MAAK;IACP,KAAK,cAAc;QACjB,MAAM,OAAO,GAAG,IAAI,iBAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACjD,YAAY;QACZ,iBAAA,MAAM,GAAG,IAAA,2BAAY,EAAC;YACpB,WAAW,EAAE,IAAA,2CAAsB,EAAC;gBAClC,aAAa,EAAE,OAAO;gBACtB,eAAe,EAAE,OAAO;aACzB,CAAC;SACH,CAAC,CAAA;QACF,MAAK;IACP;QACE,iBAAA,MAAM,GAAG,IAAA,2BAAY,GAAE,CAAA;QACvB,MAAK;AACT,CAAC;AAED,wEAAwE;AACxE,MAAM,WAAW,GAAG,KAAK,EAAC,GAAG,EAAC,EAAE;IAC9B,YAAY;IACZ,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,YAAY;YACZ,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,YAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACnB,CAAC;IACH,CAAC;AACH,CAAC,CAAA;AAED;;GAEG;AAEH,kCAAkC;AAClC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAExE,sBAAsB;AACtB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAE5E,oDAAoD;AACpD,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;AAC9E,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA","sourcesContent":["/**\n * @module pubsub\n * @description\n * This module provides a Pub/Sub (Publish/Subscribe) mechanism for handling messages and events.\n * Developers can use various middleware options such as Redis, Redis Cluster\n * to implement Pub/Sub functionality.\n */\n\nimport { createPubSub } from 'graphql-yoga'\nimport { createRedisEventTarget } from '@graphql-yoga/redis-event-target'\nimport Redis from 'ioredis'\n\nimport { config, logger } from '@things-factory/env'\nimport { PubSub } from 'type-graphql'\n\nconst { middleware, host, port, nodes, options } = config.get('pubsub', {})\n\nlet pubsub: PubSub\n\nswitch (middleware) {\n  case 'redis':\n    const redisOption = {\n      host,\n      port,\n      retryStrategy: times => {\n        // reconnect after\n        return Math.min(times * 50, 2000)\n      },\n      ...options\n    }\n    //@ts-ignore\n    pubsub = createPubSub({\n      eventTarget: createRedisEventTarget({\n        publishClient: new Redis(redisOption),\n        subscribeClient: new Redis(redisOption)\n      })\n    })\n    break\n  case 'redisCluster':\n    const cluster = new Redis.Cluster(nodes, options)\n    //@ts-ignore\n    pubsub = createPubSub({\n      eventTarget: createRedisEventTarget({\n        publishClient: cluster,\n        subscribeClient: cluster\n      })\n    })\n    break\n  default:\n    pubsub = createPubSub()\n    break\n}\n\n// kafka pubsub keeps connection and app port with 'ctrl+c' termination.\nconst exitHandler = async evt => {\n  //@ts-ignore\n  if (pubsub.close) {\n    try {\n      //@ts-ignore\n      await pubsub.close()\n    } catch (err) {\n      logger.error(err)\n    }\n  }\n}\n\n/*\n * exit events hint from https://stackoverflow.com/a/14032965/14539284\n */\n\n//do something when app is closing\nprocess.on('exit', exitHandler.bind(null, { name: 'exit', exit: true }))\n\n//catches ctrl+c event\nprocess.on('SIGINT', exitHandler.bind(null, { name: 'SIGINT', exit: true }))\n\n// catches \"kill pid\" (for example: nodemon restart)\nprocess.on('SIGUSR1', exitHandler.bind(null, { name: 'SIGUSR1', exit: true }))\nprocess.on('SIGUSR2', exitHandler.bind(null, { name: 'SIGUSR2', exit: true }))\n\n//catches uncaught exceptions\n// process.on('uncaughtException', exitHandler.bind(null, { name: 'uncaughtException', exit: true }))\n\nexport { pubsub }\n"]}