Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions src/core/const.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ export const ANDROID = 2;
export const ANDROID_NAME = 'Android';
export const WINDOWS = 3;
export const WINDOWS_NAME = 'Windows';
export const HARMONY = 4;
export const HARMONY_NAME = 'Harmony';

// supported apps
export const REACT_NATIVE = 1;
Expand Down
5 changes: 5 additions & 0 deletions src/core/services/app-manager.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

import _ from 'lodash';
import { Op } from 'sequelize';
import { Apps, AppsInterface } from '../../models/apps';
Expand All @@ -12,6 +13,8 @@ import {
ANDROID_NAME,
WINDOWS,
WINDOWS_NAME,
HARMONY,
HARMONY_NAME,
CORDOVA,
CORDOVA_NAME,
REACT_NATIVE,
Expand Down Expand Up @@ -121,6 +124,8 @@ class AppManager {
os = ANDROID_NAME;
} else if (info.os === WINDOWS) {
os = WINDOWS_NAME;
} else if (info.os === HARMONY) {
os = HARMONY_NAME;
}

let platform = '';
Expand Down
7 changes: 6 additions & 1 deletion src/core/utils/security.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { generator } from 'rand-token';
import recursive from 'recursive-readdir';
import slash from 'slash';
import { AppError } from '../app-error';
import { ANDROID, IOS } from '../const';
import { ANDROID, HARMONY, IOS } from '../const';

export function md5(str: string) {
const md5sum = crypto.createHash('md5');
Expand Down Expand Up @@ -141,6 +141,7 @@ export function uploadPackageType(directoryPath: string) {
} else {
const aregex = /android\.bundle/;
const aregexIOS = /main\.jsbundle/;
const aregexHarmony = /harmony\.jsbundle/;
let packageType = 0;
_.forIn(files, (value: string) => {
if (aregex.test(value)) {
Expand All @@ -151,6 +152,10 @@ export function uploadPackageType(directoryPath: string) {
packageType = IOS;
return false;
}
if (aregexHarmony.test(value)) {
packageType = HARMONY;
return false;
}

return undefined;
});
Expand Down
6 changes: 5 additions & 1 deletion src/routes/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
ANDROID_NAME,
WINDOWS,
WINDOWS_NAME,
HARMONY,
HARMONY_NAME,
REACT_NATIVE,
REACT_NATIVE_NAME,
CORDOVA,
Expand Down Expand Up @@ -1209,8 +1211,10 @@ appsRouter.post(
os = ANDROID;
} else if (osName === _.toLower(WINDOWS_NAME)) {
os = WINDOWS;
} else if (osName === _.toLower(HARMONY_NAME)) {
os = HARMONY;
} else {
res.status(406).send('Please input os [iOS|Android|Windows]!');
res.status(406).send('Please input os [iOS|Android|Windows|Harmony]!');
return;
}
const platformName = _.toLower(body.platform);
Expand Down