esoftplay 0.0.124-b → 0.0.124-d

package/modules/lib/curl.ts

@@ -6,8 +6,8 @@ import { LibNet_status } from 'esoftplay/cache/lib/net_status/import';
 import { LibProgress } from 'esoftplay/cache/lib/progress/import';
 import { LibToastProperty } from 'esoftplay/cache/lib/toast/import';
 import { LibUtils } from 'esoftplay/cache/lib/utils/import';
-import esp from 'esoftplay/esp';
 import { reportApiError } from "esoftplay/error";
+import esp from 'esoftplay/esp';
 import Constants from 'expo-constants';
 
 //api_logger_import
@@ -441,16 +441,14 @@ export default class m {
     LibProgress.hide()
   }
 
-  protected getTimeByTimeZone(timeZone: string): number {
-    let localTimezoneOffset = new Date().getTimezoneOffset()
-    let serverTimezoneOffset = -420 // -420 for Asia/Jakarta
-    let diff
-    if (localTimezoneOffset < serverTimezoneOffset) {
-      diff = localTimezoneOffset - serverTimezoneOffset
-    } else {
-      diff = (serverTimezoneOffset - localTimezoneOffset) * -1
-    }
-    let time = new Date().getTime() + (diff * 60 * 1000 * -1);
-    return time;
+  protected getTimeByTimeZone(GMT: number): number {
+    const date = new Date()
+    let currentOffsetInMinutes = date.getTimezoneOffset();
+    let currentOffsetInHours = currentOffsetInMinutes / 60;
+    let currentGMT = -currentOffsetInHours;
+    let currentOffset = currentGMT * 60 * 60 * 1000;
+    let targetOffset = 7/* Asia/Jakarta */ * 60 * 60 * 1000;
+    let gmtDiff = targetOffset - currentOffset;
+    return date.getTime() + gmtDiff
   }
 }

package/moment.ts

@@ -17,6 +17,20 @@ function isNumeric(n) {
   return !isNaN(parseFloat(n)) && isFinite(n);
 }
 
+function normalizeTimeOffset(date: Date) {
+  if (!(date instanceof Date)) {
+    date = dayjs(date).toDate()
+  }
+  let currentOffsetInMinutes = date.getTimezoneOffset();
+  let currentOffsetInHours = currentOffsetInMinutes / 60;
+  let currentGMT = -currentOffsetInHours;
+  let currentOffset = currentGMT * 60 * 60 * 1000;
+  let targetOffset = 7/* Asia/Jakarta */ * 60 * 60 * 1000;
+  let gmtDiff = targetOffset - currentOffset;
+  let originalTime = new Date(date.getTime() - gmtDiff);
+  return originalTime;
+}
+
 export default function moment(date?: string | Date | any) {
   let _date = isNumeric(date) ? new Date(date * 1000) : date
   return {
@@ -40,11 +54,12 @@ export default function moment(date?: string | Date | any) {
     },
     /* last chain */
     fromNow: () => {
-      const out = dayjs(_date).fromNow()
+      const out = dayjs(normalizeTimeOffset(_date)).fromNow()
       return out
     },
-    format: (custom: string) => {
-      const out = dayjs(_date).format(custom)
+    format: (custom: string, ignoreTimezone?: boolean) => {
+      const _d = ignoreTimezone? _date : normalizeTimeOffset(_date)
+      const out = dayjs(_d).format(custom)
       return out
     },
     toDate: () => {
@@ -52,7 +67,7 @@ export default function moment(date?: string | Date | any) {
       return out
     },
     toMiliseconds: () => {
-      const out = String(dayjs(_date).valueOf())
+      const out = String(dayjs(normalizeTimeOffset(_date)).valueOf())
       return out
     },
     duration: (other_date: string | Date) => {

package/package.json

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