@dcl/sdk-commands 7.1.3-4479913205.commit-bfd9912 → 7.1.4-4491682599.commit-ac44614

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,2 @@
1
+ import { FileSystemInterface } from '@dcl/inspector';
2
+ export declare function createFsFromNode(): FileSystemInterface;
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.createFsFromNode = void 0;
7
+ const fs_extra_1 = __importDefault(require("fs-extra"));
8
+ function createFsFromNode() {
9
+ return {
10
+ async existFile(filePath) {
11
+ return fs_extra_1.default.existsSync(filePath);
12
+ },
13
+ async readFile(filePath) {
14
+ return fs_extra_1.default.readFile(filePath);
15
+ },
16
+ async writeFile(filePath, content) {
17
+ await fs_extra_1.default.writeFile(filePath, content);
18
+ },
19
+ async readdir(dirPath) {
20
+ const result = await fs_extra_1.default.readdir(dirPath, { withFileTypes: true });
21
+ return result.map((item) => ({
22
+ name: item.name,
23
+ isDirectory: item.isDirectory()
24
+ }));
25
+ }
26
+ };
27
+ }
28
+ exports.createFsFromNode = createFsFromNode;
@@ -1,15 +1,11 @@
1
+ import { DataLayerHost } from '@dcl/inspector';
1
2
  import { RpcServer } from '@dcl/rpc';
2
- import { createEngine } from '@dcl/inspector';
3
3
  import { CliComponents } from '../../../components';
4
- export type IEngine = ReturnType<typeof createEngine>;
5
4
  export type DataLayerContext = {
6
- engine: IEngine;
5
+ dataLayerHost: DataLayerHost;
7
6
  };
