feat: remove protocol module

CyanSalt · Jun 23, 2021 · 2842aee · 2842aee
1 parent c286196
commit 2842aee
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 140 deletions.
diff --git a/addons/sync/commas.json b/addons/sync/commas.json
diff --git a/addons/sync/index.js b/addons/sync/index.js
diff --git a/addons/sync/locales/zh-CN.json b/addons/sync/locales/zh-CN.json
diff --git a/api/main.ts b/api/main.ts
@@ -6,7 +6,6 @@ import * as frame from './modules/frame'
 import * as i18n from './modules/i18n'
 import * as ipcMain from './modules/ipc-main'
 import * as keybinding from './modules/keybinding'
-import * as protocol from './modules/protocol'
 import * as settings from './modules/settings'
 
 export {
@@ -15,7 +14,6 @@ export {
   settings,
   frame,
   directory,
-  protocol,
   keybinding,
   ipcMain,
   bundler,

diff --git a/api/modules/protocol.ts b/api/modules/protocol.ts
diff --git a/bin/commas b/bin/commas
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-payload=$(ELECTRON_RUN_AS_NODE=1 ${TERM_PROGRAM_BIN:-node} $(dirname $0)/_context.js cli "$@")
+payload=$(ELECTRON_RUN_AS_NODE=1 ${COMMAS_EXE:-node} $(dirname $0)/_context.js cli "$@")
 printf '\x1b]539;%s\x1b\\' "$payload"
diff --git a/bin/commas-node b/bin/commas-node
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-ELECTRON_RUN_AS_NODE=1 ${TERM_PROGRAM_BIN:-node} "$@"
+ELECTRON_RUN_AS_NODE=1 ${COMMAS_EXE:-node} "$@"
diff --git a/main/index.ts b/main/index.ts
@@ -10,7 +10,6 @@ import { handleKeyBindingMessages } from './lib/keybinding'
 import { handleLauncherMessages } from './lib/launcher'
 import { createApplicationMenu, createDockMenu, handleMenuMessages } from './lib/menu'
 import { handleMessages } from './lib/message'
-import { startServingProtocol, handleProtocolRequest } from './lib/protocol'
 import { handleSettingsMessages, useSettings, whenSettingsReady } from './lib/settings'
 import { handleTerminalMessages } from './lib/terminal'
 import { handleThemeMessages } from './lib/theme'
@@ -41,7 +40,6 @@ async function initialize() {
       createDockMenu()
     })
   }
-  startServingProtocol()
   createWindow(cwd)
 }
 
@@ -75,11 +73,6 @@ app.on('will-finish-launching', () => {
     const frame = getLastWindow()
     frame.webContents.send('open-tab', { cwd: file })
   })
-  // handle custom protocol
-  app.on('open-url', (event, url) => {
-    event.preventDefault()
-    handleProtocolRequest(url)
-  })
 })
 
 app.on('window-all-closed', () => {

diff --git a/main/lib/protocol.ts b/main/lib/protocol.ts
diff --git a/main/utils/shell.ts b/main/utils/shell.ts
@@ -1,5 +1,6 @@
 import * as path from 'path'
 import { app } from 'electron'
+import { userData } from './directory'
 import { execa } from './helper'
 
 const BIN_PATH = app.isPackaged
@@ -17,7 +18,8 @@ function getDefaultEnv() {
     LANG: app.getLocale().replace('-', '_') + '.UTF-8',
     TERM_PROGRAM: app.name,
     TERM_PROGRAM_VERSION: app.getVersion(),
-    TERM_PROGRAM_BIN: app.getPath('exe'),
+    COMMAS_EXE: app.getPath('exe'),
+    COMMAS_USERDATA: userData.path,
     PATH: process.env.PATH ? `${process.env.PATH}:${BIN_PATH}` : BIN_PATH,
   }
   // Fix NVM `npm_config_prefix` error in development environment

diff --git a/resources/settings.spec.json b/resources/settings.spec.json
@@ -170,7 +170,7 @@
     "key": "terminal.addon.includes",
     "type": "list",
     "paradigm": ["string"],
-    "recommendations": ["cli", "updater", "preference", "proxy", "settings", "theme", "menu", "power-mode", "sync", "landscape"],
+    "recommendations": ["cli", "updater", "preference", "proxy", "settings", "theme", "menu", "power-mode", "landscape"],
     "label": "Enabled Addons",
     "comments": [
       "List of enabled addon name"