@jayfong/x-server 2.89.0 → 2.91.0

package/lib/_cjs/cli/deploy_util.js

@@ -25,14 +25,14 @@ class DeployUtil {
     const appDir = `./${appName}`;
     await ssh.execCommand((0, _vtils.dedent)`
         set -ex
-        mkdir -p ./app_files/${appName}
+        mkdir -p ./app_files/${appName}/${options.channel || 'dist'}
         mkdir -p ${appDir}
       `, {
       cwd: options.dir,
       onStdout: buf => console.log(buf.toString()),
       onStderr: buf => console.log(buf.toString())
     });
-    const remoteAppFile = `${options.dir}/app_files/${appName}/${_path.default.basename(appFile)}`;
+    const remoteAppFile = `${options.dir}/app_files/${appName}/${options.channel || 'dist'}/${_path.default.basename(appFile)}`;
     await ssh.putFile(appFile, remoteAppFile);
     await ssh.execCommand((0, _vtils.dedent)`
         set -ex

package/lib/_cjs/services/html.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.__esModule = true;
+exports.HtmlService = void 0;
+var _fastEscapeHtml = require("fast-escape-html");
+class HtmlService {
+  constructor() {
+    this.serviceName = 'html';
+  }
+  escape(html) {
+    return (0, _fastEscapeHtml.escapeHTML)(html);
+  }
+  unescape(html) {
+    return (0, _fastEscapeHtml.unescapeHTML)(html);
+  }
+}
+exports.HtmlService = HtmlService;

package/lib/_cjs/x.js

@@ -11,6 +11,7 @@ var _crypto = require("./services/crypto");
 var _db_value = require("./services/db_value");
 var _dispose = require("./services/dispose");
 var _emoji = require("./services/emoji");
+var _html = require("./services/html");
 var _log = require("./services/log");
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = exports.x = {
@@ -30,4 +31,4 @@ const x = exports.x = {
 _fsExtra.default.ensureDirSync(x.dataDir);
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
-}), new _log.LogService(), new _emoji.EmojiService(), new _db_value.DbValueService(), new _crypto.CryptoService());
+}), new _log.LogService(), new _emoji.EmojiService(), new _db_value.DbValueService(), new _crypto.CryptoService(), new _html.HtmlService());

package/lib/cli/deploy_util.js

@@ -20,14 +20,14 @@ export class DeployUtil {
     const appDir = `./${appName}`;
     await ssh.execCommand(dedent`
         set -ex
-        mkdir -p ./app_files/${appName}
+        mkdir -p ./app_files/${appName}/${options.channel || 'dist'}
         mkdir -p ${appDir}
       `, {
       cwd: options.dir,
       onStdout: buf => console.log(buf.toString()),
       onStderr: buf => console.log(buf.toString())
     });
-    const remoteAppFile = `${options.dir}/app_files/${appName}/${path.basename(appFile)}`;
+    const remoteAppFile = `${options.dir}/app_files/${appName}/${options.channel || 'dist'}/${path.basename(appFile)}`;
     await ssh.putFile(appFile, remoteAppFile);
     await ssh.execCommand(dedent`
         set -ex

package/lib/services/html.d.ts

@@ -0,0 +1,11 @@
+import { BaseService } from './base';
+export declare class HtmlService implements BaseService {
+    serviceName: string;
+    escape(html: string): string;
+    unescape(html: string): string;
+}
+declare module '../x' {
+    interface X {
+        html: HtmlService;
+    }
+}

package/lib/services/html.js

@@ -0,0 +1,12 @@
+import { escapeHTML, unescapeHTML } from 'fast-escape-html';
+export class HtmlService {
+  constructor() {
+    this.serviceName = 'html';
+  }
+  escape(html) {
+    return escapeHTML(html);
+  }
+  unescape(html) {
+    return unescapeHTML(html);
+  }
+}

package/lib/x.d.ts

@@ -4,6 +4,7 @@ import './services/crypto';
 import './services/db_value';
 import './services/dispose';
 import './services/emoji';
+import './services/html';
 import './services/log';
 export interface X {
     readonly appId: string;

package/lib/x.js

@@ -6,6 +6,7 @@ import { CryptoService } from "./services/crypto";
 import { DbValueService } from "./services/db_value";
 import { DisposeService } from "./services/dispose";
 import { EmojiService } from "./services/emoji";
+import { HtmlService } from "./services/html";
 import { LogService } from "./services/log";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
@@ -25,4 +26,4 @@ export const x = {
 fs.ensureDirSync(x.dataDir);
 x.register(new DisposeService({
   disposeOnExit: true
-}), new LogService(), new EmojiService(), new DbValueService(), new CryptoService());
+}), new LogService(), new EmojiService(), new DbValueService(), new CryptoService(), new HtmlService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.89.0",
+  "version": "2.91.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -9,7 +9,9 @@
   "bin": {
     "xs": "lib/_cjs/cli/cli.js"
   },
-  "files": ["lib"],
+  "files": [
+    "lib"
+  ],
   "scripts": {
     "build": "haoma compile",
     "build_test_pkg": "tyn build && rm -rf ./lib_test && mkdir -p ./lib_test && cp -r ./lib ./lib_test/lib && cp ./package.json ./lib_test/package.json && cd ./tests/app && tyn add file:../../lib_test",
@@ -44,6 +46,7 @@
     "esbuild-register": "^3.5.0",
     "execa": "^5.1.1",
     "exit-hook": "^2.2.1",
+    "fast-escape-html": "^1.1.0",
     "fast-xml-parser": "^4.2.5",
     "fastify": "^4.19.2",
     "fs-extra": "^10.0.1",