@opensumi/ide-express-file-server 2.21.10 → 2.21.11-next-1672040246.0

package/lib/browser/file-server.contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-server.contribution.js","sourceRoot":"","sources":["../../src/browser/file-server.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAA6E;AAC7E,mGAGqE;AAErE,sCAAgD;AAGhD,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IAIxC,sBAAsB,CAAC,OAA8B;QACnD,OAAO,CAAC,8BAA8B,CAAC;YACrC,MAAM,EAAE,0BAAO,CAAC,IAAI;YACpB,qBAAqB,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAClC,iBAAiB;gBACjB,qCAAqC;gBACrC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,IAAI,4BAAmB,CAAC,CAAC;gBACnF;;;mBAGG;gBACH,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACzD,OAAO,SAAS,CAAC,OAAO,CAAC,SAAS,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxF,CAAC;YACD,KAAK,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,IAAI,4BAAmB,CAAC;SACjE,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAnBC;IADC,IAAA,cAAS,EAAC,4BAAS,CAAC;;gEACA;AAFV,6BAA6B;IADzC,IAAA,yBAAM,EAAC,8CAA0B,CAAC;GACtB,6BAA6B,CAqBzC;AArBY,sEAA6B"}
+{"version":3,"file":"file-server.contribution.js","sourceRoot":"","sources":["../../src/browser/file-server.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAA6E;AAC7E,mGAGqE;AAErE,sCAAgD;AAGzC,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAIxC,sBAAsB,CAAC,OAA8B;QACnD,OAAO,CAAC,8BAA8B,CAAC;YACrC,MAAM,EAAE,0BAAO,CAAC,IAAI;YACpB,qBAAqB,EAAE,CAAC,GAAQ,EAAE,EAAE;gBAClC,iBAAiB;gBACjB,qCAAqC;gBACrC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,IAAI,4BAAmB,CAAC,CAAC;gBACnF;;;mBAGG;gBACH,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACzD,OAAO,SAAS,CAAC,OAAO,CAAC,SAAS,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxF,CAAC;YACD,KAAK,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,IAAI,4BAAmB,CAAC;SACjE,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AApBC;IAAC,IAAA,cAAS,EAAC,4BAAS,CAAC;;gEACA;AAFV,6BAA6B;IADzC,IAAA,yBAAM,EAAC,8CAA0B,CAAC;GACtB,6BAA6B,CAqBzC;AArBY,sEAA6B"}

package/lib/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,iEAA2D;AAE3D,yEAA2E;AAG3E,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,gCAAa;IAA1D;;QACE,cAAS,GAAe,CAAC,wDAA6B,CAAC,CAAC;IAC1D,CAAC;CAAA,CAAA;AAFY,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAEnC;AAFY,0DAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,iEAA2D;AAE3D,yEAA2E;AAGpE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,gCAAa;IAAnD;;QACL,cAAS,GAAe,CAAC,wDAA6B,CAAC,CAAC;IAC1D,CAAC;CAAA,CAAA;AAFY,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAEnC;AAFY,0DAAuB"}

package/lib/node/express-file-server.contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-file-server.contribution.js","sourceRoot":"","sources":["../../src/node/express-file-server.contribution.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AAExB,kEAA8B;AAE9B,qCAAyC;AACzC,2DAAoG;AAEpG,sCAAuC;AAGvC,IAAa,6BAA6B,GAA1C,MAAa,6BAA6B;IAIxC,YAAY;QACV,OAAO;YACL,WAAW;YACX,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY;YACvC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,EAAE,CAAC;SAC1C,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,GAAe;QACxB,GAAG,CAAC,GAAG,CACL,IAAA,mBAAK,EAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,OAAO,EAAE;gBACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,OAAO;aACR;YAED,MAAM,QAAQ,GAAG,mBAAG,CAAC,KAAK,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,MAAM,WAAW,GAAG,mBAAU,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE;YACE;;;eAGG;YACH,SAAS,CAAC,IAAI,CACZ,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CACnG;gBACD,mBAAmB;gBACnB,WAAW,EACX;gBACA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;gBACrC,IAAI,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE;oBACpC,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;iBAC1E;gBAED,GAAG,CAAC,IAAI,GAAG,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aAC1C;iBAAM;gBACL,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;aAClB;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA7CC;IADC,IAAA,cAAS,EAAC,yBAAS,CAAC;;gEACQ;AAFlB,6BAA6B;IADzC,IAAA,sBAAM,EAAC,qCAAqB,CAAC;GACjB,6BAA6B,CA+CzC;AA/CY,sEAA6B"}
+{"version":3,"file":"express-file-server.contribution.js","sourceRoot":"","sources":["../../src/node/express-file-server.contribution.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,wDAAwB;AAExB,kEAA8B;AAE9B,qCAAyC;AACzC,2DAAoG;AAEpG,sCAAuC;AAGhC,IAAM,6BAA6B,GAAnC,MAAM,6BAA6B;IAIxC,YAAY;QACV,OAAO;YACL,WAAW;YACX,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY;YACvC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,IAAI,EAAE,CAAC;SAC1C,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,GAAe;QACxB,GAAG,CAAC,GAAG,CACL,IAAA,mBAAK,EAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,OAAO,EAAE;gBACZ,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;gBACjB,OAAO;aACR;YAED,MAAM,QAAQ,GAAG,mBAAG,CAAC,KAAK,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/D,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,MAAM,WAAW,GAAG,mBAAU,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE;YACE;;;eAGG;YACH,SAAS,CAAC,IAAI,CACZ,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC,CACnG;gBACD,mBAAmB;gBACnB,WAAW,EACX;gBACA,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;gBACrC,IAAI,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE;oBACpC,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;iBAC1E;gBAED,GAAG,CAAC,IAAI,GAAG,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;aAC1C;iBAAM;gBACL,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;aAClB;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA9CC;IAAC,IAAA,cAAS,EAAC,yBAAS,CAAC;;gEACQ;AAFlB,6BAA6B;IADzC,IAAA,sBAAM,EAAC,qCAAqB,CAAC;GACjB,6BAA6B,CA+CzC;AA/CY,sEAA6B"}

package/lib/node/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,2DAAqD;AAErD,yFAAmF;AAGnF,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,0BAAU;IAAvD;;QACE,cAAS,GAAe,CAAC,gEAA6B,CAAC,CAAC;IAC1D,CAAC;CAAA,CAAA;AAFY,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAEnC;AAFY,0DAAuB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":";;;;AAAA,qCAAoD;AACpD,2DAAqD;AAErD,yFAAmF;AAG5E,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,0BAAU;IAAhD;;QACL,cAAS,GAAe,CAAC,gEAA6B,CAAC,CAAC;IAC1D,CAAC;CAAA,CAAA;AAFY,uBAAuB;IADnC,IAAA,eAAU,GAAE;GACA,uBAAuB,CAEnC;AAFY,0DAAuB"}

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@opensumi/ide-express-file-server",
-  "version": "2.21.10",
+  "version": "2.21.11-next-1672040246.0",
   "files": [
-    "lib"
+    "lib",
+    "src"
   ],
   "license": "MIT",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "yarn run build",
     "build": "tsc --build ../../configs/ts/references/tsconfig.express-file-server.json"
   },
   "repository": {
@@ -16,16 +17,15 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.21.10",
-    "@opensumi/ide-core-node": "2.21.10",
-    "@opensumi/ide-static-resource": "2.21.10",
+    "@opensumi/ide-core-node": "2.21.11-next-1672040246.0",
+    "@opensumi/ide-static-resource": "2.21.11-next-1672040246.0",
     "koa-mount": "^4.0.0"
   },
   "devDependencies": {
-    "@opensumi/ide-core-browser": "2.21.10",
+    "@opensumi/ide-core-browser": "2.21.11-next-1672040246.0",
     "@opensumi/ide-dev-tool": "^1.3.1",
     "@types/koa-mount": "^4.0.1",
     "superagent": "^5.1.0"
   },
-  "gitHead": "571756af952413b756eb682223697a39544b3461"
+  "gitHead": "c6ec1decc39adb64228370f7143959d2f423a5ca"
 }

