Merge pull request #233 from entrylabs/develop

master <= Develop 2.1.31 alpha2

Author: Tnks2U

src/main/ipcMainHelper.ts

@@ -6,7 +6,7 @@ import Constants from './constants';
 import CommonUtils from './commonUtils';
 import checkUpdateRequest from './utils/network/checkUpdate';
 import createLogger from './utils/functions/createLogger';
-import isValidAsarFile from './utils/functions/isValidAsarFile';
+import isValidAsarFile, { getPapagoHeaderInfoByValidator } from './utils/functions/isValidAsarFile';
 import fileUtils from './fileUtils';
 require('@electron/remote/main').initialize();
 
@@ -48,6 +48,7 @@ new (class {
         ipcMain.handle('isValidAsarFile', this.checkIsValidAsarFile.bind(this));
         ipcMain.handle('saveSoundBuffer', this.saveSoundBuffer.bind(this));
         ipcMain.handle('getExistSoundFilePath', this.getExistSoundFilePath.bind(this));
+        ipcMain.handle('getPapagoHeaderInfo', this.getPapagoHeaderInfo.bind(this));
     }
 
     async saveProject(event: IpcMainInvokeEvent, project: ObjectLike, targetPath: string) {
@@ -259,6 +260,10 @@ new (class {
         return fileUtils.getExistSoundFilePath(sound);
     }
 
+    async getPapagoHeaderInfo(event: IpcMainInvokeEvent) {
+        return await getPapagoHeaderInfoByValidator();
+    }
+
     openUrl(event: IpcMainInvokeEvent, url: string) {
         logger.info(`openUrl called : ${url}`);
         shell.openExternal(url);

src/main/utils/functions/isValidAsarFile.ts

@@ -24,6 +24,7 @@ export enum ResultCode {
 }
 
 export type ValidationResult = { result: ResultCode; reason?: string };
+export type ApiKeyResult = { result: ResultCode; value?: object };
 
 // development: /Users/user/entry_projects/entry-offline
 // production: /Users/user/entry_projects/entry-offline/dist/Entry-darwin-x64/mac/Entry.app/Contents/Resources/app.asar
@@ -36,6 +37,8 @@ function getValidatorPath(): string | undefined {
     if (appPath.indexOf('app.asar') > -1) {
         // if asar packed (production)
         return path.join(appPath, '..', validatorFileName);
+    } else if (process.env.NODE_ENV === 'development') {
+        return path.join(appPath, '/validator', isMacOS ? 'mac' : 'win', validatorFileName);
     }
 }
 
@@ -68,7 +71,7 @@ function isValidAsarFile(): Promise<boolean> {
             resolve(false);
         }, 3000);
 
-        childProcess.on('message', ((message: ValidationResult) => {
+        childProcess.on('message', (message: ValidationResult) => {
             clearTimeout(timeout);
             const { result, reason } = message;
             if (result === ResultCode.INVALID || result === ResultCode.FILE_NOT_FOUND) {
@@ -78,7 +81,42 @@ function isValidAsarFile(): Promise<boolean> {
                 resolve(true);
             }
             !childProcess.killed && childProcess.kill();
-        }));
+        });
+    });
+}
+
+export function getPapagoHeaderInfoByValidator(): Promise<object | undefined | null> {
+    const validatorPath = getValidatorPath();
+
+    if (!validatorPath || !fs.existsSync(validatorPath)) {
+        console.log('cannot find validator binary');
+        return Promise.resolve(null);
+    }
+
+    return new Promise((resolve) => {
+        const childProcess = spawn(validatorPath, ['--type=offline', '--method=apiKey'], {
+            stdio: ['ignore', 'inherit', 'inherit', 'ipc'],
+            detached: true,
+        });
+
+        const timeout = setTimeout(() => {
+            logger.warn('validator spawn timeout. check validator logic');
+            childProcess.kill();
+            resolve(null);
+        }, 3000);
+
+        childProcess.on('message', (message: ApiKeyResult) => {
+            clearTimeout(timeout);
+            const { result, value } = message;
+            if (result === ResultCode.LOGIC_ERROR || result === ResultCode.FILE_NOT_FOUND) {
+                logger.warn(`apiKey fail value: ${result}`);
+                resolve(null);
+            } else {
+                const valueWithVersion = { ...value, 'X-Offline-Version': app.getVersion() };
+                resolve(valueWithVersion);
+            }
+            !childProcess.killed && childProcess.kill();
+        });
     });
 }
 

src/preload/preload.ts

@@ -108,6 +108,13 @@ window.checkPermission = async (type: 'microphone' | 'camera') => {
     await ipcRenderer.invoke('checkPermission', type);
 };
 
+window.getPapagoHeaderInfo = async () => {
+    const result = await ipcRenderer.invoke('getPapagoHeaderInfo');
+    return result;
+};
+
+window.isOffline = true;
+
 window.ipcListen = ipcRenderer.on.bind(ipcRenderer);
 
 window.isOsx = process.platform === 'darwin';

src/renderer/components/workspace.tsx

@@ -40,7 +40,10 @@ class Workspace extends Component<IProps> {
         libDir: '../../../node_modules',
         defaultDir: '../../renderer/resources',
         entryDir: '/entry-js',
-        baseUrl: 'https://playentry.org',
+        baseUrl:
+            process.env.NODE_ENV === 'development'
+                ? 'https://entry2-dev.playentry.org'
+                : 'https://playentry.org',
         fonts: EntryStatic.fonts,
         textCodingEnable: true,
         dataTableEnable: true,

types/window.d.ts

@@ -26,9 +26,11 @@ declare interface Preload {
     onLoadProjectFromMain(callback: (project: Promise<IEntry.Project>) => void): void;
     openHardwarePage(): void;
     checkPermission(type: 'microphone' | 'camera'): Promise<void>;
+    getPapagoHeaderInfo(): Promise<object>;
     weightsPath: () => string;
     getEntryjsPath: () => string;
     getAppPathWithParams: (...params: string[]) => string;
+    isOffline: boolean;
 }
 
 declare var entrylms: any;

validator/mac/validator.txt

@@ -5238,7 +5238,7 @@ entities@^2.0.0:
 
 "entry-js@git+https://github.com/entrylabs/entryjs.git#dist/offline_v2.1.31":
   version "4.0.22"
-  resolved "git+https://github.com/entrylabs/entryjs.git#a7200f57d749b08d15f3ae628210c85e231c9d77"
+  resolved "git+https://github.com/entrylabs/entryjs.git#6e078bef7d783521a00480d56e89b66991c7a2c9"
   dependencies:
     uid "^0.0.2"
     "@entrylabs/event" "^1.0.3"