@pisell/utils 1.0.37 → 2.0.1

package/es/firebase/index.js

@@ -12,12 +12,10 @@ var isClient = typeof window != "undefined" && window.document;
 
 // 是否默认初始化firebase erp_admin默认不初始化
 var isDefaultInit = isClient && (isUndefined((_window = window) === null || _window === void 0 ? void 0 : _window.__isDefaultInit) ? true : (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.__isDefaultInit);
-var isInitialized = false;
 var firebaseApp = {};
 var auth = {};
 var database = {};
 export var initFirebase = function initFirebase(config) {
-  isInitialized = true;
   // 初始化 Firebase
   firebaseApp = initializeApp(config || firebaseConfig);
   // 获取 Firebase Auth 实例
@@ -134,24 +132,21 @@ export var readData = /*#__PURE__*/function () {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           _context4.prev = 0;
-          if (!isInitialized) {
-            initFirebase();
-          }
-          _context4.next = 4;
+          _context4.next = 3;
           return get(ref(database, getPath(path)));
-        case 4:
+        case 3:
           dataSnapshot = _context4.sent;
           return _context4.abrupt("return", dataSnapshot.val());
-        case 8:
-          _context4.prev = 8;
+        case 7:
+          _context4.prev = 7;
           _context4.t0 = _context4["catch"](0);
           console.error("Error reading data:", _context4.t0);
           throw _context4.t0;
-        case 12:
+        case 11:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[0, 8]]);
+    }, _callee4, null, [[0, 7]]);
   }));
   return function readData(_x5) {
     return _ref4.apply(this, arguments);
@@ -165,20 +160,17 @@ export var writeData = /*#__PURE__*/function () {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           _context5.prev = 0;
-          if (!isInitialized) {
-            initFirebase();
-          }
           return _context5.abrupt("return", set(ref(database, getPath(path)), data));
-        case 5:
-          _context5.prev = 5;
+        case 4:
+          _context5.prev = 4;
           _context5.t0 = _context5["catch"](0);
           console.error("Error writing data:", _context5.t0);
           throw _context5.t0;
-        case 9:
+        case 8:
         case "end":
           return _context5.stop();
       }
-    }, _callee5, null, [[0, 5]]);
+    }, _callee5, null, [[0, 4]]);
   }));
   return function writeData(_x6, _x7) {
     return _ref5.apply(this, arguments);
@@ -187,13 +179,6 @@ export var writeData = /*#__PURE__*/function () {
 
 // onValue 方法 实现监听
 export var onDataChange = function onDataChange(path, callback) {
-  try {
-    if (!isInitialized) {
-      initFirebase();
-    }
-  } catch (error) {
-    console.error('init error', error);
-  }
   var databaseRef = ref(database, getPath(path));
   var listener = onValue(databaseRef, callback);
 
@@ -203,13 +188,6 @@ export var onDataChange = function onDataChange(path, callback) {
 
 // onChildChanged 方法 实现监听变化的key
 export var onDataChanged = function onDataChanged(path, callback) {
-  try {
-    if (!isInitialized) {
-      initFirebase();
-    }
-  } catch (error) {
-    console.error('init error', error);
-  }
   var databaseRef = ref(database, getPath(path));
   var listener = onChildChanged(databaseRef, callback);
 

package/es/otherUtils.d.ts

@@ -1,5 +1,16 @@
-import { detectIncognito } from "detectincognitojs";
-export { detectIncognito };
+/**
+ * @title: 判断是否无痕模式
+ * @description:
+ * @return: *
+ * @Author: shengjie.zuo
+ * @Date: 2024-09-4 09:58:22
+ */
+export declare const detectIncognito: () => Promise<{
+    isPrivate: boolean;
+    browserName: string;
+} | {
+    isPrivate: boolean;
+}>;
 /**
  * @Description: 生成唯一id
  * @Author: wzw

package/es/otherUtils.js

@@ -1,9 +1,47 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 // @ts-ignore
 import md5 from "crypto-js/md5";
 // @ts-ignore
 import enc from "crypto-js/enc-hex";
-import { detectIncognito } from "detectincognitojs";
-export { detectIncognito };
+import { detectIncognito as originDetectIncognito } from "detectincognitojs";
+
+/**
+ * @title: 判断是否无痕模式
+ * @description:
+ * @return: *
+ * @Author: shengjie.zuo
+ * @Date: 2024-09-4 09:58:22
+ */
+export var detectIncognito = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!navigator.userAgent.toLowerCase().includes('honor')) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", {
+            isPrivate: false
+          });
+        case 2:
+          _context.next = 4;
+          return originDetectIncognito();
+        case 4:
+          return _context.abrupt("return", _context.sent);
+        case 5:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function detectIncognito() {
+    return _ref.apply(this, arguments);
+  };
+}();
 
 /**
  * @Description: 生成唯一id

package/lib/firebase/index.js

@@ -46,12 +46,10 @@ var import_config = require("./config");
 var import_typeUtils = require("../typeUtils");
 var isClient = typeof window != "undefined" && window.document;
 var isDefaultInit = isClient && ((0, import_typeUtils.isUndefined)(window == null ? void 0 : window.__isDefaultInit) ? true : window == null ? void 0 : window.__isDefaultInit);
-var isInitialized = false;
 var firebaseApp = {};
 var auth = {};
 var database = {};
 var initFirebase = (config) => {
-  isInitialized = true;
   firebaseApp = (0, import_app.initializeApp)(config || import_config.firebaseConfig);
   auth = (0, import_auth.getAuth)(firebaseApp);
   database = (0, import_database.getDatabase)(firebaseApp);
@@ -101,9 +99,6 @@ var signOutUser = async () => {
 };
 var readData = async (path) => {
   try {
-    if (!isInitialized) {
-      initFirebase();
-    }
     const dataSnapshot = await (0, import_database.get)((0, import_database.ref)(database, getPath(path)));
     return dataSnapshot.val();
   } catch (error) {
@@ -113,9 +108,6 @@ var readData = async (path) => {
 };
 var writeData = async (path, data) => {
   try {
-    if (!isInitialized) {
-      initFirebase();
-    }
     return (0, import_database.set)((0, import_database.ref)(database, getPath(path)), data);
   } catch (error) {
     console.error("Error writing data:", error);
@@ -123,25 +115,11 @@ var writeData = async (path, data) => {
   }
 };
 var onDataChange = (path, callback) => {
-  try {
-    if (!isInitialized) {
-      initFirebase();
-    }
-  } catch (error) {
-    console.error("init error", error);
-  }
   const databaseRef = (0, import_database.ref)(database, getPath(path));
   const listener = (0, import_database.onValue)(databaseRef, callback);
   return listener;
 };
 var onDataChanged = (path, callback) => {
-  try {
-    if (!isInitialized) {
-      initFirebase();
-    }
-  } catch (error) {
-    console.error("init error", error);
-  }
   const databaseRef = (0, import_database.ref)(database, getPath(path));
   const listener = (0, import_database.onChildChanged)(databaseRef, callback);
   return listener;

package/lib/otherUtils.d.ts

@@ -1,5 +1,16 @@
-import { detectIncognito } from "detectincognitojs";
-export { detectIncognito };
+/**
+ * @title: 判断是否无痕模式
+ * @description:
+ * @return: *
+ * @Author: shengjie.zuo
+ * @Date: 2024-09-4 09:58:22
+ */
+export declare const detectIncognito: () => Promise<{
+    isPrivate: boolean;
+    browserName: string;
+} | {
+    isPrivate: boolean;
+}>;
 /**
  * @Description: 生成唯一id
  * @Author: wzw

package/lib/otherUtils.js

@@ -31,7 +31,7 @@ var otherUtils_exports = {};
 __export(otherUtils_exports, {
   changeArray: () => changeArray,
   createArray: () => createArray,
-  detectIncognito: () => import_detectincognitojs.detectIncognito,
+  detectIncognito: () => detectIncognito,
   generateUniqueIdByObj: () => generateUniqueIdByObj,
   getItemByArray: () => getItemByArray,
   getUniqueId: () => getUniqueId
@@ -40,6 +40,14 @@ module.exports = __toCommonJS(otherUtils_exports);
 var import_md5 = __toESM(require("crypto-js/md5"));
 var import_enc_hex = __toESM(require("crypto-js/enc-hex"));
 var import_detectincognitojs = require("detectincognitojs");
+var detectIncognito = async () => {
+  if (navigator.userAgent.toLowerCase().includes("honor")) {
+    return {
+      isPrivate: false
+    };
+  }
+  return await (0, import_detectincognitojs.detectIncognito)();
+};
 var getUniqueId = (prefix = "", maxLength = 11) => {
   return prefix + (Math.random() + "").replace(/\D/g, "").substring(0, maxLength);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/utils",
-  "version": "1.0.37",
+  "version": "2.0.1",
   "sideEffects": false,
   "main": "./lib/index.js",
   "module": "./es/index.js",