@modern-js/server 1.4.1 → 1.4.4

package/tests/server.test.ts

@@ -2,7 +2,6 @@ import path from 'path';
 import { defaultsConfig, NormalizedConfig } from '@modern-js/core';
 import { ModernServerContext, NextFunction } from '@modern-js/types';
 import createServer, { Server } from '../src';
-import { ModernServer } from '../src/server/modern-server';
 import Watcher from '../src/dev-tools/watcher';
 
 describe('test server', () => {
@@ -21,8 +20,10 @@ describe('test server', () => {
     const server = await createServer({
       config: defaultsConfig as NormalizedConfig,
       pwd: path.join(__dirname, './fixtures/pure'),
+      dev: true,
     });
     expect(server instanceof Server).toBe(true);
+    await server.close();
   });
 
   describe('shoule get production modern server instance', () => {
@@ -32,6 +33,7 @@ describe('test server', () => {
       const server = await createServer({
         config: defaultsConfig as NormalizedConfig,
         pwd: appDirectory,
+        dev: true,
       });
       const modernServer = (server as any).server;
 
@@ -47,18 +49,20 @@ describe('test server', () => {
       } = modernServer;
       expect(pwd).toBe(appDirectory);
       expect(distDir).toBe(path.join(appDirectory, 'dist'));
-      expect(workDir).toBe(distDir);
+      expect(workDir).toBe(appDirectory);
       expect(conf).toBe(defaultsConfig);
       expect(handlers).toBeDefined();
       expect(isDev).toBeFalsy();
       expect(staticGenerate).toBeFalsy();
       expect(presetRoutes).toBeUndefined();
+      await server.close();
     });
 
     test('should add handler correctly', async () => {
       const server = await createServer({
         config: defaultsConfig as NormalizedConfig,
         pwd: appDirectory,
+        dev: true,
       });
       const modernServer = (server as any).server;
 
@@ -86,17 +90,20 @@ describe('test server', () => {
 
       expect(newLen + 1).toBe(nextLen);
       expect(modernServer.handlers[nextLen - 1]).toBe(asyncHandler);
+      await server.close();
     });
 
     test('should get request handler correctly', async () => {
       const server = await createServer({
         config: defaultsConfig as NormalizedConfig,
         pwd: appDirectory,
+        dev: true,
       });
 
-      const modernServer: ModernServer = (server as any).server;
+      const modernServer: any = (server as any).server;
       const handler = modernServer.getRequestHandler();
       expect(typeof handler === 'function').toBeTruthy();
+      await server.close();
     });
   });
 });

package/dist/js/modern/constants.js

@@ -1,26 +0,0 @@
-export const AGGRED_DIR = {
-  mock: 'config/mock',
-  server: 'server',
-  api: 'api',
-  shared: 'shared',
-  lambda: 'lambda'
-};
-export let ApiServerMode;
-
-(function (ApiServerMode) {
-  ApiServerMode["func"] = "function";
-  ApiServerMode["frame"] = "framework";
-})(ApiServerMode || (ApiServerMode = {}));
-
-export const ERROR_DIGEST = {
-  INIT: 'Server init error',
-  ENOTF: 'Page could not be found',
-  WARMUP: 'SSR warmup failed',
-  EINTER: 'Internal server error',
-  ERENDER: 'SSR render failed',
-  EMICROINJ: 'Get micro-frontend info failed'
-};
-export const ERROR_PAGE_TEXT = {
-  404: 'This page could not be found.',
-  500: 'Internal Server Error.'
-};

package/dist/js/modern/libs/context/context.js

@@ -1,180 +0,0 @@
-import { URL } from 'url';
-import qs from 'querystring';
-import { toMessage } from "../../utils";
-export class ModernServerContext {
-  /**
-   * http request
-   */
-
-  /**
-   * http response
-   */
-
-  /**
-   * url params
-   */
-  constructor(req, res) {
-    this.req = void 0;
-    this.res = void 0;
-    this.params = {};
-    this.logger = void 0;
-    this.metrics = void 0;
-    this.serverData = void 0;
-    this.req = req;
-    this.res = res;
-    this.logger = req.logger;
-    this.metrics = req.metrics;
-    this.serverData = {};
-    this.bind();
-  }
-
-  bind() {
-    const {
-      req,
-      res
-    } = this;
-
-    req.get = key => this.getReqHeader(key);
-
-    res.set = (key, value) => this.res.setHeader(key, value);
-  }
-
-  setParams(params) {
-    this.params = params;
-  }
-
-  setServerData(key, value) {
-    this.serverData[key] = value;
-  }
-
-  getReqHeader(key) {
-    const {
-      req
-    } = this;
-    const field = key.toLowerCase();
-
-    switch (field) {
-      case 'referer':
-      case 'referrer':
-        return req.headers.referrer || req.headers.referer || '';
-
-      default:
-        return req.headers[field] || '';
-    }
-  }
-  /* request property */
-
-
-  get headers() {
-    return this.req.headers;
-  }
-
-  get method() {
-    return this.req.method;
-  }
-
-  get url() {
-    return this.req.url || '';
-  }
-
-  set url(val) {
-    this.req.url = val;
-  }
-
-  get host() {
-    let host = this.getReqHeader('X-Forwarded-Host');
-
-    if (!host) {
-      host = this.getReqHeader('Host');
-    }
-
-    return host.split(/\s*,\s*/, 1)[0] || '';
-  }
-
-  get protocol() {
-    if (this.req.socket.encrypted) {
-      return 'https';
-    }
-
-    const proto = this.getReqHeader('X-Forwarded-Proto');
-    return proto ? proto.split(/\s*,\s*/, 1)[0] : 'http';
-  }
-
-  get origin() {
-    return `${this.protocol}://${this.host}`;
-  }
-
-  get href() {
-    return this.origin + this.url;
-  }
-
-  get parsedURL() {
-    const url = new URL(this.req.url, this.origin);
-    return url;
-  }
-
-  get path() {
-    return this.parsedURL.pathname;
-  }
-
-  set path(p) {
-    const url = new URL(this.req.url, this.origin); // this should never happend
-
-    if (!url || !p) {
-      return;
-    }
-
-    if (url.pathname === p) {
-      return;
-    }
-
-    url.pathname = p;
-    this.url = url.toString();
-  }
-
-  get querystring() {
-    if (!this.req) {
-      return '';
-    }
-
-    return this.parsedURL.search.replace(/^\?/, '') || '';
-  }
-
-  get query() {
-    const str = this.querystring;
-    return qs.parse(str);
-  }
-  /* response property */
-
-
-  get status() {
-    return this.res.statusCode;
-  }
-
-  set status(statusCode) {
-    this.res.statusCode = statusCode;
-  }
-  /**
-   * 判断链接是否已经关闭
-   */
-
-
-  resHasHandled() {
-    return this.res.writableEnded;
-  }
-
-  logInfo() {
-    return {
-      headers: this.headers,
-      href: this.href,
-      url: this.url
-    };
-  }
-
-  error(dig, err = '') {
-    const message = toMessage(dig, err);
-    const reqInfo = this.logInfo();
-    this.logger.error(`${reqInfo.url} - ${message}`, reqInfo);
-  }
-
-}

package/dist/js/modern/libs/context/index.js

@@ -1,3 +0,0 @@
-import { ModernServerContext } from "./context";
-export const createContext = (req, res) => new ModernServerContext(req, res);
-export { ModernServerContext };

package/dist/js/modern/libs/hook-api/route.js

@@ -1,39 +0,0 @@
-class RouteAPI {
-  constructor(matched, router, url) {
-    this.router = void 0;
-    this.current = void 0;
-    this.url = void 0;
-    this.current = matched;
-    this.router = router;
-    this.url = url;
-  }
-
-  cur() {
-    return this.current.generate(this.url);
-  }
-
-  get(entryName) {
-    const {
-      router
-    } = this;
-    const matched = router.matchEntry(entryName);
-    return matched ? matched.generate(this.url) : null;
-  }
-
-  use(entryName) {
-    const {
-      router
-    } = this;
-    const matched = router.matchEntry(entryName);
-
-    if (matched) {
-      this.current = matched;
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-}
-
-export const createRouteAPI = (matched, router, url) => new RouteAPI(matched, router, url);

package/dist/js/modern/libs/hook-api/template.js

@@ -1,61 +0,0 @@
-const RegList = {
-  before: {
-    head: '<head>',
-    body: '<body>'
-  },
-  after: {
-    head: '</head>',
-    body: '</body>'
-  }
-};
-
-class TemplateAPI {
-  constructor(content) {
-    this.content = void 0;
-    this.content = content;
-  }
-
-  get() {
-    return this.content;
-  }
-
-  set(content) {
-    this.content = content;
-  }
-
-  prependHead(fragment) {
-    const {
-      head
-    } = RegList.before;
-    return this.replace(head, `${head}${fragment}`);
-  }
-
-  appendHead(fragment) {
-    const {
-      head
-    } = RegList.after;
-    return this.replace(head, `${fragment}${head}`);
-  }
-
-  prependBody(fragment) {
-    const {
-      body
-    } = RegList.before;
-    return this.replace(body, `${body}${fragment}`);
-  }
-
-  appendBody(fragment) {
-    const {
-      body
-    } = RegList.after;
-    return this.replace(body, `${fragment}${body}`);
-  }
-
-  replace(reg, text) {
-    this.content = this.content.replace(reg, text);
-    return this;
-  }
-
-}
-
-export const createTemplateAPI = content => new TemplateAPI(content);

package/dist/js/modern/libs/metrics.js

@@ -1,12 +0,0 @@
-const metrics = {
-  gauges() {// no impl
-  },
-
-  counter() {// no impl
-  },
-
-  timer() {// no impl
-  }
-
-};
-export { metrics };

package/dist/js/modern/libs/proxy.js

@@ -1,59 +0,0 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-import { createProxyMiddleware } from 'http-proxy-middleware';
-export const createProxyHandler = proxyOptions => {
-  if (!proxyOptions) {
-    return null;
-  } // If it is not an array, it may be an object that uses the context attribute
-  // or an object in the form of { source: ProxyDetail }
-
-
-  const formatedProxy = [];
-
-  if (!Array.isArray(proxyOptions)) {
-    if ('target' in proxyOptions) {
-      formatedProxy.push(proxyOptions);
-    } else {
-      Array.prototype.push.apply(formatedProxy, Object.keys(proxyOptions).reduce((total, source) => {
-        const option = proxyOptions[source];
-        total.push(_objectSpread({
-          context: source,
-          changeOrigin: true,
-          logLevel: 'warn'
-        }, typeof option === 'string' ? {
-          target: option
-        } : option));
-        return total;
-      }, []));
-    }
-  } else {
-    formatedProxy.push(...proxyOptions);
-  }
-
-  const middlewares = formatedProxy.map(option => {
-    const middleware = createProxyMiddleware(option.context, option); // eslint-disable-next-line consistent-return
-
-    return async (ctx, next) => {
-      const {
-        req,
-        res
-      } = ctx;
-      const bypassUrl = typeof option.bypass === 'function' ? option.bypass(req, res, option) : null; // only false, no true
-
-      if (typeof bypassUrl === 'boolean') {
-        ctx.status = 404;
-        return next();
-      } else if (typeof bypassUrl === 'string') {
-        ctx.url = bypassUrl;
-        return next();
-      }
-
-      middleware(req, res, next);
-    };
-  });
-  return middlewares;
-};

package/dist/js/modern/libs/render/cache/__tests__/cache.fun.test.js

@@ -1,70 +0,0 @@
-import url from 'url';
-import { createCache, destroyCache } from "../spr";
-import { cacheAddition, connectFactor, fname, maybeSync, namespaceHash, valueFactory, withCoalescedInvoke } from "../util";
-describe('test spr util functions', () => {
-  it('should return value correctly', () => {
-    expect(connectFactor('bar', 'foo')).toBe('bar-foo');
-    expect(fname(1)).toBe('f1');
-    expect(namespaceHash('modern', '!@#$%^&')).toBe('modern/!@#$%^&');
-  });
-  it('should create or destroy instance correctly', () => {
-    const ins1 = createCache();
-    const ins2 = createCache();
-    expect(ins1 === ins2).toBe(true);
-    destroyCache();
-    const ins3 = createCache();
-    expect(ins1 === ins3).toBe(false);
-    expect(ins2 === ins3).toBe(false);
-  });
-  it('should return function correctly', () => {
-    const urlParams = (() => new url.URLSearchParams())();
-
-    urlParams.set('name', 'modern');
-    const getParam = valueFactory(urlParams);
-    expect(getParam('name')).toBe('modern');
-    const headers = {
-      age: '12345'
-    };
-    const getHeader = valueFactory(headers);
-    expect(getHeader('age')).toBe('12345');
-  });
-  it('should add target html content', () => {
-    const contentNoHead = '<div>123</div>';
-    const html = cacheAddition(contentNoHead, Math.random().toString());
-    expect(html).toBe(contentNoHead);
-    const contentWithHead = '<head></head><div>123</div>';
-    const hash = Math.random().toString();
-    const htmlWithHead = cacheAddition(contentWithHead, hash);
-    expect(htmlWithHead).toBe(`<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`);
-  });
-  it('should only invoke func one time', async () => {
-    let index = 0;
-    const fn = withCoalescedInvoke(async () => new Promise(resolve => {
-      setTimeout(() => {
-        index += 1;
-        resolve(index);
-      }, 500);
-    }));
-    const key = 'test';
-    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
-    expect(res1.isOrigin && res2.isOrigin).toBe(false);
-    expect(res1.isOrigin || res2.isOrigin).toBe(true);
-    expect(res1.value).toBe(1);
-    expect(res2.value).toBe(1);
-  });
-  it('should invoke sync or async', async () => {
-    const foo = '';
-    const async = await maybeSync(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(false);
-    expect(async).toBeUndefined();
-    const sync = await maybeSync(() => new Promise(resolve => {
-      setTimeout(() => {
-        resolve(foo);
-      }, 100);
-    }))(true);
-    expect(sync).toBe(foo);
-  });
-});