Skip to content

Commit 3f74e9f

Browse files
authored
Merge pull request #1495 from polywrap/move-fs-plugin-interface
move fs interface and plugin to new repo
2 parents ea8a523 + ac09837 commit 3f74e9f

30 files changed

Lines changed: 49 additions & 566 deletions

File tree

packages/interfaces/file-system/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/interfaces/file-system/deployment.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/interfaces/file-system/package.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/interfaces/file-system/polywrap.deploy.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/interfaces/file-system/polywrap.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

packages/js/client-config-builder/README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ export const defaultPackages = {
533533
http: "wrap://plugin/http",
534534
httpResolver: "wrap://ens/http-resolver.polywrap.eth",
535535
logger: "wrap://plugin/logger",
536-
fileSystem: "wrap://ens/fs.polywrap.eth",
536+
fileSystem: "wrap://plugin/fs",
537537
fileSystemResolver: "wrap://ens/fs-resolver.polywrap.eth",
538538
ipfsResolver: "wrap://ens/ipfs-resolver.polywrap.eth",
539539
concurrent: "wrap://plugin/concurrent",
@@ -544,6 +544,7 @@ export const defaultInterfaces = {
544544
concurrent: "wrap://ens/wrappers.polywrap.eth:concurrent@1.0.0",
545545
logger: "wrap://ens/wrappers.polywrap.eth:logger@1.0.0",
546546
http: "wrap://ens/wrappers.polywrap.eth:http@1.1.0",
547+
fileSystem: "wrap://ens/wrappers.polywrap.eth:file-system@1.0.0",
547548
};
548549

549550
export const getDefaultConfig = (): ClientConfig<Uri> => {
@@ -588,6 +589,14 @@ export const getDefaultConfig = (): ClientConfig<Uri> => {
588589
from: new Uri(defaultInterfaces.http),
589590
to: new Uri(defaultPackages.http),
590591
},
592+
{
593+
from: new Uri("wrap://ens/fs.polywrap.eth"),
594+
to: new Uri(defaultInterfaces.fileSystem),
595+
},
596+
{
597+
from: new Uri(defaultInterfaces.fileSystem),
598+
to: new Uri(defaultPackages.fileSystem),
599+
},
591600
],
592601
interfaces: [
593602
{

packages/js/client-config-builder/src/bundles/getDefaultConfig.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export const defaultPackages = {
3838
http: "wrap://plugin/http",
3939
httpResolver: "wrap://ens/http-resolver.polywrap.eth",
4040
logger: "wrap://plugin/logger",
41-
fileSystem: "wrap://ens/fs.polywrap.eth",
41+
fileSystem: "wrap://plugin/fs",
4242
fileSystemResolver: "wrap://ens/fs-resolver.polywrap.eth",
4343
ipfsResolver: "wrap://ens/ipfs-resolver.polywrap.eth",
4444
concurrent: "wrap://plugin/concurrent",
@@ -49,6 +49,7 @@ export const defaultInterfaces = {
4949
concurrent: "wrap://ens/wrappers.polywrap.eth:concurrent@1.0.0",
5050
logger: "wrap://ens/wrappers.polywrap.eth:logger@1.0.0",
5151
http: "wrap://ens/wrappers.polywrap.eth:http@1.1.0",
52+
fileSystem: "wrap://ens/wrappers.polywrap.eth:file-system@1.0.0",
5253
};
5354

5455
export const getDefaultConfig = (): ClientConfig<Uri> => {
@@ -93,6 +94,14 @@ export const getDefaultConfig = (): ClientConfig<Uri> => {
9394
from: new Uri(defaultInterfaces.http),
9495
to: new Uri(defaultPackages.http),
9596
},
97+
{
98+
from: new Uri("wrap://ens/fs.polywrap.eth"),
99+
to: new Uri(defaultInterfaces.fileSystem),
100+
},
101+
{
102+
from: new Uri(defaultInterfaces.fileSystem),
103+
to: new Uri(defaultPackages.fileSystem),
104+
},
96105
],
97106
interfaces: [
98107
{

packages/js/client/src/__tests__/core/error-structure.spec.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { Uri, PolywrapClient } from "../..";
33
import { buildWrapper } from "@polywrap/test-env-js";
44
import { WrapError, WrapErrorCode } from "@polywrap/core-js";
55
import { mockPluginRegistration } from "../helpers/mockPluginRegistration";
6+
import { defaultPackages } from "@polywrap/client-config-builder-js";
67

78
jest.setTimeout(660000);
89

@@ -235,7 +236,7 @@ describe("Error structure", () => {
235236
describe("Plugin wrapper", () => {
236237
test("Invoke a plugin wrapper with malformed args", async () => {
237238
const result = await client.invoke<Uint8Array>({
238-
uri: "wrap://ens/fs.polywrap.eth",
239+
uri: defaultPackages.fileSystem,
239240
method: "readFile",
240241
args: {
241242
pathh: "packages/js/client/src/__tests__/core/index.ts",
@@ -248,15 +249,15 @@ describe("Error structure", () => {
248249
expect(result.error?.name).toEqual("WrapError");
249250
expect(result.error?.code).toEqual(WrapErrorCode.WRAPPER_INVOKE_ABORTED);
250251
expect(result.error?.reason).toEqual("The \"path\" argument must be of type string or an instance of Buffer or URL. Received undefined");
251-
expect(result.error?.uri).toEqual("wrap://ens/fs.polywrap.eth");
252+
expect(result.error?.uri).toEqual(defaultPackages.fileSystem);
252253
expect(result.error?.method).toEqual("readFile");
253254
expect(result.error?.args).toContain("{\n \"pathh\": \"packages/js/client/src/__tests__/core/index.ts\"\n}");
254255
expect(result.error?.source).toEqual({ file: "node:internal/fs/promises", row: 450, col: 10 });
255256
});
256257

257258
test("Invoke a plugin wrapper with a method that doesn't exist", async () => {
258259
const result = await client.invoke<Uint8Array>({
259-
uri: "wrap://ens/fs.polywrap.eth",
260+
uri: defaultPackages.fileSystem,
260261
method: "readFileNotFound",
261262
args: {
262263
path: __dirname + "/index.ts",
@@ -269,7 +270,7 @@ describe("Error structure", () => {
269270
expect(result.error?.name).toEqual("WrapError");
270271
expect(result.error?.code).toEqual(WrapErrorCode.WRAPPER_METHOD_NOT_FOUND);
271272
expect(result.error?.reason.startsWith("Plugin missing method ")).toBeTruthy();
272-
expect(result.error?.uri).toEqual("wrap://ens/fs.polywrap.eth");
273+
expect(result.error?.uri).toEqual(defaultPackages.fileSystem);
273274
expect(result.error?.method).toEqual("readFileNotFound");
274275
});
275276

@@ -293,7 +294,7 @@ describe("Error structure", () => {
293294

294295
test("Invoke a plugin wrapper that throws unexpectedly", async () => {
295296
const result = await client.invoke<Uint8Array>({
296-
uri: "wrap://ens/fs.polywrap.eth",
297+
uri: defaultPackages.fileSystem,
297298
method: "readFile",
298299
args: {
299300
path: "./this/path/does/not/exist.ts",
@@ -306,7 +307,7 @@ describe("Error structure", () => {
306307
expect(result.error?.name).toEqual("WrapError");
307308
expect(result.error?.code).toEqual(WrapErrorCode.WRAPPER_INVOKE_ABORTED);
308309
expect(result.error?.reason.startsWith("ENOENT: no such file or directory")).toBeTruthy();
309-
expect(result.error?.uri).toEqual("wrap://ens/fs.polywrap.eth");
310+
expect(result.error?.uri).toEqual(defaultPackages.fileSystem);
310311
expect(result.error?.method).toEqual("readFile");
311312
expect(result.error?.args).toEqual("{\n \"path\": \"./this/path/does/not/exist.ts\"\n}");
312313
});

packages/js/client/src/__tests__/helpers/getClientWithEnsAndIpfs.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
WrapperCache,
1717
} from "@polywrap/uri-resolvers-js";
1818
import { ExtendableUriResolver } from "@polywrap/uri-resolver-extensions-js";
19+
import { defaultInterfaces } from "@polywrap/client-config-builder-js";
1920

2021
export const getClientWithEnsAndIpfs = () => {
2122
const connections: Connections = new Connections({
@@ -70,7 +71,7 @@ export const getClientWithEnsAndIpfs = () => {
7071
package: ipfsResolverPlugin({}),
7172
},
7273
{
73-
uri: "wrap://ens/fs.polywrap.eth",
74+
uri: defaultInterfaces.fileSystem,
7475
package: fileSystemPlugin({}),
7576
},
7677
{

packages/js/plugins/ethereum/src/__tests__/helpers/getDefaultConfig.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ethereumPlugin, Connections } from "../..";
55
import { providers } from "@polywrap/test-env-js";
66
import {
77
defaultIpfsProviders,
8-
ClientConfig,
8+
ClientConfig, defaultInterfaces,
99
} from "@polywrap/client-config-builder-js";
1010

1111
export const getDefaultConfig = (
@@ -37,7 +37,7 @@ export const getDefaultConfig = (
3737
package: fileSystemResolverPlugin({}),
3838
},
3939
{
40-
uri: "wrap://ens/fs.polywrap.eth",
40+
uri: defaultInterfaces.fileSystem,
4141
package: fileSystemPlugin({}),
4242
},
4343
],

0 commit comments

Comments
 (0)