yxorp 0.1.3 → 0.1.5

package/src/services/rules-matchers/remote-rules-matcher.service.ts

@@ -1,49 +1,49 @@
-import { Service } from 'typedi';
-import { Config } from '../config.service';
-import { match, compile } from 'path-to-regexp';
-import { RemoteRule } from '../../types/yxorp-config';
-
-
-@Service({
-  global: true
-})
-export class RemoteRulesMatcher {
-  constructor(
-    private config: Config
-  ) {
-  }
-
-  public match(url: string, ws: boolean = false): RemoteRule | undefined {
-    const rules = this.config.get().remoteRules || [];
-
-    for (let rule of rules) {
-      if (rule.disable) {
-        continue;
-      }
-
-      if (!!rule.ws !== ws) {
-        continue;
-      }
-
-      const matchResult = match(rule.path, {
-        decode: decodeURIComponent
-      })(url);
-
-      if (matchResult) {
-        return rule;
-      }
-    }
-  }
-
-  public toPath(url: string, remoteRule: RemoteRule): string | undefined {
-    const matchResult = match(remoteRule.path, {
-      decode: decodeURIComponent
-    })(url);
-
-    if (matchResult) {
-      const toPath = compile(remoteRule.target, { validate: false });
-      return toPath(matchResult.params);
-    }
-  }
-
-}
+import { Service } from 'typedi';
+import { Config } from '../config.service';
+import { match, compile } from 'path-to-regexp';
+import { RemoteRule } from '../../types/yxorp-config';
+
+
+@Service({
+  global: true
+})
+export class RemoteRulesMatcher {
+  constructor(
+    private config: Config
+  ) {
+  }
+
+  public match(url: string, ws: boolean = false): RemoteRule | undefined {
+    const rules = this.config.get().remoteRules || [];
+
+    for (let rule of rules) {
+      if (rule.disable) {
+        continue;
+      }
+
+      if (!!rule.ws !== ws) {
+        continue;
+      }
+
+      const matchResult = match(rule.path, {
+        decode: decodeURIComponent
+      })(url);
+
+      if (matchResult) {
+        return rule;
+      }
+    }
+  }
+
+  public toPath(url: string, remoteRule: RemoteRule): string | undefined {
+    const matchResult = match(remoteRule.path, {
+      decode: decodeURIComponent
+    })(url);
+
+    if (matchResult) {
+      const toPath = compile(remoteRule.target, { validate: false });
+      return toPath(matchResult.params);
+    }
+  }
+
+}

package/src/services/rules-matchers/rewrite-rules-matcher.service.ts

@@ -1,48 +1,48 @@
-import { Service } from 'typedi';
-import { Config } from '../config.service';
-import { match } from 'path-to-regexp';
-import { RewriteRule } from '../../types/yxorp-config';
-
-
-@Service({
-  global: true
-})
-export class RewriteRulesMatcher {
-  constructor(
-    private config: Config
-  ) {
-  }
-
-  public match(url: string, method: string): RewriteRule | undefined {
-    const rewriteRules = this.config.get().rewriteRules || [];
-
-    for (let rewriteRule of rewriteRules) {
-      if (rewriteRule.disable) {
-        continue;
-      }
-
-      if (rewriteRule.method.toLowerCase() !== method.toLowerCase()) {
-        continue;
-      }
-
-      const matchResult = match<Record<string, string>>(rewriteRule.path, {
-        decode: decodeURIComponent,
-      })(url);
-
-      if (matchResult) {
-        return rewriteRule;
-      }
-    }
-  }
-
-  public params(url: string, rewriteRule: RewriteRule): Object | undefined {
-    const matchResult = match(rewriteRule.path, {
-      decode: decodeURIComponent,
-    })(url);
-
-    if (matchResult) {
-      return matchResult.params;
-    }
-  }
-
-}
+import { Service } from 'typedi';
+import { Config } from '../config.service';
+import { match } from 'path-to-regexp';
+import { RewriteRule } from '../../types/yxorp-config';
+
+
+@Service({
+  global: true
+})
+export class RewriteRulesMatcher {
+  constructor(
+    private config: Config
+  ) {
+  }
+
+  public match(url: string, method: string): RewriteRule | undefined {
+    const rewriteRules = this.config.get().rewriteRules || [];
+
+    for (let rewriteRule of rewriteRules) {
+      if (rewriteRule.disable) {
+        continue;
+      }
+
+      if (rewriteRule.method.toLowerCase() !== method.toLowerCase()) {
+        continue;
+      }
+
+      const matchResult = match<Record<string, string>>(rewriteRule.path, {
+        decode: decodeURIComponent,
+      })(url);
+
+      if (matchResult) {
+        return rewriteRule;
+      }
+    }
+  }
+
+  public params(url: string, rewriteRule: RewriteRule): Object | undefined {
+    const matchResult = match(rewriteRule.path, {
+      decode: decodeURIComponent,
+    })(url);
+
+    if (matchResult) {
+      return matchResult.params;
+    }
+  }
+
+}

