Merge pull request #62 from Coding/define-app-lifecycle

定义 initialize 阶段；解决平台与开源版 API 分叉问题

Author: hackape

.gitignore

@@ -3,5 +3,6 @@ build
 **/*.md
 .idea/
 .vscode/
+.env
 app/config.js
 *.bak

app/backendAPI/fileAPI.js

@@ -46,7 +46,11 @@ export function writeFile (path, content, base64) {
 }
 
 export function readFile (path) {
-  return request.get(`/workspaces/${config.spaceKey}/file/read`, {
+  const url = config.isPlatform ?
+    `/workspaces/${config.spaceKey}/read`
+  : `/workspaces/${config.spaceKey}/file/read`
+
+  return request.get(url, {
     path: path,
     base64: false
   })

app/backendAPI/gitAPI.js

@@ -19,7 +19,8 @@ export function gitCheckout (branch, remoteBranch) {
 }
 
 export function gitCommit ({files, message}) {
-  return request.post(`/git/${config.spaceKey}`, {files, message})
+  const url = config.isPlatform ? `/git/${config.spaceKey}/commits` : `/git/${config.spaceKey}`
+  return request.post(url, {files, message})
 }
 
 export function gitPull () {
@@ -113,11 +114,15 @@ export function gitRebaseUpdate (lines) {
 }
 
 export function gitCommitDiff ({ref}) {
-  return request.get(`/git/${config.spaceKey}/diff`, {ref})
+  return config.isPlatform ?
+    request.diffFilesList(`/git/${config.spaceKey}/commits/${ref}`)
+  : request.get(`/git/${config.spaceKey}/diff`, {ref})
 }
 
 export function gitFileDiff ({ path, oldRef, newRef }) {
-  return request.get(`/git/${config.spaceKey}/diff`, { path, oldRef, newRef })
+  return config.isPlatform ?
+    request.diff(`/git/${config.spaceKey}/commits/${oldRef}...${newRef}`, { path })
+  : request.get(`/git/${config.spaceKey}/diff`, { path, oldRef, newRef })
 }
 
 export function gitReadFile ({ref, path}) {

app/backendAPI/websocketClient.js

@@ -22,7 +22,11 @@ const _resetRetryDelay = () => {
 
 const Client = {
   connect: function (connectCallback, errorCallback) {
-    var socket = new SockJS(`${config.baseURL}/sockjs/`, {}, {server: `${config.spaceKey}`, transports: 'websocket'})
+    const url = config.isPlatform ?
+      `${config.wsURL}/sockjs/${config.spaceKey}`
+    : `${config.baseURL}/sockjs/`
+
+    const socket = new SockJS(url, {}, {server: `${config.spaceKey}`, transports: 'websocket'})
     var stompClient = Stomp.over(socket)
 
     return stompClient.connect({},

app/backendAPI/workspaceAPI.js

@@ -5,44 +5,36 @@ import Client from './websocketClient'
 
 var connectedResolve
 export const websocketConnectedPromise = new Promise((rs, rj) => connectedResolve = rs)
-export function setupWorkspace () {
-  return request.post(`/workspaces/${config.spaceKey}/setup`).then(({spaceKey, projectName, projectIconUrl}) => {
-    // 1.
-    var websocketPromise = new Promise(function (resolve, reject) {
-      Client.connect(function () {
-        connectedResolve(this)
-        resolve(true)
-      })
-    })
-
-    // 2.
-    var settingsPromise = request.get(`/workspaces/${config.spaceKey}/settings`).then(({content}) => {
-      return JSON.parse(content)
-    })
 
-    return Promise.all([websocketPromise, settingsPromise]).then(([isConnected, settings]) => {
-      return {
-        projectName,
-        spaceKey,
-        projectIconUrl,
-        settings
-      }
-    })
-  })
+export function isWorkspaceExist () {
+  return request.get(`/workspaces/${config.spaceKey}`).catch(() => false).then(() => true)
 }
 
-export function getWorkspaces () {
-  return request.get(`/workspaces`)
+export function setupWorkspace () {
+  return config.isPlatform ?
+    request.post('/workspaces', {spaceKey: config.spaceKey})
+  : request.post(`/workspaces/${config.spaceKey}/setup`)
 }
 
-export function createWorkspace (url) {
-  return request.post('/workspaces', {url})
+export function connectWebsocketClient () {
+  return new Promise(function (resolve, reject) {
+    Client.connect(function () {
+      connectedResolve(this)
+      resolve(true)
+    })
+  })
 }
 
-export function deleteWorkspace (spaceKey) {
-  return request.delete(`/workspaces/${spaceKey}`)
+export function getSettings () {
+  return request.get(`/workspaces/${config.spaceKey}/settings`).then(({ content={} }) => {
+    return JSON.parse(content)
+  })
 }
 
-export function getPublicKey () {
-  return request.get('/user?public_key')
+// Switch back to old version
+export function switchVersion () {
+  return request.put('/versions')
+  .then((res) => {
+    window.location.reload()
+  })
 }

app/commands/commandBindings/file.js

@@ -77,7 +77,12 @@ export default {
 
     } else {
       api.writeFile(activeTab.path, content)
-        .then(() => dispatch(Tab.actions.updateTabFlags(activeTab.id, 'modified', false)))
+        .then(() => {
+          dispatch(Tab.actions.updateTabFlags(activeTab.id, 'modified', false))
+          dispatch(Tab.actions.updateTab({
+            id: activeTab.id, content: { body: content }
+          }))
+        })
     }
 
   },