From 6a3af6d891968ca9da510a73da513ed25e4c24b7 Mon Sep 17 00:00:00 2001 From: Andrew Simachev Date: Thu, 17 Aug 2023 22:00:56 +0200 Subject: [PATCH] updates --- dist/extension/img/icon32x32.png | Bin 0 -> 785 bytes dist/extension/js/background.js | 58 +++++++++++++++++- dist/extension/js/foreground.js | 1 - dist/extension/manifest.json | 7 ++- electron/js/lib/installNativeMessagingHost.js | 4 +- extension/app.tsx | 17 +++++ extension/entry.tsx | 11 +++- go/nativeMessagingHost.go | 2 +- src/ts/app.tsx | 14 ++--- src/ts/component/block/media/pdf.tsx | 2 +- src/ts/component/menu/help.tsx | 2 +- src/ts/component/page/main/media.tsx | 2 +- .../component/popup/page/settings/account.tsx | 2 +- src/ts/component/popup/page/settings/data.tsx | 2 +- src/ts/lib/action.ts | 6 +- src/ts/lib/analytics.ts | 10 +-- src/ts/lib/keyboard.ts | 18 +++--- src/ts/lib/renderer.ts | 8 +-- src/ts/lib/util/common.ts | 8 ++- src/ts/lib/util/file.ts | 2 +- src/ts/store/common.ts | 1 + 21 files changed, 132 insertions(+), 45 deletions(-) create mode 100644 dist/extension/img/icon32x32.png delete mode 100644 dist/extension/js/foreground.js diff --git a/dist/extension/img/icon32x32.png b/dist/extension/img/icon32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..572dd9befa24b90572868fc5cdd06eb2d58d2cf8 GIT binary patch literal 785 zcmV+s1Md8ZP)!JB$1YNh-lAm53I}30hwY5k$Ql*opx= ziQ&*Djb<;GpS#&N&b-~^a>r$p+e8kI3{2jvX015-Z?E|_uEq(BrrqgL^ zG#Yf6)oL}0#bWz=Ao-BA{gBzZQQ-M2Qn|M_f1Vnto7UOb1wtNa)N8zjKu4wG+hed6hfNQ_ z^(AJP`P#i3z5?9!y#ZJps5UERBhV(^1(C>E26Y(RHs=c6H?h**8p&MybME@cnbY1z z`MRT+6vqQ5&{yFIz}@wL4FP*^^kd~ZUbO}YX#Q#Y``Ed17L7?vS7721Y<>P6t`Jb+2&}(;%gHRRf&m58VYEJ1-lY++ z>aLh-x2tt*eEc#}z^n_fs6!zYD8AW1d5e?U9Vl)psY-y&`Eq448X_F$o)=;5w!Dqn z_ZeS~fe)fbPoARk^`}>@FZEDzsa)1_FN!F>dp|M9G#-KPg6-dRT)q1kskJ*uKe&(h zrOQTE%W9$Wql(;m0p-fKpcI(pr^}Jv_p$RA7W(@^Vdm5NKeqf|uq5yg*W~l>?PsF4 P00000NkvXXu0mjfuG(&n literal 0 HcmV?d00001 diff --git a/dist/extension/js/background.js b/dist/extension/js/background.js index d07b2ab503..14ea6c4088 100644 --- a/dist/extension/js/background.js +++ b/dist/extension/js/background.js @@ -1,3 +1,57 @@ -const a = 1; +(() => { -console.log('This is worker script'); \ No newline at end of file + chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => { + + switch (msg.type) { + case 'initNative': { + initNative(sendResponse); + break; + }; + }; + + return true; + }); + + const initNative = (callBack) => { + const client = chrome.runtime.connectNative('com.anytype.desktop'); + + client.onMessage.addListener((msg) => { + console.log('Received', msg); + + if (msg.error) { + console.error(msg.error); + return; + }; + + switch (msg.type) { + case 'NMHGetOpenPorts': { + let port = ''; + for (let pid in msg.response) { + port = msg.response[pid][1]; + break; + }; + + callBack({ type: 'NMHGetOpenPorts', port }); + break; + }; + }; + }); + + client.onDisconnect.addListener(() => { + console.log('Disconnected'); + }); + + client.postMessage({ type: 'NMHGetOpenPorts' }); + }; + + chrome.contextMenus.create({ + id: 'workTime', + title: 'WorkTime', + contexts: [ 'selection' ] + }); + + chrome.contextMenus.onClicked.addListener((data) => { + console.log('Click'); + }); + +})(); \ No newline at end of file diff --git a/dist/extension/js/foreground.js b/dist/extension/js/foreground.js deleted file mode 100644 index 6d3cec7eee..0000000000 --- a/dist/extension/js/foreground.js +++ /dev/null @@ -1 +0,0 @@ -const a = 1; \ No newline at end of file diff --git a/dist/extension/manifest.json b/dist/extension/manifest.json index a9fdc55ecf..52768f6063 100644 --- a/dist/extension/manifest.json +++ b/dist/extension/manifest.json @@ -12,7 +12,10 @@ "default_title": "Chrome Addon v3 Starter", "default_popup": "popup/index.html" }, - "permissions": [], + "permissions": [ + "contextMenus", + "nativeMessaging" + ], "host_permissions": [ "*://*/*" ], @@ -21,7 +24,7 @@ }, "content_scripts": [ { - "js": [ "js/foreground.js" ], + "js": [ "js/main.js" ], "matches": [ "" ] } ] diff --git a/electron/js/lib/installNativeMessagingHost.js b/electron/js/lib/installNativeMessagingHost.js index dfcec3e16f..310ed0ccee 100644 --- a/electron/js/lib/installNativeMessagingHost.js +++ b/electron/js/lib/installNativeMessagingHost.js @@ -16,9 +16,9 @@ const path = require('path'); const util = require('../util.js'); const { fixPathForAsarUnpack, is } = require('electron-util'); -const APP_NAME = 'com.anytype.anytype_desktop'; +const APP_NAME = 'com.anytype.desktop'; const MANIFEST_FILENAME = `${APP_NAME}.json`; -const EXTENSION_ID = 'ahaggknnnohbcdmckanhelcmlfcopjoa'; +const EXTENSION_ID = 'jkmhmgghdjjbafmkgjmplhemjjnkligf'; const USER_PATH = app.getPath('userData'); const EXE_PATH = app.getPath('exe'); diff --git a/extension/app.tsx b/extension/app.tsx index 0ac7949337..a04824c2ce 100644 --- a/extension/app.tsx +++ b/extension/app.tsx @@ -3,6 +3,7 @@ import * as hs from 'history'; import { Router, Route, Switch } from 'react-router-dom'; import { Provider } from 'mobx-react'; import { configure } from 'mobx'; +import { dispatcher, C } from 'Lib'; import { commonStore, authStore, blockStore, detailStore, dbStore, menuStore, popupStore } from 'Store'; import Index from './page/index'; @@ -55,6 +56,22 @@ class App extends React.Component { }; componentDidMount () { + commonStore.configSet({ debug: { mw: true } }, false); + + // @ts-ignore: saying 'chrome' is not found + chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => { + console.log(msg); + return true; + }); + + // @ts-ignore: saying 'chrome' is not found + chrome.runtime.sendMessage({ type: 'initNative' }, (response) => { + dispatcher.init(`http://127.0.0.1:${response.port}`); + + C.AppGetVersion((message: any) => { + console.log(message); + }); + }); }; componentDidUpdate () { diff --git a/extension/entry.tsx b/extension/entry.tsx index ae00cd5e7e..618a9ba561 100644 --- a/extension/entry.tsx +++ b/extension/entry.tsx @@ -2,4 +2,13 @@ import * as React from 'react'; import * as ReactDOM from 'react-dom'; import App from './app'; -ReactDOM.render(, document.getElementById('anytypeWebclipperRoot')); \ No newline at end of file +const body = document.querySelector('body'); +const root = document.createElement('div'); + +root.id = 'anytypeWebclipperRoot'; + +if (body) { + body.appendChild(root); +}; + +ReactDOM.render(, root); \ No newline at end of file diff --git a/go/nativeMessagingHost.go b/go/nativeMessagingHost.go index f3d20d29c3..8f469602cf 100644 --- a/go/nativeMessagingHost.go +++ b/go/nativeMessagingHost.go @@ -177,7 +177,7 @@ func startApplication() (int, error) { } else if platform == "darwin" { appPath = filepath.Join(appPath, "MacOS", "Anytype") } else if platform == "linux" { - appPath = filepath.Join(appPath, "anytype2") + appPath = filepath.Join(appPath, "anytype") } else { return 0, errors.New("unsupported platform") } diff --git a/src/ts/app.tsx b/src/ts/app.tsx index b0cdf70edd..127f289d01 100644 --- a/src/ts/app.tsx +++ b/src/ts/app.tsx @@ -262,8 +262,8 @@ enableLogging({ */ Sentry.init({ - release: window.Electron.version.app, - environment: window.Electron.isPackaged ? 'production' : 'development', + release: UtilCommon.getElectron().version.app, + environment: UtilCommon.getElectron().isPackaged ? 'production' : 'development', dsn: Constant.sentry, maxBreadcrumbs: 0, beforeSend: (e: any) => { @@ -327,7 +327,7 @@ class App extends React.Component {
-
{window.Electron.version.app}
+
{UtilCommon.getElectron().version.app}
) : ''} @@ -362,14 +362,14 @@ class App extends React.Component { init () { UtilCommon.init(history); - dispatcher.init(window.Electron.getGlobal('serverAddress')); + dispatcher.init(UtilCommon.getElectron().getGlobal('serverAddress')); keyboard.init(); this.registerIpcEvents(); Renderer.send('appOnLoad'); - console.log('[Process] os version:', window.Electron.version.system, 'arch:', window.Electron.arch); - console.log('[App] version:', window.Electron.version.app, 'isPackaged', window.Electron.isPackaged); + console.log('[Process] os version:', UtilCommon.getElectron().version.system, 'arch:', UtilCommon.getElectron().arch); + console.log('[App] version:', UtilCommon.getElectron().version.app, 'isPackaged', UtilCommon.getElectron().isPackaged); }; initStorage () { @@ -592,7 +592,7 @@ class App extends React.Component { popupStore.open('confirm', { data: { title: translate('popupConfirmUpdateDoneTitle'), - text: UtilCommon.sprintf(translate('popupConfirmUpdateDoneText'), window.Electron.version.app), + text: UtilCommon.sprintf(translate('popupConfirmUpdateDoneText'), UtilCommon.getElectron().version.app), textConfirm: translate('popupConfirmUpdateDoneOk'), canCancel: false, }, diff --git a/src/ts/component/block/media/pdf.tsx b/src/ts/component/block/media/pdf.tsx index 539e3dea36..2a22cb7bc1 100644 --- a/src/ts/component/block/media/pdf.tsx +++ b/src/ts/component/block/media/pdf.tsx @@ -183,7 +183,7 @@ const BlockPdf = observer(class BlockPdf extends React.Component { + C.FileDownload(hash, UtilCommon.getElectron().tmpPath, (message: any) => { if (message.path) { Renderer.send('pathOpen', message.path); }; diff --git a/src/ts/component/menu/help.tsx b/src/ts/component/menu/help.tsx index ae1f42d267..a1d7547325 100644 --- a/src/ts/component/menu/help.tsx +++ b/src/ts/component/menu/help.tsx @@ -65,7 +65,7 @@ class MenuHelp extends React.Component { }; getItems () { - const btn =