esoftplay 0.0.131-e → 0.0.131-g

package/bin/cli.js

@@ -833,7 +833,11 @@ function build() {
 					const fs = require('fs');
 					const path = require('path');
 					const directoryPath = './'; // Replace with the path to your directory
-
+					function getTime() {
+						const adjustedDate = new Date().getTime() + 7 * 60 * 60000; // Add offset in milliseconds
+						const isoStringWithGMTPlus7 = new Date(adjustedDate).toISOString();
+						return isoStringWithGMTPlus7.replace('T', ' ').replace(/\.[0-9]+Z/g, "")
+					}
 					fs.readdir(directoryPath, (err, files) => {
 						if (err) {
 							console.error('Error reading directory:', err);
@@ -853,7 +857,7 @@ function build() {
 							// const oldFileName = fileName.replace(regexPattern, '$1');
 							let ext = fileName.split(".")
 							ext.shift()
-							fs.renameSync('./' + fileName, './' + ajson.expo.name + "-" + new Date().toISOString() + "." + ext.join("."))
+							fs.renameSync('./' + fileName, './' + ajson.expo.name + "-" + getTime() + "." + ext.join("."))
 						});
 					});
 					let tmId = "-1001429450501"

package/bin/router.js

@@ -151,14 +151,14 @@ checks.forEach(modules => {
                     tmpTask[clsName]['function'] = {}
                     UseLibs.push(module + "/" + name) /* get export default */
                     if (m = (/\n?export\sdefault(( )){/).exec(data)) {
-                      tmpTask[clsName]['uselibs'] = 'function _' + m[1].replace(m[2], clsName).trim() + "(): void;"
-                      tmpTask[clsName]['namespaces'] = "namespace " + clsName.trim()
+                      tmpTask[clsName]['object'] = 'function _' + m[1].replace(m[2], clsName).trim() + "(): void;"
+                      tmpTask[clsName]['namespaces'] = clsName.trim() + ":"
                     }
                     /* get exported funtion */
                     if (f = data.match(/\n\s{2}(([A-Za-z0-9]+).*){/g)) {
                       for (let i = 0; i < f.length; i++) {
                         const _f = (/\n\s{2}(([A-Za-z0-9]+).*){/g).exec(f[i]);
-                        tmpTask[clsName]['function'][_f[2]] = 'function ' + _f[1] + ';'
+                        tmpTask[clsName]['function'][_f[2]] = _f[1] + ';'
                       }
                     }
                   }
@@ -565,6 +565,27 @@ declare module "esoftplay" {
         ItemText += "\n  ";
       }
       ItemText += "}";
+    } else if (tmpTask[clsName]["object"]) {
+      for (var i = 0; i < tmpTask[clsName]["interface"].length; i++) {
+        ItemText += "\n  export " + tmpTask[clsName]["interface"][i].replace(/\n/g, "\n  ");
+      }
+      ItemText += "\n export " + tmpTask[clsName]["object"];
+      for (var i = 0; i < tmpTask[clsName]["type"].length; i++) {
+        ItemText += "\n  export " + tmpTask[clsName]["type"][i].replace(/\n/g, "\n  ");
+      }
+      var isFilled = false;
+      ItemText += "\n declare const " + tmpTask[clsName]["namespaces"] + " {";
+      for (fun in tmpTask[clsName]["var"]) {
+        ItemText += "\n    export " + tmpTask[clsName]["var"][fun];
+      }
+      for (fun in tmpTask[clsName]["function"]) {
+        ItemText += "\n   " + tmpTask[clsName]["function"][fun];
+        isFilled = true;
+      }
+      if (isFilled) {
+        ItemText += "\n  ";
+      }
+      ItemText += "}";
     }
     const [module, task] = clsName.split(/(?=[A-Z])/)
     const nav = module?.toLowerCase() + '/' + task?.toLowerCase()

package/error.ts

@@ -9,7 +9,11 @@ let pack = require('../../package.json');
 let app = require('../../app.json');
 const { manifest } = Constants;
 
-
+function getTime() {
+  const adjustedDate = new Date().getTime() + 7 * 60 * 60000; // Add offset in milliseconds
+  const isoStringWithGMTPlus7 = new Date(adjustedDate).toISOString();
+  return isoStringWithGMTPlus7.replace('T', ' ').replace(/\.[0-9]+Z/g, "")
+}
 // const defaultErrorHandler = ErrorUtils?.getGlobalHandler?.()
 
 const myErrorHandler = (e: any, isFatal: any) => {
@@ -28,7 +32,7 @@ export function setError(error?: any) {
     user,
     error: String(error),
     routes: routesName,
-    time: new Date().toISOString()
+    time: getTime()
   };
   try {
     AsyncStorage.setItem(`${config?.domain}error`, JSON.stringify(_e));
@@ -47,7 +51,7 @@ export function reportApiError(fetch: any, error: any) {
     'slug: ' + "#" + manifest?.slug,
     'error: ' + error,
     '\n\n\ndev: ' + Platform.OS + ' - ' + Constants.deviceName,
-    'time: ' + new Date().toISOString(),
+    'time: ' + getTime(),
     'app/pub_id: ' + Constants.appOwnership + '/' + (config?.publish_id || '-'),
     'user_id: ' + user?.id || user?.user_id || '-',
     'username: ' + user?.username || '-',

package/modules/user/class.js

@@ -0,0 +1,186 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+// noPage
+// withObject
+var async_storage_1 = require("@react-native-async-storage/async-storage");
+var esoftplay_1 = require("esoftplay");
+var import_1 = require("esoftplay/cache/lib/crypt/import");
+var import_2 = require("esoftplay/cache/lib/curl/import");
+var import_3 = require("esoftplay/cache/lib/notification/import");
+var import_4 = require("esoftplay/cache/user/class/import");
+var import_5 = require("esoftplay/cache/user/data/import");
+var global_1 = require("esoftplay/global");
+var moment_1 = require("esoftplay/moment");
+var expo_constants_1 = require("expo-constants");
+var Notifications = require("expo-notifications");
+var react_native_1 = require("react-native");
+var state = (0, global_1.default)(null, { persistKey: "user", loadOnInit: true });
+exports.default = {
+    state: function () {
+        return state;
+    },
+    create: function (user) {
+        return new Promise(function (r, j) {
+            var _a;
+            (_a = state === null || state === void 0 ? void 0 : state.set) === null || _a === void 0 ? void 0 : _a.call(state, user);
+            if (esoftplay_1.esp.config('notification') == 1) {
+                import_4.UserClass.pushToken();
+            }
+            r(user);
+        });
+    },
+    load: function (callback) {
+        var _this = this;
+        return new Promise(function (r, j) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                async_storage_1.default.getItem('user').then(function (user) {
+                    var _a, _b;
+                    if (user) {
+                        var juser = JSON.parse(user);
+                        if (callback)
+                            callback(((_a = state === null || state === void 0 ? void 0 : state.get) === null || _a === void 0 ? void 0 : _a.call(state)) || juser);
+                        r((((_b = state === null || state === void 0 ? void 0 : state.get) === null || _b === void 0 ? void 0 : _b.call(state)) || juser));
+                    }
+                    else {
+                        if (callback)
+                            callback(null);
+                        r(null);
+                    }
+                });
+                return [2 /*return*/];
+            });
+        }); });
+    },
+    isLogin: function (callback) {
+        var _this = this;
+        return new Promise(function (r, j) {
+            _this.load().then(function (user) {
+                r(user);
+                if (callback)
+                    callback(user);
+            }).catch(function (nouser) {
+                r(null);
+                if (callback)
+                    callback(null);
+            });
+        });
+    },
+    delete: function () {
+        var _this = this;
+        return new Promise(function (r) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        Notifications.setBadgeCountAsync(0);
+                        state.reset();
+                        return [4 /*yield*/, async_storage_1.default.removeItem("user_notification")];
+                    case 1:
+                        _a.sent();
+                        import_5.UserData.deleteAll();
+                        if (esoftplay_1.esp.config('notification') == 1) {
+                            import_4.UserClass.pushToken();
+                        }
+                        r();
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    },
+    pushToken: function () {
+        var _this = this;
+        return new Promise(function (resolve, reject) {
+            if (expo_constants_1.default.appOwnership == 'expo' && !esoftplay_1.esp.isDebug('')) {
+                resolve(undefined);
+                return;
+            }
+            import_3.LibNotification.requestPermission(function (token) { return __awaiter(_this, void 0, void 0, function () {
+                var config_1, post;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    if (token && token.includes("ExponentPushToken")) {
+                        config_1 = esoftplay_1.esp.config();
+                        post = {
+                            user_id: 0,
+                            group_id: esoftplay_1.esp.config('group_id'),
+                            username: "",
+                            token: token,
+                            push_id: "",
+                            is_app: expo_constants_1.default.appOwnership == 'expo' ? 0 : 1,
+                            os: react_native_1.Platform.OS,
+                            device: expo_constants_1.default.deviceName,
+                            secretkey: new import_1.LibCrypt().encode(config_1.salt + "|" + (0, moment_1.default)().format("YYYY-MM-DD hh:mm:ss"))
+                        };
+                        import_4.UserClass.load(function (user) { return __awaiter(_this, void 0, void 0, function () {
+                            var push_id;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        if (user) {
+                                            user["user_id"] = user.id;
+                                            Object.keys(user).forEach(function (userfield) {
+                                                Object.keys(post).forEach(function (postfield) {
+                                                    if (postfield == userfield && postfield != "os" && postfield != "token" && postfield != "secretkey" && postfield != "push_id" && postfield != "device") {
+                                                        post[postfield] = user[userfield];
+                                                    }
+                                                });
+                                            });
+                                        }
+                                        return [4 /*yield*/, async_storage_1.default.getItem("push_id")];
+                                    case 1:
+                                        push_id = _a.sent();
+                                        if (push_id)
+                                            post["push_id"] = push_id;
+                                        new import_2.LibCurl(config_1.protocol + "://" + config_1.domain + config_1.uri + "user/push-token", post, function (res, msg) {
+                                            async_storage_1.default.setItem("push_id", String(Number.isInteger(parseInt(res)) ? res : push_id));
+                                            async_storage_1.default.setItem("token", String(token));
+                                            resolve(res);
+                                        }, function (msg) {
+                                            resolve(msg.message);
+                                        });
+                                        return [2 /*return*/];
+                                }
+                            });
+                        }); });
+                    }
+                    return [2 /*return*/];
+                });
+            }); });
+        });
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "esoftplay",
-  "version": "0.0.131-e",
+  "version": "0.0.131-g",
   "description": "embedding data from esoftplay framework (web based) into mobile app",
   "main": "cache/index.js",
   "types": "../../index.d.ts",