package/src/services/yxorp-server.service.ts

@@ -1,73 +1,73 @@
-import { Service } from 'typedi';
-import { IncomingMessage, ServerResponse } from 'http';
-import { Duplex } from 'stream';
-import { BootstrapMiddleware } from '../middleware/bootstrap.middleware';
-import { ProxyMiddleware } from '../middleware/proxy.middleware';
-import { RawBodyMiddleware } from '../middleware/rawBody.middleware';
-import { ProxyResMiddleware } from '../middleware/proxyRes.middleware';
-import { RewriteMiddleware } from '../middleware/rewrite.middleware';
-import { MockMiddleware } from '../middleware/mock.middleware';
-import { StaticMiddleware } from '../middleware/static.middleware';
-import { HttpServer } from './http-server.service';
-import { HttpProxy } from './http-proxy.service';
-import { RemoteRulesMatcher } from './rules-matchers/remote-rules-matcher.service';
-import { Config } from './config.service';
-import { LoggerService } from './logger.service';
-
-
-@Service({
-  global: true
-})
-export class YxorpServer {
-  constructor(
-    private httpServer: HttpServer,
-    private httpProxy: HttpProxy,
-    private remoteRulesMatcher: RemoteRulesMatcher,
-    private config: Config,
-    private logger: LoggerService,
-  ) {
-    this.httpServer.use(
-      StaticMiddleware,
-      BootstrapMiddleware,
-      MockMiddleware,
-      ProxyMiddleware
-    );
-    this.httpProxy.use(
-      BootstrapMiddleware,
-      RawBodyMiddleware,
-      RewriteMiddleware,
-      ProxyResMiddleware,
-    );
-
-    this.httpProxy.on('proxyRes', this.onProxyRes);
-    this.httpServer.addListener('upgrade', this.onServerUpgrade);
-  }
-
-  private onProxyRes = (proxyRes: IncomingMessage, req: IncomingMessage, res: ServerResponse) => {
-    this.httpProxy.execute(proxyRes, req, res);
-  }
-
-  private onServerUpgrade = (req: IncomingMessage, socket: Duplex, head: Buffer): void => {
-    const url = req.url || '';
-
-    const proxyOptions = this.config.get().proxyOptions;
-    const remoteRule = this.remoteRulesMatcher.match(url, true);
-    const target = remoteRule
-      ? this.remoteRulesMatcher.toPath(url, remoteRule)
-      : undefined;
-
-    const options = {
-      ...proxyOptions,
-      prependPath: !target,
-      target: target || proxyOptions.target,
-    }
-
-    this.httpProxy.ws(
-      req, socket, head, options, (error) => this.logger.info(error)
-    );
-  }
-
-  public listen = this.httpServer.listen.bind(this.httpServer) as typeof this.httpServer.listen;
-
-}
-
+import { Service } from 'typedi';
+import { IncomingMessage, ServerResponse } from 'http';
+import { Duplex } from 'stream';
+import { BootstrapMiddleware } from '../middleware/bootstrap.middleware';
+import { ProxyMiddleware } from '../middleware/proxy.middleware';
+import { RawBodyMiddleware } from '../middleware/rawBody.middleware';
+import { ProxyResMiddleware } from '../middleware/proxyRes.middleware';
+import { RewriteMiddleware } from '../middleware/rewrite.middleware';
+import { MockMiddleware } from '../middleware/mock.middleware';
+import { StaticMiddleware } from '../middleware/static.middleware';
+import { HttpServer } from './http-server.service';
+import { HttpProxy } from './http-proxy.service';
+import { RemoteRulesMatcher } from './rules-matchers/remote-rules-matcher.service';
+import { Config } from './config.service';
+import { LoggerService } from './logger.service';
+
+
+@Service({
+  global: true
+})
+export class YxorpServer {
+  constructor(
+    private httpServer: HttpServer,
+    private httpProxy: HttpProxy,
+    private remoteRulesMatcher: RemoteRulesMatcher,
+    private config: Config,
+    private logger: LoggerService,
+  ) {
+    this.httpServer.use(
+      StaticMiddleware,
+      BootstrapMiddleware,
+      MockMiddleware,
+      ProxyMiddleware
+    );
+    this.httpProxy.use(
+      BootstrapMiddleware,
+      RawBodyMiddleware,
+      RewriteMiddleware,
+      ProxyResMiddleware,
+    );
+
+    this.httpProxy.on('proxyRes', this.onProxyRes);
+    this.httpServer.addListener('upgrade', this.onServerUpgrade);
+  }
+
+  private onProxyRes = (proxyRes: IncomingMessage, req: IncomingMessage, res: ServerResponse) => {
+    this.httpProxy.execute(proxyRes, req, res);
+  }
+
+  private onServerUpgrade = (req: IncomingMessage, socket: Duplex, head: Buffer): void => {
+    const url = req.url || '';
+
+    const proxyOptions = this.config.get().proxyOptions;
+    const remoteRule = this.remoteRulesMatcher.match(url, true);
+    const target = remoteRule
+      ? this.remoteRulesMatcher.toPath(url, remoteRule)
+      : undefined;
+
+    const options = {
+      ...proxyOptions,
+      prependPath: !target,
+      target: target || proxyOptions.target,
+    }
+
+    this.httpProxy.ws(
+      req, socket, head, options, (error) => this.logger.info(error)
+    );
+  }
+
+  public listen = this.httpServer.listen.bind(this.httpServer) as typeof this.httpServer.listen;
+
+}
+

