chayns-api 1.2.0-0 → 1.2.0-1

package/dist/cjs/index.js

@@ -148,6 +148,18 @@ Object.keys(_IChaynsReact).forEach(function (key) {
     }
   });
 });
+var _is = require("./util/is");
+Object.keys(_is).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _is[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _is[key];
+    }
+  });
+});
 var _constants = require("./constants");
 Object.keys(_constants).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/dist/cjs/types/IChaynsReact.js

@@ -29,6 +29,7 @@ let DialogSelectType = exports.DialogSelectType = /*#__PURE__*/function (DialogS
   DialogSelectType[DialogSelectType["DEFAULT"] = 0] = "DEFAULT";
   DialogSelectType[DialogSelectType["ICON"] = 1] = "ICON";
   DialogSelectType[DialogSelectType["IMAGE"] = 2] = "IMAGE";
+  DialogSelectType[DialogSelectType["SIMPLE"] = 3] = "SIMPLE";
   return DialogSelectType;
 }({});
 let DialogButtonType = exports.DialogButtonType = /*#__PURE__*/function (DialogButtonType) {

package/dist/cjs/util/deviceHelper.js

@@ -4,13 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getScreenSize = exports.getClientDeviceInfo = exports.default = void 0;
-var _detectBrowser = require("detect-browser");
+var _uaParserJs = require("ua-parser-js");
 var _IChaynsReact = require("../types/IChaynsReact");
 const getDeviceInfo = (userAgent, acceptHeader) => {
-  var _match$groups, _match$groups2, _parsedUA$version$spl, _parsedUA$version;
-  const parsedUA = (0, _detectBrowser.parseUserAgent)(userAgent);
+  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2;
+  const uaParser = new _uaParserJs.UAParser(userAgent);
   let appName = _IChaynsReact.AppName.Unknown;
   const match = /(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
+  const customMatch = /\s(?<name>intercom|sidekick|team)\/(?<version>\d+)/i.exec(userAgent);
   if (/\sintercom\/\d+/i.test(userAgent)) {
     appName = _IChaynsReact.AppName.TobitChat;
   } else if (/\ssidekick\/\d+/i.test(userAgent)) {
@@ -26,20 +27,27 @@ const getDeviceInfo = (userAgent, acceptHeader) => {
   } else if (/dface|h96pp|h96max|jabiru|chaynsterminal|wayter|odroidn2p/i.test(userAgent)) {
     appName = _IChaynsReact.AppName.ChaynsLauncher;
   }
+  let appVersion = match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN;
+  if (customMatch !== null && customMatch !== void 0 && (_customMatch$groups = customMatch.groups) !== null && _customMatch$groups !== void 0 && _customMatch$groups.version) {
+    appVersion = Number.parseInt(customMatch.groups.version, 10);
+  }
   const result = {};
+  const browser = uaParser.getBrowser();
   result.browser = {
-    name: parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.name,
-    version: parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.version,
-    majorVersion: Number.parseInt((_parsedUA$version$spl = parsedUA === null || parsedUA === void 0 || (_parsedUA$version = parsedUA.version) === null || _parsedUA$version === void 0 ? void 0 : _parsedUA$version.split('.')[0]) !== null && _parsedUA$version$spl !== void 0 ? _parsedUA$version$spl : '0', 10) || 0,
+    name: browser === null || browser === void 0 ? void 0 : browser.name,
+    version: browser === null || browser === void 0 ? void 0 : browser.version,
+    majorVersion: Number.parseInt((_browser$version$spli = browser === null || browser === void 0 || (_browser$version = browser.version) === null || _browser$version === void 0 ? void 0 : _browser$version.split('.')[0]) !== null && _browser$version$spli !== void 0 ? _browser$version$spli : '0', 10) || 0,
     isWebPSupported: acceptHeader.includes('image/webp')
   };
   result.app = {
     name: appName,
-    version: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN
+    version: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN,
+    appVersion,
+    callVersion: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN
   };
   result.imei = undefined; // TODO
-  result.accessToken = undefined; // TODO
-  result.os = parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.os;
+  result.engine = uaParser.getEngine();
+  result.os = ((_uaParser$getOS = uaParser.getOS()) === null || _uaParser$getOS === void 0 ? void 0 : _uaParser$getOS.name) === 'Android' ? 'Android OS' : (_uaParser$getOS2 = uaParser.getOS()) === null || _uaParser$getOS2 === void 0 ? void 0 : _uaParser$getOS2.name;
   if (typeof window !== 'undefined') {
     result.screenSize = getScreenSize(window.innerWidth);
     result.isTouch = getClientDeviceInfo().isTouch;

package/dist/cjs/util/is.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAppCallSupported = exports.isApp = void 0;
+var _calls = require("../calls");
+var _IChaynsReact = require("../types/IChaynsReact");
+const isApp = () => {
+  var _getDevice$app$name, _getDevice$app;
+  return ((_getDevice$app$name = (_getDevice$app = (0, _calls.getDevice)().app) === null || _getDevice$app === void 0 ? void 0 : _getDevice$app.name) !== null && _getDevice$app$name !== void 0 ? _getDevice$app$name : _IChaynsReact.AppName.Unknown) !== _IChaynsReact.AppName.Unknown;
+};
+exports.isApp = isApp;
+const isAppCallSupported = ({
+  minAndroidVersion = 1,
+  minIOSVersion = 1
+}) => {
+  var _device$app;
+  if (!isApp()) return false;
+  const device = (0, _calls.getDevice)();
+  if (!((_device$app = device.app) !== null && _device$app !== void 0 && _device$app.callVersion) || isNaN(device.app.callVersion)) return false;
+  if (device.os && ['iOS', 'Mac OS'].includes(device.os)) {
+    return device.app.callVersion >= minIOSVersion;
+  }
+  if (device.os === 'Android OS') {
+    return device.app.callVersion >= minAndroidVersion;
+  }
+  return false;
+};
+exports.isAppCallSupported = isAppCallSupported;

package/dist/cjs/wrapper/AppWrapper.js

@@ -13,6 +13,7 @@ var _getUserInfo = _interopRequireDefault(require("../calls/getUserInfo"));
 var _sendMessage = require("../calls/sendMessage");
 var _apiListenerHelper = require("../helper/apiListenerHelper");
 var _languages = require("../constants/languages");
+var _is = require("../util/is");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -417,6 +418,25 @@ class AppWrapper {
       }
     },
     selectPage: async options => {
+      var _this$values, _this$values2;
+      if ((_this$values = this.values) !== null && _this$values !== void 0 && (_this$values = _this$values.site) !== null && _this$values !== void 0 && _this$values.id && options.siteId && options.siteId !== ((_this$values2 = this.values) === null || _this$values2 === void 0 || (_this$values2 = _this$values2.site) === null || _this$values2 === void 0 ? void 0 : _this$values2.id)) {
+        const url = new URL(`https://chayns.site/${options.siteId}`);
+        if (options.id) {
+          url.pathname += `/tapp/${options.id}`;
+        } else if (options.path) {
+          url.pathname += `/${options.path}`;
+        }
+        if (options.params) {
+          Object.entries(options.params).forEach(([k, v]) => {
+            url.searchParams.set(k, v);
+          });
+        }
+        void this.appCall(9, {
+          url: url.toString(),
+          checkForChaynsSite: true
+        });
+        return;
+      }
       void this.appCall(2, {
         id: options.id,
         showName: options.showName,
@@ -539,12 +559,16 @@ class AppWrapper {
     },
     openDialog: async (config, callback) => {
       const currentDialogId = appWrapperDialogId++;
+      const isSupported = (0, _is.isAppCallSupported)({
+        minAndroidVersion: 7137,
+        minIOSVersion: 6934
+      });
       this.appCall(184, {
         dialogContent: {
           apiVersion: 5,
           config
         },
-        externalDialogUrl: 'https://tapp.chayns-static.space/api/dialog-v2/v1/index.html'
+        externalDialogUrl: isSupported ? undefined : 'https://tapp.chayns-static.space/api/dialog-v2/v1/index.html'
       }, {
         awaitResult: true
       }).then(result => {

package/dist/esm/index.js

@@ -7,6 +7,7 @@ export * from './calls';
 export * from './hooks';
 export * from './components/WaitUntil';
 export * from './types/IChaynsReact';
+export * from './util/is';
 export * from './components/withCompatMode';
 export * from './constants';
 export { default as withHydrationBoundary } from './components/withHydrationBoundary';

package/dist/esm/types/IChaynsReact.js

@@ -23,6 +23,7 @@ export let DialogSelectType = /*#__PURE__*/function (DialogSelectType) {
   DialogSelectType[DialogSelectType["DEFAULT"] = 0] = "DEFAULT";
   DialogSelectType[DialogSelectType["ICON"] = 1] = "ICON";
   DialogSelectType[DialogSelectType["IMAGE"] = 2] = "IMAGE";
+  DialogSelectType[DialogSelectType["SIMPLE"] = 3] = "SIMPLE";
   return DialogSelectType;
 }({});
 export let DialogButtonType = /*#__PURE__*/function (DialogButtonType) {

package/dist/esm/util/deviceHelper.js

@@ -1,10 +1,11 @@
-import { parseUserAgent } from 'detect-browser';
+import { UAParser } from 'ua-parser-js';
 import { AppName, ScreenSize } from '../types/IChaynsReact';
 const getDeviceInfo = (userAgent, acceptHeader) => {
-  var _match$groups, _match$groups2, _parsedUA$version$spl, _parsedUA$version;
-  const parsedUA = parseUserAgent(userAgent);
+  var _match$groups, _match$groups2, _customMatch$groups, _browser$version$spli, _browser$version, _uaParser$getOS, _uaParser$getOS2;
+  const uaParser = new UAParser(userAgent);
   let appName = AppName.Unknown;
   const match = /(?:my)?chayns\/(?<version>\d+).*(?<siteId>\d{5}-\d{5})/i.exec(userAgent);
+  const customMatch = /\s(?<name>intercom|sidekick|team)\/(?<version>\d+)/i.exec(userAgent);
   if (/\sintercom\/\d+/i.test(userAgent)) {
     appName = AppName.TobitChat;
   } else if (/\ssidekick\/\d+/i.test(userAgent)) {
@@ -20,20 +21,27 @@ const getDeviceInfo = (userAgent, acceptHeader) => {
   } else if (/dface|h96pp|h96max|jabiru|chaynsterminal|wayter|odroidn2p/i.test(userAgent)) {
     appName = AppName.ChaynsLauncher;
   }
+  let appVersion = match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN;
+  if (customMatch !== null && customMatch !== void 0 && (_customMatch$groups = customMatch.groups) !== null && _customMatch$groups !== void 0 && _customMatch$groups.version) {
+    appVersion = Number.parseInt(customMatch.groups.version, 10);
+  }
   const result = {};
+  const browser = uaParser.getBrowser();
   result.browser = {
-    name: parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.name,
-    version: parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.version,
-    majorVersion: Number.parseInt((_parsedUA$version$spl = parsedUA === null || parsedUA === void 0 || (_parsedUA$version = parsedUA.version) === null || _parsedUA$version === void 0 ? void 0 : _parsedUA$version.split('.')[0]) !== null && _parsedUA$version$spl !== void 0 ? _parsedUA$version$spl : '0', 10) || 0,
+    name: browser === null || browser === void 0 ? void 0 : browser.name,
+    version: browser === null || browser === void 0 ? void 0 : browser.version,
+    majorVersion: Number.parseInt((_browser$version$spli = browser === null || browser === void 0 || (_browser$version = browser.version) === null || _browser$version === void 0 ? void 0 : _browser$version.split('.')[0]) !== null && _browser$version$spli !== void 0 ? _browser$version$spli : '0', 10) || 0,
     isWebPSupported: acceptHeader.includes('image/webp')
   };
   result.app = {
     name: appName,
-    version: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN
+    version: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN,
+    appVersion,
+    callVersion: match !== null && match !== void 0 && match.groups ? Number.parseInt(match.groups.version, 10) : NaN
   };
   result.imei = undefined; // TODO
-  result.accessToken = undefined; // TODO
-  result.os = parsedUA === null || parsedUA === void 0 ? void 0 : parsedUA.os;
+  result.engine = uaParser.getEngine();
+  result.os = ((_uaParser$getOS = uaParser.getOS()) === null || _uaParser$getOS === void 0 ? void 0 : _uaParser$getOS.name) === 'Android' ? 'Android OS' : (_uaParser$getOS2 = uaParser.getOS()) === null || _uaParser$getOS2 === void 0 ? void 0 : _uaParser$getOS2.name;
   if (typeof window !== 'undefined') {
     result.screenSize = getScreenSize(window.innerWidth);
     result.isTouch = getClientDeviceInfo().isTouch;

package/dist/esm/util/is.js

@@ -0,0 +1,23 @@
+import { getDevice } from '../calls';
+import { AppName } from '../types/IChaynsReact';
+export const isApp = () => {
+  var _getDevice$app$name, _getDevice$app;
+  return ((_getDevice$app$name = (_getDevice$app = getDevice().app) === null || _getDevice$app === void 0 ? void 0 : _getDevice$app.name) !== null && _getDevice$app$name !== void 0 ? _getDevice$app$name : AppName.Unknown) !== AppName.Unknown;
+};
+export const isAppCallSupported = _ref => {
+  var _device$app;
+  let {
+    minAndroidVersion = 1,
+    minIOSVersion = 1
+  } = _ref;
+  if (!isApp()) return false;
+  const device = getDevice();
+  if (!((_device$app = device.app) !== null && _device$app !== void 0 && _device$app.callVersion) || isNaN(device.app.callVersion)) return false;
+  if (device.os && ['iOS', 'Mac OS'].includes(device.os)) {
+    return device.app.callVersion >= minIOSVersion;
+  }
+  if (device.os === 'Android OS') {
+    return device.app.callVersion >= minAndroidVersion;
+  }
+  return false;
+};

package/dist/esm/wrapper/AppWrapper.js

@@ -13,6 +13,7 @@ import getUserInfo from '../calls/getUserInfo';
 import { sendMessageToGroup, sendMessageToPage, sendMessageToUser } from '../calls/sendMessage';
 import { addApiListener, dispatchApiEvent, removeApiListener } from '../helper/apiListenerHelper';
 import { DeviceLanguage } from '../constants/languages';
+import { isAppCallSupported } from '../util/is';
 let appWrapperDialogId = 0;
 export class AppWrapper {
   mapOldApiToNew(retVal) {
@@ -380,6 +381,26 @@ export class AppWrapper {
         }
       },
       selectPage: async options => {
+        var _this$values, _this$values2;
+        if ((_this$values = this.values) !== null && _this$values !== void 0 && (_this$values = _this$values.site) !== null && _this$values !== void 0 && _this$values.id && options.siteId && options.siteId !== ((_this$values2 = this.values) === null || _this$values2 === void 0 || (_this$values2 = _this$values2.site) === null || _this$values2 === void 0 ? void 0 : _this$values2.id)) {
+          const url = new URL(`https://chayns.site/${options.siteId}`);
+          if (options.id) {
+            url.pathname += `/tapp/${options.id}`;
+          } else if (options.path) {
+            url.pathname += `/${options.path}`;
+          }
+          if (options.params) {
+            Object.entries(options.params).forEach(_ref2 => {
+              let [k, v] = _ref2;
+              url.searchParams.set(k, v);
+            });
+          }
+          void this.appCall(9, {
+            url: url.toString(),
+            checkForChaynsSite: true
+          });
+          return;
+        }
         void this.appCall(2, {
           id: options.id,
           showName: options.showName,
@@ -502,12 +523,16 @@ export class AppWrapper {
       },
       openDialog: async (config, callback) => {
         const currentDialogId = appWrapperDialogId++;
+        const isSupported = isAppCallSupported({
+          minAndroidVersion: 7137,
+          minIOSVersion: 6934
+        });
         this.appCall(184, {
           dialogContent: {
             apiVersion: 5,
             config
           },
-          externalDialogUrl: 'https://tapp.chayns-static.space/api/dialog-v2/v1/index.html'
+          externalDialogUrl: isSupported ? undefined : 'https://tapp.chayns-static.space/api/dialog-v2/v1/index.html'
         }, {
           awaitResult: true
         }).then(result => {
@@ -588,10 +613,10 @@ export class AppWrapper {
     this.appCall(254, {
       enabled: true
     }, {
-      callback: _ref2 => {
+      callback: _ref3 => {
         let {
           colorMode
-        } = _ref2;
+        } = _ref3;
         this.values.site = {
           ...this.values.site,
           colorMode

package/dist/types/index.d.ts

@@ -7,6 +7,7 @@ export * from './calls';
 export * from './hooks';
 export * from './components/WaitUntil';
 export * from './types/IChaynsReact';
+export * from './util/is';
 export * from './components/withCompatMode';
 export * from './constants';
 export { default as withHydrationBoundary } from './components/withHydrationBoundary';

package/dist/types/types/IChaynsReact.d.ts

@@ -1,4 +1,4 @@
-import { Browser, OperatingSystem } from 'detect-browser';
+import { IBrowser, IEngine } from 'ua-parser-js';
 import DialogHandler from '../handler/DialogHandler';
 import { DialogButtonOld, SelectDialogItem } from './dialog';
 export type DialogButton = {
@@ -98,7 +98,8 @@ export interface DialogInput {
 export declare enum DialogSelectType {
     DEFAULT = 0,
     ICON = 1,
-    IMAGE = 2
+    IMAGE = 2,
+    SIMPLE = 3
 }
 export type DialogSelectListItemType = {
     id: number;
@@ -115,6 +116,9 @@ export type DialogSelectListItemType = {
 export interface DialogSelect {
     type: DialogType.SELECT;
     list: DialogSelectListItemType[];
+    fixedItem?: DialogSelectListItemType & {
+        position?: 'top' | 'bottom';
+    };
     multiselect?: boolean;
     quickfind?: boolean;
     selectType?: DialogSelectType;
@@ -163,18 +167,24 @@ export declare enum ScreenSize {
 export type ChaynsApiDevice = {
     app?: {
         name: AppName;
+        /** @deprecated same value as callVersion */
         version: number;
+        /** the actual app version according to the app name */
+        appVersion: number;
+        /** the version of the chayns call interface */
+        callVersion: number;
         storePackageName?: string;
     };
     browser?: {
-        name?: Browser | 'bot' | null;
+        name?: IBrowser["name"] | 'bot' | null;
         version?: string | null;
         majorVersion: number;
         isWebPSupported: boolean;
     };
+    engine?: IEngine;
     imei?: string;
     accessToken?: string;
-    os?: OperatingSystem | null;
+    os?: 'AIX' | 'Amiga OS' | 'Android OS' | 'Arch' | 'Bada' | 'BeOS' | 'BlackBerry' | 'CentOS' | 'Chromium OS' | 'Contiki' | 'Fedora' | 'Firefox OS' | 'FreeBSD' | 'Debian' | 'DragonFly' | 'Gentoo' | 'GNU' | 'Haiku' | 'Hurd' | 'iOS' | 'Joli' | 'Linpus' | 'Linux' | 'Mac OS' | 'Mageia' | 'Mandriva' | 'MeeGo' | 'Minix' | 'Mint' | 'Morph OS' | 'NetBSD' | 'Nintendo' | 'OpenBSD' | 'OpenVMS' | 'OS/2' | 'Palm' | 'PCLinuxOS' | 'Plan9' | 'Playstation' | 'QNX' | 'RedHat' | 'RIM Tablet OS' | 'RISC OS' | 'Sailfish' | 'Series40' | 'Slackware' | 'Solaris' | 'SUSE' | 'Symbian' | 'Tizen' | 'Ubuntu' | 'UNIX' | 'VectorLinux' | 'WebOS' | 'Windows' | 'Windows Phone' | 'Windows Mobile' | 'Zenwalk' | null;
     isTouch: boolean;
     screenSize: ScreenSize;
 };

package/dist/types/util/is.d.ts

@@ -0,0 +1,5 @@
+export declare const isApp: () => boolean;
+export declare const isAppCallSupported: ({ minAndroidVersion, minIOSVersion }: {
+    minAndroidVersion?: number | undefined;
+    minIOSVersion?: number | undefined;
+}) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "chayns-api",
-    "version": "1.2.0-0",
+    "version": "1.2.0-1",
     "description": "new chayns api",
     "main": "dist/cjs/index.js",
     "module": "dist/esm/index.js",
@@ -45,13 +45,13 @@
         "@module-federation/runtime": "^0.1.13",
         "@types/semver": "^7.5.8",
         "comlink": "4.3.1",
-        "detect-browser": "^5.2.1",
         "htmlescape": "^1.1.1",
         "lodash.throttle": "^4.1.1",
         "prop-types": "^15.7.2",
         "scheduler": "^0.23.0",
         "semaphore-async-await": "^1.5.1",
         "semver": "^7.6.0",
+        "ua-parser-js": "^1.0.38",
         "use-context-selector": "^1.4.4",
         "util": "^0.12.5"
     },
@@ -68,6 +68,7 @@
         "@types/prop-types": "^15.7.12",
         "@types/react": "^18.2.78",
         "@types/react-dom": "^18.2.25",
+        "@types/ua-parser-js": "^0.7.39",
         "@typescript-eslint/parser": "^7.6.0",
         "chayns-toolkit": "^2.0.9",
         "concurrently": "^8.2.2",