8
- export type DataLayerRpc = {
7
+ export type DataLayer = {
9
8
  rpcServer: RpcServer<DataLayerContext>;
10
- /**
11
- * we use the same engine with multiple transports for all the contexts.
12
- */
13
- engine: IEngine;
9
+ context: DataLayerContext;
14
10
  };
15
- export declare function createDataLayerRpc({ fs }: Pick<CliComponents, 'fs'>): Promise<DataLayerRpc>;
11
+ export declare function createDataLayer({ fs }: Pick<CliComponents, 'fs'>): Promise<DataLayer>;
@@ -23,26 +23,23 @@ var __importStar = (this && this.__importStar) || function (mod) {
23
23
  return result;
24
24
  };
25
25
  Object.defineProperty(exports, "__esModule", { value: true });
26
- exports.createDataLayerRpc = void 0;
26
+ exports.createDataLayer = void 0;
27
+ const inspector_1 = require("@dcl/inspector");
27
28
  const rpc_1 = require("@dcl/rpc");
28
29
  const codegen = __importStar(require("@dcl/rpc/dist/codegen"));
29
- const inspector_1 = require("@dcl/inspector");
30
- async function createDataLayerRpc({ fs }) {
31
- const engine = (0, inspector_1.createEngine)();
32
- setInterval(() => {
33
- engine.update(0.016).catch((err) => {
34
- console.error(err);
35
- debugger;
36
- });
37
- }, 16);
38
- // TODO: fs is not matching the types here (fs as any)
39
- const dataLayer = await (0, inspector_1.initRpcMethods)(fs, engine);
30
+ const fs_1 = require("./fs");
31
+ async function createDataLayer({ fs: _fs }) {
32
+ // TODO: implement createFsFromIFileSystemComponent(fs)
33
+ const dataLayerHost = await (0, inspector_1.createDataLayerHost)((0, fs_1.createFsFromNode)());
34
+ const context = {
35
+ dataLayerHost
36
+ };
40
37
  const rpcServer = (0, rpc_1.createRpcServer)({});
41
- rpcServer.setHandler(rpcHandler);
42
38
  async function rpcHandler(serverPort) {
43
39
  // TODO: dataLayer as any
44
- codegen.registerService(serverPort, inspector_1.DataServiceDefinition, async (port, ctx) => dataLayer);
40
+ codegen.registerService(serverPort, inspector_1.DataServiceDefinition, async (_port, _ctx) => dataLayerHost.rpcMethods);
45
41
  }
46
- return { rpcServer, engine };
42
+ rpcServer.setHandler(rpcHandler);
43
+ return { rpcServer, context };
47
44
  }
48
- exports.createDataLayerRpc = createDataLayerRpc;
45
+ exports.createDataLayer = createDataLayer;
@@ -1,3 +1,3 @@
1
1
  import { WebSocket } from 'ws';
2
- import { DataLayerRpc } from './rpc';
3
- export declare function handleDataLayerWs(ws: WebSocket, { rpcServer, engine }: DataLayerRpc): Promise<void>;
2
+ import { DataLayer } from './rpc';
3
+ export declare function handleDataLayerWs(ws: WebSocket, dataLayer: DataLayer): Promise<void>;
@@ -2,9 +2,9 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.handleDataLayerWs = void 0;
4
4
  const WebSocket_1 = require("@dcl/rpc/dist/transports/WebSocket");
5
- async function handleDataLayerWs(ws, { rpcServer, engine }) {
5
+ async function handleDataLayerWs(ws, dataLayer) {
6
6
  const wsTransport = (0, WebSocket_1.WebSocketTransport)(ws);
7
- rpcServer.attachTransport(wsTransport, { engine });
7
+ dataLayer.rpcServer.attachTransport(wsTransport, dataLayer.context);
8
8
  ws.on('error', (error) => {
9
9
  console.error(error);
10
10
  ws.close();
@@ -162,7 +162,7 @@ async function main(options) {
162
162
  };
163
163
  },
164
164
  async main({ components, startComponents }) {
165
- const dataLayerRpc = withDataLayer ? await (0, rpc_1.createDataLayerRpc)({ fs: components.fs }) : undefined;
165
+ const dataLayerRpc = withDataLayer ? await (0, rpc_1.createDataLayer)({ fs: components.fs }) : undefined;
166
166
  await (0, routes_1.wireRouter)(components, projectRoot, dataLayerRpc);
167
167
  if (watch) {
168
168
  await (0, file_watch_notifier_1.wireFileWatcherToWebSockets)(components, projectRoot);
@@ -1,3 +1,3 @@
1
+ import { DataLayer } from '../data-layer/rpc';
1
2
  import { PreviewComponents } from '../types';
2
- import { DataLayerRpc } from '../data-layer/rpc';
3
- export declare function wireRouter(components: PreviewComponents, dir: string, dataLayer?: DataLayerRpc): Promise<void>;
3
+ export declare function wireRouter(components: PreviewComponents, dir: string, dataLayer?: DataLayer): Promise<void>;
@@ -1,11 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.wireRouter = void 0;
4
- const realm_1 = require("./realm");
5
4
  const http_server_1 = require("@well-known-components/http-server");
6
- const endpoints_1 = require("./endpoints");
7
5
  const ws_1 = require("@well-known-components/http-server/dist/ws");
8
6
  const ws_2 = require("../data-layer/ws");
7
+ const endpoints_1 = require("./endpoints");
8
+ const realm_1 = require("./realm");
9
9
  async function wireRouter(components, dir, dataLayer) {
10
10
  const router = new http_server_1.Router();
11
11
  const sceneUpdateClients = new Set();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcl/sdk-commands",
3
- "version": "7.1.3-4479913205.commit-bfd9912",
3
+ "version": "7.1.4-4491682599.commit-ac44614",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "start": "tsc -p tsconfig.json --watch",
@@ -16,9 +16,9 @@
16
16
  "author": "Decentraland",
17
17
  "license": "Apache-2.0",
18
18
  "dependencies": {
19
- "@dcl/dcl-rollup": "7.1.3-4479913205.commit-bfd9912",
19
+ "@dcl/dcl-rollup": "7.1.4-4491682599.commit-ac44614",
20
20
  "@dcl/hashing": "1.1.3",
21
- "@dcl/inspector": "7.1.3-4479913205.commit-bfd9912",
21
+ "@dcl/inspector": "7.1.4-4491682599.commit-ac44614",
22
22
  "@dcl/linker-dapp": "0.7.0",
23
23
  "@dcl/mini-comms": "1.0.1-20230216163137.commit-a4c75be",
24
24
  "@dcl/protocol": "1.0.0-4408137944.commit-a67c796",
@@ -56,5 +56,5 @@
56
56
  "files": [
57
57
  "dist"
58
58
  ],
59
- "commit": "bfd9912fdae18508a527302eff308932f35e5549"
59
+ "commit": "ac4461417cacdf02ecfe5b34987c0e55b41639fa"
60
60
  }