package/src/types/http.d.ts

@@ -1,10 +1,10 @@
-declare module 'http' {
-  export interface IncomingMessage {
-    rawBody?: Buffer;
-    rewriteRule?: import("./yxorp-config").RewriteRule;
-    rewriteRuleParams?: Object;
-    mockRule?: import("./yxorp-config").MockRule;
-    mockRuleParams?: Object;
-    query?: Record<string, any>;
-  }
-}
+declare module 'http' {
+  export interface IncomingMessage {
+    rawBody?: Buffer;
+    rewriteRule?: import("./yxorp-config").RewriteRule;
+    rewriteRuleParams?: Object;
+    mockRule?: import("./yxorp-config").MockRule;
+    mockRuleParams?: Object;
+    query?: Record<string, any>;
+  }
+}

package/src/types/yxorp-config.ts

@@ -1,67 +1,67 @@
-import { ServerOptions } from 'http-proxy';
-
-export interface YxorpConfig extends ConfigFile {
-  proxyOptions: ServerOptions;
-}
-
-export interface ConfigFile {
-  target: string;
-  proxyPort: string | number;
-  scripts?: string[];
-  remoteRules?: RemoteRule[];
-  staticRules?: StaticRule[];
-  mockRules?: MockRule[];
-  rewriteRules?: RewriteRule[];
-}
-
-export interface RemoteRule {
-  path: string;
-  target: string;
-  ws?: boolean;
-  disable?: boolean;
-}
-
-export type StaticRule = {
-  path: string;
-  directory: string;
-  caseInsensitive?: boolean;
-  directoryIndex?: string;
-  disable?: boolean;
-}
-
-export type MockFileRule = {
-  method: string;
-  path: string;
-  file: string;
-  statusCode?: number;
-  disable?: boolean;
-}
-
-export type MockScriptRule = {
-  method: string;
-  path: string;
-  script: string;
-  disable?: boolean;
-}
-
-export type MockRule = MockFileRule | MockScriptRule;
-
-
-export type RewriteFileRule = {
-  method: string;
-  path: string;
-  file: string;
-  statusCode?: number;
-  disable?: boolean;
-}
-
-export type RewriteScriptRule = {
-  method: string;
-  path: string;
-  script: string;
-  disable?: boolean;
-}
-
-export type RewriteRule = RewriteFileRule | RewriteScriptRule;
-
-
+import { ServerOptions } from 'http-proxy';
+
+export interface YxorpConfig extends ConfigFile {
+  proxyOptions: ServerOptions;
+}
+
+export interface ConfigFile {
+  target: string;
+  proxyPort: string | number;
+  scripts?: string[];
+  remoteRules?: RemoteRule[];
+  staticRules?: StaticRule[];
+  mockRules?: MockRule[];
+  rewriteRules?: RewriteRule[];
+}
+
+export interface RemoteRule {
+  path: string;
+  target: string;
+  ws?: boolean;
+  disable?: boolean;
+}
+
+export type StaticRule = {
+  path: string;
+  directory: string;
+  caseInsensitive?: boolean;
+  directoryIndex?: string;
+  disable?: boolean;
+}
+
+export type MockFileRule = {
+  method: string;
+  path: string;
+  file: string;
+  statusCode?: number;
+  disable?: boolean;
+}
+
+export type MockScriptRule = {
+  method: string;
+  path: string;
+  script: string;
+  disable?: boolean;
+}
+
+export type MockRule = MockFileRule | MockScriptRule;
+
+
+export type RewriteFileRule = {
+  method: string;
+  path: string;
+  file: string;
+  statusCode?: number;
+  disable?: boolean;
+}
+
+export type RewriteScriptRule = {
+  method: string;
+  path: string;
+  script: string;
+  disable?: boolean;
+}
+
+export type RewriteRule = RewriteFileRule | RewriteScriptRule;
+
+

