Feature/Subscribe API (#872)

Rework subscribe adapters to contain only client part and move socket.io/mqtt server implementations to appropriate local/cloud entry points
reimagined · Nov 20, 2018 · aaa52ea · aaa52ea
1 parent d3f49f4
commit aaa52ea
Show file tree

Hide file tree

Showing 40 changed files with 356 additions and 413 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -63,6 +63,7 @@ module.exports = {
           'arg',
           'args',
           'argv',
+          'arn',
           'askstories',
           'async',
           'auth',
@@ -171,6 +172,7 @@ module.exports = {
           'invoker',
           'indexreadpolicy',
           'indexwritepolicy',
+          'iotdevicegateway',
           'iterable',
           'jpg',
           'jsons',
@@ -229,6 +231,7 @@ module.exports = {
           'preloader',
           'prefetch',
           'prev',
+          'Presigned',
           'println',
           'proc',
           'proto',
@@ -262,6 +265,7 @@ module.exports = {
           'Roboto',
           'sanitizer',
           'sdk',
+          'sts',
           'svg',
           'serializable',
           'sinon',

diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/package.json b/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/package.json
@@ -5,8 +5,8 @@
   "engines": {
     "node": ">=8.10"
   },
-  "main": "./lib/server/index.js",
-  "browser": "./lib/client/index.js",
+  "main": "./lib/index.js",
+  "module": "./es/index.js",
   "bugs": {
     "url": "https://github.com/reimagined/resolve/issues"
   },
@@ -25,27 +25,24 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "mqtt": "^2.18.8",
-    "ws": "^5.2.1",
-    "websocket-stream": "^5.1.2",
-    "mqtt-connection": "^4.0.0"
+    "mqtt": "^2.18.8"
   },
   "devDependencies": {
     "jest": "23.6.0"
   },
   "homepage": "https://github.com/reimagined/resolve/tree/master/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt#readme",
   "babelCompile": [
     {
-      "moduleType": "cjs",
+      "moduleType": "es",
       "moduleTarget": "client",
-      "inputDir": "./src/client",
-      "outDir": "./lib/client"
+      "inputDir": "./src",
+      "outDir": "./es"
     },
     {
       "moduleType": "cjs",
-      "moduleTarget": "server",
-      "inputDir": "./src/server",
-      "outDir": "./lib/server"
+      "moduleTarget": "client",
+      "inputDir": "./src",
+      "outDir": "./lib"
     }
   ]
 }
diff --git a/...ve-subscribe-mqtt/src/client/constants.js → ...s/resolve-subscribe-mqtt/src/constants.js b/...ve-subscribe-mqtt/src/client/constants.js → ...s/resolve-subscribe-mqtt/src/constants.js
diff --git a/...bscribe-mqtt/src/client/get_mqtt_topic.js → ...olve-subscribe-mqtt/src/get_mqtt_topic.js b/...bscribe-mqtt/src/client/get_mqtt_topic.js → ...olve-subscribe-mqtt/src/get_mqtt_topic.js
diff --git a/...ibe-mqtt/src/client/get_root_based_url.js → ...-subscribe-mqtt/src/get_root_based_url.js b/...ibe-mqtt/src/client/get_root_based_url.js → ...-subscribe-mqtt/src/get_root_based_url.js
diff --git a/...esolve-subscribe-mqtt/src/client/index.js → ...pters/resolve-subscribe-mqtt/src/index.js b/...esolve-subscribe-mqtt/src/client/index.js → ...pters/resolve-subscribe-mqtt/src/index.js
@@ -98,4 +98,6 @@ const createClientAdapter = ({ origin, rootPath, url, appId, onEvent }) => {
   }
 }
 
+createClientAdapter.adapterName = 'mqtt'
+
 export default createClientAdapter
diff --git a/...es/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/create_server_handler.js b/...es/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/create_server_handler.js
diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/get_mqtt_topic.js b/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/get_mqtt_topic.js
diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/index.js b/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/src/server/index.js
diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/test/index.test.js b/packages/adapters/subscribe-adapters/resolve-subscribe-mqtt/test/index.test.js
@@ -1,4 +1,4 @@
-import createSubscribeAdapter from '../src/client/index'
+import createSubscribeAdapter from '../src/index'
 import mqtt from 'mqtt'
 
 const delay = timeout =>

diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/package.json b/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/package.json
@@ -5,8 +5,8 @@
   "engines": {
     "node": ">=8.10"
   },
-  "main": "./lib/server/index.js",
-  "browser": "./lib/client/index.js",
+  "main": "./lib/index.js",
+  "module": "./es/index.js",
   "bugs": {
     "url": "https://github.com/reimagined/resolve/issues"
   },
@@ -25,7 +25,6 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "socket.io": "^2.1.1",
     "socket.io-client": "^2.1.1"
   },
   "devDependencies": {
@@ -34,16 +33,16 @@
   "homepage": "https://github.com/reimagined/resolve/tree/master/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io#readme",
   "babelCompile": [
     {
-      "moduleType": "cjs",
+      "moduleType": "es",
       "moduleTarget": "client",
-      "inputDir": "./src/client",
-      "outDir": "./lib/client"
+      "inputDir": "./src",
+      "outDir": "./es"
     },
     {
       "moduleType": "cjs",
-      "moduleTarget": "server",
-      "inputDir": "./src/server",
-      "outDir": "./lib/server"
+      "moduleTarget": "client",
+      "inputDir": "./src",
+      "outDir": "./lib"
     }
   ]
 }
diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/src/client/constants.js b/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/src/client/constants.js
diff --git a/...ve-subscribe-mqtt/src/server/constants.js → ...olve-subscribe-socket.io/src/constants.js b/...ve-subscribe-mqtt/src/server/constants.js → ...olve-subscribe-socket.io/src/constants.js
diff --git a/...e-subscribe-socket.io/src/client/index.js → .../resolve-subscribe-socket.io/src/index.js b/...e-subscribe-socket.io/src/client/index.js → .../resolve-subscribe-socket.io/src/index.js
@@ -76,4 +76,6 @@ const createClientAdapter = ({ origin, rootPath, url, onEvent }) => {
   }
 }
 
+createClientAdapter.adapterName = 'socket.io'
+
 export default createClientAdapter
diff --git a/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/src/server/constants.js b/packages/adapters/subscribe-adapters/resolve-subscribe-socket.io/src/server/constants.js
diff --git a/...apters/subscribe-adapters/resolve-subscribe-socket.io/src/server/create_server_handler.js b/...apters/subscribe-adapters/resolve-subscribe-socket.io/src/server/create_server_handler.js
-Original file line number
+Diff line change
@@ Expand Up @@
       }
     }
+    createClientAdapter.adapterName = 'mqtt'
     export default createClientAdapter