package/src/browser/file-server.contribution.ts

@@ -0,0 +1,32 @@
+import { Autowired } from '@opensumi/di';
+import { Domain, URI, AppConfig, Schemes } from '@opensumi/ide-core-browser';
+import {
+  StaticResourceContribution,
+  StaticResourceService,
+} from '@opensumi/ide-static-resource/lib/browser/static.definition';
+
+import { EXPRESS_SERVER_PATH } from '../common';
+
+@Domain(StaticResourceContribution)
+export class ExpressFileServerContribution implements StaticResourceContribution {
+  @Autowired(AppConfig)
+  appConfig: AppConfig;
+
+  registerStaticResolver(service: StaticResourceService): void {
+    service.registerStaticResourceProvider({
+      scheme: Schemes.file,
+      resolveStaticResource: (uri: URI) => {
+        // file 协议统一走静态服务
+        // http://${HOST}:8000/assets/${path}
+        const assetsUri = new URI(this.appConfig.staticServicePath || EXPRESS_SERVER_PATH);
+        /**
+         * uri.path 在 Windows 下会被解析为 /c:/Path/to/file
+         * fsPath C:\\Path\\to\\file
+         */
+        const [resourceUrl, query] = uri.codeUri.path.split('?');
+        return assetsUri.resolve(`assets${decodeURIComponent(resourceUrl)}`).withQuery(query);
+      },
+      roots: [this.appConfig.staticServicePath || EXPRESS_SERVER_PATH],
+    });
+  }
+}

