Skip to content

DEXW-2465: fix #1799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsigel wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

DEXW-2465: fix #1799

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40aed09
DEXW-2465: fix
Nov 25, 2019
785b29f
DEXW-2465: fix json parse
Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions ts-scripts/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { getType } from 'mime';
import { exec, spawn } from 'child_process';
import { readdirSync, readFileSync, statSync, unlink } from 'fs';
import { join, relative, extname, dirname } from 'path';
import { IPackageJSON, IMetaJSON, TBuild, TConnection, TPlatform, IConfItem } from './interface';
import { readFile, readJSON, readJSONSync, createWriteStream, mkdirp } from 'fs-extra';
import { dirname, extname, join, relative } from 'path';
import { IConfItem, IMetaJSON, IPackageJSON, TBuild, TConnection, TPlatform } from './interface';
import { createWriteStream, mkdirp, readFile, readJSON, readJSONSync } from 'fs-extra';
import { compile } from 'handlebars';
import { transform } from 'babel-core';
import { render } from 'less';
import { minify } from 'html-minifier';
import { get, ServerResponse, IncomingMessage, request } from 'https';
import { get, IncomingMessage, request, ServerResponse } from 'https';
import { Http2ServerRequest, Http2ServerResponse } from 'http2';
import { serialize } from 'cookie';

Expand Down Expand Up @@ -371,26 +371,16 @@ export async function getInitScript(
WavesApp.device = new MobileDetect(navigator.userAgent);

(function () {
var wrapper = require('worker-wrapper');

var worker = wrapper.create({
libs: ['/node_modules/@waves/parse-json-bignumber/dist/parse-json-bignumber.min.js?v' + WavesApp.version]
});

worker.process(function () {
(self as any).parse = parseJsonBignumber().parse;
});

var stringify = parseJsonBignumber({
parse: (data: string) => new BigNumber(data),
stringify: (data) => data.toFixed(),
isInstance: (data) => BigNumber.isBigNumber(data)
}).stringify;

WavesApp.parseJSON = function (str) {
return worker.process(function (str) {
return parse(str);
}, str);
var reg = new RegExp('((?!\\\\)"\\w+"):\\s*(-?[\\d|\\.]{14,})', 'g');

WavesApp.parseJSON = function (json) {
return JSON.parse(json.replace(reg, `$1:"$2"`));
};

WavesApp.stringifyJSON = function () {
Expand Down Expand Up @@ -477,20 +467,26 @@ export async function getInitScript(
};


config.platform = function() {
config.platform = function () {
const userAgent = navigator.userAgent;
const platform = navigator.platform;
const macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'];
const windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'];
const iosPlatforms = ['iPhone', 'iPad', 'iPod'];

switch (true) {
case (macosPlatforms.indexOf(platform) !== -1): return 'mac';
case (iosPlatforms.indexOf(platform) !== -1): return 'ios';
case (windowsPlatforms.indexOf(platform) !== -1): return 'win';
case (/Android/.test(userAgent)): return 'android';
case (/Linux/.test(platform)): return 'linux';
default: return 'linux';
case (macosPlatforms.indexOf(platform) !== -1):
return 'mac';
case (iosPlatforms.indexOf(platform) !== -1):
return 'ios';
case (windowsPlatforms.indexOf(platform) !== -1):
return 'win';
case (/Android/.test(userAgent)):
return 'android';
case (/Linux/.test(platform)):
return 'linux';
default:
return 'linux';
}
};

Expand Down Expand Up @@ -872,7 +868,7 @@ export function loadLocales(path: string, options?: object): Promise<void> {
get(url, (res) => {
res.pipe(file);
res.on('end', () => {
console.log(zipPath)
console.log(zipPath);
extract(zipPath, { dir: `${path}/` }, error => {
if (error) {
reject(error);
Expand Down