sliftutils 1.7.10 → 1.7.12
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.
- package/.claude/settings.local.json +2 -1
- package/examplestorage/exampleserver.ts +0 -2
- package/index.d.ts +301 -54
- package/misc/dist/environment.ts.cache +3 -3
- package/misc/dist/getSecret.ts.cache +139 -0
- package/misc/dist/strings.ts.cache +13 -0
- package/misc/dist/zip.ts.cache +9 -0
- package/misc/getSecret.ts +38 -16
- package/misc/https/cloudflareHelpers.d.ts +19 -0
- package/misc/https/cloudflareHelpers.ts +69 -0
- package/misc/https/dist/certs.ts.cache +115 -179
- package/misc/https/dist/cloudflareHelpers.ts.cache +68 -0
- package/misc/https/dist/dns.ts.cache +112 -100
- package/misc/https/dist/hostServer.ts.cache +130 -0
- package/misc/https/dist/httpsCerts.ts.cache +24 -5
- package/misc/https/dist/persistentLocalStorage.ts.cache +3 -2
- package/misc/https/dns.d.ts +41 -12
- package/misc/https/dns.ts +104 -101
- package/misc/https/hostServer.d.ts +0 -6
- package/misc/https/hostServer.ts +9 -5
- package/package.json +2 -2
- package/render-utils/dist/observer.tsx.cache +3 -2
- package/spec.txt +0 -90
- package/storage/ArchivesDisk.d.ts +2 -0
- package/storage/ArchivesDisk.ts +7 -3
- package/storage/BulkDatabase2/dist/BulkDatabaseBase.ts.cache +1242 -0
- package/storage/BulkDatabase2/dist/BulkDatabaseFormat.ts.cache +513 -0
- package/storage/BulkDatabase2/dist/BulkDatabaseMerge.ts.cache +352 -0
- package/storage/BulkDatabase2/dist/BulkDatabaseReader.ts.cache +306 -0
- package/storage/BulkDatabase2/dist/LoadedIndex.ts.cache +435 -0
- package/storage/BulkDatabase2/dist/WriteOverlay.ts.cache +58 -0
- package/storage/BulkDatabase2/dist/blockCache.ts.cache +179 -0
- package/storage/BulkDatabase2/dist/mergeLock.ts.cache +149 -0
- package/storage/BulkDatabase2/dist/mergeMarkers.ts.cache +101 -0
- package/storage/BulkDatabase2/dist/streamLog.ts.cache +227 -0
- package/storage/BulkDatabase2/dist/syncClient.ts.cache +104 -0
- package/storage/IArchives.d.ts +47 -15
- package/storage/IArchives.ts +86 -31
- package/storage/backblaze.d.ts +15 -0
- package/storage/backblaze.ts +199 -79
- package/storage/dist/ArchivesDisk.ts.cache +373 -0
- package/storage/dist/FileFolderAPI.tsx.cache +508 -65
- package/storage/dist/IArchives.ts.cache +44 -0
- package/storage/dist/IndexedDBFileFolderAPI.ts.cache +8 -2
- package/storage/dist/JSONStorage.ts.cache +6 -2
- package/storage/dist/PendingManager.tsx.cache +1 -1
- package/storage/dist/TransactionStorage.ts.cache +231 -92
- package/storage/dist/backblaze.ts.cache +797 -0
- package/storage/dist/fileSystemPointer.ts.cache +36 -3
- package/storage/dist/remoteFileStorage.ts.cache +495 -0
- package/storage/remoteStorage/ArchivesRemote.d.ts +5 -1
- package/storage/remoteStorage/ArchivesRemote.ts +28 -8
- package/storage/remoteStorage/ArchivesUrl.d.ts +2 -0
- package/storage/remoteStorage/ArchivesUrl.ts +16 -4
- package/storage/remoteStorage/blobStore.d.ts +63 -3
- package/storage/remoteStorage/blobStore.ts +419 -101
- package/storage/remoteStorage/createArchives.d.ts +31 -10
- package/storage/remoteStorage/createArchives.ts +470 -253
- package/storage/remoteStorage/dist/ArchivesRemote.ts.cache +197 -0
- package/storage/remoteStorage/dist/ArchivesUrl.ts.cache +85 -0
- package/storage/remoteStorage/dist/accessPage.tsx.cache +222 -0
- package/storage/remoteStorage/dist/blobStore.ts.cache +837 -0
- package/storage/remoteStorage/dist/cliArgs.ts.cache +16 -0
- package/storage/remoteStorage/dist/createArchives.ts.cache +610 -0
- package/storage/remoteStorage/dist/remoteConfig.ts.cache +206 -0
- package/storage/remoteStorage/dist/sourceWrapper.ts.cache +223 -0
- package/storage/remoteStorage/dist/storageController.ts.cache +500 -0
- package/storage/remoteStorage/dist/storageServer.ts.cache +106 -0
- package/storage/remoteStorage/dist/storageServerCli.ts.cache +39 -0
- package/storage/remoteStorage/dist/storageServerState.ts.cache +518 -0
- package/storage/remoteStorage/remoteConfig.d.ts +8 -0
- package/storage/remoteStorage/remoteConfig.ts +105 -5
- package/storage/remoteStorage/sourceWrapper.d.ts +41 -0
- package/storage/remoteStorage/sourceWrapper.ts +223 -0
- package/storage/remoteStorage/spec.md +31 -0
- package/storage/remoteStorage/storageController.d.ts +11 -0
- package/storage/remoteStorage/storageController.ts +109 -40
- package/storage/remoteStorage/storageServer.d.ts +0 -5
- package/storage/remoteStorage/storageServer.ts +17 -10
- package/storage/remoteStorage/storageServerCli.ts +0 -3
- package/storage/remoteStorage/storageServerState.d.ts +7 -1
- package/storage/remoteStorage/storageServerState.ts +230 -48
- package/testsite/server.ts +0 -2
- package/yarn.lock +11 -6
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
3
3
|
//exports.isInBrowser = exports.isInBuild = exports.triggerIsInBuild = exports.isInElectron = exports.isInChromeExtensionContentScript = exports.isInChromeExtensionBackground = exports.isInChromeExtension = void 0;
|
|
4
|
-
/// <reference
|
|
4
|
+
/// <reference types="@types/chrome/index.d.ts" />
|
|
5
5
|
function isInChromeExtension() {
|
|
6
6
|
return typeof chrome !== "undefined" && chrome.runtime && chrome.runtime.id;
|
|
7
7
|
}
|
|
@@ -46,5 +46,5 @@ function isInBrowser() {
|
|
|
46
46
|
return typeof document !== "undefined";
|
|
47
47
|
}
|
|
48
48
|
exports.isInBrowser = isInBrowser;
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
-
/* _JS_SOURCE_HASH = "
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZW52aXJvbm1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJlbnZpcm9ubWVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxrREFBa0Q7QUFDbEQsU0FBZ0IsbUJBQW1CO0lBQy9CLE9BQU8sT0FBTyxNQUFNLEtBQUssV0FBVyxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksTUFBTSxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7QUFDaEYsQ0FBQztBQUZELGtEQUVDO0FBQ0QsU0FBZ0IsNkJBQTZCO0lBQ3pDLElBQUksQ0FBQyxtQkFBbUIsRUFBRTtRQUFFLE9BQU8sS0FBSyxDQUFDO0lBRXpDLDBFQUEwRTtJQUMxRSxJQUFJLE9BQVEsVUFBa0IsQ0FBQyxhQUFhLEtBQUssVUFBVSxJQUFJLE9BQU8sUUFBUSxLQUFLLFdBQVcsRUFBRSxDQUFDO1FBQzdGLE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCwrQkFBK0I7SUFDL0IsSUFBSSxPQUFPLE1BQU0sQ0FBQyxTQUFTLEtBQUssV0FBVyxJQUFJLE9BQU8sTUFBTSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsS0FBSyxVQUFVLEVBQUUsQ0FBQztRQUN0RyxJQUFJLENBQUM7WUFDRCxPQUFPLE1BQU0sQ0FBQyxTQUFTLENBQUMsaUJBQWlCLEVBQUUsS0FBSyxNQUFNLENBQUM7UUFDM0QsQ0FBQztRQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUM7WUFDVCxPQUFPLEtBQUssQ0FBQztRQUNqQixDQUFDO0lBQ0wsQ0FBQztJQUVELE9BQU8sS0FBSyxDQUFDO0FBQ2pCLENBQUM7QUFsQkQsc0VBa0JDO0FBQ0QsU0FBZ0IsZ0NBQWdDO0lBQzVDLE9BQU8sbUJBQW1CLEVBQUUsSUFBSSxDQUFDLDZCQUE2QixFQUFFLENBQUM7QUFDckUsQ0FBQztBQUZELDRFQUVDO0FBQ0QsU0FBZ0IsWUFBWTtJQUN4QixPQUFPLE9BQU8sT0FBTyxLQUFLLFdBQVcsSUFBSSxPQUFPLENBQUMsUUFBUSxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDO0FBQzNGLENBQUM7QUFGRCxvQ0FFQztBQUNELElBQUksYUFBYSxHQUFHLEtBQUssQ0FBQztBQUMxQixTQUFnQixnQkFBZ0I7SUFDNUIsYUFBYSxHQUFHLElBQUksQ0FBQztBQUN6QixDQUFDO0FBRkQsNENBRUM7QUFDRCxTQUFnQixTQUFTO0lBQ3JCLE9BQU8sYUFBYSxDQUFDO0FBQ3pCLENBQUM7QUFGRCw4QkFFQztBQUNELFNBQWdCLFdBQVc7SUFDdkIsT0FBTyxPQUFPLFFBQVEsS0FBSyxXQUFXLENBQUM7QUFDM0MsQ0FBQztBQUZELGtDQUVDIiwic291cmNlc0NvbnRlbnQiOlsiLy8vIDxyZWZlcmVuY2UgdHlwZXM9XCJAdHlwZXMvY2hyb21lL2luZGV4LmQudHNcIiAvPlxuZXhwb3J0IGZ1bmN0aW9uIGlzSW5DaHJvbWVFeHRlbnNpb24oKSB7XG4gICAgcmV0dXJuIHR5cGVvZiBjaHJvbWUgIT09IFwidW5kZWZpbmVkXCIgJiYgY2hyb21lLnJ1bnRpbWUgJiYgY2hyb21lLnJ1bnRpbWUuaWQ7XG59XG5leHBvcnQgZnVuY3Rpb24gaXNJbkNocm9tZUV4dGVuc2lvbkJhY2tncm91bmQoKSB7XG4gICAgaWYgKCFpc0luQ2hyb21lRXh0ZW5zaW9uKCkpIHJldHVybiBmYWxzZTtcblxuICAgIC8vIE1hbmlmZXN0IFYzOiBTZXJ2aWNlIFdvcmtlciBjb250ZXh0IChoYXMgaW1wb3J0U2NyaXB0cyBidXQgbm8gZG9jdW1lbnQpXG4gICAgaWYgKHR5cGVvZiAoZ2xvYmFsVGhpcyBhcyBhbnkpLmltcG9ydFNjcmlwdHMgPT09IFwiZnVuY3Rpb25cIiAmJiB0eXBlb2YgZG9jdW1lbnQgPT09IFwidW5kZWZpbmVkXCIpIHtcbiAgICAgICAgcmV0dXJuIHRydWU7XG4gICAgfVxuXG4gICAgLy8gTWFuaWZlc3QgVjI6IEJhY2tncm91bmQgcGFnZVxuICAgIGlmICh0eXBlb2YgY2hyb21lLmV4dGVuc2lvbiAhPT0gXCJ1bmRlZmluZWRcIiAmJiB0eXBlb2YgY2hyb21lLmV4dGVuc2lvbi5nZXRCYWNrZ3JvdW5kUGFnZSA9PT0gXCJmdW5jdGlvblwiKSB7XG4gICAgICAgIHRyeSB7XG4gICAgICAgICAgICByZXR1cm4gY2hyb21lLmV4dGVuc2lvbi5nZXRCYWNrZ3JvdW5kUGFnZSgpID09PSB3aW5kb3c7XG4gICAgICAgIH0gY2F0Y2ggKGUpIHtcbiAgICAgICAgICAgIHJldHVybiBmYWxzZTtcbiAgICAgICAgfVxuICAgIH1cblxuICAgIHJldHVybiBmYWxzZTtcbn1cbmV4cG9ydCBmdW5jdGlvbiBpc0luQ2hyb21lRXh0ZW5zaW9uQ29udGVudFNjcmlwdCgpIHtcbiAgICByZXR1cm4gaXNJbkNocm9tZUV4dGVuc2lvbigpICYmICFpc0luQ2hyb21lRXh0ZW5zaW9uQmFja2dyb3VuZCgpO1xufVxuZXhwb3J0IGZ1bmN0aW9uIGlzSW5FbGVjdHJvbigpIHtcbiAgICByZXR1cm4gdHlwZW9mIHByb2Nlc3MgIT09IFwidW5kZWZpbmVkXCIgJiYgcHJvY2Vzcy52ZXJzaW9ucyAmJiBwcm9jZXNzLnZlcnNpb25zLmVsZWN0cm9uO1xufVxubGV0IGlzSW5CdWlsZEZsYWcgPSBmYWxzZTtcbmV4cG9ydCBmdW5jdGlvbiB0cmlnZ2VySXNJbkJ1aWxkKCkge1xuICAgIGlzSW5CdWlsZEZsYWcgPSB0cnVlO1xufVxuZXhwb3J0IGZ1bmN0aW9uIGlzSW5CdWlsZCgpIHtcbiAgICByZXR1cm4gaXNJbkJ1aWxkRmxhZztcbn1cbmV4cG9ydCBmdW5jdGlvbiBpc0luQnJvd3NlcigpIHtcbiAgICByZXR1cm4gdHlwZW9mIGRvY3VtZW50ICE9PSBcInVuZGVmaW5lZFwiO1xufSJdfQ==
|
|
50
|
+
/* _JS_SOURCE_HASH = "c7ee18b0b3ad11aeba561c3dc6daba53159677e35bde1c50775ffdf74982b40f"; */
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
26
|
+
exports.setSecret = exports.getSecret = exports.resetSecret = void 0;
|
|
27
|
+
const caching_1 = require("socket-function/src/caching");
|
|
28
|
+
const typesafecss_1 = require("typesafecss");
|
|
29
|
+
const secretStoragePrefix = "secret_";
|
|
30
|
+
function getStorageKey(key) {
|
|
31
|
+
return secretStoragePrefix + key.replace(/[\/\\\.]/g, "_");
|
|
32
|
+
}
|
|
33
|
+
function resetSecret(key) {
|
|
34
|
+
if ((0, typesafecss_1.isNode)()) {
|
|
35
|
+
throw new Error("resetSecret is only supported in the browser");
|
|
36
|
+
}
|
|
37
|
+
localStorage.removeItem(getStorageKey(key));
|
|
38
|
+
}
|
|
39
|
+
exports.resetSecret = resetSecret;
|
|
40
|
+
exports.getSecret = (0, caching_1.cache)(async function getSecret(key) {
|
|
41
|
+
var _a;
|
|
42
|
+
if ((0, typesafecss_1.isNode)()) {
|
|
43
|
+
const os = await Promise.resolve().then(() => __importStar(require("os")));
|
|
44
|
+
const fs = await Promise.resolve().then(() => __importStar(require("fs")));
|
|
45
|
+
const path = await Promise.resolve().then(() => __importStar(require("path")));
|
|
46
|
+
const appSecretsPath = path.resolve("./appSecrets");
|
|
47
|
+
let appSecretsModule;
|
|
48
|
+
try {
|
|
49
|
+
appSecretsModule = await Promise.resolve(`${appSecretsPath}`).then(s => __importStar(require(s)));
|
|
50
|
+
}
|
|
51
|
+
catch (_b) {
|
|
52
|
+
// Module doesn't exist, fall through to the file-based approach
|
|
53
|
+
}
|
|
54
|
+
if (appSecretsModule === null || appSecretsModule === void 0 ? void 0 : appSecretsModule.getAppSecret) {
|
|
55
|
+
const result = await appSecretsModule.getAppSecret(key);
|
|
56
|
+
if (!result) {
|
|
57
|
+
throw new Error(`Expected an app secret named "${key}" from getAppSecret in ${appSecretsPath}, but it returned no result`);
|
|
58
|
+
}
|
|
59
|
+
return result;
|
|
60
|
+
}
|
|
61
|
+
const jsonIndex = key.indexOf(".json");
|
|
62
|
+
let filePath;
|
|
63
|
+
try {
|
|
64
|
+
if (jsonIndex === -1) {
|
|
65
|
+
filePath = os.homedir() + "/" + key;
|
|
66
|
+
return fs.readFileSync(filePath, "utf-8").trim();
|
|
67
|
+
}
|
|
68
|
+
const pathPart = key.slice(0, jsonIndex + ".json".length);
|
|
69
|
+
filePath = os.homedir() + "/" + pathPart;
|
|
70
|
+
const contents = fs.readFileSync(filePath, "utf-8");
|
|
71
|
+
const json = JSON.parse(contents);
|
|
72
|
+
const keyPart = key.slice(jsonIndex + ".json.".length);
|
|
73
|
+
if (!keyPart) {
|
|
74
|
+
return JSON.stringify(json);
|
|
75
|
+
}
|
|
76
|
+
const value = json[keyPart];
|
|
77
|
+
if (value === undefined) {
|
|
78
|
+
throw new Error(`Expected key "${keyPart}" in ${filePath}, was undefined`);
|
|
79
|
+
}
|
|
80
|
+
return String(value);
|
|
81
|
+
}
|
|
82
|
+
catch (e) {
|
|
83
|
+
throw new Error(`Could not find secret "${key}". Expected it either from getAppSecret in the app secret module at ${appSecretsPath}, or in the file at ${os.homedir() + "/" + key}. Underlying error: ${(_a = e.stack) !== null && _a !== void 0 ? _a : e}`);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
// Browser implementation
|
|
87
|
+
const storageKey = getStorageKey(key);
|
|
88
|
+
const cached = localStorage.getItem(storageKey);
|
|
89
|
+
if (cached) {
|
|
90
|
+
return cached;
|
|
91
|
+
}
|
|
92
|
+
// Show modal to prompt user for secret
|
|
93
|
+
const { showFullscreenModal, FullscreenModal } = await Promise.resolve().then(() => __importStar(require("../render-utils/FullscreenModal")));
|
|
94
|
+
const { showModal } = await Promise.resolve().then(() => __importStar(require("../render-utils/modal")));
|
|
95
|
+
const { observable } = await Promise.resolve().then(() => __importStar(require("mobx")));
|
|
96
|
+
const preact = await Promise.resolve().then(() => __importStar(require("preact")));
|
|
97
|
+
return new Promise((resolve) => {
|
|
98
|
+
const state = observable({
|
|
99
|
+
value: "",
|
|
100
|
+
});
|
|
101
|
+
const { close } = showModal({
|
|
102
|
+
contents: preact.createElement(FullscreenModal, {
|
|
103
|
+
onCancel: () => {
|
|
104
|
+
// Don't allow cancel without a value
|
|
105
|
+
},
|
|
106
|
+
}, preact.createElement("div", { style: { display: "flex", flexDirection: "column", gap: 10 } }, preact.createElement("div", { style: { fontWeight: "bold" } }, `Enter secret for: ${key}`), preact.createElement("input", {
|
|
107
|
+
style: { padding: 10, fontSize: 16 },
|
|
108
|
+
onInput: (e) => {
|
|
109
|
+
state.value = e.target.value;
|
|
110
|
+
},
|
|
111
|
+
onKeyDown: (e) => {
|
|
112
|
+
if (e.code === "Enter" && state.value) {
|
|
113
|
+
localStorage.setItem(storageKey, state.value);
|
|
114
|
+
close();
|
|
115
|
+
resolve(state.value);
|
|
116
|
+
}
|
|
117
|
+
},
|
|
118
|
+
}), preact.createElement("button", {
|
|
119
|
+
style: { padding: 10, fontSize: 16, cursor: "pointer" },
|
|
120
|
+
onClick: () => {
|
|
121
|
+
if (state.value) {
|
|
122
|
+
localStorage.setItem(storageKey, state.value);
|
|
123
|
+
close();
|
|
124
|
+
resolve(state.value);
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
}, "Save"))),
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
});
|
|
131
|
+
function setSecret(key, value) {
|
|
132
|
+
if ((0, typesafecss_1.isNode)()) {
|
|
133
|
+
throw new Error("setSecret is only supported in the browser. We don't want to break the user's file system with setSecret in NodeJS.");
|
|
134
|
+
}
|
|
135
|
+
localStorage.setItem(getStorageKey(key), value);
|
|
136
|
+
}
|
|
137
|
+
exports.setSecret = setSecret;
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"getSecret.js","sourceRoot":"","sources":["getSecret.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { cache } from \"socket-function/src/caching\";\nimport { isNode } from \"typesafecss\";\n\nconst secretStoragePrefix = \"secret_\";\n\nfunction getStorageKey(key: string) {\n    return secretStoragePrefix + key.replace(/[\\/\\\\\\.]/g, \"_\");\n}\n\nexport function resetSecret(key: string) {\n    if (isNode()) {\n        throw new Error(\"resetSecret is only supported in the browser\");\n    }\n    localStorage.removeItem(getStorageKey(key));\n}\n\nexport const getSecret = cache(async function getSecret(key: string): Promise<string> {\n    if (isNode()) {\n        const os = await import(\"os\");\n        const fs = await import(\"fs\");\n        const path = await import(\"path\");\n\n        const appSecretsPath = path.resolve(\"./appSecrets\");\n        let appSecretsModule: { getAppSecret?: (key: string) => Promise<string | undefined> | string | undefined } | undefined;\n        try {\n            appSecretsModule = await import(appSecretsPath) as typeof appSecretsModule;\n        } catch {\n            // Module doesn't exist, fall through to the file-based approach\n        }\n        if (appSecretsModule?.getAppSecret) {\n            const result = await appSecretsModule.getAppSecret(key);\n            if (!result) {\n                throw new Error(`Expected an app secret named \"${key}\" from getAppSecret in ${appSecretsPath}, but it returned no result`);\n            }\n            return result;\n        }\n\n        const jsonIndex = key.indexOf(\".json\");\n        let filePath: string;\n        try {\n            if (jsonIndex === -1) {\n                filePath = os.homedir() + \"/\" + key;\n                return fs.readFileSync(filePath, \"utf-8\").trim();\n            }\n\n            const pathPart = key.slice(0, jsonIndex + \".json\".length);\n            filePath = os.homedir() + \"/\" + pathPart;\n            const contents = fs.readFileSync(filePath, \"utf-8\");\n            const json = JSON.parse(contents);\n\n            const keyPart = key.slice(jsonIndex + \".json.\".length);\n            if (!keyPart) {\n                return JSON.stringify(json);\n            }\n\n            const value = json[keyPart];\n            if (value === undefined) {\n                throw new Error(`Expected key \"${keyPart}\" in ${filePath}, was undefined`);\n            }\n            return String(value);\n        } catch (e) {\n            throw new Error(`Could not find secret \"${key}\". Expected it either from getAppSecret in the app secret module at ${appSecretsPath}, or in the file at ${os.homedir() + \"/\" + key}. Underlying error: ${(e as Error).stack ?? e}`);\n        }\n    }\n\n    // Browser implementation\n    const storageKey = getStorageKey(key);\n    const cached = localStorage.getItem(storageKey);\n    if (cached) {\n        return cached;\n    }\n\n    // Show modal to prompt user for secret\n    const { showFullscreenModal, FullscreenModal } = await import(\"../render-utils/FullscreenModal\");\n    const { showModal } = await import(\"../render-utils/modal\");\n    const { observable } = await import(\"mobx\");\n    const preact = await import(\"preact\");\n\n    return new Promise<string>((resolve) => {\n        const state = observable({\n            value: \"\",\n        });\n\n        const { close } = showModal({\n            contents: preact.createElement(FullscreenModal, {\n                onCancel: () => {\n                    // Don't allow cancel without a value\n                },\n            },\n                preact.createElement(\"div\", { style: { display: \"flex\", flexDirection: \"column\", gap: 10 } },\n                    preact.createElement(\"div\", { style: { fontWeight: \"bold\" } }, `Enter secret for: ${key}`),\n                    preact.createElement(\"input\", {\n                        style: { padding: 10, fontSize: 16 },\n                        onInput: (e: Event) => {\n                            state.value = (e.target as HTMLInputElement).value;\n                        },\n                        onKeyDown: (e: KeyboardEvent) => {\n                            if (e.code === \"Enter\" && state.value) {\n                                localStorage.setItem(storageKey, state.value);\n                                close();\n                                resolve(state.value);\n                            }\n                        },\n                    }),\n                    preact.createElement(\"button\", {\n                        style: { padding: 10, fontSize: 16, cursor: \"pointer\" },\n                        onClick: () => {\n                            if (state.value) {\n                                localStorage.setItem(storageKey, state.value);\n                                close();\n                                resolve(state.value);\n                            }\n                        },\n                    }, \"Save\"),\n                ),\n            ),\n        });\n    });\n});\n\nexport function setSecret(key: string, value: string) {\n    if (isNode()) {\n        throw new Error(\"setSecret is only supported in the browser. We don't want to break the user's file system with setSecret in NodeJS.\");\n    }\n    localStorage.setItem(getStorageKey(key), value);\n}\n"]}
|
|
139
|
+
/* _JS_SOURCE_HASH = "059a468ed50aafff48c682b57181b850933393c80cd3bc460912530e1d2ae39b"; */
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
3
|
+
//exports.ellipsize = void 0;
|
|
4
|
+
module.allowclient = true;
|
|
5
|
+
function ellipsize(text, maxLength) {
|
|
6
|
+
if (text.length <= maxLength) {
|
|
7
|
+
return text;
|
|
8
|
+
}
|
|
9
|
+
return text.slice(0, maxLength - 3) + "...";
|
|
10
|
+
}
|
|
11
|
+
exports.ellipsize = ellipsize;
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RyaW5ncy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInN0cmluZ3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBTSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFFMUIsU0FBZ0IsU0FBUyxDQUFDLElBQVksRUFBRSxTQUFpQjtJQUNyRCxJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksU0FBUyxFQUFFLENBQUM7UUFDM0IsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUNELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUUsU0FBUyxHQUFHLENBQUMsQ0FBQyxHQUFHLEtBQUssQ0FBQztBQUNoRCxDQUFDO0FBTEQsOEJBS0MiLCJzb3VyY2VzQ29udGVudCI6WyJtb2R1bGUuYWxsb3djbGllbnQgPSB0cnVlO1xuXG5leHBvcnQgZnVuY3Rpb24gZWxsaXBzaXplKHRleHQ6IHN0cmluZywgbWF4TGVuZ3RoOiBudW1iZXIpOiBzdHJpbmcge1xuICAgIGlmICh0ZXh0Lmxlbmd0aCA8PSBtYXhMZW5ndGgpIHtcbiAgICAgICAgcmV0dXJuIHRleHQ7XG4gICAgfVxuICAgIHJldHVybiB0ZXh0LnNsaWNlKDAsIG1heExlbmd0aCAtIDMpICsgXCIuLi5cIjtcbn1cbiJdfQ==
|
|
13
|
+
/* _JS_SOURCE_HASH = "939b0010ad0403d8fcaea1dade14b758df80a31a6c0bd92352e5373b6bcdd033"; */
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true , configurable: true});
|
|
3
|
+
//exports.Zip = void 0;
|
|
4
|
+
const compileFlags_1 = require("socket-function/require/compileFlags");
|
|
5
|
+
const Zip_1 = require("socket-function/src/Zip");
|
|
6
|
+
Object.defineProperty(exports, "Zip", { enumerable: true, get: function () { return Zip_1.Zip; } , configurable: true});
|
|
7
|
+
(0, compileFlags_1.setFlag)(require, "pako", "allowclient", true);
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemlwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiemlwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUtBLHVFQUErRDtBQUUvRCxpREFBOEM7QUFHckMsb0ZBSEEsU0FBRyxPQUdBO0FBRlosSUFBQSxzQkFBTyxFQUFDLE9BQU8sRUFBRSxNQUFNLEVBQUUsYUFBYSxFQUFFLElBQUksQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgaXNOb2RlIH0gZnJvbSBcInNvY2tldC1mdW5jdGlvbi9zcmMvbWlzY1wiO1xuaW1wb3J0IHsgbWVhc3VyZUZuYyB9IGZyb20gXCJzb2NrZXQtZnVuY3Rpb24vc3JjL3Byb2ZpbGluZy9tZWFzdXJlXCI7XG5pbXBvcnQgemxpYiBmcm9tIFwiemxpYlwiO1xuaW1wb3J0ICogYXMgcGFrbyBmcm9tIFwicGFrb1wiO1xuXG5pbXBvcnQgeyBzZXRGbGFnIH0gZnJvbSBcInNvY2tldC1mdW5jdGlvbi9yZXF1aXJlL2NvbXBpbGVGbGFnc1wiO1xuaW1wb3J0IHsgTWF5YmVQcm9taXNlIH0gZnJvbSBcInNvY2tldC1mdW5jdGlvbi9zcmMvdHlwZXNcIjtcbmltcG9ydCB7IFppcCB9IGZyb20gXCJzb2NrZXQtZnVuY3Rpb24vc3JjL1ppcFwiO1xuc2V0RmxhZyhyZXF1aXJlLCBcInBha29cIiwgXCJhbGxvd2NsaWVudFwiLCB0cnVlKTtcblxuZXhwb3J0IHsgWmlwIH07Il19
|
|
9
|
+
/* _JS_SOURCE_HASH = "e6f5e41c7cc18d3b9672f00b99c29319324d9ea5f7c2c16c89b5b3b27906d35f"; */
|
package/misc/getSecret.ts
CHANGED
|
@@ -19,27 +19,49 @@ export const getSecret = cache(async function getSecret(key: string): Promise<st
|
|
|
19
19
|
if (isNode()) {
|
|
20
20
|
const os = await import("os");
|
|
21
21
|
const fs = await import("fs");
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
const path = await import("path");
|
|
23
|
+
|
|
24
|
+
const appSecretsPath = path.resolve("./appSecrets");
|
|
25
|
+
let appSecretsModule: { getAppSecret?: (key: string) => Promise<string | undefined> | string | undefined } | undefined;
|
|
26
|
+
try {
|
|
27
|
+
appSecretsModule = await import(appSecretsPath) as typeof appSecretsModule;
|
|
28
|
+
} catch {
|
|
29
|
+
// Module doesn't exist, fall through to the file-based approach
|
|
30
|
+
}
|
|
31
|
+
if (appSecretsModule?.getAppSecret) {
|
|
32
|
+
const result = await appSecretsModule.getAppSecret(key);
|
|
33
|
+
if (!result) {
|
|
34
|
+
throw new Error(`Expected an app secret named "${key}" from getAppSecret in ${appSecretsPath}, but it returned no result`);
|
|
35
|
+
}
|
|
36
|
+
return result;
|
|
26
37
|
}
|
|
27
38
|
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
39
|
+
const jsonIndex = key.indexOf(".json");
|
|
40
|
+
let filePath: string;
|
|
41
|
+
try {
|
|
42
|
+
if (jsonIndex === -1) {
|
|
43
|
+
filePath = os.homedir() + "/" + key;
|
|
44
|
+
return fs.readFileSync(filePath, "utf-8").trim();
|
|
45
|
+
}
|
|
32
46
|
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
47
|
+
const pathPart = key.slice(0, jsonIndex + ".json".length);
|
|
48
|
+
filePath = os.homedir() + "/" + pathPart;
|
|
49
|
+
const contents = fs.readFileSync(filePath, "utf-8");
|
|
50
|
+
const json = JSON.parse(contents);
|
|
51
|
+
|
|
52
|
+
const keyPart = key.slice(jsonIndex + ".json.".length);
|
|
53
|
+
if (!keyPart) {
|
|
54
|
+
return JSON.stringify(json);
|
|
55
|
+
}
|
|
37
56
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
57
|
+
const value = json[keyPart];
|
|
58
|
+
if (value === undefined) {
|
|
59
|
+
throw new Error(`Expected key "${keyPart}" in ${filePath}, was undefined`);
|
|
60
|
+
}
|
|
61
|
+
return String(value);
|
|
62
|
+
} catch (e) {
|
|
63
|
+
throw new Error(`Could not find secret "${key}". Expected it either from getAppSecret in the app secret module at ${appSecretsPath}, or in the file at ${os.homedir() + "/" + key}. Underlying error: ${(e as Error).stack ?? e}`);
|
|
41
64
|
}
|
|
42
|
-
return String(value);
|
|
43
65
|
}
|
|
44
66
|
|
|
45
67
|
// Browser implementation
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
3
|
+
export type CloudflareCreds = {
|
|
4
|
+
key: string;
|
|
5
|
+
/** Set for legacy global API keys, which auth via X-Auth-Email/X-Auth-Key. Absent for API tokens, which auth via Authorization: Bearer. */
|
|
6
|
+
email?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare const getCloudflareCreds: {
|
|
9
|
+
(): Promise<CloudflareCreds>;
|
|
10
|
+
reset(): void;
|
|
11
|
+
set(newValue: Promise<CloudflareCreds>): void;
|
|
12
|
+
};
|
|
13
|
+
export declare function cloudflareGETCall<T>(path: string, params?: {
|
|
14
|
+
[key: string]: string;
|
|
15
|
+
}): Promise<T>;
|
|
16
|
+
export declare function cloudflarePOSTCall<T>(path: string, params: {
|
|
17
|
+
[key: string]: unknown;
|
|
18
|
+
}): Promise<T>;
|
|
19
|
+
export declare function cloudflareCall<T>(path: string, payload: Buffer, method: string): Promise<T>;
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { lazy } from "socket-function/src/caching";
|
|
2
|
+
import { httpsRequest } from "socket-function/src/https";
|
|
3
|
+
import { getSecret } from "../getSecret";
|
|
4
|
+
|
|
5
|
+
export type CloudflareCreds = {
|
|
6
|
+
key: string;
|
|
7
|
+
/** Set for legacy global API keys, which auth via X-Auth-Email/X-Auth-Key. Absent for API tokens, which auth via Authorization: Bearer. */
|
|
8
|
+
email?: string;
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
export const getCloudflareCreds = lazy(async (): Promise<CloudflareCreds> => {
|
|
12
|
+
// Legacy global-key auth needs an email alongside the key, so prefer it when both secrets exist.
|
|
13
|
+
try {
|
|
14
|
+
let key = await getSecret("cloudflare.json.key");
|
|
15
|
+
let email = await getSecret("cloudflare.json.email");
|
|
16
|
+
return { key, email };
|
|
17
|
+
} catch { }
|
|
18
|
+
|
|
19
|
+
// API token form. Deliberately NOT caught: if this fails too, getSecret's error (which names every place it looked) is the one the caller should see.
|
|
20
|
+
return { key: await getSecret("cloudflare.json.key") };
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
function getAuthHeaders(creds: CloudflareCreds): { [header: string]: string } {
|
|
24
|
+
if (creds.email) {
|
|
25
|
+
return {
|
|
26
|
+
"X-Auth-Email": creds.email,
|
|
27
|
+
"X-Auth-User-Service-Key": creds.key,
|
|
28
|
+
"X-Auth-Key": creds.key,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
return { "Authorization": `Bearer ${creds.key}` };
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
export async function cloudflareGETCall<T>(path: string, params?: { [key: string]: string }): Promise<T> {
|
|
35
|
+
let url = new URL(`https://api.cloudflare.com/client/v4` + path);
|
|
36
|
+
for (let [key, value] of Object.entries(params || {})) {
|
|
37
|
+
url.searchParams.set(key, value);
|
|
38
|
+
}
|
|
39
|
+
let creds = await getCloudflareCreds();
|
|
40
|
+
let result = await httpsRequest(url.toString(), [], "GET", undefined, {
|
|
41
|
+
headers: {
|
|
42
|
+
"Content-Type": "application/json",
|
|
43
|
+
...getAuthHeaders(creds),
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
let result2 = JSON.parse(result.toString()) as { result: unknown; success: boolean; errors: { code: number; message: string }[] };
|
|
47
|
+
if (!result2.success) {
|
|
48
|
+
throw new Error(`Cloudflare call failed: ${result2.errors.map(x => x.message).join(", ")}`);
|
|
49
|
+
}
|
|
50
|
+
return result2.result as T;
|
|
51
|
+
}
|
|
52
|
+
export async function cloudflarePOSTCall<T>(path: string, params: { [key: string]: unknown }): Promise<T> {
|
|
53
|
+
return await cloudflareCall(path, Buffer.from(JSON.stringify(params)), "POST");
|
|
54
|
+
}
|
|
55
|
+
export async function cloudflareCall<T>(path: string, payload: Buffer, method: string): Promise<T> {
|
|
56
|
+
let url = new URL(`https://api.cloudflare.com/client/v4` + path);
|
|
57
|
+
let creds = await getCloudflareCreds();
|
|
58
|
+
let result = await httpsRequest(url.toString(), payload, method, undefined, {
|
|
59
|
+
headers: {
|
|
60
|
+
"Content-Type": "application/json",
|
|
61
|
+
...getAuthHeaders(creds),
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
let result2 = JSON.parse(result.toString()) as { result: unknown; success: boolean; errors: { code: number; message: string }[] };
|
|
65
|
+
if (!result2.success) {
|
|
66
|
+
throw new Error(`Cloudflare call failed: ${result2.errors.map(x => x.message).join(", ")}`);
|
|
67
|
+
}
|
|
68
|
+
return result2.result as T;
|
|
69
|
+
}
|