build: add railway build config

.eslintignore

@@ -13,6 +13,7 @@ tools/cli-engine/src/browser/worker-host.js
 **/scripts/**
 packages/*/lib/**
 packages/**/dist/**
+packages/**/dist-node/**
 
 packages/components/src/icon/iconfont
 packages/core-browser/src/style/octicons

.github/workflows/check.yml

@@ -52,6 +52,7 @@ jobs:
         run: |
           yarn run init
           yarn run bundle:lite
+          yarn run bundle:prod
 
       - name: Lint
         run: |
@@ -81,6 +82,7 @@ jobs:
           yarn install --immutable
           yarn run init
           yarn run bundle:lite
+          yarn run bundle:prod
 
       - name: Lint
         run: |

.gitignore

@@ -67,6 +67,7 @@ jspm_packages/
 .yarn-integrity
 
 dist
+dist-node
 lib
 
 .vscode/*

nixpacks.toml

@@ -0,0 +1,14 @@
+providers = ["..."]
+
+[variables]
+NODE_ENV = 'production'
+
+[phases.setup]
+nixPkgs = ["...", "libsecret"]
+aptPkgs = ["...", "build-essential", "libsecret-1-dev"]
+
+[phases.build]
+cmds = ['yarn build:all', 'yarn bundle:prod', 'yarn download-extension']
+
+[start]
+cmd = 'node packages/startup/dist-node/server/server.js'

package.json

@@ -13,11 +13,12 @@
     "build:components": "cd packages/components && yarn run build:dist",
     "start:lite": "cross-env NODE_ENV=development ts-node ./scripts/start --script=start:lite",
     "bundle:lite": "ts-node ./scripts/start --script=bundle:lite",
+    "bundle:prod": "ts-node ./scripts/start --script=bundle:prod",
     "start:pty-service": "KTLOG_SHOW_DEBUG=1 npx ts-node packages/terminal-next/src/node/pty.proxy.remote.exec.ts",
     "create": "ts-node ./scripts/create",
     "add:node": "ts-node ./scripts/add-node",
     "add:browser": "ts-node ./scripts/add-browser",
-    "build": "yarn run compile && echo 'use `compile` instead'",
+    "build": "yarn run compile",
     "build:all": "yarn run build && yarn run build:worker-host && yarn run build:ext-host && yarn run build:components",
     "compile": "cross-env NODE_ENV=production ts-node ./scripts/build",
     "build:worker-host": "cd packages/extension && yarn run compile:worker",
@@ -92,7 +93,7 @@
     "@types/node-fetch": "^2.6.1",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
-    "@types/react-is": "^16.7.1",
+    "@types/react-is": "^18.2.4",
     "@types/socket.io-client": "^1.4.32",
     "@types/temp": "^0.9.1",
     "@types/ws": "^8.5.10",
@@ -111,7 +112,6 @@
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-unused-imports": "^2.0.0",
     "git-rev-sync": "^3.0.1",
-    "got": "^12.1.0",
     "handlebars": "^4.7.3",
     "is-git-clean": "^1.1.0",
     "jest": "^29.7.0",
@@ -143,8 +143,6 @@
     "tools/cli-engine"
   ],
   "resolutions": {
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
     "classnames": "2.3.1",
     "node-gyp": "9.3.1"
   },

packages/components/webpack.config.js

@@ -19,6 +19,9 @@ module.exports = {
   optimization: {
     minimizer: [new OptimizeCSSAssetsPlugin({})],
   },
+  cache: {
+    type: 'filesystem',
+  },
   plugins: [
     new MiniCssExtractPlugin({
       filename: 'index.css',
@@ -53,18 +56,6 @@ module.exports = {
       {
         test: /\.tsx?$/,
         use: [
-          {
-            loader: 'cache-loader',
-            options: {
-              cacheDirectory: path.resolve(__dirname, '../../../.cache'),
-            },
-          },
-          {
-            loader: 'thread-loader',
-            options: {
-              workers: require('os').cpus().length - 1,
-            },
-          },
           {
             loader: 'ts-loader',
             options: {

packages/core-browser/package.json

@@ -32,14 +32,12 @@
     "lodash": "^4.17.21",
     "mobx": "^5.9.4",
     "mobx-react-lite": "^1.3.1",
-    "onigasm": "2.2.2",
     "rc-menu": "^9.3.2",
     "react": "^18.0.0",
     "react-autosize-textarea": "^7.0.0",
     "react-ctxmenu-trigger": "^1.0.0",
     "react-custom-scrollbars": "^4.2.1",
-    "react-is": "^16.8.6",
-    "react-sticky": "^6.0.3",
+    "react-is": "^18.2.0",
     "react-window": "^1.8.5",
     "resize-observer-polyfill": "1.5.1",
     "strip-json-comments": "3.0.1",

packages/express-file-server/__tests__/node/index.test.ts

@@ -2,7 +2,7 @@ import http from 'http';
 import path from 'path';
 
 import Koa from 'koa';
-import superagent from 'superagent';
+import fetch from 'node-fetch';
 
 import { IServerApp, AppConfig } from '@opensumi/ide-core-node';
 import { createNodeInjector } from '@opensumi/ide-dev-tool/src/injector-helper';
@@ -38,24 +38,18 @@ describe('template test', () => {
   });
 
   it('can get png if path in whitelist', async () => {
-    const res = await superagent.get(`http://0.0.0.0:50118/assets${path.join(resPath, 'icon.png')}`);
+    const res = await fetch(`http://0.0.0.0:50118/assets${path.join(resPath, 'icon.png')}`);
     expect(res.status === 200);
   });
 
   it('response 403 if not in whitelist', async () => {
-    try {
-      await superagent.get('http://0.0.0.0:50118/assets/test');
-    } catch (err) {
-      expect(err.status === 403);
-    }
+    const res = await fetch('http://0.0.0.0:50118/assets/test');
+    expect(res.status === 403);
   });
 
   it('response 403 if not allowed mime', async () => {
-    try {
-      await superagent.get(`http://0.0.0.0:50118/assets${path.join(resPath, 'icon.exe')}`);
-    } catch (err) {
-      expect(err.status === 403);
-    }
+    const res = await fetch(`http://0.0.0.0:50118/assets${path.join(resPath, 'icon.exe')}`);
+    expect(res.status === 403);
   });
 
   afterAll(() => {

packages/express-file-server/package.json

@@ -25,7 +25,6 @@
   "devDependencies": {
     "@opensumi/ide-core-browser": "workspace:*",
     "@opensumi/ide-dev-tool": "workspace:*",
-    "@types/koa-mount": "^4.0.1",
-    "superagent": "^5.1.0"
+    "@types/koa-mount": "^4.0.1"
   }
 }

packages/extension-manager/package.json

@@ -15,11 +15,9 @@
     "@opensumi/ide-core-common": "workspace:*",
     "@opensumi/ide-core-node": "workspace:*",
     "@opensumi/ide-extension": "workspace:*",
-    "compressing": "^1.6.2",
+    "compressing": "^1.10.0",
     "fs-extra": "^10.1.0",
-    "node-fetch": "^2.6.7",
-    "request": "2.*.*",
-    "requestretry": "^7.0.0"
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
     "@opensumi/ide-components": "workspace:*",
@@ -29,8 +27,6 @@
     "@opensumi/ide-markdown": "workspace:*",
     "@opensumi/ide-overlay": "workspace:*",
     "@opensumi/ide-theme": "workspace:*",
-    "@types/node-fetch": "^2.6.1",
-    "@types/requestretry": "^1.12.7",
-    "@types/uuid": "^8.3.4"
+    "@types/node-fetch": "^2.6.1"
   }
 }

packages/extension-manager/src/node/vsx-extension.service.ts

@@ -1,10 +1,11 @@
+import assert from 'assert';
 import os from 'os';
 import path from 'path';
 import { pipeline } from 'stream';
 
 import compressing from 'compressing';
 import fs from 'fs-extra';
-import requestretry from 'requestretry';
+import nodeFetch, { RequestInit } from 'node-fetch';
 
 import { Injectable, Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
 import { uuid } from '@opensumi/ide-core-common';
@@ -138,33 +139,72 @@ export class VSXExtensionService implements IVSXExtensionBackService {
     const vsixFileName = id + '.vsix';
     const downloadPath = path.join(extensionDir, vsixFileName);
 
-    return new Promise((resolve, reject) => {
-      requestretry(
-        url,
-        {
-          method: 'GET',
-          maxAttempts: 5,
-          retryDelay: 2000,
-          headers: this.getMarketplace().downloadHeaders,
-          retryStrategy: requestretry.RetryStrategies.HTTPOrNetworkError,
-        },
-        (err, response) => {
-          if (err) {
-            reject(err);
-          } else if (response && response.statusCode === 404) {
-            reject();
-          } else if (response && response.statusCode !== 200) {
-            reject(new Error(response.statusMessage));
-          }
-        },
-      )
-        .pipe(fs.createWriteStream(downloadPath))
-        .on('error', reject)
-        .on('close', () => resolve({ downloadPath }));
+    const res = await nodeFetchRetry(
+      url,
+      {
+        method: 'GET',
+        headers: this.getMarketplace().downloadHeaders,
+      },
+      {
+        maxAttempts: 5,
+        retryDelay: 2000,
+      },
+    );
+
+    assert(res, `download extension ${id} from ${url} failed`);
+
+    if (res.status === 404) {
+      throw new Error(`extension ${id} not found`);
+    }
+
+    if (res.status !== 200) {
+      throw new Error(`download extension ${id} from ${url} failed, status: ${res?.status} ${res?.statusText}`);
+    }
+
+    return await new Promise((resolve, reject) => {
+      const fileStream = fs.createWriteStream(downloadPath);
+      res.body.pipe(fileStream);
+
+      res.body.on('error', (err) => {
+        reject(err);
+      });
+      fileStream.on('finish', function () {
+        resolve({ downloadPath });
+      });
     });
   }
 
   async search(param?: VSXSearchParam): Promise<VSXSearchResult> {
     return await this.getMarketplace().search(param);
   }
 }
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+const nodeFetchRetry = async (
+  url: string,
+  fetchOptions: RequestInit,
+  opts: {
+    maxAttempts: number;
+    retryDelay: number;
+  },
+) => {
+  let retry = (opts && opts.maxAttempts) || 3;
+
+  while (retry > 0) {
+    try {
+      return nodeFetch(url, fetchOptions);
+    } catch (e) {
+      retry = retry - 1;
+      if (retry === 0) {
+        throw e;
+      }
+
+      if (opts && opts.retryDelay) {
+        await sleep(opts.retryDelay);
+      }
+    }
+  }
+};

packages/extension/src/node/extension.service.ts

@@ -187,7 +187,7 @@ export class ExtensionNodeServiceImpl implements IExtensionNodeService {
 
       if (notExistExtension) {
         // 进程未调用启动直接连接
-        this.logger.error(`${clientId} clientId process connection set error`, extProcessId);
+        this.logger.error(`${clientId} clientId process connection not exists`);
         /**
          * 如果前端与后端连接后发现没有对应的插件进程实例，那么通知前端重启插件进程
          * 一般这种情况出现在用户关闭电脑超过 ProcessCloseExitThreshold 设定的最大时间，插件进程被杀死后，前端再次建立连接时

packages/remote-cli/package.json

@@ -21,7 +21,6 @@
   "dependencies": {
     "@opensumi/ide-utils": "workspace:*",
     "chalk": "^4.1.2",
-    "got": "^12.1.0",
     "mri": "^1.2.0"
   },
   "devDependencies": {

packages/remote-cli/src/index.ts

@@ -3,6 +3,7 @@ import { statSync, existsSync } from 'fs';
 import { join } from 'path';
 
 import { green, red } from 'chalk';
+import fetch from 'node-fetch';
 
 import { ArgvFactory } from '@opensumi/ide-utils/lib/argv';
 
@@ -45,12 +46,10 @@ function openPathOrUrl(pathOrUrl: string): void {
   }
 
   const query = `?type=${type}&${type}=${encodeURIComponent(fullPathOrUrl)}&clientId=${CLIENT_ID}`;
-  import('got').then(({ default: got }) => {
-    got(`${SUMI_SERVER_HOST}/${OPENER_ROUTE}${query}`).catch((err) => {
-      // eslint-disable-next-line no-console
-      console.error(red(`Open ${type} ${fullPathOrUrl} error: \n ${err.message}`));
-      process.exit(1);
-    });
+  fetch(`${SUMI_SERVER_HOST}/${OPENER_ROUTE}${query}`).catch((err) => {
+    // eslint-disable-next-line no-console
+    console.error(red(`Open ${type} ${fullPathOrUrl} error: \n ${err.message}`));
+    process.exit(1);
   });
 }