deepspace 0.5.6 → 0.6.0

package/CHANGELOG.md

@@ -0,0 +1,17 @@
+# deepspace
+
+## 0.6.0
+
+### Minor Changes
+
+- `deepspace collaborators add <email>` can now invite someone who isn't a DeepSpace user yet: it sends them an email invitation (billed to the app owner) and they become a collaborator when they sign in and accept it. The new `deepspace collaborators cancel <email>` rescinds a pending invite, and `collaborators list` now shows outstanding invites alongside active collaborators.
+
+### Patch Changes
+
+- `deepspace deploy` on a repo without `DEEPSPACE_APP_ID` no longer silently mints a fresh id destined for a route-claim collision when the name belongs to an existing app. Adoption now also recognizes legacy name-as-id apps the caller deploys on-behalf (collaborator or admin): adopting an app you own stays automatic; adopting one you _don't_ own asks for confirmation (or `--adopt` for non-interactive runs); a name owned by an app you can't deploy fails up front with the real reason.
+
+## 0.5.7
+
+### Patch Changes
+
+- 7301e30: Relicense to Apache-2.0 (from the next release onward), add LICENSE files, repository/homepage/bugs metadata, alpha notices, and a README for create-deepspace. Source is now published to the public mirror repo at https://github.com/deepdotspace/deepspace on every release.

package/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,5 +1,9 @@
 # deepspace
 
+> ⚠️ **Alpha** — DeepSpace is under active development. APIs may change
+> between 0.x minor versions; check the [changelog](./CHANGELOG.md) before
+> upgrading.
+
 The DeepSpace SDK — build real-time collaborative apps on Cloudflare Workers.
 Bundles auth, real-time data subscriptions, RBAC, messaging, file storage,
 collaborative editing (Yjs), and zero-config deployment behind two imports.

package/dist/cli.js

@@ -13,7 +13,9 @@ var API_ERROR_HINTS = {
   app_not_found: "App not found. Check the app id \u2014 the DEEPSPACE_APP_ID value in wrangler.toml, usually `app_\u2026` (a legacy app's id is its name). List your apps with `deepspace apps`. (`domain` commands take the deployed app *name* instead.)",
   not_app_owner_or_collaborator: "You must be the app owner or a collaborator to do this.",
   test_account_cannot_be_collaborator: "Test accounts cannot be added as collaborators. Use a real DeepSpace account.",
-  user_not_found: "No DeepSpace user with that email. They need to log in to DeepSpace at least once (`deepspace login`, or sign in to any app) before they can be referenced by email."
+  user_not_found: "No DeepSpace user with that email. They need to log in to DeepSpace at least once (`deepspace login`, or sign in to any app) before they can be referenced by email.",
+  insufficient_credits: "Out of credits. Inviting a new collaborator by email sends them a transactional email billed to your account \u2014 top up your credits and try again.",
+  invite_email_failed: "The invite email could not be sent. You were not charged \u2014 please try again in a moment."
 };
 function formatCliError(err) {
   const message = err instanceof Error ? err.message : String(err);
@@ -555,18 +557,27 @@ function mintAppId(now = Date.now()) {
   }
   return `app_${ts}${rs}`.slice(0, 30);
 }