package/src/browser/index.ts

@@ -0,0 +1,9 @@
+import { Provider, Injectable } from '@opensumi/di';
+import { BrowserModule } from '@opensumi/ide-core-browser';
+
+import { ExpressFileServerContribution } from './file-server.contribution';
+
+@Injectable()
+export class ExpressFileServerModule extends BrowserModule {
+  providers: Provider[] = [ExpressFileServerContribution];
+}

package/src/common/index.ts

@@ -0,0 +1,20 @@
+export const EXPRESS_SERVER_PORT = 8000;
+export const EXPRESS_SERVER_PATH = process.env.STATIC_SERVER_PATH || `http://127.0.0.1:${EXPRESS_SERVER_PORT}/`;
+// 静态服务资源白名单
+export const ALLOW_MIME = {
+  gif: 'image/gif',
+  jpg: 'image/jpeg',
+  png: 'image/png',
+  webp: 'image/webp',
+  svg: 'image/svg+xml',
+  ttf: 'font/ttf',
+  eot: 'font/eot',
+  otf: 'font/otf',
+  woff: 'font/woff',
+  woff2: 'font/woff2',
+  js: 'application/javascript',
+  css: 'text/css',
+  mp4: 'video/mp4',
+  ogg: 'video/ogg',
+  webm: 'video/webm',
+};

package/src/index.ts

@@ -0,0 +1 @@
+export * from './common';

package/src/node/express-file-server.contribution.ts

@@ -0,0 +1,59 @@
+import fs from 'fs';
+import path from 'path';
+
+import mount from 'koa-mount';
+
+import { Autowired } from '@opensumi/di';
+import { ServerAppContribution, Domain, IServerApp, AppConfig, URI } from '@opensumi/ide-core-node';
+
+import { ALLOW_MIME } from '../common';
+
+@Domain(ServerAppContribution)
+export class ExpressFileServerContribution implements ServerAppContribution {
+  @Autowired(AppConfig)
+  private appConfig: AppConfig;
+
+  getWhiteList() {
+    return [
+      // 插件市场安装目录
+      this.appConfig.marketplace.extensionDir,
+      ...(this.appConfig.staticAllowPath || []),
+    ];
+  }
+
+  initialize(app: IServerApp) {
+    app.use(
+      mount('/assets', async (ctx) => {
+        const uriPath = decodeURI(ctx.path.replace(/^\/assets/, ''));
+        if (!uriPath) {
+          ctx.status = 404;
+          return;
+        }
+
+        const filePath = URI.parse(`file://${uriPath}`).codeUri.fsPath;
+        const whitelist = this.getWhiteList();
+        const contentType = ALLOW_MIME[path.extname(filePath).slice(1)];
+        if (
+          /**
+           * 地址在白名单内
+           * Windows 下 C:\\Path\\to\\file 会被转换成 c:\\Path\\to\\file
+           */
+          whitelist.some(
+            (whitelistPath) => whitelistPath && filePath.toLowerCase().startsWith(whitelistPath.toLowerCase()),
+          ) &&
+          // 在允许的 contentType
+          contentType
+        ) {
+          ctx.set('Content-Type', contentType);
+          if (this.appConfig.staticAllowOrigin) {
+            ctx.set('Access-Control-Allow-Origin', this.appConfig.staticAllowOrigin);
+          }
+
+          ctx.body = fs.createReadStream(filePath);
+        } else {
+          ctx.status = 403;
+        }
+      }),
+    );
+  }
+}

package/src/node/index.ts

@@ -0,0 +1,9 @@
+import { Provider, Injectable } from '@opensumi/di';
+import { NodeModule } from '@opensumi/ide-core-node';
+
+import { ExpressFileServerContribution } from './express-file-server.contribution';
+
+@Injectable()
+export class ExpressFileServerModule extends NodeModule {
+  providers: Provider[] = [ExpressFileServerContribution];
+}