dreaction-react-native 1.7.0 → 1.7.2

package/lib/components/ConfigDialog.js

@@ -56,7 +56,7 @@ exports.ConfigDialog = react_1.default.memo((props) => {
         });
     }, []);
     const handleConfirm = () => {
-        const host = (0, parseURL_1.getHostFromUrl)(inputValue);
+        const host = (0, parseURL_1.getHostWithPortFromUrl)(inputValue);
         dreaction_1.dreaction.asyncStorageHandler?.setItem(LOCAL_CACHE_HOST_NAME, host);
         onConfirm(host);
     };

package/lib/helpers/parseURL.d.ts

@@ -6,4 +6,10 @@
  * @returns {string} host of given URL or throws
  */
 export declare function getHostFromUrl(url: string): string;
+/**
+ * Extract host:port from URL
+ * @param url URL string
+ * @returns host:port string or throws if invalid
+ */
+export declare function getHostWithPortFromUrl(url: string): string;
 //# sourceMappingURL=parseURL.d.ts.map

package/lib/helpers/parseURL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseURL.d.ts","sourceRoot":"","sources":["../../src/helpers/parseURL.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAUzC"}
+{"version":3,"file":"parseURL.d.ts","sourceRoot":"","sources":["../../src/helpers/parseURL.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAUzC;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,UAWjD"}

package/lib/helpers/parseURL.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHostFromUrl = getHostFromUrl;
+exports.getHostWithPortFromUrl = getHostWithPortFromUrl;
 /**
  * Given a valid http(s) URL, the host for the given URL
  * is returned.
@@ -19,3 +20,18 @@ function getHostFromUrl(url) {
         throw new Error("Invalid URL - host not found");
     return host;
 }
+/**
+ * Extract host:port from URL
+ * @param url URL string
+ * @returns host:port string or throws if invalid
+ */
+function getHostWithPortFromUrl(url) {
+    const hostWithPort = url
+        .replace(/^(?:https?:\/\/)?/, '')
+        .split(/[/?#]/)[0]
+        .trim();
+    if (!hostWithPort) {
+        throw new Error('Invalid URL - host not found');
+    }
+    return hostWithPort;
+}

package/lib/plugins/trackGlobalLogs.d.ts

@@ -4,6 +4,7 @@ import { DReactionCore } from 'dreaction-client-core';
  */
 declare const trackGlobalLogs: () => (dreaction: DReactionCore) => {
     onConnect: () => void;
+    onDisconnect: () => void;
 };
 export default trackGlobalLogs;
 //# sourceMappingURL=trackGlobalLogs.d.ts.map

package/lib/plugins/trackGlobalLogs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trackGlobalLogs.d.ts","sourceRoot":"","sources":["../../src/plugins/trackGlobalLogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EAGd,MAAM,uBAAuB,CAAC;AAE/B;;GAEG;AACH,QAAA,MAAM,eAAe,oBAAqB,aAAa;;CA4BtD,CAAC;AAEF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"trackGlobalLogs.d.ts","sourceRoot":"","sources":["../../src/plugins/trackGlobalLogs.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,aAAa,EAGd,MAAM,uBAAuB,CAAC;AAE/B;;GAEG;AACH,QAAA,MAAM,eAAe,oBAAqB,aAAa;;;CAuCtD,CAAC;AAEF,eAAe,eAAe,CAAC"}

package/lib/plugins/trackGlobalLogs.js

@@ -7,25 +7,36 @@ const dreaction_client_core_1 = require("dreaction-client-core");
 const trackGlobalLogs = () => (dreaction) => {
     (0, dreaction_client_core_1.assertHasLoggerPlugin)(dreaction);
     const client = dreaction;
+    const originalConsoleLog = console.log;
+    const originalConsoleWarn = console.warn;
+    const originalConsoleDebug = console.debug;
+    const originalConsoleInfo = console.info;
     return {
         onConnect: () => {
-            const originalConsoleLog = console.log;
             console.log = (...args) => {
                 originalConsoleLog(...args);
                 client.log(...args);
             };
-            const originalConsoleWarn = console.warn;
+            console.info = (...args) => {
+                originalConsoleInfo(...args);
+                client.log(...args);
+            };
             console.warn = (...args) => {
                 originalConsoleWarn(...args);
                 client.warn(args[0]);
             };
-            const originalConsoleDebug = console.debug;
             console.debug = (...args) => {
                 originalConsoleDebug(...args);
                 client.debug(args[0]);
             };
             // console.error is taken care of by ./trackGlobalErrors.ts
         },
+        onDisconnect: () => {
+            console.log = originalConsoleLog;
+            console.warn = originalConsoleWarn;
+            console.debug = originalConsoleDebug;
+            console.info = originalConsoleInfo;
+        }
     };
 };
 exports.default = trackGlobalLogs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dreaction-react-native",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "private": false,
   "description": "",
   "main": "lib/index.js",
@@ -15,8 +15,8 @@
   "author": "moonrailgun <moonrailgun@gmail.com>",
   "license": "MIT",
   "dependencies": {
-    "dreaction-protocol": "1.0.8",
-    "dreaction-client-core": "1.2.0"
+    "dreaction-client-core": "1.2.0",
+    "dreaction-protocol": "1.0.8"
   },
   "devDependencies": {
     "@react-native-async-storage/async-storage": "^2.1.0",

package/src/components/ConfigDialog.tsx

@@ -9,7 +9,7 @@ import {
 } from 'react-native';
 import { getHost } from '../helpers/getHost';
 import { dreaction } from '../dreaction';
-import { getHostFromUrl } from '../helpers/parseURL';
+import { getHostWithPortFromUrl } from '../helpers/parseURL';
 
 const LOCAL_CACHE_HOST_NAME = '__dreaction-react-native-host';
 
@@ -36,7 +36,7 @@ export const ConfigDialog: React.FC<ConfigDialogProps> = React.memo((props) => {
   }, []);
 
   const handleConfirm = () => {
-    const host = getHostFromUrl(inputValue);
+    const host = getHostWithPortFromUrl(inputValue);
     dreaction.asyncStorageHandler?.setItem(LOCAL_CACHE_HOST_NAME, host);
     onConfirm(host);
   };

package/src/helpers/parseURL.ts

@@ -17,3 +17,21 @@ export function getHostFromUrl(url: string) {
 
   return host
 }
+
+/**
+ * Extract host:port from URL
+ * @param url URL string
+ * @returns host:port string or throws if invalid
+ */
+export function getHostWithPortFromUrl(url: string) {
+  const hostWithPort = url
+    .replace(/^(?:https?:\/\/)?/, '')
+    .split(/[/?#]/)[0]
+    .trim();
+
+  if (!hostWithPort) {
+    throw new Error('Invalid URL - host not found');
+  }
+
+  return hostWithPort;
+}

package/src/plugins/trackGlobalLogs.ts

@@ -14,21 +14,26 @@ const trackGlobalLogs = () => (dreaction: DReactionCore) => {
   const client = dreaction as DReactionCore &
     InferFeatures<DReactionCore, LoggerPlugin>;
 
+  const originalConsoleLog = console.log;
+  const originalConsoleWarn = console.warn;
+  const originalConsoleDebug = console.debug;
+  const originalConsoleInfo = console.info;
+
   return {
     onConnect: () => {
-      const originalConsoleLog = console.log;
       console.log = (...args: Parameters<typeof console.log>) => {
         originalConsoleLog(...args);
         client.log(...args);
       };
-
-      const originalConsoleWarn = console.warn;
+      console.info = (...args: Parameters<typeof console.info>) => {
+        originalConsoleInfo(...args);
+        client.log(...args);
+      };
       console.warn = (...args: Parameters<typeof console.warn>) => {
         originalConsoleWarn(...args);
         client.warn(args[0]);
       };
 
-      const originalConsoleDebug = console.debug;
       console.debug = (...args: Parameters<typeof console.debug>) => {
         originalConsoleDebug(...args);
         client.debug(args[0]);
@@ -36,6 +41,12 @@ const trackGlobalLogs = () => (dreaction: DReactionCore) => {
 
       // console.error is taken care of by ./trackGlobalErrors.ts
     },
+    onDisconnect: () => {
+      console.log = originalConsoleLog;
+      console.warn = originalConsoleWarn;
+      console.debug = originalConsoleDebug;
+      console.info = originalConsoleInfo;
+    }
   } satisfies Plugin<DReactionCore>;
 };