querysub 0.541.0 → 0.542.0

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.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/src/-a-archives/archives2.ts +33 -28
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "querysub",
3
- "version": "0.541.0",
3
+ "version": "0.542.0",
4
4
  "main": "index.js",
5
5
  "license": "MIT",
6
6
  "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -71,7 +71,7 @@
71
71
  "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
72
72
  "pako": "^2.1.0",
73
73
  "peggy": "^5.0.6",
74
- "sliftutils": "^1.7.24",
74
+ "sliftutils": "^1.7.27",
75
75
  "socket-function": "^1.2.26",
76
76
  "terser": "^5.31.0",
77
77
  "typenode": "^6.6.1",
package/src/-a-archives/archives2.ts CHANGED
@@ -31,16 +31,16 @@ function createSourceWindows(
31
31
  return sources;
32
32
  }
33
33
 
34
- export function archiveBuilder(bucket: string, overrides: Partial<RemoteConfigBase>) {
34
+ function archiveBuilder(bucket: string, overrides: Partial<RemoteConfigBase>) {
35
35
  const HETZNER = `https://65-109-93-113.querysubtest.com:5233/file/root/${bucket}/storage/storagerouting.json`;
36
36
  const ONTARIO = `https://99-250-124-91.querysubtest.com:5234/file/root/${bucket}/storage/storagerouting.json`;
37
- const BACKBLAZE = `https://f002.backblazeb2.com/file/querysub-storagetest/${bucket}/storage/storagerouting.json`;
37
+ const BACKBLAZE = `https://f002.backblazeb2.com/file/${bucket}/storage/storagerouting.json`;
38
38
  let sources = createSourceWindows(overrides, [
39
39
  {
40
40
  startTime: 0,
41
41
  sources: [
42
- { type: "remote", url: ONTARIO, route: [0.5, 1], },
43
- { type: "remote", url: HETZNER, route: [0, 0.5], },
42
+ { type: "remote", url: ONTARIO, route: [0, 0.5], },
43
+ { type: "remote", url: HETZNER, route: [0.5, 1], },
44
44
  { type: "remote", url: ONTARIO, },
45
45
  { type: "remote", url: HETZNER, },
46
46
  { type: "backblaze", url: BACKBLAZE, },
@@ -67,43 +67,48 @@ export function archiveBuilder(bucket: string, overrides: Partial<RemoteConfigBa
67
67
  // TODO: We'll turn on full sync eventually. That way we can be backblaze agnostic. For now we'll leave full sync off so we don't have to download hundreds of gigabytes and potentially change our mind about how we want to store it.
68
68
 
69
69
  const archivesBuilderCache = cacheJSONArgsEqual((domain: string, overrides: Partial<RemoteConfigBase>) => {
70
+ domain = domain.toLowerCase().replaceAll(/[^a-z0-9-]/g, "-");
70
71
  return archiveBuilder(domain, overrides);
71
72
  });
72
- function nestBucket(bucket: string, archives: IArchives): IArchives {
73
- if (!bucket) return archives;
74
- if (!bucket.endsWith("/")) {
75
- bucket = bucket + "/";
73
+ function nestBucket(folder: string, archives: IArchives): IArchives {
74
+ if (!folder) return archives;
75
+ if (!folder.endsWith("/")) {
76
+ folder = folder + "/";
76
77
  }
77
78
  return {
78
- get: (path: string) => archives.get(bucket + path),
79
- set: (path: string, data: Buffer) => archives.set(bucket + path, data),
80
- del: (path: string) => archives.del(bucket + path),
81
- find: (prefix: string) => archives.find(bucket + prefix),
82
- findInfo: (prefix: string) => archives.findInfo(bucket + prefix),
83
- get2: (path: string) => archives.get2(bucket + path),
84
- setLargeFile: (config: { path: string; getNextData(): Promise<Buffer | undefined>; }) => archives.setLargeFile({ path: bucket + config.path, getNextData: config.getNextData }),
85
- getInfo: (path: string) => archives.getInfo(bucket + path),
86
- getDebugName: () => archives.getDebugName() + "/" + bucket,
79
+ get: (path: string) => archives.get(folder + path),
80
+ set: (path: string, data: Buffer) => archives.set(folder + path, data),
81
+ del: (path: string) => archives.del(folder + path),
82
+ find: (prefix: string) => archives.find(folder + prefix),
83
+ findInfo: (prefix: string) => archives.findInfo(folder + prefix),
84
+ get2: (path: string) => archives.get2(folder + path),
85
+ setLargeFile: (config: { path: string; getNextData(): Promise<Buffer | undefined>; }) => archives.setLargeFile({ path: folder + config.path, getNextData: config.getNextData }),
86
+ getInfo: (path: string) => archives.getInfo(folder + path),
87
+ getDebugName: () => archives.getDebugName() + "/" + folder,
87
88
  hasWriteAccess: () => archives.hasWriteAccess(),
88
89
  getConfig: () => archives.getConfig(),
89
- getURL: (path: string) => archives.getURL(bucket + path),
90
+ getURL: (path: string) => archives.getURL(folder + path),
90
91
  };
91
92
  }
92
93
 
93
- export function getArchives2(bucket: string) {
94
- return nestBucket(bucket, archivesBuilderCache(getDomain(), { noFullSync: true, }));
94
+ function getSafeDomain() {
95
+ return getDomain().toLowerCase().replaceAll(/[^a-z0-9-]/g, "-");
95
96
  }
96
- export function getArchives2PrivateImmutable(bucket: string) {
97
- return nestBucket(bucket, archivesBuilderCache(getDomain() + "-private-immutable", { noFullSync: true, immutable: true }));
97
+
98
+ export function getArchives2(folder: string) {
99
+ return nestBucket(folder, archivesBuilderCache(getSafeDomain(), { noFullSync: true, }));
100
+ }
101
+ export function getArchives2PrivateImmutable(folder: string) {
102
+ return nestBucket(folder, archivesBuilderCache(getSafeDomain() + "-private-immutable", { noFullSync: true, immutable: true }));
98
103
  }
99
104
  function getAllowedOrigins(domain: string) {
100
105
  return [`https://${domain}`, `https://127-0-0-1.${domain}:7007`];
101
106
  }
102
- export function getArchives2PublicImmutable(bucket: string) {
103
- let domain = getDomain();
104
- return nestBucket(bucket, archivesBuilderCache(domain + "-public-immutable", { noFullSync: true, immutable: true, public: true, allowedOrigins: getAllowedOrigins(domain) }));
107
+ export function getArchives2PublicImmutable(folder: string) {
108
+ let domain = getSafeDomain();
109
+ return nestBucket(folder, archivesBuilderCache(domain + "-public-immutable", { noFullSync: true, immutable: true, public: true, allowedOrigins: getAllowedOrigins(getDomain()) }));
105
110
  }
106
- export function getArchives2Public(bucket: string) {
107
- let domain = getDomain();
108
- return nestBucket(bucket, archivesBuilderCache(domain + "-public", { noFullSync: true, public: true, allowedOrigins: getAllowedOrigins(domain) }));
111
+ export function getArchives2Public(folder: string) {
112
+ let domain = getSafeDomain();
113
+ return nestBucket(folder, archivesBuilderCache(domain + "-public", { noFullSync: true, public: true, allowedOrigins: getAllowedOrigins(getDomain()) }));
109
114
  }