package/tsconfig.json

@@ -1,21 +1,21 @@
-{
-  // This is an alias to @tsconfig/node16: https://github.com/tsconfig/bases
-  "extends": "ts-node/node12/tsconfig.json",
-  "ts-node": {
-    // It is faster to skip typechecking.
-    // Remove if you want ts-node to do typechecking.
-    "transpileOnly": true,
-    "files": true,
-    "compilerOptions": {
-      // compilerOptions specified here will override those declared below,
-      // but *only* in ts-node.  Useful if you want ts-node and tsc to use
-      // different options with a single tsconfig.json.
-    }
-  },
-  "compilerOptions": {
-    // typescript options here
-    "resolveJsonModule": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true
-  },
-}
+{
+  // This is an alias to @tsconfig/node16: https://github.com/tsconfig/bases
+  "extends": "ts-node/node12/tsconfig.json",
+  "ts-node": {
+    // It is faster to skip typechecking.
+    // Remove if you want ts-node to do typechecking.
+    "transpileOnly": true,
+    "files": true,
+    "compilerOptions": {
+      // compilerOptions specified here will override those declared below,
+      // but *only* in ts-node.  Useful if you want ts-node and tsc to use
+      // different options with a single tsconfig.json.
+    }
+  },
+  "compilerOptions": {
+    // typescript options here
+    "resolveJsonModule": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true
+  },
+}