API-3 - Extend API Info response (#250)

* API-3 - Extend API Info response

* API-3 - Extend API Info response

* API-3 - Extend API Info response

* - upgrade modules

* - upgrade modules

---------

Co-authored-by: macbookpro <[email protected]>
Co-authored-by: Vladimir Upirov <[email protected]>

Author: 3 people

package-lock.json

@@ -81,7 +81,7 @@
     "nyc": "^15.1.0",
     "request": "^2.88.2",
     "rimraf": "^3.0.2",
-    "socket.io": "^2.3.0",
+    "socket.io": "^2.5.1",
     "terser-webpack-plugin": "^2.3.8",
     "typescript": "^4.5.4",
     "watch": "^1.0.2",
@@ -90,8 +90,8 @@
     "webpack-cli": "^5.0.2"
   },
   "dependencies": {
-    "@babel/runtime": "^7.21.5",
-    "backendless-request": "^0.7.9",
-    "backendless-rt-client": "0.3.0"
+    "@babel/runtime": "^7.26.7",
+    "backendless-request": "^0.8.0",
+    "backendless-rt-client": "0.5.0"
   }
 }

package.json

@@ -148,6 +148,8 @@ class Backendless {
 
     app.__removeService('LocalCache')
 
+    app.appInfoPromise()
+
     const loggingConfig = Object.assign({ loadLevels: true, globalLevel: 'all', levels: {} }, config.logging)
 
     if (app.__hasService('Logging')) {
@@ -166,6 +168,18 @@ class Backendless {
     return app
   }
 
+  appInfoPromise(reset) {
+    if (reset || !this.__appInfoPromise) {
+      this.__appInfoPromise = new Promise((resolve, reject) => {
+        this.request.get({ url: this.urls.appInfo() })
+          .then(resolve)
+          .catch(reject)
+      })
+    }
+
+    return this.__appInfoPromise
+  }
+
   __hasService(name) {
     return !!this[`__${name}`]
   }

src/index.js

@@ -39,9 +39,9 @@ export default class Logging {
   }
 
   loadLoggingLevels() {
-    this.app.request
-      .get({ url: this.app.urls.loggingLevels() })
-      .then(loggersList => {
+    this.app.appInfoPromise()
+      .then(appInfo => {
+        const { loggers: loggersList } = appInfo
         const loggers = {}
 
         loggersList.forEach(logger => {

src/logging/index.js

@@ -1,25 +1,18 @@
-import Request from 'backendless-request'
 import BackendlessRTClient from 'backendless-rt-client'
 
 import Utils from './utils'
 
 export const RTListeners = BackendlessRTClient.Listeners
 export const RTScopeConnector = BackendlessRTClient.ScopeConnector
 
-function loadAppInfo(appPath) {
-  return Request.get(`${appPath}/info`)
-}
-
 export default class RT extends BackendlessRTClient {
   constructor(app) {
-    const { appId, apiKey, appPath, debugMode } = app
+    const { appId, apiKey, debugMode } = app
 
     const clientId = Utils.uuid()
-    const lookupPath = `${appPath}/rt/lookup`
 
     super({
       appId: appId || undefined,
-      lookupPath,
       debugMode,
       connectQuery() {
         const userToken = app.getCurrentUserToken()
@@ -31,10 +24,13 @@ export default class RT extends BackendlessRTClient {
         }
       },
 
+      hostResolver(){
+        return app.appInfoPromise().then(({ rtURL }) => rtURL)
+      },
+
       socketConfigTransform: async socketConfig => {
         if (!appId) {
-          const appInfo = await loadAppInfo(appPath)
-
+          const appInfo = await app.appInfoPromise()
           socketConfig.url = `${socketConfig.host}/${appInfo.appId}`
           socketConfig.options.path = `/${appInfo.appId}`
           socketConfig.options.query.apiKey = appInfo.apiKey

src/rt.js

@@ -7,6 +7,12 @@ export default class Urls {
     return this.app.appPath
   }
 
+  // app info
+
+  appInfo() {
+    return `${this.root()}/info`
+  }
+
   //automations
 
   automation() {

src/urls.js

@@ -95,7 +95,9 @@ export function createMockRTServer(appId = APP_ID) {
     socket.on(RTSocketEvents.SUB_ON, data => onMessage(RTSocketEvents.SUB_ON, data))
     socket.on(RTSocketEvents.SUB_OFF, data => onMessage(RTSocketEvents.SUB_OFF, data))
 
-    onMessage(RTSocketEvents.CONNECT, { apiKey, clientId, userToken: userToken === 'null' ? null : userToken })
+    onMessage(RTSocketEvents.CONNECT, {
+      apiKey, clientId, userToken: userToken === 'null' ? null : userToken, connectionId: socket.id
+    })
   })
 
   const emit = (type, data) => {

test/unit/helpers/rt.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai'
 import { describe, it } from 'mocha'
 
-import Backendless, { forTest, prepareMockRequest, createMockRTServer, Utils } from '../../helpers/sandbox'
+import Backendless, { forTest, createMockRTServer, Utils } from '../../helpers/sandbox'
 
 describe('<Data> RT', function() {
 
@@ -11,6 +11,7 @@ describe('<Data> RT', function() {
 
   const tableName = 'TEST_TABLE_NAME'
   const relationColumnName = 'TEST_REL_COLUMN_NAME'
+  const rtURL = 'http://localhost:12345'
 
   let rtClient
 
@@ -20,7 +21,9 @@ describe('<Data> RT', function() {
   beforeEach(async () => {
     rtClient = await createMockRTServer()
 
-    prepareMockRequest(rtClient.host)
+    Backendless.appInfoPromise = chai.spy(() =>
+      Promise.resolve({ rtURL })
+    )
 
     dataStore = Backendless.Data.of(tableName)
     rtHandlers = dataStore.rt()

test/unit/specs/data/rt.js

@@ -689,14 +689,14 @@ describe('<Files> Basic', function() {
 
       expect(req1).to.deep.include({
         method : 'POST',
-        path   : `${APP_PATH}/files/test/path/`,
+        path   : `${APP_PATH}/files/test/path`,
         headers: {},
         body   : undefined
       })
 
       expect(req2).to.deep.include({
         method : 'POST',
-        path   : `${APP_PATH}/files/test/path/`,
+        path   : `${APP_PATH}/files/test/path`,
         headers: {},
         body   : undefined
       })

test/unit/specs/files/basic.js

@@ -570,16 +570,20 @@ describe('<Logging>', function() {
   })
 
   it('should apply log levels to logging config', async () => {
-    prepareMockRequest([
-      {
-        name : loggerName,
-        level: 'FATAL'
-      },
-      {
-        name : 'Global logger',
-        level: 'ERROR'
-      }
-    ])
+    Backendless.appInfoPromise = chai.spy(() =>
+      Promise.resolve({
+        loggers: [
+          {
+            name : loggerName,
+            level: 'FATAL'
+          },
+          {
+            name : 'Global logger',
+            level: 'ERROR'
+          }
+        ]
+      })
+    )
 
     Backendless.initApp({
       appId  : APP_ID,
@@ -620,16 +624,20 @@ describe('<Logging>', function() {
   })
 
   it('should ignore all logs when global is OFF', async () => {
-    prepareMockRequest([
-      {
-        name : loggerName,
-        level: 'INFO'
-      },
-      {
-        name : 'Global logger',
-        level: 'OFF'
-      }
-    ])
+    Backendless.appInfoPromise = chai.spy(() =>
+      Promise.resolve({
+        loggers: [
+          {
+            name : loggerName,
+            level: 'INFO'
+          },
+          {
+            name : 'Global logger',
+            level: 'OFF'
+          }
+        ]
+      })
+    )
 
     Backendless.initApp({
       appId  : APP_ID,

test/unit/specs/logging.js

@@ -11,6 +11,7 @@ describe('<Messaging> Channel', function() {
 
   const channelName = 'TEST_CHANNEL_NAME'
   const message = 'TEST_MESSAGE'
+  const rtURL = 'http://localhost:12345'
 
   const fakeResult = { foo: 123 }
 
@@ -22,7 +23,9 @@ describe('<Messaging> Channel', function() {
   beforeEach(async () => {
     rtClient = await createMockRTServer()
 
-    prepareMockRequest(rtClient.host)
+    Backendless.appInfoPromise = chai.spy(() =>
+      Promise.resolve({ rtURL })
+    )
 
     channel = Backendless.Messaging.subscribe(channelName)