-async function resolveOwnedAppId(deployUrl, token, appName) {
+async function resolveExistingAppId(deployUrl, token, appName) {
+  const headers = { Authorization: `Bearer ${token}` };
   try {
-    const res = await fetch(`${deployUrl}/api/apps`, {
-      headers: { Authorization: `Bearer ${token}` }
-    });
-    if (!res.ok) return null;
-    const body = await res.json();
-    const match = body.apps?.find((a) => a.name === appName);
-    return match?.appId ?? null;
+    const res = await fetch(`${deployUrl}/api/apps`, { headers });
+    if (res.ok) {
+      const body = await res.json();
+      const match = body.apps?.find((a) => a.name === appName);
+      if (match?.appId) return { kind: "adopted", appId: match.appId, owned: true };
+    }
+  } catch {
+  }
+  try {
+    const res = await fetch(
+      `${deployUrl}/api/apps/${encodeURIComponent(appName)}/analytics?period=1h`,
+      { headers }
+    );
+    if (res.ok) return { kind: "adopted", appId: appName, owned: false };
+    if (res.status === 403) return { kind: "taken" };
   } catch {
-    return null;
   }
+  return { kind: "none" };
 }
 function readAppId(cwd = process.cwd(), wranglerEnv) {
   const wranglerPath = join(resolve(cwd), "wrangler.toml");
@@ -2893,6 +2904,11 @@ var deploy_default = defineCommand8({
       type: "boolean",
       description: "Deploy even though hand-edited .dev.vars secrets are absent from the store (they will NOT be deployed, and any a previous deploy set are dropped).",
       default: false
+    },
+    adopt: {
+      type: "boolean",
+      description: "Confirm adopting an existing app you can deploy but do not own (collaborator/admin on-behalf) when wrangler.toml has no DEEPSPACE_APP_ID. Without this flag an interactive prompt asks.",
+      default: false
     }
   },
   async run({ args }) {
@@ -2932,11 +2948,32 @@ var deploy_default = defineCommand8({
       process.exit(1);
     }
     if (!appId) {
-      const adopted = await resolveOwnedAppId(DEPLOY_URL3, token, appName);
-      appId = adopted ?? mintAppId();
+      const existing = await resolveExistingAppId(DEPLOY_URL3, token, appName);
+      if (existing.kind === "taken") {
+        p4.cancel(
+          `"${appName}" is taken by an app you don't have deploy access to. Ask the owner to add you as a collaborator (\`deepspace collaborators add\`), or pick a different \`name\` in wrangler.toml.`
+        );
+        process.exit(1);
+      }
+      if (existing.kind === "adopted" && !existing.owned && !args.adopt) {
+        if (!process.stdin.isTTY) {
+          p4.cancel(
+            `"${appName}" is an existing app owned by another account that you can deploy on-behalf (collaborator/admin). Confirmation needs an interactive terminal \u2014 re-run with --adopt to deploy it, or pick a different \`name\` in wrangler.toml if you meant a new app.`
+          );
+          process.exit(1);
+        }
+        const yes = await p4.confirm({
+          message: `"${appName}" is an existing app owned by another account that you can deploy on-behalf (you are a collaborator or admin). Deploy it? (Meant a new app? Pick a different \`name\` in wrangler.toml.)`
+        });
+        if (p4.isCancel(yes) || !yes) {
+          p4.cancel("Deploy cancelled.");
+          process.exit(1);
+        }
+      }
+      appId = existing.kind === "adopted" ? existing.appId : mintAppId();
       writeAppId(appDir, appId, { wranglerEnv: envName });
       p4.log.info(
-        adopted ? `Adopted existing app id ${appId} for ${appName} \u2014 commit wrangler.toml.` : `Minted app id ${appId} \u2014 commit wrangler.toml.`
+        existing.kind === "adopted" ? `Adopted existing app id ${appId} for ${appName} \u2014 commit wrangler.toml.` : `Minted app id ${appId} \u2014 commit wrangler.toml.`
       );
     }
     p4.log.info(`Id: ${appId}`);
@@ -4131,30 +4168,35 @@ var list3 = defineCommand14({
   async run({ args }) {
     const token = await ensureToken();
     const app = await resolveAppTarget(DEPLOY_URL6, token, args.app);
-    const { collaborators } = await api2(
-      token,
-      `/api/app-collaborators/${encodeURIComponent(app)}`
-    );
+    const { collaborators, pending = [] } = await api2(token, `/api/app-collaborators/${encodeURIComponent(app)}`);
     if (args.json) {
-      process.stdout.write(JSON.stringify(collaborators, null, 2) + "\n");
+      process.stdout.write(JSON.stringify({ collaborators, pending }, null, 2) + "\n");
       return;
     }
-    if (!collaborators.length) {
+    if (!collaborators.length && !pending.length) {
       console.log(`No collaborators on ${app}. Add one with \`deepspace collaborators add <email>\`.`);
       return;
     }
-    console.log(`COLLABORATORS ON ${app}`);
-    for (const c of collaborators) {
-      console.log(`  ${c.emailDisplay}`);
+    if (collaborators.length) {
+      console.log(`COLLABORATORS ON ${app}`);
+      for (const c of collaborators) {
+        console.log(`  ${c.emailDisplay}`);
+      }
+    }
+    if (pending.length) {
+      console.log(`PENDING INVITES ON ${app}`);
+      for (const p10 of pending) {
+        console.log(`  ${p10.email} (expires ${new Date(p10.expiresAt).toLocaleDateString()})`);
+      }
     }
   }
 });
 var add = defineCommand14({
-  meta: { name: "add", description: "Authorize a DeepSpace user to deploy your app" },
+  meta: { name: "add", description: "Authorize someone to deploy your app" },
   args: {
     email: {
       type: "positional",
-      description: "Collaborator email (must already be a DeepSpace user)",
+      description: "Collaborator email",
       required: true
     },
     app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" },
@@ -4169,16 +4211,29 @@ var add = defineCommand14({
       );
       process.exit(1);
     }
-    const { collaborator } = await api2(
+    const res = await api2(
       token,
       `/api/app-collaborators/${encodeURIComponent(app)}`,
       { method: "POST", body: JSON.stringify({ email: args.email }) }
     );
     if (args.json) {
-      process.stdout.write(JSON.stringify(collaborator, null, 2) + "\n");
+      process.stdout.write(JSON.stringify(res, null, 2) + "\n");
+      return;
+    }
+    if (res.status === "invited" || res.status === "already_invited") {
+      const expires = new Date(res.expiresAt).toLocaleDateString();
+      if (res.status === "already_invited") {
+        console.log(
+          `\u2022 ${res.email} already has a pending invite (expires ${expires}). No new email was sent. Cancel it with \`deepspace collaborators cancel ${res.email}\` to reset.`
+        );
+        return;
+      }
+      console.log(
+        `\u2713 Invite sent to ${res.email} (expires ${expires}). They become a collaborator when they sign in.`
+      );
       return;
     }
-    console.log(`\u2713 ${collaborator.emailDisplay} can now deploy ${app}`);
+    console.log(`\u2713 ${res.collaborator.emailDisplay} can now deploy ${app}`);
   }
 });
 var remove = defineCommand14({
@@ -4213,9 +4268,41 @@ var remove = defineCommand14({
     console.log(`\u2713 ${found.emailDisplay} can no longer deploy ${app}`);
   }
 });
+var cancel4 = defineCommand14({
+  meta: { name: "cancel", description: "Cancel a pending (un-accepted) email invite" },
+  args: {
+    email: { type: "positional", description: "Invited email", required: true },
+    app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" },
+    json: { type: "boolean", description: "Emit JSON" }
+  },
+  async run({ args }) {
+    const token = await ensureToken();
+    const app = await resolveAppTarget(DEPLOY_URL6, token, args.app);
+    const { pending = [] } = await api2(
+      token,
+      `/api/app-collaborators/${encodeURIComponent(app)}`
+    );
+    const target = args.email.trim().toLowerCase();
+    const found = pending.find((p10) => p10.email.toLowerCase() === target);
+    if (!found) {
+      console.error(`${args.email} has no pending invite on ${app}`);
+      process.exit(1);
+    }
+    await api2(
+      token,
+      `/api/app-collaborators/${encodeURIComponent(app)}/pending/${encodeURIComponent(found.email)}`,
+      { method: "DELETE" }
+    );
+    if (args.json) {
+      process.stdout.write(JSON.stringify({ cancelled: found }, null, 2) + "\n");
+      return;
+    }
+    console.log(`\u2713 Cancelled the pending invite to ${found.email} on ${app}`);
+  }
+});
 var collaborators_default = defineCommand14({
   meta: { name: "collaborators", description: "Manage who can deploy your app" },
-  subCommands: { list: list3, add, remove }
+  subCommands: { list: list3, add, remove, cancel: cancel4 }
 });
 
 // src/cli/commands/transfer.ts
@@ -4304,7 +4391,7 @@ var accept = defineCommand15({
     );
   }
 });
-var cancel4 = defineCommand15({
+var cancel5 = defineCommand15({
   meta: { name: "cancel", description: "Cancel/decline the pending offer (either party)" },
   args: {
     app: { type: "string", alias: "a", description: "App id or name (defaults to ./wrangler.toml)" }
@@ -4318,7 +4405,7 @@ var cancel4 = defineCommand15({
 });
 var transfer_default = defineCommand15({
   meta: { name: "transfer", description: "Transfer app ownership to another user" },
-  subCommands: { offer, status: status2, accept, cancel: cancel4 }
+  subCommands: { offer, status: status2, accept, cancel: cancel5 }
 });
 
 // src/cli/commands/integrations.ts